dataframe-textual 1.16.2__tar.gz → 2.0.0__tar.gz

{dataframe_textual-1.16.2 → dataframe_textual-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataframe-textual
-Version: 1.16.2
+Version: 2.0.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
@@ -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-1.16.2 → dataframe_textual-2.0.0}/README.md

@@ -286,7 +286,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 |
@@ -310,9 +310,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
 
@@ -372,8 +372,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
@@ -382,7 +382,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
@@ -552,8 +552,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-1.16.2 → dataframe_textual-2.0.0}/pyproject.toml

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

{dataframe_textual-1.16.2 → dataframe_textual-2.0.0}/src/dataframe_textual/__init__.py

@@ -1,15 +1,32 @@
 """DataFrame Viewer - Interactive CSV/Excel viewer for the terminal."""
 
+from importlib.metadata import version
+
+__version__ = version("dataframe-textual")
+
 from .data_frame_help_panel import DataFrameHelpPanel
 from .data_frame_table import DataFrameTable, History
 from .data_frame_viewer import DataFrameViewer
-from .table_screen import FrequencyScreen, RowDetailScreen, TableScreen
+from .table_screen import (
+    FrequencyScreen,
+    MetaColumnScreen,
+    MetaShape,
+    RowDetailScreen,
+    StatisticsScreen,
+    TableScreen,
+)
 from .yes_no_screen import (
+    AddColumnScreen,
+    AddLinkScreen,
     ConfirmScreen,
     EditCellScreen,
+    EditColumnScreen,
     FilterScreen,
+    FindReplaceScreen,
     FreezeScreen,
     OpenFileScreen,
+    RenameColumnScreen,
+    RenameTabScreen,
     SaveFileScreen,
     SearchScreen,
     YesNoScreen,
@@ -23,6 +40,9 @@ __all__ = [
     "TableScreen",
     "RowDetailScreen",
     "FrequencyScreen",
+    "StatisticsScreen",
+    "MetaShape",
+    "MetaColumnScreen",
     "YesNoScreen",
     "SaveFileScreen",
     "ConfirmScreen",
@@ -31,4 +51,10 @@ __all__ = [
     "FilterScreen",
     "FreezeScreen",
     "OpenFileScreen",
+    "RenameColumnScreen",
+    "EditColumnScreen",
+    "AddColumnScreen",
+    "AddLinkScreen",
+    "FindReplaceScreen",
+    "RenameTabScreen",
 ]

{dataframe_textual-1.16.2 → dataframe_textual-2.0.0}/src/dataframe_textual/__main__.py

@@ -4,6 +4,7 @@ import argparse
 import sys
 from pathlib import Path
 
+from . import __version__
 from .common import SUPPORTED_FORMATS, load_dataframe
 from .data_frame_viewer import DataFrameViewer
 
@@ -24,6 +25,12 @@ def cli() -> argparse.Namespace:
         "  cat data.csv | %(prog)s --format csv\n",
     )
     parser.add_argument("files", nargs="*", help="Files to view (or read from stdin)")
+    parser.add_argument(
+        "-V",
+        "--version",
+        action="version",
+        version=f"%(prog)s {__version__}",
+    )
     parser.add_argument(
         "-f",
         "--format",

{dataframe_textual-1.16.2 → dataframe_textual-2.0.0}/src/dataframe_textual/common.py

@@ -152,8 +152,8 @@ SUBSCRIPT_DIGITS = {
 # Cursor types ("none" removed)
 CURSOR_TYPES = ["row", "column", "cell"]
 
-# For row index column
-RIDX = "^_ridx_^"
+# Row index mapping between filtered and original dataframe
+RID = "^_RID_^"
 
 
 @dataclass
@@ -224,7 +224,7 @@ def format_row(vals, dtypes, styles: list[str | None] | None = None, thousand_se
     return formatted_row
 
 
-def rindex(lst: list, value) -> int:
+def rindex(lst: list, value, pos: int | None = None) -> int:
     """Return the last index of value in a list. Return -1 if not found.
 
     Searches through the list in reverse order to find the last occurrence
@@ -237,9 +237,12 @@ def rindex(lst: list, value) -> int:
     Returns:
         The index (0-based) of the last occurrence, or -1 if not found.
     """
+    n = len(lst)
     for i, item in enumerate(reversed(lst)):
+        if pos is not None and (n - 1 - i) > pos:
+            continue
         if item == value:
-            return len(lst) - 1 - i
+            return n - 1 - i
     return -1
 
 
@@ -272,7 +275,7 @@ def parse_placeholders(template: str, columns: list[str], current_cidx: int) ->
 
     Supports multiple placeholder types:
     - `$_` - Current column (based on current_cidx parameter)
-    - `$#` - Row index (1-based, requires '^__ridx__^' column to be present)
+    - `$#` - Row index (1-based)
     - `$1`, `$2`, etc. - Column index (1-based)
     - `$name` - Column name (e.g., `$product_id`)
     - `` $`col name` `` - Column name with spaces (e.g., `` $`product id` ``)
@@ -323,7 +326,7 @@ def parse_placeholders(template: str, columns: list[str], current_cidx: int) ->
             parts.append(pl.col(col_name))
         elif placeholder == "#":
             # $# refers to row index (1-based)
-            parts.append((pl.col(RIDX)))
+            parts.append(pl.col(RID))
         elif placeholder.isdigit():
             # $1, $2, etc. refer to columns by 1-based position index
             col_idx = int(placeholder) - 1  # Convert to 0-based
@@ -364,14 +367,14 @@ def parse_polars_expression(expression: str, columns: list[str], current_cidx: i
 
     Replaces column references with Polars col() expressions:
     - $_ - Current selected column
-    - $# - Row index (1-based, requires '^__ridx__^' column to be present)
+    - $# - Row index (1-based)
     - $1, $2, etc. - Column index (1-based)
     - $col_name - Column name (valid identifier starting with _ or letter)
     - $`col name` - Column name with spaces (backtick quoted)
 
     Examples:
     - "$_ > 50" -> "pl.col('current_col') > 50"
-    - "$# > 10" -> "pl.col('^__ridx__^') > 10"
+    - "$# > 10" -> "pl.col('^_RID_^') > 10"
     - "$1 > 50" -> "pl.col('col0') > 50"
     - "$name == 'Alex'" -> "pl.col('name') == 'Alex'"
     - "$age < $salary" -> "pl.col('age') < pl.col('salary')"
@@ -404,7 +407,10 @@ def parse_polars_expression(expression: str, columns: list[str], current_cidx: i
         if isinstance(part, pl.Expr):
             col = part.meta.output_name()
 
-            result.append(f"pl.col('{col}')")
+            if col == RID:  # Convert to 1-based
+                result.append(f"(pl.col('{col}') + 1)")
+            else:
+                result.append(f"pl.col('{col}')")
         else:
             result.append(part)
 

{dataframe_textual-1.16.2 → dataframe_textual-2.0.0}/src/dataframe_textual/data_frame_help_panel.py

@@ -74,9 +74,6 @@ class DataFrameHelpPanel(Widget):
 
         Initializes the help panel by setting up a watcher for focused widget changes
         to dynamically update help text based on which widget has focus.
-
-        Returns:
-            None
         """
 
         # def update_help(focused_widget: Widget | None):