Graphinate 0.2.16__tar.gz → 0.2.18__tar.gz

{graphinate-0.2.16 → graphinate-0.2.18}/.github/workflows/publish-docs.yaml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.x
       - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV

{graphinate-0.2.16 → graphinate-0.2.18}/.github/workflows/publish.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
     - name: Install dependencies

{graphinate-0.2.16 → graphinate-0.2.18}/.github/workflows/test-beta.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies

{graphinate-0.2.16 → graphinate-0.2.18}/.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -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.16 → graphinate-0.2.18}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: Graphinate
-Version: 0.2.16
+Version: 0.2.18
 Summary: Graphinate. Data to Graphs.
 Project-URL: Homepage, https://erivlis.github.io/graphinate
 Project-URL: Documentation, https://erivlis.github.io/graphinate
@@ -32,10 +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.219.2
-Provides-Extra: dbs
-Requires-Dist: neo4j>=5.17.0; extra == 'dbs'
-Requires-Dist: pydgraph>=23.0.2; extra == 'dbs'
+Requires-Dist: strawberry-graphql[asgi,opentelemetry]==0.221.1
 Provides-Extra: dev
 Requires-Dist: pipdeptree; extra == 'dev'
 Requires-Dist: ruff; extra == 'dev'
@@ -51,14 +48,14 @@ 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.4; extra == 'test'
+Requires-Dist: pytest-asyncio>=0.23.5; extra == 'test'
 Requires-Dist: pytest-cov>=4.1.0; extra == 'test'
 Requires-Dist: pytest-randomly>=3.15.0; extra == 'test'
 Requires-Dist: pytest-xdist>=3.5.0; extra == 'test'
-Requires-Dist: pytest>=7.4.4; extra == 'test'
+Requires-Dist: pytest>=8.1.1; extra == 'test'
 Description-Content-Type: text/markdown
 
 # [Graphinate. Data to Graphs.](https://erivlis.github.io/graphinate/)
@@ -78,15 +75,16 @@ Description-Content-Type: text/markdown
       <img alt="GitHub repo size" src="https://img.shields.io/github/repo-size/erivlis/graphinate">
       <img alt="GitHub last commit (by committer)" src="https://img.shields.io/github/last-commit/erivlis/graphinate">
       <a href="https://github.com/erivlis/graphinate/graphs/contributors"><img alt="Contributors" src="https://img.shields.io/github/contributors/erivlis/graphinate.svg"></a>
- 	    <img alt="GitHub Watchers" src="https://img.shields.io/github/watchers/erivlis/graphinate.svg">
     </td>
   </tr>
   <tr>
     <td>Tools</td>
     <td>
-      <img alt="Static Badge" src="https://img.shields.io/badge/PyCharm-21D789.svg?logo=PyCharm&logoColor=black&labelColor=21D789&color=FCF84A">
+      <a href="https://www.jetbrains.com/pycharm/"><img alt="PyCharm" src="https://img.shields.io/badge/PyCharm-FCF84A.svg?logo=PyCharm&logoColor=black&labelColor=21D789&color=FCF84A"></a>
       <a href="https://github.com/astral-sh/ruff"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json" alt="Ruff" style="max-width:100%;"></a>
-      <a href="https://github.com/astral-sh/uv"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/uv/main/assets/badge/v0.json" alt="Ruff" style="max-width:100%;"></a>
+      <a href="https://github.com/astral-sh/uv"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/uv/main/assets/badge/v0.json" alt="uv" style="max-width:100%;"></a>
+      <a href="https://squidfunk.github.io/mkdocs-material/"><img src="https://img.shields.io/badge/Material_for_MkDocs-526CFE?&logo=MaterialForMkDocs&logoColor=white&labelColor=grey"></a>
+      <a href="https://github.com/tox-dev/pipdeptree"><img src="https://img.shields.io/badge/pipdeptree-526CFE.svg?labelColor=gray&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADFElEQVR4nFxTW2tcVRRe39773E/mliZjwKRmhBaKt4BWRKmGgihCH3xUKNWC/Q/ii76IP8AHpSIiRfqmD5YKCinalhgiCMZLSVtMM0mTdDLTuZyZc9l7yTlp7WXBgXPW+fa31rfWtxU9FLMN79Crr028e+iJsZfb7fJMp23xRlOvbTR3L/y5cuOL3Vbv7/vxuPviecI/eWr6k/mj4+8AkM11y+zs2MKwMJvNgIgYINZX/rlx+tIvf72fZXr4P0EQyOCjjw98P9vwn8+/+z3Bq6sek7AJkNhsOjQcyjvFmHd2upd+PP/zsSxNI5mnPvjw8U9fPFJ9XVkgNuDVayEbcgVEfgikNfFg4JAmh1LyyfGq06QqE9vN6+fEs4fHnjv25vjbAOA4AsL2MVZ1hRcI4QXIH7ilMqQXkiYXRBJRbFNQnTsRlqfmxFvH66ccFyAQMxP3I5cqNZBSxIWcKORMO9g3yeSHzFkGbnVCIkDUZ+beEy+8VJ4XguC6TMPYokwrCAHUJsBxYptoFBYSMi0oLIlcAkuFYhal8Zl5VanZU0zErgfurufMFjEkWZ7iRFY4SlgYfW9bUIJKFQNjiNPYf1QZOZn/hTaStPQKTI4eDCxSjsL4I6BeJzOjgcnT0HqPqwBJCdHZjW/miWjkkG3hzqKIe5FVlM3llGuWqOxTDMBkWlJ/6PB2p0Sb21gXixdvLeTtDGOHLFvQHpkiYyTuNU5kuxJercTdpEK3Bz4yLdFrXVsQ33x1/bModjhvyrKKVXB/YD9gb8PgKAlolAZipmFTOIYcxq21Xz8XS5dbi+e+2zqbA3MjxYninH3PpkyZljwYjZE2FoxBIWm6YVHaW/k66qwtF05curz509OHHzvqBqWp232fE+2AoCjOXNMfhcRcjAxxoijNFNpbG0vL588cNzpLC4I00cnCD1fPBuVqffbA5DMGNjR5MOSBpC+UYxGE5G5PmNXff/vy4rdnTmRJHD1wG+9G42D9qVfeePLk/oONI8qv7+/2fbq11f53ZfnqhStLi6d3b67/cT/+vwAAAP//Xo5dwOtdLi4AAAAASUVORK5CYII="></a>
     </td>
   </tr>
   <tr>

{graphinate-0.2.16 → graphinate-0.2.18}/README.md

@@ -15,15 +15,16 @@
       <img alt="GitHub repo size" src="https://img.shields.io/github/repo-size/erivlis/graphinate">
       <img alt="GitHub last commit (by committer)" src="https://img.shields.io/github/last-commit/erivlis/graphinate">
       <a href="https://github.com/erivlis/graphinate/graphs/contributors"><img alt="Contributors" src="https://img.shields.io/github/contributors/erivlis/graphinate.svg"></a>
- 	    <img alt="GitHub Watchers" src="https://img.shields.io/github/watchers/erivlis/graphinate.svg">
     </td>
   </tr>
   <tr>
     <td>Tools</td>
     <td>
-      <img alt="Static Badge" src="https://img.shields.io/badge/PyCharm-21D789.svg?logo=PyCharm&logoColor=black&labelColor=21D789&color=FCF84A">
+      <a href="https://www.jetbrains.com/pycharm/"><img alt="PyCharm" src="https://img.shields.io/badge/PyCharm-FCF84A.svg?logo=PyCharm&logoColor=black&labelColor=21D789&color=FCF84A"></a>
       <a href="https://github.com/astral-sh/ruff"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json" alt="Ruff" style="max-width:100%;"></a>
-      <a href="https://github.com/astral-sh/uv"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/uv/main/assets/badge/v0.json" alt="Ruff" style="max-width:100%;"></a>
+      <a href="https://github.com/astral-sh/uv"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/uv/main/assets/badge/v0.json" alt="uv" style="max-width:100%;"></a>
+      <a href="https://squidfunk.github.io/mkdocs-material/"><img src="https://img.shields.io/badge/Material_for_MkDocs-526CFE?&logo=MaterialForMkDocs&logoColor=white&labelColor=grey"></a>
+      <a href="https://github.com/tox-dev/pipdeptree"><img src="https://img.shields.io/badge/pipdeptree-526CFE.svg?labelColor=gray&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADFElEQVR4nFxTW2tcVRRe39773E/mliZjwKRmhBaKt4BWRKmGgihCH3xUKNWC/Q/ii76IP8AHpSIiRfqmD5YKCinalhgiCMZLSVtMM0mTdDLTuZyZc9l7yTlp7WXBgXPW+fa31rfWtxU9FLMN79Crr028e+iJsZfb7fJMp23xRlOvbTR3L/y5cuOL3Vbv7/vxuPviecI/eWr6k/mj4+8AkM11y+zs2MKwMJvNgIgYINZX/rlx+tIvf72fZXr4P0EQyOCjjw98P9vwn8+/+z3Bq6sek7AJkNhsOjQcyjvFmHd2upd+PP/zsSxNI5mnPvjw8U9fPFJ9XVkgNuDVayEbcgVEfgikNfFg4JAmh1LyyfGq06QqE9vN6+fEs4fHnjv25vjbAOA4AsL2MVZ1hRcI4QXIH7ilMqQXkiYXRBJRbFNQnTsRlqfmxFvH66ccFyAQMxP3I5cqNZBSxIWcKORMO9g3yeSHzFkGbnVCIkDUZ+beEy+8VJ4XguC6TMPYokwrCAHUJsBxYptoFBYSMi0oLIlcAkuFYhal8Zl5VanZU0zErgfurufMFjEkWZ7iRFY4SlgYfW9bUIJKFQNjiNPYf1QZOZn/hTaStPQKTI4eDCxSjsL4I6BeJzOjgcnT0HqPqwBJCdHZjW/miWjkkG3hzqKIe5FVlM3llGuWqOxTDMBkWlJ/6PB2p0Sb21gXixdvLeTtDGOHLFvQHpkiYyTuNU5kuxJercTdpEK3Bz4yLdFrXVsQ33x1/bModjhvyrKKVXB/YD9gb8PgKAlolAZipmFTOIYcxq21Xz8XS5dbi+e+2zqbA3MjxYninH3PpkyZljwYjZE2FoxBIWm6YVHaW/k66qwtF05curz509OHHzvqBqWp232fE+2AoCjOXNMfhcRcjAxxoijNFNpbG0vL588cNzpLC4I00cnCD1fPBuVqffbA5DMGNjR5MOSBpC+UYxGE5G5PmNXff/vy4rdnTmRJHD1wG+9G42D9qVfeePLk/oONI8qv7+/2fbq11f53ZfnqhStLi6d3b67/cT/+vwAAAP//Xo5dwOtdLi4AAAAASUVORK5CYII="></a>
     </td>
   </tr>
   <tr>

{graphinate-0.2.16 → graphinate-0.2.18}/docs/index.md

@@ -17,15 +17,16 @@
  	    <img alt="GitHub Watchers" src="https://img.shields.io/github/watchers/erivlis/graphinate.svg">
     </td>
   </tr>
-  <tr>
+  <tr  style="vertical-align: middle; border-width: 0;">
     <td>Tools</td>
     <td>
-      <img alt="Static Badge" src="https://img.shields.io/badge/PyCharm-21D789.svg?logo=PyCharm&logoColor=black&labelColor=21D789&color=FCF84A">
+      <a href="https://www.jetbrains.com/pycharm/"><img alt="PyCharm" src="https://img.shields.io/badge/PyCharm-FCF84A.svg?logo=PyCharm&logoColor=black&labelColor=21D789&color=FCF84A"></a>
       <a href="https://github.com/astral-sh/ruff"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json" alt="Ruff" style="max-width:100%;"></a>
-      <a href="https://github.com/astral-sh/uv"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/uv/main/assets/badge/v0.json" alt="Ruff" style="max-width:100%;"></a>
+      <a href="https://github.com/astral-sh/uv"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/uv/main/assets/badge/v0.json" alt="uv" style="max-width:100%;"></a>
+      <a href="https://github.com/tox-dev/pipdeptree"><img src="https://img.shields.io/badge/pipdeptree-526CFE.svg?labelColor=gray&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADFElEQVR4nFxTW2tcVRRe39773E/mliZjwKRmhBaKt4BWRKmGgihCH3xUKNWC/Q/ii76IP8AHpSIiRfqmD5YKCinalhgiCMZLSVtMM0mTdDLTuZyZc9l7yTlp7WXBgXPW+fa31rfWtxU9FLMN79Crr028e+iJsZfb7fJMp23xRlOvbTR3L/y5cuOL3Vbv7/vxuPviecI/eWr6k/mj4+8AkM11y+zs2MKwMJvNgIgYINZX/rlx+tIvf72fZXr4P0EQyOCjjw98P9vwn8+/+z3Bq6sek7AJkNhsOjQcyjvFmHd2upd+PP/zsSxNI5mnPvjw8U9fPFJ9XVkgNuDVayEbcgVEfgikNfFg4JAmh1LyyfGq06QqE9vN6+fEs4fHnjv25vjbAOA4AsL2MVZ1hRcI4QXIH7ilMqQXkiYXRBJRbFNQnTsRlqfmxFvH66ccFyAQMxP3I5cqNZBSxIWcKORMO9g3yeSHzFkGbnVCIkDUZ+beEy+8VJ4XguC6TMPYokwrCAHUJsBxYptoFBYSMi0oLIlcAkuFYhal8Zl5VanZU0zErgfurufMFjEkWZ7iRFY4SlgYfW9bUIJKFQNjiNPYf1QZOZn/hTaStPQKTI4eDCxSjsL4I6BeJzOjgcnT0HqPqwBJCdHZjW/miWjkkG3hzqKIe5FVlM3llGuWqOxTDMBkWlJ/6PB2p0Sb21gXixdvLeTtDGOHLFvQHpkiYyTuNU5kuxJercTdpEK3Bz4yLdFrXVsQ33x1/bModjhvyrKKVXB/YD9gb8PgKAlolAZipmFTOIYcxq21Xz8XS5dbi+e+2zqbA3MjxYninH3PpkyZljwYjZE2FoxBIWm6YVHaW/k66qwtF05curz509OHHzvqBqWp232fE+2AoCjOXNMfhcRcjAxxoijNFNpbG0vL588cNzpLC4I00cnCD1fPBuVqffbA5DMGNjR5MOSBpC+UYxGE5G5PmNXff/vy4rdnTmRJHD1wG+9G42D9qVfeePLk/oONI8qv7+/2fbq11f53ZfnqhStLi6d3b67/cT/+vwAAAP//Xo5dwOtdLi4AAAAASUVORK5CYII="></a>
     </td>
   </tr>
-  <tr>
+  <tr style="vertical-align: middle; border-width: 0;">
     <td>CI/CD</td>
     <td>
       <a href="https://github.com/erivlis/graphinate/actions/workflows/test.yml"><img alt="Tests" src="https://github.com/erivlis/graphinate/actions/workflows/test.yml/badge.svg?branch=master"></a>
@@ -33,7 +34,7 @@
       <a href="https://github.com/erivlis/graphinate/actions/workflows/publish-docs.yaml"><img alt="Publish Docs" src="https://github.com/erivlis/graphinate/actions/workflows/publish-docs.yaml/badge.svg"></a>
     </td>
   </tr>
-  <tr>
+  <tr style="vertical-align: middle; border-width: 0;">
     <td>Scans</td>
     <td>
       <a href="https://codecov.io/gh/erivlis/graphinate"><img alt="Coverage" src="https://codecov.io/gh/erivlis/graphinate/graph/badge.svg?token=POODT8M9NV"/></a>

{graphinate-0.2.16 → graphinate-0.2.18}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "Graphinate"
-version = "0.2.16"
+version = "0.2.18"
 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.219.2"
+    "strawberry-graphql[asgi,opentelemetry]==0.221.1"
 ]
 
 
@@ -60,22 +60,18 @@ docs = [
 ]
 test = [
     "faker>=23.2.1",
-    "pytest>=7.4.4",
-    "pytest-asyncio>=0.23.4",
+    "pytest>=8.1.1",
+    "pytest-asyncio>=0.23.5",
     "pytest-cov>=4.1.0",
     "pytest-randomly>=3.15.0",
     "pytest-xdist>=3.5.0"
 ]
-dbs = [
-    "pydgraph>=23.0.2",
-    "neo4j>=5.17.0"
-]
 plot = [
     "scipy>=1.12.0"
 ]
 server = [
     "starlette-prometheus",
-    "uvicorn[standard]>=0.27.0"
+    "uvicorn[standard]>=0.29.0"
 ]
 
 

{graphinate-0.2.16 → graphinate-0.2.18}/src/graphinate/builders.py

@@ -26,12 +26,14 @@ 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 = ' ∋ '
 DEFAULT_EDGE_DELIMITER = ' ↔ '
 
+GraphRepresentation = Union[dict, nx.Graph, strawberry.Schema]
+
 
 def label_converter(value, delimiter: str):
     if value:
@@ -101,9 +103,6 @@ class GraphType(Enum):
     MultiGraph = nx.MultiGraph
 
 
-GraphRepresentation = Union[dict, nx.Graph, strawberry.Schema]
-
-
 class Builder(ABC):
     """Builder abstract base class"""
 
@@ -146,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}
@@ -198,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,
@@ -206,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})
 
@@ -214,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
@@ -235,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):
 
@@ -295,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:
         """
@@ -394,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:
@@ -600,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.16 → graphinate-0.2.18}/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.16 → graphinate-0.2.18}/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.16 → graphinate-0.2.18}/src/graphinate/server/web/viewer/index.html

@@ -3,8 +3,8 @@
 <head>
     <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"
+    <script src="https://cdn.jsdelivr.net/npm/3d-force-graph@1.73.2/dist/3d-force-graph.min.js"
+            integrity="sha384-GvVjcMDlxnFkYfcqa18cpupB8NqHsk7/vla5sjyVcZ7Gjzc4fzSiQgCRB4zYFqCa"
             crossorigin="anonymous"></script>
     <script src="/static/scripts/murmurhash3_gc.js"
             integrity="sha384-qmbe8KG4+frUnGS6DOKYZgFKbBvbhNNOL/LZ4hSpKauxmgrTX3LALg5+oQJS4AOn"></script>

graphinate-0.2.18/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.16 → graphinate-0.2.18}/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):