sqlsaber 0.19.0__tar.gz → 0.20.0__tar.gz

{sqlsaber-0.19.0 → sqlsaber-0.20.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlsaber
-Version: 0.19.0
+Version: 0.20.0
 Summary: SQLsaber - Open-source agentic SQL assistant
 License-File: LICENSE
 Requires-Python: >=3.12

{sqlsaber-0.19.0 → sqlsaber-0.20.0}/docs/src/content/docs/changelog.md

@@ -9,6 +9,14 @@ All notable changes to SQLsaber will be documented here.
 
 ---
 
+### v0.20.0 - 2025-09-10
+
+#### Fixed
+
+- Subcommand help visibility for nested apps
+- Removed mouse support for user prompt
+  - Enabling mouse support disables terminal scrolling when user prompt is focused
+
 ### v0.19.0 - 2025-09-09
 
 #### Added

{sqlsaber-0.19.0 → sqlsaber-0.20.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sqlsaber"
-version = "0.19.0"
+version = "0.20.0"
 description = "SQLsaber - Open-source agentic SQL assistant"
 readme = "README.md"
 requires-python = ">=3.12"

{sqlsaber-0.19.0 → sqlsaber-0.20.0}/src/sqlsaber/cli/commands.py

@@ -7,6 +7,12 @@ from typing import Annotated
 import cyclopts
 from rich.console import Console
 
+from sqlsaber.cli.auth import create_auth_app
+from sqlsaber.cli.database import create_db_app
+from sqlsaber.cli.memory import create_memory_app
+from sqlsaber.cli.models import create_models_app
+from sqlsaber.cli.threads import create_threads_app
+
 # Lazy imports - only import what's needed for CLI parsing
 from sqlsaber.config.database import DatabaseConfigManager
 
@@ -24,6 +30,11 @@ app = cyclopts.App(
     help="SQLsaber - Open-source agentic SQL assistant for your database",
 )
 
+app.command(create_auth_app(), name="auth")
+app.command(create_db_app(), name="db")
+app.command(create_memory_app(), name="memory")
+app.command(create_models_app(), name="models")
+app.command(create_threads_app(), name="threads")
 
 console = Console()
 config_manager = DatabaseConfigManager()
@@ -195,47 +206,6 @@ def query(
         sys.exit(e.exit_code)
 
 
-# Use lazy imports for fast CLI startup time
-@app.command(name="auth")
-def auth(*args, **kwargs):
-    """Manage authentication configuration."""
-    from sqlsaber.cli.auth import create_auth_app
-
-    return create_auth_app()(*args, **kwargs)
-
-
-@app.command(name="db")
-def db(*args, **kwargs):
-    """Manage database connections."""
-    from sqlsaber.cli.database import create_db_app
-
-    return create_db_app()(*args, **kwargs)
-
-
-@app.command(name="memory")
-def memory(*args, **kwargs):
-    """Manage database-specific memories."""
-    from sqlsaber.cli.memory import create_memory_app
-
-    return create_memory_app()(*args, **kwargs)
-
-
-@app.command(name="models")
-def models(*args, **kwargs):
-    """Select and manage models."""
-    from sqlsaber.cli.models import create_models_app
-
-    return create_models_app()(*args, **kwargs)
-
-
-@app.command(name="threads")
-def threads(*args, **kwargs):
-    """Manage SQLsaber threads."""
-    from sqlsaber.cli.threads import create_threads_app
-
-    return create_threads_app()(*args, **kwargs)
-
-
 def main():
     """Entry point for the CLI application."""
     app()

{sqlsaber-0.19.0 → sqlsaber-0.20.0}/src/sqlsaber/cli/database.py

@@ -12,7 +12,6 @@ from rich.console import Console
 from rich.table import Table
 
 from sqlsaber.config.database import DatabaseConfig, DatabaseConfigManager
-from sqlsaber.database.connection import DatabaseConnection
 
 # Global instances for CLI commands
 console = Console()
@@ -343,6 +342,9 @@ def test(
     """Test a database connection."""
 
     async def test_connection():
+        # Lazy import to keep CLI startup fast
+        from sqlsaber.database.connection import DatabaseConnection
+
         if name:
             db_config = config_manager.get_database(name)
             if not db_config:

{sqlsaber-0.19.0 → sqlsaber-0.20.0}/src/sqlsaber/cli/interactive.py

@@ -6,6 +6,7 @@ from pathlib import Path
 import platformdirs
 from prompt_toolkit import PromptSession
 from prompt_toolkit.history import FileHistory
+from prompt_toolkit.patch_stdout import patch_stdout
 from prompt_toolkit.styles import Style
 from pydantic_ai import Agent
 from rich.console import Console
@@ -118,6 +119,15 @@ class InteractiveSession:
         if self._thread_id:
             self.console.print(f"[dim]Resuming thread:[/dim] {self._thread_id}\n")
 
+    async def _end_thread_and_display_resume_hint(self):
+        """End thread and display command to resume thread"""
+        # Print resume hint if there is an active thread
+        if self._thread_id:
+            await self._threads.end_thread(self._thread_id)
+            self.console.print(
+                f"[dim]You can continue this thread using:[/dim] saber threads resume {self._thread_id}"
+            )
+
     async def _update_table_cache(self):
         """Update the table completer cache with fresh data."""
         try:
@@ -215,33 +225,27 @@ class InteractiveSession:
 
         while True:
             try:
-                # with patch_stdout():
-                user_query = await session.prompt_async(
-                    "",
-                    multiline=True,
-                    mouse_support=True,
-                    completer=CompositeCompleter(
-                        SlashCommandCompleter(), self.table_completer
-                    ),
-                    show_frame=True,
-                    bottom_toolbar=bottom_toolbar,
-                    style=style,
-                )
+                with patch_stdout():
+                    user_query = await session.prompt_async(
+                        "",
+                        multiline=True,
+                        completer=CompositeCompleter(
+                            SlashCommandCompleter(), self.table_completer
+                        ),
+                        show_frame=True,
+                        bottom_toolbar=bottom_toolbar,
+                        style=style,
+                    )
 
                 if not user_query:
                     continue
 
                 if (
-                    user_query in ["/exit", "/quit"]
+                    user_query in ["/exit", "/quit", "exit", "quit"]
                     or user_query.startswith("/exit")
                     or user_query.startswith("/quit")
                 ):
-                    # Print resume hint if there is an active thread
-                    if self._thread_id:
-                        await self._threads.end_thread(self._thread_id)
-                        self.console.print(
-                            f"[dim]You can continue this thread using:[/dim] saber threads resume {self._thread_id}"
-                        )
+                    await self._end_thread_and_display_resume_hint()
                     break
 
                 if user_query == "/clear":
@@ -313,6 +317,7 @@ class InteractiveSession:
                     )
             except EOFError:
                 # Exit when Ctrl+D is pressed
+                await self._end_thread_and_display_resume_hint()
                 break
             except Exception as e:
                 self.console.print(f"[bold red]Error:[/bold red] {str(e)}")

{sqlsaber-0.19.0 → sqlsaber-0.20.0}/src/sqlsaber/cli/threads.py

@@ -12,17 +12,10 @@ from rich.markdown import Markdown
 from rich.panel import Panel
 from rich.table import Table
 
-from sqlsaber.agents import build_sqlsaber_agent
-from sqlsaber.cli.display import DisplayManager
-from sqlsaber.cli.interactive import InteractiveSession
-from sqlsaber.config.database import DatabaseConfigManager
-from sqlsaber.database.connection import DatabaseConnection
-from sqlsaber.database.resolver import DatabaseResolutionError, resolve_database
 from sqlsaber.threads import ThreadStorage
 
 # Globals consistent with other CLI modules
 console = Console()
-config_manager = DatabaseConfigManager()
 
 
 threads_app = cyclopts.App(
@@ -41,6 +34,9 @@ def _render_transcript(
     console: Console, all_msgs: list[ModelMessage], last_n: int | None = None
 ) -> None:
     """Render conversation turns from ModelMessage[] using DisplayManager."""
+    # Lazy import to avoid pulling UI helpers at startup
+    from sqlsaber.cli.display import DisplayManager
+
     dm = DisplayManager(console)
 
     # Locate indices of user prompts
@@ -237,6 +233,16 @@ def resume(
     store = ThreadStorage()
 
     async def _run() -> None:
+        # Lazy imports to avoid heavy modules at CLI startup
+        from sqlsaber.agents import build_sqlsaber_agent
+        from sqlsaber.cli.interactive import InteractiveSession
+        from sqlsaber.config.database import DatabaseConfigManager
+        from sqlsaber.database.connection import DatabaseConnection
+        from sqlsaber.database.resolver import (
+            DatabaseResolutionError,
+            resolve_database,
+        )
+
         thread = await store.get_thread(thread_id)
         if not thread:
             console.print(f"[red]Thread not found:[/red] {thread_id}")
@@ -248,6 +254,7 @@ def resume(
             )
             return
         try:
+            config_manager = DatabaseConfigManager()
             resolved = resolve_database(db_selector, config_manager)
             connection_string = resolved.connection_string
             db_name = resolved.name

{sqlsaber-0.19.0 → sqlsaber-0.20.0}/tests/test_cli/test_threads.py

@@ -17,9 +17,9 @@ from rich.console import Console
 from sqlsaber.cli.threads import (
     _human_readable,
     _render_transcript,
-    config_manager,
     create_threads_app,
 )
+from sqlsaber.config.database import DatabaseConfigManager
 from sqlsaber.threads.storage import Thread, ThreadStorage
 
 
@@ -220,7 +220,7 @@ class TestThreadsCLI:
             ),
         ]
 
-        with patch("sqlsaber.cli.threads.DisplayManager") as mock_dm_class:
+        with patch("sqlsaber.cli.display.DisplayManager") as mock_dm_class:
             mock_dm = MagicMock()
             mock_dm_class.return_value = mock_dm
 
@@ -253,7 +253,7 @@ class TestThreadsCLI:
             ),
         ]
 
-        with patch("sqlsaber.cli.threads.DisplayManager") as mock_dm_class:
+        with patch("sqlsaber.cli.display.DisplayManager") as mock_dm_class:
             mock_dm = MagicMock()
             mock_dm_class.return_value = mock_dm
 
@@ -307,10 +307,14 @@ class TestThreadsCLI:
 
             with (
                 patch("sqlsaber.cli.threads.ThreadStorage", return_value=store),
-                patch("sqlsaber.cli.threads.resolve_database") as mock_resolve,
-                patch("sqlsaber.cli.threads.DatabaseConnection") as mock_db_conn_class,
-                patch("sqlsaber.cli.threads.build_sqlsaber_agent") as mock_build_agent,
-                patch("sqlsaber.cli.threads.InteractiveSession") as mock_session_class,
+                patch("sqlsaber.database.resolver") as mock_resolve,
+                patch("sqlsaber.database.DatabaseConnection") as mock_db_conn_class,
+                patch(
+                    "sqlsaber.agents.pydantic_ai_agent.build_sqlsaber_agent"
+                ) as mock_build_agent,
+                patch(
+                    "sqlsaber.cli.interactive.InteractiveSession"
+                ) as mock_session_class,
             ):
                 # Mock database resolution
                 mock_resolved = MagicMock()
@@ -333,7 +337,7 @@ class TestThreadsCLI:
                 assert resolved_thread == thread
 
                 db_selector = resolved_thread.database_name
-                resolved = mock_resolve(db_selector, config_manager)
+                resolved = mock_resolve(db_selector, DatabaseConfigManager())
                 assert resolved.name == "prod_db"
 
         await mock_resume_run()

{sqlsaber-0.19.0 → sqlsaber-0.20.0}/uv.lock

@@ -1910,7 +1910,7 @@ wheels = [
 
 [[package]]
 name = "sqlsaber"
-version = "0.19.0"
+version = "0.20.0"
 source = { editable = "." }
 dependencies = [
     { name = "aiomysql" },