claritty-sdk 2.0.2__tar.gz → 2.0.4__tar.gz

{claritty_sdk-2.0.2 → claritty_sdk-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: claritty-sdk
-Version: 2.0.2
+Version: 2.0.4
 Summary: Official SDK for building apps on the Claritty Platform
 Author: Claritty Platform
 License: MIT

{claritty_sdk-2.0.2 → claritty_sdk-2.0.4}/claritty_sdk/integrations/executor_client.py

@@ -55,11 +55,16 @@ def execute_tool(
         os.environ.get("CLARITTY_CREDS_TIMEOUT_S", "30")
     )
     url = f"{base}/internal/integrations/tools/{integration_id}/{tool_id}/execute"
+    # Per-app scoping: the platform serves the connection bound to THIS app.
+    payload: Dict[str, Any] = {"userId": user_id, "arguments": arguments}
+    app_id = os.environ.get("CLARITY_APP_ID")
+    if app_id:
+        payload["appId"] = app_id
     try:
         resp = httpx.post(
             url,
             headers={"X-Claritty-Internal": secret},
-            json={"userId": user_id, "arguments": arguments},
+            json=payload,
             timeout=timeout,
         )
     except httpx.HTTPError as e:

{claritty_sdk-2.0.2 → claritty_sdk-2.0.4}/claritty_sdk/integrations/platform_creds.py

@@ -110,11 +110,18 @@ def fetch_for_user(integration_id: str, user_id: str) -> Credentials:
     import httpx
 
     url = f"{base}/internal/integrations/credentials/fetch"
+    # Per-app scoping: the platform resolves the connection bound to THIS app.
+    # CLARITY_APP_ID is injected per deployed app; omit when absent (legacy →
+    # the platform falls back to the user-scoped connection).
+    payload = {"userId": user_id, "integrationCatalogId": integration_id}
+    app_id = os.environ.get("CLARITY_APP_ID")
+    if app_id:
+        payload["appId"] = app_id
     try:
         with httpx.Client(timeout=_FETCH_TIMEOUT_S) as client:
             res = client.post(
                 url,
-                json={"userId": user_id, "integrationCatalogId": integration_id},
+                json=payload,
                 headers={
                     "X-Claritty-Internal": secret,
                     "Content-Type": "application/json",

{claritty_sdk-2.0.2 → claritty_sdk-2.0.4}/claritty_sdk/runtime/platform_client.py

@@ -138,11 +138,16 @@ class PlatformClient:
             f"{self.base_url}/internal/integrations/"
             f"{integration_id}/{bare}/execute"
         )
+        # Per-app scoping: platform serves the connection bound to THIS app.
+        payload: Dict[str, Any] = {"userId": user_id, "arguments": arguments}
+        app_id = os.environ.get("CLARITY_APP_ID")
+        if app_id:
+            payload["appId"] = app_id
         try:
             with httpx.Client(timeout=self._timeout) as http:
                 res = http.post(
                     url,
-                    json={"userId": user_id, "arguments": arguments},
+                    json=payload,
                     headers={
                         "X-Claritty-Internal": self._secret,
                         "Content-Type": "application/json",

{claritty_sdk-2.0.2 → claritty_sdk-2.0.4}/claritty_sdk/runtime/tool_loop.py

@@ -618,14 +618,23 @@ async def _dispatch_tool(
             return {"error": str(exc)}
 
     handler = _decorators.get_registered_tool(tool_id)
+    if handler is None and "." in tool_id and decl.source == "catalog":
+        # Integration-provided tool with no locally-registered handler → BROKER
+        # it through the platform executor: the platform holds the credential +
+        # provider REST code and runs the call server-side; the app only gets the
+        # result. This is the canonical secure path — the credential never
+        # reaches the app. (Phase 3.)
+        from ..integrations.catalog import (
+            get_provided_tool,
+            _make_platform_delegate,
+        )
+
+        integration_id = tool_id.split(".", 1)[0]
+        handler = get_provided_tool(tool_id) or _make_platform_delegate(
+            integration_id, tool_id
+        )
     if handler is None:
-        return {
-            "error": (
-                f"no registered handler for tool {tool_id!r}; the agent "
-                "may need to wait for Phase 3 (integration catalog) for "
-                "this to be dispatched"
-            )
-        }
+        return {"error": f"no registered handler for tool {tool_id!r}"}
 
     tool_ctx = ToolCtx(
         user_id=agent_ctx.user_id,

{claritty_sdk-2.0.2 → claritty_sdk-2.0.4}/claritty_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: claritty-sdk
-Version: 2.0.2
+Version: 2.0.4
 Summary: Official SDK for building apps on the Claritty Platform
 Author: Claritty Platform
 License: MIT

{claritty_sdk-2.0.2 → claritty_sdk-2.0.4}/claritty_sdk.egg-info/SOURCES.txt

@@ -69,4 +69,5 @@ claritty_sdk/runtime/tool_loop.py
 claritty_sdk/runtime/tracing.py
 claritty_sdk/runtime/workflow_engine.py
 tests/test_graph_emitter.py
+tests/test_integration_broker_dispatch.py
 tests/test_manifest_triggers.py

{claritty_sdk-2.0.2 → claritty_sdk-2.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "claritty-sdk"
-version = "2.0.2"
+version = "2.0.4"
 description = "Official SDK for building apps on the Claritty Platform"
 readme = "README.md"
 requires-python = ">=3.9"

claritty_sdk-2.0.4/tests/test_integration_broker_dispatch.py

@@ -0,0 +1,60 @@
+"""Phase 3: the agent tool-loop must BROKER integration-provided tools through
+the platform executor — the credential never reaches the app. A catalog-source
+tool with no locally-registered handler is dispatched via the platform delegate
+(PlatformClient.execute_integration_tool), and only its result is returned.
+"""
+import asyncio
+
+from claritty_sdk.runtime import tool_loop
+from claritty_sdk.runtime import platform_client
+from claritty_sdk.manifest import ToolDecl
+from claritty_sdk.context import AgentContext
+
+
+def _ctx():
+    return AgentContext(user_id="u1")
+
+
+def test_integration_tool_is_brokered(monkeypatch):
+    seen = {}
+
+    def fake_exec(self, integration_id, tool_id, user_id, arguments):
+        seen.update(
+            integration_id=integration_id,
+            tool_id=tool_id,
+            user_id=user_id,
+            arguments=arguments,
+        )
+        return {"message_id": "m1"}
+
+    monkeypatch.setattr(
+        platform_client.PlatformClient, "execute_integration_tool", fake_exec
+    )
+
+    toolset = {
+        "gmail.send": ToolDecl(
+            id="gmail.send", source="catalog", handler="", input={}, output={}
+        )
+    }
+    out = asyncio.run(
+        tool_loop._dispatch_tool(
+            "gmail.send", {"to": "x@y.com"}, toolset, _ctx(), None
+        )
+    )
+    # Only the result comes back — no credential.
+    assert out == {"message_id": "m1"}
+    assert seen["integration_id"] == "gmail"
+    assert seen["user_id"] == "u1"
+    assert seen["arguments"] == {"to": "x@y.com"}
+
+
+def test_unknown_custom_tool_still_errors():
+    toolset = {
+        "foo.bar": ToolDecl(
+            id="foo.bar", source="custom", handler="", input={}, output={}
+        )
+    }
+    out = asyncio.run(
+        tool_loop._dispatch_tool("foo.bar", {}, toolset, _ctx(), None)
+    )
+    assert "no registered handler" in out.get("error", "")