Graphinate 0.8.2__tar.gz → 0.8.4__tar.gz

{graphinate-0.8.2 → graphinate-0.8.4}/PKG-INFO

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

{graphinate-0.8.2 → graphinate-0.8.4}/examples/code/python_ast.py

@@ -126,7 +126,7 @@ if __name__ == '__main__':
     # schema = graphinate.builders.GraphQLBuilder(ast_model).build()
     # graphinate.graphql.server(schema)
 
-    diagram = graphinate.builders.MermaidBuilder(ast_model).build()
+    diagram = graphinate.builders.MermaidBuilder(ast_model).build(with_edge_labels=False)
 
     html_diagram = graphinate.mermaid.html(diagram)
 

{graphinate-0.8.2 → graphinate-0.8.4}/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.2 → graphinate-0.8.4}/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.2 → graphinate-0.8.4}/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.2 → graphinate-0.8.4}/pyproject.toml

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

{graphinate-0.8.2 → graphinate-0.8.4}/src/graphinate/builders.py

@@ -326,6 +326,7 @@ class MermaidBuilder(NetworkxBuilder):
     def build(self,
               orientation: nxm.DiagramOrientation = nxm.DiagramOrientation.LEFT_RIGHT,
               node_shape: nxm.DiagramNodeShape = nxm.DiagramNodeShape.DEFAULT,
+              with_edge_labels: bool = False,
               **kwargs) -> nxm.typing.MermaidDiagram:
         """
         Build a Mermaid Graph
@@ -335,6 +336,8 @@ class MermaidBuilder(NetworkxBuilder):
             The orientation of the graph, by default Orientation.LEFT_RIGHT.
           node_shape : NodeShape, optional
             The shape of the nodes, by default NodeShape.DEFAULT.
+          with_edge_labels:
+            Whether to include edge labels, by default False.
           **kwargs: additional inputs to the node and edge generator functions
 
         Returns:
@@ -342,7 +345,8 @@ class MermaidBuilder(NetworkxBuilder):
         """
         super().build(**kwargs)
         color.convert_colors_to_hex(self._graph)
-        return nxm.DiagramBuilder(orientation=orientation, node_shape=node_shape).build(self._graph)
+        nxm_builder = nxm.DiagramBuilder(orientation=orientation, node_shape=node_shape)
+        return nxm_builder.build(self._graph, with_edge_labels=with_edge_labels)
 
 
 class GraphQLBuilder(NetworkxBuilder):
@@ -809,4 +813,4 @@ def build(builder_cls: type[Builder],
     return materialized_graph
 
 
-__all__ = ('D3Builder', 'GraphQLBuilder','GraphRepresentation', 'GraphType', 'NetworkxBuilder', 'build')
+__all__ = ('D3Builder', 'GraphQLBuilder', 'GraphRepresentation', 'GraphType', 'NetworkxBuilder', 'build')

{graphinate-0.8.2 → graphinate-0.8.4}/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.8.2'},
+        'info': {'title': 'Graphinate API', 'version': '0.8.4'},
         'paths': {
             '/graphql': {'get': {'responses': {200: {'description': 'GraphQL'}}}},
             '/graphiql': {'get': {'responses': {200: {'description': 'GraphiQL UI.'}}}},

{graphinate-0.8.2 → graphinate-0.8.4}/src/graphinate/server/web/viewer/index.html

@@ -19,13 +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-hNwCF3Cb+c2HRg4oybw2YGB80Ytiml/p9GEMz87Ac4SiSMF4lZ/uywlTqHH+zWx0"
+    <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 {
@@ -319,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))