glaip-sdk 0.0.18__py3-none-any.whl → 0.0.20__py3-none-any.whl

glaip_sdk/cli/commands/tools.py

@@ -12,6 +12,13 @@ from typing import Any
 import click
 from rich.console import Console
 
+from glaip_sdk.branding import (
+    ACCENT_STYLE,
+    ERROR_STYLE,
+    INFO,
+    SUCCESS_STYLE,
+    WARNING_STYLE,
+)
 from glaip_sdk.cli.context import detect_export_format, get_ctx_value, output_flags
 from glaip_sdk.cli.display import (
     display_api_error,
@@ -40,6 +47,7 @@ from glaip_sdk.cli.utils import (
     output_result,
     spinner_context,
 )
+from glaip_sdk.icons import ICON_TOOL
 from glaip_sdk.utils import format_datetime
 from glaip_sdk.utils.import_export import merge_import_with_cli_args
 
@@ -202,8 +210,8 @@ def list_tools(ctx: Any, tool_type: str | None) -> None:
         # Define table columns: (data_key, header, style, width)
         columns = [
             ("id", "ID", "dim", 36),
-            ("name", "Name", "cyan", None),
-            ("framework", "Framework", "blue", None),
+            ("name", "Name", ACCENT_STYLE, None),
+            ("framework", "Framework", INFO, None),
         ]
 
         # Transform function for safe dictionary access
@@ -213,7 +221,7 @@ def list_tools(ctx: Any, tool_type: str | None) -> None:
             row["id"] = str(row["id"])
             return row
 
-        output_list(ctx, tools, "🔧 Available Tools", columns, transform_tool)
+        output_list(ctx, tools, f"{ICON_TOOL} Available Tools", columns, transform_tool)
 
     except Exception as e:
         raise click.ClickException(str(e))
@@ -350,11 +358,11 @@ def get(ctx: Any, tool_ref: str, select: int | None, export: str | None) -> None
                     tool = client.get_tool_by_id(tool.id)
             except Exception as e:
                 print_markup(
-                    f"[yellow]⚠️  Could not fetch full tool details: {e}[/yellow]",
+                    f"[{WARNING_STYLE}]⚠️  Could not fetch full tool details: {e}[/]",
                     console=console,
                 )
                 print_markup(
-                    "[yellow]⚠️  Proceeding with available data[/yellow]",
+                    f"[{WARNING_STYLE}]⚠️  Proceeding with available data[/]",
                     console=console,
                 )
 
@@ -365,7 +373,7 @@ def get(ctx: Any, tool_ref: str, select: int | None, export: str | None) -> None
             ):
                 export_resource_to_file(tool, export_path, detected_format)
             print_markup(
-                f"[green]✅ Complete tool configuration exported to: {export_path} (format: {detected_format})[/green]",
+                f"[{SUCCESS_STYLE}]✅ Complete tool configuration exported to: {export_path} (format: {detected_format})[/]",
                 console=console,
             )
 
@@ -395,11 +403,11 @@ def get(ctx: Any, tool_ref: str, select: int | None, export: str | None) -> None
                 ctx,
                 formatted_data,
                 title="Tool Details",
-                panel_title=f"🔧 {raw_tool_data.get('name', 'Unknown')}",
+                panel_title=f"{ICON_TOOL} {raw_tool_data.get('name', 'Unknown')}",
             )
         else:
             # Fall back to original method if raw fetch fails
-            console.print("[yellow]Falling back to Pydantic model data[/yellow]")
+            console.print(f"[{WARNING_STYLE}]Falling back to Pydantic model data[/]")
 
             # Create result data with all available fields from backend
             result_data = {
@@ -412,7 +420,10 @@ def get(ctx: Any, tool_ref: str, select: int | None, export: str | None) -> None
             }
 
             output_result(
-                ctx, result_data, title="Tool Details", panel_title=f"🔧 {tool.name}"
+                ctx,
+                result_data,
+                title="Tool Details",
+                panel_title=f"{ICON_TOOL} {tool.name}",
             )
 
     except Exception as e:
@@ -475,7 +486,7 @@ def update(
                 )
             handle_rich_output(
                 ctx,
-                markup_text(f"[green]✓[/green] Tool code updated from {file}"),
+                markup_text(f"[{SUCCESS_STYLE}]✓[/] Tool code updated from {file}"),
             )
         elif update_data:
             # Update metadata only (native tools only)
@@ -490,11 +501,11 @@ def update(
             ):
                 updated_tool = tool.update(**update_data)
             handle_rich_output(
-                ctx, markup_text("[green]✓[/green] Tool metadata updated")
+                ctx, markup_text(f"[{SUCCESS_STYLE}]✓[/] Tool metadata updated")
             )
         else:
             handle_rich_output(
-                ctx, markup_text("[yellow]No updates specified[/yellow]")
+                ctx, markup_text(f"[{WARNING_STYLE}]No updates specified[/]")
             )
             return
 
@@ -574,11 +585,13 @@ def script(ctx: Any, tool_id: str) -> None:
         if get_ctx_value(ctx, "view") == "json":
             click.echo(json.dumps({"script": script_content}, indent=2))
         else:
-            console.print(f"[green]📜 Tool Script for '{tool_id}':[/green]")
+            console.print(f"[{SUCCESS_STYLE}]📜 Tool Script for '{tool_id}':[/]")
             console.print(script_content)
 
     except Exception as e:
         handle_json_output(ctx, error=e)
         if get_ctx_value(ctx, "view") != "json":
-            print_markup(f"[red]Error getting tool script: {e}[/red]", console=console)
+            print_markup(
+                f"[{ERROR_STYLE}]Error getting tool script: {e}[/]", console=console
+            )
         raise click.ClickException(str(e))

glaip_sdk/cli/commands/update.py

@@ -0,0 +1,66 @@
+"""Update command for upgrading the glaip-sdk package.
+
+Author:
+    Raymond Christopher (raymond.christopher@gdplabs.id)
+"""
+
+from __future__ import annotations
+
+import subprocess
+import sys
+from collections.abc import Sequence
+
+import click
+from rich.console import Console
+
+from glaip_sdk.branding import ACCENT_STYLE, ERROR_STYLE, INFO_STYLE, SUCCESS_STYLE
+
+PACKAGE_NAME = "glaip-sdk"
+
+
+def _build_upgrade_command(include_prerelease: bool) -> Sequence[str]:
+    """Return the pip command used to upgrade the SDK."""
+    command = [
+        sys.executable,
+        "-m",
+        "pip",
+        "install",
+        "--upgrade",
+        PACKAGE_NAME,
+    ]
+    if include_prerelease:
+        command.append("--pre")
+    return command
+
+
+@click.command(name="update")
+@click.option(
+    "--pre",
+    "include_prerelease",
+    is_flag=True,
+    help="Include pre-release versions when upgrading.",
+)
+def update_command(include_prerelease: bool) -> None:
+    """Upgrade the glaip-sdk package using pip."""
+    console = Console()
+    upgrade_cmd = _build_upgrade_command(include_prerelease)
+    console.print(
+        f"[{ACCENT_STYLE}]Upgrading {PACKAGE_NAME} using[/] "
+        f"[{INFO_STYLE}]{' '.join(upgrade_cmd)}[/]"
+    )
+
+    try:
+        subprocess.run(upgrade_cmd, check=True)
+    except FileNotFoundError as exc:
+        raise click.ClickException(
+            "Unable to locate Python executable to run pip. "
+            "Please ensure Python is installed and try again."
+        ) from exc
+    except subprocess.CalledProcessError as exc:
+        console.print(
+            f"[{ERROR_STYLE}]Automatic upgrade failed.[/] "
+            f"Please run `pip install -U {PACKAGE_NAME}` manually."
+        )
+        raise click.ClickException("Automatic upgrade failed.") from exc
+
+    console.print(f"[{SUCCESS_STYLE}]✅ {PACKAGE_NAME} upgraded successfully.[/]")

glaip_sdk/cli/config.py

@@ -12,6 +12,14 @@ import yaml
 
 CONFIG_DIR = Path.home() / ".aip"
 CONFIG_FILE = CONFIG_DIR / "config.yaml"
+_ALLOWED_KEYS = {"api_url", "api_key", "timeout"}
+
+
+def _sanitize_config(data: dict[str, Any] | None) -> dict[str, Any]:
+    """Return config filtered to allowed keys only."""
+    if not data:
+        return {}
+    return {k: v for k, v in data.items() if k in _ALLOWED_KEYS}
 
 
 def load_config() -> dict[str, Any]:
@@ -21,7 +29,8 @@ def load_config() -> dict[str, Any]:
 
     try:
         with open(CONFIG_FILE) as f:
-            return yaml.safe_load(f) or {}
+            loaded = yaml.safe_load(f) or {}
+            return _sanitize_config(loaded)
     except yaml.YAMLError:
         return {}
 
@@ -30,8 +39,10 @@ def save_config(config: dict[str, Any]) -> None:
     """Save configuration to file."""
     CONFIG_DIR.mkdir(exist_ok=True)
 
+    sanitized = _sanitize_config(config)
+
     with open(CONFIG_FILE, "w") as f:
-        yaml.dump(config, f, default_flow_style=False)
+        yaml.dump(sanitized, f, default_flow_style=False)
 
     # Set secure file permissions
     try:

glaip_sdk/cli/display.py

@@ -15,8 +15,10 @@ from rich.console import Console
 from rich.panel import Panel
 from rich.text import Text
 
-from glaip_sdk.cli.rich_helpers import markup_text, print_markup
-from glaip_sdk.cli.utils import command_hint
+from glaip_sdk.branding import ERROR_STYLE, SUCCESS, SUCCESS_STYLE, WARNING_STYLE
+from glaip_sdk.cli.rich_helpers import markup_text
+from glaip_sdk.cli.utils import command_hint, format_command_hint
+from glaip_sdk.icons import ICON_AGENT, ICON_TOOL
 from glaip_sdk.rich_components import AIPPanel
 
 console = Console()
@@ -44,10 +46,10 @@ def display_creation_success(
         )
 
     return AIPPanel(
-        f"[green]✅ {resource_type} '{resource_name}' created successfully![/green]\n\n"
+        f"[{SUCCESS_STYLE}]✅ {resource_type} '{resource_name}' created successfully![/]\n\n"
         f"ID: {resource_id}{fields_display}",
-        title=f"🤖 {resource_type} Created",
-        border_style="green",
+        title=f"{ICON_AGENT} {resource_type} Created",
+        border_style=SUCCESS,
         padding=(0, 1),
     )
 
@@ -63,7 +65,7 @@ def display_update_success(resource_type: str, resource_name: str) -> Text:
         Rich Text object for display
     """
     return markup_text(
-        f"[green]✅ {resource_type} '{resource_name}' updated successfully[/green]"
+        f"[{SUCCESS_STYLE}]✅ {resource_type} '{resource_name}' updated successfully[/]"
     )
 
 
@@ -78,7 +80,7 @@ def display_deletion_success(resource_type: str, resource_name: str) -> Text:
         Rich Text object for display
     """
     return markup_text(
-        f"[green]✅ {resource_type} '{resource_name}' deleted successfully[/green]"
+        f"[{SUCCESS_STYLE}]✅ {resource_type} '{resource_name}' deleted successfully[/]"
     )
 
 
@@ -90,8 +92,15 @@ def display_api_error(error: Exception, operation: str = "operation") -> None:
         operation: Description of the operation that failed
     """
     error_type = type(error).__name__
-    print_markup(f"[red]Error during {operation}: {error}[/red]", console=console)
-    print_markup(f"[dim]Error type: {error_type}[/dim]", console=console)
+    error_message = markup_text(f"[{ERROR_STYLE}]Error during {operation}: {error}[/]")
+    error_message.no_wrap = True
+    error_message.overflow = "ignore"
+    console.print(error_message)
+
+    error_type_message = markup_text(f"[dim]Error type: {error_type}[/dim]")
+    error_type_message.no_wrap = True
+    error_type_message.overflow = "ignore"
+    console.print(error_type_message)
 
 
 def print_api_error(e: Exception) -> None:
@@ -107,17 +116,17 @@ def print_api_error(e: Exception) -> None:
         - Special handling for validation errors with detailed field-level errors
     """
     if not hasattr(e, "__dict__"):
-        console.print(f"[red]Error: {e}[/red]")
+        console.print(f"[{ERROR_STYLE}]Error: {e}[/]")
         return
 
     if not hasattr(e, "status_code"):
-        console.print(f"[red]Error: {e}[/red]")
+        console.print(f"[{ERROR_STYLE}]Error: {e}[/]")
         return
 
-    console.print(f"[red]API Error: {e}[/red]")
+    console.print(f"[{ERROR_STYLE}]API Error: {e}[/]")
     status_code = getattr(e, "status_code", None)
     if status_code is not None:
-        console.print(f"[yellow]Status: {status_code}[/yellow]")
+        console.print(f"[{WARNING_STYLE}]Status: {status_code}[/]")
 
     payload = getattr(e, "payload", _MISSING)
     if payload is _MISSING:
@@ -125,9 +134,9 @@ def print_api_error(e: Exception) -> None:
 
     if payload:
         if not _print_structured_payload(payload):
-            console.print(f"[yellow]Details: {payload}[/yellow]")
+            console.print(f"[{WARNING_STYLE}]Details: {payload}[/]")
     else:
-        console.print(f"[yellow]Details: {payload}[/yellow]")
+        console.print(f"[{WARNING_STYLE}]Details: {payload}[/]")
 
 
 def _print_structured_payload(payload: Any) -> bool:
@@ -149,18 +158,18 @@ def _print_validation_details(detail: Any) -> bool:
     if not isinstance(detail, list) or not detail:
         return False
 
-    console.print("[red]Validation Errors:[/red]")
+    console.print(f"[{ERROR_STYLE}]Validation Errors:[/]")
     for error in detail:
         if isinstance(error, dict):
             loc = " -> ".join(str(x) for x in error.get("loc", []))
             msg = error.get("msg", "Unknown error")
             error_type = error.get("type", "unknown")
             location = loc if loc else "field"
-            console.print(f"  [yellow]• {location}:[/yellow] {msg}")
+            console.print(f"  [{WARNING_STYLE}]• {location}:[/] {msg}")
             if error_type != "unknown":
                 console.print(f"    [dim]({error_type})[/dim]")
         else:
-            console.print(f"  [yellow]•[/yellow] {error}")
+            console.print(f"  [{WARNING_STYLE}]•[/] {error}")
     return True
 
 
@@ -169,14 +178,14 @@ def _print_details_field(details: Any) -> bool:
     if not details:
         return False
 
-    console.print("[red]Error Details:[/red]")
+    console.print(f"[{ERROR_STYLE}]Error Details:[/]")
     if isinstance(details, str):
-        console.print(f"  [yellow]•[/yellow] {details}")
+        console.print(f"  [{WARNING_STYLE}]•[/] {details}")
     elif isinstance(details, list):
         for detail in details:
-            console.print(f"  [yellow]•[/yellow] {detail}")
+            console.print(f"  [{WARNING_STYLE}]•[/] {detail}")
     else:
-        console.print(f"  [yellow]•[/yellow] {details}")
+        console.print(f"  [{WARNING_STYLE}]•[/] {details}")
     return True
 
 
@@ -310,8 +319,8 @@ def display_agent_run_suggestions(agent: Any) -> Panel:
     if run_hint_id and run_hint_name:
         cli_section = (
             "📋 Prefer the CLI instead?\n"
-            f"   [green]{run_hint_id}[/green]\n"
-            f"   [green]{run_hint_name}[/green]\n\n"
+            f"   {format_command_hint(run_hint_id) or run_hint_id}\n"
+            f"   {format_command_hint(run_hint_name) or run_hint_name}\n\n"
         )
 
     return AIPPanel(
@@ -319,7 +328,7 @@ def display_agent_run_suggestions(agent: Any) -> Panel:
         f"🚀 Start chatting with [bold]{agent_name}[/bold] right here:\n"
         f"   Type your message below and press Enter to run it immediately.\n\n"
         f"{cli_section}"
-        f"🔧 Available options:\n"
+        f"{ICON_TOOL} Available options:\n"
         f"   [dim]--chat-history[/dim]  Include previous conversation\n"
         f"   [dim]--file[/dim]          Attach files\n"
         f"   [dim]--input[/dim]         Alternative input method\n"
@@ -327,7 +336,7 @@ def display_agent_run_suggestions(agent: Any) -> Panel:
         f"   [dim]--save[/dim]          Save transcript to file\n"
         f"   [dim]--verbose[/dim]       Show detailed execution\n\n"
         f"💡 [dim]Input text can be positional OR use --input flag (both work!)[/dim]",
-        title="🤖 Ready to Run Agent",
+        title=f"{ICON_AGENT} Ready to Run Agent",
         border_style="blue",
         padding=(0, 1),
     )

glaip_sdk/cli/io.py

@@ -8,16 +8,27 @@ Authors:
 """
 
 from pathlib import Path
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import click
 
+from glaip_sdk.branding import WARNING_STYLE
 from glaip_sdk.utils.serialization import (
     collect_attributes_for_export,
     load_resource_from_file,
     write_resource_export,
 )
 
+if TYPE_CHECKING:  # pragma: no cover - typing-only imports
+    from rich.console import Console
+
+
+def _create_console() -> "Console":
+    """Return a Console instance (lazy import for easier testing)."""
+    from rich.console import Console  # Local import for test patching
+
+    return Console()
+
 
 def load_resource_from_file_with_validation(
     file_path: Path, resource_type: str
@@ -79,9 +90,7 @@ def fetch_raw_resource_details(client: Any, resource: Any, resource_type: str) -
     Notes:
         This is CLI-specific functionality for displaying comprehensive resource details.
     """
-    from rich.console import Console
-
-    console = Console()
+    console = _create_console()
 
     try:
         resource_id = str(getattr(resource, "id", "")).strip()
@@ -99,7 +108,7 @@ def fetch_raw_resource_details(client: Any, resource: Any, resource_type: str) -
                 return raw_response
     except Exception as e:
         console.print(
-            f"[yellow]Failed to fetch raw {resource_type} details: {e}[/yellow]"
+            f"[{WARNING_STYLE}]Failed to fetch raw {resource_type} details: {e}[/]"
         )
         # Fall back to regular method
         return None