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
1 change: 1 addition & 0 deletions src/dstack/_internal/core/backends/base/offers.py
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ def modifier(offer: InstanceOfferWithAvailability) -> Optional[InstanceOfferWith
offer_copy.instance.resources.disk = Disk(
size_mib=get_or_error(disk_size_range.min) * 1024
)
offer_copy.instance.resources.update_description()
return offer_copy

return modifier
48 changes: 34 additions & 14 deletions src/dstack/_internal/core/models/instances.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ class Resources(CoreModel):
gpus: List[Gpu]
spot: bool
disk: Disk = Disk(size_mib=102400) # the default value (100GB) for backward compatibility
cpu_arch: Optional[gpuhunt.CPUArchitecture] = None
# TODO: make description a computed field after migrating to pydanticV2
description: str = ""
cpu_arch: Optional[gpuhunt.CPUArchitecture] = None

@root_validator
def _description(cls, values) -> Dict:
Expand All @@ -68,12 +68,44 @@ def _description(cls, values) -> Dict:
spot = values["spot"]
cpu_arch = values["cpu_arch"]
values["description"] = Resources._pretty_format(
cpus, cpu_arch, memory_mib, disk_size_mib, gpus, spot, include_spot=True
cpus=cpus,
cpu_arch=cpu_arch,
memory_mib=memory_mib,
disk_size_mib=disk_size_mib,
gpus=gpus,
spot=spot,
include_spot=True,
)
except KeyError:
return values
return values

def pretty_format(self, include_spot: bool = False, gpu_only: bool = False) -> str:
return Resources._pretty_format(
self.cpus,
self.cpu_arch,
self.memory_mib,
self.disk.size_mib,
self.gpus,
self.spot,
include_spot,
gpu_only,
)

def update_description(self):
"""
Call to update `description` after patching other properties.
"""
self.description = Resources._pretty_format(
cpus=self.cpus,
cpu_arch=self.cpu_arch,
memory_mib=self.memory_mib,
disk_size_mib=self.disk.size_mib,
gpus=self.gpus,
spot=self.spot,
include_spot=True,
)

@staticmethod
def _pretty_format(
cpus: int,
Expand Down Expand Up @@ -119,18 +151,6 @@ def _pretty_format(
output += " (spot)"
return output

def pretty_format(self, include_spot: bool = False, gpu_only: bool = False) -> str:
return Resources._pretty_format(
self.cpus,
self.cpu_arch,
self.memory_mib,
self.disk.size_mib,
self.gpus,
self.spot,
include_spot,
gpu_only,
)


class InstanceType(CoreModel):
name: str
Expand Down