Merge pull request #2907 from markparonyan/mypy-agent-copilot-skills

fix(typing): resolve mypy errors in agent.gns3_copilot.skills

gns3server/agent/gns3_copilot/skills/loader.py

@@ -248,7 +248,7 @@ class SkillsLoader:
                     continue
                 # Use device_type from YAML content as the key
                 # Fallback to filename stem if device_type not present
-                skill_key = skill_data.get("device_type") if isinstance(skill_data, dict) else None
+                skill_key = skill_data.get("device_type")
                 if not skill_key:
                     skill_key = yaml_file.stem
                     logger.warning(f"No device_type in {yaml_file}, using filename '{skill_key}' as key")

gns3server/agent/gns3_copilot/skills/manager.py

@@ -37,8 +37,10 @@ from typing import Optional, Dict, Any
 
 try:
     import git
+
+    GIT_AVAILABLE = True
 except ImportError:
-    git = None
+    GIT_AVAILABLE = False
 
 from gns3server.config import Config
 from .loader import SkillsLoader
@@ -66,7 +68,7 @@ class SkillsManager:
     - Version tracking
     """
 
-    def __init__(self, repo_url: str = None, branch: str = "main", auto_update: bool = False):
+    def __init__(self, repo_url: Optional[str] = None, branch: str = "main", auto_update: bool = False):
         """
         Initialize the skills manager.
 
@@ -90,7 +92,7 @@ class SkillsManager:
         self._repo: Optional["git.Repo"] = None
         self._prompt_count = 0
 
-        if git is None:
+        if not GIT_AVAILABLE:
             logger.warning("GitPython is not installed. Skills management features will be limited.")
 
     def initialize(self) -> bool:
@@ -134,7 +136,7 @@ class SkillsManager:
         - Up to date → nothing
         - Network error → use existing files, log warning
         """
-        if git is None or self._repo is None:
+        if not GIT_AVAILABLE or self._repo is None:
             return
 
         # Check for uncommitted changes
@@ -173,7 +175,7 @@ class SkillsManager:
         Returns:
             True if successful, False otherwise
         """
-        if git is None:
+        if not GIT_AVAILABLE:
             logger.error("GitPython is not installed. Cannot clone repository.")
             return False
 
@@ -347,7 +349,7 @@ class SkillsManager:
         Returns:
             Commit hash as string, or empty string if not available
         """
-        if git is None or self._repo is None:
+        if not GIT_AVAILABLE or self._repo is None:
             try:
                 self._repo = git.Repo(self.local_path)
             except Exception:
@@ -409,7 +411,7 @@ class SkillsManager:
         Returns:
             True if successful, False otherwise
         """
-        if git is None:
+        if not GIT_AVAILABLE:
             logger.error("GitPython is not installed. Cannot rollback.")
             return False
 
@@ -436,7 +438,7 @@ class SkillsManager:
         Returns:
             List of commit information dictionaries
         """
-        if git is None:
+        if not GIT_AVAILABLE:
             return []
 
         try:

pyproject.toml

@@ -297,8 +297,6 @@ module = [
   "gns3server.agent",  # 2
   "gns3server.agent.gns3_copilot.chat_sessions_repository",  # 8
   "gns3server.agent.gns3_copilot.gns3_client.api_handlers",  # 10
-  "gns3server.agent.gns3_copilot.skills.loader",  # 1
-  "gns3server.agent.gns3_copilot.skills.manager",  # 4
   "gns3server.agent.gns3_copilot.tools_v2.config_tools_nornir",  # 6
   "gns3server.agent.gns3_copilot.tools_v2.display_tools_nornir",  # 6
   "gns3server.agent.gns3_copilot.tools_v2.gns3_packet_filter",  # 1