Graphinate 0.5.1__tar.gz → 0.6.0__tar.gz

{graphinate-0.5.1 → graphinate-0.6.0}/.github/workflows/publish.yml

@@ -28,7 +28,7 @@ jobs:
     - name: Build package
       run: python -m build
     - name: Publish package
-      uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
+      uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc
       with:
         user: __token__
         password: ${{ secrets.PYPI_API_TOKEN }}

{graphinate-0.5.1 → graphinate-0.6.0}/.github/workflows/test.yml

@@ -40,7 +40,7 @@ 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@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
       - name: Run codacy-coverage-reporter

{graphinate-0.5.1 → graphinate-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Graphinate
-Version: 0.5.1
+Version: 0.6.0
 Summary: 𝔾raphinate. Data to Graphs.
 Project-URL: Homepage, https://erivlis.github.io/graphinate
 Project-URL: Documentation, https://erivlis.github.io/graphinate
@@ -221,6 +221,8 @@ Options:
 
 #### Server
 
+> TIP: requires the `server` extra to be installed. e.g., `pip install graphinate[server]`
+
 ```text
 Usage: python -m graphinate server [OPTIONS]
 

{graphinate-0.5.1 → graphinate-0.6.0}/README.md

@@ -179,6 +179,8 @@ Options:
 
 #### Server
 
+> TIP: requires the `server` extra to be installed. e.g., `pip install graphinate[server]`
+
 ```text
 Usage: python -m graphinate server [OPTIONS]
 

{graphinate-0.5.1 → graphinate-0.6.0}/docs/intro.md

@@ -15,21 +15,25 @@ In addition, there are several modes of output to enable examination of the Grap
 
 ### What is a Graph?
 
-“In a mathematician's terminology, a graph is a collection of points and lines connecting some (possibly empty) subset
-of them.
-The points of a graph are most commonly known as graph *vertices*, but may also be called *nodes* or *points*.
-Similarly, the lines connecting the vertices of a graph are most commonly known as graph *edges*, but may also
-be called *arcs* or *lines*.”
+!!! quote
 
-— [https://mathworld.wolfram.com/Graph.html](https://mathworld.wolfram.com/Graph.html)
+    “In a mathematician's terminology, a graph is a collection of points and lines connecting some (possibly empty) subset
+    of them.
+    The points of a graph are most commonly known as graph *vertices*, but may also be called *nodes* or *points*.
+    Similarly, the lines connecting the vertices of a graph are most commonly known as graph *edges*, but may also
+    be called *arcs* or *lines*.”
+
+    — [https://mathworld.wolfram.com/Graph.html](https://mathworld.wolfram.com/Graph.html)
 
 ### What is Data?
 
-“...data is a collection of discrete or continuous values that convey information, describing the quantity, quality,
-fact, statistics, other basic units of meaning, or simply sequences of symbols that may be further interpreted
-formally.”
+!!! quote
 
-— [https://en.wikipedia.org/wiki/Data](https://en.wikipedia.org/wiki/Data)
+    “...data is a collection of discrete or continuous values that convey information, describing the quantity, quality,
+    fact, statistics, other basic units of meaning, or simply sequences of symbols that may be further interpreted
+    formally.”
+   
+    — [https://en.wikipedia.org/wiki/Data](https://en.wikipedia.org/wiki/Data)
 
 ## How?
 

{graphinate-0.5.1 → graphinate-0.6.0}/docs/usage/cli.md

@@ -28,6 +28,14 @@ Options:
 
 ### Server
 
+!!! tip
+
+    requires the `server` extra to be installed.
+
+      ```shell
+      pip install graphinate[server]
+      ```
+
 ```console
 Usage: python -m graphinate server [OPTIONS]
 

{graphinate-0.5.1 → graphinate-0.6.0}/examples/math/graph_atlas.py

@@ -38,13 +38,9 @@ def model(items: list[tuple[str, nx.Graph]]) -> graphinate.GraphModel:
     def nodes():
         yield from g.nodes(data='type')
 
-    @graph_model.edge(operator.itemgetter(2),
-                      source=operator.itemgetter(0),
-                      target=operator.itemgetter(1),
-                      label=operator.itemgetter(0, 1),
-                      value=operator.itemgetter(0, 1))
+    @graph_model.edge(operator.itemgetter('type'))
     def edge():
-        yield from g.edges.data('type')
+        yield from ({'source': e[0], 'target': e[1], **e[2]} for e in g.edges.data())
 
     return graph_model
 

{graphinate-0.5.1 → graphinate-0.6.0}/mkdocs.yml

@@ -101,8 +101,12 @@ extra:
       link: https://pypi.org/project/graphinate
     - icon: fontawesome/brands/mastodon
       link: https://mastodon.social/@erivlis
-    - icon: fontawesome/brands/twitter
-      link: https://twitter.com/erivlis
+    - icon: fontawesome/brands/bluesky
+      link: https://bsky.app/profile/erivlis.bsky.social
+    - icon: fontawesome/brands/x-twitter
+      link: https://x.com/erivlis
+    - icon: fontawesome/brands/linkedin
+      link: https://www.linkedin.com/in/eranrivlis
 
 
 plugins:

{graphinate-0.5.1 → graphinate-0.6.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "Graphinate"
-version = "0.5.1"
+version = "0.6.0"
 authors = [
     { name = "Eran Rivlis", email = "eran@rivlis.info" },
 ]
@@ -36,14 +36,6 @@ dependencies = [
     "strawberry-graphql[asgi,opentelemetry]"
 ]
 
-
-[project.urls]
-"Homepage" = "https://erivlis.github.io/graphinate"
-"Documentation" = "https://erivlis.github.io/graphinate"
-"Bug Tracker" = "https://github.com/erivlis/graphinate/issues"
-"Source" = "https://github.com/erivlis/graphinate"
-
-
 [project.optional-dependencies]
 plot = [
     "scipy"
@@ -53,8 +45,16 @@ server = [
     "uvicorn[standard]"
 ]
 
+[project.urls]
+"Homepage" = "https://erivlis.github.io/graphinate"
+"Documentation" = "https://erivlis.github.io/graphinate"
+"Bug Tracker" = "https://github.com/erivlis/graphinate/issues"
+"Source" = "https://github.com/erivlis/graphinate"
+
+
 [dependency-groups]
 dev = [
+    "uv",
     "ruff",
     "pipdeptree"
 ]

{graphinate-0.5.1 → graphinate-0.6.0}/src/graphinate/builders.py

@@ -30,7 +30,7 @@ from .tools import converters, mutators, utcnow
 from .typing import NodeTypeAbsoluteId, UniverseNode
 
 DEFAULT_NODE_DELIMITER = ' ∋ '
-DEFAULT_EDGE_DELIMITER = ' ↔ '
+DEFAULT_EDGE_DELIMITER = ' ⟹ '
 
 GraphRepresentation = Union[dict, nx.Graph, strawberry.Schema]  # noqa: UP007
 
@@ -235,13 +235,14 @@ class NetworkxBuilder(Builder):
             for edge_generator in edge_generators:
                 for edge in edge_generator(**kwargs):
                     edge_id = ((edge.source,), (edge.target,))
+                    edge_label = edge.label(edge_id) if callable(edge.label) else edge.label
                     edge_weight = edge.weight or 1.0
                     edge_type = edge.type.lower()
                     logger.debug("Adding edge from: '{}' to: '{}'", *edge_id)
 
                     if isinstance(self._graph, nx.MultiGraph) or edge_id not in self._graph.edges:
                         self._graph.add_edge(*edge_id,
-                                             label=edge.label,
+                                             label=edge_label,
                                              type=edge_type,
                                              value=[edge.value],
                                              weight=edge_weight,
@@ -277,7 +278,7 @@ class NetworkxBuilder(Builder):
         for name, default in defaults.items():
             if callable(default):
                 values = {tuple(e): default(tuple(e)) for *e, a in self._graph_edges(data=name, default=None)
-                          if a is None}
+                          if a is not None}
             elif isinstance(default, dict):
                 values = default
             elif default:

{graphinate-0.5.1 → graphinate-0.6.0}/src/graphinate/server/__init__.py

@@ -4,6 +4,7 @@ import webbrowser
 import strawberry
 from starlette.applications import Starlette
 from starlette.requests import Request
+from starlette.responses import RedirectResponse
 from starlette.schemas import SchemaGenerator
 from starlette.types import ASGIApp
 from strawberry.asgi import GraphQL
@@ -28,7 +29,7 @@ def openapi_schema(request: Request) -> ASGIApp:
     """
     schema_data = {
         'openapi': '3.0.0',
-        'info': {'title': 'Graphinate API', 'version': '0.5.1'},
+        'info': {'title': 'Graphinate API', 'version': '0.6.0'},
         'paths': {
             '/graphql': {'get': {'responses': {200: {'description': 'GraphQL'}}}},
             '/graphiql': {'get': {'responses': {200: {'description': 'GraphiQL UI.'}}}},
@@ -54,11 +55,12 @@ def graphql(graphql_schema: strawberry.Schema, port: int = DEFAULT_PORT):
     """
     graphql_schema.extensions.append(OpenTelemetryExtension)
 
+    def open_url():
+        for app_name in ('viewer',):
+            webbrowser.open(f'http://localhost:{port}/{app_name}')
+
     @contextlib.asynccontextmanager
     async def lifespan(app: Starlette):  # pragma: no cover
-        def open_url():
-            for app_name in ('voyager', 'graphiql', 'viewer'):
-                webbrowser.open(f'http://localhost:{port}/{app_name}')
 
         open_url()
         yield
@@ -75,6 +77,12 @@ def graphql(graphql_schema: strawberry.Schema, port: int = DEFAULT_PORT):
     app.add_middleware(PrometheusMiddleware)
     app.add_route("/metrics", metrics)
     app.add_route("/schema", route=openapi_schema, include_in_schema=False)
+    app.add_route("/openapi.json", route=openapi_schema, include_in_schema=False)
+
+    async def redirect_to_existing_route(request):
+        return RedirectResponse(url='/viewer')
+
+    app.add_route('/', redirect_to_existing_route)
 
     import uvicorn
     uvicorn.run(app, host='0.0.0.0', port=port)

{graphinate-0.5.1 → graphinate-0.6.0}/src/graphinate/server/web/rapidoc/index.html

@@ -2,8 +2,9 @@
 <html lang="en">
 <head>
     <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>
+    <script src="https://unpkg.com/rapidoc@9.3.8/dist/rapidoc-min.js"
+            integrity="sha384-szzoYhqSJqZH8X90KwbBjYL1CMLEa3U7xl/oAZg4ViKpYEY5GVhM+peBQB4u7ANM"
+            crossorigin="anonymous"></script>
     <title>Graphinate - OpenAPI RapiDoc UI</title>
 </head>
 <body>