feat: strerror() works now

Author: ntamas

src/codegen/types.yaml

@@ -1,4 +1,5 @@
 ERROR:
+  PY_TYPE: int
   CTYPES_RETURN_TYPE: handle_igraph_error_t
 
 BOOLEAN:
@@ -32,7 +33,7 @@ CSTRING:
   INCONV:
     IN: '%C% = %I%.encode("utf-8")'
     OUT: "%C% = c_char_p()"
-  OUTCONV: '%I% = %C%.value.decode("utf-8", "replace")'
+  OUTCONV: "%I% = bytes_to_str(%C%)"
 
 VECTOR:
   PY_TYPE: Iterable[float]

src/igraph_ctypes/_internal/conversion.py

@@ -58,6 +58,7 @@
     VertexPair,
     VertexSelector,
 )
+from .utils import bytes_to_str
 from .wrappers import (
     _EdgeSelector,
     _Graph,
@@ -71,6 +72,7 @@
 
 __all__ = (
     "any_to_igraph_bool_t",
+    "bytes_to_str",
     "edgelike_to_igraph_integer_t",
     "edge_capacities_to_igraph_vector_t",
     "edge_capacities_to_igraph_vector_t_view",
@@ -109,11 +111,6 @@
 )
 
 
-################################################################################
-#  Conversion from Python data types to igraph                                 #
-################################################################################
-
-
 def any_to_igraph_bool_t(obj: Any) -> igraph_bool_t:
     """Converts an arbitrary Python object to an igraph boolean by taking its
     truth value.

src/igraph_ctypes/_internal/functions.py

@@ -99,16 +99,16 @@ def delete_vertices(graph: _Graph, vertices: VertexSelector) -> None:
     igraph_delete_vertices(c_graph, c_vertices.unwrap())
 
 
-def delete_vertices_idx(graph: _Graph, vertices: VertexSelector) -> Tuple[npt.NDArray[np_type_of_igraph_integer_t], npt.NDArray[np_type_of_igraph_integer_t]]:
-    """Type-annotated wrapper for ``igraph_delete_vertices_idx``."""
+def delete_vertices_map(graph: _Graph, vertices: VertexSelector) -> Tuple[npt.NDArray[np_type_of_igraph_integer_t], npt.NDArray[np_type_of_igraph_integer_t]]:
+    """Type-annotated wrapper for ``igraph_delete_vertices_map``."""
     # Prepare input arguments
     c_graph = graph
     c_vertices = vertex_selector_to_igraph_vs_t(vertices, graph)
     c_idx = _VectorInt.create(0)
     c_invidx = _VectorInt.create(0)
 
     # Call wrapped function
-    igraph_delete_vertices_idx(c_graph, c_vertices.unwrap(), c_idx, c_invidx)
+    igraph_delete_vertices_map(c_graph, c_vertices.unwrap(), c_idx, c_invidx)
 
     # Prepare output arguments
     idx = igraph_vector_int_t_to_numpy_array(c_idx)
@@ -1696,17 +1696,18 @@ def distances_bellman_ford(graph: _Graph, weights: Iterable[float], from_: Verte
     return res
 
 
-def distances_johnson(graph: _Graph, weights: Iterable[float], from_: VertexSelector = "all", to: VertexSelector = "all") -> npt.NDArray[np_type_of_igraph_real_t]:
+def distances_johnson(graph: _Graph, from_: VertexSelector = "all", to: VertexSelector = "all", weights: Optional[Iterable[float]] = None, mode: NeighborMode = NeighborMode.OUT) -> npt.NDArray[np_type_of_igraph_real_t]:
     """Type-annotated wrapper for ``igraph_distances_johnson``."""
     # Prepare input arguments
     c_graph = graph
     c_res = _Matrix.create(0)
     c_from = vertex_selector_to_igraph_vs_t(from_, graph)
     c_to = vertex_selector_to_igraph_vs_t(to, graph)
     c_weights = edge_weights_to_igraph_vector_t_view(weights, graph)
+    c_mode = c_int(mode)
 
     # Call wrapped function
-    igraph_distances_johnson(c_graph, c_res, c_from.unwrap(), c_to.unwrap(), c_weights)
+    igraph_distances_johnson(c_graph, c_res, c_from.unwrap(), c_to.unwrap(), c_weights, c_mode)
 
     # Prepare output arguments
     res = igraph_matrix_t_to_numpy_array(c_res)
@@ -5942,7 +5943,20 @@ def has_attribute_table() -> bool:
 
 # igraph_status: no Python type known for type: EXTRA
 
-# igraph_strerror: no Python type known for type: ERROR
+
+def strerror(igraph_errno: int) -> str:
+    """Type-annotated wrapper for ``igraph_strerror``."""
+    # Prepare input arguments
+    c_igraph_errno = igraph_errno
+
+    # Call wrapped function
+    c__result = igraph_strerror(c_igraph_errno)
+
+    # Prepare return value
+    py__result = bytes_to_str(c__result)
+
+    # Construct return value
+    return py__result
 
 
 def expand_path_to_pairs(path: Iterable[VertexLike]) -> None:
@@ -5997,7 +6011,7 @@ def version() -> Tuple[str, int, int, int]:
     igraph_version(c_version_string, c_major, c_minor, c_subminor)
 
     # Prepare output arguments
-    version_string = c_version_string.value.decode("utf-8", "replace")
+    version_string = bytes_to_str(c_version_string)
     major = c_major.value
     minor = c_minor.value
     subminor = c_subminor.value

src/igraph_ctypes/_internal/lib.py

@@ -392,9 +392,9 @@ def _load_igraph_c_library():
 igraph_delete_vertices.restype = handle_igraph_error_t
 igraph_delete_vertices.argtypes = [POINTER(igraph_t), igraph_vs_t]
 
-igraph_delete_vertices_idx = _lib.igraph_delete_vertices_idx
-igraph_delete_vertices_idx.restype = handle_igraph_error_t
-igraph_delete_vertices_idx.argtypes = [POINTER(igraph_t), igraph_vs_t, POINTER(igraph_vector_int_t), POINTER(igraph_vector_int_t)]
+igraph_delete_vertices_map = _lib.igraph_delete_vertices_map
+igraph_delete_vertices_map.restype = handle_igraph_error_t
+igraph_delete_vertices_map.argtypes = [POINTER(igraph_t), igraph_vs_t, POINTER(igraph_vector_int_t), POINTER(igraph_vector_int_t)]
 
 igraph_vcount = _lib.igraph_vcount
 igraph_vcount.restype = igraph_integer_t
@@ -774,7 +774,7 @@ def _load_igraph_c_library():
 
 igraph_distances_johnson = _lib.igraph_distances_johnson
 igraph_distances_johnson.restype = handle_igraph_error_t
-igraph_distances_johnson.argtypes = [POINTER(igraph_t), POINTER(igraph_matrix_t), igraph_vs_t, igraph_vs_t, POINTER(igraph_vector_t)]
+igraph_distances_johnson.argtypes = [POINTER(igraph_t), POINTER(igraph_matrix_t), igraph_vs_t, igraph_vs_t, POINTER(igraph_vector_t), igraph_neimode_t]
 
 igraph_distances_floyd_warshall = _lib.igraph_distances_floyd_warshall
 igraph_distances_floyd_warshall.restype = handle_igraph_error_t

src/igraph_ctypes/_internal/utils.py

@@ -0,0 +1,13 @@
+from ctypes import c_char_p
+
+
+def bytes_to_str(value: bytes, encoding: str = "utf-8", errors: str = "replace") -> str:
+    """Converts a C string represented as a Python bytes object or as a
+    ctypes ``c_char_p`` object into a Python string, using the given encoding
+    and error handling.
+    """
+    if isinstance(value, c_char_p):
+        wrapped = value.value
+        return wrapped.decode(encoding, errors) if wrapped is not None else ""
+    else:
+        return value.decode(encoding, errors)

test/test_misc.py

@@ -1,4 +1,10 @@
-from igraph_ctypes._internal.functions import version
+from igraph_ctypes._internal.functions import strerror, version
+
+
+def test_strerror():
+    assert strerror(0) == "No error"
+    assert strerror(1) == "Failed"
+    assert strerror(9) == "Invalid mode"
 
 
 def test_version():