dataframe-textual 1.2.0__py3-none-any.whl → 1.4.0__py3-none-any.whl

dataframe_textual/data_frame_viewer.py

@@ -10,7 +10,7 @@ from textual.app import App, ComposeResult
 from textual.css.query import NoMatches
 from textual.theme import BUILTIN_THEMES
 from textual.widgets import TabbedContent, TabPane
-from textual.widgets.tabbed_content import ContentTab, ContentTabs
+from textual.widgets.tabbed_content import ContentTabs
 
 from .common import get_next_item, load_file
 from .data_frame_help_panel import DataFrameHelpPanel
@@ -26,7 +26,7 @@ class DataFrameViewer(App):
 
         ## 🎯 File & Tab Management
         - **Ctrl+O** - 📁 Add a new tab
-        - **Ctrl+Shift+S** - 💾 Save all tabs
+        - **Ctrl+A** - 💾 Save all tabs
         - **Ctrl+W** - ❌ Close current tab
         - **>** or **b** - ▶️ Next tab
         - **<** - ◀️ Previous tab
@@ -34,7 +34,7 @@ class DataFrameViewer(App):
         - **q** - 🚪 Quit application
 
         ## 🎨 View & Settings
-        - **Ctrl+H** - ❓ Toggle this help panel
+        - **F1** - ❓ Toggle this help panel
         - **k** - 🌙 Cycle through themes
 
         ## ⭐ Features
@@ -51,30 +51,25 @@ class DataFrameViewer(App):
 
     BINDINGS = [
         ("q", "quit", "Quit"),
-        ("ctrl+h", "toggle_help_panel", "Help"),
+        ("f1", "toggle_help_panel", "Help"),
         ("B", "toggle_tab_bar", "Toggle Tab Bar"),
         ("ctrl+o", "add_tab", "Add Tab"),
-        ("ctrl+shift+s", "save_all_tabs", "Save All Tabs"),
+        ("ctrl+a", "save_all_tabs", "Save All Tabs"),
         ("ctrl+w", "close_tab", "Close Tab"),
         ("greater_than_sign,b", "next_tab(1)", "Next Tab"),
         ("less_than_sign", "next_tab(-1)", "Prev Tab"),
     ]
 
     CSS = """
-        TabbedContent {
-            height: 100%;  /* Or a specific value, e.g., 20; */
-        }
         TabbedContent > ContentTabs {
             dock: bottom;
         }
         TabbedContent > ContentSwitcher {
             overflow: auto;
-            height: 1fr;  /* Takes the remaining space below tabs */
+            height: 1fr;
         }
-
-        TabbedContent ContentTab.active {
-            background: $primary;
-            color: $text;
+        ContentTab.-active {
+            background: $block-cursor-background; /* Same as underline */
         }
     """
 
@@ -85,7 +80,7 @@ class DataFrameViewer(App):
 
         Args:
             sources: sources to load dataframes from, each as a tuple of
-                     (DataFrame | LazyFrame, filename, tabname).
+                     (DataFrame, filename, tabname).
 
         Returns:
             None
@@ -127,7 +122,11 @@ class DataFrameViewer(App):
                     self.tabs[tab] = table
                     yield tab
                 except Exception as e:
-                    self.notify(f"Error loading {tabname}: {e}", severity="error")
+                    self.notify(
+                        f"Error loading [$error]{filename}[/]: Try [$accent]-I[/] to disable schema inference",
+                        severity="error",
+                    )
+                    self.log(f"Error loading `{filename}`: {str(e)}")
 
     def on_mount(self) -> None:
         """Set up the application when it starts.
@@ -178,12 +177,6 @@ class DataFrameViewer(App):
         if table.loaded_rows == 0:
             table._setup_table()
 
-        # Apply background color to active tab
-        event.tab.add_class("active")
-        for tab in self.tabbed.query(ContentTab):
-            if tab != event.tab:
-                tab.remove_class("active")
-
     def action_toggle_help_panel(self) -> None:
         """Toggle the help panel on or off.
 
@@ -305,11 +298,11 @@ class DataFrameViewer(App):
             try:
                 n_tab = 0
                 for lf, filename, tabname in load_file(filename, prefix_sheet=True):
-                    self._add_tab(lf.collect(), filename, tabname)
+                    self._add_tab(lf, filename, tabname)
                     n_tab += 1
-                self.notify(f"Added [$accent]{n_tab}[/] tab(s) for [$success]{filename}[/]", title="Open")
+                # self.notify(f"Added [$accent]{n_tab}[/] tab(s) for [$success]{filename}[/]", title="Open")
             except Exception as e:
-                self.notify(f"Error: {e}", title="Open", severity="error")
+                self.notify(f"Error loading [$error]{filename}[/]: {str(e)}", title="Open", severity="error")
         else:
             self.notify(f"File does not exist: [$warning]{filename}[/]", title="Open", severity="warning")
 
@@ -321,15 +314,18 @@ class DataFrameViewer(App):
         if this is no longer the only tab.
 
         Args:
-            df: The Polars DataFrame to display in the new tab.
+            lf: The Polars DataFrame to display in the new tab.
             filename: The source filename for this data (used in table metadata).
             tabname: The display name for the tab.
 
         Returns:
             None
         """
-        if any(tab.name == tabname for tab in self.tabs):
-            tabname = f"{tabname}_{len(self.tabs) + 1}"
+        # Ensure unique tab names
+        counter = 1
+        while any(tab.name == tabname for tab in self.tabs):
+            tabname = f"{tabname}_{counter}"
+            counter += 1
 
         # Find an available tab index
         tab_idx = f"tab_{len(self.tabs) + 1}"
@@ -369,6 +365,6 @@ class DataFrameViewer(App):
                 if active_pane := self.tabbed.active_pane:
                     self.tabbed.remove_pane(active_pane.id)
                     self.tabs.pop(active_pane)
-                    self.notify(f"Closed tab [$success]{active_pane.name}[/]", title="Close")
+                    # self.notify(f"Closed tab [$success]{active_pane.name}[/]", title="Close")
         except NoMatches:
             pass

dataframe_textual/sql_screen.py

@@ -0,0 +1,202 @@
+"""Modal screens for Polars sql manipulation"""
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from .data_frame_table import DataFrameTable
+
+import polars as pl
+from textual.app import ComposeResult
+from textual.containers import Container, Horizontal
+from textual.screen import ModalScreen
+from textual.widgets import Button, Input, Label, SelectionList, TextArea
+from textual.widgets.selection_list import Selection
+
+
+class SqlScreen(ModalScreen):
+    """Base class for modal screens handling SQL query."""
+
+    DEFAULT_CSS = """
+        SqlScreen {
+            align: center middle;
+        }
+
+        SqlScreen > Container {
+            width: auto;
+            height: auto;
+            border: heavy $accent;
+            border-title-color: $accent;
+            border-title-background: $panel;
+            border-title-style: bold;
+            background: $background;
+            padding: 1 2;
+            overflow: auto;
+        }
+
+        #button-container {
+            width: auto;
+            margin: 1 0 0 0;
+            height: 3;
+            align: center middle;
+        }
+
+        Button {
+            margin: 0 2;
+        }
+
+    """
+
+    def __init__(self, dftable: "DataFrameTable", on_yes_callback=None) -> None:
+        """Initialize the SQL screen."""
+        super().__init__()
+        self.dftable = dftable  # DataFrameTable
+        self.df: pl.DataFrame = dftable.df  # Polars DataFrame
+        self.on_yes_callback = on_yes_callback
+
+    def compose(self) -> ComposeResult:
+        """Compose the SQL screen widget structure."""
+        # Shared by subclasses
+        with Horizontal(id="button-container"):
+            yield Button("Apply", id="yes", variant="success")
+            yield Button("Cancel", id="no", variant="error")
+
+    def on_key(self, event) -> None:
+        """Handle key press events in the SQL screen"""
+        if event.key in ("q", "escape"):
+            self.app.pop_screen()
+            event.stop()
+        elif event.key == "enter":
+            self._handle_yes()
+            event.stop()
+        elif event.key == "escape":
+            self.dismiss(None)
+            event.stop()
+
+    def on_button_pressed(self, event: Button.Pressed) -> None:
+        """Handle button press events in the SQL screen."""
+        if event.button.id == "yes":
+            self._handle_yes()
+        elif event.button.id == "no":
+            self.dismiss(None)
+
+    def _handle_yes(self) -> None:
+        """Handle Yes button/Enter key press."""
+        if self.on_yes_callback:
+            result = self.on_yes_callback()
+            self.dismiss(result)
+        else:
+            self.dismiss(True)
+
+
+class SimpleSqlScreen(SqlScreen):
+    """Simple SQL query screen."""
+
+    DEFAULT_CSS = SqlScreen.DEFAULT_CSS.replace("SqlScreen", "SimpleSqlScreen")
+
+    CSS = """
+        SimpleSqlScreen SelectionList {
+            width: auto;
+            min-width: 40;
+            margin: 1 0;
+        }
+
+        SimpleSqlScreen SelectionList:blur {
+            border: solid $secondary;
+        }
+
+        SimpleSqlScreen Label {
+            width: auto;
+        }
+
+        SimpleSqlScreen Input {
+            width: auto;
+        }
+
+        SimpleSqlScreen Input:blur {
+            border: solid $secondary;
+        }
+
+        #button-container {
+            min-width: 40;
+        }
+    """
+
+    def __init__(self, dftable: "DataFrameTable") -> None:
+        """Initialize the simple SQL screen.
+
+        Sets up the modal screen with reference to the main DataFrameTable widget
+        and stores the DataFrame for display.
+
+        Args:
+            dftable: Reference to the parent DataFrameTable widget.
+
+        Returns:
+            None
+        """
+        super().__init__(dftable, on_yes_callback=self._handle_simple)
+
+    def compose(self) -> ComposeResult:
+        """Compose the simple SQL screen widget structure."""
+        with Container(id="sql-container") as container:
+            container.border_title = "SQL Query"
+            yield Label("Select columns (default to all):", id="select-label")
+            yield SelectionList(*[Selection(col, col) for col in self.df.columns], id="column-selection")
+            yield Label("Where condition (optional)", id="where-label")
+            yield Input(placeholder="e.g., age > 30 and height < 180", id="where-input")
+            yield from super().compose()
+
+    def _handle_simple(self) -> None:
+        """Handle Yes button/Enter key press."""
+        selections = self.query_one(SelectionList).selected
+        columns = ", ".join(f"`{s}`" for s in selections) if selections else "*"
+        where = self.query_one(Input).value.strip()
+
+        return columns, where
+
+
+class AdvancedSqlScreen(SqlScreen):
+    """Advanced SQL query screen."""
+
+    DEFAULT_CSS = SqlScreen.DEFAULT_CSS.replace("SqlScreen", "AdvancedSqlScreen")
+
+    CSS = """
+        AdvancedSqlScreen TextArea {
+            width: auto;
+            min-width: 60;
+            height: auto;
+            min-height: 10;
+        }
+
+        #button-container {
+            min-width: 60;
+        }
+    """
+
+    def __init__(self, dftable: "DataFrameTable") -> None:
+        """Initialize the simple SQL screen.
+
+        Sets up the modal screen with reference to the main DataFrameTable widget
+        and stores the DataFrame for display.
+
+        Args:
+            dftable: Reference to the parent DataFrameTable widget.
+
+        Returns:
+            None
+        """
+        super().__init__(dftable, on_yes_callback=self._handle_advanced)
+
+    def compose(self) -> ComposeResult:
+        """Compose the advanced SQL screen widget structure."""
+        with Container(id="sql-container") as container:
+            container.border_title = "Advanced SQL Query"
+            yield TextArea.code_editor(
+                placeholder="Enter SQL query (use `self` as the table name), e.g., \n\nSELECT * \nFROM self \nWHERE age > 30",
+                id="sql-textarea",
+                language="sql",
+            )
+            yield from super().compose()
+
+    def _handle_advanced(self) -> None:
+        """Handle Yes button/Enter key press."""
+        return self.query_one(TextArea).text.strip()

dataframe_textual/table_screen.py

@@ -37,7 +37,7 @@ class TableScreen(ModalScreen):
         }
     """
 
-    def __init__(self, dftable: DataFrameTable) -> None:
+    def __init__(self, dftable: "DataFrameTable") -> None:
         """Initialize the table screen.
 
         Sets up the base modal screen with reference to the main DataFrameTable widget
@@ -50,8 +50,8 @@ class TableScreen(ModalScreen):
             None
         """
         super().__init__()
-        self.df: pl.DataFrame = dftable.df  # Polars DataFrame
         self.dftable = dftable  # DataFrameTable
+        self.df: pl.DataFrame = dftable.df  # Polars DataFrame
         self.thousand_separator = False  # Whether to use thousand separators in numbers
 
     def compose(self) -> ComposeResult:
@@ -181,7 +181,12 @@ 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):
             self.table.add_row(
-                *format_row([col, val], [None, dtype], apply_justify=False, thousand_separator=self.thousand_separator)
+                *format_row(
+                    [col, val],
+                    [None, dtype],
+                    apply_justify=False,
+                    thousand_separator=self.thousand_separator,
+                )
             )
 
         self.table.cursor_type = "row"
@@ -225,7 +230,7 @@ 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", col_idx: int | None = None):
         super().__init__(dftable)
         self.col_idx = col_idx  # None for dataframe statistics, otherwise column index
 
@@ -240,9 +245,11 @@ class StatisticsScreen(TableScreen):
         if self.col_idx is None:
             # Dataframe statistics
             self._build_dataframe_stats()
+            self.table.cursor_type = "column"
         else:
             # Column statistics
             self._build_column_stats()
+            self.table.cursor_type = "row"
 
     def _build_column_stats(self) -> None:
         """Build statistics for a single column."""
@@ -344,15 +351,16 @@ class FrequencyScreen(TableScreen):
 
     CSS = TableScreen.DEFAULT_CSS.replace("TableScreen", "FrequencyScreen")
 
-    def __init__(self, col_idx: int, dftable: DataFrameTable):
+    def __init__(self, col_idx: int, dftable: "DataFrameTable") -> None:
         super().__init__(dftable)
         self.col_idx = col_idx
         self.sorted_columns = {
             1: True,  # Count
         }
-        self.df: pl.DataFrame = (
-            dftable.df[dftable.df.columns[self.col_idx]].value_counts(sort=True).sort("count", descending=True)
-        )
+
+        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.col_idx]].value_counts(sort=True).sort("count", descending=True)
 
     def on_mount(self) -> None:
         """Create the frequency table."""
@@ -385,9 +393,6 @@ class FrequencyScreen(TableScreen):
         dtype = self.dftable.df.dtypes[self.col_idx]
         dc = DtypeConfig(dtype)
 
-        # Calculate frequencies using Polars
-        total_count = len(self.dftable.df)
-
         # Add column headers with sort indicators
         columns = [
             (column, "Value", 0),
@@ -415,7 +420,7 @@ class FrequencyScreen(TableScreen):
         # Add rows to the frequency table
         for row_idx, row in enumerate(self.df.rows()):
             column, count = row
-            percentage = (count / total_count) * 100
+            percentage = (count / self.total_count) * 100
 
             if column is None:
                 value = NULL_DISPLAY
@@ -432,7 +437,7 @@ class FrequencyScreen(TableScreen):
                     f"{count:,}" if self.thousand_separator else str(count), style=ds_int.style, justify=ds_int.justify
                 ),
                 Text(
-                    f"{percentage:,.3f}" if self.thousand_separator else f"{percentage:.3f}",
+                    format_float(percentage, self.thousand_separator),
                     style=ds_float.style,
                     justify=ds_float.justify,
                 ),
@@ -446,8 +451,16 @@ class FrequencyScreen(TableScreen):
         # Add a total row
         self.table.add_row(
             Text("Total", style="bold", justify=dc.justify),
-            Text(f"{total_count:,}", style="bold", justify="right"),
-            Text("100.00", style="bold", justify="right"),
+            Text(
+                f"{self.total_count:,}" if self.thousand_separator else str(self.total_count),
+                style="bold",
+                justify="right",
+            ),
+            Text(
+                format_float(100.0, self.thousand_separator),
+                style="bold",
+                justify="right",
+            ),
             Bar(
                 highlight_range=(0.0, 10),
                 width=10,
@@ -460,12 +473,10 @@ class FrequencyScreen(TableScreen):
         row_idx, col_idx = self.table.cursor_coordinate
         col_sort = col_idx if col_idx == 0 else 1
 
-        sort_dir = self.sorted_columns.get(col_sort)
-        if sort_dir is not None:
+        if self.sorted_columns.get(col_sort) == descending:
             # If already sorted in the same direction, do nothing
-            if sort_dir == descending:
-                self.notify("Already sorted in that order", title="Sort", severity="warning")
-                return
+            # self.notify("Already sorted in that order", title="Sort", severity="warning")
+            return
 
         self.sorted_columns.clear()
         self.sorted_columns[col_sort] = descending

dataframe_textual/yes_no_screen.py

@@ -33,9 +33,11 @@ class YesNoScreen(ModalScreen):
             min-width: 40;
             max-width: 60;
             height: auto;
-            border: heavy $primary;
-            border-title-color: $primary-lighten-3;
-            background: $surface;
+            border: heavy $accent;
+            border-title-color: $accent;
+            border-title-background: $panel;
+            border-title-style: bold;
+            background: $background;
             padding: 1 2;
         }
 
@@ -241,6 +243,7 @@ class YesNoScreen(ModalScreen):
                         yield self.no
 
     def on_button_pressed(self, event: Button.Pressed) -> None:
+        """Handle button press events in the Yes/No screen."""
         if event.button.id == "yes":
             self._handle_yes()
         elif event.button.id == "maybe":
@@ -249,6 +252,7 @@ class YesNoScreen(ModalScreen):
             self.dismiss(None)
 
     def on_key(self, event) -> None:
+        """Handle key press events in the table screen."""
         if event.key == "enter":
             self._handle_yes()
             event.stop()
@@ -298,7 +302,7 @@ class SaveFileScreen(YesNoScreen):
 
 
 class ConfirmScreen(YesNoScreen):
-    """Modal screen to confirm file overwrite."""
+    """Modal screen to ask for confirmation."""
 
     CSS = YesNoScreen.DEFAULT_CSS.replace("YesNoScreen", "ConfirmScreen")
 
@@ -582,7 +586,7 @@ class AddColumnScreen(YesNoScreen):
             title="Add Column",
             label="Enter column name",
             input="column name",
-            label2="Enter value or Polars expression, e.g., 123, NULL, $_ * 2",
+            label2="Enter value or Polars expression, e.g., abc, pl.lit(123), NULL, $_ * 2, $1 + $2, $_.str.to_uppercase(), pl.concat_str($_, pl.lit('-suffix'))",
             input2="column value or expression",
             on_yes_callback=self._get_input,
         )
@@ -609,7 +613,7 @@ class AddColumnScreen(YesNoScreen):
             return self.cidx, col_name, pl.lit(None)
         elif tentative_expr(term):
             try:
-                expr = validate_expr(term, self.df, self.cidx)
+                expr = validate_expr(term, self.df.columns, self.cidx)
                 return self.cidx, col_name, expr
             except ValueError as e:
                 self.notify(f"Invalid expression [$error]{term}[/]: {str(e)}", title="Add Column", severity="error")
@@ -634,10 +638,10 @@ class FindReplaceScreen(YesNoScreen):
 
     CSS = YesNoScreen.DEFAULT_CSS.replace("YesNoScreen", "ReplaceScreen")
 
-    def __init__(self, dftable: DataFrameTable):
+    def __init__(self, dftable: "DataFrameTable", title: str = "Find and Replace"):
         term_find = str(dftable.cursor_value)
         super().__init__(
-            title="Find and Replace",
+            title=title,
             label="Find",
             input=term_find,
             label2="Replace with",