dataframe-textual 1.16.2__py3-none-any.whl → 2.0.1__py3-none-any.whl

dataframe_textual/data_frame_viewer.py

@@ -248,12 +248,7 @@ class DataFrameViewer(App):
         Opens the save dialog for the active tab's DataFrameTable to save its data.
         """
         if table := self.get_active_table():
-            table.do_save_to_file(title="Save Current Tab", all_tabs=False)
-
-    def action_save_current_tab_overwrite(self) -> None:
-        """Save the currently active tab to file, overwriting if it exists."""
-        if table := self.get_active_table():
-            table.save_to_file((table.filename, False, False))
+            table.do_save_to_file(all_tabs=False)
 
     def action_save_all_tabs(self) -> None:
         """Save all open tabs to their respective files.
@@ -261,12 +256,25 @@ class DataFrameViewer(App):
         Iterates through all DataFrameTable widgets and opens the save dialog for each.
         """
         if table := self.get_active_table():
-            table.do_save_to_file(title="Save All Tabs", all_tabs=True)
+            table.do_save_to_file(all_tabs=True)
+
+    def action_save_current_tab_overwrite(self) -> None:
+        """Save the currently active tab to file, overwriting if it exists."""
+        if table := self.get_active_table():
+            filepath = Path(table.filename)
+            filename = filepath.with_stem(table.tabname)
+            table.save_to_file((filename, False, False))
 
     def action_save_all_tabs_overwrite(self) -> None:
         """Save all open tabs to their respective files, overwriting if they exist."""
         if table := self.get_active_table():
-            table.save_to_file((table.filename, True, False))
+            filepath = Path(table.filename)
+            if filepath.suffix.lower() in [".xlsx", ".xls"]:
+                filename = table.filename
+            else:
+                filename = "all-tabs.xlsx"
+
+            table.save_to_file((filename, True, False))
 
     def action_duplicate_tab(self) -> None:
         """Duplicate the currently active tab.

dataframe_textual/sql_screen.py

@@ -13,6 +13,8 @@ from textual.screen import ModalScreen
 from textual.widgets import Button, Input, Label, SelectionList, TextArea
 from textual.widgets.selection_list import Selection
 
+from .common import RID
+
 
 class SqlScreen(ModalScreen):
     """Base class for modal screens handling SQL query."""
@@ -164,7 +166,11 @@ class SimpleSqlScreen(SqlScreen):
             container.border_title = "SQL Query"
             yield Label("SELECT columns (all if none selected):", id="select-label")
             yield SelectionList(
-                *[Selection(col, col) for col in self.df.columns if col not in self.dftable.hidden_columns],
+                *[
+                    Selection(col, col)
+                    for col in self.df.columns
+                    if col not in self.dftable.hidden_columns and col != RID
+                ],
                 id="column-selection",
             )
             yield Label("WHERE condition (optional)", id="where-label")
@@ -175,7 +181,7 @@ class SimpleSqlScreen(SqlScreen):
         """Handle Yes button/Enter key press."""
         selections = self.query_one(SelectionList).selected
         if not selections:
-            selections = [col for col in self.df.columns if col not in self.dftable.hidden_columns]
+            selections = [col for col in self.df.columns if col not in self.dftable.hidden_columns and col != RID]
 
         columns = ", ".join(f"`{s}`" for s in selections)
         where = self.query_one(Input).value.strip()

dataframe_textual/table_screen.py

@@ -13,7 +13,7 @@ from textual.renderables.bar import Bar
 from textual.screen import ModalScreen
 from textual.widgets import DataTable
 
-from .common import NULL, NULL_DISPLAY, RIDX, DtypeConfig, format_float
+from .common import NULL, NULL_DISPLAY, RID, DtypeConfig, format_float
 
 
 class TableScreen(ModalScreen):
@@ -45,9 +45,6 @@ class TableScreen(ModalScreen):
 
         Args:
             dftable: Reference to the parent DataFrameTable widget.
-
-        Returns:
-            None
         """
         super().__init__()
         self.dftable = dftable  # DataFrameTable
@@ -71,9 +68,6 @@ class TableScreen(ModalScreen):
 
         Subclasses should implement this method to populate the DataTable
         with appropriate columns and rows based on the specific screen's purpose.
-
-        Returns:
-            None
         """
         raise NotImplementedError("Subclasses must implement build_table method.")
 
@@ -85,9 +79,6 @@ class TableScreen(ModalScreen):
 
         Args:
             event: The key event object.
-
-        Returns:
-            None
         """
         if event.key in ("q", "escape"):
             self.app.pop_screen()
@@ -111,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:
@@ -123,11 +114,11 @@ class TableScreen(ModalScreen):
             expr = pl.col(col_name) == col_value
             value_display = f"[$success]{col_value}[/]"
 
-        df_filtered = self.dftable.df.with_row_index(RIDX).filter(expr)
+        df_filtered = self.dftable.df.lazy().filter(expr).collect()
         self.log(f"Filtered dataframe has {len(df_filtered)} rows")
 
-        matched_indices = set(df_filtered[RIDX].to_list())
-        if not matched_indices:
+        ok_rids = set(df_filtered[RID].to_list())
+        if not ok_rids:
             self.notify(
                 f"No matches found for [$warning]{col_name}[/] == {value_display}",
                 title="No Matches",
@@ -135,18 +126,12 @@ class TableScreen(ModalScreen):
             )
             return
 
-        # Apply the action
+        # Action filter
         if action == "filter":
-            # Update selections
-            for i in range(len(self.dftable.selected_rows)):
-                self.dftable.selected_rows[i] = i in matched_indices
-
-            # Update main table display
             self.dftable.do_filter_rows()
 
-        else:  # action == "view"
-            # Update visible rows
-            expr = [i in matched_indices for i in range(len(self.dftable.df))]
+        # Action view
+        else:
             self.dftable.view_rows((expr, cidx, False, True))
 
         # Dismiss the frequency screen
@@ -167,9 +152,6 @@ class RowDetailScreen(TableScreen):
 
         Populates the table with column names and values from the selected row
         of the main DataFrame. Sets the table cursor type to "row".
-
-        Returns:
-            None
         """
         self.build_table()
 
@@ -181,6 +163,8 @@ class RowDetailScreen(TableScreen):
 
         # Get all columns and values from the dataframe row
         for col, val, dtype in zip(self.df.columns, self.df.row(self.ridx), self.df.dtypes):
+            if col == RID:
+                continue  # Skip RID column
             formatted_row = []
             formatted_row.append(col)
 
@@ -208,20 +192,16 @@ class RowDetailScreen(TableScreen):
             self.filter_or_view_selected_value(self.get_cidx_name_value(), action="filter")
             event.stop()
         elif event.key == "right_curly_bracket":  # '}'
-            # Move to the next visible row
+            # Move to the next row
             ridx = self.ridx + 1
-            while ridx < len(self.df) and not self.dftable.visible_rows[ridx]:
-                ridx += 1
             if ridx < len(self.df):
                 self.ridx = ridx
                 self.dftable.move_cursor_to(self.ridx)
                 self.build_table()
             event.stop()
         elif event.key == "left_curly_bracket":  # '{'
-            # Move to the previous visible row
+            # Move to the previous row
             ridx = self.ridx - 1
-            while ridx >= 0 and not self.dftable.visible_rows[ridx]:
-                ridx -= 1
             if ridx >= 0:
                 self.ridx = ridx
                 self.dftable.move_cursor_to(self.ridx)
@@ -270,12 +250,8 @@ class StatisticsScreen(TableScreen):
         col_name = self.df.columns[self.col_idx]
         lf = self.df.lazy()
 
-        # Apply only to visible rows
-        if False in self.dftable.visible_rows:
-            lf = lf.filter(self.dftable.visible_rows)
-
         # Get column statistics
-        stats_df = lf.select(pl.col(col_name)).collect().describe()
+        stats_df = lf.select(pl.col(col_name)).describe()
         if len(stats_df) == 0:
             return
 
@@ -298,18 +274,14 @@ class StatisticsScreen(TableScreen):
 
     def build_dataframe_stats(self) -> None:
         """Build statistics for the entire dataframe."""
-        lf = self.df.lazy()
-
-        # Apply only to visible rows
-        if False in self.dftable.visible_rows:
-            lf = lf.filter(self.dftable.visible_rows)
+        lf = self.df.lazy().select(pl.exclude(RID))
 
         # Apply only to non-hidden columns
         if self.dftable.hidden_columns:
             lf = lf.select(pl.exclude(self.dftable.hidden_columns))
 
         # Get dataframe statistics
-        stats_df = lf.collect().describe()
+        stats_df = lf.describe()
 
         # Add columns for each dataframe column with appropriate styling
         for idx, (col_name, col_dtype) in enumerate(zip(stats_df.columns, stats_df.dtypes), 0):
@@ -348,13 +320,11 @@ class FrequencyScreen(TableScreen):
     def __init__(self, cidx: int, dftable: "DataFrameTable") -> None:
         super().__init__(dftable)
         self.cidx = cidx
-        self.sorted_columns = {
-            1: True,  # Count
-        }
+        self.sorted_columns = {1: True}  # Count sort by default
+        self.total_count = len(dftable.df)
 
-        df = dftable.df.filter(dftable.visible_rows) if False in dftable.visible_rows else dftable.df
-        self.total_count = len(df)
-        self.df: pl.DataFrame = df[df.columns[self.cidx]].value_counts(sort=True).sort("count", descending=True)
+        col = dftable.df.columns[self.cidx]
+        self.df: pl.DataFrame = dftable.df.lazy().select(pl.col(col).value_counts(sort=True)).unnest(col).collect()
 
     def on_mount(self) -> None:
         """Create the frequency table."""
@@ -506,7 +476,8 @@ class MetaShape(TableScreen):
         self.table.add_column(Text("Count", justify="right"))
 
         # Get shape information
-        num_rows, num_cols = self.df.shape
+        num_rows, num_cols = self.df.shape if self.dftable.df_view is None else self.dftable.df_view.shape
+        num_cols -= 1  # Exclude RID column
         dc_int = DtypeConfig(pl.Int64)
 
         # Add rows to the table
@@ -543,11 +514,14 @@ class MetaColumnScreen(TableScreen):
 
         # Add a row for each column
         for idx, (col_name, col_type) in enumerate(schema.items(), 1):
+            if col_name == RID:
+                continue  # Skip RID column
+
             dc = DtypeConfig(col_type)
             self.table.add_row(
                 dc_int.format(idx, thousand_separator=self.thousand_separator),
                 col_name,
-                dc_str.format(col_type, style=dc.style),
+                dc_str.format("Datetime" if str(col_type).startswith("Datetime") else col_type, style=dc.style),
             )
 
         self.table.cursor_type = "none"

dataframe_textual/yes_no_screen.py

@@ -119,9 +119,6 @@ class YesNoScreen(ModalScreen):
             maybe: Optional Maybe button text/dict. Defaults to None.
             no: Text or dict for the No button. If None, hides the No button. Defaults to "No".
             on_yes_callback: Optional callable that takes no args and returns the value to dismiss with when Yes is pressed. Defaults to None.
-
-        Returns:
-            None
         """
         super().__init__()
         self.title = title
@@ -295,32 +292,26 @@ class SaveFileScreen(YesNoScreen):
 
     CSS = YesNoScreen.DEFAULT_CSS.replace("YesNoScreen", "SaveFileScreen")
 
-    def __init__(
-        self, filename: str, title: str = "Save to File", all_tabs: bool | None = None, multi_tab: bool = False
-    ):
-        self.all_tabs = all_tabs or (all_tabs is None and multi_tab)
+    def __init__(self, filename: str, save_all: bool = False, tab_count: int = 1):
+        self.save_all = save_all
         super().__init__(
-            title=title,
-            label="Enter filename",
+            title="Save to File",
+            label="Filename",
             input=filename,
-            yes="Save",
-            maybe="Save All Tabs" if self.all_tabs else None,
+            yes=f"Save {tab_count} Tabs" if self.save_all else "Save Current Tab" if tab_count > 1 else "Save",
             no="Cancel",
             on_yes_callback=self.handle_save,
-            on_maybe_callback=self.handle_save,
         )
 
     def handle_save(self):
         if self.input:
             input_filename = self.input.value.strip()
             if input_filename:
-                return input_filename, self.all_tabs, True  # Overwrite prompt
+                return input_filename, self.save_all, True  # Overwrite prompt
             else:
                 self.notify("Filename cannot be empty", title="Save", severity="error")
                 return None
 
-        return None
-
 
 class ConfirmScreen(YesNoScreen):
     """Modal screen to ask for confirmation."""
@@ -583,7 +574,7 @@ class EditColumnScreen(YesNoScreen):
         self.df = df
         super().__init__(
             title="Edit Column",
-            label=f"by value or Polars expression, e.g., abc, pl.lit(7), {NULL}, $_ * 2, $1 + $2, $_.str.to_uppercase(), pl.arange(0, pl.len())",
+            label=f"By value or Polars expression, e.g., abc, pl.lit(7), {NULL}, $_ * 2, $1 + $2, $_.str.to_uppercase(), pl.arange(0, pl.len())",
             input="$_",
             on_yes_callback=self._get_input,
         )
@@ -607,8 +598,8 @@ class AddColumnScreen(YesNoScreen):
         super().__init__(
             title="Add Column",
             label="Column name",
-            input="Link" if link else "Name",
-            label2="Link template, e.g., https://example.com/$_/id/$1, PC/compound/$cid"
+            input="Link" if link else "New column",
+            label2="Link template, e.g., https://example.com/$1/id/$_, PC/compound/$cid"
             if link
             else "Value or Polars expression, e.g., abc, pl.lit(123), NULL, $_ * 2, $1 + $total, $_ + '_suffix', $_.str.to_uppercase()",
             input2="Link template" if link else "Value or expression",

{dataframe_textual-1.16.2.dist-info → dataframe_textual-2.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataframe-textual
-Version: 1.16.2
+Version: 2.0.1
 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
@@ -325,7 +325,7 @@ zcat compressed_data.csv.gz | dv -f csv
 
 | Key | Action |
 |-----|--------|
-| `\` | Select rows that matches cursor value in current column |
+| `\` | Select rows wth cell matches or those matching cursor value in current column |
 | `\|` (pipe) | Select rows by expression |
 | `{` | Go to previous selected row |
 | `}` | Go to next selected row |
@@ -349,9 +349,9 @@ zcat compressed_data.csv.gz | dv -f csv
 #### View & Filter
 | Key | Action |
 |-----|--------|
-| `"` (quote) | Filter to rows that are selected or contain matching cells (and remove others) |
-| `v` | View rows (and hide others) by row selections and cell matches or cursor value |
-| `V` | View rows (and hide others) by expression |
+| `"` (quote) | Filter selected rows (others removed) |
+| `v` | View selected rows (others hidden) |
+| `V` | View selected by expression (others hidden) |
 
 #### SQL Interface
 
@@ -411,8 +411,8 @@ Press `Enter` on any row to open a modal showing all column values for that row.
 Useful for examining wide datasets where columns don't fit well on screen.
 
 **In the Row Detail Modal**:
-- Press `v` to **view** all rows containing the selected column value (and hide others)
-- Press `"` to **filter** all rows containing the selected column value (and remove others)
+- Press `v` to **view** all rows containing the selected column value (others hidden but preserved)
+- Press `"` to **filter** all rows containing the selected column value (others removed)
 - Press `{` to move to the **previous row** (respects hidden rows)
 - Press `}` to move to the **next row** (respects hidden rows)
 - Press `q` or `Escape` to close the modal
@@ -421,7 +421,7 @@ Useful for examining wide datasets where columns don't fit well on screen.
 
 The application provides multiple modes for selecting rows (marks it for filtering or viewing):
 
-- `\` - Select rows that match cursor value in current column (respects data type)
+- `\` - Select rows with cell matches or those matching cursor value in current column (respects data type)
 - `|` - Opens dialog to select rows with custom expression
 - `'` - Select/deselect current row
 - `t` - Flip selections of all rows
@@ -591,8 +591,8 @@ Press `F` to see value distributions of the current column. The modal shows:
 
 **In the Frequency Table**:
 - Press `[` and `]` to sort by any column (value, count, or percentage)
-- Press `v` to **filter** all rows with the selected value (others hidden but preserved)
-- Press `"` to **exclude** all rows containing the selected value (others removed)
+- Press `v` to **view** all rows containing the selected value (others hidden but preserved)
+- Press `"` to **filter** all rows containing the selected value (others removed)
 - Press `q` or `Escape` to close the frequency table
 
 This is useful for:

dataframe_textual-2.0.1.dist-info/RECORD

@@ -0,0 +1,14 @@
+dataframe_textual/__init__.py,sha256=E53fW1spQRA4jW9grxSqPEmoe9zofzr6twdveMbt_W8,1310
+dataframe_textual/__main__.py,sha256=vgHjpSsHBF34UN46iMgu_EiebZUzxWwJZ_ngOU3nQvI,3412
+dataframe_textual/common.py,sha256=gpNNY5ZePJkJPf-YoLSCHKaBpdXQ1yW2iSKYV6zZYUo,27908
+dataframe_textual/data_frame_help_panel.py,sha256=UEtj64XsVRdtLzuwOaITfoEQUkAfwFuvpr5Npip5WHs,3381
+dataframe_textual/data_frame_table.py,sha256=p7PXV-39IRimrzdbuDfiacK9yNQ7XXkWBFyZ4finEk8,147693
+dataframe_textual/data_frame_viewer.py,sha256=fkiQ0OGi2rrE06VAVJuAM_9wwmqLY1AZouwEMNoDmy8,22367
+dataframe_textual/sql_screen.py,sha256=P3j1Fv45NIKEYo9adb7NPod54FaU-djFIvCUMMHbvjY,7534
+dataframe_textual/table_screen.py,sha256=XlVxU_haCxPoA41ZIDcwixOg341Wf35JrFwPoCTnMzE,19033
+dataframe_textual/yes_no_screen.py,sha256=NI7Zt3rETDWYiT5CH_FDy7sIWkZ7d7LquaZZbX79b2g,26400
+dataframe_textual-2.0.1.dist-info/METADATA,sha256=XUm9YBbqWaSjAGv8uOrAk8ss1blAjG30BLZwJn2IjwM,29306
+dataframe_textual-2.0.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+dataframe_textual-2.0.1.dist-info/entry_points.txt,sha256=R_GoooOxcq6ab4RaHiVoZ4zrZJ-phMcGmlL2rwqncW8,107
+dataframe_textual-2.0.1.dist-info/licenses/LICENSE,sha256=AVTg0gk1X-LHI-nnHlAMDQetrwuDZK4eypgSMDO46Yc,1069
+dataframe_textual-2.0.1.dist-info/RECORD,,

dataframe_textual-1.16.2.dist-info/RECORD

@@ -1,14 +0,0 @@
-dataframe_textual/__init__.py,sha256=IFPb8RMUgghw0eRomehkkC684Iny_gs1VkiZMQ5ZpFk,813
-dataframe_textual/__main__.py,sha256=IcwIzLxAK26gMCUrwcrukaMzp_PRLzU7AwJ31sYW1Zo,3251
-dataframe_textual/common.py,sha256=bV-8WdvAgctLlVWkFIhHLhZi6bIc0QcTo6odYgcB-JU,27735
-dataframe_textual/data_frame_help_panel.py,sha256=iEKaur-aH1N_oqHu-vMwEEjfkjQiThK24UO5izsOiW0,3416
-dataframe_textual/data_frame_table.py,sha256=NcKqhCYLtFbsly2mj_prqC31r5A4FYcfVHN2TVA5_XI,145800
-dataframe_textual/data_frame_viewer.py,sha256=hqieMaogp0WmDvK4KqmvJHYAJXaFF6eATgn3msFkHug,22118
-dataframe_textual/sql_screen.py,sha256=_1OZ552s2TV1R0XbsDsfIi1-C3TvggYASomLQoof-Ek,7401
-dataframe_textual/table_screen.py,sha256=B0qrAu-rfZahjraMUJEc_kpDYJ0dGi9_xDwlIuTySlM,19742
-dataframe_textual/yes_no_screen.py,sha256=HSWmP2rX4Y0hLNfrh3GXRAqsWhSif-jgoB9lo21jfNY,26559
-dataframe_textual-1.16.2.dist-info/METADATA,sha256=bB4fNqszkMlyz8MURUgxN9wJ7F0JbhBDg00ojbeBmIQ,29331
-dataframe_textual-1.16.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-dataframe_textual-1.16.2.dist-info/entry_points.txt,sha256=R_GoooOxcq6ab4RaHiVoZ4zrZJ-phMcGmlL2rwqncW8,107
-dataframe_textual-1.16.2.dist-info/licenses/LICENSE,sha256=AVTg0gk1X-LHI-nnHlAMDQetrwuDZK4eypgSMDO46Yc,1069
-dataframe_textual-1.16.2.dist-info/RECORD,,