dbagent-cli 0.2.0__tar.gz → 0.2.2__tar.gz

{dbagent_cli-0.2.0 → dbagent_cli-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbagent-cli
-Version: 0.2.0
+Version: 0.2.2
 Summary: Universal Database Introspection and Script Generation AI Agent (CLI)
 Author: Santhosh Gupta
 Requires-Python: >=3.9

{dbagent_cli-0.2.0 → dbagent_cli-0.2.2}/dbagent/__init__.py

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

{dbagent_cli-0.2.0 → dbagent_cli-0.2.2}/dbagent/agent/generator.py

@@ -63,6 +63,22 @@ Generate ONLY the raw executable SQL query for the given database. No markdown f
 """
 
 
+# --- Conversational chat prompt ---
+
+CHAT_SYSTEM_PROMPT = """You are DB-Agent, a helpful, intelligent, and friendly AI database assistant.
+Target Database Context:
+- **Dialect**: {dialect_name}
+- **Database Name**: {database_name}
+- **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 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.
+"""
+
+
 # --- Retry prompt when SQL fails ---
 
 RETRY_PROMPT_TEMPLATE = """The previous SQL query failed with this error:
@@ -90,11 +106,22 @@ class ScriptGenerator:
     @staticmethod
     def classify_intent(user_prompt: str) -> str:
         """
-        Classify user's natural language intent as 'read', 'write', or 'ddl'.
+        Classify user's natural language intent as 'chat', 'read', 'write', or 'ddl'.
         Used before SQL generation to predict the query type.
         """
         prompt_lower = user_prompt.lower().strip()
 
+        # Chat / Conversational indicators
+        chat_triggers = [
+            "hello", "hi", "hey", "howdy", "greetings", "good morning", "good evening",
+            "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",
+        ]
+        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}!"):
+                return "chat"
+
         # DDL indicators
         ddl_keywords = [
             "create table", "alter table", "drop table", "add column",
@@ -119,6 +146,30 @@ class ScriptGenerator:
         # Default: read
         return "read"
 
+    def generate_chat_response(
+        self,
+        schema: DatabaseSchema,
+        user_prompt: str,
+        model: Optional[str] = None,
+    ) -> str:
+        """Generate a natural conversational response to the user's message."""
+        table_names = [t.name for t in schema.tables]
+        table_summary = ", ".join(table_names[:30])
+        if len(table_names) > 30:
+            table_summary += f" ... (and {len(table_names) - 30} more)"
+
+        system_prompt = CHAT_SYSTEM_PROMPT.format(
+            dialect_name=schema.dialect_name,
+            database_name=schema.database_name,
+            table_summary=table_summary if table_summary else "No tables found",
+        )
+
+        return self.llm.generate(
+            prompt=user_prompt,
+            system_prompt=system_prompt,
+            model=model,
+        )
+
     # --- Full generation (for `generate` command) ---
 
     def generate_script(

{dbagent_cli-0.2.0 → dbagent_cli-0.2.2}/dbagent/agent/pipeline.py

@@ -28,8 +28,11 @@ class PipelineResult:
     was_executed: bool = False
     was_auto_executed: bool = False
     needs_confirmation: bool = False
+    # Conversational chat response
+    is_chat: bool = False
+    message: str = ""
     # Query classification
-    query_type: str = "unknown"  # read, write, ddl, unknown
+    query_type: str = "unknown"  # read, write, ddl, chat, unknown
     intent: str = "read"  # from natural language
     # Safety
     safety_warnings: List[str] = field(default_factory=list)
@@ -91,25 +94,48 @@ class QueryPipeline:
         Full pipeline: prompt -> SQL -> execute -> results.
 
         Steps:
-        1. Classify user intent (read/write/ddl)
-        2. Resolve tables (exact vs fuzzy match, detect ambiguity)
-        3. Fetch targeted schema on-demand
-        4. Generate SQL via LLM
-        5. Classify generated SQL
-        6. Safety check
-        7. Auto-execute or confirm
-        8. On error: retry with error context (up to MAX_RETRIES)
+        1. Classify user intent (chat/read/write/ddl)
+        2. If chat: generate natural language response and return
+        3. Resolve tables (exact vs fuzzy match, detect ambiguity)
+        4. Fetch targeted schema on-demand
+        5. Generate SQL via LLM
+        6. Classify generated SQL
+        7. Safety check
+        8. Auto-execute or confirm
+        9. On error: retry with error context (up to MAX_RETRIES)
         """
         result = PipelineResult()
         result.intent = ScriptGenerator.classify_intent(user_prompt)
 
+        # --- Fast Path: Conversational Chat ---
+        if result.intent == "chat":
+            try:
+                schema = self.connector.inspect_schema(
+                    include_samples=False,
+                    max_samples=0,
+                    include_row_counts=False,
+                )
+                result.schema = schema
+                result.message = self.generator.generate_chat_response(
+                    schema=schema,
+                    user_prompt=user_prompt,
+                    model=self.model,
+                )
+                result.is_chat = True
+                result.was_executed = True
+                result.query_type = "chat"
+                return result
+            except Exception as e:
+                # If conversational response fails, record error or fall through
+                result.error = f"Chat generation failed: {str(e)}"
+                return result
+
         # --- Step 1: Resolve tables ---
         try:
             exact, fuzzy = self.connector.resolve_tables(user_prompt)
             result.exact_tables = exact
             result.fuzzy_tables = fuzzy
         except AttributeError:
-            # Connector doesn't support resolve_tables (e.g. old version)
             exact, fuzzy = [], []
 
         # Detect ambiguity: user said "users" but we have multiple fuzzy matches and no exact

{dbagent_cli-0.2.0 → dbagent_cli-0.2.2}/dbagent/cli.py

@@ -11,6 +11,7 @@ from typing import Optional, List
 import typer
 from rich.prompt import Prompt, Confirm
 from rich.table import Table
+from rich.markdown import Markdown
 from prompt_toolkit import PromptSession
 from prompt_toolkit.history import FileHistory
 
@@ -113,7 +114,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 and results table."""
+    """Display a pipeline result with SQL, results table, or conversational chat message."""
+    if result.is_chat and result.message:
+        console.print("")
+        console.print(Markdown(result.message))
+        console.print("")
+        return
+
     if result.error:
         print_error(f"Error: {result.error}")
         if result.sql:
@@ -1013,5 +1020,17 @@ def use_command(
     print_success(f"Default AI provider switched to [bold cyan]{p}[/bold cyan]!")
 
 
+def main():
+    """Top-level entry point with graceful Ctrl+C / interrupt handling."""
+    try:
+        app()
+    except (KeyboardInterrupt, EOFError):
+        console.print("\n[dim]Operation cancelled.[/dim]")
+        sys.exit(0)
+    except Exception as e:
+        console.print(f"\n[red]Error:[/red] {e}")
+        sys.exit(1)
+
+
 if __name__ == "__main__":
-    app()
+    main()

{dbagent_cli-0.2.0 → dbagent_cli-0.2.2}/dbagent_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbagent-cli
-Version: 0.2.0
+Version: 0.2.2
 Summary: Universal Database Introspection and Script Generation AI Agent (CLI)
 Author: Santhosh Gupta
 Requires-Python: >=3.9

dbagent_cli-0.2.2/dbagent_cli.egg-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+db-agent = dbagent.cli:main
+dbagent = dbagent.cli:main

{dbagent_cli-0.2.0 → dbagent_cli-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dbagent-cli"
-version = "0.2.0"
+version = "0.2.2"
 description = "Universal Database Introspection and Script Generation AI Agent (CLI)"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -35,8 +35,8 @@ dev = [
 ]
 
 [project.scripts]
-db-agent = "dbagent.cli:app"
-dbagent = "dbagent.cli:app"
+db-agent = "dbagent.cli:main"
+dbagent = "dbagent.cli:main"
 
 [tool.setuptools.packages.find]
 where = ["."]

dbagent_cli-0.2.0/dbagent_cli.egg-info/entry_points.txt

@@ -1,3 +0,0 @@
-[console_scripts]
-db-agent = dbagent.cli:app
-dbagent = dbagent.cli:app