restore changes

Author: OskarDamkjaer

python-wrapper/src/neo4j_viz/nvl.py

@@ -28,30 +28,23 @@ def _load_template() -> str:
 
 
 class NVL:
-    """HTML fallback renderer for standalone HTML / Streamlit.
-
-    Uses the same Vite-built HTML template as the dev harness (index.html).
-    Python injects graph data via window.__NEO4J_VIZ_DATA__ — no blob URLs,
-    no manual JS/CSS inlining.
-    """
-
     def __init__(self) -> None:
         self._template = _load_template()
 
     def render(
         self,
         nodes: list[Node],
         relationships: list[Relationship],
+        render_options: dict[str, object] | None,
         width: str,
         height: str,
-        options: dict[str, object] | None = None,
     ) -> HTML:
         data_dict: dict[str, object] = {
             "nodes": [_serialize_entity(node) for node in nodes],
             "relationships": [_serialize_entity(rel) for rel in relationships],
             "width": width,
             "height": height,
-            "options": options or {},
+            "options": render_options or {},
         }
         data_json = json.dumps(data_dict)
         container_id = f"neo4j-viz-{uuid.uuid4().hex[:12]}"

python-wrapper/src/neo4j_viz/visualization_graph.py

@@ -17,6 +17,7 @@
     LayoutOptions,
     Renderer,
     RenderOptions,
+    construct_layout_options,
 )
 from .relationship import Relationship
 from .widget import GraphWidget
@@ -106,12 +107,22 @@ def _build_js_options(
 
         Renderer.check(renderer, num_nodes)
 
+        if not layout:
+            layout = Layout.FORCE_DIRECTED
+        if not layout_options:
+            layout_options = {}
+
+        if isinstance(layout_options, dict):
+            layout_options_typed = construct_layout_options(layout, layout_options)
+        else:
+            layout_options_typed = layout_options
+
         render_options = RenderOptions(
             layout=layout,
-            layout_options=layout_options if not isinstance(layout_options, dict) else None,
+            layout_options=layout_options_typed,
             renderer=renderer,
-            pan_X=pan_position[0] if pan_position else None,
-            pan_Y=pan_position[1] if pan_position else None,
+            pan_X=pan_position[0] if pan_position is not None else None,
+            pan_Y=pan_position[1] if pan_position is not None else None,
             initial_zoom=initial_zoom,
             min_zoom=min_zoom,
             max_zoom=max_zoom,
@@ -178,9 +189,9 @@ def render(
         return NVL().render(
             self.nodes,
             self.relationships,
+            js_options,
             width,
             height,
-            options=js_options,
         )
 
     def render_widget(

python-wrapper/src/neo4j_viz/widget.py

@@ -12,6 +12,12 @@
 
 
 def _serialize_entity(entity: Union[Node, Relationship]) -> dict[str, object]:
+    """Convert a Node or Relationship to a JSON-serializable dict.
+
+    Returns a dict (not a JSON string) because traitlets.List expects Python objects,
+    not pre-serialized strings. Traitlets handles JSON serialization for transport to JS.
+    See: https://traitlets.readthedocs.io/en/stable/config.html#serializing-values
+    """
     try:
         entity_dict = entity.to_dict()
         # Verify it's JSON-serializable