dbagent-cli 0.5.1__tar.gz → 0.6.0__tar.gz

{dbagent_cli-0.5.1 → dbagent_cli-0.6.0}/PKG-INFO

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

{dbagent_cli-0.5.1 → dbagent_cli-0.6.0}/dbagent/__init__.py

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

{dbagent_cli-0.5.1 → dbagent_cli-0.6.0}/dbagent/agent/generator.py

@@ -60,6 +60,10 @@ Generate ONLY the raw executable SQL query for the given database. No markdown f
    WHERE tc.constraint_type = 'FOREIGN KEY';
 7. Always include appropriate WHERE clauses, JOINs, and ORDER BY as needed.
 8. Default to LIMIT 50 unless the user specifies a count.
+9. For status, active, or flag columns (e.g. `active`, `is_active`, `status`, `enabled`, `deleted`):
+   - Check the column data type and sample values shown in the schema.
+   - If the column is VARCHAR(1) or CHAR(1) or text, check if values use 'Y'/'N', 'YES'/'NO', '1'/'0', 'ACTIVE'/'INACTIVE', 'TRUE'/'FALSE'.
+   - If sample values show 'Y'/'N' (or if it's a single-character VARCHAR/CHAR column), use `active = 'Y'` or `active IN ('Y', '1', 'true', 'TRUE')` for active/enabled status.
 """
 
 
@@ -72,7 +76,8 @@ Target Database Context:
 - **Available Tables**: {table_summary}
 
 You are chatting with the user in the interactive database shell.
-- If the user says hello, introduce yourself and mention the database you are connected to.
+- If the user says hello or greets you, introduce yourself and mention the database you are connected to.
+- If the user gives feedback or praise (e.g. "good", "great", "thanks", "nice"), acknowledge it warmly and ask what they would like to query next.
 - If the user asks what you can do or asks for help, explain that you can query data in plain English, inspect schemas (:table, :tables), find relationships (:fk), generate migrations/ETL pipelines, or execute SQL queries.
 - If the user asks general questions about the schema, tables, or database concepts, provide clear, concise, and helpful answers in formatted markdown.
 - Do NOT generate raw SQL queries or try to execute anything in this conversational mode unless the user explicitly asks for SQL examples.
@@ -110,16 +115,21 @@ class ScriptGenerator:
         Used before SQL generation to predict the query type.
         """
         prompt_lower = user_prompt.lower().strip()
+        clean_prompt = prompt_lower.rstrip(".!?,:;~ ")
 
-        # Chat / Conversational indicators
+        # Chat / Conversational indicators (greetings, feedback, praise, acknowledgements)
         chat_triggers = [
-            "hello", "hi", "hey", "howdy", "greetings", "good morning", "good evening",
+            "hello", "hi", "hey", "howdy", "greetings", "good morning", "good evening", "good afternoon",
             "who are you", "what can you do", "what are you", "help me", "how to use",
             "what is this", "tell me about this database", "how does this work",
-            "can you help", "thanks", "thank you", "bye", "goodbye",
+            "can you help", "thanks", "thank you", "thx", "bye", "goodbye", "see ya",
+            "good", "great", "nice", "cool", "awesome", "perfect", "ok", "okay",
+            "yes", "no", "sure", "got it", "understood", "nice work", "well done",
+            "sounds good", "looks good", "alright", "super", "neat", "excellent",
+            "amazing", "wonderful", "cool thanks", "great thanks", "thanks a lot",
         ]
         for trig in chat_triggers:
-            if prompt_lower == trig or prompt_lower.startswith(f"{trig} ") or prompt_lower.startswith(f"{trig},") or prompt_lower.startswith(f"{trig}!"):
+            if clean_prompt == trig or prompt_lower.startswith(f"{trig} ") or prompt_lower.startswith(f"{trig},") or prompt_lower.startswith(f"{trig}!"):
                 return "chat"
 
         # DDL indicators

{dbagent_cli-0.5.1 → dbagent_cli-0.6.0}/dbagent/agent/pipeline.py

@@ -155,12 +155,12 @@ class QueryPipeline:
         # 2. Targeted on-demand table introspection (~50ms instead of 5000ms for full scan)
         target_names = list(set(exact + fuzzy))
         if target_names:
-            targeted = self.connector.inspect_schema(table_names=target_names, include_samples=False, max_samples=0)
+            targeted = self.connector.inspect_schema(table_names=target_names, include_samples=True, max_samples=2)
             retriever = ContextRetriever(targeted)
             return retriever.retrieve_context(user_prompt, exact_tables=exact, fuzzy_tables=fuzzy, max_tables=8)
 
         # 3. Fallback: inspect targeted
-        targeted = self.connector.inspect_targeted(user_prompt, max_tables=8)
+        targeted = self.connector.inspect_targeted(user_prompt, max_tables=8, include_samples=True)
         retriever = ContextRetriever(targeted)
         return retriever.retrieve_context(user_prompt, exact_tables=exact, fuzzy_tables=fuzzy, max_tables=8)
 
@@ -191,10 +191,12 @@ class QueryPipeline:
                 result.is_chat = True
                 result.was_executed = True
                 result.query_type = "chat"
+                result.execution_time_ms = (time.time() - t_start) * 1000
                 self.conversation.add_turn(user_prompt=user_prompt, sql="", is_chat=True)
                 return result
             except Exception as e:
                 result.error = f"Chat generation failed: {str(e)}"
+                result.execution_time_ms = (time.time() - t_start) * 1000
                 return result
 
         # --- 2. Resolve Tables & Detect Ambiguity ---

{dbagent_cli-0.5.1 → dbagent_cli-0.6.0}/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
 
@@ -710,14 +729,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 +842,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.1 → dbagent_cli-0.6.0}/dbagent/connectors/relational.py

@@ -246,7 +246,7 @@ class RelationalConnector(BaseConnector):
         self,
         user_prompt: str,
         max_tables: int = 4,
-        include_samples: bool = False,
+        include_samples: bool = True,
     ) -> DatabaseSchema:
         """
         Ultra-fast on-demand targeted inspection with fuzzy matching (<30ms).
@@ -260,8 +260,8 @@ class RelationalConnector(BaseConnector):
 
         return self.inspect_schema(
             table_names=matched[:max_tables],
-            include_samples=False,
-            max_samples=0,
+            include_samples=include_samples,
+            max_samples=2 if include_samples else 0,
             include_views=False,
             include_row_counts=False,
         )

{dbagent_cli-0.5.1 → dbagent_cli-0.6.0}/dbagent/schema/formatter.py

@@ -119,5 +119,11 @@ class SchemaFormatter:
             for fk in t.foreign_keys:
                 fks.append(f"{','.join(fk.constrained_columns)}->{fk.referred_table}({','.join(fk.referred_columns)})")
             fk_str = f" | FK: {'; '.join(fks)}" if fks else ""
-            lines.append(f"- {t.name} ({', '.join(cols)}){fk_str}")
+            sample_str = ""
+            if t.sample_rows:
+                s = t.sample_rows[0]
+                sample_pairs = [f"{k}={repr(v)}" for k, v in list(s.items())[:8] if v is not None]
+                if sample_pairs:
+                    sample_str = f" | Sample: {{{', '.join(sample_pairs)}}}"
+            lines.append(f"- {t.name} ({', '.join(cols)}){fk_str}{sample_str}")
         return "\n".join(lines)

dbagent_cli-0.6.0/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.1 → dbagent_cli-0.6.0}/dbagent_cli.egg-info/PKG-INFO

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

{dbagent_cli-0.5.1 → dbagent_cli-0.6.0}/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.1 → dbagent_cli-0.6.0}/pyproject.toml

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

{dbagent_cli-0.5.1 → dbagent_cli-0.6.0}/tests/test_cli.py

@@ -417,6 +417,11 @@ def test_classify_intent():
     assert ScriptGenerator.classify_intent("create table products") == "ddl"
     assert ScriptGenerator.classify_intent("drop table temp_data") == "ddl"
     assert ScriptGenerator.classify_intent("add column age to users") == "ddl"
+    assert ScriptGenerator.classify_intent("good") == "chat"
+    assert ScriptGenerator.classify_intent("nice") == "chat"
+    assert ScriptGenerator.classify_intent("great") == "chat"
+    assert ScriptGenerator.classify_intent("thanks") == "chat"
+    assert ScriptGenerator.classify_intent("hello") == "chat"
 
 
 def test_strip_markdown_fences():