sqlsaber 0.8.2__tar.gz → 0.9.0__tar.gz

{sqlsaber-0.8.2 → sqlsaber-0.9.0}/.gitignore

@@ -8,3 +8,5 @@ wheels/
 
 # Virtual environments
 .venv
+
+*.local.*

sqlsaber-0.9.0/AGENT.md

@@ -0,0 +1,24 @@
+# SQLSaber Agent Guide
+
+## Commands
+
+- **Run Python**: `uv run python`
+- **Run tests**: `uv run python -m pytest`
+- **Run single test**: `uv run python -m pytest tests/test_path/test_file.py::test_function`
+- **Lint**: `uv run ruff check --fix`
+- **Format**: `uv run ruff format`
+
+## Architecture
+
+- **CLI App**: Agentic SQL assistant for natural language to SQL
+- **Core modules**: `agents/` (AI logic), `cli/` (commands), `clients/` (LLM clients), `database/` (connections), `mcp/` (Model Context Protocol server)
+- **Database support**: PostgreSQL, SQLite, MySQL via asyncpg/aiosqlite/aiomysql
+- **MCP integration**: Exposes tools via `sqlsaber-mcp` for Claude Code and other MCP clients
+
+## Code Style
+
+- **Imports**: stdlib → 3rd party → local, use relative imports within modules
+- **Naming**: snake_case functions/vars, PascalCase classes, UPPER_SNAKE constants, `_private` methods
+- **Types**: Always use modern type hints (3.12+), async functions for I/O
+- **Errors**: Custom exception hierarchy from `LLMClientError`, use try/finally for cleanup
+- **Docstrings**: Triple-quoted with Args/Returns sections

{sqlsaber-0.8.2 → sqlsaber-0.9.0}/CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to SQLSaber will be documented in this file.
 
 ## [Unreleased]
 
+## [0.9.0] - 2025-07-08
+
+### Changed
+
+- Migrated from Typer to Cyclopts for CLI framework
+  - Improved command structure and parameter handling
+  - Better support for sub-commands and help documentation
+- Made interactive mode more ergonomic
+  - `saber` now directly starts interactive mode (previously `saber query`)
+  - `saber "question"` executes a single query (previously `saber query "question"`)
+  - Removed the `query` subcommand for a cleaner interface
+
 ## [0.8.2] - 2025-07-08
 
 ## Changed

sqlsaber-0.9.0/CLAUDE.md

@@ -0,0 +1,22 @@
+## Commands
+
+- **Run Python**: `uv run python`
+- **Run tests**: `uv run python -m pytest`
+- **Run single test**: `uv run python -m pytest tests/test_path/test_file.py::test_function`
+- **Lint**: `uv run ruff check --fix`
+- **Format**: `uv run ruff format`
+
+## Architecture
+
+- **CLI App**: Agentic SQL assistant for natural language to SQL
+- **Core modules**: `agents/` (AI logic), `cli/` (commands), `clients/` (LLM clients), `database/` (connections), `mcp/` (Model Context Protocol server)
+- **Database support**: PostgreSQL, SQLite, MySQL via asyncpg/aiosqlite/aiomysql
+- **MCP integration**: Exposes tools via `sqlsaber-mcp` for Claude Code and other MCP clients
+
+## Code Style
+
+- **Imports**: stdlib → 3rd party → local, use relative imports within modules
+- **Naming**: snake_case functions/vars, PascalCase classes, UPPER_SNAKE constants, `_private` methods
+- **Types**: Always use modern type hints (3.12+), async functions for I/O
+- **Errors**: Custom exception hierarchy from `LLMClientError`, use try/finally for cleanup
+- **Docstrings**: Triple-quoted with Args/Returns sections

{sqlsaber-0.8.2 → sqlsaber-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlsaber
-Version: 0.8.2
+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.2 → sqlsaber-0.9.0}/README.md

@@ -105,7 +105,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
@@ -115,7 +115,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
@@ -123,33 +123,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.2 → sqlsaber-0.9.0}/pyproject.toml

@@ -1,12 +1,11 @@
 [project]
 name = "sqlsaber"
-version = "0.8.2"
+version = "0.9.0"
 description = "SQLSaber - Agentic SQL assistant like Claude Code"
 readme = "README.md"
 requires-python = ">=3.12"
 dependencies = [
     "asyncpg>=0.30.0",
-    "typer>=0.16.0",
     "rich>=13.7.0",
     "anthropic>=0.54.0",
     "keyring>=25.6.0",
@@ -18,6 +17,7 @@ dependencies = [
     "pandas>=2.0.0",
     "fastmcp>=2.9.0",
     "uniplot>=0.21.2",
+    "cyclopts>=3.22.1",
 ]
 
 [tool.uv]
@@ -33,6 +33,5 @@ packages = ["src/sqlsaber"]
 [project.scripts]
 sqlsaber = "sqlsaber.cli.commands:main"
 saber = "sqlsaber.cli.commands:main"
-sql = "sqlsaber.cli.commands:main"
 sqlsaber-mcp = "sqlsaber.mcp.mcp:main"
 saber-mcp = "sqlsaber.mcp.mcp:main"

{sqlsaber-0.8.2 → sqlsaber-0.9.0}/src/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-0.8.2 → sqlsaber-0.9.0}/src/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():