dbagent-cli 0.1.3__tar.gz → 0.1.5__tar.gz

{dbagent_cli-0.1.3 → dbagent_cli-0.1.5}/PKG-INFO

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

{dbagent_cli-0.1.3 → dbagent_cli-0.1.5}/dbagent/__init__.py

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

{dbagent_cli-0.1.3 → dbagent_cli-0.1.5}/dbagent/agent/generator.py

@@ -51,9 +51,15 @@ Generate ONLY the raw executable SQL query for the given database. No markdown f
 2. Use the exact table and column names from the schema above.
 3. Use dialect-specific syntax for `{dialect_name}`.
 4. Write clean, optimized SQL with uppercase keywords.
-5. If the user asks for recent/time-based data, use the dialect's native datetime functions.
-6. Always include appropriate WHERE clauses, JOINs, and ORDER BY as needed.
-7. Default to LIMIT 50 unless the user specifies a count.
+5. If the user asks for recent/time-based data, use native datetime functions (e.g. for PostgreSQL: `NOW() - INTERVAL '1 hour'`, for SQLite: `datetime('now', '-1 hour')`, for MySQL: `NOW() - INTERVAL 1 HOUR`).
+6. For queries inspecting PostgreSQL foreign key mappings or table relationships via system catalog, use standard joins:
+   SELECT tc.table_name, kcu.column_name, ccu.table_name AS foreign_table_name, ccu.column_name AS foreign_column_name
+   FROM information_schema.table_constraints tc
+   JOIN information_schema.key_column_usage kcu ON tc.constraint_name = kcu.constraint_name
+   JOIN information_schema.constraint_column_usage ccu ON tc.constraint_name = ccu.constraint_name
+   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.
 """
 
 

{dbagent_cli-0.1.3 → dbagent_cli-0.1.5}/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]: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]: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)))
@@ -537,15 +537,47 @@ def chat_command(
 
             if user_input.startswith(":table "):
                 tname = user_input.split(" ", 1)[1].strip()
-                with console.status(f"[bold cyan]Inspecting {tname}...[/bold cyan]"):
-                    on_demand_schema = connector.inspect_schema(table_names=[tname], include_samples=True)
-                tmodel = on_demand_schema.get_table(tname)
+                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 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 user_input.lower() == ":explain":
                 if last_result and last_result.sql:
                     print_code(last_result.sql, "sql", "Last Executed SQL")
@@ -767,26 +799,33 @@ def models_command():
 
 @app.command(name="setup")
 def setup_command(
-    model: str = typer.Option("qwen2.5-coder:1.5b", "--model", "-m", help="Ollama model to install"),
-    yes: bool = typer.Option(False, "--yes", "-y", help="Skip confirmation prompt and install local Ollama automatically"),
+    model: str = typer.Option("qwen2.5-coder:1.5b", "--model", "-m", help="Ollama model to install for local AI"),
+    yes: bool = typer.Option(False, "--yes", "-y", help="Skip prompts and install local Ollama automatically"),
 ):
-    """Setup wizard: Choose to install standalone local AI (Ollama) or configure cloud AI providers."""
+    """Interactive setup wizard: Configure local offline AI, cloud API keys, or standard DB tools."""
     print_banner()
-    console.print("[bold cyan]DB-Agent AI Engine Setup Wizard[/bold cyan]\n")
+    console.print("[bold cyan]DB-Agent Setup & Configuration Wizard[/bold cyan]\n")
 
-    install_local = yes
-    if not yes:
-        console.print("[bold white]DB-Agent supports two ways to run AI:[/bold white]")
-        console.print("  1. [bold green]Local Offline AI (Ollama)[/bold green]: 100% private, zero-cost, runs on your machine without API keys.")
-        console.print("  2. [bold cyan]Free Cloud AI (Gemini / Groq)[/bold cyan]: Lightweight, runs in the cloud via free API keys.\n")
+    chosen_provider = "ollama"
 
-        install_local = Confirm.ask(
-            "Would you like to install & configure local offline AI (Ollama + Coding Model)?",
-            default=True,
+    if yes:
+        choice = "1"
+    else:
+        console.print("[bold white]Choose how you would like to setup DB-Agent:[/bold white]")
+        console.print("  [bold green]1. Local Offline AI[/bold green] (Ollama + Coding Model) - [italic]100% Free, Private, Zero API Keys[/italic]")
+        console.print("  [bold cyan]2. Free Cloud AI[/bold cyan] (Google Gemini / Groq / OpenRouter) - [italic]Fast, requires free API key[/italic]")
+        console.print("  [bold yellow]3. Normal Database CLI[/bold yellow] - [italic]No AI, use standard connect, scan & SQL tools only[/italic]\n")
+
+        choice = Prompt.ask(
+            "Select setup mode",
+            choices=["1", "2", "3"],
+            default="1",
         )
 
-    if install_local:
-        console.print("\n[dim]Setting up local offline AI engine...[/dim]\n")
+    # --- Mode 1: Local Offline AI ---
+    if choice == "1":
+        console.print("\n[bold cyan]Setting up Local Offline AI (Ollama)...[/bold cyan]")
+        console.print("[dim]Downloading and configuring local AI engine (one-time setup)...[/dim]\n")
         from dbagent.llm.auto_setup import ensure_ollama_ready
 
         def _log(msg, level="info"):
@@ -804,16 +843,83 @@ def setup_command(
         success, message = ensure_ollama_ready(model=model, print_fn=_log)
         if success:
             config_mgr.set_setting("default_provider", "ollama")
-            print_success(message)
-            console.print("\n[bold green]You're all set![/bold green] DB-Agent is now configured with local offline AI.\n")
+            chosen_provider = "ollama"
+            print_success("Local AI engine configured and ready!")
         else:
             print_error(message)
-            raise typer.Exit(1)
-    else:
-        print_info("Skipped local Ollama installation.")
-        console.print("\n[bold white]Next Steps for Cloud AI:[/bold white]")
-        console.print("  * Run [bold cyan]db-agent config[/bold cyan] anytime to configure free Google Gemini or Groq API keys.")
-        console.print("  * Or connect directly to your database with [bold cyan]db-agent connect <url> --alias <name>[/bold cyan]\n")
+            console.print("[yellow]You can still use DB-Agent with cloud AI or standard SQL tools.[/yellow]\n")
+
+    # --- Mode 2: Cloud AI with API Key ---
+    elif choice == "2":
+        console.print("\n[bold cyan]Configure Free Cloud AI Provider[/bold cyan]\n")
+        prov = Prompt.ask(
+            "Select Cloud AI Provider",
+            choices=["gemini", "groq", "openrouter"],
+            default="gemini",
+        )
+        if prov == "gemini":
+            console.print("[dim]Get a free Gemini API key at: [bold]https://aistudio.google.com/apikey[/bold][/dim]")
+            key = Prompt.ask("Enter GEMINI_API_KEY").strip()
+            if key:
+                config_mgr.set_setting("gemini_api_key", key)
+                config_mgr.set_setting("default_provider", "gemini")
+                chosen_provider = "gemini"
+                print_success("Google Gemini Free Tier configured successfully!")
+        elif prov == "groq":
+            console.print("[dim]Get a free Groq API key at: [bold]https://console.groq.com[/bold][/dim]")
+            key = Prompt.ask("Enter GROQ_API_KEY").strip()
+            if key:
+                config_mgr.set_setting("groq_api_key", key)
+                config_mgr.set_setting("default_provider", "groq")
+                chosen_provider = "groq"
+                print_success("Groq Ultra-Fast Free Tier configured successfully!")
+        elif prov == "openrouter":
+            console.print("[dim]Get an OpenRouter API key at: [bold]https://openrouter.ai[/bold][/dim]")
+            key = Prompt.ask("Enter OPENROUTER_API_KEY").strip()
+            if key:
+                config_mgr.set_setting("openrouter_api_key", key)
+                config_mgr.set_setting("default_provider", "openrouter")
+                chosen_provider = "openrouter"
+                print_success("OpenRouter configured successfully!")
+
+    # --- Mode 3: Normal Database CLI ---
+    elif choice == "3":
+        chosen_provider = "normal (no AI)"
+        print_info("Configured in Normal mode. You can use connect, scan, and run commands.")
+        console.print("[dim]To add AI later, simply run [bold]db-agent setup[/bold] or [bold]db-agent config[/bold].[/dim]\n")
+
+    # --- Optional Database Connection Setup ---
+    console.print("")
+    if not yes and Confirm.ask("Would you like to connect and save a database profile now?", default=True):
+        db_url = Prompt.ask("Enter Database URL (e.g. postgresql://user:pass@host:5432/dbname or sqlite:///mydb.db)").strip()
+        if db_url:
+            alias = Prompt.ask("Enter alias name (e.g. devdb, prod, myapp)", default="default_db").strip()
+            with console.status("[bold cyan]Testing connection credentials...[/bold cyan]"):
+                try:
+                    connector = create_connector(db_url)
+                    success, msg = connector.test_connection()
+                    if success:
+                        config_mgr.save_profile(name=alias, connection_url=db_url, description=f"Profile for {alias}")
+                        print_success(f"Successfully connected and saved profile as alias '[bold cyan]{alias}[/bold cyan]'!")
+                    else:
+                        print_warning(f"Connection test failed: {msg}")
+                        if Confirm.ask("Save profile anyway?", default=True):
+                            config_mgr.save_profile(name=alias, connection_url=db_url, description=f"Profile for {alias}")
+                            print_success(f"Saved profile as alias '[bold cyan]{alias}[/bold cyan]'.")
+                    connector.close()
+                except Exception as e:
+                    print_error(f"Error testing connection: {str(e)}")
+
+    # --- Final Summary ---
+    console.print("\n" + "=" * 70)
+    console.print("[bold green][OK] DB-Agent Setup Complete![/bold green]")
+    console.print(f"AI Mode: [bold cyan]{chosen_provider}[/bold cyan]")
+    console.print("=" * 70)
+    console.print("\n[bold white]Quick Commands:[/bold white]")
+    console.print("  * [bold]db-agent ask \"your question\" --db <alias>[/bold]  -> Ask questions & get live results")
+    console.print("  * [bold]db-agent chat --db <alias>[/bold]                  -> Interactive CLI shell")
+    console.print("  * [bold]db-agent scan --db <alias>[/bold]                  -> Introspect database schema")
+    console.print("  * [bold]db-agent guide[/bold]                              -> View full command reference\n")
 
 
 if __name__ == "__main__":

{dbagent_cli-0.1.3 → dbagent_cli-0.1.5}/dbagent_cli.egg-info/PKG-INFO

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

{dbagent_cli-0.1.3 → dbagent_cli-0.1.5}/pyproject.toml

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