Graphinate 0.8.1__tar.gz → 0.8.3__tar.gz

{graphinate-0.8.1 → graphinate-0.8.3}/.github/workflows/test-beta.yml

@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         # https://github.com/actions/python-versions/blob/main/versions-manifest.json
-        python-version: [ "3.14.0-alpha.5" ]
+        python-version: [ "3.14.0-alpha.6" ]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}

{graphinate-0.8.1 → graphinate-0.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Graphinate
-Version: 0.8.1
+Version: 0.8.3
 Summary: Graphinate. Data to Graphs.
 Project-URL: Homepage, https://erivlis.github.io/graphinate
 Project-URL: Documentation, https://erivlis.github.io/graphinate

{graphinate-0.8.1 → graphinate-0.8.3}/examples/math/graph_atlas.py

@@ -2,11 +2,10 @@ import operator
 
 import graphs
 import networkx as nx
+from materializers import Materializers, materialize
 
 import graphinate
 
-from .materializers import Materializers, materialize
-
 
 def model(items: list[tuple[str, nx.Graph]]) -> graphinate.GraphModel:
     """

{graphinate-0.8.1 → graphinate-0.8.3}/examples/math/materializers.py

@@ -4,7 +4,7 @@ from collections.abc import Callable, Mapping
 from enum import Enum
 from typing import Optional
 
-from graphinate import GraphModel, GraphType, builders, graphql, plot
+from graphinate import GraphModel, GraphType, builders, graphql, matplotlib
 
 
 class Materializers(Enum):
@@ -17,9 +17,10 @@ class Materializers(Enum):
         NetworkX_with_edge_labels: create a NetworkX Graph and plot+show it with matplotlib
     """
     D3Graph: tuple = (builders.D3Builder, lambda d: print(json.dumps(d, indent=2, default=str)))
-    GraphQL: tuple = (builders.GraphQLBuilder, graphql)
-    NetworkX: tuple = (builders.NetworkxBuilder, plot)
-    NetworkX_with_edge_labels: tuple = (builders.NetworkxBuilder, functools.partial(plot, with_edge_labels=True))
+    GraphQL: tuple = (builders.GraphQLBuilder, graphql.server)
+    NetworkX: tuple = (builders.NetworkxBuilder, matplotlib.plot)
+    NetworkX_with_edge_labels: tuple = (builders.NetworkxBuilder,
+                                        functools.partial(matplotlib.plot, with_edge_labels=True))
     Mermaid: tuple = (builders.MermaidBuilder, print)
 
 

{graphinate-0.8.1 → graphinate-0.8.3}/examples/math/polygonal_graph.py

@@ -34,12 +34,13 @@ def polygonal_graph_model(name: str, number_of_sides: int) -> graphinate.GraphMo
 
     return graph_model
 
-
+# instantiated here to be used to cli serving
 model = polygonal_graph_model("Octagonal Graph", 8)
 
 if __name__ == '__main__':
+
     # 1. Define Graph Builder
-    builder = graphinate.builders.NetworkxBuilder(model=model)
+    builder = graphinate.builders.NetworkxBuilder(model)
 
     # Then
     # 2. Build the Graph object
@@ -51,4 +52,12 @@ if __name__ == '__main__':
 
     # Or
     # 3. Option B - Output as a plot
-    graphinate.materializers.plot(graph)
+    graphinate.renderers.matplotlib.plot(graph)
+
+    # Alternatively,
+    # 4. Define a GraphQL Builder
+    builder = graphinate.builders.GraphQLBuilder(model)
+
+    schema = builder.build()
+
+    graphinate.graphql.server(schema, port=9077)

{graphinate-0.8.1 → graphinate-0.8.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "Graphinate"
-version = "0.8.1"
+version = "0.8.3"
 description = "Graphinate. Data to Graphs."
 authors = [
     { name = "Eran Rivlis", email = "eran@rivlis.info" },

{graphinate-0.8.1 → graphinate-0.8.3}/src/graphinate/renderers/graphql.py

@@ -29,7 +29,7 @@ def _openapi_schema(request: Request) -> ASGIApp:
     """
     schema_data = {
         'openapi': '3.0.0',
-        'info': {'title': 'Graphinate API', 'version': '0.6.0'},
+        'info': {'title': 'Graphinate API', 'version': '0.8.3'},
         'paths': {
             '/graphql': {'get': {'responses': {200: {'description': 'GraphQL'}}}},
             '/graphiql': {'get': {'responses': {200: {'description': 'GraphiQL UI.'}}}},
@@ -43,45 +43,58 @@ def _openapi_schema(request: Request) -> ASGIApp:
     return schema.OpenAPIResponse(request=request)
 
 
-def server(graphql_schema: strawberry.Schema, port: int = DEFAULT_PORT, **kwargs):
-    """
-    Args:
-        graphql_schema: The Strawberry GraphQL schema.
-        port: The port number to run the server on. Defaults to 8072.
-
-    Returns:
-    """
+def _graphql_app(graphql_schema: strawberry.Schema) -> strawberry.asgi.GraphQL:
     graphql_schema.extensions.append(OpenTelemetryExtension)
+    graphql_app = GraphQL(graphql_schema, graphiql=True)
+    return graphql_app
+
 
-    def open_url():
-        for app_name in ('viewer',):
-            webbrowser.open(f'http://localhost:{port}/{app_name}')
+def _starlette_app(graphql_app: strawberry.asgi.GraphQL | None = None, port: int = DEFAULT_PORT, **kwargs) -> Starlette:
+    def open_url(endpoint):
+        webbrowser.open(f'http://localhost:{port}/{endpoint}')
 
     @contextlib.asynccontextmanager
     async def lifespan(app: Starlette):  # pragma: no cover
         if kwargs.get('browse'):
-            open_url()
+            open_url('viewer')
         yield
 
-    graphql_app = GraphQL(graphql_schema, graphiql=True, graphql_ide='pathfinder')
     app = Starlette(
         lifespan=lifespan,
         routes=routes()
     )
-    app.add_route(GRAPHQL_ROUTE_PATH, graphql_app)
-    app.add_websocket_route(GRAPHQL_ROUTE_PATH, graphql_app)
 
     from starlette_prometheus import PrometheusMiddleware, metrics
     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)
+
+    if graphql_app:
+        app.add_route(GRAPHQL_ROUTE_PATH, graphql_app)
+        app.add_websocket_route(GRAPHQL_ROUTE_PATH, graphql_app)
+        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_viewer(request):
         return RedirectResponse(url='/viewer')
 
     app.add_route('/', redirect_to_viewer)
 
+    return app
+
+
+def server(graphql_schema: strawberry.Schema, port: int = DEFAULT_PORT, **kwargs):
+    """
+    Args:
+        graphql_schema: The Strawberry GraphQL schema.
+        port: The port number to run the server on. Defaults to 8072.
+
+    Returns:
+    """
+
+    graphql_app = _graphql_app(graphql_schema)
+
+    app = _starlette_app(graphql_app, port=port, **kwargs)
+
     import uvicorn
     uvicorn.run(app, host='0.0.0.0', port=port)
 

{graphinate-0.8.1 → graphinate-0.8.3}/src/graphinate/server/web/viewer/index.html

@@ -2,9 +2,15 @@
 <html lang="">
 <head>
     <title>Graphinate Viewer</title>
-    <script type="module"
-            integrity="sha384-Dt9sd/AA7KNs3M8XRJs7rNwUZ9bRWhsKjVz4UpCle+pCI/lqdylOH3mcYcKRBPKF"
-            crossorigin="anonymous">
+    <link rel="modulepreload"
+          href="https://unpkg.com/tweakpane@4.0.5/dist/tweakpane.min.js"
+          integrity="sha384-Dt9sd/AA7KNs3M8XRJs7rNwUZ9bRWhsKjVz4UpCle+pCI/lqdylOH3mcYcKRBPKF"
+          crossorigin="anonymous">
+    <link rel="modulepreload"
+          href="https://unpkg.com/@tweakpane/plugin-essentials@0.2.1/dist/tweakpane-plugin-essentials.min.js"
+          integrity="sha384-q0QZoZn8RhBcEJYEcp7qn991YSevEjaL/GJwbQyuY0FlicmHWZmA384DCVgumN4u"
+          crossorigin="anonymous">
+    <script type="module">
         // Import ES module
         import * as Tweakpane from 'https://unpkg.com/tweakpane@4.0.5/dist/tweakpane.min.js';
         import * as TweakpaneEssentialsPlugin
@@ -13,15 +19,12 @@
         window.Tweakpane = Tweakpane;
         window.TweakpaneEssentialsPlugin = TweakpaneEssentialsPlugin;
     </script>
-
-
-    <script src="https://unpkg.com/3d-force-graph@1.76.1/dist/3d-force-graph.min.js"
-            integrity="sha384-7PiolihqoWLaY+8+zoccK5LLtWiGzovYvg5gjpKkQYhL51yq4JYt6owMj3bzQFBc"
+    <script src="https://cdn.jsdelivr.net/npm/3d-force-graph@1.76.2/dist/3d-force-graph.min.js"
+            integrity="sha384-zSKZ615fogcuRjUjE+0YstAo3N/t7PzUvtQu5KGA1iqkmHXsTRst7zP+6573D+hK"
             crossorigin="anonymous"></script>
-    <script src="https://unpkg.com/murmurhash-js@1.0.0/murmurhash3_gc.js"
-            integrity="sha384-g+j9YCPmBDu4mlFm1UGyQFBh5P7x/xYGJvqbX/WFbzJC2V/wwBRCorSlQ1UaAED0"
+    <script src="https://cdn.jsdelivr.net/npm/murmurhash-js@1.0.0/murmurhash3_gc.min.js"
+            integrity="sha384-RTcg9S2mr/vVW+vsvQZB7G2cYWnhkBdsMvqKzHxL41KG4zTgrMSzGfm7mzw0aYU2"
             crossorigin="anonymous"></script>
-
     <!-- Append this element into the head element to apply the theme -->
     <style>
         body {
@@ -315,7 +318,7 @@
         return `<div style="color: ${gEl.color}; font-family: 'Consolas', 'Menlo', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', monospace; outline-color: ${gEl.color}">${gEl.type}<br>'${gEl.label}'</div>`
     }
 
-    const Graph = ForceGraph3D()(document.getElementById('3d-graph'))
+    const Graph = new ForceGraph3D(document.getElementById('3d-graph'))
         .nodeColor('color')
         .nodeVal(node => graphParams.nodeVal)
         .nodeLabel(node => createLabel(node))