chore: typing simplifications

Author: ntamas

src/igraph_ctypes/_internal/attributes.py

@@ -6,9 +6,10 @@
 from dataclasses import dataclass, field
 from typing import Any, Callable, Optional
 
-from .lib import igraph_error, igraph_vector_ptr_size
+from .conversion import igraph_vector_int_t_to_numpy_array_view
+from .lib import igraph_error
 from .refcount import incref, decref
-from .types import igraph_attribute_table_t
+from .types import igraph_attribute_table_t, IntArray
 from .utils import nop, protect_with
 
 __all__ = ("AttributeHandlerBase", "AttributeHandler", "AttributeStorage")
@@ -66,6 +67,13 @@ def add_vertices(self, graph, n: int) -> None:
         """
         raise NotImplementedError
 
+    @abstractmethod
+    def add_edges(self, graph, edges) -> None:
+        """Notifies the attribute storage object that the given edges were
+        added to the graph.
+        """
+        raise NotImplementedError
+
     @abstractmethod
     def clear(self):
         """Clears the storage area, removing all attributes."""
@@ -94,6 +102,9 @@ class DictAttributeStorage(AttributeStorage):
     def add_vertices(self, graph, n: int) -> None:
         pass
 
+    def add_edges(self, graph, edges: IntArray) -> None:
+        pass
+
     def clear(self) -> None:
         """Clears the storage area, removing all attributes from the
         attribute dictionaries.
@@ -194,7 +205,16 @@ def combine_vertices(self, graph, to, mapping, combinations):
         pass
 
     def add_edges(self, graph, edges, attr) -> None:
-        pass
+        # attr will only ever be NULL here so raise an error if it is not
+        if attr:
+            raise RuntimeError(
+                "add_edges() attribute handler called with non-null attr; "
+                "this is most likely a bug"
+            )
+
+        # Extend the existing attribute containers
+        edge_array = igraph_vector_int_t_to_numpy_array_view(edges).reshape((-1, 2))
+        _get_storage_from_graph(graph).add_edges(graph, edge_array)
 
     def permute_edges(self, graph, to, mapping):
         pass

src/igraph_ctypes/graph.py

@@ -1,9 +1,9 @@
-from numpy.typing import NDArray
 from typing import Iterable, Optional, TypeVar
 
 from .enums import NeighborMode
 from .types import (
     EdgeSelector,
+    IntArray,
     VertexLike,
     VertexPair,
     VertexSelector,
@@ -23,7 +23,6 @@
     neighbors,
     vcount,
 )
-from ._internal.types import np_type_of_igraph_integer_t
 from ._internal.wrappers import _Graph
 
 
@@ -87,7 +86,7 @@ def get_edge_id(
 
     def incident(
         self, vid: VertexLike, mode: NeighborMode = NeighborMode.ALL
-    ) -> NDArray[np_type_of_igraph_integer_t]:
+    ) -> IntArray:
         return incident(self, vid, mode)
 
     def is_directed(self) -> bool:
@@ -96,7 +95,7 @@ def is_directed(self) -> bool:
 
     def neighbors(
         self, vid: VertexLike, mode: NeighborMode = NeighborMode.ALL
-    ) -> NDArray[np_type_of_igraph_integer_t]:
+    ) -> IntArray:
         """Returns the list of neighbors of a vertex."""
         return neighbors(self, vid, mode)