glaip-sdk 0.6.15b2__py3-none-any.whl → 0.6.16__py3-none-any.whl

glaip_sdk/client/shared.py

@@ -0,0 +1,21 @@
+"""Shared helpers for client configuration wiring.
+
+Authors:
+    Raymond Christopher (raymond.christopher@gdplabs.id)
+"""
+
+from __future__ import annotations
+
+from typing import Any
+
+from glaip_sdk.client.base import BaseClient
+
+
+def build_shared_config(client: BaseClient) -> dict[str, Any]:
+    """Return the keyword arguments used to initialize sub-clients."""
+    return {
+        "parent_client": client,
+        "api_url": client.api_url,
+        "api_key": client.api_key,
+        "timeout": client._timeout,
+    }

glaip_sdk/client/tools.py

@@ -0,0 +1,661 @@
+#!/usr/bin/env python3
+"""Tool client for AIP SDK.
+
+Authors:
+    Raymond Christopher (raymond.christopher@gdplabs.id)
+    Christian Trisno Sen Long Chen (christian.t.s.l.chen@gdplabs.id)
+"""
+
+import logging
+import os
+import tempfile
+from typing import Any
+
+from glaip_sdk.client.base import BaseClient
+from glaip_sdk.config.constants import (
+    DEFAULT_TOOL_FRAMEWORK,
+    DEFAULT_TOOL_TYPE,
+    DEFAULT_TOOL_VERSION,
+)
+from glaip_sdk.models import ToolResponse
+from glaip_sdk.tools import Tool
+from glaip_sdk.utils.client_utils import (
+    add_kwargs_to_payload,
+    create_model_instances,
+    find_by_name,
+)
+from glaip_sdk.utils.resource_refs import is_uuid
+
+# API endpoints
+TOOLS_ENDPOINT = "/tools/"
+TOOLS_UPLOAD_ENDPOINT = "/tools/upload"
+TOOLS_UPLOAD_BY_ID_ENDPOINT_FMT = "/tools/{tool_id}/upload"
+
+# Set up module-level logger
+logger = logging.getLogger("glaip_sdk.tools")
+
+
+class ToolClient(BaseClient):
+    """Client for tool operations."""
+
+    def __init__(self, *, parent_client: BaseClient | None = None, **kwargs):
+        """Initialize the tool client.
+
+        Args:
+            parent_client: Parent client to adopt session/config from
+            **kwargs: Additional arguments for standalone initialization
+        """
+        super().__init__(parent_client=parent_client, **kwargs)
+
+    def list_tools(self, tool_type: str | None = None) -> list[Tool]:
+        """List all tools, optionally filtered by type.
+
+        Args:
+            tool_type: Filter tools by type (e.g., "custom", "native")
+        """
+        endpoint = TOOLS_ENDPOINT
+        if tool_type:
+            endpoint += f"?type={tool_type}"
+        data = self._request("GET", endpoint)
+        return create_model_instances(data, Tool, self)
+
+    def get_tool_by_id(self, tool_id: str) -> Tool:
+        """Get tool by ID."""
+        data = self._request("GET", f"{TOOLS_ENDPOINT}{tool_id}")
+        response = ToolResponse(**data)
+        return Tool.from_response(response, client=self)
+
+    def find_tools(self, name: str | None = None) -> list[Tool]:
+        """Find tools by name."""
+        data = self._request("GET", TOOLS_ENDPOINT)
+        tools = create_model_instances(data, Tool, self)
+        return find_by_name(tools, name, case_sensitive=False)
+
+    def _validate_and_read_file(self, file_path: str) -> str:
+        """Validate file exists and read its content.
+
+        Args:
+            file_path: Path to the file to read
+
+        Returns:
+            str: File content
+
+        Raises:
+            FileNotFoundError: If file doesn't exist
+        """
+        if not os.path.exists(file_path):
+            raise FileNotFoundError(f"Tool file not found: {file_path}")
+
+        with open(file_path, encoding="utf-8") as f:
+            return f.read()
+
+    def _extract_name_from_file(self, file_path: str) -> str:
+        """Extract tool name from file path.
+
+        Args:
+            file_path: Path to the file
+
+        Returns:
+            str: Extracted name (filename without extension)
+        """
+        return os.path.splitext(os.path.basename(file_path))[0]
+
+    def _prepare_upload_data(self, name: str, framework: str, description: str | None = None, **kwargs) -> dict:
+        """Prepare upload data dictionary.
+
+        Args:
+            name: Tool name
+            framework: Tool framework
+            description: Optional description
+            **kwargs: Additional parameters
+
+        Returns:
+            dict: Upload data dictionary
+        """
+        data = {
+            "name": name,
+            "framework": framework,
+            "type": kwargs.pop("tool_type", DEFAULT_TOOL_TYPE),  # Default to custom
+        }
+
+        if description:
+            data["description"] = description
+
+        # Handle tags if provided in kwargs
+        if kwargs.get("tags"):
+            if isinstance(kwargs["tags"], list):
+                data["tags"] = ",".join(kwargs["tags"])
+            else:
+                data["tags"] = kwargs["tags"]
+
+        # Include any other kwargs in the upload data
+        for key, value in kwargs.items():
+            if key not in ["tags"]:  # tags already handled above
+                data[key] = value
+
+        return data
+
+    def _upload_tool_file(self, file_path: str, upload_data: dict) -> Tool:
+        """Upload tool file to server.
+
+        Args:
+            file_path: Path to temporary file to upload
+            upload_data: Dictionary with upload metadata
+
+        Returns:
+            Tool: Created tool object
+        """
+        with open(file_path, "rb") as fb:
+            files = {
+                "file": (os.path.basename(file_path), fb, "application/octet-stream"),
+            }
+
+            response = self._request(
+                "POST",
+                TOOLS_UPLOAD_ENDPOINT,
+                files=files,
+                data=upload_data,
+            )
+
+        tool_response = ToolResponse(**response)
+        return Tool.from_response(tool_response, client=self)
+
+    def _build_create_payload(
+        self,
+        name: str,
+        description: str | None = None,
+        framework: str = DEFAULT_TOOL_FRAMEWORK,
+        tool_type: str = DEFAULT_TOOL_TYPE,
+        **kwargs,
+    ) -> dict[str, Any]:
+        """Build payload for tool creation with proper metadata handling.
+
+        CENTRALIZED PAYLOAD BUILDING LOGIC:
+        - Handles file vs metadata-only tool creation
+        - Sets proper defaults and required fields
+        - Processes tags and other metadata consistently
+
+        Args:
+            name: Tool name
+            description: Tool description
+            framework: Tool framework (defaults to langchain)
+            tool_type: Tool type (defaults to custom)
+            **kwargs: Additional parameters (tags, version, etc.)
+
+        Returns:
+            Complete payload dictionary for tool creation
+        """
+        # Prepare the creation payload with required fields
+        payload: dict[str, any] = {
+            "name": name.strip(),
+            "type": tool_type,
+            "framework": framework,
+            "version": kwargs.get("version", DEFAULT_TOOL_VERSION),
+        }
+
+        # Add description if provided
+        if description:
+            payload["description"] = description.strip()
+
+        # Handle tags - convert list to comma-separated string for API
+        if kwargs.get("tags"):
+            if isinstance(kwargs["tags"], list):
+                payload["tags"] = ",".join(str(tag).strip() for tag in kwargs["tags"])
+            else:
+                payload["tags"] = str(kwargs["tags"])
+
+        # Add any other kwargs (excluding already handled ones)
+        excluded_keys = {"tags", "version"}
+        add_kwargs_to_payload(payload, kwargs, excluded_keys)
+
+        return payload
+
+    def _handle_description_update(
+        self, update_data: dict[str, Any], description: str | None, current_tool: Tool
+    ) -> None:
+        """Handle description field in update payload."""
+        if description is not None:
+            update_data["description"] = description.strip()
+        elif hasattr(current_tool, "description") and current_tool.description:
+            update_data["description"] = current_tool.description
+
+    def _handle_tags_update(self, update_data: dict[str, Any], kwargs: dict[str, Any], current_tool: Tool) -> None:
+        """Handle tags field in update payload."""
+        if kwargs.get("tags"):
+            if isinstance(kwargs["tags"], list):
+                update_data["tags"] = ",".join(str(tag).strip() for tag in kwargs["tags"])
+            else:
+                update_data["tags"] = str(kwargs["tags"])
+        elif hasattr(current_tool, "tags") and current_tool.tags:
+            # Preserve existing tags if present
+            if isinstance(current_tool.tags, list):
+                update_data["tags"] = ",".join(str(tag).strip() for tag in current_tool.tags)
+            else:
+                update_data["tags"] = str(current_tool.tags)
+
+    def _handle_additional_kwargs(self, update_data: dict[str, Any], kwargs: dict[str, Any]) -> None:
+        """Handle additional kwargs in update payload."""
+        excluded_keys = {
+            "tags",
+            "framework",
+            "version",
+            "type",
+            "tool_type",
+            "name",
+            "description",
+        }
+        for key, value in kwargs.items():
+            if key not in excluded_keys:
+                update_data[key] = value
+
+    def _build_update_payload(
+        self,
+        current_tool: Tool,
+        name: str | None = None,
+        description: str | None = None,
+        **kwargs,
+    ) -> dict[str, Any]:
+        """Build payload for tool update with proper current state preservation.
+
+        Args:
+            current_tool: Current tool object to update
+            name: New tool name (None to keep current)
+            description: New description (None to keep current)
+            **kwargs: Additional parameters (tags, framework, etc.)
+
+        Returns:
+            Complete payload dictionary for tool update
+
+        Notes:
+            - Preserves current values as defaults when new values not provided
+            - Handles metadata updates properly
+        """
+        # Prepare the update payload with current values as defaults
+        type_override = kwargs.pop("type", None)
+        if type_override is None:
+            type_override = kwargs.pop("tool_type", None)
+        current_type = (
+            type_override
+            or getattr(current_tool, "tool_type", None)
+            or getattr(current_tool, "type", None)
+            or DEFAULT_TOOL_TYPE
+        )
+        # Convert enum to string value for API payload
+        if hasattr(current_type, "value"):
+            current_type = current_type.value
+
+        update_data = {
+            "name": name if name is not None else current_tool.name,
+            "type": current_type,
+            "framework": kwargs.get("framework", getattr(current_tool, "framework", DEFAULT_TOOL_FRAMEWORK)),
+            "version": kwargs.get("version", getattr(current_tool, "version", DEFAULT_TOOL_VERSION)),
+        }
+
+        # Handle description update
+        self._handle_description_update(update_data, description, current_tool)
+
+        # Handle tags update
+        self._handle_tags_update(update_data, kwargs, current_tool)
+
+        # Handle additional kwargs
+        self._handle_additional_kwargs(update_data, kwargs)
+
+        return update_data
+
+    def _create_tool_from_file(
+        self,
+        file_path: str,
+        name: str | None = None,
+        description: str | None = None,
+        framework: str = "langchain",
+        **kwargs,
+    ) -> Tool:
+        """Create tool from file content using upload endpoint.
+
+        Args:
+            file_path: Path to tool file
+            name: Optional tool name (auto-detected if not provided)
+            description: Optional tool description
+            framework: Tool framework
+            **kwargs: Additional parameters
+
+        Returns:
+            Tool: Created tool object
+        """
+        # Read and validate file
+        file_content = self._validate_and_read_file(file_path)
+
+        # Auto-detect name if not provided
+        if not name:
+            name = self._extract_name_from_file(file_path)
+
+        # Handle description - generate default if not provided or empty
+        if description is None or description == "":
+            # Generate default description based on tool_type if available
+            tool_type = kwargs.get("tool_type", "custom")
+            description = f"A {tool_type} tool"
+
+        # Create temporary file for upload
+        with tempfile.NamedTemporaryFile(
+            mode="w",
+            suffix=".py",
+            prefix=f"{name}_",
+            delete=False,
+            encoding="utf-8",
+        ) as temp_file:
+            temp_file.write(file_content)
+            temp_file_path = temp_file.name
+
+        try:
+            # Prepare upload data
+            upload_data = self._prepare_upload_data(name=name, framework=framework, description=description, **kwargs)
+
+            # Upload file
+            return self._upload_tool_file(temp_file_path, upload_data)
+
+        finally:
+            # Clean up temporary file
+            try:
+                os.unlink(temp_file_path)
+            except OSError:
+                pass  # Ignore cleanup errors
+
+    def create_tool(
+        self,
+        file_path: str,
+        name: str | None = None,
+        description: str | None = None,
+        framework: str = "langchain",
+        **kwargs,
+    ) -> Tool:
+        """Create a new tool from a file.
+
+        Args:
+            file_path: File path to tool script (required) - file content will be read and processed as plugin
+            name: Tool name (auto-detected from file if not provided)
+            description: Tool description (auto-generated if not provided)
+            framework: Tool framework (defaults to "langchain")
+            **kwargs: Additional tool parameters
+        """
+        return self._create_tool_from_file(
+            file_path=file_path,
+            name=name,
+            description=description,
+            framework=framework,
+            **kwargs,
+        )
+
+    def create_tool_from_code(
+        self,
+        name: str,
+        code: str,
+        framework: str = "langchain",
+        description: str | None = None,
+        tags: list[str] | None = None,
+    ) -> Tool:
+        """Create a new tool plugin from code string.
+
+        This method uses the /tools/upload endpoint which properly processes
+        and registers tool plugins, unlike the regular create_tool method
+        which only creates metadata.
+
+        Args:
+            name: Name for the tool (used for temporary file naming)
+            code: Python code containing the tool plugin
+            framework: Tool framework (defaults to "langchain")
+            description: Optional tool description
+            tags: Optional list of tags
+
+        Returns:
+            Tool: The created tool object
+        """
+        # Create a temporary file with the tool code
+        with tempfile.NamedTemporaryFile(
+            mode="w",
+            suffix=".py",
+            prefix=f"{name}_",
+            delete=False,
+            encoding="utf-8",
+        ) as temp_file:
+            temp_file.write(code)
+            temp_file_path = temp_file.name
+
+        try:
+            # Prepare upload data using shared helper
+            upload_data = self._prepare_upload_data(
+                name=name,
+                framework=framework,
+                description=description,
+                tags=tags if tags else None,
+            )
+
+            # Upload file using shared helper
+            return self._upload_tool_file(temp_file_path, upload_data)
+
+        finally:
+            # Clean up the temporary file
+            try:
+                os.unlink(temp_file_path)
+            except OSError:
+                pass  # Ignore cleanup errors
+
+    def update_tool(self, tool_id: str, **kwargs) -> Tool:
+        """Update an existing tool."""
+        data = self._request("PUT", f"{TOOLS_ENDPOINT}{tool_id}", json=kwargs)
+        response = ToolResponse(**data)
+        return Tool.from_response(response, client=self)
+
+    def delete_tool(self, tool_id: str) -> None:
+        """Delete a tool."""
+        self._request("DELETE", f"{TOOLS_ENDPOINT}{tool_id}")
+
+    def upsert_tool(
+        self,
+        identifier: str | Tool,
+        code: str | None = None,
+        description: str | None = None,
+        framework: str = "langchain",
+        **kwargs,
+    ) -> Tool:
+        """Create or update a tool by instance, ID, or name.
+
+        Args:
+            identifier: Tool instance, ID (UUID string), or name
+            code: Python code containing the tool plugin (required for create)
+            description: Tool description
+            framework: Tool framework (defaults to "langchain")
+            **kwargs: Additional parameters (tags, version, etc.)
+
+        Returns:
+            The created or updated tool.
+
+        Example:
+            >>> # By name with code (creates if not exists)
+            >>> tool = client.tools.upsert_tool(
+            ...     "greeting",
+            ...     code=bundled_source,
+            ...     description="A greeting tool",
+            ... )
+            >>> # By instance
+            >>> tool = client.tools.upsert_tool(existing_tool, code=new_code)
+            >>> # By ID
+            >>> tool = client.tools.upsert_tool("uuid-here", code=new_code)
+        """
+        # Handle Tool instance
+        if isinstance(identifier, Tool):
+            if identifier.id:
+                logger.info("Updating tool by instance: %s", identifier.name)
+                return self._do_tool_upsert_update(
+                    identifier.id,
+                    identifier.name,
+                    code,
+                    description,
+                    framework,
+                    **kwargs,
+                )
+            identifier = identifier.name
+
+        # Handle string (ID or name)
+        if isinstance(identifier, str):
+            if is_uuid(identifier):
+                logger.info("Updating tool by ID: %s", identifier)
+                existing = self.get_tool_by_id(identifier)
+                return self._do_tool_upsert_update(identifier, existing.name, code, description, framework, **kwargs)
+
+            # It's a name - find or create
+            return self._upsert_tool_by_name(identifier, code, description, framework, **kwargs)
+
+        raise ValueError(f"Invalid identifier type: {type(identifier)}")
+
+    def _do_tool_upsert_update(
+        self,
+        tool_id: str,
+        name: str | None,
+        code: str | None,
+        description: str | None,
+        framework: str,
+        **kwargs,
+    ) -> Tool:
+        """Perform the update part of tool upsert."""
+        if code:
+            # Update via file upload
+            with tempfile.NamedTemporaryFile(
+                mode="w",
+                suffix=".py",
+                prefix=f"{name or 'tool'}_",
+                delete=False,
+                encoding="utf-8",
+            ) as temp_file:
+                temp_file.write(code)
+                temp_file_path = temp_file.name
+
+            try:
+                return self.update_tool_via_file(
+                    tool_id,
+                    temp_file_path,
+                    name=name,
+                    description=description,
+                    framework=framework,
+                    **kwargs,
+                )
+            finally:
+                try:
+                    os.unlink(temp_file_path)
+                except OSError:
+                    pass
+        else:
+            # Metadata-only update
+            update_kwargs = {"framework": framework, **kwargs}
+            if name:
+                update_kwargs["name"] = name
+            if description:
+                update_kwargs["description"] = description
+            return self.update_tool(tool_id, **update_kwargs)
+
+    def _upsert_tool_by_name(
+        self,
+        name: str,
+        code: str | None,
+        description: str | None,
+        framework: str,
+        **kwargs,
+    ) -> Tool:
+        """Find tool by name and update, or create if not found."""
+        existing = self.find_tools(name)
+        name_lower = name.lower()
+        exact_matches = [tool for tool in existing if tool.name and tool.name.lower() == name_lower]
+
+        if len(exact_matches) == 1:
+            logger.info("Updating existing tool: %s", name)
+            return self._do_tool_upsert_update(exact_matches[0].id, name, code, description, framework, **kwargs)
+
+        if len(exact_matches) > 1:
+            raise ValueError(f"Multiple tools found with name '{name}'")
+
+        # Create new tool - code is required
+        if not code:
+            raise ValueError(f"Tool '{name}' not found and no code provided for creation")
+
+        logger.info("Creating new tool: %s", name)
+        return self.create_tool_from_code(
+            name=name,
+            code=code,
+            framework=framework,
+            description=description,
+            **kwargs,
+        )
+
+    def get_tool_script(self, tool_id: str) -> str:
+        """Get the tool script content.
+
+        Args:
+            tool_id: The ID of the tool
+
+        Returns:
+            str: The tool script content
+
+        Raises:
+            Exception: If the tool script cannot be retrieved
+        """
+        try:
+            response = self._request("GET", f"{TOOLS_ENDPOINT}{tool_id}/script")
+            return response.get("script", "") or response.get("content", "")
+        except Exception as e:
+            logger.error(f"Failed to get tool script for {tool_id}: {e}")
+            raise
+
+    def update_tool_via_file(self, tool_id: str, file_path: str, **kwargs) -> Tool:
+        """Update a tool plugin via file upload.
+
+        Args:
+            tool_id: The ID of the tool to update
+            file_path: Path to the new tool file
+            **kwargs: Additional metadata to update (name, description, tags, etc.)
+
+        Returns:
+            Tool: The updated tool object
+
+        Raises:
+            FileNotFoundError: If the file doesn't exist
+            Exception: If the update fails
+        """
+        # Validate file exists
+        self._validate_and_read_file(file_path)
+
+        # Fetch current metadata to ensure required fields are preserved
+        current_tool = self.get_tool_by_id(tool_id)
+
+        payload_kwargs = kwargs.copy()
+        name = payload_kwargs.pop("name", None)
+        description = payload_kwargs.pop("description", None)
+        update_payload = self._build_update_payload(
+            current_tool=current_tool,
+            name=name,
+            description=description,
+            **payload_kwargs,
+        )
+
+        try:
+            # Prepare multipart upload
+            with open(file_path, "rb") as fb:
+                files = {
+                    "file": (
+                        os.path.basename(file_path),
+                        fb,
+                        "application/octet-stream",
+                    ),
+                }
+
+                response = self._request(
+                    "PUT",
+                    TOOLS_UPLOAD_BY_ID_ENDPOINT_FMT.format(tool_id=tool_id),
+                    files=files,
+                    data=update_payload,
+                )
+
+            tool_response = ToolResponse(**response)
+            return Tool.from_response(tool_response, client=self)
+
+        except Exception as e:
+            logger.error("Failed to update tool %s via file: %s", tool_id, e)
+            raise