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
10 changes: 4 additions & 6 deletions src/dstack/_internal/cli/services/args.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
from typing import Dict

from dstack._internal.core.models import resources as resources
from dstack._internal.core.models.configurations import PortMapping
from dstack._internal.core.models.envs import EnvVarTuple


def gpu_spec(v: str) -> Dict:
return resources.GPUSpec.parse(v)
def gpu_spec(v: str) -> resources.GPUSpec:
return resources.GPUSpec.model_validate(v)


def env_var(v: str) -> EnvVarTuple:
Expand All @@ -17,8 +15,8 @@ def port_mapping(v: str) -> PortMapping:
return PortMapping.parse(v)


def cpu_spec(v: str) -> dict:
return resources.CPUSpec.parse(v)
def cpu_spec(v: str) -> resources.CPUSpec:
return resources.CPUSpec.model_validate(v)


def memory_spec(v: str) -> resources.Range[resources.Memory]:
Expand Down
5 changes: 2 additions & 3 deletions src/dstack/_internal/cli/services/resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

from dstack._internal.cli.services.args import cpu_spec, disk_spec, gpu_spec, memory_spec
from dstack._internal.cli.services.configurators.base import ArgsParser
from dstack._internal.core.models import resources
from dstack._internal.core.models.configurations import AnyRunConfiguration


Expand Down Expand Up @@ -45,9 +44,9 @@ def register_resources_args(parser: ArgsParser) -> None:

def apply_resources_args(args: argparse.Namespace, conf: AnyRunConfiguration) -> None:
if args.cpu_spec:
conf.resources.cpu = resources.CPUSpec.model_validate(args.cpu_spec)
conf.resources.cpu = args.cpu_spec
if args.gpu_spec:
conf.resources.gpu = resources.GPUSpec.model_validate(args.gpu_spec)
conf.resources.gpu = args.gpu_spec
if args.memory_spec:
conf.resources.memory = args.memory_spec
if args.disk_spec:
Expand Down
Loading