Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions rock/admin/entrypoints/sandbox_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
SandboxWriteFileRequest,
)
from rock.admin.proto.response import SandboxStartResponse
from rock.deployments.config import DockerDeploymentConfig
from rock.sandbox.sandbox_manager import SandboxManager
from rock.utils import handle_exceptions

Expand All @@ -39,7 +38,7 @@ 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()))
sandbox_start_response = await sandbox_manager.start(config.transform())
return RockResponse(result=sandbox_start_response)


Expand All @@ -51,7 +50,7 @@ async def start_async(
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()),
config.transform(),
user_info={"user_id": x_user_id, "experiment_id": x_experiment_id},
)
return RockResponse(result=sandbox_start_response)
Expand Down
4 changes: 2 additions & 2 deletions rock/admin/proto/request.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ class SandboxStartRequest(BaseModel):
"""The amount of CPUs to allocate for the container."""

def transform(self):
from rock.rocklet.proto.request import InitDockerEnvRequest
from rock.deployments.config import DockerDeploymentConfig

res = InitDockerEnvRequest(**self.model_dump())
res = DockerDeploymentConfig(**self.model_dump())
return res


Expand Down
9 changes: 0 additions & 9 deletions rock/rocklet/proto/request.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,10 @@
SandboxCommand,
SandboxCreateBashSessionRequest,
SandboxReadFileRequest,
SandboxStartRequest,
SandboxWriteFileRequest,
)


class InitDockerEnvRequest(SandboxStartRequest):
python_standalone_dir: str | None = None
"""Directory path for the Python standalone installation."""

container_name: str | None = None
"""Custom name for the container. If None, a random name will be generated."""


class InternalCommand(SandboxCommand):
container_name: str | None = None

Expand Down
Loading