dbagent-cli 0.9.3__tar.gz → 0.9.5__tar.gz

{dbagent_cli-0.9.3 → dbagent_cli-0.9.5}/PKG-INFO

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

{dbagent_cli-0.9.3 → dbagent_cli-0.9.5}/dbagent/__init__.py

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

{dbagent_cli-0.9.3 → dbagent_cli-0.9.5}/dbagent/agent/generator.py

@@ -166,11 +166,17 @@ class ScriptGenerator:
             "related tables", "related tebales", "table mappings", "related tables mappings",
             "related tebales mappings", "not correct", "not right", "check all the tables",
             "mappings also", "find all mappings", "check links", "check mappings",
+            "is fk_", "are fk_", "is pk_", "are pk_", "difference between", "compare",
+            "tell me", "check it and tell me", "check and tell me", "same or different",
         ]
         for kw in analysis_keywords:
             if kw in prompt_lower:
                 return "analysis"
 
+        # Comparative analysis questions (e.g. "is fk_site_group_id and fk_group_id same", "are table_a and table_b related")
+        if re.search(r'\b(?:is|are)\b.*\b(?:same|different|difference|related|equal|linked)\b', prompt_lower):
+            return "analysis"
+
         # Contextual clarification for analysis (e.g. "i mean ivis_scope", "i mean table_x")
         if re.search(r'\bi mean\b', prompt_lower) and not re.search(r'\b(insert|update|delete|drop)\b', prompt_lower):
             return "analysis"

{dbagent_cli-0.9.3 → dbagent_cli-0.9.5}/dbagent/cli.py

@@ -98,10 +98,13 @@ audit_logger = AuditLogger()
 # Dynamic Animated Spinner with Rotating Messages
 # ---------------------------------------------------------------------------
 
+_active_spinner: Optional["DynamicSpinner"] = None
+
+
 class DynamicSpinner:
     """
     Context manager that shows an animated spinner with rotating contextual messages.
-    Messages cycle every ~1.5s so the user always sees progress.
+    Messages cycle every ~1.2s so the user always sees progress.
     Displays elapsed time suffix like (2.3s).
     """
 
@@ -193,7 +196,7 @@ class DynamicSpinner:
         ]
         return cls(messages=messages, interval=1.2)
 
-    def __init__(self, messages: Optional[List[str]] = None, interval: float = 1.5):
+    def __init__(self, messages: Optional[List[str]] = None, interval: float = 1.2):
         self._messages = messages or self.DEFAULT_MESSAGES
         self._interval = interval
         self._stop_event = threading.Event()
@@ -202,6 +205,8 @@ class DynamicSpinner:
         self._status = None
 
     def __enter__(self):
+        global _active_spinner
+        _active_spinner = self
         self._start_time = time.time()
         self._stop_event.clear()
         self._status = console.status(f"[bold cyan]{self._messages[0]}[/bold cyan]")
@@ -211,11 +216,36 @@ class DynamicSpinner:
         return self
 
     def __exit__(self, *args):
+        global _active_spinner
+        _active_spinner = None
         self._stop_event.set()
         if self._thread:
-            self._thread.join(timeout=2)
+            self._thread.join(timeout=1)
+        if self._status:
+            try:
+                self._status.__exit__(*args)
+            except Exception:
+                pass
+
+    def pause(self):
+        """Temporarily pause the spinner so interactive prompts don't clash."""
+        self._stop_event.set()
         if self._status:
-            self._status.__exit__(*args)
+            try:
+                self._status.stop()
+            except Exception:
+                pass
+
+    def resume(self):
+        """Resume the spinner after interactive prompt finishes."""
+        self._stop_event.clear()
+        if self._status:
+            try:
+                self._status.start()
+            except Exception:
+                pass
+        self._thread = threading.Thread(target=self._rotate, daemon=True)
+        self._thread.start()
 
     @property
     def elapsed_ms(self) -> float:
@@ -265,28 +295,42 @@ def resolve_db_url(db_arg: Optional[str] = None) -> str:
 
 def _confirm_callback(sql: str, warnings: List[str]) -> bool:
     """Prompt user to confirm a write or DDL operation."""
-    console.print("")
-    print_code(sql, "sql", "Action Requires Confirmation")
-    for w in warnings:
-        print_warning(w)
-    return Confirm.ask("Execute this statement on the database?", default=False)
+    global _active_spinner
+    if _active_spinner:
+        _active_spinner.pause()
+    try:
+        console.print("")
+        print_code(sql, "sql", "Action Requires Confirmation")
+        for w in warnings:
+            print_warning(w)
+        return Confirm.ask("Execute this statement on the database?", default=False)
+    finally:
+        if _active_spinner:
+            _active_spinner.resume()
 
 
 def _choice_callback(prompt_text: str, choices: List[str]) -> Optional[str]:
     """Prompt user to disambiguate table choices."""
-    console.print(f"\n[bold yellow]?[/bold yellow] {prompt_text}")
-    for i, c in enumerate(choices, 1):
-        console.print(f"  [{i}] {c}")
-    choice = Prompt.ask("Select number or table name", default="1")
+    global _active_spinner
+    if _active_spinner:
+        _active_spinner.pause()
     try:
-        idx = int(choice) - 1
-        if 0 <= idx < len(choices):
-            return choices[idx]
-    except ValueError:
-        pass
-    if choice in choices:
-        return choice
-    return choices[0]
+        console.print(f"\n[bold yellow]?[/bold yellow] {prompt_text}")
+        for i, c in enumerate(choices, 1):
+            console.print(f"  [{i}] {c}")
+        choice = Prompt.ask("Select number or table name", default="1")
+        try:
+            idx = int(choice) - 1
+            if 0 <= idx < len(choices):
+                return choices[idx]
+        except ValueError:
+            pass
+        if choice in choices:
+            return choice
+        return choices[0]
+    finally:
+        if _active_spinner:
+            _active_spinner.resume()
 
 
 def _display_pipeline_result(result: PipelineResult, show_sql: bool = True) -> None:

{dbagent_cli-0.9.3 → dbagent_cli-0.9.5}/dbagent/connectors/base.py

@@ -53,7 +53,29 @@ class BaseConnector(ABC):
         exact = []
         fuzzy = []
 
-        tokens = set(re.findall(r'\b[a-zA-Z0-9_]+\b', prompt_lower))
+        stop_words = {
+            "check", "tell", "same", "show", "list", "find", "get", "is", "are", "does", "will", "can", "what",
+            "which", "how", "why", "where", "with", "and", "from", "that", "this", "these", "those", "have",
+            "has", "had", "not", "all", "any", "few", "some", "many", "each", "every", "table", "tables",
+            "column", "columns", "field", "fields", "row", "rows", "record", "records", "data", "info",
+            "information", "name", "names", "type", "types", "key", "keys", "id", "ids", "status", "true",
+            "false", "null", "seriously", "please", "mean", "like", "about", "between", "among", "into",
+            "onto", "over", "under", "before", "after", "during", "since", "until", "across", "along",
+            "throughout", "outside", "inside", "above", "below", "behind", "beyond", "plus", "except",
+            "but", "against", "towards", "upon", "within", "without", "give", "also", "explain", "look",
+            "know", "make", "take", "help", "view", "count", "done", "good", "nice", "okay", "fine"
+        }
+
+        raw_tokens = set(re.findall(r'\b[a-zA-Z0-9_]+\b', prompt_lower))
+        tokens = set(raw_tokens)
+
+        # Extract entity stems from foreign key column tokens (e.g. fk_site_group_id -> site_group, fk_group_id -> group)
+        for tok in raw_tokens:
+            if tok.startswith("fk_") or tok.startswith("pk_"):
+                entity = re.sub(r'^(?:fk_|pk_)', '', tok)
+                entity = re.sub(r'_(?:id|code|key|no|num)$', '', entity)
+                if entity and len(entity) >= 3 and entity not in stop_words:
+                    tokens.add(entity)
 
         for t in all_tables:
             t_lower = t.lower()
@@ -64,7 +86,7 @@ class BaseConnector(ABC):
 
             # 2. Match without common prefixes (e.g. "ivis_scope" -> "scope", "scopes")
             unprefixed = re.sub(r'^(?:ivis_|tbl_|table_|app_)', '', t_lower)
-            if unprefixed and len(unprefixed) >= 3:
+            if unprefixed and len(unprefixed) >= 3 and unprefixed not in stop_words:
                 if (unprefixed in tokens or 
                     f"{unprefixed}s" in tokens or 
                     f"{unprefixed}es" in tokens or 
@@ -73,8 +95,10 @@ class BaseConnector(ABC):
                         exact.append(t)
                         continue
 
-            # 3. Fuzzy partial match
+            # 3. Fuzzy partial match (strictly exclude English stop words)
             for tok in tokens:
+                if tok in stop_words:
+                    continue
                 if len(tok) >= 4 and (tok in t_lower or t_lower in tok):
                     if t not in exact and t not in fuzzy:
                         fuzzy.append(t)

{dbagent_cli-0.9.3 → dbagent_cli-0.9.5}/dbagent/schema/ground_truth.py

@@ -42,6 +42,8 @@ class GroundTruthValidationResult:
                 lines.append(f"    [dim]• ... and {len(self.verified_fks) - 4} more[/dim]")
         if self.sql_queries_checked > 0:
             lines.append(f"  [bold green]✓[/bold green] [bold white]SQL Queries Verified:[/bold white] {self.sql_queries_checked} dialect statement(s) validated against schema")
+        for missing in self.missing_tables:
+            lines.append(f"  [bold yellow]⚠ Note:[/bold yellow] Query referenced [dim]{missing}[/dim]")
         for tbl, cols in self.missing_columns.items():
             lines.append(f"  [bold red]⚠ Warning:[/bold red] Column(s) [yellow]{', '.join(cols)}[/yellow] not found in table [cyan]{tbl}[/cyan]")
         return "\n".join(lines)
@@ -83,14 +85,40 @@ class SchemaGroundTruthValidator:
                         if fk_desc not in result.verified_fks:
                             result.verified_fks.append(fk_desc)
 
-        # 2. Extract and count SQL queries
+        # 2. Extract and validate SQL queries against physical schema
         sql_blocks = re.findall(r'```(?:sql)?\s*([\s\S]*?)\s*```', response_text, re.IGNORECASE)
         result.sql_queries_checked = len(sql_blocks)
+        sql_referenced_tables = set()
+
+        for block in sql_blocks:
+            # Extract FROM and JOIN table references
+            matches = re.findall(r'\b(?:FROM|JOIN)\s+([a-zA-Z0-9_]+)', block, re.IGNORECASE)
+            for m in matches:
+                m_clean = m.strip().lower()
+                sql_referenced_tables.add(m_clean)
+
+        for sql_tbl in sql_referenced_tables:
+            if sql_tbl in schema_table_map:
+                if schema_table_map[sql_tbl].name not in result.verified_tables:
+                    result.verified_tables.append(schema_table_map[sql_tbl].name)
+            else:
+                # Check if it's a common alias or slight naming divergence
+                found_match = None
+                for real_tbl in schema_table_map:
+                    if sql_tbl in real_tbl or real_tbl in sql_tbl:
+                        found_match = schema_table_map[real_tbl].name
+                        break
+                if found_match:
+                    result.missing_tables.append(f"{sql_tbl} ➔ (Actual: {found_match})")
+                else:
+                    result.missing_tables.append(sql_tbl)
 
         total_checked = len(result.verified_tables)
-        if total_checked > 0:
+        if result.missing_tables:
+            result.score_pct = max(70, 100 - (len(result.missing_tables) * 15))
+        elif total_checked > 0:
             result.score_pct = 100
         else:
             result.score_pct = 95
-            
+
         return result

{dbagent_cli-0.9.3 → dbagent_cli-0.9.5}/dbagent_cli.egg-info/PKG-INFO

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

{dbagent_cli-0.9.3 → dbagent_cli-0.9.5}/pyproject.toml

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