agentscope-runtime 0.1.5b2__py3-none-any.whl → 0.1.6__py3-none-any.whl

agentscope_runtime/sandbox/client/http_client.py

@@ -3,13 +3,12 @@
 import logging
 import time
 from typing import Any, Optional
+from urllib.parse import urljoin
 
 import requests
 from pydantic import Field
-from steel import Steel
 
 from ..model import ContainerModel
-from ..constant import BROWSER_SESSION_ID
 
 
 logging.getLogger("httpx").setLevel(logging.CRITICAL)
@@ -69,8 +68,7 @@ class SandboxHttpClient:
     def __init__(
         self,
         model: Optional[ContainerModel] = None,
-        timeout: int = 30,
-        enable_browser: bool = True,
+        timeout: int = 60,
         domain: str = "localhost",
     ) -> None:
         """
@@ -81,49 +79,28 @@ class SandboxHttpClient:
             runtime sandbox.
         """
         self.session_id = model.session_id
-        self.base_url = model.base_url.replace("localhost", domain)
-        self.browser_url = model.browser_url.replace("localhost", domain)
-        self.client_browser_ws = model.client_browser_ws.replace(
-            "localhost",
-            domain,
+        self.base_url = urljoin(
+            model.url.replace("localhost", domain),
+            "fastapi",
         )
 
-        self.enable_browser = enable_browser
         self.timeout = timeout
         self.session = requests.Session()
         self.built_in_tools = []
         self.secret = model.runtime_token
 
         # Update headers with secret if provided
-        headers = {"Content-Type": "application/json"}
+        headers = {
+            "Content-Type": "application/json",
+            "x-agentrun-session-id": "s" + self.session_id,
+        }
         if self.secret:
             headers["Authorization"] = f"Bearer {self.secret}"
         self.session.headers.update(headers)
 
-        self.steel_client = None
-
     def __enter__(self):
         # Wait for the runtime api server to be healthy
         self.wait_until_healthy()
-
-        if self.enable_browser:
-            self.steel_client = Steel(
-                steel_api_key="dummy",
-                base_url=self.browser_url,
-            )
-
-            # Create a new browser session if it doesn't exist
-            try:
-                # Try to connet to existing session
-                self.steel_client.sessions.retrieve(
-                    BROWSER_SESSION_ID,
-                )
-            except Exception:
-                # Session not found, create a new one
-                self.steel_client.sessions.create(
-                    session_id=BROWSER_SESSION_ID,
-                )
-
         return self
 
     def __exit__(self, exc_type, exc_value, traceback):
@@ -138,17 +115,9 @@ class SandboxHttpClient:
             bool: True if the service is reachable, False otherwise
         """
         endpoint = f"{self.base_url}/healthz"
-        browser_endpoint = f"{self.browser_url}/v1/health"
         try:
             response_api = self.session.get(endpoint)
-            if self.enable_browser:
-                response_browser = self.session.get(browser_endpoint)
-                return (
-                    response_api.status_code == 200
-                    and response_browser.status_code == 200
-                )
-            else:
-                return response_api.status_code == 200
+            return response_api.status_code == 200
         except requests.RequestException:
             return False
 
@@ -246,7 +215,10 @@ class SandboxHttpClient:
         """Run an IPython cell."""
         try:
             endpoint = f"{self.base_url}/tools/run_ipython_cell"
-            response = self.session.post(endpoint, json={"code": code})
+            response = self.session.post(
+                endpoint,
+                json={"code": code},
+            )
             response.raise_for_status()
             return response.json()
         except requests.exceptions.RequestException as e:
@@ -379,7 +351,11 @@ class SandboxHttpClient:
             endpoint = f"{self.base_url}/workspace/files"
             params = {"file_path": file_path}
             data = {"content": content}
-            response = self.session.post(endpoint, params=params, json=data)
+            response = self.session.post(
+                endpoint,
+                params=params,
+                json=data,
+            )
             response.raise_for_status()
             return response.json()
         except requests.exceptions.RequestException as e:
@@ -402,7 +378,10 @@ class SandboxHttpClient:
         try:
             endpoint = f"{self.base_url}/workspace/list-directories"
             params = {"directory": directory}
-            response = self.session.get(endpoint, params=params)
+            response = self.session.get(
+                endpoint,
+                params=params,
+            )
             response.raise_for_status()
             return response.json()
         except requests.exceptions.RequestException as e:
@@ -419,7 +398,10 @@ class SandboxHttpClient:
         try:
             endpoint = f"{self.base_url}/workspace/directories"
             params = {"directory_path": directory_path}
-            response = self.session.post(endpoint, params=params)
+            response = self.session.post(
+                endpoint,
+                params=params,
+            )
             response.raise_for_status()
             return response.json()
         except requests.exceptions.RequestException as e:
@@ -438,7 +420,10 @@ class SandboxHttpClient:
         try:
             endpoint = f"{self.base_url}/workspace/files"
             params = {"file_path": file_path}
-            response = self.session.delete(endpoint, params=params)
+            response = self.session.delete(
+                endpoint,
+                params=params,
+            )
             response.raise_for_status()
             return response.json()
         except requests.exceptions.RequestException as e:
@@ -461,7 +446,10 @@ class SandboxHttpClient:
         try:
             endpoint = f"{self.base_url}/workspace/directories"
             params = {"directory_path": directory_path, "recursive": recursive}
-            response = self.session.delete(endpoint, params=params)
+            response = self.session.delete(
+                endpoint,
+                params=params,
+            )
             response.raise_for_status()
             return response.json()
         except requests.exceptions.RequestException as e:
@@ -487,7 +475,10 @@ class SandboxHttpClient:
                 "source_path": source_path,
                 "destination_path": destination_path,
             }
-            response = self.session.put(endpoint, params=params)
+            response = self.session.put(
+                endpoint,
+                params=params,
+            )
             response.raise_for_status()
             return response.json()
         except requests.exceptions.RequestException as e:
@@ -514,7 +505,10 @@ class SandboxHttpClient:
                 "source_path": source_path,
                 "destination_path": destination_path,
             }
-            response = self.session.post(endpoint, params=params)
+            response = self.session.post(
+                endpoint,
+                params=params,
+            )
             response.raise_for_status()
             return response.json()
         except requests.exceptions.RequestException as e:

agentscope_runtime/sandbox/client/training_client.py

@@ -212,7 +212,6 @@ class TrainingSandboxClient:
     def list_tools(self, **kwargs):
         """list tools"""
         if "instance_id" in kwargs:
-            # 只传get_tools_info的方法参数
             return self.get_tools_info(
                 instance_id=kwargs.get("instance_id"),
                 messages=kwargs.get("messages", {}),

agentscope_runtime/sandbox/constant.py

@@ -1,5 +1,28 @@
 # -*- coding: utf-8 -*-
 import os
+import sys
+import logging
 
+logger = logging.getLogger(__name__)
+
+# Image Registry: default "", means using Docker Hub.
+# For AgentScope official registry, use
+# "agentscope-registry.ap-southeast-1.cr.aliyuncs.com"
+REGISTRY = os.getenv("RUNTIME_SANDBOX_REGISTRY", "")
+if REGISTRY == "":
+    agentscope_acr = "agentscope-registry.ap-southeast-1.cr.aliyuncs.com"
+    if sys.platform.startswith("win"):
+        cmd = f"set RUNTIME_SANDBOX_REGISTRY={agentscope_acr}"
+    else:
+        cmd = f"export RUNTIME_SANDBOX_REGISTRY={agentscope_acr}"
+    logger.warning(
+        "Using Docker Hub as image registry. If pulling is slow or fails, "
+        f"you can switch to the AgentScope official registry by running:\n  "
+        f"{cmd}\n",
+    )
+
+# Image Namespace
+IMAGE_NAMESPACE = os.getenv("RUNTIME_SANDBOX_IMAGE_NAMESPACE", "agentscope")
+
+# Image Tag
 IMAGE_TAG = os.getenv("RUNTIME_SANDBOX_IMAGE_TAG", "latest")
-BROWSER_SESSION_ID = "123e4567-e89b-12d3-a456-426614174000"

agentscope_runtime/sandbox/custom/custom_sandbox.py

@@ -3,17 +3,17 @@ import os
 
 from typing import Optional
 
-from ..constant import IMAGE_TAG
+from ..utils import build_image_uri
 from ..registry import SandboxRegistry
 from ..enums import SandboxType
 from ..box.sandbox import Sandbox
 
-SANDBOXTYPE = "custom_sandbox"
+SANDBOX_TYPE = "custom_sandbox"
 
 
 @SandboxRegistry.register(
-    f"agentscope/runtime-sandbox-{SANDBOXTYPE}:{IMAGE_TAG}",
-    sandbox_type=SANDBOXTYPE,
+    build_image_uri(f"runtime-sandbox-{SANDBOX_TYPE}"),
+    sandbox_type=SANDBOX_TYPE,
     security_level="medium",
     timeout=60,
     description="my sandbox",
@@ -35,5 +35,5 @@ class CustomSandbox(Sandbox):
             timeout,
             base_url,
             bearer_token,
-            SandboxType(SANDBOXTYPE),
+            SandboxType(SANDBOX_TYPE),
         )

agentscope_runtime/sandbox/custom/example.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from typing import Optional
 
-from ..constant import IMAGE_TAG
+from ..utils import build_image_uri
 from ..registry import SandboxRegistry
 from ..enums import SandboxType
 from ..box.sandbox import Sandbox
@@ -10,7 +10,7 @@ SANDBOX_TYPE = "example"
 
 
 @SandboxRegistry.register(
-    f"agentscope/runtime-sandbox-{SANDBOX_TYPE}:{IMAGE_TAG}",
+    build_image_uri(f"runtime-sandbox-{SANDBOX_TYPE}"),
     sandbox_type=SANDBOX_TYPE,
     security_level="medium",
     timeout=60,

agentscope_runtime/sandbox/enums.py

@@ -65,6 +65,7 @@ class SandboxType(DynamicEnum):
     BASE = "base"
     BROWSER = "browser"
     FILESYSTEM = "filesystem"
+    GUI = "gui"
     APPWORLD = "appworld"
     BFCL = "bfcl"
     WEBSHOP = "webshop"

agentscope_runtime/sandbox/manager/collections/in_memory_mapping.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from typing import Any
+
 from .base_mapping import Mapping
 
 
@@ -6,17 +8,20 @@ class InMemoryMapping(Mapping):
     def __init__(self):
         self.store = {}
 
-    def set(self, key: str, value: dict):
+    def set(self, key: str, value: Any):
         self.store[key] = value
 
-    def get(self, key: str) -> dict:
+    def get(self, key: str) -> Any:
         return self.store.get(key)
 
     def delete(self, key: str):
         if key in self.store:
             del self.store[key]
 
-    def scan(self, prefix: str):
-        for key in list(self.store.keys()):
-            if key.startswith(prefix):
-                yield key
+    def scan(self, prefix: str = None):
+        if prefix is None:
+            yield from list(self.store.keys())
+        else:
+            yield from list(
+                key for key in self.store if key.startswith(prefix)
+            )

agentscope_runtime/sandbox/manager/collections/redis_mapping.py

@@ -1,26 +1,42 @@
 # -*- coding: utf-8 -*-
 import json
 
+from typing import Any
+
 from .base_mapping import Mapping
 
 
 class RedisMapping(Mapping):
-    def __init__(self, redis_client):
+    def __init__(self, redis_client, prefix: str = ""):
         self.client = redis_client
+        self.prefix = prefix.rstrip(":") + ":" if prefix else ""
+
+    def _get_full_key(self, key: str) -> str:
+        return f"{self.prefix}{key}"
+
+    def _strip_prefix(self, full_key: str) -> str:
+        if self.prefix and full_key.startswith(self.prefix):
+            return full_key[len(self.prefix) :]
+        return full_key
 
-    def set(self, key: str, value: dict):
-        self.client.set(key, json.dumps(value))
+    def set(self, key: str, value: Any):
+        self.client.set(self._get_full_key(key), json.dumps(value))
 
-    def get(self, key: str) -> dict:
-        value = self.client.get(key)
+    def get(self, key: str) -> Any:
+        value = self.client.get(self._get_full_key(key))
         return json.loads(value) if value else None
 
     def delete(self, key: str):
-        self.client.delete(key)
+        self.client.delete(self._get_full_key(key))
 
-    def scan(self, prefix: str):
+    def scan(self, prefix: str = ""):
+        search_pattern = f"{self._get_full_key(prefix)}*"
         cursor = 0
         while cursor != 0:
-            cursor, keys = self.client.scan(cursor=cursor, match=f"{prefix}*")
+            cursor, keys = self.client.scan(
+                cursor=cursor,
+                match=search_pattern,
+            )
             for key in keys:
-                yield key.decode("utf-8")
+                decoded_key = key.decode("utf-8")
+                yield self._strip_prefix(decoded_key)

agentscope_runtime/sandbox/manager/container_clients/__init__.py

@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-from .base_client import BaseClient
-from .docker_client import DockerClient
-from .kubernetes_client import KubernetesClient
-
-__all__ = [
-    "BaseClient",
-    "DockerClient",
-    "KubernetesClient",
-]