feat: add new types related to attribute handling from the 'develop' branch

Author: ntamas

src/codegen/internal_lib.py.in

@@ -9,6 +9,7 @@ from .errors import handle_igraph_error_t
 from .types import (
     FILE,
     igraph_attribute_combination_t,
+    igraph_attribute_record_list_t,
     igraph_attribute_table_t,
     igraph_bool_t,
     igraph_integer_t,
@@ -39,6 +40,7 @@ from .types import (
     igraph_maxflow_stats_t,
     igraph_interruption_handler_t,
     igraph_isocompat_t,
+    igraph_isohandler_t,
     igraph_plfit_result_t,
     igraph_rng_t,
     igraph_rng_type_t,

src/igraph_ctypes/_internal/functions.py

@@ -6534,7 +6534,7 @@ def subisomorphic(graph1: Graph, graph2: Graph) -> bool:
 
 # igraph_subisomorphic_vf2: no Python type known for type: ISOCOMPAT_FUNC
 
-# igraph_subisomorphic_function_vf2: no Python type known for type: ISOMORPHISM_FUNC
+# igraph_get_subisomorphisms_vf2_callback: no Python type known for type: ISOMORPHISM_FUNC
 
 # igraph_count_subisomorphisms_vf2: no Python type known for type: ISOCOMPAT_FUNC
 
@@ -6561,7 +6561,7 @@ def permute_vertices(graph: Graph, permutation: Iterable[int]) -> Graph:
 
 # igraph_isomorphic_bliss: no Python type known for type: BLISSSH
 
-# igraph_automorphisms: no Python type known for type: BLISSSH
+# igraph_count_automorphisms: no Python type known for type: BLISSSH
 
 # igraph_automorphism_group: no Python type known for type: BLISSSH
 
@@ -7226,3 +7226,9 @@ def version() -> tuple[str, int, int, int]:
 
     # Construct return value
     return version_string, major, minor, subminor
+
+
+def subisomorphic_function_vf2() -> None:
+    """Type-annotated wrapper for ``igraph_subisomorphic_function_vf2``."""
+    # Call wrapped function
+    igraph_subisomorphic_function_vf2()

src/igraph_ctypes/_internal/lib.py

@@ -9,6 +9,7 @@
 from .types import (
     FILE,
     igraph_attribute_combination_t,
+    igraph_attribute_record_list_t,
     igraph_attribute_table_t,
     igraph_bool_t,
     igraph_integer_t,
@@ -39,6 +40,7 @@
     igraph_maxflow_stats_t,
     igraph_interruption_handler_t,
     igraph_isocompat_t,
+    igraph_isohandler_t,
     igraph_plfit_result_t,
     igraph_rng_t,
     igraph_rng_type_t,
@@ -633,11 +635,11 @@ def _load_libc():
 
 igraph_add_edges = _lib.igraph_add_edges
 igraph_add_edges.restype = handle_igraph_error_t
-igraph_add_edges.argtypes = [POINTER(igraph_t), POINTER(igraph_vector_int_t), c_void_p]
+igraph_add_edges.argtypes = [POINTER(igraph_t), POINTER(igraph_vector_int_t), POINTER(igraph_attribute_record_list_t)]
 
 igraph_add_vertices = _lib.igraph_add_vertices
 igraph_add_vertices.restype = handle_igraph_error_t
-igraph_add_vertices.argtypes = [POINTER(igraph_t), igraph_integer_t, c_void_p]
+igraph_add_vertices.argtypes = [POINTER(igraph_t), igraph_integer_t, POINTER(igraph_attribute_record_list_t)]
 
 igraph_copy = _lib.igraph_copy
 igraph_copy.restype = handle_igraph_error_t
@@ -2195,6 +2197,10 @@ def _load_libc():
 igraph_subisomorphic_vf2.restype = handle_igraph_error_t
 igraph_subisomorphic_vf2.argtypes = [POINTER(igraph_t), POINTER(igraph_t), POINTER(igraph_vector_int_t), POINTER(igraph_vector_int_t), POINTER(igraph_vector_int_t), POINTER(igraph_vector_int_t), POINTER(igraph_bool_t), POINTER(igraph_vector_int_t), POINTER(igraph_vector_int_t), igraph_isocompat_t, igraph_isocompat_t, c_void_p]
 
+igraph_get_subisomorphisms_vf2_callback = _lib.igraph_get_subisomorphisms_vf2_callback
+igraph_get_subisomorphisms_vf2_callback.restype = handle_igraph_error_t
+igraph_get_subisomorphisms_vf2_callback.argtypes = [POINTER(igraph_t), POINTER(igraph_t), POINTER(igraph_vector_int_t), POINTER(igraph_vector_int_t), POINTER(igraph_vector_int_t), POINTER(igraph_vector_int_t), POINTER(igraph_vector_int_t), POINTER(igraph_vector_int_t), igraph_isohandler_t, igraph_isocompat_t, igraph_isocompat_t, c_void_p]
+
 igraph_count_subisomorphisms_vf2 = _lib.igraph_count_subisomorphisms_vf2
 igraph_count_subisomorphisms_vf2.restype = handle_igraph_error_t
 igraph_count_subisomorphisms_vf2.argtypes = [POINTER(igraph_t), POINTER(igraph_t), POINTER(igraph_vector_int_t), POINTER(igraph_vector_int_t), POINTER(igraph_vector_int_t), POINTER(igraph_vector_int_t), POINTER(igraph_integer_t), igraph_isocompat_t, igraph_isocompat_t, c_void_p]
@@ -2215,9 +2221,9 @@ def _load_libc():
 igraph_isomorphic_bliss.restype = handle_igraph_error_t
 igraph_isomorphic_bliss.argtypes = [POINTER(igraph_t), POINTER(igraph_t), POINTER(igraph_vector_int_t), POINTER(igraph_vector_int_t), POINTER(igraph_bool_t), POINTER(igraph_vector_int_t), POINTER(igraph_vector_int_t), igraph_bliss_sh_t, POINTER(igraph_bliss_info_t), POINTER(igraph_bliss_info_t)]
 
-igraph_automorphisms = _lib.igraph_automorphisms
-igraph_automorphisms.restype = handle_igraph_error_t
-igraph_automorphisms.argtypes = [POINTER(igraph_t), POINTER(igraph_vector_int_t), igraph_bliss_sh_t, POINTER(igraph_bliss_info_t)]
+igraph_count_automorphisms = _lib.igraph_count_automorphisms
+igraph_count_automorphisms.restype = handle_igraph_error_t
+igraph_count_automorphisms.argtypes = [POINTER(igraph_t), POINTER(igraph_vector_int_t), igraph_bliss_sh_t, POINTER(igraph_bliss_info_t)]
 
 igraph_automorphism_group = _lib.igraph_automorphism_group
 igraph_automorphism_group.restype = handle_igraph_error_t

src/igraph_ctypes/_internal/types.py

@@ -282,6 +282,40 @@ class igraph_attribute_combination_record_t(Structure):
     _fields_ = [("name", c_char_p), ("type", c_int), ("func", CFUNCTYPE(c_void_p))]
 
 
+class _igraph_attribute_record_value_t(CUnion):
+    _fields_ = [
+        ("as_raw", c_void_p),
+        ("as_vector", POINTER(igraph_vector_t)),
+        ("as_strvector", POINTER(igraph_strvector_t)),
+        ("as_vector_bool", POINTER(igraph_vector_bool_t)),
+    ]
+
+
+class _igraph_attribute_record_default_value_t(CUnion):
+    _fields_ = [
+        ("numeric", igraph_real_t),
+        ("boolean", igraph_bool_t),
+        ("string", c_char_p),
+    ]
+
+
+class igraph_attribute_record_t(Structure):
+    """ctypes representation of ``igraph_attribute_record_t``"""
+
+    _fields_ = [
+        ("name", c_char_p),
+        ("type", c_int),
+        ("value", _igraph_attribute_record_value_t),
+        ("default_value", _igraph_attribute_record_default_value_t),
+    ]
+
+
+class igraph_attribute_record_list_t(Structure):
+    """ctypes representation of ``igraph_attribute_record_list_t``"""
+
+    _fields_ = vector_fields(igraph_attribute_record_t)
+
+
 class igraph_bliss_info_t(Structure):
     """ctypes representation of an ``igraph_bliss_info_t`` object"""
 
@@ -431,6 +465,12 @@ class igraph_rng_t(Structure):
     igraph_integer_t,
     c_void_p,
 )
+igraph_isohandler_t = CFUNCTYPE(
+    igraph_error_t,
+    POINTER(igraph_vector_int_t),
+    POINTER(igraph_vector_int_t),
+    c_void_p,
+)
 igraph_warning_handler_t = CFUNCTYPE(None, c_char_p, c_char_p, c_int)