sqlsaber 0.8.1__py3-none-any.whl → 0.9.0__py3-none-any.whl

sqlsaber/cli/auth.py

@@ -1,7 +1,7 @@
 """Authentication CLI commands."""
 
 import questionary
-import typer
+import cyclopts
 from rich.console import Console
 
 from sqlsaber.config.auth import AuthConfigManager, AuthMethod
@@ -12,15 +12,14 @@ console = Console()
 config_manager = AuthConfigManager()
 
 # Create the authentication management CLI app
-auth_app = typer.Typer(
+auth_app = cyclopts.App(
     name="auth",
     help="Manage authentication configuration",
-    add_completion=True,
 )
 
 
-@auth_app.command("setup")
-def setup_auth():
+@auth_app.command
+def setup():
     """Configure authentication method for SQLSaber."""
     console.print("\n[bold]SQLSaber Authentication Setup[/bold]\n")
 
@@ -79,8 +78,8 @@ def setup_auth():
     )
 
 
-@auth_app.command("status")
-def show_auth_status():
+@auth_app.command
+def status():
     """Show current authentication configuration."""
     auth_method = config_manager.get_auth_method()
 
@@ -104,8 +103,8 @@ def show_auth_status():
                 console.print("[yellow]OAuth token missing or expired[/yellow]")
 
 
-@auth_app.command("reset")
-def reset_auth():
+@auth_app.command
+def reset():
     """Reset authentication configuration."""
     if not config_manager.has_auth_configured():
         console.print("[yellow]No authentication configuration to reset.[/yellow]")
@@ -137,6 +136,6 @@ def reset_auth():
         console.print("Reset cancelled.")
 
 
-def create_auth_app() -> typer.Typer:
+def create_auth_app() -> cyclopts.App:
     """Return the authentication management CLI app."""
     return auth_app

sqlsaber/cli/commands.py

@@ -1,9 +1,11 @@
 """CLI command definitions and handlers."""
 
 import asyncio
+import sys
 from pathlib import Path
+from typing import Annotated
 
-import typer
+import cyclopts
 from rich.console import Console
 
 from sqlsaber.agents.anthropic import AnthropicSQLAgent
@@ -16,10 +18,18 @@ from sqlsaber.cli.streaming import StreamingQueryHandler
 from sqlsaber.config.database import DatabaseConfigManager
 from sqlsaber.database.connection import DatabaseConnection
 
-app = typer.Typer(
+
+class CLIError(Exception):
+    """Exception raised for CLI errors that should result in exit."""
+
+    def __init__(self, message: str, exit_code: int = 1):
+        super().__init__(message)
+        self.exit_code = exit_code
+
+
+app = cyclopts.App(
     name="sqlsaber",
     help="SQLSaber - Use the agent Luke!\n\nSQL assistant for your database",
-    add_completion=True,
 )
 
 
@@ -27,40 +37,49 @@ console = Console()
 config_manager = DatabaseConfigManager()
 
 
-@app.callback()
-def main_callback(
-    database: str | None = typer.Option(
-        None,
-        "--database",
-        "-d",
-        help="Database connection name (uses default if not specified)",
-    ),
+@app.meta.default
+def meta_handler(
+    database: Annotated[
+        str | None,
+        cyclopts.Parameter(
+            ["--database", "-d"],
+            help="Database connection name (uses default if not specified)",
+        ),
+    ] = None,
 ):
     """
     Query your database using natural language.
 
     Examples:
-        sb query                             # Start interactive mode
-        sb query "show me all users"         # Run a single query with default database
-        sb query -d mydb "show me users"     # Run a query with specific database
+        saber                             # Start interactive mode
+        saber "show me all users"         # Run a single query with default database
+        saber -d mydb "show me users"     # Run a query with specific database
     """
-    pass
+    # Store database in app context for commands to access
+    app.meta["database"] = database
 
 
-@app.command()
+@app.default
 def query(
-    query_text: str | None = typer.Argument(
-        None,
-        help="SQL query in natural language (if not provided, starts interactive mode)",
-    ),
-    database: str | None = typer.Option(
-        None,
-        "--database",
-        "-d",
-        help="Database connection name (uses default if not specified)",
-    ),
+    query_text: Annotated[
+        str | None,
+        cyclopts.Parameter(
+            help="SQL query in natural language (if not provided, starts interactive mode)",
+        ),
+    ] = None,
+    database: Annotated[
+        str | None,
+        cyclopts.Parameter(
+            ["--database", "-d"],
+            help="Database connection name (uses default if not specified)",
+        ),
+    ] = None,
 ):
-    """Run a query against the database or start interactive mode."""
+    """Run a query against the database or start interactive mode.
+
+    When called without arguments, starts interactive mode.
+    When called with a query string, executes that query and exits.
+    """
 
     async def run_session():
         # Get database configuration or handle direct CSV file
@@ -69,35 +88,24 @@ def query(
             if database.endswith(".csv"):
                 csv_path = Path(database).expanduser().resolve()
                 if not csv_path.exists():
-                    console.print(
-                        f"[bold red]Error:[/bold red] CSV file '{database}' not found."
-                    )
-                    raise typer.Exit(1)
+                    raise CLIError(f"CSV file '{database}' not found.")
                 connection_string = f"csv:///{csv_path}"
                 db_name = csv_path.stem
             else:
                 # Look up configured database connection
                 db_config = config_manager.get_database(database)
                 if not db_config:
-                    console.print(
-                        f"[bold red]Error:[/bold red] Database connection '{database}' not found."
-                    )
-                    console.print(
-                        "Use 'sqlsaber db list' to see available connections."
+                    raise CLIError(
+                        f"Database connection '{database}' not found. Use 'sqlsaber db list' to see available connections."
                     )
-                    raise typer.Exit(1)
                 connection_string = db_config.to_connection_string()
                 db_name = db_config.name
         else:
             db_config = config_manager.get_default_database()
             if not db_config:
-                console.print(
-                    "[bold red]Error:[/bold red] No database connections configured."
-                )
-                console.print(
-                    "Use 'sqlsaber db add <name>' to add a database connection."
+                raise CLIError(
+                    "No database connections configured. Use 'sqlsaber db add <name>' to add a database connection."
                 )
-                raise typer.Exit(1)
             connection_string = db_config.to_connection_string()
             db_name = db_config.name
 
@@ -105,10 +113,7 @@ def query(
         try:
             db_conn = DatabaseConnection(connection_string)
         except Exception as e:
-            console.print(
-                f"[bold red]Error creating database connection:[/bold red] {e}"
-            )
-            raise typer.Exit(1)
+            raise CLIError(f"Error creating database connection: {e}")
 
         # Create agent instance with database name for memory context
         agent = AnthropicSQLAgent(db_conn, db_name)
@@ -132,25 +137,29 @@ def query(
             await db_conn.close()
             console.print("\n[green]Goodbye![/green]")
 
-    # Run the async function
-    asyncio.run(run_session())
+    # Run the async function with proper error handling
+    try:
+        asyncio.run(run_session())
+    except CLIError as e:
+        console.print(f"[bold red]Error:[/bold red] {e}")
+        sys.exit(e.exit_code)
 
 
 # Add authentication management commands
 auth_app = create_auth_app()
-app.add_typer(auth_app, name="auth")
+app.command(auth_app, name="auth")
 
 # Add database management commands after main callback is defined
 db_app = create_db_app()
-app.add_typer(db_app, name="db")
+app.command(db_app, name="db")
 
 # Add memory management commands
 memory_app = create_memory_app()
-app.add_typer(memory_app, name="memory")
+app.command(memory_app, name="memory")
 
 # Add model management commands
 models_app = create_models_app()
-app.add_typer(models_app, name="models")
+app.command(models_app, name="models")
 
 
 def main():

sqlsaber/cli/database.py

@@ -2,10 +2,12 @@
 
 import asyncio
 import getpass
+import sys
 from pathlib import Path
+from typing import Annotated
 
 import questionary
-import typer
+import cyclopts
 from rich.console import Console
 from rich.table import Table
 
@@ -17,45 +19,64 @@ console = Console()
 config_manager = DatabaseConfigManager()
 
 # Create the database management CLI app
-db_app = typer.Typer(
+db_app = cyclopts.App(
     name="db",
     help="Manage database connections",
-    add_completion=True,
 )
 
 
-@db_app.command("add")
-def add_database(
-    name: str = typer.Argument(..., help="Name for the database connection"),
-    type: str = typer.Option(
-        "postgresql",
-        "--type",
-        "-t",
-        help="Database type (postgresql, mysql, sqlite)",
-    ),
-    host: str | None = typer.Option(None, "--host", "-h", help="Database host"),
-    port: int | None = typer.Option(None, "--port", "-p", help="Database port"),
-    database: str | None = typer.Option(
-        None, "--database", "--db", help="Database name"
-    ),
-    username: str | None = typer.Option(None, "--username", "-u", help="Username"),
-    ssl_mode: str | None = typer.Option(
-        None,
-        "--ssl-mode",
-        help="SSL mode (disable, allow, prefer, require, verify-ca, verify-full for PostgreSQL; DISABLED, PREFERRED, REQUIRED, VERIFY_CA, VERIFY_IDENTITY for MySQL)",
-    ),
-    ssl_ca: str | None = typer.Option(
-        None, "--ssl-ca", help="SSL CA certificate file path"
-    ),
-    ssl_cert: str | None = typer.Option(
-        None, "--ssl-cert", help="SSL client certificate file path"
-    ),
-    ssl_key: str | None = typer.Option(
-        None, "--ssl-key", help="SSL client private key file path"
-    ),
-    interactive: bool = typer.Option(
-        True, "--interactive/--no-interactive", help="Use interactive mode"
-    ),
+@db_app.command
+def add(
+    name: Annotated[str, cyclopts.Parameter(help="Name for the database connection")],
+    type: Annotated[
+        str,
+        cyclopts.Parameter(
+            ["--type", "-t"],
+            help="Database type (postgresql, mysql, sqlite)",
+        ),
+    ] = "postgresql",
+    host: Annotated[
+        str | None,
+        cyclopts.Parameter(["--host", "-h"], help="Database host"),
+    ] = None,
+    port: Annotated[
+        int | None,
+        cyclopts.Parameter(["--port", "-p"], help="Database port"),
+    ] = None,
+    database: Annotated[
+        str | None,
+        cyclopts.Parameter(["--database", "--db"], help="Database name"),
+    ] = None,
+    username: Annotated[
+        str | None,
+        cyclopts.Parameter(["--username", "-u"], help="Username"),
+    ] = None,
+    ssl_mode: Annotated[
+        str | None,
+        cyclopts.Parameter(
+            ["--ssl-mode"],
+            help="SSL mode (disable, allow, prefer, require, verify-ca, verify-full for PostgreSQL; DISABLED, PREFERRED, REQUIRED, VERIFY_CA, VERIFY_IDENTITY for MySQL)",
+        ),
+    ] = None,
+    ssl_ca: Annotated[
+        str | None,
+        cyclopts.Parameter(["--ssl-ca"], help="SSL CA certificate file path"),
+    ] = None,
+    ssl_cert: Annotated[
+        str | None,
+        cyclopts.Parameter(["--ssl-cert"], help="SSL client certificate file path"),
+    ] = None,
+    ssl_key: Annotated[
+        str | None,
+        cyclopts.Parameter(["--ssl-key"], help="SSL client private key file path"),
+    ] = None,
+    interactive: Annotated[
+        bool,
+        cyclopts.Parameter(
+            ["--interactive", "--no-interactive"],
+            help="Use interactive mode",
+        ),
+    ] = True,
 ):
     """Add a new database connection."""
 
@@ -157,7 +178,7 @@ def add_database(
                 console.print(
                     "[bold red]Error:[/bold red] Database file path is required for SQLite"
                 )
-                raise typer.Exit(1)
+                sys.exit(1)
             host = "localhost"
             port = 0
             username = "sqlite"
@@ -167,7 +188,7 @@ def add_database(
                 console.print(
                     "[bold red]Error:[/bold red] Host, database, and username are required"
                 )
-                raise typer.Exit(1)
+                sys.exit(1)
 
             if port is None:
                 port = 5432 if type == "postgresql" else 3306
@@ -210,11 +231,11 @@ def add_database(
 
     except Exception as e:
         console.print(f"[bold red]Error adding database:[/bold red] {e}")
-        raise typer.Exit(1)
+        sys.exit(1)
 
 
-@db_app.command("list")
-def list_databases():
+@db_app.command
+def list():
     """List all configured database connections."""
     databases = config_manager.list_databases()
     default_name = config_manager.get_default_name()
@@ -260,16 +281,18 @@ def list_databases():
     console.print(table)
 
 
-@db_app.command("remove")
-def remove_database(
-    name: str = typer.Argument(..., help="Name of the database connection to remove"),
+@db_app.command
+def remove(
+    name: Annotated[
+        str, cyclopts.Parameter(help="Name of the database connection to remove")
+    ],
 ):
     """Remove a database connection."""
     if not config_manager.get_database(name):
         console.print(
             f"[bold red]Error:[/bold red] Database connection '{name}' not found"
         )
-        raise typer.Exit(1)
+        sys.exit(1)
 
     if questionary.confirm(
         f"Are you sure you want to remove database connection '{name}'?"
@@ -282,37 +305,40 @@ def remove_database(
             console.print(
                 f"[bold red]Error:[/bold red] Failed to remove database connection '{name}'"
             )
-            raise typer.Exit(1)
+            sys.exit(1)
     else:
         console.print("Operation cancelled")
 
 
-@db_app.command("set-default")
-def set_default_database(
-    name: str = typer.Argument(
-        ..., help="Name of the database connection to set as default"
-    ),
+@db_app.command
+def set_default(
+    name: Annotated[
+        str,
+        cyclopts.Parameter(help="Name of the database connection to set as default"),
+    ],
 ):
     """Set the default database connection."""
     if not config_manager.get_database(name):
         console.print(
             f"[bold red]Error:[/bold red] Database connection '{name}' not found"
         )
-        raise typer.Exit(1)
+        sys.exit(1)
 
     if config_manager.set_default_database(name):
         console.print(f"[green]Successfully set '{name}' as default database[/green]")
     else:
         console.print(f"[bold red]Error:[/bold red] Failed to set '{name}' as default")
-        raise typer.Exit(1)
+        sys.exit(1)
 
 
-@db_app.command("test")
-def test_database(
-    name: str | None = typer.Argument(
-        None,
-        help="Name of the database connection to test (uses default if not specified)",
-    ),
+@db_app.command
+def test(
+    name: Annotated[
+        str | None,
+        cyclopts.Parameter(
+            help="Name of the database connection to test (uses default if not specified)",
+        ),
+    ] = None,
 ):
     """Test a database connection."""
 
@@ -323,7 +349,7 @@ def test_database(
                 console.print(
                     f"[bold red]Error:[/bold red] Database connection '{name}' not found"
                 )
-                raise typer.Exit(1)
+                sys.exit(1)
         else:
             db_config = config_manager.get_default_database()
             if not db_config:
@@ -333,7 +359,7 @@ def test_database(
                 console.print(
                     "Use 'sqlsaber db add <name>' to add a database connection"
                 )
-                raise typer.Exit(1)
+                sys.exit(1)
 
         console.print(f"[blue]Testing connection to '{db_config.name}'...[/blue]")
 
@@ -351,11 +377,11 @@ def test_database(
 
         except Exception as e:
             console.print(f"[bold red]✗ Connection failed:[/bold red] {e}")
-            raise typer.Exit(1)
+            sys.exit(1)
 
     asyncio.run(test_connection())
 
 
-def create_db_app() -> typer.Typer:
+def create_db_app() -> cyclopts.App:
     """Return the database management CLI app."""
     return db_app

sqlsaber/cli/display.py

@@ -4,6 +4,7 @@ import json
 
 from rich.console import Console
 from rich.markdown import Markdown
+from rich.panel import Panel
 from rich.syntax import Syntax
 from rich.table import Table
 
@@ -244,7 +245,7 @@ class DisplayManager:
             self.show_error(f"Error displaying plot: {str(e)}")
 
     def show_markdown_response(self, content: list):
-        """Display the assistant's response as rich markdown."""
+        """Display the assistant's response as rich markdown in a panel."""
         if not content:
             return
 
@@ -256,10 +257,11 @@ class DisplayManager:
                 if text:
                     text_parts.append(text)
 
-        # Join all text parts and display as markdown
+        # Join all text parts and display as markdown in a panel
         full_text = "".join(text_parts).strip()
         if full_text:
-            self.console.print()  # Add spacing before markdown
+            self.console.print()  # Add spacing before panel
             markdown = Markdown(full_text)
-            self.console.print(markdown)
-            self.console.print()  # Add spacing after markdown
+            panel = Panel.fit(markdown, border_style="green")
+            self.console.print(panel)
+            self.console.print()  # Add spacing after panel

sqlsaber/cli/interactive.py

@@ -36,8 +36,15 @@ class InteractiveSession:
 
         self.console.print(
             Panel.fit(
-                "[bold green]SQLSaber - Use the agent Luke![/bold green]\n\n"
-                "[bold]Your agentic SQL assistant.[/bold]\n\n\n"
+                """
+███████  ██████  ██      ███████  █████  ██████  ███████ ██████
+██      ██    ██ ██      ██      ██   ██ ██   ██ ██      ██   ██
+███████ ██    ██ ██      ███████ ███████ ██████  █████   ██████
+     ██ ██ ▄▄ ██ ██           ██ ██   ██ ██   ██ ██      ██   ██
+███████  ██████  ███████ ███████ ██   ██ ██████  ███████ ██   ██
+            ▀▀
+"""
+                "\n\n"
                 "[dim]Use '/clear' to reset conversation, '/exit' or '/quit' to leave.[/dim]\n\n"
                 "[dim]Start a message with '#' to add something to agent's memory for this database.[/dim]\n\n"
                 "[dim]Type '@' to get table name completions.[/dim]",

sqlsaber/cli/memory.py

@@ -1,6 +1,10 @@
 """Memory management CLI commands."""
 
-import typer
+import sys
+from typing import Annotated
+
+import cyclopts
+import questionary
 from rich.console import Console
 from rich.table import Table
 
@@ -13,10 +17,9 @@ config_manager = DatabaseConfigManager()
 memory_manager = MemoryManager()
 
 # Create the memory management CLI app
-memory_app = typer.Typer(
+memory_app = cyclopts.App(
     name="memory",
     help="Manage database-specific memories",
-    add_completion=True,
 )
 
 
@@ -28,7 +31,7 @@ def _get_database_name(database: str | None = None) -> str:
             console.print(
                 f"[bold red]Error:[/bold red] Database connection '{database}' not found."
             )
-            raise typer.Exit(1)
+            sys.exit(1)
         return database
     else:
         db_config = config_manager.get_default_database()
@@ -37,19 +40,20 @@ def _get_database_name(database: str | None = None) -> str:
                 "[bold red]Error:[/bold red] No database connections configured."
             )
             console.print("Use 'sqlsaber db add <name>' to add a database connection.")
-            raise typer.Exit(1)
+            sys.exit(1)
         return db_config.name
 
 
-@memory_app.command("add")
-def add_memory(
-    content: str = typer.Argument(..., help="Memory content to add"),
-    database: str | None = typer.Option(
-        None,
-        "--database",
-        "-d",
-        help="Database connection name (uses default if not specified)",
-    ),
+@memory_app.command
+def add(
+    content: Annotated[str, cyclopts.Parameter(help="Memory content to add")],
+    database: Annotated[
+        str | None,
+        cyclopts.Parameter(
+            ["--database", "-d"],
+            help="Database connection name (uses default if not specified)",
+        ),
+    ] = None,
 ):
     """Add a new memory for the specified database."""
     database_name = _get_database_name(database)
@@ -61,17 +65,18 @@ def add_memory(
         console.print(f"[dim]Content:[/dim] {memory.content}")
     except Exception as e:
         console.print(f"[bold red]Error adding memory:[/bold red] {e}")
-        raise typer.Exit(1)
-
-
-@memory_app.command("list")
-def list_memories(
-    database: str | None = typer.Option(
-        None,
-        "--database",
-        "-d",
-        help="Database connection name (uses default if not specified)",
-    ),
+        sys.exit(1)
+
+
+@memory_app.command
+def list(
+    database: Annotated[
+        str | None,
+        cyclopts.Parameter(
+            ["--database", "-d"],
+            help="Database connection name (uses default if not specified)",
+        ),
+    ] = None,
 ):
     """List all memories for the specified database."""
     database_name = _get_database_name(database)
@@ -102,15 +107,16 @@ def list_memories(
     console.print(f"\n[dim]Total memories: {len(memories)}[/dim]")
 
 
-@memory_app.command("show")
-def show_memory(
-    memory_id: str = typer.Argument(..., help="Memory ID to show"),
-    database: str | None = typer.Option(
-        None,
-        "--database",
-        "-d",
-        help="Database connection name (uses default if not specified)",
-    ),
+@memory_app.command
+def show(
+    memory_id: Annotated[str, cyclopts.Parameter(help="Memory ID to show")],
+    database: Annotated[
+        str | None,
+        cyclopts.Parameter(
+            ["--database", "-d"],
+            help="Database connection name (uses default if not specified)",
+        ),
+    ] = None,
 ):
     """Show the full content of a specific memory."""
     database_name = _get_database_name(database)
@@ -121,7 +127,7 @@ def show_memory(
         console.print(
             f"[bold red]Error:[/bold red] Memory with ID '{memory_id}' not found for database '{database_name}'"
         )
-        raise typer.Exit(1)
+        sys.exit(1)
 
     console.print(f"[bold]Memory ID:[/bold] {memory.id}")
     console.print(f"[bold]Database:[/bold] {memory.database}")
@@ -130,15 +136,16 @@ def show_memory(
     console.print(f"{memory.content}")
 
 
-@memory_app.command("remove")
-def remove_memory(
-    memory_id: str = typer.Argument(..., help="Memory ID to remove"),
-    database: str | None = typer.Option(
-        None,
-        "--database",
-        "-d",
-        help="Database connection name (uses default if not specified)",
-    ),
+@memory_app.command
+def remove(
+    memory_id: Annotated[str, cyclopts.Parameter(help="Memory ID to remove")],
+    database: Annotated[
+        str | None,
+        cyclopts.Parameter(
+            ["--database", "-d"],
+            help="Database connection name (uses default if not specified)",
+        ),
+    ] = None,
 ):
     """Remove a specific memory by ID."""
     database_name = _get_database_name(database)
@@ -149,7 +156,7 @@ def remove_memory(
         console.print(
             f"[bold red]Error:[/bold red] Memory with ID '{memory_id}' not found for database '{database_name}'"
         )
-        raise typer.Exit(1)
+        sys.exit(1)
 
     # Show memory content before removal
     console.print("[yellow]Removing memory:[/yellow]")
@@ -163,23 +170,25 @@ def remove_memory(
         console.print(
             f"[bold red]Error:[/bold red] Failed to remove memory '{memory_id}'"
         )
-        raise typer.Exit(1)
-
-
-@memory_app.command("clear")
-def clear_memories(
-    database: str | None = typer.Option(
-        None,
-        "--database",
-        "-d",
-        help="Database connection name (uses default if not specified)",
-    ),
-    force: bool = typer.Option(
-        False,
-        "--force",
-        "-f",
-        help="Skip confirmation prompt",
-    ),
+        sys.exit(1)
+
+
+@memory_app.command
+def clear(
+    database: Annotated[
+        str | None,
+        cyclopts.Parameter(
+            ["--database", "-d"],
+            help="Database connection name (uses default if not specified)",
+        ),
+    ] = None,
+    force: Annotated[
+        bool,
+        cyclopts.Parameter(
+            ["--force", "-f"],
+            help="Skip confirmation prompt",
+        ),
+    ] = False,
 ):
     """Clear all memories for the specified database."""
     database_name = _get_database_name(database)
@@ -198,8 +207,8 @@ def clear_memories(
         console.print(
             f"[yellow]About to clear {memories_count} memories for database '{database_name}'[/yellow]"
         )
-        confirm = typer.confirm("Are you sure you want to proceed?")
-        if not confirm:
+
+        if not questionary.confirm("Are you sure you want to proceed?").ask():
             console.print("Operation cancelled")
             return
 
@@ -209,14 +218,15 @@ def clear_memories(
     )
 
 
-@memory_app.command("summary")
-def memory_summary(
-    database: str | None = typer.Option(
-        None,
-        "--database",
-        "-d",
-        help="Database connection name (uses default if not specified)",
-    ),
+@memory_app.command
+def summary(
+    database: Annotated[
+        str | None,
+        cyclopts.Parameter(
+            ["--database", "-d"],
+            help="Database connection name (uses default if not specified)",
+        ),
+    ] = None,
 ):
     """Show memory summary for the specified database."""
     database_name = _get_database_name(database)
@@ -232,6 +242,6 @@ def memory_summary(
             console.print(f"[dim]{memory['timestamp']}[/dim] - {memory['content']}")
 
 
-def create_memory_app() -> typer.Typer:
+def create_memory_app() -> cyclopts.App:
     """Return the memory management CLI app."""
     return memory_app

sqlsaber/cli/models.py

@@ -1,10 +1,11 @@
 """Model management CLI commands."""
 
 import asyncio
+import sys
 
 import httpx
 import questionary
-import typer
+import cyclopts
 from rich.console import Console
 from rich.table import Table
 
@@ -14,10 +15,9 @@ from sqlsaber.config.settings import Config
 console = Console()
 
 # Create the model management CLI app
-models_app = typer.Typer(
+models_app = cyclopts.App(
     name="models",
     help="Select and manage models",
-    add_completion=True,
 )
 
 
@@ -96,8 +96,8 @@ class ModelManager:
 model_manager = ModelManager()
 
 
-@models_app.command("list")
-def list_models():
+@models_app.command
+def list():
     """List available AI models."""
 
     async def fetch_and_display():
@@ -146,8 +146,8 @@ def list_models():
     asyncio.run(fetch_and_display())
 
 
-@models_app.command("set")
-def set_model():
+@models_app.command
+def set():
     """Set the AI model to use."""
 
     async def interactive_set():
@@ -156,7 +156,7 @@ def set_model():
 
         if not models:
             console.print("[red]Failed to fetch models. Cannot set model.[/red]")
-            raise typer.Exit(1)
+            sys.exit(1)
 
         # Create choices for questionary
         choices = []
@@ -190,22 +190,22 @@ def set_model():
                 console.print(f"[green]✓ Model set to: {selected_model}[/green]")
             else:
                 console.print("[red]✗ Failed to set model[/red]")
-                raise typer.Exit(1)
+                sys.exit(1)
         else:
             console.print("[yellow]Operation cancelled[/yellow]")
 
     asyncio.run(interactive_set())
 
 
-@models_app.command("current")
-def current_model():
+@models_app.command
+def current():
     """Show the currently configured model."""
     current = model_manager.get_current_model()
     console.print(f"Current model: [cyan]{current}[/cyan]")
 
 
-@models_app.command("reset")
-def reset_model():
+@models_app.command
+def reset():
     """Reset to the default model."""
 
     async def interactive_reset():
@@ -218,13 +218,13 @@ def reset_model():
                 )
             else:
                 console.print("[red]✗ Failed to reset model[/red]")
-                raise typer.Exit(1)
+                sys.exit(1)
         else:
             console.print("[yellow]Operation cancelled[/yellow]")
 
     asyncio.run(interactive_reset())
 
 
-def create_models_app() -> typer.Typer:
+def create_models_app() -> cyclopts.App:
     """Return the model management CLI app."""
     return models_app

{sqlsaber-0.8.1.dist-info → sqlsaber-0.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlsaber
-Version: 0.8.1
+Version: 0.9.0
 Summary: SQLSaber - Agentic SQL assistant like Claude Code
 License-File: LICENSE
 Requires-Python: >=3.12
@@ -8,6 +8,7 @@ Requires-Dist: aiomysql>=0.2.0
 Requires-Dist: aiosqlite>=0.21.0
 Requires-Dist: anthropic>=0.54.0
 Requires-Dist: asyncpg>=0.30.0
+Requires-Dist: cyclopts>=3.22.1
 Requires-Dist: fastmcp>=2.9.0
 Requires-Dist: httpx>=0.28.1
 Requires-Dist: keyring>=25.6.0
@@ -15,7 +16,6 @@ Requires-Dist: pandas>=2.0.0
 Requires-Dist: platformdirs>=4.0.0
 Requires-Dist: questionary>=2.1.0
 Requires-Dist: rich>=13.7.0
-Requires-Dist: typer>=0.16.0
 Requires-Dist: uniplot>=0.21.2
 Description-Content-Type: text/markdown
 
@@ -126,7 +126,7 @@ saber memory list
 Start an interactive session:
 
 ```bash
-saber query
+saber
 ```
 
 > You can also add memories in an interactive session by starting your message with the `#` sign
@@ -136,7 +136,7 @@ saber query
 Execute a single natural language query:
 
 ```bash
-saber query "show me all users created this month"
+saber "show me all users created this month"
 ```
 
 ### Database Selection
@@ -144,33 +144,39 @@ saber query "show me all users created this month"
 Use a specific database connection:
 
 ```bash
-# Use named database from config
-saber query -d mydb "count all orders"
+# Interactive mode with specific database
+saber -d mydb
+
+# Single query with specific database
+saber -d mydb "count all orders"
 ```
 
 ## Examples
 
 ```bash
 # Show database schema
-saber query "what tables are in my database?"
+saber "what tables are in my database?"
 
 # Count records
-saber query "how many active users do we have?"
+saber "how many active users do we have?"
 
 # Complex queries with joins
-saber query "show me orders with customer details for this week"
+saber "show me orders with customer details for this week"
 
 # Aggregations
-saber query "what's the total revenue by product category?"
+saber "what's the total revenue by product category?"
 
 # Date filtering
-saber query "list users who haven't logged in for 30 days"
+saber "list users who haven't logged in for 30 days"
 
 # Data exploration
-saber query "show me the distribution of customer ages"
+saber "show me the distribution of customer ages"
 
 # Business analytics
-saber query "which products had the highest sales growth last quarter?"
+saber "which products had the highest sales growth last quarter?"
+
+# Start interactive mode
+saber
 ```
 
 ## MCP Server Integration

{sqlsaber-0.8.1.dist-info → sqlsaber-0.9.0.dist-info}/RECORD

@@ -6,14 +6,14 @@ sqlsaber/agents/base.py,sha256=Cl5ZV4dfgjslOAq8jbrnt5kX-NM_8QmjacWzb0hvbzs,10527
 sqlsaber/agents/mcp.py,sha256=FKtXgDrPZ2-xqUYCw2baI5JzrWekXaC5fjkYW1_Mg50,827
 sqlsaber/agents/streaming.py,sha256=LaSeMTlxuJFRArJVqDly5-_KgcePiCCKPKfMxfB4oGs,521
 sqlsaber/cli/__init__.py,sha256=qVSLVJLLJYzoC6aj6y9MFrzZvAwc4_OgxU9DlkQnZ4M,86
-sqlsaber/cli/auth.py,sha256=tm3f-qIuNS0nQbU2DEI7ezWG092mayNW1GuoiwdV8hI,5047
-sqlsaber/cli/commands.py,sha256=Ob505FV1kfaRKoW_agon4Q82772QmLjxISfvbXGOHE4,5256
+sqlsaber/cli/auth.py,sha256=1yvawtS5NGj9dWMRZ8I5T6sqBiRqZpPsjEPrJSQBJAs,4979
+sqlsaber/cli/commands.py,sha256=ABmw9U6HwSJI61d9iK0X3nsFKLMqfcQGQEYE9ZoZHlw,5494
 sqlsaber/cli/completers.py,sha256=HsUPjaZweLSeYCWkAcgMl8FylQ1xjWBWYTEL_9F6xfU,6430
-sqlsaber/cli/database.py,sha256=mWpMPcISUokYIiAMU4M_g8YeI-Fz5YU_R3PYs-GigCw,12588
-sqlsaber/cli/display.py,sha256=XcBkjdG7RoM_ijHgv0VWqWleT5CCTm0Hcp1sJoE1FKE,9979
-sqlsaber/cli/interactive.py,sha256=sQQXO8RcbVwxIBArNUlv-8ePhLn3UUdx6zUl44l8tow,7395
-sqlsaber/cli/memory.py,sha256=OFspjaZ2RaYrBdSDVOD-9_6T8NbqedHEn5FztGkLUlc,7621
-sqlsaber/cli/models.py,sha256=7bvIykGPTJu3-3tpPinr44GBkPIQhoeKI3d3Kgn3jOI,7783
+sqlsaber/cli/database.py,sha256=tJ8rqGrafZpg3VgDmSiq7eZoPscoGAW3XLTYGoQw8LE,12910
+sqlsaber/cli/display.py,sha256=wC-xYmmD21XyAkpRdMW7Ch2Mn5SlM1X34pbpka2ZIX8,10083
+sqlsaber/cli/interactive.py,sha256=NjrhzXt6YK4WL17DMkJTY5dA1v9QMxLdkI1XgPKK8YA,8017
+sqlsaber/cli/memory.py,sha256=OufHFJFwV0_GGn7LvKRTJikkWhV1IwNIUDOxFPHXOaQ,7794
+sqlsaber/cli/models.py,sha256=HByezaeKqj65GzB_FmWuugjkgTq2Pvab_mzNZnHxya0,7690
 sqlsaber/cli/streaming.py,sha256=WfhFd5ntq2HStpJZwWJ0C5uyXKc3aU14eo8HdjzW1o0,3767
 sqlsaber/clients/__init__.py,sha256=jcMoVsT92U6nQrfotCp1h0ggskJPAcgeYarqQl1qEBg,171
 sqlsaber/clients/anthropic.py,sha256=umRmuzpmJdYO7hO3biAZXO9T_sb6Vv010o6zqn03is8,9947
@@ -39,8 +39,8 @@ sqlsaber/memory/storage.py,sha256=ne8szLlGj5NELheqLnI7zu21V8YS4rtpYGGC7tOmi-s,57
 sqlsaber/models/__init__.py,sha256=RJ7p3WtuSwwpFQ1Iw4_DHV2zzCtHqIzsjJzxv8kUjUE,287
 sqlsaber/models/events.py,sha256=89SXKb5GGpH01yTr2kPEBhzp9xv35RFIYuFdAZSIPoE,721
 sqlsaber/models/types.py,sha256=w-zk81V2dtveuteej36_o1fDK3So428j3P2rAejU62U,862
-sqlsaber-0.8.1.dist-info/METADATA,sha256=wmQlEB13kRa35a-n6oIFSg0YExXE0iF7_V4GZWkuLRA,5986
-sqlsaber-0.8.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sqlsaber-0.8.1.dist-info/entry_points.txt,sha256=jmFo96Ylm0zIKXJBwhv_P5wQ7SXP9qdaBcnTp8iCEe8,195
-sqlsaber-0.8.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-sqlsaber-0.8.1.dist-info/RECORD,,
+sqlsaber-0.9.0.dist-info/METADATA,sha256=F2LyQDJS7tE1PfA2LhHJfjNU1qo35MbloSjvJyXgCs4,6023
+sqlsaber-0.9.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sqlsaber-0.9.0.dist-info/entry_points.txt,sha256=qEbOB7OffXPFgyJc7qEIJlMEX5RN9xdzLmWZa91zCQQ,162
+sqlsaber-0.9.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+sqlsaber-0.9.0.dist-info/RECORD,,

{sqlsaber-0.8.1.dist-info → sqlsaber-0.9.0.dist-info}/entry_points.txt

@@ -1,6 +1,5 @@
 [console_scripts]
 saber = sqlsaber.cli.commands:main
 saber-mcp = sqlsaber.mcp.mcp:main
-sql = sqlsaber.cli.commands:main
 sqlsaber = sqlsaber.cli.commands:main
 sqlsaber-mcp = sqlsaber.mcp.mcp:main