Partial for narwhals serialize frame. Still needs work. Need datetime type

Author: schloerke

shiny/render/_data_frame_utils/_pandas.py

@@ -80,6 +80,9 @@ def wrap_shiny_html_with_session(x: TagNode):
 
     res["typeHints"] = type_hints
 
+    if "index" in res:
+        del res["index"]
+
     # print(json.dumps(res, indent=4))
     return res
 

shiny/render/_data_frame_utils/_tbl_data.py

@@ -244,7 +244,6 @@ def _(data: PdDataFrame) -> FrameJson:
 
 
 # TODO: test this
-@serialize_frame.register(nw.DataFrame)
 @serialize_frame.register
 def _(data: PlDataFrame) -> FrameJson:
     import json
@@ -276,6 +275,51 @@ def wrap_shiny_html_with_session(x: TagNode):
     }
 
 
+@serialize_frame.register(nw.DataFrame)
+def _(data: nw.DataFrame[Any]) -> FrameJson:
+    import json
+
+    type_hints = [serialize_dtype(data[col_name]) for col_name in data.columns]
+    type_hints_type = {type_hint["type"] for type_hint in type_hints}
+
+    data_rows = data.rows(named=False)
+
+    print(data_rows)
+    print(data.rows(named=False))
+
+    # Shiny tag support
+    if "html" in type_hints_type:
+        session = require_active_session(None)
+
+        def wrap_shiny_html_with_session(x: TagNode):
+            return maybe_as_cell_html(x, session=session)
+
+        html_column_positions = [
+            i for i, x in enumerate(type_hints_type) if x == "html"
+        ]
+
+        new_rows: list[tuple[Any, ...]] = []
+
+        # Wrap the corresponding columns with the cell html object
+        for row in data_rows:
+            new_row = list(row)
+            for html_column_position in html_column_positions:
+                new_row[html_column_position] = wrap_shiny_html_with_session(
+                    new_row[html_column_position]
+                )
+            new_rows.append(tuple(new_row))
+
+        data_rows = new_rows
+
+    data_val = json.loads(json.dumps(data_rows, default=str))
+
+    return {
+        "columns": data.columns,
+        "data": data_val,
+        "typeHints": type_hints,
+    }
+
+
 # subset_frame -------------------------------------------------------------------------
 def subset_frame__typed(
     data: DataFrameLikeT, *, rows: RowsList = None, cols: ColsList = None

tests/pytest/test_render_data_frame_tbl_data.py

@@ -123,7 +123,7 @@ def assert_frame_equal2(
         (pl.Series([1]), "numeric"),
         (pl.Series([1.1]), "numeric"),
         (pl.Series(["a"]), "string"),
-        (pl.Series([datetime.now()]), "unknown"),
+        (pl.Series([datetime.now()]), "datetime"),
         (pl.Series(["a"], dtype=pl.Categorical), "categorical"),
         (pl.Series([{"x": 1}]), "unknown"),
         (pl.Series([h1("yo")]), "html"),
@@ -163,7 +163,7 @@ def test_serialize_frame(df_f: DataFrameLike):
     res = serialize_frame(df_f)
     assert res == {
         "columns": ["num", "chr", "cat", "dt", "struct", "arr", "object"],
-        "index": [0, 1],
+        # "index": [0, 1],
         "data": [
             [1, "a", "a", "2000-01-02T00:00:00.000", {"x": 1}, [1, 2], "<C object>"],
             [2, "b", "a", "2000-01-02T00:00:00.000", {"x": 2}, [3, 4], "D(y=2)"],