glaip-sdk 0.2.2__py3-none-any.whl → 0.3.0__py3-none-any.whl

glaip_sdk/cli/commands/agents.py

@@ -64,10 +64,12 @@ from glaip_sdk.cli.utils import (
     build_renderer,
     coerce_to_row,
     get_client,
+    handle_resource_export,
     in_slash_mode,
     output_list,
     output_result,
     spinner_context,
+    with_client_and_spinner,
 )
 from glaip_sdk.cli.validators import (
     validate_agent_instruction_cli as validate_agent_instruction,
@@ -78,7 +80,7 @@ from glaip_sdk.cli.validators import (
 from glaip_sdk.cli.validators import (
     validate_timeout_cli as validate_timeout,
 )
-from glaip_sdk.config.constants import DEFAULT_AGENT_RUN_TIMEOUT, DEFAULT_MODEL
+from glaip_sdk.config.constants import AGENT_CONFIG_FIELDS, DEFAULT_AGENT_RUN_TIMEOUT, DEFAULT_MODEL
 from glaip_sdk.exceptions import AgentTimeoutError
 from glaip_sdk.icons import ICON_AGENT
 from glaip_sdk.utils import format_datetime, is_uuid
@@ -146,10 +148,7 @@ def _build_fallback_agent_mapping(agent: Any) -> dict[str, Any]:
         "description",
         "model",
         "agent_config",
-        "tools",
-        "agents",
-        "mcps",
-        "timeout",
+        *[field for field in AGENT_CONFIG_FIELDS if field not in ("name", "instruction", "model")],
         "tool_configs",
     )
 
@@ -457,7 +456,6 @@ def agents_group() -> None:
     pass
 
 
-# pylint: disable=duplicate-code
 def _resolve_agent(
     ctx: Any,
     client: Any,
@@ -465,26 +463,38 @@ def _resolve_agent(
     select: int | None = None,
     interface_preference: str = "fuzzy",
 ) -> Any | None:
-    """Resolve agent reference (ID or name) with ambiguity handling.
+    """Resolve an agent by ID or name, supporting fuzzy and questionary interfaces.
+
+    This function provides agent-specific resolution with flexible UI options.
+    It wraps resolve_resource_reference with agent-specific configuration, allowing
+    users to choose between fuzzy search and traditional questionary selection.
 
     Args:
-        ctx: Click context object for CLI operations.
-        client: AIP client instance for API operations.
-        ref: Agent reference (ID or name) to resolve.
-        select: Pre-selected agent index for non-interactive mode.
-        interface_preference: "fuzzy" for fuzzy picker, "questionary" for up/down list.
+        ctx: Click context for CLI command execution.
+        client: AIP SDK client instance.
+        ref: Agent identifier (UUID or name string).
+        select: Pre-selected index for non-interactive resolution (1-based).
+        interface_preference: UI preference - "fuzzy" for search or "questionary" for list.
 
     Returns:
-        Resolved agent object or None if not found.
+        Agent object when found, None when resolution fails.
     """
+    # Configure agent-specific resolution parameters
+    resolution_config = {
+        "resource_type": "agent",
+        "get_by_id": client.agents.get_agent_by_id,
+        "find_by_name": client.agents.find_agents,
+        "label": "Agent",
+    }
+    # Use agent-specific resolution with flexible interface preference
     return resolve_resource_reference(
         ctx,
         client,
         ref,
-        "agent",
-        client.agents.get_agent_by_id,
-        client.agents.find_agents,
-        "Agent",
+        resolution_config["resource_type"],
+        resolution_config["get_by_id"],
+        resolution_config["find_by_name"],
+        resolution_config["label"],
         select=select,
         interface_preference=interface_preference,
     )
@@ -514,19 +524,20 @@ def list_agents(
 ) -> None:
     """List agents with optional filtering."""
     try:
-        client = get_client(ctx)
-        with spinner_context(
+        with with_client_and_spinner(
             ctx,
             "[bold blue]Fetching agents…[/bold blue]",
             console_override=console,
-        ):
-            agents = client.agents.list_agents(
-                agent_type=agent_type,
-                framework=framework,
-                name=name,
-                version=version,
-                sync_langflow_agents=sync_langflow,
-            )
+        ) as client:
+            # Query agents with specified filters
+            filter_params = {
+                "agent_type": agent_type,
+                "framework": framework,
+                "name": name,
+                "version": version,
+                "sync_langflow_agents": sync_langflow,
+            }
+            agents = client.agents.list_agents(**filter_params)
 
         # Define table columns: (data_key, header, style, width)
         columns = [
@@ -621,28 +632,30 @@ def get(
         aip agents get my-agent --export agent.yaml    # Exports complete configuration as YAML
     """
     try:
-        client = get_client(ctx)
+        # Initialize API client for agent retrieval
+        api_client = get_client(ctx)
 
-        # Resolve agent with ambiguity handling - use questionary interface for traditional UX
-        agent = _resolve_agent(ctx, client, agent_ref, select, interface_preference="questionary")
+        # Resolve agent reference using questionary interface for better UX
+        agent = _resolve_agent(ctx, api_client, agent_ref, select, interface_preference="questionary")
 
-        # Handle export option
-        if export:
-            from glaip_sdk.cli.utils import handle_resource_export
+        if not agent:
+            raise click.ClickException(f"Agent '{agent_ref}' not found")
 
+        # Handle export option if requested
+        if export:
             handle_resource_export(
                 ctx,
                 agent,
                 Path(export),
                 resource_type="agent",
-                get_by_id_func=client.agents.get_agent_by_id,
+                get_by_id_func=api_client.agents.get_agent_by_id,
                 console_override=console,
             )
 
         # Display full agent details using the standardized helper
         _display_agent_details(
             ctx,
-            client,
+            api_client,
             agent,
             instruction_preview_limit=instruction_preview,
         )
@@ -650,6 +663,8 @@ def get(
         # Show run suggestions via centralized display helper
         handle_rich_output(ctx, display_agent_run_suggestions(agent))
 
+    except click.ClickException:
+        raise
     except Exception as e:
         raise click.ClickException(str(e)) from e
 

glaip_sdk/cli/commands/mcps.py

@@ -43,10 +43,13 @@ from glaip_sdk.cli.resolution import resolve_resource_reference
 from glaip_sdk.cli.rich_helpers import print_markup
 from glaip_sdk.cli.utils import (
     coerce_to_row,
+    fetch_resource_for_export,
+    format_datetime_fields,
     get_client,
     output_list,
     output_result,
     spinner_context,
+    with_client_and_spinner,
 )
 from glaip_sdk.config.constants import (
     DEFAULT_MCP_TYPE,
@@ -298,28 +301,37 @@ def mcps_group() -> None:
     pass
 
 
-def _resolve_mcp(ctx: Any, client: Any, ref: str, select: int | None = None) -> Any | None:  # pylint: disable=duplicate-code
-    """Resolve MCP reference (ID or name) with ambiguity handling.
+def _resolve_mcp(ctx: Any, client: Any, ref: str, select: int | None = None) -> Any | None:
+    """Resolve an MCP server by ID or name, with interactive selection support.
+
+    This function provides MCP-specific resolution logic. It delegates to
+    resolve_resource_reference for MCP-specific resolution, supporting UUID
+    lookups and name-based fuzzy matching.
 
     Args:
-        ctx: Click context object
-        client: API client instance
-        ref: MCP reference (ID or name)
-        select: Index to select when multiple matches found
+        ctx: Click context for command execution.
+        client: API client for backend operations.
+        ref: MCP identifier (UUID or name string).
+        select: Optional selection index when multiple MCPs match (1-based).
 
     Returns:
-        MCP object if found, None otherwise
+        MCP instance if resolution succeeds, None if not found.
 
     Raises:
-        ClickException: If MCP not found or selection invalid
+        click.ClickException: When resolution fails or selection is invalid.
     """
+    # Configure MCP-specific resolution functions
+    mcp_client = client.mcps
+    get_by_id_func = mcp_client.get_mcp_by_id
+    find_by_name_func = mcp_client.find_mcps
+    # Use MCP-specific resolution with standard fuzzy matching
     return resolve_resource_reference(
         ctx,
         client,
         ref,
         "mcp",
-        client.mcps.get_mcp_by_id,
-        client.mcps.find_mcps,
+        get_by_id_func,
+        find_by_name_func,
         "MCP",
         select=select,
     )
@@ -512,12 +524,11 @@ def list_mcps(ctx: Any) -> None:
         ClickException: If API request fails
     """
     try:
-        client = get_client(ctx)
-        with spinner_context(
+        with with_client_and_spinner(
             ctx,
             "[bold blue]Fetching MCPs…[/bold blue]",
             console_override=console,
-        ):
+        ) as client:
             mcps = client.mcps.list_mcps()
 
         # Define table columns: (data_key, header, style, width)
@@ -612,8 +623,10 @@ def create(
             aip mcps create --import mcp-export.json --name new-name --transport sse
     """
     try:
-        client = get_client(ctx)
+        # Get API client instance for MCP operations
+        api_client = get_client(ctx)
 
+        # Process import file if specified, otherwise use None
         import_payload = _load_import_ready_payload(import_file) if import_file is not None else None
 
         merged_payload, missing_fields = _merge_import_payload(
@@ -657,7 +670,7 @@ def create(
             if mcp_metadata is not None:
                 create_kwargs["mcp_metadata"] = mcp_metadata
 
-            mcp = client.mcps.create_mcp(**create_kwargs)
+            mcp = api_client.mcps.create_mcp(**create_kwargs)
 
         # Handle JSON output
         handle_json_output(ctx, mcp.model_dump())
@@ -704,7 +717,6 @@ def _handle_mcp_export(
     detected_format = detect_export_format(export_path)
 
     # Always export comprehensive data - re-fetch with full details
-    from glaip_sdk.cli.utils import fetch_resource_for_export
 
     mcp = fetch_resource_for_export(
         ctx,
@@ -783,8 +795,6 @@ def _display_mcp_details(ctx: Any, client: Any, mcp: Any) -> None:
 
     if raw_mcp_data:
         # Use raw API data - this preserves ALL fields
-        from glaip_sdk.cli.utils import format_datetime_fields
-
         formatted_data = format_datetime_fields(raw_mcp_data)
 
         output_result(

glaip_sdk/cli/commands/models.py

@@ -12,9 +12,8 @@ from rich.console import Console
 from glaip_sdk.branding import ACCENT_STYLE, INFO, SUCCESS
 from glaip_sdk.cli.context import output_flags
 from glaip_sdk.cli.utils import (
-    get_client,
     output_list,
-    spinner_context,
+    with_client_and_spinner,
 )
 
 console = Console()
@@ -32,12 +31,11 @@ def models_group() -> None:
 def list_models(ctx: Any) -> None:
     """List available language models."""
     try:
-        client = get_client(ctx)
-        with spinner_context(
+        with with_client_and_spinner(
             ctx,
             "[bold blue]Fetching language models…[/bold blue]",
             console_override=console,
-        ):
+        ) as client:
             models = client.list_language_models()
 
         # Define table columns: (data_key, header, style, width)

glaip_sdk/cli/commands/tools.py

@@ -4,7 +4,6 @@ Authors:
     Raymond Christopher (raymond.christopher@gdplabs.id)
 """
 
-# pylint: disable=duplicate-code
 import json
 import re
 from pathlib import Path
@@ -40,7 +39,10 @@ from glaip_sdk.cli.resolution import resolve_resource_reference
 from glaip_sdk.cli.rich_helpers import markup_text, print_markup
 from glaip_sdk.cli.utils import (
     coerce_to_row,
+    format_datetime_fields,
     get_client,
+    handle_best_effort_check,
+    handle_resource_export,
     output_list,
     output_result,
     spinner_context,
@@ -57,16 +59,32 @@ def tools_group() -> None:
     pass
 
 
-# pylint: disable=duplicate-code
 def _resolve_tool(ctx: Any, client: Any, ref: str, select: int | None = None) -> Any | None:
-    """Resolve tool reference (ID or name) with ambiguity handling."""
+    """Resolve a tool by ID or name, handling ambiguous matches interactively.
+
+    This function provides tool-specific resolution logic. It uses
+    resolve_resource_reference to find tools by UUID or name, with interactive
+    selection when multiple matches are found.
+
+    Args:
+        ctx: Click context for CLI operations.
+        client: API client instance.
+        ref: Tool reference (UUID string or name).
+        select: Pre-selected index for non-interactive mode (1-based).
+
+    Returns:
+        Tool object if found, None otherwise.
+    """
+    # Configure tool-specific resolution with standard fuzzy matching
+    get_by_id = client.get_tool
+    find_by_name = client.find_tools
     return resolve_resource_reference(
         ctx,
         client,
         ref,
         "tool",
-        client.get_tool,
-        client.find_tools,
+        get_by_id,
+        find_by_name,
         "Tool",
         select=select,
     )
@@ -100,19 +118,16 @@ def _validate_name_match(provided: str | None, internal: str) -> str:
 
 def _check_duplicate_name(client: Any, tool_name: str) -> None:
     """Raise if a tool with the same name already exists."""
-    try:
+
+    def _check_duplicate() -> None:
         existing = client.find_tools(name=tool_name)
         if existing:
             raise click.ClickException(
                 f"A tool named '{tool_name}' already exists. "
                 "Please change your plugin's 'name' to a unique value, then re-run."
             )
-    except click.ClickException:
-        # Re-raise ClickException (intended error)
-        raise
-    except Exception:
-        # Non-fatal: best-effort duplicate check for other errors
-        pass
+
+    handle_best_effort_check(_check_duplicate)
 
 
 def _parse_tags(tags: str | None) -> list[str]:
@@ -349,8 +364,6 @@ def get(ctx: Any, tool_ref: str, select: int | None, export: str | None) -> None
 
         # Handle export option
         if export:
-            from glaip_sdk.cli.utils import handle_resource_export
-
             handle_resource_export(
                 ctx,
                 tool,
@@ -371,8 +384,6 @@ def get(ctx: Any, tool_ref: str, select: int | None, export: str | None) -> None
         if raw_tool_data:
             # Use raw API data - this preserves ALL fields
             # Format dates for better display (minimal postprocessing)
-            from glaip_sdk.cli.utils import format_datetime_fields
-
             formatted_data = format_datetime_fields(raw_tool_data)
 
             # Display using output_result with raw data

glaip_sdk/cli/constants.py

@@ -33,3 +33,6 @@ UPDATE_CHECK_ENABLED = True
 
 # Agent instruction preview defaults
 DEFAULT_AGENT_INSTRUCTION_PREVIEW_LIMIT = 800
+
+# Remote runs defaults
+DEFAULT_REMOTE_RUNS_PAGE_LIMIT = 20

glaip_sdk/cli/main.py

@@ -34,7 +34,7 @@ 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.transcripts import transcripts_group
-from glaip_sdk.cli.commands.update import update_command
+from glaip_sdk.cli.commands.update import _build_upgrade_command, 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
@@ -418,8 +418,6 @@ def update(check_only: bool, force: bool) -> None:
 
         # Update using pip
         try:
-            from glaip_sdk.cli.commands.update import _build_upgrade_command
-
             cmd = list(_build_upgrade_command(include_prerelease=False))
             # Replace package name with "glaip-sdk" (main.py uses different name)
             cmd[-1] = "glaip-sdk"

glaip_sdk/cli/slash/agent_session.py

@@ -16,7 +16,7 @@ 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.constants import DEFAULT_AGENT_INSTRUCTION_PREVIEW_LIMIT
 from glaip_sdk.cli.slash.prompt import _HAS_PROMPT_TOOLKIT, FormattedText
-from glaip_sdk.cli.utils import format_command_hint
+from glaip_sdk.cli.utils import bind_slash_session_context, format_command_hint
 
 if TYPE_CHECKING:  # pragma: no cover - type checking only
     from glaip_sdk.cli.slash.session import SlashSession
@@ -41,6 +41,7 @@ class AgentRunSession:
         self._contextual_completion_help: dict[str, str] = {
             "details": "Show this agent's configuration (+ expands prompt).",
             "help": "Display this context-aware menu.",
+            "runs": "✨ NEW · Browse remote run history for this agent.",
             "exit": "Return to the command palette.",
             "q": "Return to the command palette.",
         }
@@ -252,19 +253,8 @@ class AgentRunSession:
     @contextmanager
     def _bind_session_context(self) -> Any:
         """Temporarily attach this slash session to the Click context."""
-        ctx_obj = getattr(self.session.ctx, "obj", None)
-        has_context = isinstance(ctx_obj, dict)
-        previous_session = ctx_obj.get("_slash_session") if has_context else None
-        if has_context:
-            ctx_obj["_slash_session"] = self.session
-        try:
+        with bind_slash_session_context(self.session.ctx, self.session):
             yield
-        finally:
-            if has_context:
-                if previous_session is None:
-                    ctx_obj.pop("_slash_session", None)
-                else:
-                    ctx_obj["_slash_session"] = previous_session
 
     def _run_agent(self, agent_id: str, message: str) -> None:
         """Execute the agents run command for the active agent."""

glaip_sdk/cli/slash/prompt.py

@@ -177,8 +177,11 @@ def _iter_command_completions(
         return []
 
     commands = sorted(session._unique_commands.values(), key=lambda c: c.name)
+    agent_context = bool(getattr(session, "_current_agent", None))
 
     for cmd in commands:
+        if getattr(cmd, "agent_only", False) and not agent_context:
+            continue
         yield from _generate_command_completions(cmd, prefix, text, seen)