Add new narwhals types

Author: schloerke

shiny/render/_data_frame.py

@@ -644,7 +644,12 @@ async def _patches_handler(self, patches: tuple[CellPatch, ...]) -> Jsonifiable:
         # Add (or overwrite) new cell patches by setting each patch into the cell patch map
         self._set_cell_patch_map_patches(patches)
 
+        # With the patches applied, any data retrieved while processing cell style
+        # will use the new patch values.
+        await self._attempt_update_cell_style()
+
         # Upgrade any HTML-like content to `CellHtml` json objects
+        # for sending to the client
         processed_patches: list[CellPatchProcessed] = [
             {
                 "row_index": patch["row_index"],
@@ -658,14 +663,12 @@ async def _patches_handler(self, patches: tuple[CellPatch, ...]) -> Jsonifiable:
             for patch in patches
         ]
 
-        # Prep the processed patches for sending to the client
+        # Prep the processed patches as dictionaries for sending to the client
         jsonifiable_patches: list[Jsonifiable] = [
             cell_patch_processed_to_jsonifiable(ret_processed_patch)
             for ret_processed_patch in processed_patches
         ]
 
-        await self._attempt_update_cell_style()
-
         # Return the processed patches to the client
         return jsonifiable_patches
 
@@ -715,7 +718,7 @@ async def _attempt_update_cell_style(self) -> None:
             if not callable(styles_fn):
                 return
 
-            # TODO-barret; Use the returned data type from the rener function!
+            # TODO-barret; Use the returned data type from the render function!
             to_original_type_fn = self._nw_data_to_original_type_fn()
             patched_into_data = to_original_type_fn(self._data_patched())
             new_styles = as_browser_style_infos(styles_fn, into_data=patched_into_data)

shiny/render/_data_frame_utils/_tbl_data.py

@@ -1,14 +1,15 @@
 from __future__ import annotations
 
-from typing import Any, List, Tuple, TypedDict
+from typing import Any, List, Tuple, TypedDict, cast
 
 import narwhals.stable.v1 as nw
 import orjson
 from htmltools import TagNode
 
 from ..._typing_extensions import TypeIs
-from ...session import require_active_session
-from ._html import maybe_as_cell_html
+from ...session import Session, require_active_session
+from ...types import Jsonifiable, JsonifiableDict
+from ._html import as_cell_html, cell_contains_htmltoolslike
 from ._types import (
     CellPatch,
     CellValue,
@@ -184,6 +185,9 @@ def apply_frame_patches(
 nw_categorical = nw.Categorical()
 nw_duration = nw.Duration()
 nw_enum = nw.Enum()
+nw_struct = nw.Struct()
+nw_list = nw.List()
+nw_array = nw.Array()
 nw_string = nw.String()
 nw_date = nw.Date()
 nw_datetime = nw.Datetime()
@@ -220,7 +224,8 @@ def serialize_dtype(col: nw.Series) -> FrameDtype:
         type_ = "object"
         if series_contains_htmltoolslike(col):
             type_ = "html"
-
+    elif dtype in {nw_struct, nw_list, nw_array}:
+        type_ = "object"
     else:
         type_ = "unknown"
         if series_contains_htmltoolslike(col):