Merge branch '3.1' into mypy-agent

gns3server/agent/gns3_copilot/tools_v2/config_tools_nornir.py

@@ -78,7 +78,7 @@ try:
     # so we use importlib to get the actual module
     import importlib
 
-    sd = importlib.import_module("netmiko.ssh_dispatcher")
+    sd: Any = importlib.import_module("netmiko.ssh_dispatcher")
 
     # Recalculate platforms lists to include custom device types
     sd.platforms = list(sd.CLASS_MAPPER.keys())
@@ -196,7 +196,7 @@ class ExecuteMultipleDeviceConfigCommands(BaseTool):
 
         # Validate input
         device_configs_list, project_id = self._validate_tool_input(tool_input)
-        if isinstance(device_configs_list, list) and len(device_configs_list) > 0 and "error" in device_configs_list[0]:
+        if len(device_configs_list) > 0 and "error" in device_configs_list[0]:
             return device_configs_list
 
         # Filter forbidden commands and store blocked commands info

gns3server/agent/gns3_copilot/tools_v2/display_tools_nornir.py

@@ -78,7 +78,7 @@ try:
     # so we use importlib to get the actual module
     import importlib
 
-    sd = importlib.import_module("netmiko.ssh_dispatcher")
+    sd: Any = importlib.import_module("netmiko.ssh_dispatcher")
 
     # Recalculate platforms lists to include custom device types
     sd.platforms = list(sd.CLASS_MAPPER.keys())
@@ -199,7 +199,7 @@ class ExecuteMultipleDeviceCommands(BaseTool):
 
         # Validate input
         device_configs_list, project_id = self._validate_tool_input(tool_input)
-        if isinstance(device_configs_list, list) and len(device_configs_list) > 0 and "error" in device_configs_list[0]:
+        if len(device_configs_list) > 0 and "error" in device_configs_list[0]:
             return device_configs_list
 
         # Filter forbidden commands and store blocked commands info

gns3server/agent/gns3_copilot/tools_v2/gns3_packet_filter.py

@@ -286,7 +286,7 @@ class GNS3PacketFilterTool(BaseTool):
 
             # Check if output contains "Invalid" indicating syntax error
             if "Invalid" in result.stdout or "Invalid" in result.stderr:
-                error_lines = []
+                error_lines: list[str] = []
                 if "Invalid" in result.stderr:
                     error_lines.extend(line for line in result.stderr.split("\n") if "Invalid" in line)
                 if "Invalid" in result.stdout:

gns3server/agent/gns3_copilot/tools_v2/packet_analysis_tool.py

@@ -143,7 +143,8 @@ class PacketAnalysisTool(BaseTool):
                 stderr=subprocess.DEVNULL,
                 text=True,
             )
-            tshark.stdout.close()
+            if tshark.stdout is not None:
+                tshark.stdout.close()
             stdout, _ = grep.communicate(timeout=30)
             tshark.wait(timeout=5)
         except Exception as e:

gns3server/agent/gns3_copilot/tools_v2/vpcs_tools_netmiko.py

@@ -68,7 +68,7 @@ try:
     # CRITICAL: Update netmiko.ssh_dispatcher platforms lists
     import importlib
 
-    sd = importlib.import_module("netmiko.ssh_dispatcher")
+    sd: Any = importlib.import_module("netmiko.ssh_dispatcher")
 
     # Recalculate platforms lists to include custom device types
     sd.platforms = list(sd.CLASS_MAPPER.keys())
@@ -179,7 +179,7 @@ class VPCSCommands(BaseTool):
 
         # Validate input
         device_configs_list, project_id = self._validate_tool_input(tool_input)
-        if isinstance(device_configs_list, list) and len(device_configs_list) > 0 and "error" in device_configs_list[0]:
+        if len(device_configs_list) > 0 and "error" in device_configs_list[0]:
             return device_configs_list
 
         # Create a mapping of device names to their commands
@@ -386,7 +386,7 @@ class VPCSCommands(BaseTool):
     def _prepare_device_hosts_data(
         self,
         device_configs_list: list[dict[str, Any]],
-        project_id: str,
+        project_id: str | None,
         jwt_token: str | None = None,
         url: str | None = None,
     ) -> dict[str, dict[str, Any]]:
@@ -415,7 +415,7 @@ class VPCSCommands(BaseTool):
         device_ports = get_device_ports_from_topology(device_names, project_id=project_id, jwt_token=jwt_token, url=url)
 
         # Build Nornir inventory hosts data
-        hosts_data = {}
+        hosts_data: dict[str, Any] = {}
         for device_name in device_names:
             if device_name not in device_ports:
                 logger.error("Device '%s' not found in topology", device_name)