Skip to content

Commit ddbb259

Browse files
committed
feat(api)!: unify portable sandbox resource requirements
Model CPU, memory, and GPU through one typed ResourceRequirements envelope across inline sandbox specs, reusable workload templates, and compute drivers. Update the CLI, gateway translation, and built-in drivers to consume the unified model. BREAKING CHANGE: CPU and memory move to typed resource requirements, and SandboxWorkloadConfig.resources now uses ResourceRequirements instead of SandboxResources. Part of #2838 Signed-off-by: Evan Lezar <[email protected]>
1 parent 903d9a0 commit ddbb259

19 files changed

Lines changed: 1119 additions & 590 deletions

File tree

‎crates/openshell-cli/src/main.rs‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use openshell_bootstrap::{
1919
use openshell_cli::completers;
2020
use openshell_cli::run;
2121
use openshell_cli::tls::TlsOptions;
22-
use openshell_core::proto::GpuResourceRequirements;
22+
use openshell_core::proto::{GpuResourceRequirements, ResourceRequirements};
2323

2424
/// Resolved gateway context: name + gateway endpoint.
2525
struct GatewayContext {
@@ -3200,6 +3200,21 @@ async fn run_async() -> Result<()> {
32003200
.transpose()?;
32013201
let keep = keep || !no_keep || editor.is_some() || forward.is_some();
32023202
let gpu_requirements: Option<GpuResourceRequirements> = gpu.map(Into::into);
3203+
let cpu_requirements = run::build_cpu_resource_requirements(cpu.as_deref())?;
3204+
let memory_requirements =
3205+
run::build_memory_resource_requirements(memory.as_deref())?;
3206+
let resource_requirements = if gpu_requirements.is_some()
3207+
|| cpu_requirements.is_some()
3208+
|| memory_requirements.is_some()
3209+
{
3210+
Some(ResourceRequirements {
3211+
gpu: gpu_requirements,
3212+
cpu: cpu_requirements,
3213+
memory: memory_requirements,
3214+
})
3215+
} else {
3216+
None
3217+
};
32033218

32043219
let ctx = resolve_gateway(&cli.gateway, &cli.gateway_endpoint)?;
32053220
let endpoint = &ctx.endpoint;
@@ -3214,9 +3229,7 @@ async fn run_async() -> Result<()> {
32143229
from: from.as_deref(),
32153230
uploads: &upload_specs,
32163231
keep,
3217-
gpu_requirements,
3218-
cpu: cpu.as_deref(),
3219-
memory: memory.as_deref(),
3232+
resource_requirements,
32203233
driver_config_json: driver_config_json.as_deref(),
32213234
editor,
32223235
providers: &providers,

0 commit comments

Comments
 (0)