sqlsaber 0.18.0__py3-none-any.whl → 0.20.0__py3-none-any.whl

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/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/cli/interactive.py

@@ -1,8 +1,13 @@
 """Interactive mode handling for the CLI."""
 
 import asyncio
+from pathlib import Path
 
-import questionary
+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
 from rich.panel import Panel
@@ -24,6 +29,23 @@ from sqlsaber.database.schema import SchemaManager
 from sqlsaber.threads import ThreadStorage
 
 
+def bottom_toolbar():
+    return [
+        (
+            "class:bottom-toolbar",
+            " Use 'Esc-Enter' or 'Meta-Enter' to submit.",
+        )
+    ]
+
+
+style = Style.from_dict(
+    {
+        "frame.border": "#ebbcba",
+        "bottom-toolbar": "#ebbcba bg:#21202e",
+    }
+)
+
+
 class InteractiveSession:
     """Manages interactive CLI sessions."""
 
@@ -82,7 +104,7 @@ class InteractiveSession:
             self.console.print(
                 "\n",
                 "[dim] > Use '/clear' to reset conversation",
-                "[dim] > Use '/exit' or '/quit' to leave[/dim]",
+                "[dim] > Use 'Ctrl+D', '/exit' or '/quit' to leave[/dim]",
                 "[dim] > Use 'Ctrl+C' to interrupt and return to prompt\n\n",
                 "[dim] > Start message with '#' to add something to agent's memory for this database",
                 "[dim] > Type '@' to get table name completions",
@@ -97,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:
@@ -137,7 +168,10 @@ class InteractiveSession:
         # Create the query task
         query_task = asyncio.create_task(
             self.streaming_handler.execute_streaming_query(
-                user_query, self.agent, self.cancellation_token, self.message_history
+                user_query,
+                self.agent,
+                self.cancellation_token,
+                self.message_history,
             )
         )
         self.current_task = query_task
@@ -183,32 +217,35 @@ class InteractiveSession:
         # Initialize table cache
         await self._update_table_cache()
 
+        session = PromptSession(
+            history=FileHistory(
+                Path(platformdirs.user_config_dir("sqlsaber")) / "history"
+            )
+        )
+
         while True:
             try:
-                user_query = await questionary.text(
-                    ">",
-                    qmark="",
-                    multiline=True,
-                    instruction="",
-                    completer=CompositeCompleter(
-                        SlashCommandCompleter(), self.table_completer
-                    ),
-                ).ask_async()
+                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":
@@ -276,7 +313,11 @@ class InteractiveSession:
                     self.console.print("\n[yellow]Query interrupted[/yellow]")
                 else:
                     self.console.print(
-                        "\n[yellow]Use '/exit' or '/quit' to leave.[/yellow]"
+                        "\n[yellow]Press Ctrl+D to exit. Or use '/exit' or '/quit' slash command.[/yellow]"
                     )
+            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/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.18.0.dist-info → sqlsaber-0.20.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlsaber
-Version: 0.18.0
+Version: 0.20.0
 Summary: SQLsaber - Open-source agentic SQL assistant
 License-File: LICENSE
 Requires-Python: >=3.12
@@ -13,6 +13,7 @@ Requires-Dist: httpx>=0.28.1
 Requires-Dist: keyring>=25.6.0
 Requires-Dist: pandas>=2.0.0
 Requires-Dist: platformdirs>=4.0.0
+Requires-Dist: prompt-toolkit>3.0.51
 Requires-Dist: pydantic-ai
 Requires-Dist: questionary>=2.1.0
 Requires-Dist: rich>=13.7.0

{sqlsaber-0.18.0.dist-info → sqlsaber-0.20.0.dist-info}/RECORD

@@ -6,15 +6,15 @@ sqlsaber/agents/mcp.py,sha256=GcJTx7YDYH6aaxIADEIxSgcWAdWakUx395JIzVnf17U,768
 sqlsaber/agents/pydantic_ai_agent.py,sha256=dGdsgyxCZvfK-v-MH8KimKOr-xb2aSfSWY8CMcOUCT8,6795
 sqlsaber/cli/__init__.py,sha256=qVSLVJLLJYzoC6aj6y9MFrzZvAwc4_OgxU9DlkQnZ4M,86
 sqlsaber/cli/auth.py,sha256=jTsRgbmlGPlASSuIKmdjjwfqtKvjfKd_cTYxX0-QqaQ,7400
-sqlsaber/cli/commands.py,sha256=CmCqDC6KiE8JD6Vkpsry4lBQInCiS8TBeKKx3gdxZcM,8689
+sqlsaber/cli/commands.py,sha256=mjLG9i1bXf0TEroxkIxq5O7Hhjufz3Ad72cyJz7vE1k,8128
 sqlsaber/cli/completers.py,sha256=HsUPjaZweLSeYCWkAcgMl8FylQ1xjWBWYTEL_9F6xfU,6430
-sqlsaber/cli/database.py,sha256=atwg3l8acQ3YTDuhq7vNrBN6tpOv0syz6V62KTF-Bh8,12910
+sqlsaber/cli/database.py,sha256=JKtHSN-BFzBa14REf0phFVQB7d67m1M5FFaD8N6DdrY,12966
 sqlsaber/cli/display.py,sha256=wa7BjTBwXwqLT145Q1AEL0C28pQJTrvDN10mnFMjqsg,8554
-sqlsaber/cli/interactive.py,sha256=QqBjSsjtb6XoBVRyGS520cQrm7DvWC-obQ_EflcygbU,12051
+sqlsaber/cli/interactive.py,sha256=suTZ-EvbaB21BsFsRc4MkjM89lZ2iJlYH4G1iYjW7PI,13213
 sqlsaber/cli/memory.py,sha256=OufHFJFwV0_GGn7LvKRTJikkWhV1IwNIUDOxFPHXOaQ,7794
 sqlsaber/cli/models.py,sha256=ZewtwGQwhd9b-yxBAPKePolvI1qQG-EkmeWAGMqtWNQ,8986
 sqlsaber/cli/streaming.py,sha256=WNqBYYbWtL5CNQkRg5YWhYpWKI8qz7JmqneB2DXTOHY,5259
-sqlsaber/cli/threads.py,sha256=xti7_kvh3loQfLb7_GC8wSULJ4Oj56jXY8GQp69CQCI,11111
+sqlsaber/cli/threads.py,sha256=XUnLcCUe2wa_85IKdKmryqfiHTQu_IylET2Qo8oy1nk,11324
 sqlsaber/config/__init__.py,sha256=olwC45k8Nc61yK0WmPUk7XHdbsZH9HuUAbwnmKe3IgA,100
 sqlsaber/config/api_keys.py,sha256=RqWQCko1tY7sES7YOlexgBH5Hd5ne_kGXHdBDNqcV2U,3649
 sqlsaber/config/auth.py,sha256=b5qB2h1doXyO9Bn8z0CcL8LAR2jF431gGXBGKLgTmtQ,2756
@@ -40,8 +40,8 @@ sqlsaber/tools/enums.py,sha256=CH32mL-0k9ZA18911xLpNtsgpV6tB85TktMj6uqGz54,411
 sqlsaber/tools/instructions.py,sha256=X-x8maVkkyi16b6Tl0hcAFgjiYceZaSwyWTfmrvx8U8,9024
 sqlsaber/tools/registry.py,sha256=HWOQMsNIdL4XZS6TeNUyrL-5KoSDH6PHsWd3X66o-18,3211
 sqlsaber/tools/sql_tools.py,sha256=hM6tKqW5MDhFUt6MesoqhTUqIpq_5baIIDoN1MjDCXY,9647
-sqlsaber-0.18.0.dist-info/METADATA,sha256=HAXen2RBeZ4wIdxoLIMPKiNgOXJolWFqqXl5_cCOsJA,6141
-sqlsaber-0.18.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sqlsaber-0.18.0.dist-info/entry_points.txt,sha256=qEbOB7OffXPFgyJc7qEIJlMEX5RN9xdzLmWZa91zCQQ,162
-sqlsaber-0.18.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-sqlsaber-0.18.0.dist-info/RECORD,,
+sqlsaber-0.20.0.dist-info/METADATA,sha256=LJgfLWIWvI8ZgeLjZMLakKCmHn4EywL0MS9XeKLy63E,6178
+sqlsaber-0.20.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sqlsaber-0.20.0.dist-info/entry_points.txt,sha256=qEbOB7OffXPFgyJc7qEIJlMEX5RN9xdzLmWZa91zCQQ,162
+sqlsaber-0.20.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+sqlsaber-0.20.0.dist-info/RECORD,,