glaip-sdk 0.0.2__py3-none-any.whl → 0.0.4__py3-none-any.whl

glaip_sdk/cli/commands/configure.py

@@ -11,8 +11,12 @@ from pathlib import Path
 import click
 import yaml
 from rich.console import Console
-from rich.panel import Panel
 from rich.table import Table
+from rich.text import Text
+
+from glaip_sdk import Client
+from glaip_sdk._version import __version__ as _SDK_VERSION
+from glaip_sdk.branding import AIPBranding
 
 console = Console()
 
@@ -25,8 +29,11 @@ def load_config():
     if not CONFIG_FILE.exists():
         return {}
 
-    with open(CONFIG_FILE) as f:
-        return yaml.safe_load(f) or {}
+    try:
+        with open(CONFIG_FILE) as f:
+            return yaml.safe_load(f) or {}
+    except yaml.YAMLError:
+        return {}
 
 
 def save_config(config):
@@ -49,82 +56,6 @@ def config_group():
     pass
 
 
-@config_group.command()
-def configure():
-    """Configure AIP CLI credentials and settings interactively."""
-
-    console.print(
-        Panel(
-            "[bold cyan]AIP Configuration[/bold cyan]\nConfigure your AIP CLI settings.",
-            title="🔧 Configuration Setup",
-            border_style="cyan",
-        )
-    )
-
-    # Load existing config
-    config = load_config()
-
-    console.print("\n[bold]Enter your AIP configuration:[/bold]")
-    console.print("(Leave blank to keep current values)")
-    console.print("─" * 50)
-
-    # API URL
-    current_url = config.get("api_url", "")
-    console.print(
-        f"\n[cyan]AIP API URL[/cyan] {f'(current: {current_url})' if current_url else ''}:"
-    )
-    new_url = input("> ").strip()
-    if new_url:
-        config["api_url"] = new_url
-    elif not current_url:
-        config["api_url"] = "https://your-aip-instance.com"
-
-    # API Key
-    current_key_masked = (
-        "***" + config.get("api_key", "")[-4:] if config.get("api_key") else ""
-    )
-    console.print(
-        f"\n[cyan]AIP API Key[/cyan] {f'(current: {current_key_masked})' if current_key_masked else ''}:"
-    )
-    new_key = getpass.getpass("> ")
-    if new_key:
-        config["api_key"] = new_key
-
-    # Save configuration
-    save_config(config)
-
-    console.print(f"\n✅ Configuration saved to: {CONFIG_FILE}")
-
-    # Test the new configuration
-    console.print("\n🔌 Testing connection...")
-    try:
-        from glaip_sdk import Client
-
-        # Create client with new config
-        client = Client(api_url=config["api_url"], api_key=config["api_key"])
-
-        # Try to list resources to test connection
-        try:
-            agents = client.list_agents()
-            console.print(f"✅ Connection successful! Found {len(agents)} agents")
-        except Exception as e:
-            console.print(f"⚠️  Connection established but API call failed: {e}")
-            console.print(
-                "   You may need to check your API permissions or network access"
-            )
-
-        client.close()
-
-    except Exception as e:
-        console.print(f"❌ Connection failed: {e}")
-        console.print("   Please check your API URL and key")
-        console.print("   You can run 'aip status' later to test again")
-
-    console.print("\n💡 You can now use AIP CLI commands!")
-    console.print("   • Run 'aip status' to check connection")
-    console.print("   • Run 'aip agents list' to see your agents")
-
-
 @config_group.command("list")
 def list_config():
     """List current configuration."""
@@ -150,7 +81,7 @@ def list_config():
             table.add_row(key, str(value))
 
     console.print(table)
-    console.print(f"\n📁 Config file: {CONFIG_FILE}")
+    console.print(Text(f"\n📁 Config file: {CONFIG_FILE}"))
 
 
 @config_group.command("set")
@@ -173,9 +104,9 @@ def set_config(key, value):
 
     if key == "api_key":
         masked_value = "***" + value[-4:] if len(value) > 4 else "***"
-        console.print(f"✅ Set {key} = {masked_value}")
+        console.print(Text(f"✅ Set {key} = {masked_value}"))
     else:
-        console.print(f"✅ Set {key} = {value}")
+        console.print(Text(f"✅ Set {key} = {value}"))
 
 
 @config_group.command("get")
@@ -186,7 +117,7 @@ def get_config(key):
     config = load_config()
 
     if key not in config:
-        console.print(f"[yellow]Configuration key '{key}' not found.[/yellow]")
+        console.print(Text(f"[yellow]Configuration key '{key}' not found.[/yellow]"))
         raise click.ClickException(f"Configuration key not found: {key}")
 
     value = config[key]
@@ -207,13 +138,13 @@ def unset_config(key):
     config = load_config()
 
     if key not in config:
-        console.print(f"[yellow]Configuration key '{key}' not found.[/yellow]")
+        console.print(Text(f"[yellow]Configuration key '{key}' not found.[/yellow]"))
         return
 
     del config[key]
     save_config(config)
 
-    console.print(f"✅ Removed {key} from configuration")
+    console.print(Text(f"✅ Removed {key} from configuration"))
 
 
 @config_group.command("reset")
@@ -237,20 +168,13 @@ def reset_config(force):
         console.print("[yellow]No configuration found to reset.[/yellow]")
 
 
-# Note: The config command group should be registered in main.py
-
-
-@click.command()
-def configure_command():
-    """Configure AIP CLI credentials and settings interactively."""
-
-    console.print(
-        Panel(
-            "[bold cyan]AIP Configuration[/bold cyan]\nConfigure your AIP CLI settings.",
-            title="🔧 Configuration Setup",
-            border_style="cyan",
-        )
+def _configure_interactive():
+    """Shared configuration logic for both configure commands."""
+    # Display AIP welcome banner
+    branding = AIPBranding.create_from_sdk(
+        sdk_version=_SDK_VERSION, package_name="glaip-sdk"
     )
+    branding.display_welcome_panel(title="🔧 AIP Configuration")
 
     # Load existing config
     config = load_config()
@@ -284,22 +208,20 @@ def configure_command():
     # Save configuration
     save_config(config)
 
-    console.print(f"\n✅ Configuration saved to: {CONFIG_FILE}")
+    console.print(Text(f"\n✅ Configuration saved to: {CONFIG_FILE}"))
 
     # Test the new configuration
     console.print("\n🔌 Testing connection...")
     try:
-        from glaip_sdk import Client
-
         # Create client with new config
         client = Client(api_url=config["api_url"], api_key=config["api_key"])
 
         # Try to list resources to test connection
         try:
             agents = client.list_agents()
-            console.print(f"✅ Connection successful! Found {len(agents)} agents")
+            console.print(Text(f"✅ Connection successful! Found {len(agents)} agents"))
         except Exception as e:
-            console.print(f"⚠️  Connection established but API call failed: {e}")
+            console.print(Text(f"⚠️  Connection established but API call failed: {e}"))
             console.print(
                 "   You may need to check your API permissions or network access"
             )
@@ -307,10 +229,30 @@ def configure_command():
         client.close()
 
     except Exception as e:
-        console.print(f"❌ Connection failed: {e}")
+        console.print(Text(f"❌ Connection failed: {e}"))
         console.print("   Please check your API URL and key")
         console.print("   You can run 'aip status' later to test again")
 
     console.print("\n💡 You can now use AIP CLI commands!")
     console.print("   • Run 'aip status' to check connection")
     console.print("   • Run 'aip agents list' to see your agents")
+
+
+@config_group.command()
+def configure():
+    """Configure AIP CLI credentials and settings interactively."""
+    _configure_interactive()
+
+
+# Alias command for backward compatibility
+@click.command()
+def configure_command():
+    """Configure AIP CLI credentials and settings interactively.
+
+    This is an alias for 'aip config configure' for backward compatibility.
+    """
+    # Delegate to the shared function
+    _configure_interactive()
+
+
+# Note: The config command group should be registered in main.py

glaip_sdk/cli/commands/init.py

@@ -11,30 +11,28 @@ from pathlib import Path
 import click
 import yaml
 from rich.console import Console
-from rich.panel import Panel
+from rich.text import Text
+
+from glaip_sdk import Client
+from glaip_sdk._version import __version__ as _SDK_VERSION
+from glaip_sdk.branding import AIPBranding
 
 console = Console()
 
 
 @click.command()
-@click.option("--no-scaffold", is_flag=True, help="Skip creating sample agent and tool")
-@click.option("--no-demo", is_flag=True, help="Don't launch interactive demo")
-def init_command(no_scaffold, no_demo):
+def init_command():
     """Initialize AIP project configuration."""
-
-    console.print(
-        Panel(
-            "[bold cyan]Welcome to AIP![/bold cyan]\nLet's set up your project.",
-            title="🚀 AIP Initialization",
-            border_style="cyan",
-        )
+    # Display AIP welcome banner
+    branding = AIPBranding.create_from_sdk(
+        sdk_version=_SDK_VERSION, package_name="glaip-sdk"
     )
+    branding.display_welcome_panel(title="🚀 AIP Initialization")
 
-    # Get configuration with better formatting
-    console.print("\n[bold]Step 1:[/bold] API Configuration")
+    # Get configuration
+    console.print("\n[bold]API Configuration[/bold]")
     console.print("─" * 50)
 
-    # Use built-in input for better control
     console.print(
         "\n[cyan]AIP API URL[/cyan] (default: https://your-aip-instance.com):"
     )
@@ -42,127 +40,54 @@ def init_command(no_scaffold, no_demo):
     if not api_url:
         api_url = "https://your-aip-instance.com"
 
-    console.print()  # Add spacing
-    console.print("[cyan]AIP API Key[/cyan]:")
+    console.print("\n[cyan]AIP API Key[/cyan]:")
     api_key = getpass.getpass("> ")
 
-    # Project configuration removed - not needed for AIP CLI
-
     # Create config directory
     config_dir = Path.home() / ".aip"
-    config_dir.mkdir(exist_ok=True)
+    try:
+        config_dir.mkdir(exist_ok=True)
+    except Exception as e:
+        console.print(Text(f"⚠️  Warning: Could not create config directory: {e}"))
+        return
 
     # Save configuration
     config = {"api_url": api_url, "api_key": api_key}
-
     config_file = config_dir / "config.yaml"
-    with open(config_file, "w") as f:
-        yaml.dump(config, f, default_flow_style=False)
+    try:
+        with open(config_file, "w") as f:
+            yaml.dump(config, f, default_flow_style=False)
+    except Exception as e:
+        console.print(Text(f"⚠️  Warning: Could not save configuration: {e}"))
+        return
 
     # Set secure file permissions (0600) - best effort on all platforms
     try:
         os.chmod(config_file, 0o600)
     except Exception:
-        # Best effort - may fail on Windows or other non-POSIX systems
-        pass
-
-    console.print(f"\n✅ Configuration saved to: {config_file}")
-
-    # Create sample agent and tool if requested
-    if not no_scaffold:
-        console.print("\n[bold]Step 2:[/bold] Sample Resources")
-        console.print("─" * 50)
-
-        console.print("\n[cyan]Create sample agent & tool?[/cyan] (Y/n):")
-        create_sample_resources = input("> ").strip().lower()
-        if create_sample_resources in ["", "y", "yes"]:
-            try:
-                from glaip_sdk import Client
-
-                # Set environment variables
-                os.environ["AIP_API_URL"] = api_url
-                os.environ["AIP_API_KEY"] = api_key
-
-                client = Client()
-
-                # Create sample agent
-                agent = client.create_agent(
-                    name="hello-world",
-                    instruction="You are a helpful AI assistant that says hello",
-                )
-                console.print(f"✅ Created sample agent: {agent.name} (id: {agent.id})")
-
-                # Create sample tool
-                tool_content = '''def hello_tool(name="World"):
-    """A simple hello tool."""
-    return f"Hello, {name}!"
-'''
-                with open("greeting_tool.py", "w") as f:
-                    f.write(tool_content)
-
-                tool = client.create_tool("greeting_tool.py", framework="langchain")
-                console.print(f"✅ Created sample tool: {tool.name} (id: {tool.id})")
-
-            except Exception as e:
-                console.print(f"⚠️  Warning: Could not create sample resources: {e}")
-
-    # Launch interactive demo if requested
-    if not no_demo:
-        console.print("\n[bold]Step 3:[/bold] Interactive Demo")
-        console.print("─" * 50)
-
-        console.print("\n[cyan]Start an interactive demo now?[/cyan] (Y/n):")
-        launch_demo = input("> ").strip().lower()
-        if launch_demo in ["", "y", "yes"]:
-            launch_interactive_demo()
-
-    console.print("\n🎉 [bold green]AIP initialization complete![/bold green]")
-    console.print(f"📁 Configuration: {config_file}")
-    console.print("💡 Next steps:")
-    console.print("   • Run 'aip agents list' to see your agents")
-    console.print("   • Run 'aip tools list' to see your tools")
-    console.print("   • Run 'aip status' to check connection")
+        pass  # Ignore permission errors
 
+    console.print(Text(f"\n✅ Configuration saved to: {config_file}"))
 
-def launch_interactive_demo():
-    """Launch interactive demo with sample agent."""
+    # Test the new configuration
+    console.print("\n🔌 Testing connection...")
     try:
-        from glaip_sdk import Client
-
-        console.print(
-            Panel(
-                "[bold green]Interactive Demo[/bold green]\nType to talk to hello-world. Ctrl+C to exit.",
-                title="🎮 Demo Mode",
-                border_style="green",
-            )
-        )
+        # Set environment variables
+        os.environ["AIP_API_URL"] = api_url
+        os.environ["AIP_API_KEY"] = api_key
 
         client = Client()
-        agents = client.find_agents(name="hello-world")
-        if not agents:
-            console.print("❌ Sample agent not found")
-            return
-
-        agent = agents[0]  # Use the first (and should be only) agent
-
-        while True:
-            try:
-                console.print("\n> ", end="")
-                user_input = input().strip()
-                if user_input.lower() in ["exit", "quit", "bye"]:
-                    break
-
-                response = agent.run(user_input)
-                console.print(f"🤖 {response}")
-
-            except KeyboardInterrupt:
-                break
-            except Exception as e:
-                console.print(f"❌ Error: {e}")
-
+        agents = client.list_agents()
+        console.print(Text(f"✅ Connection successful! Found {len(agents)} agents"))
     except Exception as e:
-        console.print(f"⚠️  Could not launch demo: {e}")
-
+        console.print(Text(f"⚠️  Connection established but API call failed: {e}"))
+        console.print(
+            Text("   You may need to check your API permissions or network access")
+        )
 
-# Note: The init command should be registered in main.py, not here
-# This prevents circular imports
+    console.print("\n🎉 [bold green]AIP initialization complete![/bold green]")
+    console.print(f"📁 Configuration: {config_file}")
+    console.print("💡 Next steps:")
+    console.print("   • Run 'aip agents list' to see your agents")
+    console.print("   • Run 'aip tools list' to see your tools")
+    console.print("   • Run 'aip status' to check connection")