glaip-sdk 0.1.3__py3-none-any.whl → 0.6.10__py3-none-any.whl

glaip_sdk/cli/commands/tools.py

@@ -10,8 +10,6 @@ from pathlib import Path
 from typing import Any
 
 import click
-from rich.console import Console
-
 from glaip_sdk.branding import (
     ACCENT_STYLE,
     ERROR_STYLE,
@@ -19,7 +17,7 @@ from glaip_sdk.branding import (
     SUCCESS_STYLE,
     WARNING_STYLE,
 )
-from glaip_sdk.cli.context import detect_export_format, get_ctx_value, output_flags
+from glaip_sdk.cli.context import get_ctx_value, output_flags
 from glaip_sdk.cli.display import (
     display_api_error,
     display_confirmation_prompt,
@@ -29,12 +27,7 @@ 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,
 )
@@ -42,14 +35,17 @@ 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,
 )
 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
+from rich.console import Console
 
 console = Console()
 
@@ -61,14 +57,31 @@ def tools_group() -> None:
 
 
 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,
     )
@@ -102,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()]
 
 
@@ -212,6 +223,14 @@ def list_tools(ctx: Any, tool_type: str | None) -> 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"])
@@ -259,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
@@ -325,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
@@ -340,38 +361,13 @@ 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:
-                with spinner_context(
-                    ctx,
-                    "[bold blue]Fetching complete tool details…[/bold blue]",
-                    console_override=console,
-                ):
-                    tool = client.get_tool_by_id(tool.id)
-            except Exception as e:
-                print_markup(
-                    f"[{WARNING_STYLE}]⚠️  Could not fetch full tool details: {e}[/]",
-                    console=console,
-                )
-                print_markup(
-                    f"[{WARNING_STYLE}]⚠️  Proceeding with available data[/]",
-                    console=console,
-                )
-
-            with spinner_context(
+            handle_resource_export(
                 ctx,
-                "[bold blue]Exporting tool configuration…[/bold blue]",
+                tool,
+                Path(export),
+                resource_type="tool",
+                get_by_id_func=client.get_tool_by_id,
                 console_override=console,
-            ):
-                export_resource_to_file(tool, export_path, detected_format)
-            print_markup(
-                f"[{SUCCESS_STYLE}]✅ Complete tool configuration exported to: {export_path} "
-                f"(format: {detected_format})[/]",
-                console=console,
             )
 
         # Try to fetch raw API data first to preserve ALL fields
@@ -385,11 +381,7 @@ 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)
-            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(