dbagent-cli 0.5.2__tar.gz → 0.6.1__tar.gz

{dbagent_cli-0.5.2 → dbagent_cli-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbagent-cli
-Version: 0.5.2
+Version: 0.6.1
 Summary: Enterprise AI Database Copilot, Schema Graph Introspector & Autonomous Recovery Agent (CLI)
 Author: Santhosh Gupta
 Requires-Python: >=3.9

{dbagent_cli-0.5.2 → dbagent_cli-0.6.1}/dbagent/__init__.py

@@ -2,5 +2,5 @@
 DB-Agent: Universal Database Introspection and Script Generation AI Agent (CLI).
 """
 
-__version__ = "0.5.2"
+__version__ = "0.6.1"
 __author__ = "Santhosh Gupta"

{dbagent_cli-0.5.2 → dbagent_cli-0.6.1}/dbagent/cli.py

@@ -14,9 +14,10 @@ import typer
 from rich.prompt import Prompt, Confirm
 from rich.table import Table
 from rich.markdown import Markdown
-from rich.panel import Panel
-from prompt_toolkit import PromptSession
+from prompt_toolkit import PromptSession, HTML
 from prompt_toolkit.history import FileHistory
+from prompt_toolkit.completion import WordCompleter
+from prompt_toolkit.styles import Style
 
 from dbagent import __version__, __author__
 from dbagent.config import ConfigManager
@@ -63,6 +64,13 @@ from dbagent.ui.console import (
 )
 from dbagent.ui.viewer import SchemaViewer
 from dbagent.ui.grid_window import open_desktop_grid_window, open_browser_grid_window
+from dbagent.ui.chat_screen import (
+    clear_screen,
+    render_chat_header,
+    render_user_turn,
+    render_assistant_turn,
+    render_session_history,
+)
 
 app = typer.Typer(
     name="db-agent",
@@ -447,27 +455,38 @@ def chat_command(
     dialect = connector.engine.dialect.name
     current_mode = OperationMode(mode.upper()) if mode.upper() in OperationMode.__members__ else OperationMode.CONFIRM
 
-    console.print(f"[bold green]Connected:[/bold green] {db_name} ({dialect}) - {len(table_names)} tables")
-    console.print(f"[bold cyan]AI:[/bold cyan] {llm.name} | [bold yellow]Mode:[/bold yellow] {current_mode.value}")
-    console.print("[dim]Type your question in plain English or use colon commands (e.g. :help, :tables, :doctor).[/dim]")
-
     # Display AI recommendations on connect (instant <0.1ms with zero network overhead)
+    recs = []
     try:
         cached_schema = cache_mgr.load_cached_schema(db_url)
         if cached_schema:
             recs = QueryRecommender.generate_recommendations(cached_schema, max_suggestions=3)
         else:
             recs = QueryRecommender.generate_from_table_names(table_names, max_suggestions=3)
-        if recs:
-            console.print("\n[bold cyan]💡 Try asking:[/bold cyan]")
-            for r in recs:
-                console.print(f"  → [italic]{r}[/italic]")
     except Exception:
         pass
-    console.print("")
+
+    # Clear screen and render Claude-style clean header card
+    clear_screen()
+    render_chat_header(
+        db_name=db_name,
+        dialect=dialect,
+        table_count=len(table_names),
+        ai_provider=llm.name,
+        ai_model=model or getattr(llm, "default_model", None),
+        mode=current_mode.value,
+        recommendations=recs,
+    )
 
     history_file = config_mgr.config_dir / "chat_history.txt"
-    session = PromptSession(history=FileHistory(str(history_file)))
+    chat_completer = WordCompleter([
+        ":help", ":tables", ":schema", ":dt", ":table", ":fk", ":path", ":join",
+        ":doctor", ":mode", ":changes", ":provider", ":model", ":models",
+        ":page", ":card", ":wide", ":scroll", ":window", ":grid", ":web",
+        ":explain", ":history", ":auto", ":noauto", ":run", ":clear", ":export",
+        ":exit", ":quit", ":q",
+    ], ignore_case=True)
+    session = PromptSession(history=FileHistory(str(history_file)), completer=chat_completer)
 
     auto_execute = True
     conversation_ctx = ConversationContext()
@@ -488,7 +507,7 @@ def chat_command(
 
     while True:
         try:
-            user_input = session.prompt("db-agent> ").strip()
+            user_input = session.prompt(HTML("<ansicyan><b>db-agent</b></ansicyan> <ansiblue><b>❯</b></ansiblue> ")).strip()
             if not user_input:
                 continue
 
@@ -512,9 +531,9 @@ def chat_command(
                     console.print("  [bold]:doctor[/bold]                    -> Run database health diagnostics")
                     console.print("  [bold]:mode <name>[/bold]               -> Switch mode (SAFE, READ_ONLY, CONFIRM, SANDBOX, ADMIN)")
                     console.print("  [bold]:changes[/bold]                   -> List recent write ChangeSets")
-                    console.print("  [bold]:provider <name>[/bold]           -> Switch AI provider (ollama, gemini, groq, openrouter)")
-                    console.print("  [bold]:model <name>[/bold]              -> Switch active model name (e.g. gemini-3.6-flash)")
-                    console.print("  [bold]:models[/bold]                     -> Show active AI provider and model status")
+                    console.print("  [bold]:provider <name>[/bold]           -> Switch AI provider (gemini, ollama, groq, openrouter)")
+                    console.print("  [bold]:models[/bold]                     -> View list of available AI models & speed benchmarks")
+                    console.print("  [bold]:model <num|name>[/bold]          -> Switch active model (:model 1, :model 3.7, :model 3.6)")
                     console.print("  [bold]:page <n>[/bold]                  -> View column page <n> for wide multi-column tables")
                     console.print("  [bold]:card[/bold]                      -> View last result in expanded vertical card format (all columns)")
                     console.print("  [bold]:wide[/bold]                      -> Force-show all columns in terminal (zoom out)")
@@ -680,21 +699,53 @@ def chat_command(
                         print_error(f"Unknown provider '{cmd_arg}'. Supported: ollama, gemini, groq, openrouter")
                     continue
 
-                if cmd_name == ":model":
-                    if not cmd_arg:
-                        curr_model = model or getattr(llm, "default_model", "default")
-                        console.print(f"Active Model: [bold green]{curr_model}[/bold green] (Provider: {llm.name})")
-                        console.print("[dim]Usage: [bold]:model <model_name>[/bold][/dim]")
+                if cmd_name in [":model", ":models", ":providers", ":ai"]:
+                    avail_models = llm.list_models() if hasattr(llm, "list_models") else []
+                    curr_model = model or getattr(llm, "default_model", "default")
+
+                    # If no arg passed or :models/:providers called, show rich model selection menu
+                    if not cmd_arg or cmd_name in [":models", ":providers", ":ai"]:
+                        console.print(f"\n[bold cyan]Active AI Provider:[/bold cyan] [bold white]{llm.name}[/bold white]")
+                        console.print(f"[bold cyan]Active Model:[/bold cyan] [bold green]{curr_model}[/bold green]\n")
+                        if avail_models:
+                            console.print(f"[bold]Available Models for {llm.name}:[/bold]")
+                            model_descriptions = {
+                                "gemini-flash-lite-latest": "⚡ Ultra-Fast (~0.8s) • Recommended for instant chat & queries",
+                                "gemini-3.6-flash": "⚡ High Quality (~3.5s) • Strong SQL reasoning & accuracy",
+                                "gemini-3.7-flash": "🧠 Deep Reasoning (~13s) • Latest flagship model",
+                                "gemini-3.1-flash-lite": "⚡ Fast Lite (~4.0s) • Low latency",
+                                "gemini-flash-latest": "⚡ Standard Flash (~7.0s)",
+                            }
+                            for idx, m_name in enumerate(avail_models, 1):
+                                is_active = " [bold green]✓ Active[/bold green]" if m_name == curr_model else ""
+                                desc = model_descriptions.get(m_name, "")
+                                desc_str = f" - [dim]{desc}[/dim]" if desc else ""
+                                console.print(f"  [bold cyan]{idx}[/bold cyan]. [bold white]{m_name}[/bold white]{desc_str}{is_active}")
+                            console.print("\n[dim]Quick Switch: [bold]:model 1[/bold] (ultra-fast) | [bold]:model 3.7[/bold] | [bold]:model 3.6[/bold] | [bold]:model <name>[/bold][/dim]\n")
                         continue
-                    model = cmd_arg
-                    print_success(f"Switched active model to [bold cyan]{model}[/bold cyan] (Provider: {llm.name})")
-                    continue
 
-                if cmd_name in [":models", ":providers", ":ai"]:
-                    curr_model = model or getattr(llm, "default_model", "default")
-                    console.print(f"\n[bold cyan]Active AI Provider:[/bold cyan] [bold white]{llm.name}[/bold white]")
-                    console.print(f"[bold cyan]Active Model:[/bold cyan] [bold green]{curr_model}[/bold green]")
-                    console.print("[dim]Switch anytime: [bold]:provider <ollama|gemini|groq|openrouter>[/bold] or [bold]:model <name>[/bold][/dim]\n")
+                    # Handle numeric shortcut or name shortcut
+                    target_model = cmd_arg.strip()
+                    if target_model.isdigit() and avail_models:
+                        choice_idx = int(target_model) - 1
+                        if 0 <= choice_idx < len(avail_models):
+                            target_model = avail_models[choice_idx]
+                    elif target_model in ["3.7", "37"]:
+                        target_model = "gemini-3.7-flash"
+                    elif target_model in ["3.6", "36"]:
+                        target_model = "gemini-3.6-flash"
+                    elif target_model in ["lite", "fast", "flash-lite", "1"]:
+                        target_model = "gemini-flash-lite-latest"
+                    elif target_model in ["3.1"]:
+                        target_model = "gemini-3.1-flash-lite"
+                    elif avail_models:
+                        matches = [m for m in avail_models if target_model.lower() in m.lower()]
+                        if matches:
+                            target_model = matches[0]
+
+                    model = target_model
+                    pipeline.model = model
+                    print_success(f"Switched active model to [bold cyan]{model}[/bold cyan] (Provider: {llm.name})")
                     continue
 
                 if cmd_name == ":explain":
@@ -710,14 +761,20 @@ def chat_command(
                     continue
 
                 if cmd_name == ":history":
-                    if not query_history:
-                        print_warning("No query history in this session.")
-                        continue
-                    for i, r in enumerate(query_history[-10:], 1):
-                        status = "[green]OK[/green]" if r.success else "[red]FAIL[/red]"
-                        sql_str = r.sql or ""
-                        sql_preview = (sql_str[:80] + "...") if len(sql_str) > 80 else sql_str
-                        console.print(f"  {i}. {status} [{r.query_type}] {sql_preview}")
+                    render_session_history(query_history)
+                    continue
+
+                if cmd_name in [":clear", ":cls"]:
+                    clear_screen()
+                    render_chat_header(
+                        db_name=db_name,
+                        dialect=dialect,
+                        table_count=len(table_names),
+                        ai_provider=llm.name,
+                        ai_model=model or getattr(llm, "default_model", None),
+                        mode=current_mode.value,
+                        recommendations=recs,
+                    )
                     continue
 
                 if cmd_name in [":page", ":cols", ":p"]:
@@ -817,10 +874,17 @@ def chat_command(
             pipeline.mode = current_mode
             pipeline.auto_execute = auto_execute
 
+            render_user_turn(user_input)
+
             with DynamicSpinner():
                 result = pipeline.run(user_prompt=user_input)
 
-            _display_pipeline_result(result, show_sql=True)
+            render_assistant_turn(
+                result,
+                show_sql=True,
+                ai_provider=llm.name,
+                ai_model=model or getattr(llm, "default_model", None),
+            )
 
             last_result = result
             query_history.append(result)

{dbagent_cli-0.5.2 → dbagent_cli-0.6.1}/dbagent/llm/gemini_provider.py

@@ -14,19 +14,18 @@ class GeminiProvider(BaseLLMProvider):
     """Google Gemini LLM provider (Free Tier available)."""
 
     FALLBACK_MODELS = [
+        "gemini-flash-lite-latest",
         "gemini-3.6-flash",
         "gemini-3.7-flash",
-        "gemini-3.5-flash",
+        "gemini-3.1-flash-lite",
         "gemini-flash-latest",
-        "gemini-pro-latest",
-        "gemini-2.5-flash",
     ]
 
     def __init__(self, api_key: Optional[str] = None, default_model: str = "gemini-3.6-flash"):
         self.api_key = api_key or os.getenv("GEMINI_API_KEY")
         self.default_model = default_model
         self._session = requests.Session()
-        self._session.headers.update({"User-Agent": "DB-Agent/0.5.0"})
+        self._session.headers.update({"User-Agent": "DB-Agent/0.6.0"})
 
     @property
     def name(self) -> str:
@@ -117,7 +116,7 @@ class GeminiProvider(BaseLLMProvider):
                     else:
                         raise RuntimeError(f"Gemini API error ({response.status_code}): {response.text}")
                 else:
-                    response = self._session.post(endpoint, json=payload, timeout=30)
+                    response = self._session.post(endpoint, json=payload, timeout=15)
                     if response.status_code == 200:
                         data = response.json()
                         candidates = data.get("candidates", [])

dbagent_cli-0.6.1/dbagent/ui/chat_screen.py

@@ -0,0 +1,211 @@
+"""
+Claude-Style Clean Chat Screen UI Component for DB-Agent.
+Renders clean status headers, message turn cards, visual history tables, and styled prompt layouts.
+"""
+
+import os
+from typing import List, Optional, Dict, Any
+from rich.console import Console
+from rich.panel import Panel
+from rich.table import Table
+from rich.text import Text
+from rich.markdown import Markdown
+from rich.syntax import Syntax
+from rich.rule import Rule
+
+from dbagent import __version__
+from dbagent.agent.pipeline import PipelineResult
+from dbagent.ui.console import print_results_table, print_error, print_warning, print_info
+from dbagent.ui.visualizer import ResultVisualizer
+
+console = Console()
+
+
+def clear_screen() -> None:
+    """Clear terminal screen cleanly across Windows, macOS, and Linux."""
+    os.system("cls" if os.name == "nt" else "clear")
+
+
+def render_chat_header(
+    db_name: str,
+    dialect: str,
+    table_count: int,
+    ai_provider: str,
+    ai_model: Optional[str] = None,
+    mode: str = "CONFIRM",
+    recommendations: Optional[List[str]] = None,
+) -> None:
+    """Render the top Claude-style status header card."""
+    model_str = f" ({ai_model})" if ai_model else ""
+    
+    header_content = Text()
+    header_content.append("⚡ DB-AGENT ", style="bold cyan")
+    header_content.append(f"v{__version__}\n", style="bold green")
+    
+    header_content.append("🟢 Connected: ", style="bold green")
+    header_content.append(f"{db_name} ", style="bold white")
+    header_content.append(f"({dialect}) • {table_count} tables\n", style="dim")
+    
+    header_content.append("🤖 AI: ", style="bold cyan")
+    header_content.append(f"{ai_provider}{model_str}", style="bold white")
+    header_content.append("  |  ", style="dim")
+    header_content.append("🛡️ Mode: ", style="bold yellow")
+    header_content.append(f"{mode}", style="bold yellow")
+    header_content.append("  |  ", style="dim")
+    header_content.append("⌨️ Type ", style="dim")
+    header_content.append(":help", style="bold cyan")
+    header_content.append(" for commands", style="dim")
+    
+    panel = Panel(
+        header_content,
+        border_style="cyan",
+        padding=(0, 1),
+    )
+    console.print(panel)
+
+    if recommendations:
+        console.print("[dim italic]💡 Try asking:[/dim italic]")
+        for rec in recommendations[:3]:
+            console.print(f"  [dim]→[/dim] [cyan]{rec}[/cyan]")
+        console.print("")
+
+
+def render_user_turn(user_prompt: str) -> None:
+    """Render a user turn message bubble/card."""
+    user_text = Text()
+    user_text.append("💬 You: ", style="bold blue")
+    user_text.append(user_prompt, style="bold white")
+    console.print("")
+    console.print(Rule(style="dim blue"))
+    console.print(user_text)
+
+
+def render_assistant_turn(
+    result: PipelineResult,
+    show_sql: bool = True,
+    ai_provider: str = "gemini",
+    ai_model: Optional[str] = None,
+) -> None:
+    """Render the assistant response card with SQL, data grid, and execution timing."""
+    model_display = f" ({ai_model})" if ai_model else ""
+    timing_str = f"⚡ {result.execution_time_ms / 1000:.1f}s" if result.execution_time_ms > 0 else ""
+    
+    # Conversational Chat Response
+    if result.is_chat and result.message:
+        console.print(f"\n[bold cyan]🤖 DB-Agent{model_display}[/bold cyan] [dim]{timing_str}[/dim]")
+        console.print(Markdown(result.message))
+        console.print("")
+        return
+
+    # Error Response
+    if result.error:
+        console.print(f"\n[bold red]🤖 DB-Agent (Error)[/bold red] [dim]{timing_str}[/dim]")
+        if result.friendly_error:
+            print_error(result.friendly_error)
+        else:
+            print_error(f"Error: {result.error}")
+
+        if result.error_suggestions:
+            console.print(f"[dim]Did you mean: {', '.join(result.error_suggestions)}[/dim]")
+
+        if result.sql:
+            console.print("[dim]Generated SQL:[/dim]")
+            syntax = Syntax(result.sql.strip(), "sql", theme="monokai", line_numbers=False)
+            console.print(Panel(syntax, border_style="red", padding=(0, 1)))
+        if result.retries > 0:
+            console.print(f"[dim](Retried {result.retries} time(s))[/dim]")
+        console.print("")
+        return
+
+    # Executed Result Response
+    if result.was_executed:
+        console.print(f"\n[bold cyan]🤖 DB-Agent{model_display}[/bold cyan] [dim]{timing_str}[/dim]")
+        
+        if show_sql and result.sql:
+            sql_clean = result.sql.strip()
+            syntax = Syntax(sql_clean, "sql", theme="monokai", line_numbers=False)
+            console.print(Panel(syntax, title="[dim]SQL Statement[/dim]", border_style="dim", padding=(0, 1)))
+            if result.is_cached:
+                console.print(f"[dim italic]⚡ Cached result ({round(result.cache_age_seconds, 1)}s old)[/dim italic]")
+
+        if result.has_results:
+            print_results_table(result.columns, result.rows, title="Results")
+
+            # ASCII visualization if detected
+            if result.visualization and result.visualization.chart_type == "BAR":
+                console.print("")
+                bar_chart = ResultVisualizer.render_ascii_bar_chart(
+                    result.visualization.x_column,
+                    result.visualization.y_column,
+                    result.rows,
+                )
+                console.print(bar_chart)
+                console.print("")
+        else:
+            print_info("Query executed successfully. No rows returned.")
+
+        if result.confidence:
+            console.print(result.confidence.format_summary())
+
+        if result.retries > 0:
+            console.print(f"[dim](Auto-corrected after {result.retries} retry(ies))[/dim]")
+
+        # Recovery details for writes
+        if result.change_id:
+            console.print(f"\n[bold green]✓ Change committed successfully[/bold green]")
+            console.print(f"  * Change ID: [bold white]{result.change_id}[/bold white]")
+            if result.recovery_status == "AVAILABLE":
+                console.print(f"  * Recovery: [bold cyan]{result.recovery_message}[/bold cyan]")
+                console.print(f"  * Rollback command: [bold]db-agent rollback {result.change_id}[/bold]\n")
+            else:
+                console.print(f"  * Recovery: [yellow]{result.recovery_message or result.recovery_status}[/yellow]\n")
+        console.print("")
+    elif result.needs_confirmation and not result.was_executed:
+        if result.sql:
+            syntax = Syntax(result.sql.strip(), "sql", theme="monokai", line_numbers=False)
+            console.print(Panel(syntax, title=f"Generated {result.query_type.upper()} Query", border_style="yellow"))
+            console.print("[dim]This query was not executed (requires confirmation).[/dim]\n")
+    elif result.sql:
+        syntax = Syntax(result.sql.strip(), "sql", theme="monokai", line_numbers=False)
+        console.print(Panel(syntax, title="Generated SQL", border_style="dim"))
+        console.print("")
+
+
+def render_session_history(query_history: List[PipelineResult]) -> None:
+    """Render a clean visual session history table."""
+    if not query_history:
+        console.print("[dim]No query history in this session yet.[/dim]\n")
+        return
+
+    table = Table(title="📜 Session Query History", border_style="cyan", show_lines=True)
+    table.add_column("#", style="dim", width=4, justify="right")
+    table.add_column("Status", width=8, justify="center")
+    table.add_column("Type", width=8, justify="center")
+    table.add_column("Query / Message Preview", style="white", min_width=30)
+    table.add_column("Rows", style="cyan", width=6, justify="right")
+    table.add_column("Time", style="green", width=8, justify="right")
+
+    for i, r in enumerate(query_history, 1):
+        if r.is_chat:
+            status = "[bold blue]CHAT[/bold blue]"
+            q_type = "chat"
+            preview = (r.message or "")[:60] + "..." if len(r.message or "") > 60 else (r.message or "")
+            rows = "-"
+        elif r.success:
+            status = "[bold green]OK[/bold green]"
+            q_type = r.query_type
+            sql_str = r.sql or ""
+            preview = (sql_str[:60] + "...") if len(sql_str) > 60 else sql_str
+            rows = str(len(r.rows)) if r.has_results else "0"
+        else:
+            status = "[bold red]FAIL[/bold red]"
+            q_type = r.query_type or "error"
+            preview = (r.error or r.sql or "")[:60]
+            rows = "0"
+
+        time_str = f"{r.execution_time_ms / 1000:.1f}s" if r.execution_time_ms > 0 else "-"
+        table.add_row(str(i), status, q_type, preview, rows, time_str)
+
+    console.print("")
+    console.print(table)
+    console.print("")

{dbagent_cli-0.5.2 → dbagent_cli-0.6.1}/dbagent_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbagent-cli
-Version: 0.5.2
+Version: 0.6.1
 Summary: Enterprise AI Database Copilot, Schema Graph Introspector & Autonomous Recovery Agent (CLI)
 Author: Santhosh Gupta
 Requires-Python: >=3.9

{dbagent_cli-0.5.2 → dbagent_cli-0.6.1}/dbagent_cli.egg-info/SOURCES.txt

@@ -48,6 +48,7 @@ dbagent/semantic/templates.py
 dbagent/sql/__init__.py
 dbagent/sql/optimizer.py
 dbagent/sql/validator.py
+dbagent/ui/chat_screen.py
 dbagent/ui/console.py
 dbagent/ui/grid_window.py
 dbagent/ui/viewer.py

{dbagent_cli-0.5.2 → dbagent_cli-0.6.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dbagent-cli"
-version = "0.5.2"
+version = "0.6.1"
 description = "Enterprise AI Database Copilot, Schema Graph Introspector & Autonomous Recovery Agent (CLI)"
 readme = "README.md"
 requires-python = ">=3.9"