dataframe-textual 1.9.0__py3-none-any.whl → 2.2.3__py3-none-any.whl

dataframe_textual/data_frame_viewer.py

@@ -33,14 +33,17 @@ class DataFrameViewer(App):
         - **Q** - ❌ Close all tabs (prompts to save unsaved changes)
         - **Ctrl+Q** - 🚪 Force to quit app (discards unsaved changes)
         - **Ctrl+T** - 💾 Save current tab to 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 a file
-        - **Double-click tab** - ✏️ Rename current tab
+        - **Double-click** - ✏️ Rename tab
 
         ## 🎨 View & Settings
         - **F1** - ❓ Toggle this help panel
         - **k** - 🌙 Cycle through themes
+        - **Ctrl+P -> Screenshot** - 📸 Capture terminal view as a SVG image
 
         ## ⭐ Features
         - **Multi-file support** - 📂 Open multiple CSV/Excel files as tabs
@@ -62,6 +65,8 @@ class DataFrameViewer(App):
         ("ctrl+o", "open_file", "Open File"),
         ("ctrl+t", "save_current_tab", "Save Current Tab"),
         ("ctrl+a", "save_all_tabs", "Save All Tabs"),
+        ("w", "save_current_tab_overwrite", "Save Current Tab (overwrite)"),
+        ("W", "save_all_tabs_overwrite", "Save All Tabs (overwrite)"),
         ("ctrl+d", "duplicate_tab", "Duplicate Tab"),
         ("greater_than_sign,b", "next_tab(1)", "Next Tab"),  # '>' and 'b'
         ("less_than_sign", "next_tab(-1)", "Prev Tab"),  # '<'
@@ -81,10 +86,6 @@ class DataFrameViewer(App):
         ContentTab.dirty {
             background: $warning-darken-3;
         }
-
-        .underline--bar {
-            color: red;
-        }
     """
 
     def __init__(self, *sources: Source) -> None:
@@ -136,7 +137,9 @@ class DataFrameViewer(App):
                 except Exception as e:
                     self.notify(
                         f"Error loading [$error]{filename}[/]: Try [$accent]-I[/] to disable schema inference",
+                        title="Load File",
                         severity="error",
+                        timeout=10,
                     )
                     self.log(f"Error loading `{filename}`: {str(e)}")
 
@@ -165,7 +168,7 @@ class DataFrameViewer(App):
         """
         if event.key == "k":
             self.theme = get_next_item(list(BUILTIN_THEMES.keys()), self.theme)
-            self.notify(f"Switched to theme: [$success]{self.theme}[/]", title="Theme")
+            self.notify(f"Switched to theme: [$success]{self.theme}[/]", title="SwitchTheme")
 
     def on_click(self, event: Click) -> None:
         """Handle mouse click events on tabs.
@@ -247,7 +250,7 @@ class DataFrameViewer(App):
         Opens the save dialog for the active tab's DataFrameTable to save its data.
         """
         if table := self.get_active_table():
-            table.do_save_to_file(title="Save Current Tab", all_tabs=False)
+            table.do_save_to_file(all_tabs=False)
 
     def action_save_all_tabs(self) -> None:
         """Save all open tabs to their respective files.
@@ -255,11 +258,37 @@ class DataFrameViewer(App):
         Iterates through all DataFrameTable widgets and opens the save dialog for each.
         """
         if table := self.get_active_table():
-            table.do_save_to_file(title="Save All Tabs", all_tabs=True)
+            table.do_save_to_file(all_tabs=True)
+
+    def action_save_current_tab_overwrite(self) -> None:
+        """Save the currently active tab to file, overwriting if it exists."""
+        if table := self.get_active_table():
+            filepath = Path(table.filename)
+            filename = filepath.with_stem(table.tabname)
+            table.save_to_file((filename, False, False))
+
+    def action_save_all_tabs_overwrite(self) -> None:
+        """Save all open tabs to their respective files, overwriting if they exist."""
+        if table := self.get_active_table():
+            filepath = Path(table.filename)
+            if filepath.suffix.lower() in [".xlsx", ".xls"]:
+                filename = table.filename
+            else:
+                filename = "all-tabs.xlsx"
+
+            table.save_to_file((filename, True, False))
 
     def action_duplicate_tab(self) -> None:
         """Duplicate the currently active tab.
 
+        Creates a copy of the current tab with the same data and filename.
+        The new tab is named with '_copy' suffix and inserted after the current tab.
+        """
+        self.do_duplicate_tab()
+
+    def do_duplicate_tab(self) -> None:
+        """Duplicate the currently active tab.
+
         Creates a copy of the current tab with the same data and filename.
         The new tab is named with '_copy' suffix and inserted after the current tab.
         """
@@ -273,7 +302,7 @@ class DataFrameViewer(App):
 
         # Create new table with the same dataframe and filename
         new_table = DataFrameTable(
-            table.df,
+            table.df.clone(),
             table.filename,
             tabname=new_tabname,
             zebra_stripes=True,
@@ -301,6 +330,17 @@ class DataFrameViewer(App):
         Cycles through tabs by the specified offset. With offset=1, moves to next tab.
         With offset=-1, moves to previous tab. Wraps around when reaching edges.
 
+        Args:
+            offset: Number of tabs to advance (+1 for next, -1 for previous). Defaults to 1.
+        """
+        self.do_next_tab(offset)
+
+    def do_next_tab(self, offset: int = 1) -> None:
+        """Switch to the next tab or previous tab.
+
+        Cycles through tabs by the specified offset. With offset=1, moves to next tab.
+        With offset=-1, moves to previous tab. Wraps around when reaching edges.
+
         Args:
             offset: Number of tabs to advance (+1 for next, -1 for previous). Defaults to 1.
         """
@@ -322,7 +362,7 @@ class DataFrameViewer(App):
         tabs = self.query_one(ContentTabs)
         tabs.display = not tabs.display
         # status = "shown" if tabs.display else "hidden"
-        # self.notify(f"Tab bar [$success]{status}[/]", title="Toggle")
+        # self.notify(f"Tab bar [$success]{status}[/]", title="Toggle Tab Bar")
 
     def get_active_table(self) -> DataFrameTable | None:
         """Get the currently active DataFrameTable widget.
@@ -338,7 +378,8 @@ class DataFrameViewer(App):
             if active_pane := tabbed.active_pane:
                 return active_pane.query_one(DataFrameTable)
         except (NoMatches, AttributeError):
-            self.notify("No active table found", title="Locate", severity="error")
+            self.notify("No active table found", title="Locate Table", severity="error", timeout=10)
+
         return None
 
     def get_unique_tabname(self, tab_name: str) -> str:
@@ -376,11 +417,13 @@ class DataFrameViewer(App):
                 for source in load_file(filename, prefix_sheet=True):
                     self.add_tab(source.frame, filename, source.tabname, after=self.tabbed.active_pane)
                     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 File")
             except Exception as e:
-                self.notify(f"Error loading [$error]{filename}[/]: {str(e)}", title="Open", severity="error")
+                self.notify(
+                    f"Error loading [$error]{filename}[/]: {str(e)}", title="Open File", severity="error", timeout=10
+                )
         else:
-            self.notify(f"File does not exist: [$warning]{filename}[/]", title="Open", severity="warning")
+            self.notify(f"File does not exist: [$warning]{filename}[/]", title="Open File", severity="warning")
 
     def add_tab(
         self,
@@ -459,7 +502,7 @@ class DataFrameViewer(App):
                 """Handle the "save before closing?" confirmation."""
                 if result:
                     # User wants to save - close after save dialog opens
-                    active_table.do_save_to_file(title="Save Current Tab", task_after_save="close_tab")
+                    active_table.do_save_to_file(task_after_save="close_tab")
                 elif result is None:
                     # User cancelled - do nothing
                     return
@@ -530,7 +573,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",
@@ -572,7 +615,7 @@ class DataFrameViewer(App):
         content_tab, new_name = result
 
         # Update the tab name
-        old_name = content_tab.label_text
+        # old_name = content_tab.label_text
         content_tab.label = new_name
 
         # Mark tab as dirty to indicate name change
@@ -584,4 +627,4 @@ class DataFrameViewer(App):
                 table.focus()
                 break
 
-        self.notify(f"Renamed tab [$accent]{old_name}[/] to [$success]{new_name}[/]", title="Rename")
+        # self.notify(f"Renamed tab [$accent]{old_name}[/] to [$success]{new_name}[/]", title="Rename Tab")

dataframe_textual/sql_screen.py

@@ -13,6 +13,8 @@ from textual.screen import ModalScreen
 from textual.widgets import Button, Input, Label, SelectionList, TextArea
 from textual.widgets.selection_list import Selection
 
+from .common import RID
+
 
 class SqlScreen(ModalScreen):
     """Base class for modal screens handling SQL query."""
@@ -151,37 +153,35 @@ class SimpleSqlScreen(SqlScreen):
 
         Args:
             dftable: Reference to the parent DataFrameTable widget.
-
-        Returns:
-            None
         """
         super().__init__(
             dftable,
-            on_yes_callback=self._handle_simple,
-            on_maybe_callback=partial(
-                self._handle_simple,
-                view=False,
-            ),
+            on_yes_callback=self.handle_simple,
+            on_maybe_callback=partial(self.handle_simple, view=False),
         )
 
     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 Label("SELECT columns (all if none selected):", id="select-label")
             yield SelectionList(
-                *[Selection(col, col) for col in self.df.columns if col not in self.dftable.hidden_columns],
+                *[
+                    Selection(col, col)
+                    for col in self.df.columns
+                    if col not in self.dftable.hidden_columns and col != RID
+                ],
                 id="column-selection",
             )
-            yield Label("Where condition (optional)", id="where-label")
+            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, view: bool = True) -> None:
+    def handle_simple(self, view: bool = True) -> None:
         """Handle Yes button/Enter key press."""
         selections = self.query_one(SelectionList).selected
         if not selections:
-            selections = [col for col in self.df.columns if col not in self.dftable.hidden_columns]
+            selections = [col for col in self.df.columns if col not in self.dftable.hidden_columns and col != RID]
 
         columns = ", ".join(f"`{s}`" for s in selections)
         where = self.query_one(Input).value.strip()
@@ -215,14 +215,11 @@ class AdvancedSqlScreen(SqlScreen):
 
         Args:
             dftable: Reference to the parent DataFrameTable widget.
-
-        Returns:
-            None
         """
         super().__init__(
             dftable,
-            on_yes_callback=self._handle_advanced,
-            on_maybe_callback=partial(self._handle_advanced, view=False),
+            on_yes_callback=self.handle_advanced,
+            on_maybe_callback=partial(self.handle_advanced, view=False),
         )
 
     def compose(self) -> ComposeResult:
@@ -230,12 +227,12 @@ class AdvancedSqlScreen(SqlScreen):
         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",
+                placeholder="Enter SQL query, e.g., \n\nSELECT * \nFROM self \nWHERE age > 30\n\n- use 'self' as the table name\n- use backticks (`) for column names with spaces.",
                 id="sql-textarea",
                 language="sql",
             )
             yield from super().compose()
 
-    def _handle_advanced(self, view: bool = True) -> None:
+    def handle_advanced(self, view: bool = True) -> None:
         """Handle Yes button/Enter key press."""
         return self.query_one(TextArea).text.strip(), view