Merge pull request #14 from Serverless-Devs/feat-all-in-one-sandbox

[feat] implement all in one sandbox

Author: OhYee

agentrun/sandbox/README.md

@@ -2,6 +2,7 @@
 
 提供沙箱环境管理功能，包括 Sandbox 和 Template 的创建、管理和控制。"""
 
+from .aio_sandbox import AioSandbox
 from .browser_sandbox import BrowserSandbox
 from .client import SandboxClient
 from .code_interpreter_sandbox import CodeInterpreterSandbox
@@ -21,6 +22,7 @@
     TemplateNetworkConfiguration,
     TemplateNetworkMode,
     TemplateOssConfiguration,
+    TemplateOSSPermission,
     TemplateType,
 )
 from .sandbox import Sandbox
@@ -34,6 +36,7 @@
     "Template",
     "CodeInterpreterSandbox",
     "BrowserSandbox",
+    "AioSandbox",
     # 模型类
     "SandboxInput",
     "TemplateInput",
@@ -51,4 +54,5 @@
     "ListSandboxesInput",
     "ListSandboxesOutput",
     "CodeLanguage",
+    "TemplateOSSPermission",
 ]

agentrun/sandbox/README_zh.md

@@ -11,6 +11,7 @@
 from agentrun.utils.model import BaseModel
 
 if TYPE_CHECKING:
+    from agentrun.sandbox.aio_sandbox import AioSandbox
     from agentrun.sandbox.browser_sandbox import BrowserSandbox
     from agentrun.sandbox.code_interpreter_sandbox import CodeInterpreterSandbox
     from agentrun.sandbox.model import (
@@ -78,14 +79,25 @@ async def create_async(
     ) -> "BrowserSandbox":
         ...
 
+    @classmethod
+    @overload
+    async def create_async(
+        cls,
+        template_type: Literal[TemplateType.AIO],
+        template_name: Optional[str] = None,
+        sandbox_idle_timeout_seconds: Optional[int] = 600,
+        config: Optional[Config] = None,
+    ) -> "AioSandbox":
+        ...
+
     @classmethod
     async def create_async(
         cls,
         template_type: TemplateType,
         template_name: Optional[str] = None,
         sandbox_idle_timeout_seconds: Optional[int] = 600,
         config: Optional[Config] = None,
-    ) -> Union["CodeInterpreterSandbox", "BrowserSandbox"]:
+    ) -> Union["CodeInterpreterSandbox", "BrowserSandbox", "AioSandbox"]:
 
         if template_name is None:
             # todo 可以考虑为用户创建一个模板？
@@ -95,6 +107,7 @@ async def create_async(
         template = await cls.get_template_async(template_name, config=config)
 
         # 根据 template 类型创建相应的 Sandbox 子类
+        from agentrun.sandbox.aio_sandbox import AioSandbox
         from agentrun.sandbox.browser_sandbox import BrowserSandbox
         from agentrun.sandbox.code_interpreter_sandbox import (
             CodeInterpreterSandbox,
@@ -122,6 +135,10 @@ async def create_async(
             sandbox = BrowserSandbox.model_validate(
                 base_sandbox.model_dump(by_alias=False)
             )
+        elif template.template_type == TemplateType.AIO:
+            sandbox = AioSandbox.model_validate(
+                base_sandbox.model_dump(by_alias=False)
+            )
         else:
             raise ValueError(
                 f"template_type {template.template_type} is not supported"
@@ -198,14 +215,24 @@ async def connect_async(
     ) -> "BrowserSandbox":
         ...
 
+    @classmethod
+    @overload
+    async def connect_async(
+        cls,
+        sandbox_id: str,
+        template_type: Literal[TemplateType.AIO],
+        config: Optional[Config] = None,
+    ) -> "AioSandbox":
+        ...
+
     @classmethod
     @overload
     async def connect_async(
         cls,
         sandbox_id: str,
         template_type: None = None,
         config: Optional[Config] = None,
-    ) -> Union["CodeInterpreterSandbox", "BrowserSandbox"]:
+    ) -> Union["CodeInterpreterSandbox", "BrowserSandbox", "AioSandbox"]:
         ...
 
     @classmethod
@@ -214,7 +241,7 @@ async def connect_async(
         sandbox_id: str,
         template_type: Optional[TemplateType] = None,
         config: Optional[Config] = None,
-    ) -> Union["CodeInterpreterSandbox", "BrowserSandbox"]:
+    ) -> Union["CodeInterpreterSandbox", "BrowserSandbox", "AioSandbox"]:
         """连接一个SandBox（异步）
 
         Args:
@@ -255,6 +282,7 @@ async def connect_async(
             )
 
         # 根据 template 类型创建相应的 Sandbox 子类
+        from agentrun.sandbox.aio_sandbox import AioSandbox
         from agentrun.sandbox.browser_sandbox import BrowserSandbox
         from agentrun.sandbox.code_interpreter_sandbox import (
             CodeInterpreterSandbox,
@@ -269,10 +297,14 @@ async def connect_async(
             result = BrowserSandbox.model_validate(
                 sandbox.model_dump(by_alias=False)
             )
+        elif template.template_type == TemplateType.AIO:
+            result = AioSandbox.model_validate(
+                sandbox.model_dump(by_alias=False)
+            )
         else:
             raise ValueError(
                 f"Unsupported template type: {template.template_type}. "
-                "Expected 'code-interpreter' or 'browser'"
+                "Expected 'code-interpreter', 'browser' or 'aio'"
             )
 
         result._config = config