Graphinate 0.2.17__tar.gz → 0.2.19__tar.gz

{graphinate-0.2.17 → graphinate-0.2.19}/.github/workflows/test.yml

@@ -40,6 +40,6 @@ jobs:
           python -m pip install faker pytest pytest-asyncio pytest-cov pytest-randomly pytest-xdist starlette-prometheus uvicorn[standard]
           pytest tests --cov=src --cov-branch --cov-report=xml --junitxml=test_results.xml -n auto
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v3
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}

{graphinate-0.2.17 → graphinate-0.2.19}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: Graphinate
-Version: 0.2.17
+Version: 0.2.19
 Summary: Graphinate. Data to Graphs.
 Project-URL: Homepage, https://erivlis.github.io/graphinate
 Project-URL: Documentation, https://erivlis.github.io/graphinate
@@ -32,7 +32,7 @@ Requires-Dist: inflect==7.0.0
 Requires-Dist: loguru==0.7.2
 Requires-Dist: matplotlib==3.8.3
 Requires-Dist: networkx==3.2.1
-Requires-Dist: strawberry-graphql[asgi,opentelemetry]==0.220.0
+Requires-Dist: strawberry-graphql[asgi,opentelemetry]==0.221.1
 Provides-Extra: dev
 Requires-Dist: pipdeptree; extra == 'dev'
 Requires-Dist: ruff; extra == 'dev'
@@ -48,7 +48,7 @@ Provides-Extra: plot
 Requires-Dist: scipy>=1.12.0; extra == 'plot'
 Provides-Extra: server
 Requires-Dist: starlette-prometheus; extra == 'server'
-Requires-Dist: uvicorn[standard]>=0.27.0; extra == 'server'
+Requires-Dist: uvicorn[standard]>=0.29.0; extra == 'server'
 Provides-Extra: test
 Requires-Dist: faker>=23.2.1; extra == 'test'
 Requires-Dist: pytest-asyncio>=0.23.5; extra == 'test'

graphinate-0.2.19/docs/examples/system.md

@@ -0,0 +1,15 @@
+# System
+
+## Processes
+
+=== "Processes"
+
+    ``` python title="examples/system/processes.py" linenums="1"
+    --8<-- "examples/system/processes.py"
+    ```
+
+=== "Dependencies"
+
+    ``` text title="examples/system/requirements.txt" linenums="1"
+    --8<-- "examples/system/requirements.txt"
+    ```

graphinate-0.2.19/examples/code/requirements.txt

@@ -0,0 +1 @@
+pipdeptree>=2.13.0

graphinate-0.2.19/examples/system/processes.py

@@ -0,0 +1,64 @@
+import operator
+from collections.abc import Iterable
+
+import networkx as nx
+import psutil
+
+import graphinate
+
+
+def processes_graph_model():
+    graph_model = graphinate.model("Processes Graph")
+
+    def processes() -> Iterable[psutil.Process]:
+        for pid in psutil.pids():
+            if psutil.pid_exists(pid):
+                yield psutil.Process(pid)
+
+    processes_list = [{'pid': p.pid, 'name': p.name(), 'parent_pid': p.parent().pid if p.parent() else None} for p in
+                      processes()]
+
+    @graph_model.node(key=operator.itemgetter('pid'), label=operator.itemgetter('name'))
+    def process():
+        yield from processes_list
+
+    @graph_model.edge()
+    def edge():
+        for p in processes_list:
+            parent_pid = p.get('parent_pid')
+            if parent_pid:
+                yield {'source': p.get('pid'), 'target': parent_pid}
+
+    return graph_model
+
+
+model = processes_graph_model()
+
+if __name__ == '__main__':
+    use_materialize = True
+
+    if use_materialize:
+        # Materialize the GraphModel
+        graphinate.materialize(
+            model,
+            builder=graphinate.builders.GraphQLBuilder,
+            actualizer=graphinate.graphql
+        )
+
+    else:
+        # Or
+
+        # 1. Define Graph Builder
+        builder = graphinate.builders.NetworkxBuilder(model=model)
+
+        # Then
+        # 2. Build the Graph object
+        graph: nx.Graph = builder.build()
+
+        # Then
+        # 3. Option A - Output to console
+        print(graph)
+
+        # Or
+        # 3. Option B - Output as a plot
+        graphinate.materializers.plot(graph)

graphinate-0.2.19/examples/system/requirements.txt

@@ -0,0 +1 @@
+psutil>=5.9.8

{graphinate-0.2.17 → graphinate-0.2.19}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "Graphinate"
-version = "0.2.17"
+version = "0.2.19"
 authors = [
     { name = "Eran Rivlis", email = "eran@rivlis.info" },
 ]
@@ -33,7 +33,7 @@ dependencies = [
     "loguru==0.7.2",
     "matplotlib==3.8.3",
     "networkx==3.2.1",
-    "strawberry-graphql[asgi,opentelemetry]==0.220.0"
+    "strawberry-graphql[asgi,opentelemetry]==0.221.1"
 ]
 
 
@@ -71,7 +71,7 @@ plot = [
 ]
 server = [
     "starlette-prometheus",
-    "uvicorn[standard]>=0.27.0"
+    "uvicorn[standard]>=0.29.0"
 ]
 
 

{graphinate-0.2.17 → graphinate-0.2.19}/src/graphinate/builders.py

@@ -26,7 +26,7 @@ from strawberry.extensions import ParserCache, QueryDepthLimiter, ValidationCach
 
 from . import color
 from .modeling import UNIVERSE_NODE, GraphModel
-from .tools import converters, mutators
+from .tools import converters, mutators, utcnow
 from .typing import NodeTypeAbsoluteId
 
 DEFAULT_NODE_DELIMITER = ' ∋ '
@@ -145,9 +145,9 @@ class NetworkxBuilder(Builder):
         super().__init__(model, graph_type)
 
     def _initialize_graph(self):
-        self._graph = self.graph_type.value(name=self.model.name,
-                                            node_types=Counter(),
-                                            edge_types=Counter())
+        self._graph: nx.Graph = self.graph_type.value(name=self.model.name,
+                                                      node_types=Counter(),
+                                                      edge_types=Counter())
 
     def _graph_edges(self, data, default=None):
         params = {'data': data, 'default': default}
@@ -197,7 +197,7 @@ class NetworkxBuilder(Builder):
             if node_id in self._graph:
                 self._graph.nodes[node_id]['value'].append(node.value)
                 self._graph.nodes[node_id]['magnitude'] += 1
-                self._graph.nodes[node_id]['updated'] = datetime.utcnow()
+                self._graph.nodes[node_id]['updated'] = utcnow()
             else:
                 self._graph.add_node(node_id,
                                      label=label,
@@ -205,7 +205,7 @@ class NetworkxBuilder(Builder):
                                      value=[node.value],
                                      magnitude=1,
                                      lineage=list(node_lineage),
-                                     created=datetime.utcnow())
+                                     created=utcnow())
 
                 self._graph.graph['node_types'].update({node_type: 1})
 
@@ -213,7 +213,7 @@ class NetworkxBuilder(Builder):
                 logger.debug("Adding edge from: '{}' to '{}'", parent_node_id, node_id)
                 self._graph.add_edge(parent_node_id,
                                      node_id,
-                                     created=datetime.utcnow())
+                                     created=utcnow())
 
             new_kwargs = kwargs.copy()
             new_kwargs[f"{node_type}_id"] = node.key
@@ -234,12 +234,12 @@ class NetworkxBuilder(Builder):
                                              type=edge_type,
                                              value=[edge.value],
                                              weight=edge_weight,
-                                             created=datetime.utcnow())
+                                             created=utcnow())
                         self._graph.graph['edge_types'].update({edge_type: 1})
                     else:
                         self._graph.edges[edge_id]['value'].append(edge.value)
                         self._graph.edges[edge_id]['weight'] += edge_weight
-                        self._graph.edges[edge_id]['updated'] = datetime.utcnow()
+                        self._graph.edges[edge_id]['updated'] = utcnow()
 
     def _rectify_node_attributes(self, **defaults):
 
@@ -294,7 +294,7 @@ class NetworkxBuilder(Builder):
             counter = self._graph.graph[counter_name]
             self._graph.graph[counter_name] = mutators.dictify(counter)
 
-        self._graph.graph['created'] = datetime.utcnow()
+        self._graph.graph['created'] = utcnow()
 
     def build(self, **kwargs) -> GraphRepresentation:
         """
@@ -393,27 +393,60 @@ class GraphQLBuilder(NetworkxBuilder):
 
     @strawberry.type
     class Graph:
-        graph: strawberry.Private[nx.Graph]
-
-        name: str
-        created: datetime
-        hash: str
-        node_type_counts: list['GraphQLBuilder.Measure']
-        edge_type_counts: list['GraphQLBuilder.Measure']
-        node_count: int
-        edge_count: int
-        order: int
-        size: int
-        # girth: int
-        average_degree: float
+        nx_graph: strawberry.Private[nx.Graph]
 
         @strawberry.field()
         def radius(self) -> 'GraphQLBuilder.InfNumber':
-            return nx.radius(self.graph) if nx.is_connected(self.graph) else math.inf
+            return nx.radius(self.nx_graph) if nx.is_connected(self.nx_graph) else math.inf
 
         @strawberry.field()
         def diameter(self) -> 'GraphQLBuilder.InfNumber':
-            return nx.diameter(self.graph) if nx.is_connected(self.graph) else math.inf
+            return nx.diameter(self.nx_graph) if nx.is_connected(self.nx_graph) else math.inf
+
+        @strawberry.field()
+        def name(self) -> str:
+            return self.nx_graph.graph['name']
+
+        @strawberry.field()
+        def node_type_counts(self) -> list['GraphQLBuilder.Measure']:
+            return [GraphQLBuilder.Measure(name=t, value=c) for t, c in self.nx_graph.graph['node_types'].items()]
+
+        @strawberry.field()
+        def edge_type_counts(self) -> list['GraphQLBuilder.Measure']:
+            return [GraphQLBuilder.Measure(name=t, value=c) for t, c in self.nx_graph.graph['edge_types'].items()]
+
+        @strawberry.field()
+        def node_count(self) -> int:
+            return self.nx_graph.number_of_nodes()
+
+        @strawberry.field()
+        def edge_count(self) -> int:
+            return self.nx_graph.number_of_edges()
+
+        @strawberry.field()
+        def order(self) -> int:
+            return self.nx_graph.order()
+
+        @strawberry.field()
+        def size(self) -> int:
+            return self.nx_graph.size(weight='weight')
+
+        # @strawberry.field()
+        # def girth(self) -> int:
+        #     return min(len(cycle) for cycle in nx.simple_cycles(self.graph))
+
+        @strawberry.field()
+        def average_degree(self) -> float:
+            return self.nx_graph.number_of_nodes() and (
+                    1.0 * sum(d for _, d in self.nx_graph.degree()) / self.nx_graph.number_of_nodes())
+
+        @strawberry.field()
+        def hash(self) -> str:
+            return nx.weisfeiler_lehman_graph_hash(self.nx_graph)
+
+        @strawberry.field()
+        def created(self) -> datetime:
+            return self.nx_graph.graph['created']
 
     @strawberry.enum(description="""
         See NetworkX documentation for explanations:
@@ -599,24 +632,7 @@ class GraphQLBuilder(NetworkxBuilder):
 
         # region - Defining GraphQL Query Class dict - graph field
         def graphql_graph(self) -> GraphQLBuilder.Graph:
-            graph = get_graph()
-            return GraphQLBuilder.Graph(
-                graph=graph,
-                name=graph.graph['name'],
-                node_type_counts=[GraphQLBuilder.Measure(name=t, value=c) for t, c in
-                                  graph.graph['node_types'].items()],
-                edge_type_counts=[GraphQLBuilder.Measure(name=t, value=c) for t, c in
-                                  graph.graph['edge_types'].items()],
-                node_count=graph.number_of_nodes(),
-                edge_count=graph.number_of_edges(),
-                order=graph.order(),
-                size=graph.size(weight='weight'),
-                # girth=min(len(cycle) for cycle in nx.simple_cycles(graph)),
-                average_degree=graph.number_of_nodes() and (
-                        1.0 * sum(d for _, d in graph.degree()) / graph.number_of_nodes()),
-                hash=nx.weisfeiler_lehman_graph_hash(graph),
-                created=graph.graph['created'],
-            )
+            return GraphQLBuilder.Graph(nx_graph=get_graph())
 
         self.add_field_resolver(query_class_dict, 'graph', graphql_graph)
 

{graphinate-0.2.17 → graphinate-0.2.19}/src/graphinate/server/web/elements/index.html

@@ -1,9 +1,10 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title>Graphinate OpenAPI Elements UI</title>
+
+    <title>Graphinate - OpanAPI Elements UI</title>
     <!-- Embed elements Elements via Web Component -->
     <script src="https://unpkg.com/@stoplight/elements/web-components.min.js"
             integrity="sha384-yR4p7dGVb43Z+zDGOg8xyIj71nVRZvN/IpUbptwjAtxcq+IcVQ+mNMiL7ppakjKc"></script>

{graphinate-0.2.17 → graphinate-0.2.19}/src/graphinate/server/web/graphiql/index.html

@@ -151,7 +151,7 @@
         });
       }
 
-      ReactDOM.createRenderRoot(
+      ReactDOM.render(
         React.createElement(GraphiQLWithExplorer),
         document.getElementById("graphiql")
       );

{graphinate-0.2.17 → graphinate-0.2.19}/src/graphinate/server/web/rapidoc/index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8"> <!-- Important: rapi-doc uses utf8 characters -->
     <script type="module" src="https://unpkg.com/rapidoc/dist/rapidoc-min.js"
             integrity="sha384-x8lk+1kqb32UOR4ETiOR+bpfZZtNri15JJdU7sXAKtHk2m9yMRVvITZcxS0ILJpC"></script>
-    <title>Graphinate OpenAPI RapiDoc UI</title>
+    <title>Graphinate - OpenAPI RapiDoc UI</title>
 </head>
 <body>
 <rapi-doc

{graphinate-0.2.17 → graphinate-0.2.19}/src/graphinate/server/web/viewer/index.html

@@ -4,8 +4,9 @@
     <title>Graphinate</title>
     <style> body { margin: 0; } </style>
     <script src="https://cdn.jsdelivr.net/npm/3d-force-graph@1.72.3/dist/3d-force-graph.min.js"
-            integrity="sha384-oGNXGez54SiNIIRSFWGVG0UJ9MIswOOsd/MbPZVNZFy+ykbIp1A7Ge5liZVo5oQK"
+            integrity="sha256-X4nSjPQnyc5QqQ88WM5oVzMx2KUKXj3hxRAvt2WxDRI="
             crossorigin="anonymous"></script>
+
     <script src="/static/scripts/murmurhash3_gc.js"
             integrity="sha384-qmbe8KG4+frUnGS6DOKYZgFKbBvbhNNOL/LZ4hSpKauxmgrTX3LALg5+oQJS4AOn"></script>
 </head>

graphinate-0.2.19/src/graphinate/tools/__init__.py

@@ -0,0 +1,5 @@
+from datetime import datetime, timezone
+
+
+def utcnow() -> datetime:
+    return datetime.now(timezone.utc)

{graphinate-0.2.17 → graphinate-0.2.19}/tests/graphinate/test_materializers.py

@@ -1,10 +1,11 @@
 import functools
 from unittest.mock import patch
 
-import graphinate
 import pytest
 from matplotlib import pyplot as plt
 
+import graphinate
+
 MODAL_RADIOBUTTON_CHOOSER = 'graphinate.materializers.modal_radiobutton_chooser'
 
 
@@ -33,6 +34,11 @@ def test_materialize_d3graph(map_graph_model, monkeypatch, capsys):
         assert captured.err == ""
 
 
+def valid_materialization(graph_model) -> bool:
+    graphinate.materialize(graph_model)
+    return True
+
+
 def test_materialize_graphql(map_graph_model, monkeypatch):
     with patch(MODAL_RADIOBUTTON_CHOOSER) as modal_radiobutton_chooser:
         import uvicorn
@@ -40,8 +46,8 @@ def test_materialize_graphql(map_graph_model, monkeypatch):
         modal_radiobutton_chooser.return_value = ('Test', graphinate.materializers.Materializers.GraphQL.value)
 
         *_, graph_model = map_graph_model
-        graphinate.materialize(graph_model)
-        assert True
+
+        assert valid_materialization(graph_model)
 
 
 networkx_materializers = [
@@ -49,7 +55,6 @@ networkx_materializers = [
     graphinate.materializers.Materializers.NetworkX_with_edge_labels.value,
     (graphinate.builders.NetworkxBuilder,
      functools.partial(graphinate.materializers.matplotlib.plot, with_node_labels=False))
-
 ]
 
 
@@ -60,8 +65,7 @@ def test_materialize_networkx(map_graph_model, materializer, monkeypatch):
         with patch('graphinate.materializers.modal_radiobutton_chooser') as modal_radiobutton_chooser:
             modal_radiobutton_chooser.return_value = ('Test', materializer)
             *_, graph_model = map_graph_model
-            graphinate.materialize(graph_model)
-            assert True
+            assert valid_materialization(graph_model)
 
 
 def test_materialize_none(map_graph_model, monkeypatch):

graphinate-0.2.17/examples/code/requirements.txt

@@ -1 +0,0 @@
-pipdeptree==2.13.0