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

dataframe_textual/data_frame_table.py

@@ -9,6 +9,7 @@ from typing import Any
 
 import polars as pl
 from rich.text import Text
+from textual import work
 from textual.coordinate import Coordinate
 from textual.events import Click
 from textual.widgets import DataTable, TabPane
@@ -30,9 +31,11 @@ from .common import (
     format_row,
     get_next_item,
     rindex,
+    sleep_async,
     tentative_expr,
     validate_expr,
 )
+from .sql_screen import AdvancedSqlScreen, SimpleSqlScreen
 from .table_screen import FrequencyScreen, RowDetailScreen, StatisticsScreen
 from .yes_no_screen import (
     AddColumnScreen,
@@ -142,6 +145,10 @@ class DataFrameTable(DataTable):
         - **"** - 📍 Filter to show only selected rows
         - **T** - 🧹 Clear all selections and matches
 
+        ## 🔍 SQL Interface
+        - **l** - 💬 Open simple SQL interface (select columns & WHERE clause)
+        - **L** - 🔎 Open advanced SQL interface (full SQL queries)
+
         ## ✏️ Edit & Modify
         - **Double-click** - ✍️ Edit cell or rename column header
         - **e** - ✍️ Edit current cell
@@ -154,11 +161,10 @@ class DataFrameTable(DataTable):
         - **delete** - ❌ Clear current cell (set to NULL)
         - **-** - ❌ Delete current column
         - **_** - ❌ Delete column and those after
-        - **Ctrl+-** - ❌ Delete column and those before
+        - **Ctrl+_** - ❌ Delete column and those before
         - **d** - 📋 Duplicate current column
         - **D** - 📋 Duplicate current row
 
-
         ## 🎯 Reorder
         - **Shift+↑↓** - ⬆️⬇️ Move row up/down
         - **Shift+←→** - ⬅️➡️ Move column left/right
@@ -235,7 +241,7 @@ class DataFrameTable(DataTable):
         ("delete", "clear_cell", "Clear cell"),
         ("minus", "delete_column", "Delete column"),  # `-`
         ("underscore", "delete_column_and_after", "Delete column and those after"),  # `_`
-        ("ctrl+minus", "delete_column_and_before", "Delete column and those before"),  # `Ctrl+-`
+        ("ctrl+underscore", "delete_column_and_before", "Delete column and those before"),  # `Ctrl+_`
         ("x", "delete_row", "Delete row"),
         ("X", "delete_row_and_below", "Delete row and those below"),
         ("ctrl+x", "delete_row_and_up", "Delete row and those up"),
@@ -254,11 +260,14 @@ class DataFrameTable(DataTable):
         ("shift+up", "move_row_up", "Move row up"),
         ("shift+down", "move_row_down", "Move row down"),
         # Type Conversion
-        ("number_sign", "cast_column_dtype('int')", "Cast column dtype to int"),  # `#`
-        ("percent_sign", "cast_column_dtype('float')", "Cast column dtype to float"),  # `%`
-        ("exclamation_mark", "cast_column_dtype('bool')", "Cast column dtype to bool"),  # `!`
-        ("dollar_sign", "cast_column_dtype('string')", "Cast column dtype to string"),  # `$`
+        ("number_sign", "cast_column_dtype('pl.Int64')", "Cast column dtype to integer"),  # `#`
+        ("percent_sign", "cast_column_dtype('pl.Float64')", "Cast column dtype to float"),  # `%`
+        ("exclamation_mark", "cast_column_dtype('pl.Boolean')", "Cast column dtype to bool"),  # `!`
+        ("dollar_sign", "cast_column_dtype('pl.String')", "Cast column dtype to string"),  # `$`
         ("at", "make_cell_clickable", "Make cell clickable"),  # `@`
+        # Sql
+        ("l", "simple_sql", "Simple SQL interface"),
+        ("L", "advanced_sql", "Advanced SQL interface"),
         # Undo/Redo
         ("u", "undo", "Undo"),
         ("U", "redo", "Redo"),
@@ -854,6 +863,14 @@ class DataFrameTable(DataTable):
         """Go to the previous selected row."""
         self._previous_selected_row()
 
+    def action_simple_sql(self) -> None:
+        """Open the SQL interface screen."""
+        self._simple_sql()
+
+    def action_advanced_sql(self) -> None:
+        """Open the advanced SQL interface screen."""
+        self._advanced_sql()
+
     def on_mouse_scroll_down(self, event) -> None:
         """Load more rows when scrolling down with mouse."""
         self._check_and_load_more()
@@ -865,6 +882,9 @@ class DataFrameTable(DataTable):
         Row keys are 0-based indices, which map directly to dataframe row indices.
         Column keys are header names from the dataframe.
         """
+        self.loaded_rows = 0
+        self.show_row_labels = True
+
         # Reset to original dataframe
         if reset:
             self.df = self.lazyframe.collect()
@@ -887,12 +907,15 @@ class DataFrameTable(DataTable):
                 stop = row_idx + 1
                 break
 
+        # Ensure all selected rows or matches are loaded
+        stop = max(stop, rindex(self.selected_rows, True) + 1)
+        stop = max(stop, max(self.matches.keys(), default=0) + 1)
+
         # Save current cursor position before clearing
         row_idx, col_idx = self.cursor_coordinate
 
         self._setup_columns()
         self._load_rows(stop)
-        self._do_highlight()
 
         # Restore cursor position
         if row_idx < len(self.rows) and col_idx < len(self.columns):
@@ -904,9 +927,7 @@ class DataFrameTable(DataTable):
         Column keys are header names from the dataframe.
         Column labels contain column names from the dataframe, with sort indicators if applicable.
         """
-        self.loaded_rows = 0
         self.clear(columns=True)
-        self.show_row_labels = True
 
         # Add columns with justified headers
         for col, dtype in zip(self.df.columns, self.df.dtypes):
@@ -944,25 +965,33 @@ class DataFrameTable(DataTable):
         start = self.loaded_rows
         df_slice = self.df.slice(start, stop - start)
 
-        for row_idx, row in enumerate(df_slice.rows(), start):
-            if not self.visible_rows[row_idx]:
+        for ridx, row in enumerate(df_slice.rows(), start):
+            if not self.visible_rows[ridx]:
                 continue  # Skip hidden rows
 
-            vals, dtypes = [], []
+            is_selected = self.selected_rows[ridx]
+            match_cols = self.matches.get(ridx, set())
+
+            vals, dtypes, styles = [], [], []
             for val, col, dtype in zip(row, self.df.columns, self.df.dtypes):
                 if col in self.hidden_columns:
                     continue  # Skip hidden columns
+
                 vals.append(val)
                 dtypes.append(dtype)
-            formatted_row = format_row(vals, dtypes, thousand_separator=self.thousand_separator)
+                # Highlight entire row if selected or has matches
+                styles.append("red" if is_selected or col in match_cols else None)
+
+            formatted_row = format_row(vals, dtypes, styles=styles, thousand_separator=self.thousand_separator)
 
             # Always add labels so they can be shown/hidden via CSS
-            self.add_row(*formatted_row, key=str(row_idx), label=str(row_idx + 1))
+            self.add_row(*formatted_row, key=str(ridx), label=str(ridx + 1))
 
         # Update loaded rows count
         self.loaded_rows = stop
 
         # self.notify(f"Loaded [$accent]{stop}/{len(self.df)}[/] rows from [$success]{self.name}[/]", title="Load")
+        # self.log(f"Loaded {stop}/{len(self.df)} rows from {self.name}")
 
     def _check_and_load_more(self) -> None:
         """Check if we need to load more rows and load them."""
@@ -1026,6 +1055,63 @@ class DataFrameTable(DataTable):
                 if need_update:
                     self.update_cell(row.key, col.key, cell_text)
 
+    @work(exclusive=True, description="Loading rows asynchronously...")
+    async def _load_rows_async(self, stop: int | None = None) -> None:
+        """Asynchronously load a batch of rows into the table.
+
+        Args:
+            stop: Stop loading rows when this index is reached. If None, load until the end of the dataframe.
+        """
+        if stop >= (total := len(self.df)):
+            stop = total
+
+        if stop > self.loaded_rows:
+            # Load incrementally with smaller chunks to prevent UI freezing
+            chunk_size = min(100, stop - self.loaded_rows)  # Load max 100 rows at a time
+            next_stop = min(self.loaded_rows + chunk_size, stop)
+            self._load_rows(next_stop)
+
+            # If there's more to load, schedule the next chunk with longer delay
+            if next_stop < stop:
+                # Use longer delay and call work method instead of set_timer
+                await sleep_async(0.1)  # 100ms delay to yield to UI
+                self._load_rows_async(stop)  # Recursive call within work context
+
+            # self.log(f"Async loaded {stop}/{len(self.df)} rows from {self.name}")
+
+    @work(exclusive=True, description="Doing highlight...")
+    async def _do_highlight_async(self) -> None:
+        """Perform the highlighting preparation in a worker."""
+        try:
+            # Calculate what needs to be loaded without actually loading
+            stop = rindex(self.selected_rows, True) + 1
+            stop = max(stop, max(self.matches.keys(), default=0) + 1)
+
+            # Call the highlighting method (runs in background worker)
+            self._highlight_async(stop)
+
+        except Exception as e:
+            self.notify(f"Error preparing highlight: {str(e)}", title="Search", severity="error")
+
+    @work(exclusive=True, description="Highlighting matches...")
+    async def _highlight_async(self, stop: int) -> None:
+        """Perform highlighting with async loading to avoid blocking."""
+        # Load rows in smaller chunks to avoid blocking
+        if stop > self.loaded_rows:
+            # Load incrementally to avoid one big block
+            chunk_size = min(100, stop - self.loaded_rows)  # Load max 100 rows at a time
+            next_stop = min(self.loaded_rows + chunk_size, stop)
+            self._load_rows(next_stop)
+
+            # If there's more to load, yield to event loop with delay
+            if next_stop < stop:
+                await sleep_async(0.05)  # 50ms delay to allow UI updates
+                self._highlight_async(stop)
+                return
+
+        # Now do the actual highlighting
+        self._highlight_table(force=False)
+
     # History & Undo
     def _create_history(self, description: str) -> None:
         """Create the initial history state."""
@@ -1080,16 +1166,16 @@ class DataFrameTable(DataTable):
             self.notify("No actions to undo", title="Undo", severity="warning")
             return
 
-        # Save current state for redo
-        self.history = self._create_history("Redo state")
-
         # Pop the last history state for undo
         history = self.histories.pop()
 
+        # Save current state for redo
+        self.history = self._create_history(history.description)
+
         # Restore state
         self._apply_history(history)
 
-        # self.notify(f"Reverted: {history.description}", title="Undo")
+        self.notify(f"Reverted: {history.description}", title="Undo")
 
     def _redo(self) -> None:
         """Redo the last undone action."""
@@ -1097,8 +1183,10 @@ class DataFrameTable(DataTable):
             self.notify("No actions to redo", title="Redo", severity="warning")
             return
 
+        description = self.history.description
+
         # Save current state for undo
-        self._add_history("Undo state")
+        self._add_history(description)
 
         # Restore state
         self._apply_history(self.history)
@@ -1106,7 +1194,7 @@ class DataFrameTable(DataTable):
         # Clear redo state
         self.history = None
 
-        # self.notify(f"Reapplied: {history.description}", title="Redo")
+        self.notify(f"Reapplied: {description}", title="Redo")
 
     # View
     def _view_row_detail(self) -> None:
@@ -1161,10 +1249,7 @@ class DataFrameTable(DataTable):
         if fixed_columns >= 0:
             self.fixed_columns = fixed_columns
 
-        self.notify(
-            f"Pinned [$accent]{fixed_rows}[/] rows and [$success]{fixed_columns}[/] columns",
-            title="Pin",
-        )
+        # self.notify(f"Pinned [$accent]{fixed_rows}[/] rows and [$success]{fixed_columns}[/] columns", title="Pin")
 
     # Delete & Move
     def _delete_column(self, more: str = None) -> None:
@@ -1184,7 +1269,7 @@ class DataFrameTable(DataTable):
                 col_names_to_remove.append(col_key.value)
                 col_keys_to_remove.append(col_key)
 
-            descr = f"Removed column [$success]{col_name}[/] and all columns before"
+            message = f"Removed column [$success]{col_name}[/] and all columns before"
 
         # Remove all columns after the current column
         elif more == "after":
@@ -1193,16 +1278,16 @@ class DataFrameTable(DataTable):
                 col_names_to_remove.append(col_key.value)
                 col_keys_to_remove.append(col_key)
 
-            descr = f"Removed column [$success]{col_name}[/] and all columns after"
+            message = f"Removed column [$success]{col_name}[/] and all columns after"
 
         # Remove only the current column
         else:
             col_names_to_remove.append(col_name)
             col_keys_to_remove.append(col_key)
-            descr = f"Removed column [$success]{col_name}[/]"
+            message = f"Removed column [$success]{col_name}[/]"
 
         # Add to history
-        self._add_history(descr)
+        self._add_history(message)
 
         # Remove the columns from the table display using the column names as keys
         for ck in col_keys_to_remove:
@@ -1229,7 +1314,7 @@ class DataFrameTable(DataTable):
         # Remove from dataframe
         self.df = self.df.drop(col_names_to_remove)
 
-        # self.notify(descr, title="Delete")
+        self.notify(message, title="Delete")
 
     def _hide_column(self) -> None:
         """Hide the currently selected column from the table display."""
@@ -1275,7 +1360,7 @@ class DataFrameTable(DataTable):
         self._setup_table()
 
         self.notify(
-            f"Showed [$accent]{hidden_row_count}[/] hidden row(s) and/or [$accent]{hidden_col_count}[/] hidden column(s)",
+            f"Showed [$accent]{hidden_row_count}[/] hidden row(s) and/or [$accent]{hidden_col_count}[/] column(s)",
             title="Show",
         )
 
@@ -1317,10 +1402,7 @@ class DataFrameTable(DataTable):
         # Move cursor to the new duplicated column
         self.move_cursor(column=col_idx + 1)
 
-        self.notify(
-            f"Duplicated column [$accent]{col_name}[/] as [$success]{new_col_name}[/]",
-            title="Duplicate",
-        )
+        # self.notify(f"Duplicated column [$accent]{col_name}[/] as [$success]{new_col_name}[/]", title="Duplicate")
 
     def _delete_row(self, more: str = None) -> None:
         """Delete rows from the table and dataframe.
@@ -1385,7 +1467,7 @@ class DataFrameTable(DataTable):
         self._setup_table()
 
         deleted_count = old_count - len(self.df)
-        if deleted_count > 1:
+        if deleted_count > 0:
             self.notify(f"Deleted [$accent]{deleted_count}[/] row(s)", title="Delete")
 
     def _duplicate_row(self) -> None:
@@ -1503,7 +1585,7 @@ class DataFrameTable(DataTable):
                 return
             swap_idx = row_idx + 1
         else:
-            self.notify(f"Invalid direction: {direction}", title="Move", severity="error")
+            # Invalid direction
             return
 
         row_key = self.coordinate_to_cell_key((row_idx, 0)).row_key
@@ -1653,7 +1735,7 @@ class DataFrameTable(DataTable):
             col_key = col_name
             self.update_cell(row_key, col_key, formatted_value, update_width=True)
 
-            self.notify(f"Cell updated to [$success]{cell_value}[/]", title="Edit")
+            # self.notify(f"Cell updated to [$success]{cell_value}[/]", title="Edit")
         except Exception as e:
             self.notify(f"Failed to update cell: {str(e)}", title="Edit", severity="error")
 
@@ -1682,7 +1764,7 @@ class DataFrameTable(DataTable):
         # Check if term is a valid expression
         elif tentative_expr(term):
             try:
-                expr = validate_expr(term, self.df, cidx)
+                expr = validate_expr(term, self.df.columns, cidx)
             except Exception as e:
                 self.notify(f"Error validating expression [$error]{term}[/]: {str(e)}", title="Edit", severity="error")
                 return
@@ -1695,7 +1777,7 @@ class DataFrameTable(DataTable):
                 expr = pl.lit(value)
             except Exception:
                 self.notify(
-                    f"Unable to convert [$accent]{term}[/] to [$error]{dtype}[/]. Cast to string.",
+                    f"Error converting [$accent]{term}[/] to [$error]{dtype}[/]. Cast to string.",
                     title="Edit",
                     severity="error",
                 )
@@ -1708,16 +1790,13 @@ class DataFrameTable(DataTable):
             # Apply the expression to the column
             self.df = self.df.with_columns(expr.alias(col_name))
         except Exception as e:
-            self.notify(f"Failed to apply expression: [$error]{str(e)}[/]", title="Edit", severity="error")
+            self.notify(f"Error applying expression: [$error]{str(e)}[/]", title="Edit", severity="error")
             return
 
         # Recreate the table for display
         self._setup_table()
 
-        self.notify(
-            f"Column [$accent]{col_name}[/] updated with [$success]{expr}[/]",
-            title="Edit",
-        )
+        # self.notify(f"Column [$accent]{col_name}[/] updated with [$success]{expr}[/]", title="Edit")
 
     def _rename_column(self) -> None:
         """Open modal to rename the selected column."""
@@ -1764,10 +1843,7 @@ class DataFrameTable(DataTable):
         # Move cursor to the renamed column
         self.move_cursor(column=col_idx)
 
-        self.notify(
-            f"Renamed column [$success]{col_name}[/] to [$success]{new_name}[/]",
-            title="Column",
-        )
+        # self.notify(f"Renamed column [$success]{col_name}[/] to [$success]{new_name}[/]", title="Column")
 
     def _clear_cell(self) -> None:
         """Clear the current cell by setting its value to None."""
@@ -1795,9 +1871,9 @@ class DataFrameTable(DataTable):
 
             self.update_cell(row_key, col_key, formatted_value)
 
-            self.notify(f"Cell cleared to [$success]{NULL_DISPLAY}[/]", title="Clear")
+            # self.notify(f"Cell cleared to [$success]{NULL_DISPLAY}[/]", title="Clear")
         except Exception as e:
-            self.notify(f"Failed to clear cell: {str(e)}", title="Clear", severity="error")
+            self.notify(f"Error clearing cell: {str(e)}", title="Clear", severity="error")
             raise e
 
     def _add_column(self, col_name: str = None, col_value: pl.Expr = None) -> None:
@@ -1840,9 +1916,9 @@ class DataFrameTable(DataTable):
             # Move cursor to the new column
             self.move_cursor(column=cidx + 1)
 
-            self.notify(f"Added column [$success]{new_name}[/]", title="Add Column")
+            # self.notify(f"Added column [$success]{new_name}[/]", title="Add Column")
         except Exception as e:
-            self.notify(f"Failed to add column: {str(e)}", title="Add Column", severity="error")
+            self.notify(f"Error adding column: {str(e)}", title="Add Column", severity="error")
             raise e
 
     def _add_column_expr(self) -> None:
@@ -1884,53 +1960,32 @@ class DataFrameTable(DataTable):
 
             # self.notify(f"Added column [$success]{col_name}[/]", title="Add Column")
         except Exception as e:
-            self.notify(f"Failed to add column: [$error]{str(e)}[/]", title="Add Column", severity="error")
+            self.notify(f"Error adding column: [$error]{str(e)}[/]", title="Add Column", severity="error")
             raise e
 
-    def _string_to_polars_dtype(self, dtype_str: str) -> pl.DataType:
-        """Convert string type name to Polars DataType.
-
-        Args:
-            dtype_str: String representation of the type ("string", "int", "float", "bool")
-
-        Returns:
-            Corresponding Polars DataType
-
-        Raises:
-            ValueError: If the type string is not recognized
-        """
-        dtype_map = {
-            "string": pl.String,
-            "int": pl.Int64,
-            "float": pl.Float64,
-            "bool": pl.Boolean,
-        }
-
-        dtype_lower = dtype_str.lower().strip()
-        return dtype_map.get(dtype_lower)
-
-    def _cast_column_dtype(self, dtype: str | pl.DataType = pl.String) -> None:
+    def _cast_column_dtype(self, dtype: str) -> None:
         """Cast the current column to a different data type.
 
         Args:
-            dtype: Target data type (string like "int", "float", "bool", "string" or Polars DataType)
+            dtype: Target data type (string representation, e.g., "pl.String", "pl.Int64")
         """
         cidx = self.cursor_col_idx
         col_name = self.cursor_col_name
         current_dtype = self.df.dtypes[cidx]
 
-        # Convert string dtype to Polars DataType if needed
-        if isinstance(dtype, str):
-            target_dtype = self._string_to_polars_dtype(dtype)
-            if target_dtype is None:
-                self.notify(
-                    f"Use string for unknown data type: {dtype}. Supported types: {', '.join(self._string_to_polars_dtype.keys())}",
-                    title="Cast",
-                    severity="warning",
-                )
-                target_dtype = pl.String
-        else:
-            target_dtype = dtype
+        try:
+            target_dtype = eval(dtype)
+        except Exception:
+            self.notify(f"Invalid target data type: [$error]{dtype}[/]", title="Cast", severity="error")
+            return
+
+        if current_dtype == target_dtype:
+            self.notify(
+                f"Column [$accent]{col_name}[/] is already of type [$success]{target_dtype}[/]",
+                title="Cast",
+                severity="warning",
+            )
+            return  # No change needed
 
         # Add to history
         self._add_history(
@@ -1944,13 +1999,13 @@ class DataFrameTable(DataTable):
             # Recreate the table display
             self._setup_table()
 
+            self.notify(f"Cast column [$accent]{col_name}[/] to [$success]{target_dtype}[/]", title="Cast")
+        except Exception as e:
             self.notify(
-                f"Cast column [$accent]{col_name}[/] to [$success]{target_dtype}[/]",
+                f"Error casting column [$accent]{col_name}[/] to [$success]{target_dtype}[/]: {str(e)}",
                 title="Cast",
+                severity="error",
             )
-        except Exception as e:
-            self.notify(f"Failed to cast column: {str(e)}", title="Cast", severity="error")
-            raise e
 
     def _search_cursor_value(self) -> None:
         """Search with cursor value in current column."""
@@ -1959,7 +2014,7 @@ class DataFrameTable(DataTable):
         # Get the value of the currently selected cell
         term = NULL if self.cursor_value is None else str(self.cursor_value)
 
-        self._do_search((term, cidx, False, False))
+        self._do_search((term, cidx, False, True))
 
     def _search_expr(self) -> None:
         """Search by expression."""
@@ -1978,6 +2033,7 @@ class DataFrameTable(DataTable):
         """Search for a term."""
         if result is None:
             return
+
         term, cidx, match_nocase, match_whole = result
         col_name = self.df.columns[cidx]
 
@@ -1987,12 +2043,10 @@ class DataFrameTable(DataTable):
         # Support for polars expressions
         elif tentative_expr(term):
             try:
-                expr = validate_expr(term, self.df, cidx)
+                expr = validate_expr(term, self.df.columns, cidx)
             except Exception as e:
                 self.notify(
-                    f"Failed to validate Polars expression [$error]{term}[/]: {str(e)}",
-                    title="Search",
-                    severity="error",
+                    f"Error validating expression [$error]{term}[/]: {str(e)}", title="Search", severity="error"
                 )
                 return
 
@@ -2016,7 +2070,7 @@ class DataFrameTable(DataTable):
                         term = f"(?i){term}"
                     expr = pl.col(col_name).cast(pl.String).str.contains(term)
                     self.notify(
-                        f"Unable to convert [$accent]{term}[/] to [$error]{dtype}[/]. Cast to string.",
+                        f"Error converting [$accent]{term}[/] to [$error]{dtype}[/]. Cast to string.",
                         title="Search",
                         severity="warning",
                     )
@@ -2031,7 +2085,7 @@ class DataFrameTable(DataTable):
             matches = set(lf.filter(expr).select(RIDX).collect().to_series().to_list())
         except Exception as e:
             self.notify(
-                f"Error applying search filter: [$error]{str(e)}[/]",
+                f"Error applying search filter [$accent]{term}[/]: [$error]{str(e)}[/]",
                 title="Search",
                 severity="error",
             )
@@ -2040,7 +2094,7 @@ class DataFrameTable(DataTable):
         match_count = len(matches)
         if match_count == 0:
             self.notify(
-                f"No matches found for [$warning]{term}[/]. Try [$accent](?i)abc[/] for case-insensitive search.",
+                f"No matches found for [$accent]{term}[/]. Try [$warning](?i)abc[/] for case-insensitive search.",
                 title="Search",
                 severity="warning",
             )
@@ -2053,11 +2107,12 @@ class DataFrameTable(DataTable):
         for m in matches:
             self.selected_rows[m] = True
 
-        # Highlight matches
-        self._do_highlight()
-
+        # Show notification immediately, then start highlighting
         self.notify(f"Found [$accent]{match_count}[/] matches for [$success]{term}[/]", title="Search")
 
+        # Start highlighting in a worker to avoid blocking the UI
+        self._do_highlight_async()
+
     def _find_matches(
         self, term: str, cidx: int | None = None, match_nocase: bool = False, match_whole: bool = False
     ) -> dict[int, set[int]]:
@@ -2095,7 +2150,7 @@ class DataFrameTable(DataTable):
                 expr = pl.col(col_name).is_null()
             elif tentative_expr(term):
                 try:
-                    expr = validate_expr(term, self.df, col_idx)
+                    expr = validate_expr(term, self.df.columns, col_idx)
                 except Exception as e:
                     raise Exception(f"Error validating Polars expression: {str(e)}")
             else:
@@ -2127,9 +2182,9 @@ class DataFrameTable(DataTable):
 
         if scope == "column":
             cidx = self.cursor_col_idx
-            self._do_find((term, cidx, False, False))
+            self._do_find((term, cidx, False, True))
         else:
-            self._do_find_global((term, None, False, False))
+            self._do_find_global((term, None, False, True))
 
     def _find_expr(self, scope="column") -> None:
         """Open screen to find by expression.
@@ -2158,16 +2213,12 @@ class DataFrameTable(DataTable):
         try:
             matches = self._find_matches(term, cidx, match_nocase, match_whole)
         except Exception as e:
-            self.notify(
-                f"Error finding matches: [$error]{str(e)}[/]",
-                title="Find",
-                severity="error",
-            )
+            self.notify(f"Error finding matches for [$error]{term}[/]: {str(e)}", title="Find", severity="error")
             return
 
         if not matches:
             self.notify(
-                f"No matches found for [$warning]{term}[/] in current column. Try [$accent](?i)abc[/] for case-insensitive search.",
+                f"No matches found for [$accent]{term}[/] in current column. Try [$warning](?i)abc[/] for case-insensitive search.",
                 title="Find",
                 severity="warning",
             )
@@ -2181,11 +2232,11 @@ class DataFrameTable(DataTable):
         for ridx, col_idxs in matches.items():
             self.matches[ridx].update(col_idxs)
 
-        # Highlight matches
-        self._do_highlight()
-
         self.notify(f"Found [$accent]{match_count}[/] matches for [$success]{term}[/]", title="Find")
 
+        # Start highlighting in a worker to avoid blocking the UI
+        self._do_highlight_async()
+
     def _do_find_global(self, result) -> None:
         """Global find a term across all columns."""
         if result is None:
@@ -2195,16 +2246,12 @@ class DataFrameTable(DataTable):
         try:
             matches = self._find_matches(term, cidx=None, match_nocase=match_nocase, match_whole=match_whole)
         except Exception as e:
-            self.notify(
-                f"Error finding matches: [$error]{str(e)}[/]",
-                title="Find",
-                severity="error",
-            )
+            self.notify(f"Error finding matches for [$error]{term}[/]: {str(e)}", title="Find", severity="error")
             return
 
         if not matches:
             self.notify(
-                f"No matches found for [$warning]{term}[/] in any column. Try [$accent](?i)abc[/] for case-insensitive search.",
+                f"No matches found for [$accent]{term}[/] in any column. Try [$warning](?i)abc[/] for case-insensitive search.",
                 title="Global Find",
                 severity="warning",
             )
@@ -2218,14 +2265,13 @@ class DataFrameTable(DataTable):
         for ridx, col_idxs in matches.items():
             self.matches[ridx].update(col_idxs)
 
-        # Highlight matches
-        self._do_highlight()
-
         self.notify(
-            f"Found [$accent]{match_count}[/] matches for [$success]{term}[/] across all columns",
-            title="Global Find",
+            f"Found [$accent]{match_count}[/] matches for [$success]{term}[/] across all columns", title="Global Find"
         )
 
+        # Start highlighting in a worker to avoid blocking the UI
+        self._do_highlight_async()
+
     def _next_match(self) -> None:
         """Move cursor to the next match."""
         if not self.matches:
@@ -2364,16 +2410,12 @@ class DataFrameTable(DataTable):
         matches = self._find_matches(term_find, cidx, match_nocase, match_whole)
 
         if not matches:
-            self.notify(
-                f"No matches found for [$warning]{term_find}[/]",
-                title="Replace",
-                severity="warning",
-            )
+            self.notify(f"No matches found for [$warning]{term_find}[/]", title="Replace", severity="warning")
             return
 
         # Add to history
         self._add_history(
-            f"Replacing [$accent]{term_find}[/] with [$success]{term_replace}[/] in column [$accent]{col_name}[/]"
+            f"Replaced [$accent]{term_find}[/] with [$success]{term_replace}[/] in column [$accent]{col_name}[/]"
         )
 
         # Update matches
@@ -2596,10 +2638,7 @@ class DataFrameTable(DataTable):
 
         # Check if we're highlighting or un-highlighting
         if new_selected_count := self.selected_rows.count(True):
-            self.notify(
-                f"Toggled selection for [$accent]{new_selected_count}[/] rows",
-                title="Toggle",
-            )
+            self.notify(f"Toggled selection for [$accent]{new_selected_count}[/] rows", title="Toggle")
 
         # Refresh the highlighting
         self._do_highlight(force=True)
@@ -2665,15 +2704,12 @@ class DataFrameTable(DataTable):
         # Recreate the table for display
         self._setup_table()
 
-        self.notify(
-            f"Removed unselected rows. Now showing [$accent]{selected_count}[/] rows",
-            title="Filter",
-        )
+        self.notify(f"Removed unselected rows. Now showing [$accent]{selected_count}[/] rows", title="Filter")
 
     def _view_rows(self) -> None:
         """View rows.
 
-        If there are selected rows, view those rows.
+        If there are selected rows or matches, view those rows.
         Otherwise, view based on the value of the currently selected cell.
         """
 
@@ -2689,7 +2725,7 @@ class DataFrameTable(DataTable):
             ridx = self.cursor_row_idx
             term = str(self.df.item(ridx, cidx))
 
-        self._do_view_rows((term, cidx, False, False))
+        self._do_view_rows((term, cidx, False, True))
 
     def _view_rows_expr(self) -> None:
         """Open the filter screen to enter an expression."""
@@ -2718,10 +2754,10 @@ class DataFrameTable(DataTable):
         elif tentative_expr(term):
             # Support for polars expressions
             try:
-                expr = validate_expr(term, self.df, cidx)
+                expr = validate_expr(term, self.df.columns, cidx)
             except Exception as e:
                 self.notify(
-                    f"Error validating Polars expression [$error]{term}[/]: {str(e)}", title="Filter", severity="error"
+                    f"Error validating expression [$error]{term}[/]: {str(e)}", title="Filter", severity="error"
                 )
                 return
         else:
@@ -2743,9 +2779,7 @@ class DataFrameTable(DataTable):
                         term = f"(?i){term}"
                     expr = pl.col(col_name).cast(pl.String).str.contains(term)
                     self.notify(
-                        f"Unknown column type [$warning]{dtype}[/]. Cast to string.",
-                        title="Filter",
-                        severity="warning",
+                        f"Unknown column type [$warning]{dtype}[/]. Cast to string.", title="Filter", severity="warning"
                     )
 
         # Lazyframe with row indices
@@ -2759,17 +2793,13 @@ class DataFrameTable(DataTable):
         try:
             df_filtered = lf.filter(expr).collect()
         except Exception as e:
-            self.notify(f"Failed to apply filter [$error]{expr}[/]: {str(e)}", title="Filter", severity="error")
+            self.notify(f"Error applying filter [$error]{expr}[/]: {str(e)}", title="Filter", severity="error")
             self.histories.pop()  # Remove last history entry
             return
 
         matched_count = len(df_filtered)
         if not matched_count:
-            self.notify(
-                f"No rows match the expression: [$success]{expr}[/]",
-                title="Filter",
-                severity="warning",
-            )
+            self.notify(f"No rows match the expression: [$success]{expr}[/]", title="Filter", severity="warning")
             return
 
         # Add to history
@@ -2784,11 +2814,9 @@ class DataFrameTable(DataTable):
 
         # Recreate the table for display
         self._setup_table()
+        self._do_highlight()
 
-        self.notify(
-            f"Filtered to [$accent]{matched_count}[/] matching rows",
-            title="Filter",
-        )
+        self.notify(f"Filtered to [$accent]{matched_count}[/] matching rows", title="Filter")
 
     def _cycle_cursor_type(self) -> None:
         """Cycle through cursor types: cell -> row -> column -> cell."""
@@ -2862,6 +2890,9 @@ class DataFrameTable(DataTable):
         filepath = Path(filename)
         ext = filepath.suffix.lower()
 
+        # Add to history
+        self._add_history(f"Saved dataframe to [$success]{filename}[/]")
+
         try:
             if ext in (".xlsx", ".xls"):
                 self._do_save_excel(filename)
@@ -2878,12 +2909,9 @@ class DataFrameTable(DataTable):
             self.filename = filename  # Update current filename
             if not self._all_tabs:
                 extra = "current tab with " if len(self.app.tabs) > 1 else ""
-                self.notify(
-                    f"Saved {extra}[$accent]{len(self.df)}[/] rows to [$success]{filename}[/]",
-                    title="Save",
-                )
+                self.notify(f"Saved {extra}[$accent]{len(self.df)}[/] rows to [$success]{filename}[/]", title="Save")
         except Exception as e:
-            self.notify(f"Failed to save: {str(e)}", title="Save", severity="error")
+            self.notify(f"Error saving [$error]{filename}[/]: {str(e)}", title="Save", severity="error")
             raise e
 
     def _do_save_excel(self, filename: str) -> None:
@@ -2903,14 +2931,10 @@ class DataFrameTable(DataTable):
 
         # From ConfirmScreen callback, so notify accordingly
         if self._all_tabs is True:
-            self.notify(
-                f"Saved all tabs to [$success]{filename}[/]",
-                title="Save",
-            )
+            self.notify(f"Saved all tabs to [$success]{filename}[/]", title="Save")
         else:
             self.notify(
-                f"Saved current tab with [$accent]{len(self.df)}[/] rows to [$success]{filename}[/]",
-                title="Save",
+                f"Saved current tab with [$accent]{len(self.df)}[/] rows to [$success]{filename}[/]", title="Save"
             )
 
     def _make_cell_clickable(self) -> None:
@@ -2944,6 +2968,66 @@ class DataFrameTable(DataTable):
 
         if url_count:
             self.notify(
-                f"Made [$accent]{url_count}[/] cell(s) clickable in column [$success]{col_key.value}[/]",
-                title="Make Clickable",
+                f"Use Ctrl/Cmd click to open the links in column [$success]{col_key.value}[/]", title="Hyperlink"
             )
+
+    def _simple_sql(self) -> None:
+        """Open the SQL interface screen."""
+        self.app.push_screen(
+            SimpleSqlScreen(self),
+            callback=self._do_simple_sql,
+        )
+
+    def _do_simple_sql(self, result) -> None:
+        """Handle SQL result result from SimpleSqlScreen."""
+        if result is None:
+            return
+        columns, where = result
+
+        sql = f"SELECT {columns} FROM self"
+        if where:
+            sql += f" WHERE {where}"
+
+        self._do_sql(sql)
+
+    def _advanced_sql(self) -> None:
+        """Open the advanced SQL interface screen."""
+        self.app.push_screen(
+            AdvancedSqlScreen(self),
+            callback=self._do_advanced_sql,
+        )
+
+    def _do_advanced_sql(self, result) -> None:
+        """Handle SQL result result from AdvancedSqlScreen."""
+        if result is None:
+            return
+
+        self._do_sql(result)
+
+    def _do_sql(self, sql: str) -> None:
+        """Execute a SQL query directly.
+
+        Args:
+            sql: The SQL query string to execute.
+        """
+        # Add to history
+        self._add_history(f"SQL Query:\n[$accent]{sql}[/]")
+
+        # Execute the SQL query
+        try:
+            self.df = self.df.sql(sql)
+        except Exception as e:
+            self.notify(f"Error executing SQL query [$error]{sql}[/]: {str(e)}", title="SQL Query", severity="error")
+            return
+
+        if not len(self.df):
+            self.notify(f"SQL query returned no results for [$warning]{sql}[/]", title="SQL Query", severity="warning")
+            return
+
+        # Recreate the table display
+        self._setup_table()
+
+        self.notify(
+            f"SQL query executed successfully. Now showing [$accent]{len(self.df)}[/] rows and [$accent]{len(self.df.columns)}[/] columns.",
+            title="SQL Query",
+        )