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

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

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

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

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

{dbagent_cli-0.5.0 → dbagent_cli-0.5.2}/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.0 → dbagent_cli-0.5.2}/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.0 → dbagent_cli-0.5.2}/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.0 → dbagent_cli-0.5.2}/dbagent/llm/gemini_provider.py

@@ -58,6 +58,8 @@ class GeminiProvider(BaseLLMProvider):
         for fb in self.FALLBACK_MODELS:
             if fb != requested_model and fb not in models_to_try:
                 models_to_try.append(fb)
+        # Retry primary model once more at end as a last resort
+        models_to_try.append(requested_model)
 
         contents = []
         if system_prompt:
@@ -138,4 +140,8 @@ class GeminiProvider(BaseLLMProvider):
                 last_error = str(e)
                 continue
 
-        raise RuntimeError(f"Gemini generation error: {last_error or 'All model attempts failed'}")
+        raise RuntimeError(
+            f"Gemini generation error: All {len(models_to_try)} models failed. "
+            f"Primary model '{requested_model}' — last error: {last_error or 'unknown'}. "
+            f"Check your API key and network connection."
+        )

{dbagent_cli-0.5.0 → dbagent_cli-0.5.2}/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.5.0 → dbagent_cli-0.5.2}/dbagent_cli.egg-info/PKG-INFO

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

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

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

{dbagent_cli-0.5.0 → dbagent_cli-0.5.2}/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():