dataframe-textual 2.9.0__tar.gz → 2.10.0__tar.gz

{dataframe_textual-2.9.0 → dataframe_textual-2.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataframe-textual
-Version: 2.9.0
+Version: 2.10.0
 Summary: Interactive terminal viewer/editor for tabular data
 Project-URL: Homepage, https://github.com/need47/dataframe-textual
 Project-URL: Repository, https://github.com/need47/dataframe-textual.git
@@ -423,6 +423,8 @@ Useful for examining wide datasets where columns don't fit well on screen.
 - Press `"` to **filter** all rows containing the selected column value (others removed)
 - Press `{` to move to the previous row
 - Press `}` to move to the next row
+- Press `F` to show the frequency table for the selected column
+- Press `s` to show the statistics table for the selected column
 - Press `q` or `Escape` to close the modal
 
 ### 3. Row Selection
@@ -587,6 +589,10 @@ View quick metadata about your dataframe and columns to understand their structu
   - **Name** - Column name
   - **Type** - Data type (e.g., Int64, String, Float64, Boolean)
 
+**In the Column Metadata Table**
+- Press `F` to show the frequency table for the selected column
+- Press `s` to show the statistics table for the selected column
+
 **In Metadata Modals**:
 - Press `q` or `Escape` to close
 

{dataframe_textual-2.9.0 → dataframe_textual-2.10.0}/README.md

@@ -384,6 +384,8 @@ Useful for examining wide datasets where columns don't fit well on screen.
 - Press `"` to **filter** all rows containing the selected column value (others removed)
 - Press `{` to move to the previous row
 - Press `}` to move to the next row
+- Press `F` to show the frequency table for the selected column
+- Press `s` to show the statistics table for the selected column
 - Press `q` or `Escape` to close the modal
 
 ### 3. Row Selection
@@ -548,6 +550,10 @@ View quick metadata about your dataframe and columns to understand their structu
   - **Name** - Column name
   - **Type** - Data type (e.g., Int64, String, Float64, Boolean)
 
+**In the Column Metadata Table**
+- Press `F` to show the frequency table for the selected column
+- Press `s` to show the statistics table for the selected column
+
 **In Metadata Modals**:
 - Press `q` or `Escape` to close
 

{dataframe_textual-2.9.0 → dataframe_textual-2.10.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dataframe-textual"
-version = "2.9.0"
+version = "2.10.0"
 description = "Interactive terminal viewer/editor for tabular data"
 readme = "README.md"
 requires-python = ">=3.11"

{dataframe_textual-2.9.0 → dataframe_textual-2.10.0}/src/dataframe_textual/data_frame_table.py

@@ -260,7 +260,7 @@ class DataFrameTable(DataTable):
         ("enter", "view_row_detail", "View row details"),
         ("F", "show_frequency", "Show frequency"),
         ("s", "show_statistics", "Show statistics for column"),
-        ("S", "show_statistics('dataframe')", "Show statistics for dataframe"),
+        ("S", "show_statistics(-1)", "Show statistics for dataframe"),
         # Sort
         ("left_square_bracket", "sort_ascending", "Sort ascending"),  # `[`
         ("right_square_bracket", "sort_descending", "Sort descending"),  # `]`
@@ -747,13 +747,16 @@ class DataFrameTable(DataTable):
         """Show frequency distribution for the current column."""
         self.do_show_frequency()
 
-    def action_show_statistics(self, scope: str = "column") -> None:
+    def action_show_statistics(self, cidx: int | None = None) -> None:
         """Show statistics for the current column or entire dataframe.
 
         Args:
-            scope: Either "column" for current column stats or "dataframe" for all columns.
+            cidx: Column index
+                If -1, show statistics for entire dataframe.
+                If None, show statistics for current column, otherwise for specified column.
+
         """
-        self.do_show_statistics(scope)
+        self.do_show_statistics(cidx)
 
     def action_metadata_shape(self) -> None:
         """Show metadata about the dataframe (row and column counts)."""
@@ -1661,26 +1664,26 @@ class DataFrameTable(DataTable):
         # Push the modal screen
         self.app.push_screen(RowDetailScreen(ridx, self))
 
-    def do_show_frequency(self) -> None:
-        """Show frequency distribution for the current column."""
-        cidx = self.cursor_col_idx
+    def do_show_frequency(self, cidx=None) -> None:
+        """Show frequency distribution for a given columnn."""
+        cidx = cidx or self.cursor_col_idx
 
         # Push the frequency modal screen
         self.app.push_screen(FrequencyScreen(cidx, self))
 
-    def do_show_statistics(self, scope: str = "column") -> None:
+    def do_show_statistics(self, cidx: int | None = None) -> None:
         """Show statistics for the current column or entire dataframe.
 
         Args:
-            scope: Either "column" for current column stats or "dataframe" for all columns.
+            cidx: Column index to show statistics for. If None, show for entire dataframe.
         """
-        if scope == "dataframe":
+        if cidx == -1:
             # Show statistics for entire dataframe
-            self.app.push_screen(StatisticsScreen(self, col_idx=None))
+            self.app.push_screen(StatisticsScreen(self, cidx=None))
         else:
-            # Show statistics for current column
-            cidx = self.cursor_col_idx
-            self.app.push_screen(StatisticsScreen(self, col_idx=cidx))
+            # Show statistics for current column or specified column
+            cidx = self.cursor_col_idx if cidx is None else cidx
+            self.app.push_screen(StatisticsScreen(self, cidx=cidx))
 
     def do_metadata_shape(self) -> None:
         """Show metadata about the dataframe (row and column counts)."""
@@ -3711,6 +3714,9 @@ class DataFrameTable(DataTable):
 
         expr_str = "boolean list or series" if isinstance(expr, (list, pl.Series)) else str(expr)
 
+        # Add to history
+        self.add_history(f"Viewed rows by expression [$success]{expr_str}[/]")
+
         # Apply the filter expression
         try:
             df_filtered = lf.filter(expr).collect()
@@ -3722,12 +3728,10 @@ class DataFrameTable(DataTable):
 
         matched_count = len(df_filtered)
         if not matched_count:
+            self.histories_undo.pop()  # Remove last history entry
             self.notify(f"No rows match the expression: [$success]{expr}[/]", title="View Rows", severity="warning")
             return
 
-        # Add to history
-        self.add_history(f"Viewed rows by expression [$success]{expr_str}[/]")
-
         ok_rids = set(df_filtered[RID])
 
         # Create a view of self.df as a copy

{dataframe_textual-2.9.0 → dataframe_textual-2.10.0}/src/dataframe_textual/table_screen.py

@@ -102,7 +102,7 @@ class TableScreen(ModalScreen):
         if cidx_name_value is None:
             return
         cidx, col_name, col_value = cidx_name_value
-        self.log(f"Filtering or viewing by `{col_name} == {col_value}`")
+        # self.log(f"Filtering or viewing by `{col_name} == {col_value}`")
 
         # Handle NULL values
         if col_value == NULL:
@@ -115,7 +115,7 @@ class TableScreen(ModalScreen):
             value_display = f"[$success]{col_value}[/]"
 
         df_filtered = self.dftable.df.lazy().filter(expr).collect()
-        self.log(f"Filtered dataframe has {len(df_filtered)} rows")
+        # self.log(f"Filtered dataframe has {len(df_filtered)} rows")
 
         ok_rids = set(df_filtered[RID].to_list())
         if not ok_rids:
@@ -134,9 +134,45 @@ class TableScreen(ModalScreen):
         else:
             self.dftable.view_rows((expr, cidx, False, True))
 
-        # Dismiss the frequency screen
+        # Dismiss the current modal screen
         self.app.pop_screen()
 
+    def show_frequency(self, cidx_name_value: tuple[int, str, Any] | None) -> None:
+        """Show frequency by the selected value.
+
+        Args:
+            col_name_value: Tuple of (column_name, column_value) to filter/view by, or None.
+        """
+        if cidx_name_value is None:
+            return
+        cidx, col_name, col_value = cidx_name_value
+        # self.log(f"Showing frequency for `{col_name} == {col_value}`")
+
+        # Do not dismiss the current modal screen so it can be returned to
+        # when frequency screen is closed.
+        # self.app.pop_screen()
+
+        # Show frequency screen
+        self.dftable.do_show_frequency(cidx)
+
+    def show_statistics(self, cidx_name_value: tuple[int, str, Any] | None) -> None:
+        """Show frequency by the selected value.
+
+        Args:
+            col_name_value: Tuple of (column_name, column_value) to filter/view by, or None.
+        """
+        if cidx_name_value is None:
+            return
+        cidx, col_name, col_value = cidx_name_value
+        # self.log(f"Showing statistics for `{col_name} == {col_value}`")
+
+        # Do not dismiss the current modal screen so it can be returned to
+        # when frequency screen is closed.
+        # self.app.pop_screen()
+
+        # Show statistics screen
+        self.dftable.do_show_statistics(cidx)
+
 
 class RowDetailScreen(TableScreen):
     """Modal screen to display a single row's details."""
@@ -175,10 +211,15 @@ class RowDetailScreen(TableScreen):
         self.table.cursor_type = "row"
 
     def on_key(self, event) -> None:
-        """Handle key press events in the row detail screen.
+        """Handle key press events on the row detail screen.
 
-        Supports 'v' for filtering and '"' for highlighting the main table
-        by the value in the selected row.
+        Supported keys:
+          - 'v': View the main table by the selected value.
+          - '"': Filter the main table by the selected value.
+          - '{': Move to the previous row.
+          - '}': Move to the next row.
+          - 'F': Show frequency for the selected value.
+          - 's': Show statistics for the selected value.
 
         Args:
             event: The key event object.
@@ -207,8 +248,17 @@ class RowDetailScreen(TableScreen):
                 self.dftable.move_cursor_to(self.ridx)
                 self.build_table()
             event.stop()
+        elif event.key == "F":
+            # Show frequency for the selected value
+            self.show_frequency(self.get_cidx_name_value())
+            event.stop()
+        elif event.key == "s":
+            # Show statistics for the selected value
+            self.show_statistics(self.get_cidx_name_value())
+            event.stop()
 
     def get_cidx_name_value(self) -> tuple[int, str, Any] | None:
+        """Get the current column info."""
         cidx = self.table.cursor_row
         if cidx >= len(self.df.columns):
             return None  # Invalid row
@@ -224,9 +274,9 @@ class StatisticsScreen(TableScreen):
 
     CSS = TableScreen.DEFAULT_CSS.replace("TableScreen", "StatisticsScreen")
 
-    def __init__(self, dftable: "DataFrameTable", col_idx: int | None = None):
+    def __init__(self, dftable: "DataFrameTable", cidx: int | None = None):
         super().__init__(dftable)
-        self.col_idx = col_idx  # None for dataframe statistics, otherwise column index
+        self.cidx = cidx  # None for dataframe statistics, otherwise column index
 
     def on_mount(self) -> None:
         """Create the statistics table."""
@@ -236,7 +286,7 @@ class StatisticsScreen(TableScreen):
         """Build the statistics table."""
         self.table.clear(columns=True)
 
-        if self.col_idx is None:
+        if self.cidx is None:
             # Dataframe statistics
             self.build_dataframe_stats()
             self.table.cursor_type = "column"
@@ -247,7 +297,7 @@ class StatisticsScreen(TableScreen):
 
     def build_column_stats(self) -> None:
         """Build statistics for a single column."""
-        col_name = self.df.columns[self.col_idx]
+        col_name = self.df.columns[self.cidx]
         lf = self.df.lazy()
 
         # Get column statistics
@@ -500,6 +550,25 @@ class MetaColumnScreen(TableScreen):
         """
         self.build_table()
 
+    def on_key(self, event) -> None:
+        """Handle key press events on the column metadata screen.
+
+        Supports keys:
+          - 'F': Show frequency for the selected value.
+          - 's': Show statistics for the selected value.
+
+        Args:
+            event: The key event object.
+        """
+        if event.key == "F":
+            # Show frequency for the selected value
+            self.show_frequency(self.get_cidx_name_value())
+            event.stop()
+        elif event.key == "s":
+            # Show statistics for the selected value
+            self.show_statistics(self.get_cidx_name_value())
+            event.stop()
+
     def build_table(self) -> None:
         """Build the column metadata table."""
         self.table.clear(columns=True)
@@ -524,4 +593,15 @@ class MetaColumnScreen(TableScreen):
                 dc_str.format("Datetime" if str(col_type).startswith("Datetime") else col_type, style=dc.style),
             )
 
-        self.table.cursor_type = "none"
+        self.table.cursor_type = "row"
+
+    def get_cidx_name_value(self) -> int | None:
+        """Get the current column info."""
+        cidx = self.table.cursor_row
+        if cidx >= len(self.df.columns):
+            return None  # Invalid row
+
+        col_name = self.df.columns[cidx]
+        col_value = None
+
+        return cidx, col_name, col_value

{dataframe_textual-2.9.0 → dataframe_textual-2.10.0}/uv.lock

@@ -171,7 +171,7 @@ wheels = [
 
 [[package]]
 name = "dataframe-textual"
-version = "2.9.0"
+version = "2.10.0"
 source = { editable = "." }
 dependencies = [
     { name = "polars" },