dataframe-textual 2.0.0__py3-none-any.whl → 2.1.0__py3-none-any.whl

dataframe_textual/data_frame_table.py

@@ -20,6 +20,7 @@ from textual.widgets._data_table import (
     CellDoesNotExist,
     CellKey,
     CellType,
+    Column,
     ColumnKey,
     CursorType,
     DuplicateKey,
@@ -79,14 +80,13 @@ class History:
     df: pl.DataFrame
     df_view: pl.DataFrame | None
     filename: str
-    loaded_rows: int
     hidden_columns: set[str]
     selected_rows: set[int]
     sorted_columns: dict[str, bool]  # col_name -> descending
+    matches: dict[int, set[str]]  # RID -> set of col names
     fixed_rows: int
     fixed_columns: int
     cursor_coordinate: Coordinate
-    matches: dict[int, set[str]]  # RID -> set of col names
     dirty: bool = False  # Whether this history state has unsaved changes
 
 
@@ -141,7 +141,7 @@ class DataFrameTable(DataTable):
         - **M** - 📋 Show column metadata (ID, name, type)
         - **h** - 👁️ Hide current column
         - **H** - 👀 Show all hidden rows/columns
-        - **_** - 📏 Expand column to full width
+        - **_** - 📏 Toggle column full width
         - **z** - 📌 Freeze rows and columns
         - **~** - 🏷️ Toggle row labels
         - **,** - 🔢 Toggle thousand separator for numeric display
@@ -352,6 +352,9 @@ class DataFrameTable(DataTable):
         # Whether to use thousand separator for numeric display
         self.thousand_separator = False
 
+        # Set of columns expanded to full width
+        self.expanded_columns: set[str] = set()
+
         # Whether to show internal row index column
         self.show_rid = False
 
@@ -1036,7 +1039,7 @@ class DataFrameTable(DataTable):
         Returns:
             dict[str, int]: Mapping of column name to width (None for auto-sizing columns).
         """
-        column_widths = {}
+        col_widths, col_label_widths = {}, {}
 
         # Get available width for the table (with some padding for borders/scrollbar)
         available_width = self.scrollable_content_region.width
@@ -1046,7 +1049,7 @@ class DataFrameTable(DataTable):
 
         # No string columns, let TextualDataTable auto-size all columns
         if not string_cols:
-            return column_widths
+            return col_widths
 
         # Sample a reasonable number of rows to calculate widths (don't scan entire dataframe)
         sample_size = min(self.BATCH_SIZE, len(self.df))
@@ -1060,7 +1063,10 @@ class DataFrameTable(DataTable):
             # Get column label width
             # Add padding for sort indicators if any
             label_width = measure(self.app.console, col, 1) + 2
-            if dtype != pl.String:
+            col_label_widths[col] = label_width
+
+            # Let Textual auto-size for non-string columns and already expanded columns
+            if dtype != pl.String or col in self.expanded_columns:
                 available_width -= label_width
                 continue
 
@@ -1083,16 +1089,16 @@ class DataFrameTable(DataTable):
                 max_width = label_width
                 self.log(f"Error determining width for column '{col}': {e}")
 
-            column_widths[col] = max_width
+            col_widths[col] = max_width
             available_width -= max_width
 
         # If there's no more available width, auto-size remaining columns
         if available_width < 0:
-            for col in column_widths:
-                if column_widths[col] > STRING_WIDTH_CAP:
-                    column_widths[col] = STRING_WIDTH_CAP  # Cap string columns
+            for col in col_widths:
+                if col_widths[col] > STRING_WIDTH_CAP and col_label_widths[col] < STRING_WIDTH_CAP:
+                    col_widths[col] = STRING_WIDTH_CAP  # Cap string columns
 
-        return column_widths
+        return col_widths
 
     def setup_columns(self) -> None:
         """Clear table and setup columns.
@@ -1487,6 +1493,9 @@ class DataFrameTable(DataTable):
         if start % self.BATCH_SIZE != 0:
             start = (start // self.BATCH_SIZE + 1) * self.BATCH_SIZE
 
+        if stop - start < self.BATCH_SIZE:
+            start -= self.BATCH_SIZE
+
         self.load_rows_range(start, stop)
         self.move_cursor(row=self.row_count - 1)
 
@@ -1519,14 +1528,13 @@ class DataFrameTable(DataTable):
             df=self.df,
             df_view=self.df_view,
             filename=self.filename,
-            loaded_rows=self.loaded_rows,
             hidden_columns=self.hidden_columns.copy(),
             selected_rows=self.selected_rows.copy(),
             sorted_columns=self.sorted_columns.copy(),
+            matches={k: v.copy() for k, v in self.matches.items()},
             fixed_rows=self.fixed_rows,
             fixed_columns=self.fixed_columns,
             cursor_coordinate=self.cursor_coordinate,
-            matches={k: v.copy() for k, v in self.matches.items()},
             dirty=self.dirty,
         )
 
@@ -1539,14 +1547,13 @@ class DataFrameTable(DataTable):
         self.df = history.df
         self.df_view = history.df_view
         self.filename = history.filename
-        self.loaded_rows = history.loaded_rows
         self.hidden_columns = history.hidden_columns.copy()
         self.selected_rows = history.selected_rows.copy()
         self.sorted_columns = history.sorted_columns.copy()
+        self.matches = {k: v.copy() for k, v in history.matches.items()} if history.matches else defaultdict(set)
         self.fixed_rows = history.fixed_rows
         self.fixed_columns = history.fixed_columns
         self.cursor_coordinate = history.cursor_coordinate
-        self.matches = {k: v.copy() for k, v in history.matches.items()} if history.matches else defaultdict(set)
         self.dirty = history.dirty
 
         # Recreate table for display
@@ -1710,11 +1717,15 @@ class DataFrameTable(DataTable):
         if dtype != pl.String:
             return
 
+        # The column to expand/shrink
+        col: Column = self.columns[col_key]
+
         # Calculate the maximum width across all loaded rows
-        max_width = len(col_name) + 2  # Start with column name width + padding
+        label_width = len(col_name) + 2  # Start with column name width + padding
 
         try:
             need_expand = False
+            max_width = label_width
 
             # Scan through all loaded rows that are visible to find max width
             for row_idx in range(self.loaded_rows):
@@ -1728,22 +1739,28 @@ class DataFrameTable(DataTable):
             if not need_expand:
                 return
 
-            # Update the column width
-            col = self.columns[col_key]
-            col.width = max_width
+            if col_name in self.expanded_columns:
+                col.width = max(label_width, STRING_WIDTH_CAP)
+                self.expanded_columns.remove(col_name)
+            else:
+                self.expanded_columns.add(col_name)
 
-            # Force a refresh
-            self._update_count += 1
-            self._require_update_dimensions = True
-            self.refresh(layout=True)
+                # Update the column width
+                col.width = max_width
 
-            # self.notify(f"Expanded column [$success]{col_name}[/] to width [$accent]{max_width}[/]", title="Expand")
         except Exception as e:
             self.notify(
                 f"Error expanding column [$error]{col_name}[/]", title="Expand Column", severity="error", timeout=10
             )
             self.log(f"Error expanding column `{col_name}`: {str(e)}")
 
+        # Force a refresh
+        self._update_count += 1
+        self._require_update_dimensions = True
+        self.refresh(layout=True)
+
+        # self.notify(f"Expanded column [$success]{col_name}[/] to width [$accent]{max_width}[/]", title="Expand")
+
     def do_toggle_rid(self) -> None:
         """Toggle display of the internal RID column."""
         self.show_rid = not self.show_rid
@@ -1965,13 +1982,21 @@ class DataFrameTable(DataTable):
             if self.df_view is not None:
                 # Get updated column from df for rows that exist in df_view
                 col_updated = f"^_{col_name}_^"
-                lf_updated = self.df.lazy().select(RID, pl.col(col_name).alias(col_updated))
-                # Join and use coalesce to prefer updated value or keep original
+                col_exists = "^_exists_^"
+                lf_updated = self.df.lazy().select(
+                    RID, pl.col(col_name).alias(col_updated), pl.lit(True).alias(col_exists)
+                )
+                # Join and use when/then/otherwise to handle all updates including NULLs
                 self.df_view = (
                     self.df_view.lazy()
                     .join(lf_updated, on=RID, how="left")
-                    .with_columns(pl.coalesce(pl.col(col_updated), pl.col(col_name)).alias(col_name))
-                    .drop(col_updated)
+                    .with_columns(
+                        pl.when(pl.col(col_exists))
+                        .then(pl.col(col_updated))
+                        .otherwise(pl.col(col_name))
+                        .alias(col_name)
+                    )
+                    .drop(col_updated, col_exists)
                     .collect()
                 )
         except Exception as e:
@@ -2269,7 +2294,12 @@ class DataFrameTable(DataTable):
         """Remove the currently selected column from the table."""
         # Get the column to remove
         col_idx = self.cursor_column
-        col_name = self.cursor_col_name
+        try:
+            col_name = self.cursor_col_name
+        except CellDoesNotExist:
+            self.notify("No column to delete at the current cursor position", title="Delete Column", severity="warning")
+            return
+
         col_key = self.cursor_col_key
 
         col_names_to_remove = []
@@ -2334,7 +2364,7 @@ class DataFrameTable(DataTable):
         if self.df_view is not None:
             self.df_view = self.df_view.drop(col_names_to_remove)
 
-        self.notify(message, title="Delete")
+        self.notify(message, title="Delete Column")
 
     def do_duplicate_column(self) -> None:
         """Duplicate the currently selected column, inserting it right after the current column."""
@@ -2386,7 +2416,7 @@ class DataFrameTable(DataTable):
         # Delete all selected rows
         if selected_count := len(self.selected_rows):
             history_desc = f"Deleted {selected_count} selected row(s)"
-            rids_to_delete = self.selected_rows
+            rids_to_delete.update(self.selected_rows)
 
         # Delete current row and those above
         elif more == "above":

dataframe_textual/data_frame_viewer.py

@@ -549,7 +549,7 @@ class DataFrameViewer(App):
             )
             self.push_screen(
                 ConfirmScreen(
-                    "Close All Tabs",
+                    "Close All Tabs" if len(self.tabs) > 1 else "Close Tab",
                     label=label,
                     yes="Save",
                     maybe="Discard",

dataframe_textual/table_screen.py

@@ -163,7 +163,7 @@ 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:
+            if col in self.dftable.hidden_columns or col == RID:
                 continue  # Skip RID column
             formatted_row = []
             formatted_row.append(col)

{dataframe_textual-2.0.0.dist-info → dataframe_textual-2.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataframe-textual
-Version: 2.0.0
+Version: 2.1.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
@@ -247,8 +247,8 @@ zcat compressed_data.csv.gz | dv -f csv
 | `Q` | Close all tabs and app (prompts to save unsaved changes) |
 | `Ctrl+Q` | Force to quit app (regardless of unsaved changes) |
 | `Ctrl+T` | Save current tab to file |
+| `Ctrl+A` | Save all tabs to a Excel file |
 | `w` | Save current tab to file (overwrite without prompt) |
-| `Ctrl+A` | Save all tabs to file |
 | `W` | Save all tabs to file (overwrite without prompt) |
 | `Ctrl+D` | Duplicate current tab |
 | `Ctrl+O` | Open file in a new tab |
@@ -271,7 +271,7 @@ zcat compressed_data.csv.gz | dv -f csv
 | Key | Action |
 |-----|--------|
 | `g` | Jump to first row |
-| `G` | Jump to last row (loads all remaining rows) |
+| `G` | Jump to last row |
 | `↑` / `↓` | Move up/down one row |
 | `←` / `→` | Move left/right one column |
 | `Home` / `End` | Jump to first/last column |
@@ -295,9 +295,11 @@ zcat compressed_data.csv.gz | dv -f csv
 | `F` | Show frequency distribution for current column |
 | `s` | Show statistics for current column |
 | `S` | Show statistics for entire dataframe |
+| `m` | Show metadata for row count and column count |
+| `M` | Show metadata for current column |
 | `K` | Cycle cursor types: cell → row → column → cell |
 | `~` | Toggle row labels |
-| `_` (underscore) | Expand column to full width |
+| `_` (underscore) | Toggle column full width |
 | `z` | Freeze rows and columns |
 | `,` | Toggle thousand separator for numeric display |
 | `h` | Hide current column |
@@ -318,7 +320,7 @@ zcat compressed_data.csv.gz | dv -f csv
 | `x` | Delete current row |
 | `X` | Delete current row and all those below |
 | `Ctrl+X` | Delete current row and all those above |
-| `d` | Duplicate current column (appends '_copy' suffix) |
+| `d` | Duplicate current column |
 | `D` | Duplicate current row |
 
 #### Row Selection
@@ -392,7 +394,7 @@ zcat compressed_data.csv.gz | dv -f csv
 | `c` | Copy current cell to clipboard |
 | `Ctrl+C` | Copy column to clipboard |
 | `Ctrl+R` | Copy row to clipboard (tab-separated) |
-| `Ctrl+S` | Save current tab to file |
+| `Ctrl+S` | Save to file |
 
 ## Features in Detail
 
@@ -413,8 +415,8 @@ 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 (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 `{` to move to the previous row
+- Press `}` to move to the next row
 - Press `q` or `Escape` to close the modal
 
 ### 3. Row Selection
@@ -429,7 +431,7 @@ The application provides multiple modes for selecting rows (marks it for filteri
 - `{` - Go to previous selected row
 - `}` - Go to next selected row
 
-**Advanced Matching Options**:
+**Advanced Options**:
 
 When searching or finding, you can use checkboxes in the dialog to enable:
 - **Match Nocase**: Ignore case differences
@@ -445,7 +447,7 @@ These options work with plain text searches. Use Polars regex patterns in expres
 - Use `u` to undo any search or filter
 
 ### 4. Find & Replace
-**Find Operations** - Find by value/expression and highlight matching cells:
+Find by value/expression and highlight matching cells:
 - `/` - Find cursor value within current column (respects data type)
 - `?` - Open dialog to search current column with expression
 - `;` - Find cursor value across all columns
@@ -469,10 +471,10 @@ When you press `r` or `R`, enter:
 
 **Replace Interactive**:
 - Review each match one at a time (confirm, skip, or cancel)
-- Shows progress: `X of Y`
+- Shows progress
 
 **Tips:**
-- Search are done by string value (i.e. ignoring data type)
+- Search are done by string value (i.e., ignoring data type)
 - Type `NULL` to replace null/missing values
 - Use `Match Nocase` for case-insensitive matching
 - Use `Match Whole` to avoid partial replacements
@@ -480,7 +482,7 @@ When you press `r` or `R`, enter:
 
 ### 5. Filter vs. View
 
-Both operations show rows that are selected or contain matching cells, but with fundamentally different effects:
+Both operations show selected rows but with fundamentally different effects:
 
 | Operation | Keyboard | Effect | Data Preserved |
 |-----------|----------|--------|-----------------|
@@ -571,8 +573,8 @@ View quick metadata about your dataframe and columns to understand their structu
 
 **Dataframe Metadata** (`m`):
 - Press `m` to open a modal displaying:
-  - **Rows** - Total number of rows in the dataframe
-  - **Columns** - Total number of columns in the dataframe
+  - **Row** - Total number of rows in the dataframe
+  - **Column** - Total number of columns in the dataframe
 
 **Column Metadata** (`M`):
 - Press `M` to open a modal displaying details for all columns:
@@ -751,7 +753,6 @@ SELECT specific columns and apply WHERE conditions without writing full SQL:
 #### Advanced SQL Interface (`L`)
 Execute complete SQL queries for advanced data manipulation:
 - Write full SQL queries with standard [SQL syntax](https://docs.pola.rs/api/python/stable/reference/sql/index.html)
-- Support for JOINs, GROUP BY, aggregations, and more
 - Access to all SQL capabilities for complex transformations
 - Always use `self` as the table name
 - Syntax highlighted
@@ -773,7 +774,7 @@ WHERE `product id` = 7
 
 Copies value to system clipboard with `pbcopy` on macOS and `xclip` on Linux.
 
-**Note** May require a X server to work.
+**Note**: may require a X server to work.
 
 - Press `c` to copy cursor value
 - Press `Ctrl+C` to copy column values
@@ -815,8 +816,8 @@ Manage multiple files and dataframes simultaneously with tabs.
 - **`Double-click`** - Rename the tab
 - **`Ctrl+D`** - Duplicate current tab (creates a copy with same data and state)
 - **`Ctrl+T`** - Save current tab to file
-- **`w`** - Save current tab to file (overwrite without prompt)
 - **`Ctrl+A`** - Save all tabs in a single Excel file
+- **`w`** - Save current tab to file (overwrite without prompt)
 - **`W`** - Save all tabs to file (overwrite without prompt)
 - **`q`** - Close current tab (closes tab, prompts to save if unsaved changes)
 - **`Q`** - Close all tabs and exit app (prompts to save tabs with unsaved changes)

{dataframe_textual-2.0.0.dist-info → dataframe_textual-2.1.0.dist-info}/RECORD

@@ -2,13 +2,13 @@ dataframe_textual/__init__.py,sha256=E53fW1spQRA4jW9grxSqPEmoe9zofzr6twdveMbt_W8
 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=4tnE6apxQ_EJoSvFwq4ZuDqKTHSBUcQVFYSDbweIK98,147612
-dataframe_textual/data_frame_viewer.py,sha256=fkiQ0OGi2rrE06VAVJuAM_9wwmqLY1AZouwEMNoDmy8,22367
+dataframe_textual/data_frame_table.py,sha256=pPddPOa3hV3voCf3_9botg0jeNcPdWsN7Oiw5vKdMdU,148701
+dataframe_textual/data_frame_viewer.py,sha256=pX1xU3REQnMMEHapYKmr_FH1hFGExqTrOjjFWBx7dtg,22406
 dataframe_textual/sql_screen.py,sha256=P3j1Fv45NIKEYo9adb7NPod54FaU-djFIvCUMMHbvjY,7534
-dataframe_textual/table_screen.py,sha256=XlVxU_haCxPoA41ZIDcwixOg341Wf35JrFwPoCTnMzE,19033
+dataframe_textual/table_screen.py,sha256=XPzJI6FXjwnxtQSMTmluygwkYM-0-Lx3v9o-MuL6bMg,19071
 dataframe_textual/yes_no_screen.py,sha256=NI7Zt3rETDWYiT5CH_FDy7sIWkZ7d7LquaZZbX79b2g,26400
-dataframe_textual-2.0.0.dist-info/METADATA,sha256=9prx6qymZRsp42WCJbl1S9qluBkY2IBRDMN-JHiBL_U,29306
-dataframe_textual-2.0.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-dataframe_textual-2.0.0.dist-info/entry_points.txt,sha256=R_GoooOxcq6ab4RaHiVoZ4zrZJ-phMcGmlL2rwqncW8,107
-dataframe_textual-2.0.0.dist-info/licenses/LICENSE,sha256=AVTg0gk1X-LHI-nnHlAMDQetrwuDZK4eypgSMDO46Yc,1069
-dataframe_textual-2.0.0.dist-info/RECORD,,
+dataframe_textual-2.1.0.dist-info/METADATA,sha256=6RZnWlkm6mWKnQNMUTUGBeklOFYXQgWtd1lOJmz5oX0,29160
+dataframe_textual-2.1.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+dataframe_textual-2.1.0.dist-info/entry_points.txt,sha256=R_GoooOxcq6ab4RaHiVoZ4zrZJ-phMcGmlL2rwqncW8,107
+dataframe_textual-2.1.0.dist-info/licenses/LICENSE,sha256=AVTg0gk1X-LHI-nnHlAMDQetrwuDZK4eypgSMDO46Yc,1069
+dataframe_textual-2.1.0.dist-info/RECORD,,