execsql2 2.5.0__py3-none-any.whl → 2.6.0__py3-none-any.whl

execsql/gui/tui.py

@@ -101,6 +101,10 @@ def _button_row(button_list: list) -> list[Button]:
 class _BaseDialog(ModalScreen):
     """Common infrastructure for all execsql dialog screens."""
 
+    BINDINGS = [
+        Binding("escape", "cancel", "Cancel", show=True),
+    ]
+
     DEFAULT_CSS = """
     _BaseDialog {
         align: center middle;
@@ -151,6 +155,11 @@ class _BaseDialog(ModalScreen):
     def result(self) -> dict:
         return self._result
 
+    def action_cancel(self) -> None:
+        """Dismiss the dialog as cancelled (triggered by Escape key)."""
+        self._result = {"button": None, "cancelled": True}
+        self.dismiss(self._result)
+
     @on(Button.Pressed, "#btn_cancel_exit")
     def _on_cancel_exit(self, event: Button.Pressed) -> None:
         """Universal Cancel handler — dismisses with cancelled=True so the sync queue can exit."""
@@ -167,6 +176,11 @@ class _BaseDialog(ModalScreen):
 class MsgScreen(_BaseDialog):
     """Simple message dialog with Continue and Cancel buttons."""
 
+    BINDINGS = [
+        *_BaseDialog.BINDINGS,
+        Binding("enter", "submit", "Continue", show=True),
+    ]
+
     def compose(self) -> ComposeResult:
         title = self.args.get("title", "Message")
         message = self.args.get("message", "")
@@ -176,6 +190,12 @@ class MsgScreen(_BaseDialog):
             with Horizontal(id="buttons"):
                 yield Button("Cancel", id="btn_cancel_exit", variant="warning")
                 yield Button("Continue", id="btn_close", variant="primary")
+            yield Footer()
+
+    def action_submit(self) -> None:
+        """Continue the dialog (triggered by Enter key)."""
+        self._result = {"button": 1}
+        self.dismiss(self._result)
 
     def on_button_pressed(self, event: Button.Pressed) -> None:
         if event.button.id == "btn_close":
@@ -191,6 +211,11 @@ class MsgScreen(_BaseDialog):
 class PauseScreen(_BaseDialog):
     """Pause dialog with optional countdown and Continue/Cancel buttons."""
 
+    BINDINGS = [
+        *_BaseDialog.BINDINGS,
+        Binding("enter", "submit", "Continue", show=True),
+    ]
+
     def compose(self) -> ComposeResult:
         title = self.args.get("title", "Pause")
         message = self.args.get("message", "")
@@ -200,6 +225,7 @@ class PauseScreen(_BaseDialog):
             with Horizontal(id="buttons"):
                 yield Button("Cancel", id="btn_cancel_exit", variant="warning")
                 yield Button("Continue", id="btn_continue", variant="primary")
+            yield Footer()
 
     def on_mount(self) -> None:
         countdown = self.args.get("countdown")
@@ -210,6 +236,11 @@ class PauseScreen(_BaseDialog):
         self._result = {"quit": False}
         self.dismiss(self._result)
 
+    def action_submit(self) -> None:
+        """Continue the dialog (triggered by Enter key)."""
+        self._result = {"quit": False}
+        self.dismiss(self._result)
+
     def on_button_pressed(self, event: Button.Pressed) -> None:
         if event.button.id == "btn_continue":
             self._result = {"quit": False}
@@ -224,6 +255,11 @@ class PauseScreen(_BaseDialog):
 class DisplayScreen(_BaseDialog):
     """Data display dialog: title, message, optional table, optional text entry, buttons."""
 
+    BINDINGS = [
+        *_BaseDialog.BINDINGS,
+        Binding("enter", "submit", "Submit", show=True),
+    ]
+
     def compose(self) -> ComposeResult:
         title = self.args.get("title", "")
         message = self.args.get("message", "")
@@ -251,6 +287,23 @@ class DisplayScreen(_BaseDialog):
                 )
             with Horizontal(id="buttons"):
                 yield from _button_row(button_list)
+            yield Footer()
+
+    def action_submit(self) -> None:
+        """Submit the first primary button value (triggered by Enter key)."""
+        button_list = self.args.get("button_list", [("Continue", 1)])
+        # Find the first non-cancel button value.
+        value = None
+        for btn in button_list:
+            if btn[1]:
+                value = btn[1]
+                break
+        if value is None:
+            return
+        text_input = self.query_one("#text_input", Input) if self.args.get("textentry") else None
+        return_value = text_input.value if text_input else None
+        self._result = {"button": value, "return_value": return_value}
+        self.dismiss(self._result)
 
     def on_button_pressed(self, event: Button.Pressed) -> None:
         btn_id = event.button.id
@@ -272,6 +325,11 @@ class DisplayScreen(_BaseDialog):
 class EntryFormScreen(_BaseDialog):
     """Multi-field entry form dialog."""
 
+    BINDINGS = [
+        *_BaseDialog.BINDINGS,
+        Binding("enter", "submit", "OK", show=True),
+    ]
+
     DEFAULT_CSS = (
         _BaseDialog.DEFAULT_CSS
         + """
@@ -337,9 +395,26 @@ class EntryFormScreen(_BaseDialog):
             with Horizontal(id="buttons"):
                 yield Button("Cancel", id="btn_cancel_exit", variant="warning")
                 yield Button("OK", id="btn_ok", variant="primary")
+            yield Footer()
 
         self._specs = specs
 
+    def action_submit(self) -> None:
+        """Submit the form (triggered by Enter key)."""
+        for spec in self._specs:
+            widget = self._inputs.get(spec.varname)
+            if widget is None:
+                continue
+            etype = (spec.entry_type or "text").lower()
+            if etype == "checkbox":
+                spec.value = "True" if widget.value else "False"
+            elif etype in ("dropdown", "select"):
+                spec.value = str(widget.value) if widget.value is not None else ""
+            else:
+                spec.value = widget.value
+        self._result = {"button": 1, "return_value": self._specs}
+        self.dismiss(self._result)
+
     def on_button_pressed(self, event: Button.Pressed) -> None:
         if event.button.id == "btn_ok":
             for spec in self._specs:
@@ -365,6 +440,11 @@ class EntryFormScreen(_BaseDialog):
 class CompareScreen(_BaseDialog):
     """Side-by-side table comparison dialog."""
 
+    BINDINGS = [
+        *_BaseDialog.BINDINGS,
+        Binding("enter", "submit", "Continue", show=True),
+    ]
+
     DEFAULT_CSS = (
         _BaseDialog.DEFAULT_CSS
         + """
@@ -412,6 +492,7 @@ class CompareScreen(_BaseDialog):
                     yield _make_table_widget("table2", headers2, rows2)
             with Horizontal(id="buttons"):
                 yield from _button_row(button_list)
+            yield Footer()
 
     def on_mount(self) -> None:
         keylist = [str(k) for k in self.args.get("keylist", [])]
@@ -461,6 +542,15 @@ class CompareScreen(_BaseDialog):
         finally:
             self._syncing = False
 
+    def action_submit(self) -> None:
+        """Submit the first primary button value (triggered by Enter key)."""
+        button_list = self.args.get("button_list", [("Continue", 1)])
+        for btn in button_list:
+            if btn[1]:
+                self._result = {"button": btn[1]}
+                self.dismiss(self._result)
+                return
+
     def on_button_pressed(self, event: Button.Pressed) -> None:
         btn_id = event.button.id
         if btn_id and btn_id.startswith("btn_") and btn_id[4:].isdigit():
@@ -478,6 +568,11 @@ class CompareScreen(_BaseDialog):
 class SelectRowsScreen(_BaseDialog):
     """Row selection dialog: pick rows from source table and add to target."""
 
+    BINDINGS = [
+        *_BaseDialog.BINDINGS,
+        Binding("enter", "submit", "Continue", show=True),
+    ]
+
     DEFAULT_CSS = (
         _BaseDialog.DEFAULT_CSS
         + """
@@ -516,6 +611,7 @@ class SelectRowsScreen(_BaseDialog):
                     yield _make_table_widget("dest_table", headers2, rows2)
             with Horizontal(id="buttons"):
                 yield from _button_row(button_list)
+            yield Footer()
 
     def on_data_table_row_selected(self, event: DataTable.RowSelected) -> None:
         if event.data_table.id == "source_table":
@@ -525,6 +621,15 @@ class SelectRowsScreen(_BaseDialog):
             values = [src.get_cell(row_key, col) for col in src.columns]
             dest.add_row(*values)
 
+    def action_submit(self) -> None:
+        """Submit the first primary button value (triggered by Enter key)."""
+        button_list = self.args.get("button_list", [("Continue", 1)])
+        for btn in button_list:
+            if btn[1]:
+                self._result = {"button": btn[1]}
+                self.dismiss(self._result)
+                return
+
     def on_button_pressed(self, event: Button.Pressed) -> None:
         btn_id = event.button.id
         if btn_id and btn_id.startswith("btn_") and btn_id[4:].isdigit():
@@ -588,6 +693,10 @@ class SelectSubScreen(_BaseDialog):
 class ActionScreen(_BaseDialog):
     """Action button grid dialog."""
 
+    BINDINGS = [
+        *_BaseDialog.BINDINGS,
+    ]
+
     def compose(self) -> ComposeResult:
         title = self.args.get("title", "Actions")
         message = self.args.get("message", "")
@@ -609,6 +718,7 @@ class ActionScreen(_BaseDialog):
                     yield Button(f"{spec.label} — {spec.prompt}", id=f"action_{i}", variant="primary")
                 if include_continue:
                     yield Button("Continue", id="action_continue", variant="default")
+            yield Footer()
 
         self._button_specs = button_specs
 
@@ -1045,6 +1155,7 @@ class ConsoleApp(App):
         self._script_thread: threading.Thread | None = None
         self._script_exception: BaseException | None = None
         self._screen_map: dict | None = None
+        self._console_lines: list[str] = []
 
     def compose(self) -> ComposeResult:
         yield Header(show_clock=False)
@@ -1118,11 +1229,19 @@ class ConsoleApp(App):
         self.call_from_thread(self._append_console, text)
 
     def _append_console(self, text: str) -> None:
+        self._console_lines.append(text)
         try:
             self.query_one("#console_log", RichLog).write(text)
         except Exception:
             pass  # Widget may not be mounted yet.
 
+    def save(self, outfile: str, append: bool = False) -> None:
+        """Save the console text contents to *outfile*."""
+        mode = "a" if append else "w"
+        with open(outfile, mode, encoding="utf-8") as fh:
+            for line in self._console_lines:
+                fh.write(line if line.endswith("\n") else line + "\n")
+
     def set_status(self, msg: str) -> None:
         """Thread-safe status bar update."""
         self.call_from_thread(self._update_status, msg)
@@ -1199,6 +1318,19 @@ class TextualBackend(GuiBackend):
             pct = (num / total * 100.0) if total else num
             self._console_app.set_progress(pct)
 
+    def console_save(self, outfile: str, append: bool = False) -> None:
+        """Save console text contents to *outfile*."""
+        if self._console_app is not None:
+            self._console_app.save(outfile, append)
+
+    def console_hide(self) -> None:
+        """Hide the console (minimize) — Textual has no window-level hide,
+        so this is a no-op in a terminal environment."""
+
+    def console_show(self) -> None:
+        """Show the console — Textual has no window-level show,
+        so this is a no-op in a terminal environment."""
+
     def console_wait_user(self, message: str = "") -> None:
         # ConsoleApp exits when the script is done; nothing extra needed here.
         pass

execsql/metacommands/__init__.py

@@ -10,207 +10,207 @@ Handler functions live in the sibling modules:
 
 from __future__ import annotations
 
-import execsql.state as _state  # noqa: F401
+import execsql.state as _state
 
 # Handler imports — grouped by module for readability.
 from execsql.metacommands.connect import (
-    x_connect_pg,  # noqa: F401
-    x_connect_user_pg,  # noqa: F401
-    x_connect_ssvr,  # noqa: F401
-    x_connect_user_ssvr,  # noqa: F401
-    x_connect_mysql,  # noqa: F401
-    x_connect_user_mysql,  # noqa: F401
-    x_connect_access,  # noqa: F401
-    x_connect_fb,  # noqa: F401
-    x_connect_user_fb,  # noqa: F401
-    x_connect_ora,  # noqa: F401
-    x_connect_user_ora,  # noqa: F401
-    x_connect_duckdb,  # noqa: F401
-    x_connect_sqlite,  # noqa: F401
-    x_connect_dsn,  # noqa: F401
-    x_use,  # noqa: F401
-    x_disconnect,  # noqa: F401
-    x_autocommit_on,  # noqa: F401
-    x_autocommit_off,  # noqa: F401
-    x_pg_vacuum,  # noqa: F401
-    x_daoflushdelay,  # noqa: F401
+    x_connect_pg,
+    x_connect_user_pg,
+    x_connect_ssvr,
+    x_connect_user_ssvr,
+    x_connect_mysql,
+    x_connect_user_mysql,
+    x_connect_access,
+    x_connect_fb,
+    x_connect_user_fb,
+    x_connect_ora,
+    x_connect_user_ora,
+    x_connect_duckdb,
+    x_connect_sqlite,
+    x_connect_dsn,
+    x_use,
+    x_disconnect,
+    x_autocommit_on,
+    x_autocommit_off,
+    x_pg_vacuum,
+    x_daoflushdelay,
 )
 from execsql.metacommands.control import (
-    x_if,  # noqa: F401
-    x_if_orif,  # noqa: F401
-    x_if_andif,  # noqa: F401
-    x_if_elseif,  # noqa: F401
-    x_if_else,  # noqa: F401
-    x_if_block,  # noqa: F401
-    x_if_end,  # noqa: F401
-    x_loop,  # noqa: F401
-    x_halt,  # noqa: F401
-    x_halt_msg,  # noqa: F401
-    x_error_halt,  # noqa: F401
-    x_metacommand_error_halt,  # noqa: F401
-    x_begin_batch,  # noqa: F401
-    x_end_batch,  # noqa: F401
-    x_rollback,  # noqa: F401
-    x_break,  # noqa: F401
-    x_wait_until,  # noqa: F401
+    x_if,
+    x_if_orif,
+    x_if_andif,
+    x_if_elseif,
+    x_if_else,
+    x_if_block,
+    x_if_end,
+    x_loop,
+    x_halt,
+    x_halt_msg,
+    x_error_halt,
+    x_metacommand_error_halt,
+    x_begin_batch,
+    x_end_batch,
+    x_rollback,
+    x_break,
+    x_wait_until,
 )
 from execsql.metacommands.data import (
-    x_sub,  # noqa: F401
-    x_sub_add,  # noqa: F401
-    x_sub_append,  # noqa: F401
-    x_sub_empty,  # noqa: F401
-    x_rm_sub,  # noqa: F401
-    x_sub_local,  # noqa: F401
-    x_sub_tempfile,  # noqa: F401
-    x_sub_ini,  # noqa: F401
-    x_sub_querystring,  # noqa: F401
-    x_sub_encrypt,  # noqa: F401
-    x_sub_decrypt,  # noqa: F401
-    x_subdata,  # noqa: F401
-    x_selectsub,  # noqa: F401
-    x_prompt_selectsub,  # noqa: F401
-    x_empty_strings,  # noqa: F401
-    x_trim_strings,  # noqa: F401
-    x_replace_newlines,  # noqa: F401
-    x_empty_rows,  # noqa: F401
-    x_only_strings,  # noqa: F401
-    x_boolean_int,  # noqa: F401
-    x_boolean_words,  # noqa: F401
-    x_fold_col_hdrs,  # noqa: F401
-    x_trim_col_hdrs,  # noqa: F401
-    x_clean_col_hdrs,  # noqa: F401
-    x_del_empty_cols,  # noqa: F401
-    x_create_col_hdrs,  # noqa: F401
-    x_dedup_col_hdrs,  # noqa: F401
-    x_import_common_cols_only,  # noqa: F401
-    x_quote_all_text,  # noqa: F401
-    x_reset_counter,  # noqa: F401
-    x_reset_counters,  # noqa: F401
-    x_set_counter,  # noqa: F401
-    x_max_int,  # noqa: F401
+    x_sub,
+    x_sub_add,
+    x_sub_append,
+    x_sub_empty,
+    x_rm_sub,
+    x_sub_local,
+    x_sub_tempfile,
+    x_sub_ini,
+    x_sub_querystring,
+    x_sub_encrypt,
+    x_sub_decrypt,
+    x_subdata,
+    x_selectsub,
+    x_prompt_selectsub,
+    x_empty_strings,
+    x_trim_strings,
+    x_replace_newlines,
+    x_empty_rows,
+    x_only_strings,
+    x_boolean_int,
+    x_boolean_words,
+    x_fold_col_hdrs,
+    x_trim_col_hdrs,
+    x_clean_col_hdrs,
+    x_del_empty_cols,
+    x_create_col_hdrs,
+    x_dedup_col_hdrs,
+    x_import_common_cols_only,
+    x_quote_all_text,
+    x_reset_counter,
+    x_reset_counters,
+    x_set_counter,
+    x_max_int,
 )
 from execsql.metacommands.debug import (
-    x_debug_write_metacommands,  # noqa: F401
-    x_debug_commandliststack,  # noqa: F401
-    x_debug_iflevels,  # noqa: F401
-    x_debug_write_odbc_drivers,  # noqa: F401
-    x_debug_log_subvars,  # noqa: F401
-    x_debug_log_config,  # noqa: F401
-    x_debug_write_subvars,  # noqa: F401
-    x_debug_write_config,  # noqa: F401
+    x_debug_write_metacommands,
+    x_debug_commandliststack,
+    x_debug_iflevels,
+    x_debug_write_odbc_drivers,
+    x_debug_log_subvars,
+    x_debug_log_config,
+    x_debug_write_subvars,
+    x_debug_write_config,
 )
 from execsql.metacommands.io import (
-    x_export,  # noqa: F401
-    x_export_query,  # noqa: F401
-    x_export_query_with_template,  # noqa: F401
-    x_export_with_template,  # noqa: F401
-    x_export_ods_multiple,  # noqa: F401
-    x_export_metadata,  # noqa: F401
-    x_export_metadata_table,  # noqa: F401
-    x_import,  # noqa: F401
-    x_import_file,  # noqa: F401
-    x_import_ods,  # noqa: F401
-    x_import_ods_pattern,  # noqa: F401
-    x_import_xls,  # noqa: F401
-    x_import_xls_pattern,  # noqa: F401
-    x_import_parquet,  # noqa: F401
-    x_import_feather,  # noqa: F401
-    x_import_row_buffer,  # noqa: F401
-    x_show_progress,  # noqa: F401
-    x_export_row_buffer,  # noqa: F401
-    x_write,  # noqa: F401
-    x_write_create_table,  # noqa: F401
-    x_write_create_table_ods,  # noqa: F401
-    x_write_create_table_xls,  # noqa: F401
-    x_write_create_table_alias,  # noqa: F401
-    x_write_prefix,  # noqa: F401
-    x_write_suffix,  # noqa: F401
-    x_writescript,  # noqa: F401
-    x_include,  # noqa: F401
-    x_copy,  # noqa: F401
-    x_copy_query,  # noqa: F401
-    x_zip,  # noqa: F401
-    x_zip_buffer_mb,  # noqa: F401
-    x_rm_file,  # noqa: F401
-    x_make_export_dirs,  # noqa: F401
-    x_cd,  # noqa: F401
-    x_scan_lines,  # noqa: F401
-    x_hdf5_text_len,  # noqa: F401
-    x_serve,  # noqa: F401
+    x_export,
+    x_export_query,
+    x_export_query_with_template,
+    x_export_with_template,
+    x_export_ods_multiple,
+    x_export_metadata,
+    x_export_metadata_table,
+    x_import,
+    x_import_file,
+    x_import_ods,
+    x_import_ods_pattern,
+    x_import_xls,
+    x_import_xls_pattern,
+    x_import_parquet,
+    x_import_feather,
+    x_import_row_buffer,
+    x_show_progress,
+    x_export_row_buffer,
+    x_write,
+    x_write_create_table,
+    x_write_create_table_ods,
+    x_write_create_table_xls,
+    x_write_create_table_alias,
+    x_write_prefix,
+    x_write_suffix,
+    x_writescript,
+    x_include,
+    x_copy,
+    x_copy_query,
+    x_zip,
+    x_zip_buffer_mb,
+    x_rm_file,
+    x_make_export_dirs,
+    x_cd,
+    x_scan_lines,
+    x_hdf5_text_len,
+    x_serve,
 )
 from execsql.metacommands.prompt import (
-    x_prompt,  # noqa: F401
-    x_prompt_enter,  # noqa: F401
-    x_prompt_entryform,  # noqa: F401
-    x_prompt_pause,  # noqa: F401
-    x_prompt_compare,  # noqa: F401
-    x_prompt_ask_compare,  # noqa: F401
-    x_prompt_ask,  # noqa: F401
-    x_prompt_map,  # noqa: F401
-    x_prompt_action,  # noqa: F401
-    x_prompt_savefile,  # noqa: F401
-    x_prompt_openfile,  # noqa: F401
-    x_prompt_directory,  # noqa: F401
-    x_prompt_select_rows,  # noqa: F401
-    x_prompt_credentials,  # noqa: F401
-    x_prompt_connect,  # noqa: F401
-    x_ask,  # noqa: F401
-    x_pause,  # noqa: F401
-    x_msg,  # noqa: F401
-    x_reset_dialog_canceled,  # noqa: F401
+    x_prompt,
+    x_prompt_enter,
+    x_prompt_entryform,
+    x_prompt_pause,
+    x_prompt_compare,
+    x_prompt_ask_compare,
+    x_prompt_ask,
+    x_prompt_map,
+    x_prompt_action,
+    x_prompt_savefile,
+    x_prompt_openfile,
+    x_prompt_directory,
+    x_prompt_select_rows,
+    x_prompt_credentials,
+    x_prompt_connect,
+    x_ask,
+    x_pause,
+    x_msg,
+    x_reset_dialog_canceled,
 )
 from execsql.metacommands.script_ext import (
-    x_extendscript,  # noqa: F401
-    x_extendscript_metacommand,  # noqa: F401
-    x_extendscript_sql,  # noqa: F401
-    x_executescript,  # noqa: F401
+    x_extendscript,
+    x_extendscript_metacommand,
+    x_extendscript_sql,
+    x_executescript,
 )
 from execsql.metacommands.system import (
-    x_system_cmd,  # noqa: F401
-    x_email,  # noqa: F401
-    x_timer,  # noqa: F401
-    x_log,  # noqa: F401
-    x_logwritemessages,  # noqa: F401
-    x_log_datavars,  # noqa: F401
-    x_log_sql,  # noqa: F401
-    x_console,  # noqa: F401
-    x_consoleprogress,  # noqa: F401
-    x_consolewait,  # noqa: F401
-    x_consolewait_onerror,  # noqa: F401
-    x_consolewait_whendone,  # noqa: F401
-    x_console_hideshow,  # noqa: F401
-    x_consolewidth,  # noqa: F401
-    x_consoleheight,  # noqa: F401
-    x_consolestatus,  # noqa: F401
-    x_consolesave,  # noqa: F401
-    x_cancel_halt,  # noqa: F401
-    x_cancel_halt_write_clear,  # noqa: F401
-    x_cancel_halt_write,  # noqa: F401
-    x_cancel_halt_email_clear,  # noqa: F401
-    x_cancel_halt_email,  # noqa: F401
-    x_cancel_halt_exec,  # noqa: F401
-    x_cancel_halt_exec_clear,  # noqa: F401
-    x_error_halt_write_clear,  # noqa: F401
-    x_error_halt_write,  # noqa: F401
-    x_error_halt_email_clear,  # noqa: F401
-    x_error_halt_email,  # noqa: F401
-    x_error_halt_exec,  # noqa: F401
-    x_error_halt_exec_clear,  # noqa: F401
-    x_write_warnings,  # noqa: F401
-    x_gui_level,  # noqa: F401
-    x_execute,  # noqa: F401
+    x_system_cmd,
+    x_email,
+    x_timer,
+    x_log,
+    x_logwritemessages,
+    x_log_datavars,
+    x_log_sql,
+    x_console,
+    x_consoleprogress,
+    x_consolewait,
+    x_consolewait_onerror,
+    x_consolewait_whendone,
+    x_console_hideshow,
+    x_consolewidth,
+    x_consoleheight,
+    x_consolestatus,
+    x_consolesave,
+    x_cancel_halt,
+    x_cancel_halt_write_clear,
+    x_cancel_halt_write,
+    x_cancel_halt_email_clear,
+    x_cancel_halt_email,
+    x_cancel_halt_exec,
+    x_cancel_halt_exec_clear,
+    x_error_halt_write_clear,
+    x_error_halt_write,
+    x_error_halt_email_clear,
+    x_error_halt_email,
+    x_error_halt_exec,
+    x_error_halt_exec_clear,
+    x_write_warnings,
+    x_gui_level,
+    x_execute,
 )
 
 # Regex helper functions (from utils/regex.py)
 from execsql.utils.regex import (
-    ins_rxs,  # noqa: F401
-    ins_quoted_rx,  # noqa: F401
-    ins_schema_rxs,  # noqa: F401
-    ins_table_rxs,  # noqa: F401
-    ins_table_list_rxs,  # noqa: F401
-    ins_fn_rxs,  # noqa: F401
+    ins_rxs,
+    ins_quoted_rx,
+    ins_schema_rxs,
+    ins_table_rxs,
+    ins_table_list_rxs,
+    ins_fn_rxs,
 )
-from execsql.script import MetaCommandList  # noqa: F401
+from execsql.script import MetaCommandList
 
 __all__ = [
     # execsql.state
@@ -457,6 +457,6 @@ DATABASE_TYPES = [
 # ---------------------------------------------------------------------------
 # Module-level DISPATCH_TABLE — built once at import time.
 # ---------------------------------------------------------------------------
-from execsql.metacommands.dispatch import build_dispatch_table  # noqa: E402
+from execsql.metacommands.dispatch import build_dispatch_table
 
 DISPATCH_TABLE = build_dispatch_table()