GA-163 | test_multigraph & test_multidigraph

nx_arangodb/classes/dict/graph.py

@@ -16,7 +16,6 @@
     json_serializable,
     key_is_not_reserved,
     key_is_string,
-    logger_debug,
 )
 
 #############
@@ -80,7 +79,6 @@ class GraphDict(UserDict[str, Any]):
     :type graph_name: str
     """
 
-    @logger_debug
     def __init__(self, db: StandardDatabase, graph: Graph, *args: Any, **kwargs: Any):
         super().__init__(*args, **kwargs)
         self.data: dict[str, Any] = {}
@@ -111,7 +109,6 @@ def __process_graph_dict_value(self, key: str, value: Any) -> Any:
         return graph_attr_dict
 
     @key_is_string
-    @logger_debug
     def __contains__(self, key: str) -> bool:
         """'foo' in G.graph"""
         if key in self.data:
@@ -120,7 +117,6 @@ def __contains__(self, key: str) -> bool:
         return aql_doc_has_key(self.db, self.graph_id, key)
 
     @key_is_string
-    @logger_debug
     def __getitem__(self, key: str) -> Any:
         """G.graph['foo']"""
 
@@ -139,7 +135,6 @@ def __getitem__(self, key: str) -> Any:
 
     @key_is_string
     @key_is_not_reserved
-    @logger_debug
     def __setitem__(self, key: str, value: Any) -> None:
         """G.graph['foo'] = 'bar'"""
         if value is None:
@@ -152,15 +147,13 @@ def __setitem__(self, key: str, value: Any) -> None:
 
     @key_is_string
     @key_is_not_reserved
-    @logger_debug
     def __delitem__(self, key: str) -> None:
         """del G.graph['foo']"""
         self.data.pop(key, None)
         doc_update(self.db, self.graph_id, {key: None})
 
     # @values_are_json_serializable # TODO?
-    @logger_debug
-    def update(self, attrs: Any) -> None:
+    def update(self, attrs: Any) -> None:  # type: ignore
         """G.graph.update({'foo': 'bar'})"""
 
         if not attrs:
@@ -173,7 +166,6 @@ def update(self, attrs: Any) -> None:
         self.data.update(graph_attr_dict_data)
         doc_update(self.db, self.graph_id, attrs)
 
-    @logger_debug
     def clear(self) -> None:
         """G.graph.clear()"""
         self.data.clear()
@@ -194,7 +186,6 @@ class GraphAttrDict(UserDict[str, Any]):
     :type graph_id: str
     """
 
-    @logger_debug
     def __init__(
         self,
         db: StandardDatabase,
@@ -219,7 +210,6 @@ def clear(self) -> None:
         raise NotImplementedError("Cannot clear GraphAttrDict")
 
     @key_is_string
-    @logger_debug
     def __contains__(self, key: str) -> bool:
         """'bar' in G.graph['foo']"""
         if key in self.data:
@@ -228,7 +218,6 @@ def __contains__(self, key: str) -> bool:
         return aql_doc_has_key(self.db, self.graph.name, key, self.parent_keys)
 
     @key_is_string
-    @logger_debug
     def __getitem__(self, key: str) -> Any:
         """G.graph['foo']['bar']"""
 
@@ -246,7 +235,6 @@ def __getitem__(self, key: str) -> Any:
         return graph_attr_dict_value
 
     @key_is_string
-    @logger_debug
     def __setitem__(self, key, value):
         """
         G.graph['foo'] = 'bar'
@@ -263,15 +251,13 @@ def __setitem__(self, key, value):
         doc_update(self.db, self.graph_id, update_dict)
 
     @key_is_string
-    @logger_debug
     def __delitem__(self, key):
         """del G.graph['foo']['bar']"""
         self.data.pop(key, None)
         update_dict = get_update_dict(self.parent_keys, {key: None})
         doc_update(self.db, self.graph_id, update_dict)
 
-    @logger_debug
-    def update(self, attrs: Any) -> None:
+    def update(self, attrs: Any) -> None:  # type: ignore
         """G.graph['foo'].update({'bar': 'baz'})"""
         if not attrs:
             return

nx_arangodb/classes/dict/node.py

@@ -28,7 +28,6 @@
     key_is_string,
     keys_are_not_reserved,
     keys_are_strings,
-    logger_debug,
     separate_nodes_by_collections,
     upsert_collection_documents,
     vertex_get,
@@ -97,7 +96,6 @@ class NodeAttrDict(UserDict[str, Any]):
     :type graph: Graph
     """
 
-    @logger_debug
     def __init__(self, db: StandardDatabase, graph: Graph, *args: Any, **kwargs: Any):
         super().__init__(*args, **kwargs)
         self.data: dict[str, Any] = {}
@@ -116,11 +114,9 @@ def clear(self) -> None:
         raise NotImplementedError("Cannot clear NodeAttrDict")
 
     def copy(self) -> Any:
-        # TODO: REVISIT THIS
         return self.data.copy()
 
     @key_is_string
-    @logger_debug
     def __contains__(self, key: str) -> bool:
         """'foo' in G._node['node/1']"""
         if key in self.data:
@@ -131,7 +127,6 @@ def __contains__(self, key: str) -> bool:
         return result
 
     @key_is_string
-    @logger_debug
     def __getitem__(self, key: str) -> Any:
         """G._node['node/1']['foo']"""
         if key in self.data:
@@ -151,7 +146,6 @@ def __getitem__(self, key: str) -> Any:
     @key_is_string
     @key_is_not_reserved
     # @value_is_json_serializable # TODO?
-    @logger_debug
     def __setitem__(self, key: str, value: Any) -> None:
         """
         G._node['node/1']['foo'] = 'bar'
@@ -170,7 +164,6 @@ def __setitem__(self, key: str, value: Any) -> None:
 
     @key_is_string
     @key_is_not_reserved
-    @logger_debug
     def __delitem__(self, key: str) -> None:
         """del G._node['node/1']['foo']"""
         assert self.node_id
@@ -181,7 +174,6 @@ def __delitem__(self, key: str) -> None:
     @keys_are_strings
     @keys_are_not_reserved
     # @values_are_json_serializable # TODO?
-    @logger_debug
     def update(self, attrs: Any) -> None:
         """G._node['node/1'].update({'foo': 'bar'})"""
         if not attrs:
@@ -213,7 +205,6 @@ class NodeDict(UserDict[str, NodeAttrDict]):
     :type default_node_type: str
     """
 
-    @logger_debug
     def __init__(
         self,
         db: StandardDatabase,
@@ -250,7 +241,6 @@ def __str__(self) -> str:
         return self.__repr__()
 
     @key_is_string
-    @logger_debug
     def __contains__(self, key: str) -> bool:
         """'node/1' in G._node"""
         node_id = get_node_id(key, self.default_node_type)
@@ -270,7 +260,6 @@ def __contains__(self, key: str) -> bool:
         return False
 
     @key_is_string
-    @logger_debug
     def __getitem__(self, key: str) -> NodeAttrDict:
         """G._node['node/1']"""
         node_id = get_node_id(key, self.default_node_type)
@@ -290,7 +279,6 @@ def __getitem__(self, key: str) -> NodeAttrDict:
         raise KeyError(key)
 
     @key_is_string
-    @logger_debug
     def __setitem__(self, key: str, value: NodeAttrDict) -> None:
         """G._node['node/1'] = {'foo': 'bar'}
 
@@ -308,7 +296,6 @@ def __setitem__(self, key: str, value: NodeAttrDict) -> None:
         self.data[node_id] = node_attr_dict
 
     @key_is_string
-    @logger_debug
     def __delitem__(self, key: str) -> None:
         """del g._node['node/1']"""
         node_id = get_node_id(key, self.default_node_type)
@@ -336,7 +323,6 @@ def __delitem__(self, key: str) -> None:
 
         self.data.pop(node_id, None)
 
-    @logger_debug
     def __len__(self) -> int:
         """len(g._node)"""
         return sum(
@@ -346,15 +332,13 @@ def __len__(self) -> int:
             ]
         )
 
-    @logger_debug
     def __iter__(self) -> Iterator[str]:
         """for k in g._node"""
         if not (self.FETCHED_ALL_IDS or self.FETCHED_ALL_DATA):
             self._fetch_all()
 
         yield from self.data.keys()
 
-    @logger_debug
     def keys(self) -> Any:
         """g._node.keys()"""
         if self.FETCHED_ALL_IDS:
@@ -368,15 +352,20 @@ def keys(self) -> Any:
                     self.data[node_id] = empty_node_attr_dict
                     yield node_id
 
-    @logger_debug
     def clear(self) -> None:
         """g._node.clear()"""
         self.data.clear()
         self.FETCHED_ALL_DATA = False
         self.FETCHED_ALL_IDS = False
 
+    def copy(self) -> Any:
+        """g._node.copy()"""
+        if not self.FETCHED_ALL_DATA:
+            self._fetch_all()
+
+        return {key: value.copy() for key, value in self.data.items()}
+
     @keys_are_strings
-    @logger_debug
     def __update_local_nodes(self, nodes: Any) -> None:
         for node_id, node_data in nodes.items():
             node_attr_dict = self.node_attr_dict_factory()
@@ -386,7 +375,6 @@ def __update_local_nodes(self, nodes: Any) -> None:
             self.data[node_id] = node_attr_dict
 
     @keys_are_strings
-    @logger_debug
     def update(self, nodes: Any) -> None:
         """g._node.update({'node/1': {'foo': 'bar'}, 'node/2': {'baz': 'qux'}})"""
         separated_by_collection = separate_nodes_by_collections(
@@ -414,15 +402,13 @@ def update(self, nodes: Any) -> None:
             logger.warning(m)
             raise ArangoDBBatchError(errors)
 
-    @logger_debug
     def values(self) -> Any:
         """g._node.values()"""
         if not self.FETCHED_ALL_DATA:
             self._fetch_all()
 
         yield from self.data.values()
 
-    @logger_debug
     def items(self, data: str | None = None, default: Any | None = None) -> Any:
         """g._node.items() or G._node.items(data='foo')"""
         if data is None:
@@ -434,7 +420,6 @@ def items(self, data: str | None = None, default: Any | None = None) -> Any:
             v_cols = list(self.graph.vertex_collections())
             yield from aql_fetch_data(self.db, v_cols, data, default)
 
-    @logger_debug
     def _fetch_all(self):
         self.clear()
 

nx_arangodb/classes/digraph.py

@@ -64,6 +64,14 @@ def __init__(
             self.clear_edges = self.clear_edges_override
             self.add_node = self.add_node_override
             self.remove_node = self.remove_node_override
+            self.reverse = self.reverse_override
+
+        if (
+            not self.is_multigraph()
+            and incoming_graph_data is not None
+            and not self._loaded_incoming_graph_data
+        ):
+            nx.convert.to_networkx_graph(incoming_graph_data, create_using=self)
 
     #######################
     # nx.DiGraph Overides #
@@ -79,6 +87,12 @@ def __init__(
     # def out_edges(self):
     # pass
 
+    def reverse_override(self, copy: bool = True) -> Any:
+        if copy is False:
+            raise NotImplementedError("In-place reverse is not supported yet.")
+
+        return super().reverse(copy=True)
+
     def clear_edges_override(self):
         logger.info("Note that clearing edges ony erases the edges in the local cache")
         for predecessor_dict in self._pred.data.values():

nx_arangodb/classes/function.py

@@ -5,6 +5,7 @@
 
 from __future__ import annotations
 
+from collections import UserDict
 from typing import Any, Callable, Generator, Optional, Tuple
 
 import networkx as nx
@@ -194,11 +195,11 @@ def wrapper(self: Any, key: Any, *args: Any, **kwargs: Any) -> Any:
         """"""
         if isinstance(key, str):
             if key != "-1" and "/" not in key:
-                raise ValueError(f"{key} is not an ArangoDB ID.")
+                raise KeyError(f"{key} is not an ArangoDB ID.")
 
         elif isinstance(key, int):
             m = "Edge order is not guaranteed when using int as an edge key. It may raise a KeyError. Use at your own risk."  # noqa
-            logger.warning(m)
+            logger.debug(m)
 
         else:
             raise TypeError(f"{key} is not an ArangoDB Edge _id or integer.")
@@ -208,16 +209,6 @@ def wrapper(self: Any, key: Any, *args: Any, **kwargs: Any) -> Any:
     return wrapper
 
 
-def logger_debug(func: Callable[..., Any]) -> Any:
-    """Decorator to log debug messages."""
-
-    def wrapper(self: Any, *args: Any, **kwargs: Any) -> Any:
-        logger.debug(f"{type(self)}.{func.__name__} - {args} - {kwargs}")
-        return func(self, *args, **kwargs)
-
-    return wrapper
-
-
 def keys_are_strings(func: Callable[..., Any]) -> Any:
     """Decorator to check if the keys are strings."""
 
@@ -447,10 +438,10 @@ def aql_edge_count_src(
     direction: str,
 ) -> int:
     query = f"""
-        RETURN LENGTH(
-            FOR v, e IN 1..1 {direction} @src_node_id GRAPH @graph_name
-                RETURN DISTINCT e._id
-        )
+        FOR v, e IN 1..1 {direction} @src_node_id GRAPH @graph_name
+            COLLECT id = e._id
+            COLLECT WITH COUNT INTO num
+            RETURN num
     """
 
     bind_vars = {
@@ -475,8 +466,9 @@ def aql_edge_count_src_dst(
     query = f"""
         FOR v, e IN 1..1 {direction} @src_node_id GRAPH @graph_name
             FILTER {filter_clause}
-            COLLECT WITH COUNT INTO length
-            RETURN length
+            COLLECT id = e._id
+            COLLECT WITH COUNT INTO num
+            RETURN num
     """
 
     bind_vars = {