Remove small and unused narwals wrapper methods

Author: schloerke

shiny/render/_data_frame.py

@@ -37,7 +37,6 @@
     apply_frame_patches,
     as_data_frame,
     data_frame_to_native,
-    frame_shape,
     subset_frame,
 )
 from ._data_frame_utils._types import (
@@ -442,7 +441,7 @@ def cell_selection(self) -> CellSelection:
             selection_modes=self.selection_modes(),
             nw_data=self._nw_data(),
             data_view_rows=self.data_view_rows(),
-            data_view_cols=tuple(range(frame_shape(self._nw_data())[1])),
+            data_view_cols=tuple(range(self._nw_data().shape[1])),
         )
 
         return cell_selection
@@ -954,7 +953,7 @@ async def update_sort(
         if len(sort) > 0:
             with reactive.isolate():
                 nw_data = self._nw_data()
-            ncol = frame_shape(nw_data)[1]
+            ncol = nw_data.shape[1]
 
             for val in sort:
                 val_dict: ColumnSort
@@ -995,8 +994,7 @@ async def update_filter(
             filter = []
         else:
             with reactive.isolate():
-                shape = frame_shape(self._nw_data())
-            ncol = shape[1]
+                ncol = self._nw_data().shape[1]
 
             for column_filter, i in zip(filter, range(len(filter))):
                 assert isinstance(column_filter, dict)

shiny/render/_data_frame_utils/_selection.py

@@ -8,7 +8,6 @@
 from ..._deprecated import warn_deprecated
 from ..._typing_extensions import TypedDict
 from ...types import ListOrTuple
-from ._tbl_data import frame_shape
 from ._types import DataFrame, FrameRenderSelectionModes
 
 NoneSelectionMode = Literal["none"]
@@ -240,7 +239,7 @@ def as_browser_cell_selection(
         return {"type": "none"}
 
     if x == "all":
-        row_len, col_len = frame_shape(nw_data)
+        row_len, col_len = nw_data.shape
         # Look at the selection modes to determine what to do
         if selection_modes._has_rect():
             if selection_modes.rect == "cell":
@@ -379,7 +378,7 @@ def as_cell_selection(
         )
 
     # Make sure the rows are within the data
-    nrow, ncol = frame_shape(nw_data)
+    nrow, ncol = nw_data.shape
     ret["rows"] = tuple(row for row in ret["rows"] if row < nrow)
     ret["cols"] = tuple(col for col in ret["cols"] if col < ncol)
 

shiny/render/_data_frame_utils/_styles.py

@@ -3,7 +3,7 @@
 from typing import Callable, List
 
 from ...types import ListOrTuple
-from ._tbl_data import frame_column_names, frame_shape
+from ._tbl_data import as_data_frame
 from ._types import BrowserStyleInfo, IntoDataFrameT, StyleInfo
 
 StyleFn = Callable[[IntoDataFrameT], List["StyleInfo"]]
@@ -183,7 +183,6 @@ def as_browser_style_infos(
     *,
     into_data: IntoDataFrameT,
 ) -> list[BrowserStyleInfo]:
-    browser_column_names = frame_column_names(into_data)
 
     if callable(infos):
         style_infos = infos(into_data)
@@ -195,7 +194,10 @@ def as_browser_style_infos(
 
     if not isinstance(style_infos, list):
         style_infos = [style_infos]
-    nrow = frame_shape(into_data)[0]
+
+    nw_data = as_data_frame(into_data)
+    browser_column_names = nw_data.columns
+    nrow = nw_data.shape[0]
 
     browser_infos = [
         style_info_to_browser_style_info(

shiny/render/_data_frame_utils/_tbl_data.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, List, Tuple, TypedDict, cast
+from typing import Any, List, TypedDict, cast
 
 import narwhals.stable.v1 as nw
 import orjson
@@ -30,10 +30,6 @@
     "serialize_dtype",
     "serialize_frame",
     "subset_frame",
-    "get_frame_cell",
-    "frame_shape",
-    "copy_frame",
-    "frame_column_names",
 )
 
 ########################################################################################
@@ -289,6 +285,7 @@ def subset_frame(
     # int, or even a tuple of ints)
 
     # The nested if-else structure is used to navigate around narwhals' typing system and lack of `:` operator outside of `[`, `]`.
+
     if cols is None:
         if rows is None:
             return data
@@ -310,32 +307,6 @@ def subset_frame(
             return data[rows, col_names]
 
 
-# # get_frame_cell -----------------------------------------------------------------------
-def get_frame_cell(data: DataFrame[Any], row: int, col: int) -> Any:
-    return data.item(row, col)
-
-
-# shape --------------------------------------------------------------------------------
-def frame_shape(data: IntoDataFrame) -> Tuple[int, int]:
-    nw_data = as_data_frame(data)
-    return nw_data.shape
-
-
-def column_is_numeric(nw_data: DataFrame[Any], column_index: int) -> bool:
-    series_dtype: DType = nw_data[:, column_index].dtype
-    return series_dtype.is_numeric()
-
-
-# copy_frame ---------------------------------------------------------------------------
-def copy_frame(nw_data: DataFrameT) -> DataFrameT:
-    return nw_data.clone()
-
-
-# column_names -------------------------------------------------------------------------
-def frame_column_names(into_data: IntoDataFrame) -> List[str]:
-    return as_data_frame(into_data).columns
-
-
 class ScatterValues(TypedDict):
     row_indexes: list[int]
     values: list[CellValue]

tests/playwright/shiny/components/data_frame/row_selection/app.py

@@ -74,23 +74,13 @@ def selected_rows():
     # Test for selected rows data
     @render.code
     def grid_row_count():
-        grid_data = grid.data()
-        nrow, _ = (  # pyright: ignore[reportUnknownVariableType]
-            render._data_frame_utils._tbl_data.frame_shape(  # pyright: ignore[reportUnknownMemberType, reportAttributeAccessIssue]
-                grid_data
-            )
-        )
-        return str(nrow)  # pyright: ignore[reportUnknownArgumentType]
+        nrow = grid._nw_data().shape[0]
+        return str(nrow)
 
     @render.code
     def selected_row_count():
-        grid_selected_data = grid_selected.data()
-        nrow, _ = (  # pyright: ignore[reportUnknownVariableType]
-            render._data_frame_utils._tbl_data.frame_shape(  # pyright: ignore[reportUnknownMemberType, reportAttributeAccessIssue]
-                grid_selected_data
-            )
-        )
-        return str(nrow)  # pyright: ignore[reportUnknownArgumentType]
+        nrow = grid_selected._nw_data().shape[0]
+        return str(nrow)
 
 
 @module.ui

tests/pytest/test_render_data_frame_tbl_data.py

@@ -15,8 +15,6 @@
 
 from shiny.render._data_frame_utils._tbl_data import (
     as_data_frame,
-    copy_frame,
-    frame_shape,
     serialize_dtype,
     serialize_frame,
     subset_frame,
@@ -321,16 +319,6 @@ def test_subset_frame(df_f: IntoDataFrame):
     assert_frame_equal2(res, dst)
 
 
-def test_get_frame_cell(df_f: IntoDataFrame):
-    assert as_data_frame(df_f).item(1, 1) == "b"
-
-
-def test_copy_frame(df_f: IntoDataFrame):
-    new_df = copy_frame(as_data_frame(df_f))
-
-    assert new_df is not df_f
-
-
 def test_subset_frame_rows_single(small_df_f: IntoDataFrame):
     res = subset_frame(as_data_frame(small_df_f), rows=[1])
 
@@ -350,10 +338,6 @@ def test_subset_frame_cols_single(small_df_f: IntoDataFrame):
     )
 
 
-def test_shape(small_df_f: IntoDataFrame):
-    assert frame_shape(small_df_f) == (2, 2)
-
-
 def test_dtype_coverage():
     from pathlib import Path