dbagent-cli 0.1.6__tar.gz → 0.1.8__tar.gz

{dbagent_cli-0.1.6 → dbagent_cli-0.1.8}/PKG-INFO

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

{dbagent_cli-0.1.6 → dbagent_cli-0.1.8}/dbagent/__init__.py

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

{dbagent_cli-0.1.6 → dbagent_cli-0.1.8}/dbagent/cli.py

@@ -509,7 +509,7 @@ def chat_command(
     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}")
     console.print("[dim]Type your question in plain English. Read queries auto-execute. Write queries ask for confirmation.[/dim]")
-    console.print("[dim]Commands: [bold]:tables[/bold] | [bold]:table <name>[/bold] | [bold]:fk <name>[/bold] | [bold]:explain[/bold] | [bold]:history[/bold] | [bold]:auto[/bold]/[bold]:noauto[/bold] | [bold]:run[/bold] | [bold]:export <file>[/bold] | [bold]:exit[/bold][/dim]\n")
+    console.print("[dim]Commands: [bold]:tables[/bold] | [bold]:table <name>[/bold] | [bold]:fk <name>[/bold] | [bold]:model <name>[/bold] | [bold]:explain[/bold] | [bold]:history[/bold] | [bold]:auto[/bold]/[bold]:noauto[/bold] | [bold]:run[/bold] | [bold]:export <file>[/bold] | [bold]:exit[/bold][/dim]\n")
 
     history_file = config_mgr.config_dir / "chat_history.txt"
     session = PromptSession(history=FileHistory(str(history_file)))
@@ -524,108 +524,180 @@ def chat_command(
             if not user_input:
                 continue
 
-            # --- REPL commands ---
-            if user_input.lower() in [":exit", ":quit", "exit", "quit", "q"]:
-                console.print("[bold cyan]Goodbye![/bold cyan]")
-                break
+            # --- REPL commands (all start with :) ---
+            if user_input.startswith(":"):
+                cmd_parts = user_input.split(maxsplit=1)
+                cmd_name = cmd_parts[0].lower()
+                cmd_arg = cmd_parts[1].strip() if len(cmd_parts) > 1 else ""
+
+                if cmd_name in [":exit", ":quit", ":q"]:
+                    console.print("[bold cyan]Goodbye![/bold cyan]")
+                    break
+
+                if cmd_name in [":help", ":h", ":?"]:
+                    console.print("\n[bold cyan]Interactive Chat Commands:[/bold cyan]")
+                    console.print("  [bold]:tables[/bold]                     -> List all tables in this database")
+                    console.print("  [bold]:table <name>[/bold]              -> Inspect columns, PKs, types & sample data")
+                    console.print("  [bold]:fk <name>[/bold]                 -> View mapped foreign keys & related tables")
+                    console.print("  [bold]:provider <name>[/bold]           -> Switch AI provider (ollama, gemini, groq, openrouter)")
+                    console.print("  [bold]:model <name>[/bold]              -> Switch active model name (e.g. gemini-3.6-flash)")
+                    console.print("  [bold]:models[/bold]                     -> Show active AI provider and model status")
+                    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")
+                    console.print("  [bold]:run[/bold]                        -> Re-execute the last generated SQL query")
+                    console.print("  [bold]:export <file>[/bold]              -> Save the last generated SQL to a file")
+                    console.print("  [bold]:exit[/bold]                       -> Exit chat session\n")
+                    continue
 
-            if user_input.lower() in [":tables", ":schema", "\\d", "\\dt"]:
-                with console.status("[bold cyan]Fetching schema...[/bold cyan]"):
-                    schema = connector.inspect_schema(include_samples=False, max_samples=0, include_row_counts=False)
-                SchemaViewer.display_schema_summary(schema)
-                continue
+                if cmd_name in [":tables", ":schema", ":dt"]:
+                    with console.status("[bold cyan]Fetching schema...[/bold cyan]"):
+                        schema = connector.inspect_schema(include_samples=False, max_samples=0, include_row_counts=False)
+                    SchemaViewer.display_schema_summary(schema)
+                    continue
 
-            if user_input.startswith(":table "):
-                tname = user_input.split(" ", 1)[1].strip()
-                exact, fuzzy = connector.resolve_tables(tname)
-                target = exact[0] if exact else (fuzzy[0] if fuzzy else tname)
-                with console.status(f"[bold cyan]Inspecting {target}...[/bold cyan]"):
-                    on_demand_schema = connector.inspect_schema(table_names=[target], include_samples=True)
-                tmodel = on_demand_schema.get_table(target)
-                if tmodel:
-                    SchemaViewer.display_table_detail(tmodel)
-                else:
-                    print_error(f"Table '{tname}' not found.")
-                continue
+                if cmd_name == ":table":
+                    if not cmd_arg:
+                        print_warning("Usage: :table <table_name> (e.g. :table ivis_users)")
+                        continue
+                    exact, fuzzy = connector.resolve_tables(cmd_arg)
+                    target = exact[0] if exact else (fuzzy[0] if fuzzy else cmd_arg)
+                    with console.status(f"[bold cyan]Inspecting {target}...[/bold cyan]"):
+                        on_demand_schema = connector.inspect_schema(table_names=[target], include_samples=True)
+                    tmodel = on_demand_schema.get_table(target)
+                    if tmodel:
+                        SchemaViewer.display_table_detail(tmodel)
+                    else:
+                        print_error(f"Table '{cmd_arg}' not found.")
+                    continue
 
-            if user_input.startswith(":relations ") or user_input.startswith(":fk ") or user_input.startswith(":mapped "):
-                tname = user_input.split(" ", 1)[1].strip()
-                exact, fuzzy = connector.resolve_tables(tname)
-                target = exact[0] if exact else (fuzzy[0] if fuzzy else tname)
-                with console.status(f"[bold cyan]Finding relationships for {target}...[/bold cyan]"):
-                    full_schema = connector.inspect_schema(include_samples=False, max_samples=0)
-                
-                # Find FKs where target references others, and others reference target
-                tmodel = full_schema.get_table(target)
-                outgoing = tmodel.foreign_keys if tmodel else []
-                incoming = []
-                for other in full_schema.tables:
-                    for fk in other.foreign_keys:
-                        if fk.referred_table.lower() == target.lower():
-                            incoming.append((other.name, fk))
-
-                console.print(f"\n[bold cyan]Relationships mapped to table: [bold white]{target}[/bold white][/bold cyan]\n")
-                if outgoing:
-                    console.print("[bold green]Outgoing (This table references):[/bold green]")
-                    for fk in outgoing:
-                        console.print(f"  * ({', '.join(fk.constrained_columns)}) -> [bold]{fk.referred_table}[/bold]({', '.join(fk.referred_columns)})")
-                if incoming:
-                    console.print("\n[bold yellow]Incoming (Other tables reference this table):[/bold yellow]")
-                    for src_table, fk in incoming:
-                        console.print(f"  * [bold]{src_table}[/bold]({', '.join(fk.constrained_columns)}) -> ({', '.join(fk.referred_columns)})")
-                if not outgoing and not incoming:
-                    console.print(f"[dim]No foreign key constraints found directly mapped to '{target}'.[/dim]")
-                console.print("")
-                continue
+                if cmd_name in [":fk", ":relations", ":mapped"]:
+                    if not cmd_arg:
+                        print_warning("Usage: :fk <table_name> (e.g. :fk ivis_users)")
+                        continue
+                    exact, fuzzy = connector.resolve_tables(cmd_arg)
+                    target = exact[0] if exact else (fuzzy[0] if fuzzy else cmd_arg)
+                    with console.status(f"[bold cyan]Finding relationships for {target}...[/bold cyan]"):
+                        full_schema = connector.inspect_schema(include_samples=False, max_samples=0)
+                    
+                    tmodel = full_schema.get_table(target)
+                    outgoing = tmodel.foreign_keys if tmodel else []
+                    incoming = []
+                    for other in full_schema.tables:
+                        for fk in other.foreign_keys:
+                            if fk.referred_table.lower() == target.lower():
+                                incoming.append((other.name, fk))
+
+                    console.print(f"\n[bold cyan]Relationships mapped to table: [bold white]{target}[/bold white][/bold cyan]\n")
+                    if outgoing:
+                        console.print("[bold green]Outgoing (This table references):[/bold green]")
+                        for fk in outgoing:
+                            console.print(f"  * ({', '.join(fk.constrained_columns)}) -> [bold]{fk.referred_table}[/bold]({', '.join(fk.referred_columns)})")
+                    if incoming:
+                        console.print("\n[bold yellow]Incoming (Other tables reference this table):[/bold yellow]")
+                        for src_table, fk in incoming:
+                            console.print(f"  * [bold]{src_table}[/bold]({', '.join(fk.constrained_columns)}) -> ({', '.join(fk.referred_columns)})")
+                    if not outgoing and not incoming:
+                        console.print(f"[dim]No foreign key constraints found directly mapped to '{target}'.[/dim]")
+                    console.print("")
+                    continue
 
-            if user_input.lower() == ":explain":
-                if last_result and last_result.sql:
-                    print_code(last_result.sql, "sql", "Last Executed SQL")
-                    console.print(f"[dim]Query type: {last_result.query_type} | Intent: {last_result.intent} | Retries: {last_result.retries}[/dim]")
-                    if last_result.exact_tables:
-                        console.print(f"[dim]Tables (exact): {', '.join(last_result.exact_tables)}[/dim]")
-                    if last_result.fuzzy_tables:
-                        console.print(f"[dim]Tables (fuzzy): {', '.join(last_result.fuzzy_tables)}[/dim]")
-                else:
-                    print_warning("No previous query to explain.")
-                continue
+                if cmd_name in [":provider", ":use"]:
+                    if not cmd_arg:
+                        curr_model = model or getattr(llm, "default_model", "default")
+                        console.print(f"\n[bold cyan]Active AI Provider:[/bold cyan] [bold white]{llm.name}[/bold white] | Model: [bold green]{curr_model}[/bold green]")
+                        console.print("[dim]Usage: [bold]:provider <ollama|gemini|groq|openrouter>[/bold][/dim]\n")
+                        continue
+                    prov_target = cmd_arg.lower()
+                    if prov_target in ["ollama", "gemini", "groq", "openrouter", "mock"]:
+                        llm = get_llm_provider(provider_name=prov_target, config_mgr=config_mgr)
+                        model = None
+                        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")
+                    continue
 
-            if user_input.lower() == ":history":
-                if not query_history:
-                    print_warning("No query history in this session.")
+                if cmd_name == ":model":
+                    if not cmd_arg:
+                        curr_model = model or getattr(llm, "default_model", "default")
+                        console.print(f"Active Model: [bold green]{curr_model}[/bold green] (Provider: {llm.name})")
+                        console.print("[dim]Usage: [bold]:model <model_name>[/bold][/dim]")
+                        continue
+                    model = cmd_arg
+                    print_success(f"Switched active model to [bold cyan]{model}[/bold cyan] (Provider: {llm.name})")
                     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
-                    console.print(f"  {i}. {status} [{r.query_type}] {sql_preview}")
-                continue
 
-            if user_input.lower() == ":auto":
-                auto_execute = True
-                print_success("Auto-execute enabled. Read queries will run automatically.")
-                continue
+                if cmd_name in [":models", ":providers", ":ai"]:
+                    curr_model = model or getattr(llm, "default_model", "default")
+                    console.print(f"\n[bold cyan]Active AI Provider:[/bold cyan] [bold white]{llm.name}[/bold white]")
+                    console.print(f"[bold cyan]Active Model:[/bold cyan] [bold green]{curr_model}[/bold green]")
+                    console.print("[dim]Switch anytime: [bold]:provider <ollama|gemini|groq|openrouter>[/bold] or [bold]:model <name>[/bold][/dim]\n")
+                    continue
 
-            if user_input.lower() == ":noauto":
-                auto_execute = False
-                print_info("Auto-execute disabled. All queries will show SQL only. Use :run to execute.")
-                continue
+                if cmd_name == ":explain":
+                    if last_result and last_result.sql:
+                        print_code(last_result.sql, "sql", "Last Executed SQL")
+                        console.print(f"[dim]Query type: {last_result.query_type} | Intent: {last_result.intent} | Retries: {last_result.retries}[/dim]")
+                        if last_result.exact_tables:
+                            console.print(f"[dim]Tables (exact): {', '.join(last_result.exact_tables)}[/dim]")
+                        if last_result.fuzzy_tables:
+                            console.print(f"[dim]Tables (fuzzy): {', '.join(last_result.fuzzy_tables)}[/dim]")
+                    else:
+                        print_warning("No previous query to explain.")
+                    continue
 
-            if user_input.lower() == ":run":
-                if not last_result or not last_result.sql:
-                    print_warning("No generated SQL query to run.")
+                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_preview = (r.sql[:80] + "...") if len(r.sql) > 80 else r.sql
+                        console.print(f"  {i}. {status} [{r.query_type}] {sql_preview}")
+                    continue
+
+                if cmd_name == ":auto":
+                    auto_execute = True
+                    print_success("Auto-execute enabled. Read queries will run automatically.")
+                    continue
+
+                if cmd_name == ":noauto":
+                    auto_execute = False
+                    print_info("Auto-execute disabled. All queries will show SQL only. Use :run to execute.")
+                    continue
+
+                if cmd_name == ":run":
+                    if not last_result or not last_result.sql:
+                        print_warning("No generated SQL query to run.")
+                        continue
+                    if last_result.was_executed:
+                        console.print("[dim]Re-executing last query...[/dim]")
+                    cols, rows, err = connector.execute_query(last_result.sql, limit=100)
+                    if err:
+                        print_error(f"Execution error: {err}")
+                    else:
+                        print_results_table(cols, rows)
+                    continue
+
+                if cmd_name == ":export":
+                    if not cmd_arg:
+                        print_warning("Usage: :export <file_path> (e.g. :export query.sql)")
+                        continue
+                    if not last_result or not last_result.sql:
+                        print_warning("No code block to export.")
+                        continue
+                    p = Path(cmd_arg)
+                    p.parent.mkdir(parents=True, exist_ok=True)
+                    p.write_text(last_result.sql, encoding="utf-8")
+                    print_success(f"SQL saved to {p}")
                     continue
-                if last_result.was_executed:
-                    # Re-run the last query
-                    console.print("[dim]Re-executing last query...[/dim]")
-                cols, rows, err = connector.execute_query(last_result.sql, limit=100)
-                if err:
-                    print_error(f"Execution error: {err}")
-                else:
-                    print_results_table(cols, rows)
+
+                print_warning(f"Unknown command '{user_input}'. Type [bold]:help[/bold] to see all in-chat commands.")
                 continue
 
-            if user_input.startswith(":export "):
-                file_target = user_input.split(" ", 1)[1].strip()
+            if user_input.lower() in ["exit", "quit", "q"]:
+                console.print("[bold cyan]Goodbye![/bold cyan]")
+                break
                 if not last_result or not last_result.sql:
                     print_warning("No code block to export.")
                     continue
@@ -782,7 +854,7 @@ def models_command():
     gemini = get_llm_provider("gemini")
     gemini_status = "[green]Configured[/green]" if gemini.is_available() else "[yellow]Not Configured (Free Key: aistudio.google.com)[/yellow]"
     console.print(f"\n2. [bold white]Google Gemini (Free Tier)[/bold white] - Status: {gemini_status}")
-    console.print("   Available Models: `gemini-2.0-flash`, `gemini-1.5-flash`, `gemini-1.5-pro`")
+    console.print("   Available Models: `gemini-3.6-flash`, `gemini-2.5-flash`, `gemini-2.5-pro`")
 
     groq = get_llm_provider("groq")
     groq_status = "[green]Configured[/green]" if groq.is_available() else "[yellow]Not Configured (Free Key: console.groq.com)[/yellow]"
@@ -922,5 +994,24 @@ def setup_command(
     console.print("  * [bold]db-agent guide[/bold]                              -> View full command reference\n")
 
 
+# ---- use ----
+
+@app.command(name="use")
+def use_command(
+    provider_name: str = typer.Argument(..., help="AI provider name (ollama, gemini, groq, openrouter)"),
+    model: Optional[str] = typer.Option(None, "--model", "-m", help="Optional default model name"),
+):
+    """Switch the default AI provider (e.g. `db-agent use gemini` or `db-agent use ollama`)."""
+    p = provider_name.lower()
+    if p not in ["ollama", "gemini", "groq", "openrouter", "mock"]:
+        print_error(f"Invalid provider '{provider_name}'. Supported: ollama, gemini, groq, openrouter")
+        raise typer.Exit(1)
+
+    config_mgr.set_setting("default_provider", p)
+    if model:
+        config_mgr.set_setting(f"{p}_default_model", model)
+    print_success(f"Default AI provider switched to [bold cyan]{p}[/bold cyan]!")
+
+
 if __name__ == "__main__":
     app()

{dbagent_cli-0.1.6 → dbagent_cli-0.1.8}/dbagent/connectors/relational.py

@@ -447,19 +447,22 @@ class RelationalConnector(BaseConnector):
         limit: int = 100,
     ) -> Tuple[List[str], List[Dict[str, Any]], Optional[str]]:
         """Safely execute a query with row limit."""
+        clean_q = query.strip()
         try:
             with self.engine.connect() as conn:
                 try:
-                    result = conn.exec_driver_sql(query)
+                    conn = conn.execution_options(isolation_level="AUTOCOMMIT")
                 except Exception:
-                    result = conn.execute(text(query))
+                    pass
+
+                try:
+                    result = conn.exec_driver_sql(clean_q)
+                except Exception:
+                    result = conn.execute(text(clean_q))
+
                 if not result.returns_rows:
-                    # DML: commit and report affected rows
-                    try:
-                        conn.commit()
-                    except Exception:
-                        pass
                     return ["status"], [{"status": "Query executed successfully."}], None
+
                 columns = list(result.keys())
                 raw_rows = result.fetchmany(limit)
                 rows = [

{dbagent_cli-0.1.6 → dbagent_cli-0.1.8}/dbagent_cli.egg-info/PKG-INFO

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

{dbagent_cli-0.1.6 → dbagent_cli-0.1.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dbagent-cli"
-version = "0.1.6"
+version = "0.1.8"
 description = "Universal Database Introspection and Script Generation AI Agent (CLI)"
 readme = "README.md"
 requires-python = ">=3.9"