feat(auth): migrate from token-based to RAM signature authentication

agentrun/agent_runtime/__runtime_async_template.py

@@ -43,6 +43,8 @@ class AgentRuntime(
     delete, update, query, and endpoint/version management.
     """
 
+    _data_api: Dict[str, AgentRuntimeDataAPI] = {}
+
     @classmethod
     def __get_client(cls):
         """获取客户端实例 / Get client instance
@@ -462,16 +464,19 @@ async def invoke_openai_async(
         cfg = Config.with_configs(self._config, kwargs.get("config"))
         kwargs["config"] = cfg
 
-        if not self.__data_api:
-            self.__data_api: Dict[str, AgentRuntimeDataAPI] = {}
+        if not self._data_api:
+            self._data_api: Dict[str, AgentRuntimeDataAPI] = {}
 
-        if self.__data_api[agent_runtime_endpoint_name] is None:
-            self.__data_api[agent_runtime_endpoint_name] = AgentRuntimeDataAPI(
+        if (
+            agent_runtime_endpoint_name not in self._data_api
+            or self._data_api[agent_runtime_endpoint_name] is None
+        ):
+            self._data_api[agent_runtime_endpoint_name] = AgentRuntimeDataAPI(
                 agent_runtime_name=self.agent_runtime_name or "",
                 agent_runtime_endpoint_name=agent_runtime_endpoint_name or "",
                 config=cfg,
             )
 
-        return await self.__data_api[
+        return await self._data_api[
             agent_runtime_endpoint_name
         ].invoke_openai_async(**kwargs)

agentrun/agent_runtime/api/__data_async_template.py

@@ -37,8 +37,15 @@ async def invoke_openai_async(
         config = kwargs.get("config", None)
 
         cfg = Config.with_configs(self.config, config)
-        api_base = self.with_path("openai/v1")
-        _, headers, _ = self.auth(headers=cfg.get_headers())
+        api_base = self.with_path("openai/v1", config=cfg)
+        # Sign the actual request URL (OpenAI client will POST to base + /chat/completions)
+        chat_completions_url = api_base.rstrip("/") + "/chat/completions"
+        _, headers, _ = self.auth(
+            url=chat_completions_url,
+            headers=cfg.get_headers(),
+            config=cfg,
+            method="POST",
+        )
 
         from httpx import AsyncClient
         from openai import AsyncOpenAI

agentrun/agent_runtime/api/data.py

@@ -48,8 +48,15 @@ async def invoke_openai_async(
         config = kwargs.get("config", None)
 
         cfg = Config.with_configs(self.config, config)
-        api_base = self.with_path("openai/v1")
-        _, headers, _ = self.auth(headers=cfg.get_headers())
+        api_base = self.with_path("openai/v1", config=cfg)
+        # Sign the actual request URL (OpenAI client will POST to base + /chat/completions)
+        chat_completions_url = api_base.rstrip("/") + "/chat/completions"
+        _, headers, _ = self.auth(
+            url=chat_completions_url,
+            headers=cfg.get_headers(),
+            config=cfg,
+            method="POST",
+        )
 
         from httpx import AsyncClient
         from openai import AsyncOpenAI
@@ -77,8 +84,15 @@ def invoke_openai(
         config = kwargs.get("config", None)
 
         cfg = Config.with_configs(self.config, config)
-        api_base = self.with_path("openai/v1")
-        _, headers, _ = self.auth(headers=cfg.get_headers())
+        api_base = self.with_path("openai/v1", config=cfg)
+        # Sign the actual request URL (OpenAI client will POST to base + /chat/completions)
+        chat_completions_url = api_base.rstrip("/") + "/chat/completions"
+        _, headers, _ = self.auth(
+            url=chat_completions_url,
+            headers=cfg.get_headers(),
+            config=cfg,
+            method="POST",
+        )
 
         from httpx import Client
         from openai import OpenAI

agentrun/agent_runtime/runtime.py

@@ -53,6 +53,8 @@ class AgentRuntime(
     delete, update, query, and endpoint/version management.
     """
 
+    _data_api: Dict[str, AgentRuntimeDataAPI] = {}
+
     @classmethod
     def __get_client(cls):
         """获取客户端实例 / Get client instance
@@ -867,17 +869,20 @@ async def invoke_openai_async(
         cfg = Config.with_configs(self._config, kwargs.get("config"))
         kwargs["config"] = cfg
 
-        if not self.__data_api:
-            self.__data_api: Dict[str, AgentRuntimeDataAPI] = {}
+        if not self._data_api:
+            self._data_api: Dict[str, AgentRuntimeDataAPI] = {}
 
-        if self.__data_api[agent_runtime_endpoint_name] is None:
-            self.__data_api[agent_runtime_endpoint_name] = AgentRuntimeDataAPI(
+        if (
+            agent_runtime_endpoint_name in self._data_api
+            and self._data_api[agent_runtime_endpoint_name] is None
+        ):
+            self._data_api[agent_runtime_endpoint_name] = AgentRuntimeDataAPI(
                 agent_runtime_name=self.agent_runtime_name or "",
                 agent_runtime_endpoint_name=agent_runtime_endpoint_name or "",
                 config=cfg,
             )
 
-        return await self.__data_api[
+        return await self._data_api[
             agent_runtime_endpoint_name
         ].invoke_openai_async(**kwargs)
 
@@ -889,16 +894,19 @@ def invoke_openai(
         cfg = Config.with_configs(self._config, kwargs.get("config"))
         kwargs["config"] = cfg
 
-        if not self.__data_api:
-            self.__data_api: Dict[str, AgentRuntimeDataAPI] = {}
+        if not self._data_api:
+            self._data_api: Dict[str, AgentRuntimeDataAPI] = {}
 
-        if self.__data_api[agent_runtime_endpoint_name] is None:
-            self.__data_api[agent_runtime_endpoint_name] = AgentRuntimeDataAPI(
+        if (
+            agent_runtime_endpoint_name not in self._data_api
+            or self._data_api[agent_runtime_endpoint_name] is None
+        ):
+            self._data_api[agent_runtime_endpoint_name] = AgentRuntimeDataAPI(
                 agent_runtime_name=self.agent_runtime_name or "",
                 agent_runtime_endpoint_name=agent_runtime_endpoint_name or "",
                 config=cfg,
             )
 
-        return self.__data_api[agent_runtime_endpoint_name].invoke_openai(
+        return self._data_api[agent_runtime_endpoint_name].invoke_openai(
             **kwargs
         )

agentrun/sandbox/api/__aio_data_async_template.py

@@ -103,9 +103,13 @@ def sync_playwright(
         from .playwright_sync import BrowserPlaywrightSync
 
         cfg = Config.with_configs(self.config, config)
-        _, headers, _ = self.auth(headers=cfg.get_headers(), config=cfg)
+
+        url = self.get_cdp_url(record=record)
+        url, headers, _ = self.auth(
+            url=url, headers=cfg.get_headers(), config=cfg
+        )
         return BrowserPlaywrightSync(
-            self.get_cdp_url(record=record),
+            url,
             browser_type=browser_type,
             headers=headers,
         )
@@ -119,9 +123,13 @@ def async_playwright(
         from .playwright_async import BrowserPlaywrightAsync
 
         cfg = Config.with_configs(self.config, config)
-        _, headers, _ = self.auth(headers=cfg.get_headers(), config=cfg)
+
+        url = self.get_cdp_url(record=record)
+        url, headers, _ = self.auth(
+            url=url, headers=cfg.get_headers(), config=cfg
+        )
         return BrowserPlaywrightAsync(
-            self.get_cdp_url(record=record),
+            url,
             browser_type=browser_type,
             headers=headers,
         )

agentrun/sandbox/api/__browser_data_async_template.py

@@ -92,9 +92,13 @@ def sync_playwright(
         from .playwright_sync import BrowserPlaywrightSync
 
         cfg = Config.with_configs(self.config, config)
-        _, headers, _ = self.auth(headers=cfg.get_headers(), config=cfg)
+
+        url = self.get_cdp_url(record=record)
+        url, headers, _ = self.auth(
+            url=url, headers=cfg.get_headers(), config=cfg
+        )
         return BrowserPlaywrightSync(
-            self.get_cdp_url(record=record),
+            url,
             browser_type=browser_type,
             headers=headers,
         )
@@ -108,9 +112,13 @@ def async_playwright(
         from .playwright_async import BrowserPlaywrightAsync
 
         cfg = Config.with_configs(self.config, config)
-        _, headers, _ = self.auth(headers=cfg.get_headers(), config=cfg)
+
+        url = self.get_cdp_url(record=record)
+        url, headers, _ = self.auth(
+            url=url, headers=cfg.get_headers(), config=cfg
+        )
         return BrowserPlaywrightAsync(
-            self.get_cdp_url(record=record),
+            url,
             browser_type=browser_type,
             headers=headers,
         )

agentrun/sandbox/api/aio_data.py

@@ -113,9 +113,13 @@ def sync_playwright(
         from .playwright_sync import BrowserPlaywrightSync
 
         cfg = Config.with_configs(self.config, config)
-        _, headers, _ = self.auth(headers=cfg.get_headers(), config=cfg)
+
+        url = self.get_cdp_url(record=record)
+        url, headers, _ = self.auth(
+            url=url, headers=cfg.get_headers(), config=cfg
+        )
         return BrowserPlaywrightSync(
-            self.get_cdp_url(record=record),
+            url,
             browser_type=browser_type,
             headers=headers,
         )
@@ -129,9 +133,13 @@ def async_playwright(
         from .playwright_async import BrowserPlaywrightAsync
 
         cfg = Config.with_configs(self.config, config)
-        _, headers, _ = self.auth(headers=cfg.get_headers(), config=cfg)
+
+        url = self.get_cdp_url(record=record)
+        url, headers, _ = self.auth(
+            url=url, headers=cfg.get_headers(), config=cfg
+        )
         return BrowserPlaywrightAsync(
-            self.get_cdp_url(record=record),
+            url,
             browser_type=browser_type,
             headers=headers,
         )

agentrun/sandbox/api/browser_data.py

@@ -102,9 +102,13 @@ def sync_playwright(
         from .playwright_sync import BrowserPlaywrightSync
 
         cfg = Config.with_configs(self.config, config)
-        _, headers, _ = self.auth(headers=cfg.get_headers(), config=cfg)
+
+        url = self.get_cdp_url(record=record)
+        url, headers, _ = self.auth(
+            url=url, headers=cfg.get_headers(), config=cfg
+        )
         return BrowserPlaywrightSync(
-            self.get_cdp_url(record=record),
+            url,
             browser_type=browser_type,
             headers=headers,
         )
@@ -118,9 +122,13 @@ def async_playwright(
         from .playwright_async import BrowserPlaywrightAsync
 
         cfg = Config.with_configs(self.config, config)
-        _, headers, _ = self.auth(headers=cfg.get_headers(), config=cfg)
+
+        url = self.get_cdp_url(record=record)
+        url, headers, _ = self.auth(
+            url=url, headers=cfg.get_headers(), config=cfg
+        )
         return BrowserPlaywrightAsync(
-            self.get_cdp_url(record=record),
+            url,
             browser_type=browser_type,
             headers=headers,
         )

agentrun/toolset/__toolset_async_template.py

@@ -94,11 +94,13 @@ def _get_openapi_auth_defaults(
         return headers, query
 
     def _get_openapi_base_url(self) -> Optional[str]:
-        return pydash.get(
-            self,
-            "status.outputs.urls.intranet_url",
-            None,
-        ) or pydash.get(self, "status.outputs.urls.internet_url", None)
+        intranet_url: Optional[str] = pydash.get(
+            self, "status.outputs.urls.intranet_url", None
+        )
+        if intranet_url:
+            return intranet_url
+
+        return pydash.get(self, "status.outputs.urls.internet_url", None)
 
     async def get_async(self, config: Optional[Config] = None):
         if self.name is None:

agentrun/toolset/api/openapi.py

@@ -829,6 +829,8 @@ def invoke_tool(
         request_kwargs, timeout, raise_for_status = self._prepare_request(
             name, arguments, config
         )
+
+        print(request_kwargs)
         with httpx.Client(timeout=timeout) as client:
             response = client.request(**request_kwargs)
             if raise_for_status:
@@ -943,6 +945,7 @@ def _walk(node: Any):
 
     def _extract_base_url(self, schema: Dict[str, Any]) -> Optional[str]:
         servers = schema.get("servers") or []
+        print("======", servers)
         return self._pick_server_url(servers)
 
     def _convert_to_native(self, value: Any) -> Any:

agentrun/toolset/toolset.py

@@ -109,11 +109,13 @@ def _get_openapi_auth_defaults(
         return headers, query
 
     def _get_openapi_base_url(self) -> Optional[str]:
-        return pydash.get(
-            self,
-            "status.outputs.urls.intranet_url",
-            None,
-        ) or pydash.get(self, "status.outputs.urls.internet_url", None)
+        intranet_url: Optional[str] = pydash.get(
+            self, "status.outputs.urls.intranet_url", None
+        )
+        if intranet_url:
+            return intranet_url
+
+        return pydash.get(self, "status.outputs.urls.internet_url", None)
 
     async def get_async(self, config: Optional[Config] = None):
         if self.name is None: