jdcloud-agentgrid 0.1.4__tar.gz → 0.2.1__tar.gz

{jdcloud_agentgrid-0.1.4 → jdcloud_agentgrid-0.2.1}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: jdcloud_agentgrid
-Version: 0.1.4
+Version: 0.2.1
 Summary: AgentGrid Python SDK for JDCloud AgentGrid Runtime
 Project-URL: Homepage, https://github.com/agentgrid/agentgrid-python
 Project-URL: Repository, https://github.com/agentgrid/agentgrid-python
 Author: AgentGrid SDK Team
 Requires-Python: >=3.10
-Requires-Dist: jdcloud-sdk>=1.6.314
+Requires-Dist: jdcloud-sdk>=1.6.321
 Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: starlette>=0.37.2
 Requires-Dist: uvicorn>=0.30.0
@@ -15,6 +15,7 @@ Requires-Dist: build>=1.2.2; extra == 'dev'
 Requires-Dist: httpx>=0.27.0; extra == 'dev'
 Requires-Dist: langchain-openrouter>=0.2.1; extra == 'dev'
 Requires-Dist: langchain>=0.3.28; extra == 'dev'
+Requires-Dist: playwright>=1.52.0; extra == 'dev'
 Requires-Dist: pytest>=8.2.0; extra == 'dev'
 Description-Content-Type: text/markdown
 
@@ -60,7 +61,7 @@ uv sync
 basic:
   region: cn-north-1
   endpoint: https://agentgrid.jdcloud-api.com
-  data_endpoint: https://agentgrid-cn-north-1.jdcloud.com
+  data_endpoint: https://agentgrid-api-cn-north-1.jdcloud.com
   timeout: 30
   connect_timeout: 5
   read_timeout: 30
@@ -80,7 +81,7 @@ from agentgrid import AgentGridProfile, runtime_session
 
 profile = AgentGridProfile(
     region="cn-north-1",
-    data_endpoint="https://agentgrid-cn-north-1.jdcloud.com",  # 可选：默认就是该地址
+    data_endpoint="https://agentgrid-api-cn-north-1.jdcloud.com",  # 可选：默认就是该地址
 )
 
 with runtime_session("cn-north-1", "your-runtime-id", profile=profile) as runtime:

{jdcloud_agentgrid-0.1.4 → jdcloud_agentgrid-0.2.1}/README.md

@@ -40,7 +40,7 @@ uv sync
 basic:
   region: cn-north-1
   endpoint: https://agentgrid.jdcloud-api.com
-  data_endpoint: https://agentgrid-cn-north-1.jdcloud.com
+  data_endpoint: https://agentgrid-api-cn-north-1.jdcloud.com
   timeout: 30
   connect_timeout: 5
   read_timeout: 30
@@ -60,7 +60,7 @@ from agentgrid import AgentGridProfile, runtime_session
 
 profile = AgentGridProfile(
     region="cn-north-1",
-    data_endpoint="https://agentgrid-cn-north-1.jdcloud.com",  # 可选：默认就是该地址
+    data_endpoint="https://agentgrid-api-cn-north-1.jdcloud.com",  # 可选：默认就是该地址
 )
 
 with runtime_session("cn-north-1", "your-runtime-id", profile=profile) as runtime:

{jdcloud_agentgrid-0.1.4 → jdcloud_agentgrid-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "jdcloud_agentgrid"
-version = "0.1.4"
+version = "0.2.1"
 description = "AgentGrid Python SDK for JDCloud AgentGrid Runtime"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -12,7 +12,7 @@ authors = [
   { name = "AgentGrid SDK Team" },
 ]
 dependencies = [
-  "jdcloud_sdk>=1.6.314",
+  "jdcloud_sdk>=1.6.321",
   "PyYAML>=6.0.2",
   "starlette>=0.37.2",
   "uvicorn>=0.30.0",
@@ -24,6 +24,7 @@ dev = [
   "httpx>=0.27.0",
   "langchain>=0.3.28",
   "langchain-openrouter>=0.2.1",
+  "playwright>=1.52.0",
   "pytest>=8.2.0",
 ]
 
@@ -49,5 +50,6 @@ breaking_change_requires_major_bump = true
 
 [dependency-groups]
 dev = [
+    "playwright>=1.52.0",
     "twine>=6.2.0",
 ]

{jdcloud_agentgrid-0.1.4 → jdcloud_agentgrid-0.2.1}/src/agentgrid/apps/base_app.py

@@ -9,5 +9,5 @@ class BaseAgentGridApp(ABC):
     """应用层统一运行接口。"""
 
     @abstractmethod
-    def run(self, host: str | None = None, port: int = 8000) -> None:
+    def run(self, host: str | None = None, port: int = 8080) -> None:
         """启动应用服务。"""

{jdcloud_agentgrid-0.1.4 → jdcloud_agentgrid-0.2.1}/src/agentgrid/apps/simple_app/simple_app_handlers.py

@@ -141,12 +141,21 @@ class InvokeHandler(BaseHandler):
 class PingHandler(BaseHandler):
     """`/ping` 与健康检查处理器。"""
 
+    def __init__(self, func: Callable[..., Any] | None = None) -> None:
+        super().__init__(func=func)
+        self._default_ping_updated_at = int(time.time())
+
     async def handle(self, request: Request) -> Response:
         del request
 
         if not self.func:
-            logger.error("Ping handler function is not set")
-            return Response(status_code=404)
+            return JSONResponse(
+                content={
+                    "status": "Healthy",
+                    "time_of_last_update": self._default_ping_updated_at,
+                },
+                media_type="application/json",
+            )
 
         if asyncio.iscoroutinefunction(self.func):
             result = await self.func()

{jdcloud_agentgrid-0.1.4 → jdcloud_agentgrid-0.2.1}/src/agentgrid/config.py

@@ -20,7 +20,7 @@ import yaml
 
 DEFAULT_RUNTIME_ENDPOINT_HOST = "agentgrid.jdcloud-api.com"
 DEFAULT_RUNTIME_ENDPOINT = f"http://{DEFAULT_RUNTIME_ENDPOINT_HOST}"
-DEFAULT_RUNTIME_DATA_ENDPOINT = "https://agentgrid-cn-north-1.jdcloud.com"
+DEFAULT_RUNTIME_DATA_ENDPOINT = "http://agentgrid-api-cn-north-1.jdcloud.com"
 
 
 @dataclass(slots=True, frozen=True)

{jdcloud_agentgrid-0.1.4 → jdcloud_agentgrid-0.2.1}/src/agentgrid/extensions/tools/browser_client.py

@@ -15,6 +15,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass, field
 from typing import TYPE_CHECKING, Any
+from urllib.parse import urlsplit
 
 from jdcloud_sdk.core.exception import ClientException, ServerException
 from jdcloud_sdk.core.jdcloudresponse import JDCloudResponse
@@ -69,8 +70,7 @@ def extract_browser_cdp_websocket_endpoint(payload: object) -> str | None:
     if not isinstance(payload, dict):
         return None
 
-    result = payload.get("result")
-    if isinstance(result, dict):
+    def _extract_from_mapping(mapping: dict[str, Any]) -> str | None:
         for key in (
             "cdpWebSocketEndpoint",
             "cdpWebsocketEndpoint",
@@ -79,25 +79,46 @@ def extract_browser_cdp_websocket_endpoint(payload: object) -> str | None:
             "websocketDebuggerUrl",
             "cdp_endpoint",
         ):
-            endpoint = result.get(key)
+            endpoint = mapping.get(key)
             if isinstance(endpoint, str) and endpoint.strip():
                 return endpoint.strip()
+        return None
 
-    for key in (
-        "cdpWebSocketEndpoint",
-        "cdpWebsocketEndpoint",
-        "cdpEndpoint",
-        "webSocketDebuggerUrl",
-        "websocketDebuggerUrl",
-        "cdp_endpoint",
-    ):
-        endpoint = payload.get(key)
-        if isinstance(endpoint, str) and endpoint.strip():
-            return endpoint.strip()
+    candidates: list[dict[str, Any]] = []
+    result = payload.get("result")
+    if isinstance(result, dict):
+        browser_session = result.get("browserToolSession")
+        if isinstance(browser_session, dict):
+            candidates.append(browser_session)
+        candidates.append(result)
+
+    browser_session = payload.get("browserToolSession")
+    if isinstance(browser_session, dict):
+        candidates.append(browser_session)
+    candidates.append(payload)
+
+    for candidate in candidates:
+        endpoint = _extract_from_mapping(candidate)
+        if endpoint is not None:
+            return endpoint
 
     return None
 
 
+def _normalize_cdp_websocket_endpoint(endpoint: str) -> str:
+    """归一化 CDP 地址，缺省协议时补全 `ws://`。"""
+
+    value = endpoint.strip()
+    if not value:
+        return value
+
+    if urlsplit(value).scheme:
+        return value
+    if value.startswith("//"):
+        return f"ws:{value}"
+    return f"ws://{value}"
+
+
 @dataclass(slots=True)
 class BrowserSessionHandle:
     """Browser Tool 已启动会话句柄。"""
@@ -105,9 +126,29 @@ class BrowserSessionHandle:
     profile: AgentGridProfile
     browser_tool_id: str
     session_id: str
+    _api_key: str | None = field(default=None, repr=False)
     _cdp_websocket_endpoint: str | None = field(default=None, repr=False)
     _stopped: bool = field(default=False, init=False, repr=False)
 
+    def get_cdp_connect_headers(self, *, api_key: str | None = None) -> dict[str, str]:
+        """返回 Playwright CDP 连接所需请求头。"""
+
+        headers = {
+            "x-agentgrid-browser-session-id": self.session_id,
+        }
+
+        effective_api_key = self._api_key if api_key is None else api_key
+        if effective_api_key is None:
+            raise ValueError(
+                "cdp api key is required, pass browser_session apiKey or set tools.browser.api_key/runtime.api_key"
+            )
+        normalized_api_key = effective_api_key.strip()
+        if not normalized_api_key:
+            raise ValueError("cdp api key must not be empty")
+        headers["x-api-key"] = normalized_api_key
+
+        return headers
+
     def stop(self, *, headers: dict[str, str] | None = None) -> dict[str, Any]:
         """停止当前 Browser 会话。"""
 
@@ -156,7 +197,11 @@ class BrowserSessionHandle:
         """获取可用于 CDP 连接的 websocket 地址。"""
 
         if not refresh and self._cdp_websocket_endpoint is not None:
-            return self._cdp_websocket_endpoint
+            normalized_endpoint = _normalize_cdp_websocket_endpoint(
+                self._cdp_websocket_endpoint
+            )
+            self._cdp_websocket_endpoint = normalized_endpoint
+            return normalized_endpoint
 
         payload = self.get_session_detail(headers=headers)
         endpoint = extract_browser_cdp_websocket_endpoint(payload)
@@ -172,8 +217,9 @@ class BrowserSessionHandle:
                 },
             )
 
-        self._cdp_websocket_endpoint = endpoint
-        return endpoint
+        normalized_endpoint = _normalize_cdp_websocket_endpoint(endpoint)
+        self._cdp_websocket_endpoint = normalized_endpoint
+        return normalized_endpoint
 
 
 @dataclass(slots=True)

{jdcloud_agentgrid-0.1.4 → jdcloud_agentgrid-0.2.1}/src/agentgrid/extensions/tools/code_interpreter_client.py

@@ -8,7 +8,8 @@
 
 说明：
 - 控制面与数据面均在本文件内收敛实现。
-- 数据面统一复用 `basic.data_endpoint` 下的 `/invoke` 协议。
+- 数据面走 `basic.data_endpoint` 下的
+  `/v1/regions/<region>/code-interpreters/<code-interpreter-identifier>:invoke`。
 """
 
 from __future__ import annotations
@@ -92,6 +93,7 @@ class CodeInterpreterSessionHandle:
     profile: AgentGridProfile
     code_interpreter_id: str
     session_id: str
+    _default_data_plane_headers: dict[str, str] | None = field(default=None, repr=False)
     _stopped: bool = field(default=False, init=False, repr=False)
     _started: bool = field(default=True, repr=False)
 
@@ -711,7 +713,10 @@ class CodeInterpreterSessionHandle:
     def _build_data_plane_headers(
         self, *, headers: dict[str, str] | None
     ) -> dict[str, str]:
-        merged = dict(headers or {})
+        merged = dict(self._default_data_plane_headers or {})
+        merged.update(dict(headers or {}))
+        # 数据面会话绑定头必须携带真实 session_id，避免被外部误传覆盖。
+        merged["x-agentgrid-code-interpreter-session-id"] = self.session_id
         merged.setdefault("Content-Type", "application/json")
         merged.setdefault("Accept", "application/json, text/event-stream")
         return apply_authentication(
@@ -720,12 +725,32 @@ class CodeInterpreterSessionHandle:
             api_key=None,
         )
 
+    @staticmethod
+    def _extract_data_plane_default_headers(
+        headers: dict[str, str] | None,
+    ) -> dict[str, str] | None:
+        if not headers:
+            return None
+
+        for key, value in headers.items():
+            if key.lower() != "x-api-key":
+                continue
+            normalized = str(value).strip()
+            if not normalized:
+                continue
+            return {"x-api-key": normalized}
+        return None
+
     def _build_data_plane_url(self) -> str:
         endpoint = self.profile.config.effective_data_endpoint.strip()
         if "://" not in endpoint:
             endpoint = f"http://{endpoint}"
         endpoint = endpoint.rstrip("/")
-        return f"{endpoint}/invoke"
+        region = str(self.profile.config.region).strip()
+        return (
+            f"{endpoint}/v1/regions/{region}/code-interpreters/"
+            f"{self.code_interpreter_id}:invoke"
+        )
 
     def _resolve_data_plane_timeout(self) -> float | None:
         if self.profile.config.effective_connect_timeout is not None:
@@ -986,10 +1011,14 @@ class CodeInterpreterClient:
                 raw_error=payload,
             )
 
+        default_data_plane_headers = (
+            CodeInterpreterSessionHandle._extract_data_plane_default_headers(headers)
+        )
         return CodeInterpreterSessionHandle(
             profile=self.profile,
             code_interpreter_id=resolved_code_interpreter_id,
             session_id=session_id,
+            _default_data_plane_headers=default_data_plane_headers,
         )
 
     def get_code_interpreter_session(

{jdcloud_agentgrid-0.1.4 → jdcloud_agentgrid-0.2.1}/src/agentgrid/runtime/client.py

@@ -96,7 +96,7 @@ class AgentGridRuntimeClient:
         )
         effective_api_key = self._resolve_api_key(api_key)
 
-        headers: dict[str, str] = {"Host": f"{runtime_id}.agentgrid.jdcloud.com"}
+        headers: dict[str, str] = {}
         if effective_session_id is not None:
             headers["x-agentgrid-runtime-session-id"] = effective_session_id
         if request_id is not None:

{jdcloud_agentgrid-0.1.4 → jdcloud_agentgrid-0.2.1}/src/agentgrid/session.py

@@ -151,6 +151,7 @@ def browser_session(
         profile=effective_profile,
         browser_tool_id=effective_identifier,
         session_id=session_id,
+        _api_key=effective_api_key,
     )
 
     try:
@@ -445,16 +446,17 @@ def _extract_browser_session_status(payload: object) -> str:
 
     result = payload.get("result")
     if isinstance(result, dict):
-        status = (
-            result.get("status")
-            or result.get("state")
-            or result.get("sessionStatus")
-            or result.get("session_state")
-        )
+        browser_tool_session = result.get("browserToolSession")
+        if isinstance(browser_tool_session, dict):
+            status = browser_tool_session.get("state")
+            if isinstance(status, str) and status.strip():
+                return status.strip().lower()
+
+        status = result.get("state")
         if isinstance(status, str) and status.strip():
             return status.strip().lower()
 
-    status = payload.get("status") or payload.get("state")
+    status = payload.get("state")
     if isinstance(status, str) and status.strip():
         return status.strip().lower()
     return "unknown"

{jdcloud_agentgrid-0.1.4 → jdcloud_agentgrid-0.2.1}/src/agentgrid/version.py

@@ -3,4 +3,4 @@
 v1 基线采用语义化版本策略，当前为初始开发版本。
 """
 
-__version__ = "0.1.0"
+__version__ = "0.2.1"