Skip to content

[Bug]: UI doesn't show Resources for instances of SSH fleets #2785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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: 0 additions & 1 deletion src/dstack/_internal/core/backends/base/offers.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ def catalog_item_to_offer(
spot=item.spot,
disk=Disk(size_mib=disk_size_mib),
)
resources.description = resources.pretty_format()
return InstanceOffer(
backend=backend,
instance=InstanceType(
Expand Down
63 changes: 51 additions & 12 deletions src/dstack/_internal/core/models/instances.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,29 +48,68 @@ class Resources(CoreModel):
gpus: List[Gpu]
spot: bool
disk: Disk = Disk(size_mib=102400) # the default value (100GB) for backward compatibility
# TODO: make description a computed field after migrating to pydanticV2
description: str = ""
cpu_arch: Optional[gpuhunt.CPUArchitecture] = None

def pretty_format(self, include_spot: bool = False) -> str:
@root_validator
def _description(cls, values) -> Dict:
try:
description = values["description"]
if not description:
cpus = values["cpus"]
memory_mib = values["memory_mib"]
gpus = values["gpus"]
disk_size_mib = values["disk"].size_mib
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
)
except KeyError:
return values
return values

@staticmethod
def _pretty_format(
cpus: int,
cpu_arch: Optional[gpuhunt.CPUArchitecture],
memory_mib: int,
disk_size_mib: int,
gpus: List[Gpu],
spot: bool,
include_spot: bool = False,
) -> str:
resources = {}
if self.cpus > 0:
resources["cpus"] = self.cpus
resources["cpu_arch"] = self.cpu_arch
if self.memory_mib > 0:
resources["memory"] = f"{self.memory_mib / 1024:.0f}GB"
if self.disk.size_mib > 0:
resources["disk_size"] = f"{self.disk.size_mib / 1024:.0f}GB"
if self.gpus:
gpu = self.gpus[0]
if cpus > 0:
resources["cpus"] = cpus
resources["cpu_arch"] = cpu_arch
if memory_mib > 0:
resources["memory"] = f"{memory_mib / 1024:.0f}GB"
if disk_size_mib > 0:
resources["disk_size"] = f"{disk_size_mib / 1024:.0f}GB"
if gpus:
gpu = gpus[0]
resources["gpu_name"] = gpu.name
resources["gpu_count"] = len(self.gpus)
resources["gpu_count"] = len(gpus)
if gpu.memory_mib > 0:
resources["gpu_memory"] = f"{gpu.memory_mib / 1024:.0f}GB"
output = pretty_resources(**resources)
if include_spot and self.spot:
if include_spot and spot:
output += " (spot)"
return output

def pretty_format(self, include_spot: 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,
)


class InstanceType(CoreModel):
name: str
Expand Down
2 changes: 1 addition & 1 deletion src/tests/_internal/server/routers/test_fleets.py
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ async def test_creates_ssh_fleet(self, test_db, session: AsyncSession, client: A
"gpus": [],
"spot": False,
"disk": {"size_mib": 102400},
"description": "",
"description": "cpu=2 mem=0GB disk=100GB",
},
},
"name": f"{spec.configuration.name}-0",
Expand Down
Loading