cbrkit 0.18.2__tar.gz → 0.18.3__tar.gz

{cbrkit-0.18.2 → cbrkit-0.18.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cbrkit
-Version: 0.18.2
+Version: 0.18.3
 Summary: Customizable Case-Based Reasoning (CBR) toolkit for Python with a built-in API and CLI.
 Home-page: https://wi2trier.github.io/cbrkit/
 License: MIT

{cbrkit-0.18.2 → cbrkit-0.18.3}/cbrkit/sim/graphs/_model.py

@@ -147,11 +147,7 @@ try:
         )
         edges = immutables.Map(
             (edge_id, Edge(edge_id, nodes[source_id], nodes[target_id], edge_data))
-            for edge_id, (
-                source_id,
-                target_id,
-                edge_data,
-            ) in g.edge_index_map().items()
+            for edge_id, (source_id, target_id, edge_data) in g.edge_index_map().items()
         )
 
         return Graph(nodes, edges, g.attrs)
@@ -164,43 +160,44 @@ except ImportError:
 try:
     import networkx as nx
 
-    def to_networkx[N, E](g: Graph[Any, N, E, Any]) -> "nx.DiGraph":
+    def to_networkx(g: Graph) -> nx.DiGraph:
         ng = nx.DiGraph()
-        # Set graph attributes
-        ng.graph.update(g.data)
+        ng.graph = g.data
 
-        # Add nodes with their data
-        for node in g.nodes.values():
-            ng.add_node(node.key, data=node.data)
+        ng.add_nodes_from(
+            (
+                node.key,
+                (node.data if isinstance(node.data, Mapping) else {"data": node.data}),
+            )
+            for node in g.nodes
+        )
 
-        # Add edges with their data
-        for edge in g.edges.values():
-            ng.add_edge(edge.source.key, edge.target.key, key=edge.key, data=edge.data)
+        ng.add_edges_from(
+            (
+                edge.source.key,
+                edge.target.key,
+                (
+                    {**edge.data, "key": edge.key}
+                    if isinstance(edge.data, Mapping)
+                    else {"data": edge.data, "key": edge.key}
+                ),
+            )
+            for edge in g.edges.values()
+        )
 
         return ng
 
-    def from_networkx[N, E](g: "nx.DiGraph") -> Graph[Any, N, E, Any]:
-        # Create nodes
+    def from_networkx(g: nx.DiGraph) -> Graph:
         nodes = immutables.Map(
-            (node_id, Node(node_id, g.nodes[node_id].get("data")))
-            for node_id in g.nodes
+            (idx, Node(idx, data)) for idx, data in g.nodes(data=True)
         )
 
-        # Create edges
         edges = immutables.Map(
-            (
-                edge_data.get("key", idx),
-                Edge(
-                    edge_data.get("key", idx),
-                    nodes[source],
-                    nodes[target],
-                    edge_data.get("data"),
-                ),
-            )
-            for idx, (source, target, edge_data) in enumerate(g.edges(data=True))
+            (idx, Edge(idx, nodes[source_id], nodes[target_id], edge_data))
+            for idx, (source_id, target_id, edge_data) in enumerate(g.edges(data=True))
         )
 
-        return Graph(nodes, edges, dict(g.graph))
+        return Graph(nodes, edges, g.graph)
 
     __all__ += ["to_networkx", "from_networkx"]
 

{cbrkit-0.18.2 → cbrkit-0.18.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cbrkit"
-version = "0.18.2"
+version = "0.18.3"
 description = "Customizable Case-Based Reasoning (CBR) toolkit for Python with a built-in API and CLI."
 authors = ["Mirko Lenz <mirko@mirkolenz.com>"]
 license = "MIT"