Graphinate 0.8.1__tar.gz → 0.8.2__tar.gz

{graphinate-0.8.1 → graphinate-0.8.2}/.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.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Graphinate
-Version: 0.8.1
+Version: 0.8.2
 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.2}/pyproject.toml

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

{graphinate-0.8.1 → graphinate-0.8.2}/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.2'},
         '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.2}/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,10 +19,8 @@
         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"
+            integrity="sha384-hNwCF3Cb+c2HRg4oybw2YGB80Ytiml/p9GEMz87Ac4SiSMF4lZ/uywlTqHH+zWx0"
             crossorigin="anonymous"></script>
     <script src="https://unpkg.com/murmurhash-js@1.0.0/murmurhash3_gc.js"
             integrity="sha384-g+j9YCPmBDu4mlFm1UGyQFBh5P7x/xYGJvqbX/WFbzJC2V/wwBRCorSlQ1UaAED0"