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

glaip_sdk/cli/main.py

@@ -14,7 +14,18 @@ from rich.console import Console
 
 from glaip_sdk import Client
 from glaip_sdk._version import __version__ as _SDK_VERSION
-from glaip_sdk.branding import AIPBranding
+from glaip_sdk.branding import (
+    ERROR,
+    ERROR_STYLE,
+    INFO,
+    INFO_STYLE,
+    NEUTRAL,
+    SUCCESS,
+    SUCCESS_STYLE,
+    WARNING,
+    WARNING_STYLE,
+    AIPBranding,
+)
 from glaip_sdk.cli.commands.agents import agents_group
 from glaip_sdk.cli.commands.configure import (
     config_group,
@@ -23,12 +34,15 @@ from glaip_sdk.cli.commands.configure import (
 from glaip_sdk.cli.commands.mcps import mcps_group
 from glaip_sdk.cli.commands.models import models_group
 from glaip_sdk.cli.commands.tools import tools_group
+from glaip_sdk.cli.commands.update import update_command
 from glaip_sdk.cli.config import load_config
+from glaip_sdk.cli.transcript import get_transcript_cache_stats
 from glaip_sdk.cli.update_notifier import maybe_notify_update
-from glaip_sdk.cli.utils import spinner_context, update_spinner
+from glaip_sdk.cli.utils import in_slash_mode, spinner_context, update_spinner
 from glaip_sdk.config.constants import (
     DEFAULT_AGENT_RUN_TIMEOUT,
 )
+from glaip_sdk.icons import ICON_AGENT
 from glaip_sdk.rich_components import AIPPanel, AIPTable
 
 # Import SlashSession for potential mocking in tests
@@ -38,11 +52,40 @@ except ImportError:  # pragma: no cover - optional slash dependencies
     # Slash dependencies might not be available in all environments
     SlashSession = None
 
+# Constants
+AVAILABLE_STATUS = "✅ Available"
+
+
+def _format_size(num: int) -> str:
+    """Return a human-readable byte size."""
+    if num <= 0:
+        return "0B"
+
+    units = ["B", "KB", "MB", "GB", "TB"]
+    value = float(num)
+    for unit in units:
+        if value < 1024 or unit == units[-1]:
+            if value >= 100 or unit == "B":
+                return f"{value:.0f}{unit}"
+            if value >= 10:
+                return f"{value:.1f}{unit}"
+            return f"{value:.2f}{unit}"
+        value /= 1024
+    return f"{value:.1f}TB"  # pragma: no cover - defensive fallback
+
 
 @click.group(invoke_without_command=True)
 @click.version_option(version=_SDK_VERSION, prog_name="aip")
-@click.option("--api-url", envvar="AIP_API_URL", help="AIP API URL")
-@click.option("--api-key", envvar="AIP_API_KEY", help="AIP API Key")
+@click.option(
+    "--api-url",
+    envvar="AIP_API_URL",
+    help="AIP API URL (primary credential for the CLI)",
+)
+@click.option(
+    "--api-key",
+    envvar="AIP_API_KEY",
+    help="AIP API Key (CLI requires this together with --api-url)",
+)
 @click.option("--timeout", default=30.0, help="Request timeout in seconds")
 @click.option(
     "--view",
@@ -61,17 +104,18 @@ def main(
     view: str | None,
     no_tty: bool,
 ) -> None:
-    """GL AIP SDK Command Line Interface.
+    r"""GL AIP SDK Command Line Interface.
 
     A comprehensive CLI for managing GL AIP resources including
     agents, tools, MCPs, and more.
 
+    \b
     Examples:
-        aip version                     # Show detailed version info
-        aip configure                   # Configure credentials
-        aip agents list                   # List all agents
-        aip tools create my_tool.py      # Create a new tool
-        aip agents run my-agent "Hello world"  # Run an agent
+      aip version                     # Show detailed version info
+      aip configure                   # Configure credentials
+      aip agents list                 # List all agents
+      aip tools create my_tool.py     # Create a new tool
+      aip agents run my-agent "Hello world"  # Run an agent
     """
     # Store configuration in context
     ctx.ensure_object(dict)
@@ -82,15 +126,24 @@ def main(
 
     ctx.obj["tty"] = not no_tty
 
-    if not ctx.resilient_parsing and ctx.obj["tty"]:
+    launching_slash = (
+        ctx.invoked_subcommand is None
+        and not ctx.resilient_parsing
+        and _should_launch_slash(ctx)
+        and SlashSession is not None
+    )
+
+    if not ctx.resilient_parsing and ctx.obj["tty"] and not launching_slash:
         console = Console()
         maybe_notify_update(
             _SDK_VERSION,
             console=console,
+            ctx=ctx,
+            slash_command="update",
         )
 
     if ctx.invoked_subcommand is None and not ctx.resilient_parsing:
-        if _should_launch_slash(ctx) and SlashSession is not None:
+        if launching_slash:
             session = SlashSession(ctx)
             session.run()
             ctx.exit()
@@ -108,6 +161,7 @@ main.add_command(models_group)
 
 # Add top-level commands
 main.add_command(configure_command)
+main.add_command(update_command)
 
 
 # Tip: `--version` is provided by click.version_option above.
@@ -150,7 +204,7 @@ def _validate_config_and_show_error(config: dict, console: Console) -> None:
     if not config.get("api_url") or not config.get("api_key"):
         console.print(
             AIPPanel(
-                "[bold red]❌ Configuration incomplete[/bold red]\n\n"
+                f"[{ERROR_STYLE}]❌ Configuration incomplete[/]\n\n"
                 f"🔍 Current config:\n"
                 f"   • API URL: {config.get('api_url', 'Not set')}\n"
                 f"   • API Key: {'***' + config.get('api_key', '')[-4:] if config.get('api_key') else 'Not set'}\n\n"
@@ -158,16 +212,65 @@ def _validate_config_and_show_error(config: dict, console: Console) -> None:
                 f"   • Run 'aip configure' to set up credentials\n"
                 f"   • Or run 'aip config list' to see current config",
                 title="❌ Configuration Error",
-                border_style="red",
+                border_style=ERROR,
             )
         )
         console.print(
-            f"\n[bold green]✅ AIP - Ready[/bold green] (SDK v{_SDK_VERSION}) - Configure to connect"
+            f"\n[{SUCCESS_STYLE}]✅ AIP - Ready[/] (SDK v{_SDK_VERSION}) - Configure to connect"
         )
         sys.exit(1)
 
 
-def _create_and_test_client(config: dict, console: Console) -> Client:
+def _resolve_status_console(ctx: Any) -> tuple[Console, bool]:
+    """Return the console to use and whether we are in slash mode."""
+    ctx_obj = ctx.obj if isinstance(ctx.obj, dict) else None
+    console_override = ctx_obj.get("_slash_console") if ctx_obj else None
+    console = console_override or Console()
+    slash_mode = in_slash_mode(ctx)
+    return console, slash_mode
+
+
+def _render_status_heading(console: Console, slash_mode: bool) -> None:
+    """Print the status heading/banner."""
+    del slash_mode  # heading now consistent across invocation contexts
+    console.print(f"[{INFO_STYLE}]GL AIP status[/]")
+    console.print()
+    console.print(f"[{SUCCESS_STYLE}]✅ GL AIP ready[/] (SDK v{_SDK_VERSION})")
+
+
+def _collect_cache_summary() -> tuple[str | None, str | None]:
+    """Collect transcript cache summary and optional note."""
+    try:
+        cache_stats = get_transcript_cache_stats()
+    except Exception:
+        return "[dim]Saved run history[/dim]: unavailable", None
+
+    runs_text = f"{cache_stats.entry_count} runs saved"
+    if cache_stats.total_bytes:
+        size_part = f" · {_format_size(cache_stats.total_bytes)} used"
+    else:
+        size_part = ""
+
+    cache_line = (
+        f"[dim]Saved run history[/dim]: {runs_text}{size_part}"
+        f" · {cache_stats.cache_dir}"
+    )
+    return cache_line, None
+
+
+def _display_cache_summary(
+    console: Console, slash_mode: bool, cache_line: str | None, cache_note: str | None
+) -> None:
+    """Render the cache summary details."""
+    if cache_line:
+        console.print(cache_line)
+    if cache_note and not slash_mode:
+        console.print(cache_note)
+
+
+def _create_and_test_client(
+    config: dict, console: Console, *, compact: bool = False
+) -> Client:
     """Create client and test connection by fetching resources."""
     # Try to create client
     client = Client(
@@ -182,7 +285,7 @@ def _create_and_test_client(config: dict, console: Console) -> Client:
             None,  # We'll pass ctx later
             "[bold blue]Checking GL AIP status…[/bold blue]",
             console_override=console,
-            spinner_style="cyan",
+            spinner_style=INFO,
         ) as status_indicator:
             update_spinner(status_indicator, "[bold blue]Fetching agents…[/bold blue]")
             agents = client.list_agents()
@@ -195,45 +298,60 @@ def _create_and_test_client(config: dict, console: Console) -> Client:
 
         # Create status table
         table = AIPTable(title="🔗 GL AIP Status")
-        table.add_column("Resource", style="cyan", width=15)
-        table.add_column("Count", style="green", width=10)
-        table.add_column("Status", style="green", width=15)
+        table.add_column("Resource", style=INFO, width=15)
+        table.add_column("Count", style=NEUTRAL, width=10)
+        table.add_column("Status", style=SUCCESS_STYLE, width=15)
 
-        table.add_row("Agents", str(len(agents)), "✅ Available")
-        table.add_row("Tools", str(len(tools)), "✅ Available")
-        table.add_row("MCPs", str(len(mcps)), "✅ Available")
+        table.add_row("Agents", str(len(agents)), AVAILABLE_STATUS)
+        table.add_row("Tools", str(len(tools)), AVAILABLE_STATUS)
+        table.add_row("MCPs", str(len(mcps)), AVAILABLE_STATUS)
 
-        console.print(
-            AIPPanel(
-                f"[bold green]✅ Connected to GL AIP[/bold green]\n"
-                f"🔗 API URL: {client.api_url}\n"
-                f"🤖 Agent Run Timeout: {DEFAULT_AGENT_RUN_TIMEOUT}s",
-                title="🚀 Connection Status",
-                border_style="green",
+        if compact:
+            connection_summary = "GL AIP reachable"
+            console.print(
+                f"[dim]• Base URL[/dim]: {client.api_url} ({connection_summary})"
+            )
+            console.print(f"[dim]• Agent timeout[/dim]: {DEFAULT_AGENT_RUN_TIMEOUT}s")
+            console.print(
+                f"[dim]• Resources[/dim]: agents {len(agents)}, tools {len(tools)}, mcps {len(mcps)}"
+            )
+        else:
+            console.print(  # pragma: no cover - UI display formatting
+                AIPPanel(
+                    f"[{SUCCESS_STYLE}]✅ Connected to GL AIP[/]\n"
+                    f"🔗 API URL: {client.api_url}\n"
+                    f"{ICON_AGENT} Agent Run Timeout: {DEFAULT_AGENT_RUN_TIMEOUT}s",
+                    title="🚀 Connection Status",
+                    border_style=SUCCESS,
+                )
             )
-        )
 
-        console.print(table)
+            console.print(table)  # pragma: no cover - UI display formatting
 
     except Exception as e:
         # Show AIP Ready status even if connection fails
-        console.print(
-            f"\n[bold green]✅ AIP - Ready[/bold green] (SDK v{_SDK_VERSION})"
-        )
-
-        console.print(
-            AIPPanel(
-                f"[bold yellow]⚠️  Connection established but API call failed[/bold yellow]\n"
-                f"🔗 API URL: {client.api_url}\n"
-                f"❌ Error: {e}\n\n"
-                f"💡 This usually means:\n"
-                f"   • Network connectivity issues\n"
-                f"   • API permissions problems\n"
-                f"   • Backend service issues",
-                title="⚠️  Partial Connection",
-                border_style="yellow",
+        if compact:
+            status_text = "API call failed"
+            console.print(f"[dim]• Base URL[/dim]: {client.api_url} ({status_text})")
+            console.print(f"[{ERROR_STYLE}]• Error[/]: {e}")
+            console.print(
+                "[dim]• Tip[/dim]: Check network connectivity or API permissions and try again."
+            )
+            console.print("[dim]• Resources[/dim]: unavailable")
+        else:
+            console.print(
+                AIPPanel(
+                    f"[{WARNING_STYLE}]⚠️  Connection established but API call failed[/]\n"
+                    f"🔗 API URL: {client.api_url}\n"
+                    f"❌ Error: {e}\n\n"
+                    f"💡 This usually means:\n"
+                    f"   • Network connectivity issues\n"
+                    f"   • API permissions problems\n"
+                    f"   • Backend service issues",
+                    title="⚠️  Partial Connection",
+                    border_style=WARNING,
+                )
             )
-        )
 
     return client
 
@@ -242,7 +360,7 @@ def _handle_connection_error(config: dict, console: Console, error: Exception) -
     """Handle connection errors and show troubleshooting information."""
     console.print(
         AIPPanel(
-            f"[bold red]❌ Connection failed[/bold red]\n\n"
+            f"[{ERROR_STYLE}]❌ Connection failed[/]\n\n"
             f"🔍 Error: {error}\n\n"
             f"💡 Troubleshooting steps:\n"
             f"   • Verify your API URL and key are correct\n"
@@ -250,7 +368,7 @@ def _handle_connection_error(config: dict, console: Console, error: Exception) -
             f"   • Run 'aip configure' to update credentials\n"
             f"   • Run 'aip config list' to check configuration",
             title="❌ Connection Error",
-            border_style="red",
+            border_style=ERROR,
         )
     )
     sys.exit(1)
@@ -260,20 +378,14 @@ def _handle_connection_error(config: dict, console: Console, error: Exception) -
 @click.pass_context
 def status(ctx: Any) -> None:
     """Show connection status and basic info."""
-    config = {}
+    config: dict = {}
+    console: Console | None = None
     try:
-        console = Console()
-
-        # Display AIP status banner
-        branding = AIPBranding.create_from_sdk(
-            sdk_version=_SDK_VERSION, package_name="glaip-sdk"
-        )
-        branding.display_welcome_panel(title="🚀 AIP Status")
+        console, slash_mode = _resolve_status_console(ctx)
+        _render_status_heading(console, slash_mode)
 
-        # Show AIP Ready status
-        console.print(
-            f"\n[bold green]✅ AIP - Ready[/bold green] (SDK v{_SDK_VERSION})"
-        )
+        cache_line, cache_note = _collect_cache_summary()
+        _display_cache_summary(console, slash_mode, cache_line, cache_note)
 
         # Load and merge configuration
         config = _load_and_merge_config(ctx)
@@ -281,14 +393,14 @@ def status(ctx: Any) -> None:
         # Validate configuration
         _validate_config_and_show_error(config, console)
 
-        # Create and test client connection
-        client = _create_and_test_client(config, console)
+        # Create and test client connection using unified compact layout
+        client = _create_and_test_client(config, console, compact=True)
         client.close()
 
     except Exception as e:
         # Handle any unexpected errors during the process
-        console = Console()
-        _handle_connection_error(config if "config" in locals() else {}, console, e)
+        fallback_console = console or Console()
+        _handle_connection_error(config or {}, fallback_console, e)
 
 
 @main.command()
@@ -330,7 +442,7 @@ def update(check_only: bool, force: bool) -> None:
                 "[bold blue]🔄 Updating AIP SDK...[/bold blue]\n\n"
                 "📦 This will update the package from PyPI\n"
                 "💡 Use --check-only to just check for updates",
-                title="🚀 Update Process",
+                title="Update Process",
                 border_style="blue",
                 padding=(0, 1),
             )
@@ -352,11 +464,11 @@ def update(check_only: bool, force: bool) -> None:
 
             console.print(
                 AIPPanel(
-                    "[bold green]✅ Update successful![/bold green]\n\n"
+                    f"[{SUCCESS_STYLE}]✅ Update successful![/]\n\n"
                     "🔄 AIP SDK has been updated to the latest version\n"
                     "💡 Restart your terminal or run 'aip --version' to verify",
                     title="🎉 Update Complete",
-                    border_style="green",
+                    border_style=SUCCESS,
                     padding=(0, 1),
                 )
             )
@@ -373,14 +485,14 @@ def update(check_only: bool, force: bool) -> None:
         except subprocess.CalledProcessError as e:
             console.print(
                 AIPPanel(
-                    f"[bold red]❌ Update failed[/bold red]\n\n"
+                    f"[{ERROR_STYLE}]❌ Update failed[/]\n\n"
                     f"🔍 Error: {e.stderr}\n\n"
                     "💡 Troubleshooting:\n"
                     "   • Check your internet connection\n"
                     "   • Try running: pip install --upgrade glaip-sdk\n"
                     "   • Check if you have write permissions",
                     title="❌ Update Error",
-                    border_style="red",
+                    border_style=ERROR,
                     padding=(0, 1),
                 )
             )
@@ -389,11 +501,11 @@ def update(check_only: bool, force: bool) -> None:
     except ImportError:
         console.print(
             AIPPanel(
-                "[bold red]❌ Rich library not available[/bold red]\n\n"
+                f"[{ERROR_STYLE}]❌ Rich library not available[/]\n\n"
                 "💡 Install rich: pip install rich\n"
                 "   Then try: aip update",
                 title="❌ Missing Dependency",
-                border_style="red",
+                border_style=ERROR,
             )
         )
         sys.exit(1)

glaip_sdk/cli/pager.py

@@ -6,6 +6,7 @@ Authors:
 
 from __future__ import annotations
 
+import importlib
 import io
 import os
 import platform
@@ -43,7 +44,7 @@ def _get_console() -> Console:
     """
     global console
     try:
-        from glaip_sdk.cli import utils as cli_utils
+        cli_utils = importlib.import_module("glaip_sdk.cli.utils")
     except Exception:  # pragma: no cover - fallback during import cycles
         cli_utils = None
 

glaip_sdk/cli/parsers/json_input.py

@@ -12,6 +12,25 @@ from pathlib import Path
 from typing import Any
 
 import click
+import yaml
+
+
+def _looks_like_file_path(value: str) -> bool:
+    """Check if string looks like a file reference.
+
+    Args:
+        value: String to check for file-like patterns
+
+    Returns:
+        True if the string appears to be a file path
+    """
+    return (
+        value.lower().endswith((".json", ".yaml", ".yml"))
+        or "/" in value
+        or "\\" in value  # Path separators
+        or value.startswith(("./", "../"))  # Relative paths
+        or value.count(".") > 1  # Likely a filename with extension
+    )
 
 
 def _format_file_error(
@@ -40,16 +59,16 @@ def _format_file_error(
 
 
 def _parse_json_from_file(file_path_str: str) -> Any:
-    """Parse JSON from a file path.
+    """Parse JSON or YAML from a file path.
 
     Args:
-        file_path_str: Path to the JSON file (without @ prefix).
+        file_path_str: Path to the JSON or YAML file (without @ prefix).
 
     Returns:
         Parsed dictionary from file.
 
     Raises:
-        click.ClickException: If file not found, not readable, empty, or invalid JSON.
+        click.ClickException: If file not found, not readable, empty, or invalid format.
     """
     # Resolve relative paths against CWD
     file_path = Path(file_path_str)
@@ -86,18 +105,35 @@ def _parse_json_from_file(file_path_str: str) -> Any:
             _format_file_error("File is empty", file_path_str, file_path)
         )
 
-    # Parse JSON from file content
-    try:
-        return json.loads(content)
-    except json.JSONDecodeError as e:
-        raise click.ClickException(
-            _format_file_error(
-                "Invalid JSON in file",
-                file_path_str,
-                file_path,
-                detail=f"Error: {e.msg} at line {e.lineno}, column {e.colno}",
+    # Determine file format and parse accordingly
+    file_ext = file_path.suffix.lower()
+
+    if file_ext in [".yaml", ".yml"]:
+        # Parse YAML from file content
+        try:
+            return yaml.safe_load(content)
+        except yaml.YAMLError as e:
+            raise click.ClickException(
+                _format_file_error(
+                    "Invalid YAML in file",
+                    file_path_str,
+                    file_path,
+                    detail=f"Error: {e}",
+                )
+            )
+    else:
+        # Default to JSON parsing
+        try:
+            return json.loads(content)
+        except json.JSONDecodeError as e:
+            raise click.ClickException(
+                _format_file_error(
+                    "Invalid JSON in file",
+                    file_path_str,
+                    file_path,
+                    detail=f"Error: {e.msg} at line {e.lineno}, column {e.colno}",
+                )
             )
-        )
 
 
 def parse_json_input(value: str | None) -> Any:
@@ -119,6 +155,9 @@ def parse_json_input(value: str | None) -> Any:
         >>> parse_json_input('@/path/to/config.json')
         # Returns content of config.json parsed as JSON
 
+        >>> parse_json_input('/path/to/config.json')
+        # Fallback: treats as file path if JSON parsing fails
+
         >>> parse_json_input(None)
         None
     """
@@ -134,6 +173,15 @@ def parse_json_input(value: str | None) -> Any:
     try:
         return json.loads(value)
     except json.JSONDecodeError as e:
+        # Check if the value looks like a file path and provide helpful hint
+        if _looks_like_file_path(trimmed):
+            raise click.ClickException(
+                f"Invalid JSON in inline value\n"
+                f"Error: {e.msg} at line {e.lineno}, column {e.colno}\n"
+                f"\n💡 Did you mean to load this from a file? "
+                f"File-based config values should start with @ (e.g., @{trimmed})"
+            )
+
         raise click.ClickException(
             f"Invalid JSON in inline value\n"
             f"Error: {e.msg} at line {e.lineno}, column {e.colno}"

glaip_sdk/cli/resolution.py

@@ -12,6 +12,7 @@ from typing import Any
 
 import click
 
+from glaip_sdk.branding import ACCENT_STYLE
 from glaip_sdk.cli.utils import resolve_resource, spinner_context
 
 
@@ -55,7 +56,9 @@ def resolve_resource_reference(
             if spinner_message is not None
             else f"[bold blue]Fetching {label}…[/bold blue]"
         )
-        with spinner_context(ctx, message, spinner_style="cyan") as status_indicator:
+        with spinner_context(
+            ctx, message, spinner_style=ACCENT_STYLE
+        ) as status_indicator:
             return resolve_resource(
                 ctx,
                 reference,

glaip_sdk/cli/slash/__init__.py

@@ -7,12 +7,11 @@ Authors:
 from glaip_sdk.cli.commands.agents import get as agents_get_command
 from glaip_sdk.cli.commands.agents import run as agents_run_command
 from glaip_sdk.cli.commands.configure import configure_command, load_config
+from glaip_sdk.cli.slash.agent_session import AgentRunSession
+from glaip_sdk.cli.slash.prompt import _HAS_PROMPT_TOOLKIT
+from glaip_sdk.cli.slash.session import SlashSession
 from glaip_sdk.cli.utils import get_client
 
-from .agent_session import AgentRunSession
-from .prompt import _HAS_PROMPT_TOOLKIT
-from .session import SlashSession
-
 __all__ = [
     "AgentRunSession",
     "SlashSession",