PyPI - Graphinate - Versions diffs - 0.2.13__tar.gz → 0.2.15__tar.gz - Mend

Graphinate 0.2.13tar.gz → 0.2.15tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (94) hide show

{graphinate-0.2.13 → graphinate-0.2.15}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Graphinate
-Version: 0.2.13
+Version: 0.2.15
 Summary: Graphinate. Data to Graphs.
 Project-URL: Homepage, https://erivlis.github.io/graphinate
 Project-URL: Documentation, https://erivlis.github.io/graphinate
@@ -33,6 +33,9 @@ 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'
 Provides-Extra: dev
 Requires-Dist: pipdeptree; extra == 'dev'
 Requires-Dist: ruff; extra == 'dev'

{graphinate-0.2.13 → graphinate-0.2.15}/pyproject.toml RENAMED Viewed

@@ -1,6 +1,6 @@
 [project]
 name = "Graphinate"
-version = "0.2.13"
+version = "0.2.15"
 authors = [
     { name = "Eran Rivlis", email = "eran@rivlis.info" },
 ]
@@ -66,6 +66,10 @@ test = [
     "pytest-randomly>=3.15.0",
     "pytest-xdist>=3.5.0"
 ]
+dbs = [
+    "pydgraph>=23.0.2",
+    "neo4j>=5.17.0"
+]
 plot = [
     "scipy>=1.12.0"
 ]

{graphinate-0.2.13 → graphinate-0.2.15}/src/graphinate/builders.py RENAMED Viewed

@@ -27,7 +27,7 @@ from strawberry.extensions import ParserCache, QueryDepthLimiter, ValidationCach
 from . import color
 from .modeling import UNIVERSE_NODE, GraphModel
-from .tools import mutators
+from .tools import converters, mutators
 from .typing import NodeTypeAbsoluteId
 DEFAULT_NODE_DELIMITER = ' ∋ '
@@ -353,9 +353,10 @@ class GraphQLBuilder(NetworkxBuilder):
     # region Strawberry Types
     InfNumber = strawberry.scalar(
-        NewType("InfInt", Union[float, int, decimal.Decimal]),
-        serialize=lambda v: 'Infinity' if v == math.inf else ('-Infinity' if v == -math.inf else v),
-        parse_value=lambda v: math.inf if v == 'Infinity' else (-math.inf if v == '-Infinity' else v),
+        converters.InfNumber,
+        description='Integer, Decimal or Float including Infinity and -Infinity',
+        serialize=converters.infnum_to_value,
+        parse_value=converters.value_to_infnum,
     )
     @strawberry.type

{graphinate-0.2.13 → graphinate-0.2.15}/src/graphinate/server/__init__.py RENAMED Viewed

@@ -11,6 +11,8 @@ from .starlette import routes
 DEFAULT_PORT: int = 8072
+GRAPHQL_ROUTE_PATH = "/graphql"
 def openapi_schema(request):
     schema = SchemaGenerator(
@@ -18,7 +20,7 @@ def openapi_schema(request):
             "openapi": "3.0.0",
             "info": {"title": "Graphinate API", "version": "1.0"},
             "paths": {
-                "/graphql": {
+                GRAPHQL_ROUTE_PATH: {
                     "get": {
                         "responses": {
                             200: {
@@ -95,8 +97,8 @@ def graphql(graphql_schema: strawberry.Schema, port: int = DEFAULT_PORT):
         lifespan=lifespan,
         routes=routes()
     )
-    app.add_route("/graphql", graphql_app)
-    app.add_websocket_route("/graphql", graphql_app)
+    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)

graphinate-0.2.15/src/graphinate/server/web/elements/index.html ADDED Viewed

@@ -0,0 +1,22 @@
+<!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>
+    <!-- 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>
+    <link rel="stylesheet" href="https://unpkg.com/@stoplight/elements/styles.min.css"
+          integrity="sha384-fgRmJCkCe8Qyv2rSIDjIvkm779dv+HZbSa/ptwSeufq8qJZo/xsi79N8Rb6xTIMO">
+</head>
+<body>
+<elements-api
+        apiDescriptionUrl="/schema"
+        router="hash"
+        layout="sidebar"
+/>
+</body>
+</html>

graphinate-0.2.15/src/graphinate/server/web/rapidoc/index.html ADDED Viewed

@@ -0,0 +1,15 @@
+<!doctype html> <!-- Important: must specify -->
+<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>
+    <title>Graphinate OpenAPI RapiDoc UI</title>
+</head>
+<body>
+<rapi-doc
+        spec-url="/schema"
+        theme="dark"
+></rapi-doc>
+</body>
+</html>

graphinate-0.2.15/src/graphinate/tools/converters.py ADDED Viewed

@@ -0,0 +1,28 @@
+import decimal
+import math
+from types import MappingProxyType
+from typing import NewType, Union
+InfNumber = NewType("InfNumber", Union[float, int, decimal.Decimal])
+INFINITY_MAPPER = MappingProxyType({
+    'Infinity': math.inf,
+    '+Infinity': math.inf,
+    '-Infinity': -math.inf
+})
+MATH_INF_MAPPER = MappingProxyType({
+    math.inf: 'Infinity',
+    -math.inf: '-Infinity'
+})
+def value_to_infnum(value: any) -> InfNumber:
+    return INFINITY_MAPPER.get(value, value)
+def infnum_to_value(value: InfNumber):
+    return MATH_INF_MAPPER.get(value, value)
+__all__ = ['InfNumber', 'infnum_to_value', 'value_to_infnum']

{graphinate-0.2.13 → graphinate-0.2.15}/tests/graphinate/test_tools.py RENAMED Viewed

@@ -1,8 +1,11 @@
 import dataclasses
+import math
-import graphinate.tools.mutators
 import pytest
+import graphinate.tools.mutators
+from graphinate.tools import converters
 @dataclasses.dataclass
 class Data:
@@ -38,3 +41,25 @@ dictify_value_as_str_cases = [
 def test_dictify__value_to_str(case, expected):
     actual = graphinate.tools.mutators.dictify(case, value_converter=str)
     assert actual == expected
+@pytest.mark.parametrize(('case', 'expected'),
+                         [('1', '1'), ('1.1', '1.1'), (1, 1), (1.1, 1.1), (0, 0), (True, True), ('Infinity', math.inf),
+                          ('-Infinity', -math.inf), ('+Infinity', math.inf)])
+def test_value_to_infnum(case, expected):
+    # act
+    actual = converters.value_to_infnum(case)
+    # assert
+    assert actual == expected
+@pytest.mark.parametrize(('case', 'expected'),
+                         [('1', '1'), ('1.1', '1.1'), (1, 1), (1.1, 1.1), (0, 0), (True, True), (math.inf, 'Infinity'),
+                          (-math.inf, '-Infinity')])
+def test_infnum_to_value(case, expected):
+    # act
+    actual = converters.infnum_to_value(case)
+    # assert
+    assert actual == expected

graphinate-0.2.13/src/graphinate/server/web/elements/index.html DELETED Viewed

@@ -1,20 +0,0 @@
-<!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>Elements in HTML</title>
-    <!-- Embed elements Elements via Web Component -->
-    <script src="https://unpkg.com/@stoplight/elements/web-components.min.js"></script>
-    <link rel="stylesheet" href="https://unpkg.com/@stoplight/elements/styles.min.css">
-  </head>
-  <body>
-    <elements-api
-      apiDescriptionUrl="/schema"
-      router="hash"
-      layout="sidebar"
-    />
-  </body>
-</html>

graphinate-0.2.13/src/graphinate/server/web/rapidoc/index.html DELETED Viewed

@@ -1,14 +0,0 @@
-<!doctype html> <!-- Important: must specify -->
-<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"></script>
-  <title>Graphinate OpenAPI</title>
-</head>
-<body>
-  <rapi-doc
-    spec-url="/schema"
-    theme = "dark"
-  > </rapi-doc>
-</body>
-</html>