dbagent-cli 0.4.1__tar.gz → 0.5.0__tar.gz

{dbagent_cli-0.4.1 → dbagent_cli-0.5.0}/PKG-INFO

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

{dbagent_cli-0.4.1 → dbagent_cli-0.5.0}/dbagent/__init__.py

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

{dbagent_cli-0.4.1 → dbagent_cli-0.5.0}/dbagent/agent/generator.py

@@ -132,16 +132,25 @@ class ScriptGenerator:
             if kw in prompt_lower:
                 return "ddl"
 
-        # Write indicators
-        write_keywords = [
+        # Write indicators (word-boundary matching to avoid false positives like "show dataset")
+        write_phrases = [
             "insert", "add record", "add row", "add new",
-            "update", "change", "modify", "set ",
-            "delete", "remove", "drop record",
+            "update", "delete", "drop record",
             "increment", "decrement",
         ]
-        for kw in write_keywords:
+        for kw in write_phrases:
             if kw in prompt_lower:
                 return "write"
+        # Single-word write verbs need word boundary to avoid false positives
+        # e.g. "set" should not match "dataset", "change" should not match "show changes"
+        import re as _re
+        write_verbs = ["set", "change", "modify", "remove"]
+        for verb in write_verbs:
+            if _re.search(r'\b' + verb + r'\b', prompt_lower):
+                # Exclude when preceded by 'show', 'list', 'display', 'view', 'get'
+                read_context = _re.search(r'\b(?:show|list|display|view|get|count)\b.*\b' + verb, prompt_lower)
+                if not read_context:
+                    return "write"
 
         # Default: read
         return "read"

{dbagent_cli-0.4.1 → dbagent_cli-0.5.0}/dbagent/cli.py

@@ -6,6 +6,8 @@ Ask questions in natural language, get instant results, explore relationships, a
 import os
 import sys
 import json
+import time
+import threading
 from pathlib import Path
 from typing import Optional, List, Dict, Any
 import typer
@@ -77,6 +79,87 @@ template_mgr = TemplateManager()
 audit_logger = AuditLogger()
 
 
+# ---------------------------------------------------------------------------
+# Dynamic Animated Spinner with Rotating Messages
+# ---------------------------------------------------------------------------
+
+class DynamicSpinner:
+    """
+    Context manager that shows an animated spinner with rotating contextual messages.
+    Messages cycle every ~1.5s so the user always sees progress.
+    Displays elapsed time suffix like (2.3s).
+    """
+
+    DEFAULT_MESSAGES = [
+        "🔍 Analyzing your question...",
+        "📊 Resolving tables & schema...",
+        "🧠 Generating SQL with AI...",
+        "⚡ Executing query...",
+        "📋 Formatting results...",
+    ]
+
+    CONNECT_MESSAGES = [
+        "🔌 Connecting to database...",
+        "🔐 Authenticating credentials...",
+        "📡 Establishing connection pool...",
+    ]
+
+    SCHEMA_MESSAGES = [
+        "📂 Inspecting database schema...",
+        "🔗 Mapping foreign key relationships...",
+        "📊 Cataloging tables & columns...",
+    ]
+
+    DOCTOR_MESSAGES = [
+        "🏥 Running health diagnostics...",
+        "📡 Testing connectivity & latency...",
+        "🔍 Analyzing index coverage...",
+    ]
+
+    def __init__(self, messages: Optional[List[str]] = None, interval: float = 1.5):
+        self._messages = messages or self.DEFAULT_MESSAGES
+        self._interval = interval
+        self._stop_event = threading.Event()
+        self._thread: Optional[threading.Thread] = None
+        self._start_time = 0.0
+        self._status = None
+
+    def __enter__(self):
+        self._start_time = time.time()
+        self._stop_event.clear()
+        self._status = console.status(f"[bold cyan]{self._messages[0]}[/bold cyan]")
+        self._status.__enter__()
+        self._thread = threading.Thread(target=self._rotate, daemon=True)
+        self._thread.start()
+        return self
+
+    def __exit__(self, *args):
+        self._stop_event.set()
+        if self._thread:
+            self._thread.join(timeout=2)
+        if self._status:
+            self._status.__exit__(*args)
+
+    @property
+    def elapsed_ms(self) -> float:
+        return (time.time() - self._start_time) * 1000
+
+    def _rotate(self):
+        idx = 0
+        while not self._stop_event.is_set():
+            self._stop_event.wait(self._interval)
+            if self._stop_event.is_set():
+                break
+            idx = (idx + 1) % len(self._messages)
+            elapsed = time.time() - self._start_time
+            msg = f"[bold cyan]{self._messages[idx]}[/bold cyan] [dim]({elapsed:.1f}s)[/dim]"
+            try:
+                if self._status and self._status._live:
+                    self._status.update(msg)
+            except Exception:
+                pass
+
+
 # ---------------------------------------------------------------------------
 # Helper Functions
 # ---------------------------------------------------------------------------
@@ -131,9 +214,13 @@ def _choice_callback(prompt_text: str, choices: List[str]) -> Optional[str]:
 
 def _display_pipeline_result(result: PipelineResult, show_sql: bool = True) -> None:
     """Display a pipeline result with SQL, results table, confidence, or conversational chat message."""
+    from dbagent.ui.console import print_timing
+
     if result.is_chat and result.message:
         console.print("")
         console.print(Markdown(result.message))
+        if result.execution_time_ms > 0:
+            print_timing(result.execution_time_ms)
         console.print("")
         return
 
@@ -182,6 +269,10 @@ def _display_pipeline_result(result: PipelineResult, show_sql: bool = True) -> N
         if result.retries > 0:
             console.print(f"[dim](Auto-corrected after {result.retries} retry(ies))[/dim]")
 
+        # Show execution timing
+        if result.execution_time_ms > 0:
+            print_timing(result.execution_time_ms)
+
         # Display recovery info for write changes
         if result.change_id:
             console.print(f"\n[bold green]✓ Change committed successfully[/bold green]")
@@ -285,7 +376,7 @@ def ask_command(
     print_banner()
     db_url = resolve_db_url(db)
 
-    with console.status("[bold cyan]Connecting to database...[/bold cyan]"):
+    with DynamicSpinner(DynamicSpinner.CONNECT_MESSAGES):
         try:
             connector = create_connector(db_url)
             success, msg = connector.test_connection()
@@ -315,7 +406,7 @@ def ask_command(
         choice_callback=_choice_callback,
     )
 
-    with console.status("[bold cyan]Thinking & generating SQL...[/bold cyan]"):
+    with DynamicSpinner():
         result = pipeline.run(user_prompt=prompt, force=force, bypass_cache=no_cache)
 
     _display_pipeline_result(result, show_sql=True)
@@ -336,7 +427,7 @@ def chat_command(
     print_banner()
     db_url = resolve_db_url(db)
 
-    with console.status("[bold cyan]Connecting to database...[/bold cyan]"):
+    with DynamicSpinner(DynamicSpinner.CONNECT_MESSAGES):
         try:
             connector = create_connector(db_url)
             success, msg = connector.test_connection()
@@ -383,6 +474,18 @@ def chat_command(
     query_history: List[PipelineResult] = []
     last_result: Optional[PipelineResult] = None
 
+    # Create pipeline ONCE and reuse across all queries (avoids re-init overhead)
+    pipeline = QueryPipeline(
+        connector=connector,
+        llm=llm,
+        model=model,
+        mode=current_mode,
+        auto_execute=auto_execute,
+        confirm_callback=_confirm_callback,
+        choice_callback=_choice_callback,
+        conversation_context=conversation_ctx,
+    )
+
     while True:
         try:
             user_input = session.prompt("db-agent> ").strip()
@@ -414,7 +517,10 @@ def chat_command(
                     console.print("  [bold]:models[/bold]                     -> Show active AI provider and model status")
                     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)")
                     console.print("  [bold]:scroll[/bold]                    -> Open full-screen interactive horizontal/vertical scroller")
+                    console.print("  [bold]:window[/bold]                    -> Open desktop GUI window with scrollbars & search")
+                    console.print("  [bold]:web[/bold]                       -> Open browser-based interactive data grid")
                     console.print("  [bold]:explain[/bold]                    -> Show generated SQL & query analysis for last turn")
                     console.print("  [bold]:history[/bold]                    -> View history of queries in this session")
                     console.print("  [bold]:auto[/bold] / [bold]:noauto[/bold]        -> Toggle automatic execution of read queries")
@@ -522,7 +628,7 @@ def chat_command(
                     continue
 
                 if cmd_name == ":doctor":
-                    with console.status("[bold cyan]Running Database Doctor diagnostics...[/bold cyan]"):
+                    with DynamicSpinner(DynamicSpinner.DOCTOR_MESSAGES):
                         report = DatabaseDoctor.run_diagnostics(connector, llm, current_mode.value)
                     console.print(f"\n[bold cyan]Database Doctor Health Report: {report.database_name} ({report.dialect})[/bold cyan]")
                     for check in report.checks:
@@ -568,6 +674,7 @@ def chat_command(
                     if prov_target in ["ollama", "gemini", "groq", "openrouter", "mock"]:
                         llm = get_llm_provider(provider_name=prov_target, config_mgr=config_mgr)
                         model = None
+                        pipeline.generator.llm = llm  # Update reused pipeline
                         print_success(f"Switched AI provider to [bold cyan]{llm.name}[/bold cyan]")
                     else:
                         print_error(f"Unknown provider '{cmd_arg}'. Supported: ollama, gemini, groq, openrouter")
@@ -608,7 +715,8 @@ def chat_command(
                         continue
                     for i, r in enumerate(query_history[-10:], 1):
                         status = "[green]OK[/green]" if r.success else "[red]FAIL[/red]"
-                        sql_preview = (r.sql[:80] + "...") if len(r.sql) > 80 else r.sql
+                        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}")
                     continue
 
@@ -704,18 +812,12 @@ def chat_command(
                 break
 
             # --- Natural language query via pipeline ---
-            pipeline = QueryPipeline(
-                connector=connector,
-                llm=llm,
-                model=model,
-                mode=current_mode,
-                auto_execute=auto_execute,
-                confirm_callback=_confirm_callback,
-                choice_callback=_choice_callback,
-                conversation_context=conversation_ctx,
-            )
+            # Update pipeline settings in-place (pipeline was created once before the loop)
+            pipeline.model = model
+            pipeline.mode = current_mode
+            pipeline.auto_execute = auto_execute
 
-            with console.status("[bold cyan]Thinking...[/bold cyan]"):
+            with DynamicSpinner():
                 result = pipeline.run(user_prompt=user_input)
 
             _display_pipeline_result(result, show_sql=True)
@@ -774,7 +876,7 @@ def scan_command(
     print_banner()
     db_url = resolve_db_url(db)
 
-    with console.status("[bold cyan]Connecting and introspecting database schema...[/bold cyan]"):
+    with DynamicSpinner(DynamicSpinner.SCHEMA_MESSAGES):
         try:
             connector = create_connector(db_url)
             success, msg = connector.test_connection()
@@ -833,7 +935,7 @@ def doctor_command(
     print_banner()
     db_url = resolve_db_url(db)
 
-    with console.status("[bold cyan]Running Database Doctor health check...[/bold cyan]"):
+    with DynamicSpinner(DynamicSpinner.DOCTOR_MESSAGES):
         try:
             connector = create_connector(db_url)
             llm = get_llm_provider(config_mgr=config_mgr)

{dbagent_cli-0.4.1 → dbagent_cli-0.5.0}/dbagent/llm/gemini_provider.py

@@ -25,6 +25,8 @@ class GeminiProvider(BaseLLMProvider):
     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"})
 
     @property
     def name(self) -> str:
@@ -84,7 +86,7 @@ class GeminiProvider(BaseLLMProvider):
 
             try:
                 if stream_callback:
-                    response = requests.post(endpoint, json=payload, stream=True, timeout=10)
+                    response = self._session.post(endpoint, json=payload, stream=True, timeout=15)
                     if response.status_code == 200:
                         full_text = []
                         for line in response.iter_lines():
@@ -106,11 +108,14 @@ class GeminiProvider(BaseLLMProvider):
                         return "".join(full_text)
                     elif response.status_code in (404, 400, 503, 429):
                         last_error = f"Model {target_model} status {response.status_code}"
+                        if response.status_code == 429:
+                            import time
+                            time.sleep(min(2 ** models_to_try.index(target_model), 4))
                         continue
                     else:
                         raise RuntimeError(f"Gemini API error ({response.status_code}): {response.text}")
                 else:
-                    response = requests.post(endpoint, json=payload, timeout=10)
+                    response = self._session.post(endpoint, json=payload, timeout=30)
                     if response.status_code == 200:
                         data = response.json()
                         candidates = data.get("candidates", [])
@@ -120,6 +125,9 @@ class GeminiProvider(BaseLLMProvider):
                         return ""
                     elif response.status_code in (404, 400, 503, 429):
                         last_error = f"Model {target_model} status {response.status_code}"
+                        if response.status_code == 429:
+                            import time
+                            time.sleep(min(2 ** models_to_try.index(target_model), 4))
                         continue
                     else:
                         raise RuntimeError(f"Gemini API error ({response.status_code}): {response.text}")

{dbagent_cli-0.4.1 → dbagent_cli-0.5.0}/dbagent/ui/console.py

@@ -26,8 +26,10 @@ console = Console()
 
 def print_banner() -> None:
     """Print the DB-Agent terminal banner."""
+    from dbagent import __version__
     banner_text = Text()
     banner_text.append("[*] DB-AGENT ", style="bold cyan")
+    banner_text.append(f"v{__version__} ", style="bold green")
     banner_text.append("- Universal Database Introspector & AI Script Generator\n", style="bold white")
     banner_text.append("Supports PostgreSQL | MySQL | SQLite | MSSQL | Oracle | DuckDB | MongoDB", style="dim")
     panel = Panel(banner_text, border_style="cyan", padding=(0, 2))
@@ -57,6 +59,21 @@ def print_code(code: str, language: str = "sql", title: Optional[str] = None) ->
     console.print(panel)
 
 
+def print_timing(elapsed_ms: float) -> None:
+    """Display execution timing with color coding."""
+    elapsed_s = elapsed_ms / 1000
+    if elapsed_s < 1.0:
+        style = "bold green"
+        icon = "⚡"
+    elif elapsed_s < 5.0:
+        style = "bold yellow"
+        icon = "⏱️"
+    else:
+        style = "bold red"
+        icon = "🐢"
+    console.print(f"[{style}]{icon} Completed in {elapsed_s:.1f}s[/{style}]")
+
+
 def print_results_table(
     columns: List[str],
     rows: List[Dict[str, Any]],

{dbagent_cli-0.4.1 → dbagent_cli-0.5.0}/dbagent/ui/grid_window.py

@@ -24,6 +24,10 @@ def open_desktop_grid_window(
     def _launch_gui():
         try:
             import tkinter as tk
+        except ImportError:
+            print("[DB-Agent] Desktop GUI requires tkinter. Install it with: sudo apt-get install python3-tk (Linux) or it's included with Python on Windows/macOS.")
+            return
+        try:
             from tkinter import ttk, messagebox, filedialog
             import csv
 
@@ -106,18 +110,22 @@ def open_desktop_grid_window(
                 col_w = max(120, min(280, len(str(col)) * 12))
                 tree.column(col, width=col_w, minwidth=80, stretch=False)
 
+            MAX_GUI_ROWS = 5000
+
             def populate_table(filter_text=""):
                 tree.delete(*tree.get_children())
                 f_lower = filter_text.strip().lower()
                 count = 0
-                for r in rows:
+                source_rows = rows[:MAX_GUI_ROWS]
+                for r in source_rows:
                     row_vals = [str(r.get(c, "")) if r.get(c) is not None else "NULL" for c in columns]
                     if f_lower:
                         if not any(f_lower in v.lower() for v in row_vals):
                             continue
                     tree.insert("", tk.END, values=row_vals)
                     count += 1
-                status_lbl.config(text=f"Showing: {count} of {len(rows)} rows ({len(columns)} columns)")
+                truncated = f" (limited to {MAX_GUI_ROWS})" if len(rows) > MAX_GUI_ROWS else ""
+                status_lbl.config(text=f"Showing: {count} of {len(rows)} rows ({len(columns)} columns){truncated}")
 
             populate_table()
 
@@ -242,4 +250,5 @@ def open_browser_grid_window(
     with open(temp_path, "w", encoding="utf-8") as f:
         f.write(html_content)
 
-    webbrowser.open(f"file://{temp_path}")
+    from pathlib import Path as _Path
+    webbrowser.open(_Path(temp_path).as_uri())

{dbagent_cli-0.4.1 → dbagent_cli-0.5.0}/dbagent_cli.egg-info/PKG-INFO

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

{dbagent_cli-0.4.1 → dbagent_cli-0.5.0}/pyproject.toml

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