glaip-sdk 0.0.7__py3-none-any.whl → 0.6.5b6__py3-none-any.whl

glaip_sdk/cli/commands/models.py

@@ -9,7 +9,12 @@ from typing import Any
 import click
 from rich.console import Console
 
-from glaip_sdk.cli.utils import get_client, output_flags, output_list
+from glaip_sdk.branding import ACCENT_STYLE, INFO, SUCCESS
+from glaip_sdk.cli.context import output_flags
+from glaip_sdk.cli.utils import (
+    output_list,
+    with_client_and_spinner,
+)
 
 console = Console()
 
@@ -26,19 +31,31 @@ def models_group() -> None:
 def list_models(ctx: Any) -> None:
     """List available language models."""
     try:
-        client = get_client(ctx)
-        models = client.list_language_models()
+        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)
         columns = [
             ("id", "ID", "dim", 36),
-            ("provider", "Provider", "cyan", None),
-            ("name", "Model", "green", None),
-            ("base_url", "Base URL", "yellow", None),
+            ("provider", "Provider", ACCENT_STYLE, None),
+            ("name", "Model", SUCCESS, None),
+            ("base_url", "Base URL", INFO, None),
         ]
 
         # Transform function for safe dictionary access
         def transform_model(model: dict[str, Any]) -> dict[str, Any]:
+            """Transform a model dictionary to a display row dictionary.
+
+            Args:
+                model: Model dictionary to transform.
+
+            Returns:
+                Dictionary with id, provider, name, and base_url fields.
+            """
             return {
                 "id": str(model.get("id", "N/A")),
                 "provider": model.get("provider", "N/A"),
@@ -46,9 +63,7 @@ def list_models(ctx: Any) -> None:
                 "base_url": model.get("base_url", "Default") or "Default",
             }
 
-        output_list(
-            ctx, models, "🧠 Available Language Models", columns, transform_model
-        )
+        output_list(ctx, models, "🧠 Available Language Models", columns, transform_model)
 
     except Exception as e:
-        raise click.ClickException(str(e))
+        raise click.ClickException(str(e)) from e

glaip_sdk/cli/commands/tools.py

@@ -10,9 +10,14 @@ from pathlib import Path
 from typing import Any
 
 import click
-from rich.console import Console
-from rich.text import Text
-
+from glaip_sdk.branding import (
+    ACCENT_STYLE,
+    ERROR_STYLE,
+    INFO,
+    SUCCESS_STYLE,
+    WARNING_STYLE,
+)
+from glaip_sdk.cli.context import get_ctx_value, output_flags
 from glaip_sdk.cli.display import (
     display_api_error,
     display_confirmation_prompt,
@@ -22,27 +27,25 @@ from glaip_sdk.cli.display import (
     handle_json_output,
     handle_rich_output,
 )
-from glaip_sdk.cli.io import (
-    export_resource_to_file_with_validation as export_resource_to_file,
-)
-from glaip_sdk.cli.io import (
-    fetch_raw_resource_details,
-)
+from glaip_sdk.cli.io import fetch_raw_resource_details
 from glaip_sdk.cli.io import (
     load_resource_from_file_with_validation as load_resource_from_file,
 )
 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,
-    detect_export_format,
+    format_datetime_fields,
     get_client,
-    get_ctx_value,
-    output_flags,
+    handle_best_effort_check,
+    handle_resource_export,
     output_list,
     output_result,
+    spinner_context,
 )
-from glaip_sdk.utils import format_datetime
+from glaip_sdk.icons import ICON_TOOL
 from glaip_sdk.utils.import_export import merge_import_with_cli_args
+from rich.console import Console
 
 console = Console()
 
@@ -53,17 +56,32 @@ def tools_group() -> None:
     pass
 
 
-def _resolve_tool(
-    ctx: Any, client: Any, ref: str, select: int | None = None
-) -> Any | None:
-    """Resolve tool reference (ID or name) with ambiguity handling."""
+def _resolve_tool(ctx: Any, client: Any, ref: str, select: int | None = None) -> Any | None:
+    """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,
     )
@@ -97,22 +115,20 @@ 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]:
+    """Return a cleaned list of tag strings from a comma-separated input."""
     return [t.strip() for t in (tags.split(",") if tags else []) if t.strip()]
 
 
@@ -174,9 +190,7 @@ def _validate_creation_parameters(
 ) -> None:
     """Validate required parameters for tool creation."""
     if not file and not import_file:
-        raise click.ClickException(
-            "A tool file must be provided. Use --file to specify the tool file to upload."
-        )
+        raise click.ClickException("A tool file must be provided. Use --file to specify the tool file to upload.")
 
 
 @tools_group.command(name="list")
@@ -193,26 +207,39 @@ def list_tools(ctx: Any, tool_type: str | None) -> None:
     """List all tools."""
     try:
         client = get_client(ctx)
-        tools = client.list_tools(tool_type=tool_type)
+        with spinner_context(
+            ctx,
+            "[bold blue]Fetching tools…[/bold blue]",
+            console_override=console,
+        ):
+            tools = client.list_tools(tool_type=tool_type)
 
         # 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
         def transform_tool(tool: Any) -> dict[str, Any]:
+            """Transform a tool object to a display row dictionary.
+
+            Args:
+                tool: Tool object to transform.
+
+            Returns:
+                Dictionary with id, name, and framework fields.
+            """
             row = coerce_to_row(tool, ["id", "name", "framework"])
             # Ensure id is always a string
             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))
+        raise click.ClickException(str(e)) from e
 
 
 @tools_group.command()
@@ -251,8 +278,9 @@ def create(
     tags: tuple[str, ...] | None,
     import_file: str | None,
 ) -> None:
-    """Create a new tool.
+    r"""Create a new tool.
 
+    \b
     Examples:
         aip tools create tool.py  # Create from file
         aip tools create --import tool.json  # Create from exported configuration
@@ -276,7 +304,12 @@ def create(
         _validate_creation_parameters(file, import_file)
 
         # Create tool from file (either direct file or import file)
-        tool = _create_tool_from_file(client, file, name, description, tags)
+        with spinner_context(
+            ctx,
+            "[bold blue]Creating tool…[/bold blue]",
+            console_override=console,
+        ):
+            tool = _create_tool_from_file(client, file, name, description, tags)
 
         # Handle JSON output
         handle_json_output(ctx, tool.model_dump())
@@ -298,7 +331,7 @@ def create(
         handle_json_output(ctx, error=e)
         if get_ctx_value(ctx, "view") != "json":
             display_api_error(e, "tool creation")
-        raise click.ClickException(str(e))
+        raise click.ClickException(str(e)) from e
 
 
 @tools_group.command()
@@ -312,8 +345,9 @@ def create(
 @output_flags()
 @click.pass_context
 def get(ctx: Any, tool_ref: str, select: int | None, export: str | None) -> None:
-    """Get tool details.
+    r"""Get tool details.
 
+    \b
     Examples:
         aip tools get my-tool
         aip tools get my-tool --export tool.json    # Exports complete configuration as JSON
@@ -327,54 +361,38 @@ def get(ctx: Any, tool_ref: str, select: int | None, export: str | None) -> None
 
         # Handle export option
         if export:
-            export_path = Path(export)
-            # Auto-detect format from file extension
-            detected_format = detect_export_format(export_path)
-
-            # Always export comprehensive data - re-fetch tool with full details if needed
-            try:
-                tool = client.get_tool_by_id(tool.id)
-            except Exception as e:
-                console.print(
-                    Text(f"[yellow]⚠️  Could not fetch full tool details: {e}[/yellow]")
-                )
-                console.print(
-                    Text("[yellow]⚠️  Proceeding with available data[/yellow]")
-                )
-
-            export_resource_to_file(tool, export_path, detected_format)
-            console.print(
-                Text(
-                    f"[green]✅ Complete tool configuration exported to: {export_path} (format: {detected_format})[/green]"
-                )
+            handle_resource_export(
+                ctx,
+                tool,
+                Path(export),
+                resource_type="tool",
+                get_by_id_func=client.get_tool_by_id,
+                console_override=console,
             )
 
         # Try to fetch raw API data first to preserve ALL fields
-        raw_tool_data = fetch_raw_resource_details(client, tool, "tools")
+        with spinner_context(
+            ctx,
+            "[bold blue]Fetching detailed tool data…[/bold blue]",
+            console_override=console,
+        ):
+            raw_tool_data = fetch_raw_resource_details(client, tool, "tools")
 
         if raw_tool_data:
             # Use raw API data - this preserves ALL fields
             # Format dates for better display (minimal postprocessing)
-            formatted_data = raw_tool_data.copy()
-            if "created_at" in formatted_data:
-                formatted_data["created_at"] = format_datetime(
-                    formatted_data["created_at"]
-                )
-            if "updated_at" in formatted_data:
-                formatted_data["updated_at"] = format_datetime(
-                    formatted_data["updated_at"]
-                )
+            formatted_data = format_datetime_fields(raw_tool_data)
 
             # Display using output_result with raw data
             output_result(
                 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 = {
@@ -387,11 +405,14 @@ 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:
-        raise click.ClickException(str(e))
+        raise click.ClickException(str(e)) from e
 
 
 @tools_group.command()
@@ -418,9 +439,14 @@ def update(
 
         # Get tool by ID (no ambiguity handling needed)
         try:
-            tool = client.get_tool_by_id(tool_id)
+            with spinner_context(
+                ctx,
+                "[bold blue]Fetching tool…[/bold blue]",
+                console_override=console,
+            ):
+                tool = client.get_tool_by_id(tool_id)
         except Exception as e:
-            raise click.ClickException(f"Tool with ID '{tool_id}' not found: {e}")
+            raise click.ClickException(f"Tool with ID '{tool_id}' not found: {e}") from e
 
         # Prepare update data
         update_data = {}
@@ -433,24 +459,35 @@ def update(
             # Update code via file upload (custom tools only)
             if tool.tool_type != "custom":
                 raise click.ClickException(
-                    f"File updates are only supported for custom tools. Tool '{tool.name}' is of type '{tool.tool_type}'."
+                    "File updates are only supported for custom tools. "
+                    f"Tool '{tool.name}' is of type '{tool.tool_type}'."
                 )
-            updated_tool = client.tools.update_tool_via_file(
-                tool.id, file, framework=tool.framework
-            )
+            with spinner_context(
+                ctx,
+                "[bold blue]Uploading new tool code…[/bold blue]",
+                console_override=console,
+            ):
+                updated_tool = client.tools.update_tool_via_file(tool.id, file, framework=tool.framework)
             handle_rich_output(
-                ctx, Text(f"[green]✓[/green] Tool code updated from {file}")
+                ctx,
+                markup_text(f"[{SUCCESS_STYLE}]✓[/] Tool code updated from {file}"),
             )
         elif update_data:
             # Update metadata only (native tools only)
             if tool.tool_type != "native":
                 raise click.ClickException(
-                    f"Metadata updates are only supported for native tools. Tool '{tool.name}' is of type '{tool.tool_type}'."
+                    "Metadata updates are only supported for native tools. "
+                    f"Tool '{tool.name}' is of type '{tool.tool_type}'."
                 )
-            updated_tool = tool.update(**update_data)
-            handle_rich_output(ctx, Text("[green]✓[/green] Tool metadata updated"))
+            with spinner_context(
+                ctx,
+                "[bold blue]Updating tool metadata…[/bold blue]",
+                console_override=console,
+            ):
+                updated_tool = tool.update(**update_data)
+            handle_rich_output(ctx, markup_text(f"[{SUCCESS_STYLE}]✓[/] Tool metadata updated"))
         else:
-            handle_rich_output(ctx, Text("[yellow]No updates specified[/yellow]"))
+            handle_rich_output(ctx, markup_text(f"[{WARNING_STYLE}]No updates specified[/]"))
             return
 
         handle_json_output(ctx, updated_tool.model_dump())
@@ -460,7 +497,7 @@ def update(
         handle_json_output(ctx, error=e)
         if get_ctx_value(ctx, "view") != "json":
             display_api_error(e, "tool update")
-        raise click.ClickException(str(e))
+        raise click.ClickException(str(e)) from e
 
 
 @tools_group.command()
@@ -475,15 +512,25 @@ def delete(ctx: Any, tool_id: str, yes: bool) -> None:
 
         # Get tool by ID (no ambiguity handling needed)
         try:
-            tool = client.get_tool_by_id(tool_id)
+            with spinner_context(
+                ctx,
+                "[bold blue]Fetching tool…[/bold blue]",
+                console_override=console,
+            ):
+                tool = client.get_tool_by_id(tool_id)
         except Exception as e:
-            raise click.ClickException(f"Tool with ID '{tool_id}' not found: {e}")
+            raise click.ClickException(f"Tool with ID '{tool_id}' not found: {e}") from e
 
         # Confirm deletion via centralized display helper
         if not yes and not display_confirmation_prompt("Tool", tool.name):
             return
 
-        tool.delete()
+        with spinner_context(
+            ctx,
+            "[bold blue]Deleting tool…[/bold blue]",
+            console_override=console,
+        ):
+            tool.delete()
 
         handle_json_output(
             ctx,
@@ -498,7 +545,7 @@ def delete(ctx: Any, tool_id: str, yes: bool) -> None:
         handle_json_output(ctx, error=e)
         if get_ctx_value(ctx, "view") != "json":
             display_api_error(e, "tool deletion")
-        raise click.ClickException(str(e))
+        raise click.ClickException(str(e)) from e
 
 
 @tools_group.command("script")
@@ -509,16 +556,21 @@ def script(ctx: Any, tool_id: str) -> None:
     """Get tool script content."""
     try:
         client = get_client(ctx)
-        script_content = client.get_tool_script(tool_id)
+        with spinner_context(
+            ctx,
+            "[bold blue]Fetching tool script…[/bold blue]",
+            console_override=console,
+        ):
+            script_content = client.get_tool_script(tool_id)
 
         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":
-            console.print(Text(f"[red]Error getting tool script: {e}[/red]"))
-        raise click.ClickException(str(e))
+            print_markup(f"[{ERROR_STYLE}]Error getting tool script: {e}[/]", console=console)
+        raise click.ClickException(str(e)) from e