rl-rock 0.2.1.dev1__tar.gz → 0.2.1.dev2__tar.gz

{rl_rock-0.2.1.dev1/rl_rock.egg-info → rl_rock-0.2.1.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rl-rock
-Version: 0.2.1.dev1
+Version: 0.2.1.dev2
 Summary: ROCK-Reinforcement Open Construction Kit
 Author: chatos@alibaba
 Requires-Python: <4.0,>=3.10
@@ -89,7 +89,7 @@ ROCK adopts a client-server architecture, supports different levels of isolation
 [API References](https://alibaba.github.io/ROCK/docs/api)
 
 ---
-Intall ROCK with `pip` or source, and start the local admin server:
+**Recommended**: Install from source (using uv). Alternatively, install from PyPI. Start the local admin server:
 
 ```bash
 # Clone repository
@@ -109,6 +109,22 @@ source .venv/bin/activate
 rock admin start
 ```
 
+### PyPI Installation (Recommended for simple testing)
+
+To install ROCK from PyPI (recommended only for simple testing):
+
+```bash
+# Install from PyPI
+pip install rl-rock
+
+# If using the pip runtime environment (for sandbox dependency installation),
+# you may need to set runtime environment type to pip:
+export ROCK_WORKER_ENV_TYPE=pip
+
+# Start admin server
+rock admin start
+```
+
 **Notes**: ROCK depends on Docker and uv tools for environment management.
 
 1. **Python Environment Configuration**: To ensure ROCK can correctly mount the project and virtual environment along with its base Python interpreter, it is strongly recommended to use uv-managed Python environments to create virtual environments rather than system Python. This can be achieved through the `--python-preference only-managed` parameter.
@@ -117,7 +133,9 @@ rock admin start
 
 3. **Dependency Management**: Use the `uv` command to install all dependency groups, ensuring consistency between development, testing, and production environments.
 
-4. **OS Support**: ROCK recommends managing environments on the same operating system, such as managing Linux image environments on a Linux system. However, it also supports cross-operating system level image management, for example, launching Ubuntu images on MacOS. 
+4. **Pip Source Installation**: For pip source installation (e.g., `pip install rl-rock`), you need to set the `ROCK_WORKER_ENV_TYPE=pip` environment variable and ensure network access for the sandbox to install dependencies. See [Configuration Documentation](docs/rock/configuration.md) for more details on runtime environment options and environment variables.
+
+5. **OS Support**: ROCK recommends managing environments on the same operating system, such as managing Linux image environments on a Linux system. However, it also supports cross-operating system level image management, for example, launching Ubuntu images on MacOS. 
 
 ### Using Env Protocol
 ROCK is fully compatible with the GEM protocol, providing standardized environment interfaces:
@@ -231,8 +249,8 @@ observation, reward, terminated, truncated, info = env.step(action)
 # Activate virtual environment
 source .venv/bin/activate
 
-# Start Rock service, local startup
-admin --env local
+# Start Rock service, default local startup
+rock admin start
 ```
 
 > **Service Information**: The ROCK Local Admin service runs by default on `http://127.0.0.1:8080`. You can access this address through your browser to view the management interface.
@@ -286,7 +304,7 @@ Special thanks to:
 
 ---
 
-## 🤝 About [ROCK n ROLL Team]
+## 🤝 About [ROCK & ROLL Team]
 ROCK is a project jointly developed by Taotian Future Living Lab and Alibaba AI Engine Team, with a strong emphasis on pioneering the future of Reinforcement Learning (RL). Our mission is to explore and shape innovative forms of future living powered by advanced RL technologies. If you are passionate about the future of RL and want to be part of its evolution, we warmly welcome you to join us! 
 
 For more information about **ROLL**, please visit:
@@ -298,7 +316,9 @@ Learn more about the ROCK & ROLL Team through our official channels below👇
 <a href="./assets/rock_wechat.png" target="_blank">
   <img src="https://img.shields.io/badge/WeChat-green?logo=wechat" alt="WeChat QR">
 </a>
-
+<a href="./assets/future_lab.png" target="_blank">
+  <img src="https://img.shields.io/twitter/follow/FutureLab2025?style=social" alt="X QR">
+</a>
 
 ---
 

{rl_rock-0.2.1.dev1 → rl_rock-0.2.1.dev2}/README.md

@@ -36,7 +36,7 @@ ROCK adopts a client-server architecture, supports different levels of isolation
 [API References](https://alibaba.github.io/ROCK/docs/api)
 
 ---
-Intall ROCK with `pip` or source, and start the local admin server:
+**Recommended**: Install from source (using uv). Alternatively, install from PyPI. Start the local admin server:
 
 ```bash
 # Clone repository
@@ -56,6 +56,22 @@ source .venv/bin/activate
 rock admin start
 ```
 
+### PyPI Installation (Recommended for simple testing)
+
+To install ROCK from PyPI (recommended only for simple testing):
+
+```bash
+# Install from PyPI
+pip install rl-rock
+
+# If using the pip runtime environment (for sandbox dependency installation),
+# you may need to set runtime environment type to pip:
+export ROCK_WORKER_ENV_TYPE=pip
+
+# Start admin server
+rock admin start
+```
+
 **Notes**: ROCK depends on Docker and uv tools for environment management.
 
 1. **Python Environment Configuration**: To ensure ROCK can correctly mount the project and virtual environment along with its base Python interpreter, it is strongly recommended to use uv-managed Python environments to create virtual environments rather than system Python. This can be achieved through the `--python-preference only-managed` parameter.
@@ -64,7 +80,9 @@ rock admin start
 
 3. **Dependency Management**: Use the `uv` command to install all dependency groups, ensuring consistency between development, testing, and production environments.
 
-4. **OS Support**: ROCK recommends managing environments on the same operating system, such as managing Linux image environments on a Linux system. However, it also supports cross-operating system level image management, for example, launching Ubuntu images on MacOS. 
+4. **Pip Source Installation**: For pip source installation (e.g., `pip install rl-rock`), you need to set the `ROCK_WORKER_ENV_TYPE=pip` environment variable and ensure network access for the sandbox to install dependencies. See [Configuration Documentation](docs/rock/configuration.md) for more details on runtime environment options and environment variables.
+
+5. **OS Support**: ROCK recommends managing environments on the same operating system, such as managing Linux image environments on a Linux system. However, it also supports cross-operating system level image management, for example, launching Ubuntu images on MacOS. 
 
 ### Using Env Protocol
 ROCK is fully compatible with the GEM protocol, providing standardized environment interfaces:
@@ -178,8 +196,8 @@ observation, reward, terminated, truncated, info = env.step(action)
 # Activate virtual environment
 source .venv/bin/activate
 
-# Start Rock service, local startup
-admin --env local
+# Start Rock service, default local startup
+rock admin start
 ```
 
 > **Service Information**: The ROCK Local Admin service runs by default on `http://127.0.0.1:8080`. You can access this address through your browser to view the management interface.
@@ -233,7 +251,7 @@ Special thanks to:
 
 ---
 
-## 🤝 About [ROCK n ROLL Team]
+## 🤝 About [ROCK & ROLL Team]
 ROCK is a project jointly developed by Taotian Future Living Lab and Alibaba AI Engine Team, with a strong emphasis on pioneering the future of Reinforcement Learning (RL). Our mission is to explore and shape innovative forms of future living powered by advanced RL technologies. If you are passionate about the future of RL and want to be part of its evolution, we warmly welcome you to join us! 
 
 For more information about **ROLL**, please visit:
@@ -245,7 +263,9 @@ Learn more about the ROCK & ROLL Team through our official channels below👇
 <a href="./assets/rock_wechat.png" target="_blank">
   <img src="https://img.shields.io/badge/WeChat-green?logo=wechat" alt="WeChat QR">
 </a>
-
+<a href="./assets/future_lab.png" target="_blank">
+  <img src="https://img.shields.io/twitter/follow/FutureLab2025?style=social" alt="X QR">
+</a>
 
 ---
 

{rl_rock-0.2.1.dev1 → rl_rock-0.2.1.dev2}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 authors = [{ name = "chatos@alibaba" }]
 requires-python = "<4.0,>=3.10"
 name = "rl-rock"
-version = "0.2.1.dev1"
+version = "0.2.1.dev2"
 description = "ROCK-Reinforcement Open Construction Kit"
 readme = "README.md"
 dependencies = [

{rl_rock-0.2.1.dev1 → rl_rock-0.2.1.dev2/rl_rock.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rl-rock
-Version: 0.2.1.dev1
+Version: 0.2.1.dev2
 Summary: ROCK-Reinforcement Open Construction Kit
 Author: chatos@alibaba
 Requires-Python: <4.0,>=3.10
@@ -89,7 +89,7 @@ ROCK adopts a client-server architecture, supports different levels of isolation
 [API References](https://alibaba.github.io/ROCK/docs/api)
 
 ---
-Intall ROCK with `pip` or source, and start the local admin server:
+**Recommended**: Install from source (using uv). Alternatively, install from PyPI. Start the local admin server:
 
 ```bash
 # Clone repository
@@ -109,6 +109,22 @@ source .venv/bin/activate
 rock admin start
 ```
 
+### PyPI Installation (Recommended for simple testing)
+
+To install ROCK from PyPI (recommended only for simple testing):
+
+```bash
+# Install from PyPI
+pip install rl-rock
+
+# If using the pip runtime environment (for sandbox dependency installation),
+# you may need to set runtime environment type to pip:
+export ROCK_WORKER_ENV_TYPE=pip
+
+# Start admin server
+rock admin start
+```
+
 **Notes**: ROCK depends on Docker and uv tools for environment management.
 
 1. **Python Environment Configuration**: To ensure ROCK can correctly mount the project and virtual environment along with its base Python interpreter, it is strongly recommended to use uv-managed Python environments to create virtual environments rather than system Python. This can be achieved through the `--python-preference only-managed` parameter.
@@ -117,7 +133,9 @@ rock admin start
 
 3. **Dependency Management**: Use the `uv` command to install all dependency groups, ensuring consistency between development, testing, and production environments.
 
-4. **OS Support**: ROCK recommends managing environments on the same operating system, such as managing Linux image environments on a Linux system. However, it also supports cross-operating system level image management, for example, launching Ubuntu images on MacOS. 
+4. **Pip Source Installation**: For pip source installation (e.g., `pip install rl-rock`), you need to set the `ROCK_WORKER_ENV_TYPE=pip` environment variable and ensure network access for the sandbox to install dependencies. See [Configuration Documentation](docs/rock/configuration.md) for more details on runtime environment options and environment variables.
+
+5. **OS Support**: ROCK recommends managing environments on the same operating system, such as managing Linux image environments on a Linux system. However, it also supports cross-operating system level image management, for example, launching Ubuntu images on MacOS. 
 
 ### Using Env Protocol
 ROCK is fully compatible with the GEM protocol, providing standardized environment interfaces:
@@ -231,8 +249,8 @@ observation, reward, terminated, truncated, info = env.step(action)
 # Activate virtual environment
 source .venv/bin/activate
 
-# Start Rock service, local startup
-admin --env local
+# Start Rock service, default local startup
+rock admin start
 ```
 
 > **Service Information**: The ROCK Local Admin service runs by default on `http://127.0.0.1:8080`. You can access this address through your browser to view the management interface.
@@ -286,7 +304,7 @@ Special thanks to:
 
 ---
 
-## 🤝 About [ROCK n ROLL Team]
+## 🤝 About [ROCK & ROLL Team]
 ROCK is a project jointly developed by Taotian Future Living Lab and Alibaba AI Engine Team, with a strong emphasis on pioneering the future of Reinforcement Learning (RL). Our mission is to explore and shape innovative forms of future living powered by advanced RL technologies. If you are passionate about the future of RL and want to be part of its evolution, we warmly welcome you to join us! 
 
 For more information about **ROLL**, please visit:
@@ -298,7 +316,9 @@ Learn more about the ROCK & ROLL Team through our official channels below👇
 <a href="./assets/rock_wechat.png" target="_blank">
   <img src="https://img.shields.io/badge/WeChat-green?logo=wechat" alt="WeChat QR">
 </a>
-
+<a href="./assets/future_lab.png" target="_blank">
+  <img src="https://img.shields.io/twitter/follow/FutureLab2025?style=social" alt="X QR">
+</a>
 
 ---
 

{rl_rock-0.2.1.dev1 → rl_rock-0.2.1.dev2}/rl_rock.egg-info/SOURCES.txt

@@ -24,7 +24,7 @@ rock/admin/core/redis_key.py
 rock/admin/core/sandbox_table.py
 rock/admin/core/schema.py
 rock/admin/entrypoints/sandbox_api.py
-rock/admin/entrypoints/sandbox_read_api.py
+rock/admin/entrypoints/sandbox_proxy_api.py
 rock/admin/entrypoints/warmup_api.py
 rock/admin/gem/api.py
 rock/admin/metrics/constants.py
@@ -48,6 +48,7 @@ rock/deployments/manager.py
 rock/deployments/ray.py
 rock/deployments/remote.py
 rock/deployments/runtime_env.py
+rock/deployments/sandbox_validator.py
 rock/deployments/status.py
 rock/deployments/hooks/__init__.py
 rock/deployments/hooks/abstract.py
@@ -79,7 +80,7 @@ rock/sandbox/sandbox_actor.py
 rock/sandbox/sandbox_manager.py
 rock/sandbox/job/warmup_actor.py
 rock/sandbox/service/sandbox_meta.py
-rock/sandbox/service/sandbox_read_service.py
+rock/sandbox/service/sandbox_proxy_service.py
 rock/sandbox/service/warmup_service.py
 rock/sdk/__init__.py
 rock/sdk/builder/__init__.py
@@ -98,12 +99,14 @@ rock/sdk/envs/rock_env.py
 rock/sdk/sandbox/client.py
 rock/sdk/sandbox/config.py
 rock/utils/__init__.py
-rock/utils/concurrent.py
+rock/utils/concurrent_helper.py
 rock/utils/data.py
+rock/utils/database.py
 rock/utils/docker.py
 rock/utils/exception.py
 rock/utils/http.py
 rock/utils/importer.py
+rock/utils/retry.py
 rock/utils/system.py
 rock/utils/providers/__init__.py
 rock/utils/providers/nacos_provider.py

{rl_rock-0.2.1.dev1 → rl_rock-0.2.1.dev2}/rock/actions/__init__.py

@@ -7,13 +7,11 @@ from .sandbox.config import LocalSandboxRuntimeConfig, RemoteSandboxRuntimeConfi
 from .sandbox.request import (
     Action,
     BashAction,
-    BashInterruptAction,
     CloseBashSessionRequest,
     CloseSessionRequest,
     Command,
     CreateBashSessionRequest,
     CreateSessionRequest,
-    InitDockerEnvRequest,
     ReadFileRequest,
     UploadRequest,
     WriteFileRequest,
@@ -59,12 +57,10 @@ __all__ = [
     "CloseSessionResponse",
     "CreateSessionRequest",
     "BashAction",
-    "BashInterruptAction",
     "Action",
     "WriteFileRequest",
     "CloseBashSessionRequest",
     "CloseSessionRequest",
-    "InitDockerEnvRequest",
     "ReadFileRequest",
     "UploadRequest",
     "IsAliveResponse",

rl_rock-0.2.1.dev2/rock/actions/sandbox/request.py

@@ -0,0 +1,66 @@
+from typing import Annotated, Literal
+
+from pydantic import BaseModel, Field
+
+
+class Command(BaseModel):
+    session_type: Literal["bash"] = "bash"
+    command: str | list[str]
+
+
+class CreateBashSessionRequest(BaseModel):
+    session_type: Literal["bash"] = "bash"
+    session: str = "default"
+    startup_source: list[str] = []
+    env_enable: bool = False
+    env: dict[str, str] | None = Field(default=None)
+
+
+CreateSessionRequest = Annotated[CreateBashSessionRequest, Field(discriminator="session_type")]
+"""Union type for all create session requests. Do not use this directly."""
+
+
+class BashAction(BaseModel):
+    action_type: Literal["bash"] = "bash"
+    command: str
+    session: str = "default"
+    timeout: float | None = None
+    check: Literal["silent", "raise", "ignore"] = "raise"
+
+
+Action = Annotated[BashAction, Field(discriminator="action_type")]
+
+
+class WriteFileRequest(BaseModel):
+    content: str
+    path: str
+
+
+class CloseBashSessionRequest(BaseModel):
+    session_type: Literal["bash"] = "bash"
+    session: str = "default"
+
+
+CloseSessionRequest = Annotated[CloseBashSessionRequest, Field(discriminator="session_type")]
+"""Union type for all close session requests. Do not use this directly."""
+
+
+class ReadFileRequest(BaseModel):
+    path: str
+    """File path to read from."""
+
+    encoding: str | None = None
+    """Text encoding to use when reading the file. None uses default encoding.
+    This corresponds to the `encoding` parameter of `Path.read_text()`."""
+
+    errors: str | None = None
+    """Error handling strategy when reading the file. None uses default handling.
+    This corresponds to the `errors` parameter of `Path.read_text()`."""
+
+
+class UploadRequest(BaseModel):
+    source_path: str
+    """Local file path to upload from."""
+
+    target_path: str
+    """Remote file path to upload to."""

{rl_rock-0.2.1.dev1 → rl_rock-0.2.1.dev2}/rock/admin/entrypoints/sandbox_api.py

@@ -38,20 +38,20 @@ def set_sandbox_manager(service: SandboxManager):
 
 @sandbox_router.post("/start")
 @handle_exceptions(error_message="start sandbox failed")
-async def start(config: SandboxStartRequest) -> RockResponse[SandboxStartResponse]:
-    sandbox_start_response = await sandbox_manager.start(DockerDeploymentConfig(**config.transform().model_dump()))
+async def start(request: SandboxStartRequest) -> RockResponse[SandboxStartResponse]:
+    sandbox_start_response = await sandbox_manager.start(DockerDeploymentConfig.from_request(request))
     return RockResponse(result=sandbox_start_response)
 
 
 @sandbox_router.post("/start_async")
 @handle_exceptions(error_message="async start sandbox failed")
 async def start_async(
-    config: SandboxStartRequest,
+    request: SandboxStartRequest,
     x_user_id: str | None = Header(default="default", alias="X-User-Id"),
     x_experiment_id: str | None = Header(default="default", alias="X-Experiment-Id"),
 ) -> RockResponse[SandboxStartResponse]:
     sandbox_start_response = await sandbox_manager.start_async(
-        DockerDeploymentConfig(**config.transform().model_dump()),
+        DockerDeploymentConfig.from_request(request),
         user_info={"user_id": x_user_id, "experiment_id": x_experiment_id},
     )
     return RockResponse(result=sandbox_start_response)
@@ -84,37 +84,37 @@ async def get_status(sandbox_id: str):
 @sandbox_router.post("/execute")
 @handle_exceptions(error_message="execute command failed")
 async def execute(command: SandboxCommand) -> RockResponse[CommandResponse]:
-    return RockResponse(result=await sandbox_manager.execute(command.transform()))
+    return RockResponse(result=await sandbox_manager.execute(command))
 
 
 @sandbox_router.post("/create_session")
 @handle_exceptions(error_message="create session failed")
 async def create_session(request: SandboxCreateBashSessionRequest) -> RockResponse[CreateBashSessionResponse]:
-    return RockResponse(result=await sandbox_manager.create_session(request.transform()))
+    return RockResponse(result=await sandbox_manager.create_session(request))
 
 
 @sandbox_router.post("/run_in_session")
 @handle_exceptions(error_message="run in session failed")
 async def run(action: SandboxBashAction) -> RockResponse[BashObservation]:
-    return RockResponse(result=await sandbox_manager.run_in_session(action.transform()))
+    return RockResponse(result=await sandbox_manager.run_in_session(action))
 
 
 @sandbox_router.post("/close_session")
 @handle_exceptions(error_message="close session failed")
 async def close_session(request: SandboxCloseBashSessionRequest) -> RockResponse[CloseBashSessionResponse]:
-    return RockResponse(result=await sandbox_manager.close_session(request.transform()))
+    return RockResponse(result=await sandbox_manager.close_session(request))
 
 
 @sandbox_router.post("/read_file")
 @handle_exceptions(error_message="read file failed")
 async def read_file(request: SandboxReadFileRequest) -> RockResponse[ReadFileResponse]:
-    return RockResponse(result=await sandbox_manager.read_file(request.transform()))
+    return RockResponse(result=await sandbox_manager.read_file(request))
 
 
 @sandbox_router.post("/write_file")
 @handle_exceptions(error_message="write file failed")
 async def write_file(request: SandboxWriteFileRequest) -> RockResponse[WriteFileResponse]:
-    return RockResponse(result=await sandbox_manager.write_file(request.transform()))
+    return RockResponse(result=await sandbox_manager.write_file(request))
 
 
 @sandbox_router.post("/upload")
@@ -122,11 +122,8 @@ async def write_file(request: SandboxWriteFileRequest) -> RockResponse[WriteFile
 async def upload(
     file: UploadFile = File(...),
     target_path: str = Form(...),
-    container_name: str | None = Form(None),
     sandbox_id: str | None = Form(None),
 ) -> RockResponse[UploadResponse]:
-    if container_name:
-        return RockResponse(result=await sandbox_manager.upload(file, target_path, container_name))
     return RockResponse(result=await sandbox_manager.upload(file, target_path, sandbox_id))
 
 

rl_rock-0.2.1.dev1/rock/admin/entrypoints/sandbox_read_api.py → rl_rock-0.2.1.dev2/rock/admin/entrypoints/sandbox_proxy_api.py

@@ -22,85 +22,81 @@ from rock.admin.proto.request import (
     SandboxReadFileRequest,
     SandboxWriteFileRequest,
 )
-from rock.sandbox.service.sandbox_read_service import SandboxReadService
+from rock.sandbox.service.sandbox_proxy_service import SandboxProxyService
 from rock.utils import handle_exceptions
 
-sandbox_read_router = APIRouter()
-sandbox_read_service: SandboxReadService
+sandbox_proxy_router = APIRouter()
+sandbox_proxy_service: SandboxProxyService
 
 
-def set_sandbox_read_service(service: SandboxReadService):
-    global sandbox_read_service
-    sandbox_read_service = service
+def set_sandbox_proxy_service(service: SandboxProxyService):
+    global sandbox_proxy_service
+    sandbox_proxy_service = service
 
 
-@sandbox_read_router.post("/execute")
+@sandbox_proxy_router.post("/execute")
 @handle_exceptions(error_message="execute command failed")
 async def execute(command: SandboxCommand) -> RockResponse[CommandResponse]:
-    return RockResponse(result=await sandbox_read_service.execute(command.transform()))
+    return RockResponse(result=await sandbox_proxy_service.execute(command))
 
 
-@sandbox_read_router.post("/create_session")
+@sandbox_proxy_router.post("/create_session")
 @handle_exceptions(error_message="create session failed")
 async def create_session(request: SandboxCreateBashSessionRequest) -> RockResponse[CreateBashSessionResponse]:
-    return RockResponse(result=await sandbox_read_service.create_session(request.transform()))
+    return RockResponse(result=await sandbox_proxy_service.create_session(request))
 
 
-@sandbox_read_router.post("/run_in_session")
+@sandbox_proxy_router.post("/run_in_session")
 @handle_exceptions(error_message="run in session failed")
 async def run(action: SandboxBashAction) -> RockResponse[BashObservation]:
-    result = await sandbox_read_service.run_in_session(action.transform())
+    result = await sandbox_proxy_service.run_in_session(action)
     if result.exit_code is not None and result.exit_code == -1:
         return RockResponse(status=ResponseStatus.FAILED, error=result.failure_reason)
     return RockResponse(result=result)
 
 
-@sandbox_read_router.post("/close_session")
+@sandbox_proxy_router.post("/close_session")
 @handle_exceptions(error_message="close session failed")
 async def close_session(request: SandboxCloseBashSessionRequest) -> RockResponse[CloseBashSessionResponse]:
-    return RockResponse(result=await sandbox_read_service.close_session(request.transform()))
+    return RockResponse(result=await sandbox_proxy_service.close_session(request))
 
 
-@sandbox_read_router.get("/is_alive")
+@sandbox_proxy_router.get("/is_alive")
 @handle_exceptions(error_message="get sandbox is alive failed")
 async def is_alive(sandbox_id: str):
-    return RockResponse(result=await sandbox_read_service.is_alive(sandbox_id))
+    return RockResponse(result=await sandbox_proxy_service.is_alive(sandbox_id))
 
 
-@sandbox_read_router.post("/read_file")
+@sandbox_proxy_router.post("/read_file")
 @handle_exceptions(error_message="read file failed")
 async def read_file(request: SandboxReadFileRequest) -> RockResponse[ReadFileResponse]:
-    return RockResponse(result=await sandbox_read_service.read_file(request.transform()))
+    return RockResponse(result=await sandbox_proxy_service.read_file(request))
 
 
-@sandbox_read_router.post("/write_file")
+@sandbox_proxy_router.post("/write_file")
 @handle_exceptions(error_message="write file failed")
 async def write_file(request: SandboxWriteFileRequest) -> RockResponse[WriteFileResponse]:
-    return RockResponse(result=await sandbox_read_service.write_file(request.transform()))
+    return RockResponse(result=await sandbox_proxy_service.write_file(request))
 
 
-@sandbox_read_router.post("/upload")
+@sandbox_proxy_router.post("/upload")
 @handle_exceptions(error_message="upload file failed")
 async def upload(
     file: UploadFile = File(...),
     target_path: str = Form(...),
-    container_name: str | None = Form(None),
     sandbox_id: str | None = Form(None),
 ) -> RockResponse[UploadResponse]:
-    if container_name:
-        return RockResponse(result=await sandbox_read_service.upload(file, target_path, container_name))
-    else:
-        return RockResponse(result=await sandbox_read_service.upload(file, target_path, sandbox_id))
+    return RockResponse(result=await sandbox_proxy_service.upload(file, target_path, sandbox_id))
 
 
-@sandbox_read_router.websocket("/sandboxes/{id}/proxy/ws")
-@sandbox_read_router.websocket("/sandboxes/{id}/proxy/ws/{path:path}")
+@sandbox_proxy_router.websocket("/sandboxes/{id}/proxy/ws")
+@sandbox_proxy_router.websocket("/sandboxes/{id}/proxy/ws/{path:path}")
 async def websocket_proxy(websocket: WebSocket, id: str, path: str = ""):
     await websocket.accept()
     sandbox_id = id
     logging.info(f"Client connected to WebSocket proxy: {sandbox_id}, path: {path}")
     try:
-        await sandbox_read_service.websocket_proxy(websocket, sandbox_id, path)
+        await sandbox_proxy_service.websocket_proxy(websocket, sandbox_id, path)
     except WebSocketDisconnect:
         logging.info(f"Client disconnected from WebSocket proxy: {sandbox_id}")
     except Exception as e:
@@ -108,8 +104,8 @@ async def websocket_proxy(websocket: WebSocket, id: str, path: str = ""):
         await websocket.close(code=1011, reason=f"Proxy error: {str(e)}")
 
 
-@sandbox_read_router.get("/get_token")
+@sandbox_proxy_router.get("/get_token")
 @handle_exceptions(error_message="get oss sts token failed")
 async def get_token():
-    result = await asyncio.to_thread(sandbox_read_service.gen_oss_sts_token)
+    result = await asyncio.to_thread(sandbox_proxy_service.gen_oss_sts_token)
     return RockResponse(result=result)

{rl_rock-0.2.1.dev1 → rl_rock-0.2.1.dev2}/rock/admin/main.py

@@ -13,20 +13,20 @@ from starlette.responses import JSONResponse
 from rock import env_vars
 from rock.admin.core.ray_service import RayService
 from rock.admin.entrypoints.sandbox_api import sandbox_router, set_sandbox_manager
-from rock.admin.entrypoints.sandbox_read_api import sandbox_read_router, set_sandbox_read_service
+from rock.admin.entrypoints.sandbox_proxy_api import sandbox_proxy_router, set_sandbox_proxy_service
 from rock.admin.entrypoints.warmup_api import set_warmup_service, warmup_router
 from rock.admin.gem.api import gem_router, set_env_service
 from rock.config import RockConfig
 from rock.logger import init_logger
 from rock.sandbox.gem_manager import GemManager
-from rock.sandbox.service.sandbox_read_service import SandboxReadService
+from rock.sandbox.service.sandbox_proxy_service import SandboxProxyService
 from rock.sandbox.service.warmup_service import WarmupService
 from rock.utils import sandbox_id_ctx_var
 from rock.utils.providers import RedisProvider
 
 parser = argparse.ArgumentParser()
 parser.add_argument("--env", type=str, default="local")
-parser.add_argument("--role", type=str, default="write", choices=["write", "read"])
+parser.add_argument("--role", type=str, default="admin", choices=["admin", "proxy"])
 parser.add_argument("--port", type=int, default=8080)
 
 args = parser.parse_args()
@@ -58,7 +58,7 @@ async def lifespan(app: FastAPI):
         await redis_provider.init_pool()
 
     # init sandbox service
-    if args.role == "write":
+    if args.role == "admin":
         # init service
         if rock_config.runtime.enable_auto_clear:
             sandbox_manager = GemManager(
@@ -82,8 +82,8 @@ async def lifespan(app: FastAPI):
 
         RayService(rock_config.ray).init()
     else:
-        sandbox_manager = SandboxReadService(rock_config=rock_config, redis_provider=redis_provider)
-        set_sandbox_read_service(sandbox_manager)
+        sandbox_manager = SandboxProxyService(rock_config=rock_config, redis_provider=redis_provider)
+        set_sandbox_proxy_service(sandbox_manager)
 
     logger.info("rock-admin start")
 
@@ -163,10 +163,10 @@ async def log_requests_and_responses(request: Request, call_next):
 
 def main():
     # config router
-    if args.role == "write":
+    if args.role == "admin":
         app.include_router(sandbox_router, prefix="/apis/envs/sandbox/v1", tags=["sandbox"])
     else:
-        app.include_router(sandbox_read_router, prefix="/apis/envs/sandbox/v1", tags=["sandbox"])
+        app.include_router(sandbox_proxy_router, prefix="/apis/envs/sandbox/v1", tags=["sandbox"])
     app.include_router(warmup_router, prefix="/apis/envs/sandbox/v1", tags=["warmup"])
     app.include_router(gem_router, prefix="/apis/v1/envs/gem", tags=["gem"])