glaip-sdk 0.6.25__py3-none-any.whl → 0.7.0__py3-none-any.whl

glaip_sdk/client/tools.py

@@ -103,6 +103,9 @@ class ToolClient(BaseClient):
     def _prepare_upload_data(self, name: str, framework: str, description: str | None = None, **kwargs) -> dict:
         """Prepare upload data dictionary.
 
+        Uses the same payload building logic as _build_create_payload to ensure
+        consistency between upload and metadata-only tool creation.
+
         Args:
             name: Tool name
             framework: Tool framework
@@ -112,28 +115,19 @@ class ToolClient(BaseClient):
         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"]
+        # Extract tool_type from kwargs if present, defaulting to DEFAULT_TOOL_TYPE
+        tool_type = kwargs.pop("tool_type", DEFAULT_TOOL_TYPE)
 
-        # 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
+        # Use _build_create_payload to build the payload consistently
+        payload = self._build_create_payload(
+            name=name,
+            description=description,
+            framework=framework,
+            tool_type=tool_type,
+            **kwargs,
+        )
 
-        return data
+        return payload
 
     def _upload_tool_file(self, file_path: str, upload_data: dict) -> Tool:
         """Upload tool file to server.
@@ -439,9 +433,44 @@ class ToolClient(BaseClient):
             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)
+    def update_tool(self, tool_id: str | Tool, **kwargs) -> Tool:
+        """Update an existing tool.
+
+        Notes:
+            - Payload construction is centralized via ``_build_update_payload`` to keep metadata
+              update and upload update flows consistent.
+            - Accepts either a tool ID or a ``Tool`` instance (avoids an extra fetch when callers
+              already have the current tool).
+        """
+        # Backward-compatible: allow passing a Tool instance to avoid an extra fetch.
+        if isinstance(tool_id, Tool):
+            current_tool = tool_id
+            if not current_tool.id:
+                raise ValueError("Tool instance has no id; cannot update.")
+            tool_id_value = str(current_tool.id)
+        else:
+            current_tool = None
+            tool_id_value = tool_id
+
+        if not kwargs:
+            data = self._request("PUT", f"{TOOLS_ENDPOINT}{tool_id_value}", json={})
+            response = ToolResponse(**data)
+            return Tool.from_response(response, client=self)
+
+        if current_tool is None:
+            current_tool = self.get_tool_by_id(tool_id_value)
+
+        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,
+        )
+
+        data = self._request("PUT", f"{TOOLS_ENDPOINT}{tool_id_value}", json=update_payload)
         response = ToolResponse(**data)
         return Tool.from_response(response, client=self)
 

glaip_sdk/registry/tool.py

@@ -54,6 +54,32 @@ class ToolRegistry(BaseRegistry["Tool"]):
         value = getattr(obj, attr, None)
         return value if isinstance(value, str) else None
 
+    def _extract_name_from_instance(self, ref: Any) -> str | None:
+        """Extract name from a non-type instance.
+
+        Args:
+            ref: The instance to extract name from.
+
+        Returns:
+            The extracted name, or None if not found.
+        """
+        if isinstance(ref, type):
+            return None
+        return self._get_string_attr(ref, "name")
+
+    def _extract_name_from_class(self, ref: Any) -> str | None:
+        """Extract name from a class.
+
+        Args:
+            ref: The class to extract name from.
+
+        Returns:
+            The extracted name, or None if not found.
+        """
+        if not isinstance(ref, type):
+            return None
+        return self._get_string_attr(ref, "name") or self._get_name_from_model_fields(ref)
+
     def _extract_name(self, ref: Any) -> str:
         """Extract tool name from a reference.
 
@@ -81,31 +107,37 @@ class ToolRegistry(BaseRegistry["Tool"]):
             return ref.get("name") or ref.get("id") or ""
 
         # Tool instance (not a class) with name attribute
-        if not isinstance(ref, type):
-            name = self._get_string_attr(ref, "name")
-            if name:
-                return name
+        name = self._extract_name_from_instance(ref)
+        if name:
+            return name
 
         # Tool class - try direct attribute first, then model_fields
-        if isinstance(ref, type):
-            name = self._get_string_attr(ref, "name") or self._get_name_from_model_fields(ref)
-            if name:
-                return name
+        name = self._extract_name_from_class(ref)
+        if name:
+            return name
 
         raise ValueError(f"Cannot extract name from: {ref}")
 
-    def _resolve_and_cache(self, ref: Any, name: str) -> Tool:
-        """Resolve tool reference - upload if class, find if string/native.
+    def _cache_tool(self, tool: Tool, name: str) -> None:
+        """Cache a tool by name and ID if available.
 
         Args:
-            ref: The tool reference to resolve.
+            tool: The tool to cache.
+            name: The tool name.
+        """
+        self._cache[name] = tool
+        if hasattr(tool, "id") and tool.id:
+            self._cache[tool.id] = tool
+
+    def _resolve_tool_instance(self, ref: Any, name: str) -> Tool | None:
+        """Resolve a ToolClass instance.
+
+        Args:
+            ref: The ToolClass instance to resolve.
             name: The extracted tool name.
 
         Returns:
-            The resolved glaip_sdk.models.Tool object.
-
-        Raises:
-            ValueError: If the tool cannot be resolved.
+            The resolved tool, or None if not a ToolClass instance.
         """
         # Lazy imports to avoid circular dependency
         from glaip_sdk.tools.base import Tool as ToolClass  # noqa: PLC0415
@@ -113,56 +145,23 @@ class ToolRegistry(BaseRegistry["Tool"]):
         from glaip_sdk.utils.discovery import find_tool  # noqa: PLC0415
         from glaip_sdk.utils.sync import update_or_create_tool  # noqa: PLC0415
 
-        # Tool instance from Tool.from_native() or Tool.from_langchain()
         # Use try/except to handle mocked Tool class in tests
         try:
             is_tool_instance = isinstance(ref, ToolClass)
         except TypeError:
-            is_tool_instance = False
-
-        if is_tool_instance:
-            # If Tool has an ID, it's already deployed - return as-is
-            if ref.id is not None:
-                logger.debug("Caching already deployed tool: %s", name)
-                self._cache[name] = ref
-                # Also cache by id for consistency with other resolution branches
-                self._cache[ref.id] = ref
-                return ref
-
-            # Tool.from_native() - look up on platform
-            if ref.tool_type == ToolType.NATIVE:
-                logger.info("Looking up native tool: %s", name)
-                tool = find_tool(name)
-                if tool:
-                    self._cache[name] = tool
-                    return tool
-                raise ValueError(f"Native tool not found on platform: {name}")
-
-            # Tool.from_langchain() - upload the tool_class
-            if ref.tool_class is not None:
-                logger.info("Uploading custom tool: %s", name)
-                tool = update_or_create_tool(ref.tool_class)
-                self._cache[name] = tool
-                if tool.id:
-                    self._cache[tool.id] = tool
-                return tool
+            return None
 
-            # Unresolvable Tool instance - neither native nor has tool_class
-            raise ValueError(
-                f"Cannot resolve Tool instance: {ref}. "
-                f"Tool has no id, is not NATIVE type, and has no tool_class. "
-                f"Ensure Tool is created via Tool.from_native() or Tool.from_langchain()."
-            )
+        if not is_tool_instance:
+            return None
 
-        # Already deployed tool (not a ToolClass, but has id/name) - just cache and return
-        # This handles API response objects and backward compatibility
-        if hasattr(ref, "id") and hasattr(ref, "name") and not isinstance(ref, type):
-            if ref.id is not None:
-                logger.debug("Caching already deployed tool: %s", name)
-                self._cache[name] = ref
-                return ref
+        # If Tool has an ID, it's already deployed - return as-is
+        if ref.id is not None:
+            logger.debug("Caching already deployed tool: %s", name)
+            self._cache_tool(ref, name)
+            return ref
 
-            # Tool without ID (backward compatibility) - look up on platform
+        # Tool.from_native() - look up on platform
+        if ref.tool_type == ToolType.NATIVE:
             logger.info("Looking up native tool: %s", name)
             tool = find_tool(name)
             if tool:
@@ -170,32 +169,144 @@ class ToolRegistry(BaseRegistry["Tool"]):
                 return tool
             raise ValueError(f"Native tool not found on platform: {name}")
 
-        # Custom tool class - upload it
-        if self._is_custom_tool(ref):
+        # Tool.from_langchain() - upload the tool_class
+        if ref.tool_class is not None:
             logger.info("Uploading custom tool: %s", name)
-            tool = update_or_create_tool(ref)
-            self._cache[name] = tool
-            if tool.id:
-                self._cache[tool.id] = tool
+            tool = update_or_create_tool(ref.tool_class)
+            self._cache_tool(tool, name)
             return tool
 
-        # Dict from API response - use ID directly if available
-        if isinstance(ref, dict):
-            tool_id = ref.get("id")
-            if tool_id:
-                tool = ToolClass(id=tool_id, name=ref.get("name", ""))
-                self._cache[name] = tool
-                return tool
-            raise ValueError(f"Tool dict missing 'id': {ref}")
+        # Unresolvable Tool instance - neither native nor has tool_class
+        raise ValueError(
+            f"Cannot resolve Tool instance: {ref}. "
+            f"Tool has no id, is not NATIVE type, and has no tool_class. "
+            f"Ensure Tool is created via Tool.from_native() or Tool.from_langchain()."
+        )
 
-        # String name - look up on platform (could be native or existing tool)
-        if isinstance(ref, str):
-            logger.info("Looking up tool by name: %s", name)
-            tool = find_tool(name)
-            if tool:
-                self._cache[name] = tool
-                return tool
-            raise ValueError(f"Tool not found on platform: {name}")
+    def _resolve_deployed_tool(self, ref: Any, name: str) -> Tool | None:
+        """Resolve an already deployed tool (has id/name attributes).
+
+        Args:
+            ref: The tool reference to resolve.
+            name: The extracted tool name.
+
+        Returns:
+            The resolved tool, or None if not a deployed tool.
+        """
+        from glaip_sdk.utils.discovery import find_tool  # noqa: PLC0415
+
+        # Already deployed tool (not a ToolClass, but has id/name)
+        # This handles API response objects and backward compatibility
+        if not (hasattr(ref, "id") and hasattr(ref, "name") and not isinstance(ref, type)):
+            return None
+
+        if ref.id is not None:
+            logger.debug("Caching already deployed tool: %s", name)
+            # Use _cache_tool to cache by both name and ID for consistency
+            self._cache_tool(ref, name)
+            return ref
+
+        # Tool without ID (backward compatibility) - look up on platform
+        logger.info("Looking up native tool: %s", name)
+        tool = find_tool(name)
+        if tool:
+            # Use _cache_tool to cache by both name and ID if available
+            self._cache_tool(tool, name)
+            return tool
+        raise ValueError(f"Native tool not found on platform: {name}")
+
+    def _resolve_custom_tool(self, ref: Any, name: str) -> Tool | None:
+        """Resolve a custom tool class.
+
+        Args:
+            ref: The tool reference to resolve.
+            name: The extracted tool name.
+
+        Returns:
+            The resolved tool, or None if not a custom tool.
+        """
+        from glaip_sdk.utils.sync import update_or_create_tool  # noqa: PLC0415
+
+        if not self._is_custom_tool(ref):
+            return None
+
+        logger.info("Uploading custom tool: %s", name)
+        tool = update_or_create_tool(ref)
+        self._cache_tool(tool, name)
+        return tool
+
+    def _resolve_dict_tool(self, ref: Any, name: str) -> Tool | None:
+        """Resolve a tool from a dict (API response).
+
+        Args:
+            ref: The dict to resolve.
+            name: The extracted tool name.
+
+        Returns:
+            The resolved tool, or None if not a dict.
+        """
+        from glaip_sdk.tools.base import Tool as ToolClass  # noqa: PLC0415
+
+        if not isinstance(ref, dict):
+            return None
+
+        tool_id = ref.get("id")
+        if tool_id:
+            tool = ToolClass(id=tool_id, name=ref.get("name", ""))
+            # Use _cache_tool to cache by both name and ID for consistency
+            self._cache_tool(tool, name)
+            return tool
+        raise ValueError(f"Tool dict missing 'id': {ref}")
+
+    def _resolve_string_tool(self, ref: Any, name: str) -> Tool | None:
+        """Resolve a tool from a string name.
+
+        Args:
+            ref: The string to resolve.
+            name: The extracted tool name.
+
+        Returns:
+            The resolved tool, or None if not a string.
+        """
+        from glaip_sdk.utils.discovery import find_tool  # noqa: PLC0415
+
+        if not isinstance(ref, str):
+            return None
+
+        logger.info("Looking up tool by name: %s", name)
+        tool = find_tool(name)
+        if tool:
+            # Use _cache_tool to cache by both name and ID for consistency
+            self._cache_tool(tool, name)
+            return tool
+        raise ValueError(f"Tool not found on platform: {name}")
+
+    def _resolve_and_cache(self, ref: Any, name: str) -> Tool:
+        """Resolve tool reference - upload if class, find if string/native.
+
+        Args:
+            ref: The tool reference to resolve.
+            name: The extracted tool name.
+
+        Returns:
+            The resolved glaip_sdk.models.Tool object.
+
+        Raises:
+            ValueError: If the tool cannot be resolved.
+        """
+        # Try each resolution strategy in order
+        resolvers = [
+            self._resolve_tool_instance,
+            self._resolve_deployed_tool,
+            self._resolve_custom_tool,
+            self._resolve_dict_tool,
+            self._resolve_string_tool,
+        ]
+
+        for resolver in resolvers:
+            result = resolver(ref, name)
+            if result is not None:
+                return result
 
         raise ValueError(f"Could not resolve tool reference: {ref}")
 
@@ -234,7 +345,8 @@ class ToolRegistry(BaseRegistry["Tool"]):
             if ref.id is not None:
                 name = self._extract_name(ref)
                 if name not in self._cache:
-                    self._cache[name] = ref
+                    # Use _cache_tool to cache by both name and ID for consistency
+                    self._cache_tool(ref, name)
                 return ref
 
             # Tool without ID (e.g., from Tool.from_native()) - needs platform lookup

glaip_sdk/tools/base.py

@@ -256,6 +256,9 @@ class Tool:
         Returns:
             A Tool reference that will be uploaded during Agent.deploy().
 
+        Raises:
+            ValueError: If the tool class has no valid string 'name' attribute or field.
+
         Example:
             >>> from langchain_core.tools import BaseTool
             >>>
@@ -267,7 +270,42 @@ class Tool:
             >>>
             >>> greeting_tool = Tool.from_langchain(GreetingTool)
         """
-        return cls(tool_class=tool_class, type=ToolType.CUSTOM)
+        # Extract name from tool_class to populate the name attribute
+        tool_name = cls._extract_tool_name(tool_class)
+        return cls(name=tool_name, tool_class=tool_class, type=ToolType.CUSTOM)
+
+    @staticmethod
+    def _extract_tool_name(tool_class: type) -> str:
+        """Extract tool name from a LangChain tool class.
+
+        Args:
+            tool_class: A LangChain BaseTool subclass.
+
+        Returns:
+            The extracted tool name.
+
+        Raises:
+            ValueError: If name cannot be extracted or is not a valid string.
+        """
+        # Try model_fields first (Pydantic v2)
+        if hasattr(tool_class, "model_fields"):
+            name_field = tool_class.model_fields.get("name")
+            if name_field and name_field.default:
+                # Validate that default is actually a string
+                if isinstance(name_field.default, str):
+                    return name_field.default
+
+        # Try direct name attribute
+        if hasattr(tool_class, "name"):
+            name_attr = getattr(tool_class, "name")
+            if isinstance(name_attr, str):
+                return name_attr
+
+        # If we can't extract the name, raise an error
+        raise ValueError(
+            f"Cannot extract name from tool class {tool_class.__name__}. "
+            f"Ensure the tool class has a 'name' attribute or field with a valid string value."
+        )
 
     def get_import_path(self) -> str | None:
         """Get the import path for custom tools.
@@ -292,15 +330,8 @@ class Tool:
             return self.name
 
         if self.tool_class is not None:
-            # LangChain BaseTool - get name from model_fields
-            if hasattr(self.tool_class, "model_fields"):
-                name_field = self.tool_class.model_fields.get("name")
-                if name_field and name_field.default:
-                    return name_field.default
-
-            # Direct name attribute
-            if hasattr(self.tool_class, "name"):
-                return self.tool_class.name
+            # Reuse extraction logic for consistency
+            return self._extract_tool_name(self.tool_class)
 
         raise ValueError(f"Cannot determine name for tool: {self}")
 

glaip_sdk/utils/import_resolver.py

@@ -215,11 +215,49 @@ class ImportResolver:
             True if import should be skipped.
         """
         if isinstance(node, ast.ImportFrom):
-            return node.module and any(node.module.startswith(m) for m in self.EXCLUDED_MODULES)
+            return self._should_skip_import_from(node)
         if isinstance(node, ast.Import):
-            return any(alias.name.startswith(m) for m in self.EXCLUDED_MODULES for alias in node.names)
+            return self._should_skip_regular_import(node)
         return False
 
+    def _should_skip_import_from(self, node: ast.ImportFrom) -> bool:
+        """Check if ImportFrom node should be skipped.
+
+        Args:
+            node: ImportFrom node to check.
+
+        Returns:
+            True if import should be skipped.
+        """
+        if not node.module:
+            return False
+        return self._is_module_excluded(node.module)
+
+    def _should_skip_regular_import(self, node: ast.Import) -> bool:
+        """Check if Import node should be skipped.
+
+        Args:
+            node: Import node to check.
+
+        Returns:
+            True if any alias should be skipped.
+        """
+        return any(self._is_module_excluded(alias.name) for alias in node.names)
+
+    def _is_module_excluded(self, module_name: str) -> bool:
+        """Check if a module name should be excluded.
+
+        Args:
+            module_name: Module name to check.
+
+        Returns:
+            True if module is excluded.
+        """
+        # Exact match for glaip_sdk or match excluded submodules with boundary
+        if module_name == "glaip_sdk":
+            return True
+        return any(module_name == m or module_name.startswith(m + ".") for m in self.EXCLUDED_MODULES)
+
     @staticmethod
     def _build_import_strings(future_imports: list, regular_imports: list) -> list[str]:
         """Build formatted import strings from import nodes.

{glaip_sdk-0.6.25.dist-info → glaip_sdk-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: glaip-sdk
-Version: 0.6.25
+Version: 0.7.0
 Summary: Python SDK and CLI for GL AIP (GDP Labs AI Agent Package) - Build, run, and manage AI agents
 Author-email: Raymond Christopher <raymond.christopher@gdplabs.id>
 License: MIT
@@ -144,7 +144,7 @@ print("--- Stream complete ---")
 
 🎉 **SDK Success!** You're now ready to build AI-powered applications with Python.
 
----
+______________________________________________________________________
 
 ## 💻 Hello World - CLI