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

glaip_sdk/registry/tool.py

@@ -66,9 +66,16 @@ class ToolRegistry(BaseRegistry["Tool"]):
         Raises:
             ValueError: If name cannot be extracted from the reference.
         """
+        # Lazy import to avoid circular dependency
+        from glaip_sdk.tools.base import Tool  # noqa: PLC0415
+
         if isinstance(ref, str):
             return ref
 
+        # Tool instance (from Tool.from_langchain() or Tool.from_native())
+        if isinstance(ref, Tool):
+            return ref.get_name()
+
         # Dict from API response - extract name or id
         if isinstance(ref, dict):
             return ref.get("name") or ref.get("id") or ""
@@ -101,17 +108,61 @@ class ToolRegistry(BaseRegistry["Tool"]):
             ValueError: If the tool cannot be resolved.
         """
         # Lazy imports to avoid circular dependency
+        from glaip_sdk.tools.base import Tool as ToolClass  # noqa: PLC0415
+        from glaip_sdk.tools.base import ToolType  # noqa: PLC0415
         from glaip_sdk.utils.discovery import find_tool  # noqa: PLC0415
         from glaip_sdk.utils.sync import update_or_create_tool  # noqa: PLC0415
 
-        # Already deployed tool (glaip_sdk.models.Tool with ID) - just cache and return
+        # 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
+
+            # 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()."
+            )
+
+        # 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
 
-            # Tool without ID (e.g., Tool.from_native()) - look up on platform
+            # Tool without ID (backward compatibility) - look up on platform
             logger.info("Looking up native tool: %s", name)
             tool = find_tool(name)
             if tool:
@@ -132,9 +183,7 @@ class ToolRegistry(BaseRegistry["Tool"]):
         if isinstance(ref, dict):
             tool_id = ref.get("id")
             if tool_id:
-                from glaip_sdk.tools.base import Tool  # noqa: PLC0415
-
-                tool = Tool(id=tool_id, name=ref.get("name", ""))
+                tool = ToolClass(id=tool_id, name=ref.get("name", ""))
                 self._cache[name] = tool
                 return tool
             raise ValueError(f"Tool dict missing 'id': {ref}")

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: glaip-sdk
-Version: 0.6.24
+Version: 0.6.25
 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

{glaip_sdk-0.6.24.dist-info → glaip_sdk-0.6.25.dist-info}/RECORD

@@ -92,7 +92,7 @@ glaip_sdk/registry/__init__.py,sha256=mjvElYE-wwmbriGe-c6qy4on0ccEuWxW_EWWrSbptC
 glaip_sdk/registry/agent.py,sha256=F0axW4BIUODqnttIOzxnoS5AqQkLZ1i48FTeZNnYkhA,5203
 glaip_sdk/registry/base.py,sha256=0x2ZBhiERGUcf9mQeWlksSYs5TxDG6FxBYQToYZa5D4,4143
 glaip_sdk/registry/mcp.py,sha256=kNJmiijIbZL9Btx5o2tFtbaT-WG6O4Xf_nl3wz356Ow,7978
-glaip_sdk/registry/tool.py,sha256=rxrVxnO_VwO6E5kccqxxEUC337J9qbKpje-Gwl5a3sY,7699
+glaip_sdk/registry/tool.py,sha256=rLORO-Y5z-zo_qcomF-VKsfZrNKiZ1o36MMg86L1X9w,9885
 glaip_sdk/runner/__init__.py,sha256=8RrngoGfpF8x9X27RPdX4gJjch75ZvhtVt_6UV0ULLQ,1615
 glaip_sdk/runner/base.py,sha256=KIjcSAyDCP9_mn2H4rXR5gu1FZlwD9pe0gkTBmr6Yi4,2663
 glaip_sdk/runner/deps.py,sha256=Du3hr2R5RHOYCRAv7RVmx661x-ayVXIeZ8JD7ODirTA,3884
@@ -160,8 +160,8 @@ glaip_sdk/utils/rendering/steps/format.py,sha256=Chnq7OBaj8XMeBntSBxrX5zSmrYeGcO
 glaip_sdk/utils/rendering/steps/manager.py,sha256=BiBmTeQMQhjRMykgICXsXNYh1hGsss-fH9BIGVMWFi0,13194
 glaip_sdk/utils/rendering/viewer/__init__.py,sha256=XrxmE2cMAozqrzo1jtDFm8HqNtvDcYi2mAhXLXn5CjI,457
 glaip_sdk/utils/rendering/viewer/presenter.py,sha256=mlLMTjnyeyPVtsyrAbz1BJu9lFGQSlS-voZ-_Cuugv0,5725
-glaip_sdk-0.6.24.dist-info/METADATA,sha256=mZ9OCm5VvtAtoEpJ7ATbyggUegM709JmEHVL1QjQAPc,8299
-glaip_sdk-0.6.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-glaip_sdk-0.6.24.dist-info/entry_points.txt,sha256=65vNPUggyYnVGhuw7RhNJ8Fp2jygTcX0yxJBcBY3iLU,48
-glaip_sdk-0.6.24.dist-info/top_level.txt,sha256=td7yXttiYX2s94-4wFhv-5KdT0rSZ-pnJRSire341hw,10
-glaip_sdk-0.6.24.dist-info/RECORD,,
+glaip_sdk-0.6.25.dist-info/METADATA,sha256=sxk3u4tpSPNCUAIgfGy3MfxJhnPEPgQgueua3pSrIOw,8299
+glaip_sdk-0.6.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+glaip_sdk-0.6.25.dist-info/entry_points.txt,sha256=65vNPUggyYnVGhuw7RhNJ8Fp2jygTcX0yxJBcBY3iLU,48
+glaip_sdk-0.6.25.dist-info/top_level.txt,sha256=td7yXttiYX2s94-4wFhv-5KdT0rSZ-pnJRSire341hw,10
+glaip_sdk-0.6.25.dist-info/RECORD,,