fix ruff check and type errors

Author: terapyon

net_vis/adapters/networkx_adapter.py

@@ -42,7 +42,7 @@ def _detect_graph_type(graph: Any) -> str:
     @staticmethod
     def _extract_nodes(
         graph: Any,
-        positions: dict[Any, tuple[float, float]],
+        positions: dict[Any, Any],
         node_color: str | Callable | None = None,
         node_label: str | Callable | None = None,
     ) -> list[Node]:
@@ -250,7 +250,7 @@ def _expand_multigraph_edges(
         return edges
 
     @staticmethod
-    def _get_existing_positions(graph: Any) -> dict[Any, tuple[float, float]] | None:
+    def _get_existing_positions(graph: Any) -> dict[Any, Any] | None:
         """Extract existing 'pos' attribute from nodes.
 
         Args:
@@ -271,7 +271,7 @@ def _get_existing_positions(graph: Any) -> dict[Any, tuple[float, float]] | None
         return positions if has_positions else None
 
     @staticmethod
-    def _apply_spring_layout(graph: Any) -> dict[Any, tuple[float, float]]:
+    def _apply_spring_layout(graph: Any) -> dict[Any, Any]:
         """Apply spring (force-directed) layout.
 
         Args:
@@ -283,7 +283,7 @@ def _apply_spring_layout(graph: Any) -> dict[Any, tuple[float, float]]:
         return nx.spring_layout(graph)
 
     @staticmethod
-    def _apply_kamada_kawai_layout(graph: Any) -> dict[Any, tuple[float, float]]:
+    def _apply_kamada_kawai_layout(graph: Any) -> dict[Any, Any]:
         """Apply Kamada-Kawai layout.
 
         Args:
@@ -296,7 +296,7 @@ def _apply_kamada_kawai_layout(graph: Any) -> dict[Any, tuple[float, float]]:
             ImportError: If scipy is not installed
         """
         try:
-            import scipy  # noqa: F401
+            import scipy  # type: ignore[import-not-found]  # noqa: F401
         except ImportError:
             raise ImportError(
                 "Layout 'kamada_kawai' requires scipy. "
@@ -306,7 +306,7 @@ def _apply_kamada_kawai_layout(graph: Any) -> dict[Any, tuple[float, float]]:
         return nx.kamada_kawai_layout(graph)
 
     @staticmethod
-    def _apply_spectral_layout(graph: Any) -> dict[Any, tuple[float, float]]:
+    def _apply_spectral_layout(graph: Any) -> dict[Any, Any]:
         """Apply spectral layout.
 
         Args:
@@ -319,7 +319,7 @@ def _apply_spectral_layout(graph: Any) -> dict[Any, tuple[float, float]]:
             ImportError: If scipy is not installed
         """
         try:
-            import scipy  # noqa: F401
+            import scipy  # type: ignore[import-not-found]  # noqa: F401
         except ImportError:
             raise ImportError(
                 "Layout 'spectral' requires scipy. "
@@ -329,7 +329,7 @@ def _apply_spectral_layout(graph: Any) -> dict[Any, tuple[float, float]]:
         return nx.spectral_layout(graph)
 
     @staticmethod
-    def _apply_circular_layout(graph: Any) -> dict[Any, tuple[float, float]]:
+    def _apply_circular_layout(graph: Any) -> dict[Any, Any]:
         """Apply circular layout.
 
         Args:
@@ -341,7 +341,7 @@ def _apply_circular_layout(graph: Any) -> dict[Any, tuple[float, float]]:
         return nx.circular_layout(graph)
 
     @staticmethod
-    def _apply_random_layout(graph: Any) -> dict[Any, tuple[float, float]]:
+    def _apply_random_layout(graph: Any) -> dict[Any, Any]:
         """Apply random layout.
 
         Args:
@@ -353,7 +353,7 @@ def _apply_random_layout(graph: Any) -> dict[Any, tuple[float, float]]:
         return nx.random_layout(graph)
 
     @staticmethod
-    def _apply_custom_layout(graph: Any, layout_func: Callable) -> dict[Any, tuple[float, float]]:
+    def _apply_custom_layout(graph: Any, layout_func: Callable) -> dict[Any, Any]:
         """Apply custom layout function.
 
         Args:
@@ -366,7 +366,7 @@ def _apply_custom_layout(graph: Any, layout_func: Callable) -> dict[Any, tuple[f
         return layout_func(graph)
 
     @staticmethod
-    def _validate_positions(positions: dict[Any, tuple[float, float]]) -> bool:
+    def _validate_positions(positions: dict[Any, Any]) -> bool:
         """Validate that positions don't contain NaN or inf values.
 
         Args:
@@ -386,7 +386,7 @@ def _validate_positions(positions: dict[Any, tuple[float, float]]) -> bool:
     def _compute_layout(
         graph: Any,
         layout: str | Callable | None = None
-    ) -> dict[Any, tuple[float, float]]:
+    ) -> dict[Any, Any]:
         """Compute node positions using specified layout algorithm.
 
         Args:

net_vis/models.py

@@ -92,7 +92,7 @@ def to_dict(self) -> dict[str, Any]:
         for layer in self.layers:
             # Convert nodes to netvis format
             for node in layer.nodes:
-                node_dict = {
+                node_dict: dict[str, Any] = {
                     "id": node.id,
                     "x": node.x,
                     "y": node.y,
@@ -107,7 +107,7 @@ def to_dict(self) -> dict[str, Any]:
 
             # Convert edges to netvis format (links)
             for edge in layer.edges:
-                link_dict = {
+                link_dict: dict[str, Any] = {
                     "source": edge.source,
                     "target": edge.target,
                 }
@@ -119,7 +119,7 @@ def to_dict(self) -> dict[str, Any]:
                 link_dict.update(edge.metadata)
                 all_links.append(link_dict)
 
-        result = {
+        result: dict[str, Any] = {
             "nodes": all_nodes,
             "links": all_links,
         }

net_vis/plotter.py

@@ -1,9 +1,11 @@
 """High-level API for plotting NetworkX graphs in JupyterLab."""
 
 import json
-from typing import Any, Callable
-from .models import Scene, GraphLayer
+from collections.abc import Callable
+from typing import Any
+
 from .adapters.networkx_adapter import NetworkXAdapter
+from .models import Scene
 
 
 class Plotter:

net_vis/tests/test_networkx_adapter.py

@@ -6,6 +6,7 @@
 pytest.importorskip("networkx")
 
 import networkx as nx
+
 from net_vis.adapters.networkx_adapter import NetworkXAdapter
 
 

net_vis/tests/test_plotter.py

@@ -1,12 +1,14 @@
 """Tests for Plotter class public API."""
 
 import json
+
 import pytest
 
 # Skip all tests if networkx is not installed
 pytest.importorskip("networkx")
 
 import networkx as nx
+
 from net_vis import Plotter
 
 

pyproject.toml

@@ -134,6 +134,7 @@ exclude = [
     ".venv",
     "venv",
     "venv-docker",
+    "net_vis/tests",
 ]
 pythonVersion = "3.10"
 typeCheckingMode = "basic"