glaip-sdk 0.0.5b1__py3-none-any.whl → 0.0.6a0__py3-none-any.whl

glaip_sdk/cli/commands/configure.py

@@ -7,6 +7,7 @@ Authors:
 import getpass
 import os
 from pathlib import Path
+from typing import Any
 
 import click
 import yaml
@@ -24,7 +25,7 @@ CONFIG_DIR = Path.home() / ".aip"
 CONFIG_FILE = CONFIG_DIR / "config.yaml"
 
 
-def load_config():
+def load_config() -> dict[str, Any]:
     """Load configuration from file."""
     if not CONFIG_FILE.exists():
         return {}
@@ -36,7 +37,7 @@ def load_config():
         return {}
 
 
-def save_config(config):
+def save_config(config: dict[str, Any]) -> None:
     """Save configuration to file."""
     CONFIG_DIR.mkdir(exist_ok=True)
 
@@ -51,13 +52,13 @@ def save_config(config):
 
 
 @click.group()
-def config_group():
+def config_group() -> None:
     """Configuration management operations."""
     pass
 
 
 @config_group.command("list")
-def list_config():
+def list_config() -> None:
     """List current configuration."""
 
     config = load_config()
@@ -87,7 +88,7 @@ def list_config():
 @config_group.command("set")
 @click.argument("key")
 @click.argument("value")
-def set_config(key, value):
+def set_config(key: str, value: str) -> None:
     """Set a configuration value."""
 
     valid_keys = ["api_url", "api_key"]
@@ -111,7 +112,7 @@ def set_config(key, value):
 
 @config_group.command("get")
 @click.argument("key")
-def get_config(key):
+def get_config(key: str) -> None:
     """Get a configuration value."""
 
     config = load_config()
@@ -132,7 +133,7 @@ def get_config(key):
 
 @config_group.command("unset")
 @click.argument("key")
-def unset_config(key):
+def unset_config(key: str) -> None:
     """Remove a configuration value."""
 
     config = load_config()
@@ -149,7 +150,7 @@ def unset_config(key):
 
 @config_group.command("reset")
 @click.option("--force", is_flag=True, help="Skip confirmation prompt")
-def reset_config(force):
+def reset_config(force: bool) -> None:
     """Reset all configuration to defaults."""
 
     if not force:
@@ -168,7 +169,7 @@ def reset_config(force):
         console.print("[yellow]No configuration found to reset.[/yellow]")
 
 
-def _configure_interactive():
+def _configure_interactive() -> None:
     """Shared configuration logic for both configure commands."""
     # Display AIP welcome banner
     branding = AIPBranding.create_from_sdk(
@@ -239,14 +240,14 @@ def _configure_interactive():
 
 
 @config_group.command()
-def configure():
+def configure() -> None:
     """Configure AIP CLI credentials and settings interactively."""
     _configure_interactive()
 
 
 # Alias command for backward compatibility
 @click.command()
-def configure_command():
+def configure_command() -> None:
     """Configure AIP CLI credentials and settings interactively.
 
     This is an alias for 'aip config configure' for backward compatibility.

glaip_sdk/cli/commands/mcps.py

@@ -6,6 +6,7 @@ Authors:
 
 import json
 from pathlib import Path
+from typing import Any
 
 import click
 from rich.console import Console
@@ -30,6 +31,7 @@ from glaip_sdk.cli.resolution import resolve_resource_reference
 from glaip_sdk.cli.utils import (
     coerce_to_row,
     get_client,
+    get_ctx_value,
     output_flags,
     output_list,
     output_result,
@@ -41,12 +43,14 @@ console = Console()
 
 
 @click.group(name="mcps", no_args_is_help=True)
-def mcps_group():
+def mcps_group() -> None:
     """MCP management operations."""
     pass
 
 
-def _resolve_mcp(ctx, client, ref, select=None):
+def _resolve_mcp(
+    ctx: Any, client: Any, ref: str, select: int | None = None
+) -> Any | None:
     """Resolve MCP reference (ID or name) with ambiguity handling."""
     return resolve_resource_reference(
         ctx,
@@ -63,7 +67,7 @@ def _resolve_mcp(ctx, client, ref, select=None):
 @mcps_group.command(name="list")
 @output_flags()
 @click.pass_context
-def list_mcps(ctx):
+def list_mcps(ctx: Any) -> None:
     """List all MCPs."""
     try:
         client = get_client(ctx)
@@ -77,7 +81,7 @@ def list_mcps(ctx):
         ]
 
         # Transform function for safe dictionary access
-        def transform_mcp(mcp):
+        def transform_mcp(mcp: Any) -> dict[str, Any]:
             row = coerce_to_row(mcp, ["id", "name", "config"])
             # Ensure id is always a string
             row["id"] = str(row["id"])
@@ -103,7 +107,9 @@ def list_mcps(ctx):
 @click.option("--config", help="JSON configuration string")
 @output_flags()
 @click.pass_context
-def create(ctx, name, transport, description, config):
+def create(
+    ctx: Any, name: str, transport: str, description: str | None, config: str | None
+) -> None:
     """Create a new MCP."""
     try:
         client = get_client(ctx)
@@ -140,7 +146,7 @@ def create(ctx, name, transport, description, config):
 
     except Exception as e:
         handle_json_output(ctx, error=e)
-        if ctx.obj.get("view") != "json":
+        if get_ctx_value(ctx, "view") != "json":
             display_api_error(e, "MCP creation")
         raise click.ClickException(str(e))
 
@@ -154,7 +160,7 @@ def create(ctx, name, transport, description, config):
 )
 @output_flags()
 @click.pass_context
-def get(ctx, mcp_ref, export):
+def get(ctx: Any, mcp_ref: str, export: str | None) -> None:
     """Get MCP details.
 
     Examples:
@@ -244,7 +250,7 @@ def get(ctx, mcp_ref, export):
 @click.argument("mcp_ref")
 @output_flags()
 @click.pass_context
-def list_tools(ctx, mcp_ref):
+def list_tools(ctx: Any, mcp_ref: str) -> None:
     """List tools from MCP."""
     try:
         client = get_client(ctx)
@@ -263,7 +269,7 @@ def list_tools(ctx, mcp_ref):
         ]
 
         # Transform function for safe dictionary access
-        def transform_tool(tool):
+        def transform_tool(tool: dict[str, Any]) -> dict[str, Any]:
             return {
                 "name": tool.get("name", "N/A"),
                 "description": tool.get("description", "N/A")[:47] + "..."
@@ -289,7 +295,7 @@ def list_tools(ctx, mcp_ref):
 )
 @output_flags()
 @click.pass_context
-def connect(ctx, config_file):
+def connect(ctx: Any, config_file: str) -> None:
     """Connect to MCP using config file."""
     try:
         client = get_client(ctx)
@@ -298,7 +304,7 @@ def connect(ctx, config_file):
         with open(config_file) as f:
             config = json.load(f)
 
-        view = (ctx.obj or {}).get("view", "rich")
+        view = get_ctx_value(ctx, "view", "rich")
         if view != "json":
             console.print(
                 Text(
@@ -309,7 +315,7 @@ def connect(ctx, config_file):
         # Test connection using config
         result = client.mcps.test_mcp_connection_from_config(config)
 
-        view = (ctx.obj or {}).get("view", "rich")
+        view = get_ctx_value(ctx, "view", "rich")
         if view == "json":
             handle_json_output(ctx, result)
         else:
@@ -332,7 +338,13 @@ def connect(ctx, config_file):
 @click.option("--config", help="JSON configuration string")
 @output_flags()
 @click.pass_context
-def update(ctx, mcp_ref, name, description, config):
+def update(
+    ctx: Any,
+    mcp_ref: str,
+    name: str | None,
+    description: str | None,
+    config: str | None,
+) -> None:
     """Update an existing MCP."""
     try:
         client = get_client(ctx)
@@ -363,7 +375,7 @@ def update(ctx, mcp_ref, name, description, config):
 
     except Exception as e:
         handle_json_output(ctx, error=e)
-        if (ctx.obj or {}).get("view") != "json":
+        if get_ctx_value(ctx, "view") != "json":
             display_api_error(e, "MCP update")
         raise click.ClickException(str(e))
 
@@ -373,7 +385,7 @@ def update(ctx, mcp_ref, name, description, config):
 @click.option("-y", "--yes", is_flag=True, help="Skip confirmation")
 @output_flags()
 @click.pass_context
-def delete(ctx, mcp_ref, yes):
+def delete(ctx: Any, mcp_ref: str, yes: bool) -> None:
     """Delete an MCP."""
     try:
         client = get_client(ctx)
@@ -398,6 +410,6 @@ def delete(ctx, mcp_ref, yes):
 
     except Exception as e:
         handle_json_output(ctx, error=e)
-        if (ctx.obj or {}).get("view") != "json":
+        if get_ctx_value(ctx, "view") != "json":
             display_api_error(e, "MCP deletion")
         raise click.ClickException(str(e))

glaip_sdk/cli/commands/models.py

@@ -4,6 +4,8 @@ Authors:
     Raymond Christopher (raymond.christopher@gdplabs.id)
 """
 
+from typing import Any
+
 import click
 from rich.console import Console
 
@@ -13,7 +15,7 @@ console = Console()
 
 
 @click.group(name="models", no_args_is_help=True)
-def models_group():
+def models_group() -> None:
     """Language model operations."""
     pass
 
@@ -21,7 +23,7 @@ def models_group():
 @models_group.command(name="list")
 @output_flags()
 @click.pass_context
-def list_models(ctx):
+def list_models(ctx: Any) -> None:
     """List available language models."""
     try:
         client = get_client(ctx)
@@ -36,7 +38,7 @@ def list_models(ctx):
         ]
 
         # Transform function for safe dictionary access
-        def transform_model(model):
+        def transform_model(model: dict[str, Any]) -> dict[str, Any]:
             return {
                 "id": str(model.get("id", "N/A")),
                 "provider": model.get("provider", "N/A"),

glaip_sdk/cli/commands/tools.py

@@ -7,6 +7,7 @@ Authors:
 import json
 import re
 from pathlib import Path
+from typing import Any
 
 import click
 from rich.console import Console
@@ -34,6 +35,7 @@ from glaip_sdk.cli.resolution import resolve_resource_reference
 from glaip_sdk.cli.utils import (
     coerce_to_row,
     get_client,
+    get_ctx_value,
     output_flags,
     output_list,
     output_result,
@@ -45,12 +47,14 @@ console = Console()
 
 
 @click.group(name="tools", no_args_is_help=True)
-def tools_group():
+def tools_group() -> None:
     """Tool management operations."""
     pass
 
 
-def _resolve_tool(ctx, client, ref, select=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."""
     return resolve_resource_reference(
         ctx,
@@ -90,7 +94,7 @@ def _validate_name_match(provided: str | None, internal: str) -> str:
     return provided or internal
 
 
-def _check_duplicate_name(client, tool_name: str) -> None:
+def _check_duplicate_name(client: Any, tool_name: str) -> None:
     """Raise if a tool with the same name already exists."""
     try:
         existing = client.find_tools(name=tool_name)
@@ -111,6 +115,69 @@ def _parse_tags(tags: str | None) -> list[str]:
     return [t.strip() for t in (tags.split(",") if tags else []) if t.strip()]
 
 
+def _handle_import_file(
+    import_file: str | None,
+    name: str | None,
+    description: str | None,
+    tags: tuple[str, ...] | None,
+) -> dict[str, Any]:
+    """Handle import file logic and merge with CLI arguments."""
+    if import_file:
+        import_data = load_resource_from_file(Path(import_file), "tool")
+
+        # Merge CLI args with imported data
+        cli_args = {
+            "name": name,
+            "description": description,
+            "tags": tags,
+        }
+
+        return merge_import_with_cli_args(import_data, cli_args)
+    else:
+        # No import file - use CLI args directly
+        return {
+            "name": name,
+            "description": description,
+            "tags": tags,
+        }
+
+
+def _create_tool_from_file(
+    client: Any,
+    file_path: str,
+    name: str | None,
+    description: str | None,
+    tags: str | None,
+) -> Any:
+    """Create tool from file upload."""
+    with open(file_path, encoding="utf-8") as f:
+        code_content = f.read()
+
+    internal_name = _extract_internal_name(code_content)
+    tool_name = _validate_name_match(name, internal_name)
+    _check_duplicate_name(client, tool_name)
+
+    # Upload the plugin code as-is (no rewrite)
+    return client.create_tool_from_code(
+        name=tool_name,
+        code=code_content,
+        framework="langchain",  # Always langchain
+        description=description,
+        tags=_parse_tags(tags) if tags else None,
+    )
+
+
+def _validate_creation_parameters(
+    file: str | None,
+    import_file: str | None,
+) -> 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."
+        )
+
+
 @tools_group.command(name="list")
 @output_flags()
 @click.option(
@@ -121,7 +188,7 @@ def _parse_tags(tags: str | None) -> list[str]:
     required=False,
 )
 @click.pass_context
-def list_tools(ctx, tool_type):
+def list_tools(ctx: Any, tool_type: str | None) -> None:
     """List all tools."""
     try:
         client = get_client(ctx)
@@ -135,7 +202,7 @@ def list_tools(ctx, tool_type):
         ]
 
         # Transform function for safe dictionary access
-        def transform_tool(tool):
+        def transform_tool(tool: Any) -> dict[str, Any]:
             row = coerce_to_row(tool, ["id", "name", "framework"])
             # Ensure id is always a string
             row["id"] = str(row["id"])
@@ -152,15 +219,15 @@ def list_tools(ctx, tool_type):
 @click.option(
     "--file",
     type=click.Path(exists=True),
-    help="Tool file to upload (optional for metadata-only tools)",
+    help="Tool file to upload",
 )
 @click.option(
     "--name",
-    help="Tool name (required for metadata-only tools, extracted from script if file provided)",
+    help="Tool name (extracted from script if file provided)",
 )
 @click.option(
     "--description",
-    help="Tool description (optional - extracted from script if file provided)",
+    help="Tool description (extracted from script if file provided)",
 )
 @click.option(
     "--tags",
@@ -174,113 +241,47 @@ def list_tools(ctx, tool_type):
 )
 @output_flags()
 @click.pass_context
-def create(ctx, file_arg, file, name, description, tags, import_file):
+def create(
+    ctx: Any,
+    file_arg: str | None,
+    file: str | None,
+    name: str | None,
+    description: str | None,
+    tags: tuple[str, ...] | None,
+    import_file: str | None,
+) -> None:
     """Create a new tool.
 
     Examples:
-        aip tools create --name "My Tool" --description "A helpful tool"
         aip tools create tool.py  # Create from file
         aip tools create --import tool.json  # Create from exported configuration
     """
     try:
         client = get_client(ctx)
 
-        # Initialize merged_data for cases without import_file
-        merged_data = {}
-
-        # Handle import from file
-        if import_file:
-            import_data = load_resource_from_file(Path(import_file), "tool")
-
-            # Merge CLI args with imported data
-            cli_args = {
-                "name": name,
-                "description": description,
-                "tags": tags,
-            }
+        # Allow positional file argument for better DX (matches examples)
+        if not file and file_arg:
+            file = file_arg
 
-            merged_data = merge_import_with_cli_args(import_data, cli_args)
-        else:
-            # No import file - use CLI args directly
-            merged_data = {
-                "name": name,
-                "description": description,
-                "tags": tags,
-            }
+        # Handle import file and merge with CLI arguments
+        merged_data = _handle_import_file(import_file, name, description, tags)
 
         # Extract merged values
         name = merged_data.get("name")
         description = merged_data.get("description")
         tags = merged_data.get("tags")
 
-        # Allow positional file argument for better DX (matches examples)
-        if not file and file_arg:
-            file = file_arg
-
-        # Validate required parameters based on creation method
-        if not file and not import_file:
-            # Metadata-only tool creation
-            if not name:
-                raise click.ClickException(
-                    "--name is required when creating metadata-only tools"
-                )
+        # Validate required parameters
+        _validate_creation_parameters(file, import_file)
 
-        # Create tool based on whether file is provided
-        if file:
-            # File-based tool creation — validate internal plugin name, no rewriting
-            with open(file, encoding="utf-8") as f:
-                code_content = f.read()
-
-            internal_name = _extract_internal_name(code_content)
-            tool_name = _validate_name_match(name, internal_name)
-            _check_duplicate_name(client, tool_name)
-
-            # Upload the plugin code as-is (no rewrite)
-            tool = client.create_tool_from_code(
-                name=tool_name,
-                code=code_content,
-                framework="langchain",  # Always langchain
-                description=description,
-                tags=_parse_tags(tags) if tags else None,
-            )
-        else:
-            # Metadata-only tool creation or import from file
-            tool_kwargs = {}
-            if name:
-                tool_kwargs["name"] = name
-            tool_kwargs["tool_type"] = "custom"  # Always custom
-            tool_kwargs["framework"] = "langchain"  # Always langchain
-            if description:
-                tool_kwargs["description"] = description
-            if tags:
-                tool_kwargs["tags"] = _parse_tags(tags)
-
-            # If importing from file, include all other detected attributes
-            if import_file:
-                # Add all other attributes from import data (excluding already handled ones)
-                excluded_fields = {
-                    "name",
-                    "description",
-                    "tags",
-                    # System-only fields that shouldn't be passed to create_tool
-                    "id",
-                    "created_at",
-                    "updated_at",
-                    "tool_type",
-                    "framework",
-                    "version",
-                }
-                for key, value in merged_data.items():
-                    if key not in excluded_fields and value is not None:
-                        tool_kwargs[key] = value
-
-            tool = client.create_tool(**tool_kwargs)
+        # Create tool from file (either direct file or import file)
+        tool = _create_tool_from_file(client, file, name, description, tags)
 
         # Handle JSON output
         handle_json_output(ctx, tool.model_dump())
 
         # Handle Rich output
-        creation_method = "file upload (custom)" if file else "metadata only (native)"
+        creation_method = "file upload (custom)"
         rich_panel = display_creation_success(
             "Tool",
             tool.name,
@@ -294,7 +295,7 @@ def create(ctx, file_arg, file, name, description, tags, import_file):
 
     except Exception as e:
         handle_json_output(ctx, error=e)
-        if ctx.obj.get("view") != "json":
+        if get_ctx_value(ctx, "view") != "json":
             display_api_error(e, "tool creation")
         raise click.ClickException(str(e))
 
@@ -309,7 +310,7 @@ def create(ctx, file_arg, file, name, description, tags, import_file):
 )
 @output_flags()
 @click.pass_context
-def get(ctx, tool_ref, select, export):
+def get(ctx: Any, tool_ref: str, select: int | None, export: str | None) -> None:
     """Get tool details.
 
     Examples:
@@ -406,7 +407,13 @@ def get(ctx, tool_ref, select, export):
 @click.option("--tags", help="Comma-separated tags")
 @output_flags()
 @click.pass_context
-def update(ctx, tool_id, file, description, tags):
+def update(
+    ctx: Any,
+    tool_id: str,
+    file: str | None,
+    description: str | None,
+    tags: tuple[str, ...] | None,
+) -> None:
     """Update a tool (code or metadata)."""
     try:
         client = get_client(ctx)
@@ -453,7 +460,7 @@ def update(ctx, tool_id, file, description, tags):
 
     except Exception as e:
         handle_json_output(ctx, error=e)
-        if ctx.obj.get("view") != "json":
+        if get_ctx_value(ctx, "view") != "json":
             display_api_error(e, "tool update")
         raise click.ClickException(str(e))
 
@@ -463,7 +470,7 @@ def update(ctx, tool_id, file, description, tags):
 @click.option("-y", "--yes", is_flag=True, help="Skip confirmation")
 @output_flags()
 @click.pass_context
-def delete(ctx, tool_id, yes):
+def delete(ctx: Any, tool_id: str, yes: bool) -> None:
     """Delete a tool."""
     try:
         client = get_client(ctx)
@@ -491,7 +498,7 @@ def delete(ctx, tool_id, yes):
 
     except Exception as e:
         handle_json_output(ctx, error=e)
-        if ctx.obj.get("view") != "json":
+        if get_ctx_value(ctx, "view") != "json":
             display_api_error(e, "tool deletion")
         raise click.ClickException(str(e))
 
@@ -500,13 +507,13 @@ def delete(ctx, tool_id, yes):
 @click.argument("tool_id")
 @output_flags()
 @click.pass_context
-def script(ctx, tool_id):
+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)
 
-        if ctx.obj.get("view") == "json":
+        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]")
@@ -514,6 +521,6 @@ def script(ctx, tool_id):
 
     except Exception as e:
         handle_json_output(ctx, error=e)
-        if ctx.obj.get("view") != "json":
+        if get_ctx_value(ctx, "view") != "json":
             console.print(Text(f"[red]Error getting tool script: {e}[/red]"))
         raise click.ClickException(str(e))