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
2 changes: 1 addition & 1 deletion ruff.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ ignore =[

[lint.isort]
known-first-party = ["dstack"]
known-third-party = ["mkdocs_gen_files"]
known-third-party = ["mkdocs_gen_files", "datacrunch"]
12 changes: 12 additions & 0 deletions src/dstack/_internal/cli/commands/pool.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import argparse
import datetime
from pathlib import Path
from typing import Sequence

Expand Down Expand Up @@ -290,18 +291,29 @@ def print_instance_table(instances: Sequence[Instance]) -> None:
table = Table(box=None)
table.add_column("INSTANCE NAME")
table.add_column("BACKEND")
table.add_column("REGION")
table.add_column("INSTANCE TYPE")
table.add_column("SPOT")
table.add_column("STATUS")
table.add_column("PRICE")
table.add_column("CREATED")

for instance in instances:
style = "success" if instance.status.is_available() else "warning"
created = (
pretty_date(instance.created.replace(tzinfo=datetime.timezone.utc))
if instance.created is not None
else ""
)
row = [
instance.name,
instance.backend,
instance.region,
instance.instance_type.resources.pretty_format(),
"yes" if instance.instance_type.resources.spot else "no",
f"[{style}]{instance.status.value}[/]",
f"${instance.price:.4}",
created,
]
table.add_row(*row)

Expand Down
2 changes: 2 additions & 0 deletions src/dstack/_internal/core/models/pools.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ class Instance(BaseModel):
job_status: Optional[JobStatus] = None
hostname: str
status: InstanceStatus
created: Optional[datetime.datetime]
region: str
price: float


Expand Down
2 changes: 2 additions & 0 deletions src/dstack/_internal/server/services/pools.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,8 @@ def instance_model_to_instance(instance_model: InstanceModel) -> Instance:
instance_type=jpd.instance_type,
hostname=jpd.hostname,
status=instance_model.status,
region=offer.region,
created=instance_model.created_at,
price=offer.price,
)
if instance_model.job is not None:
Expand Down
1 change: 1 addition & 0 deletions src/dstack/_internal/server/testing/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@ async def create_instance(
project=project,
status=status,
created_at=created_at,
started_at=created_at,
finished_at=finished_at,
job_provisioning_data='{"backend": "datacrunch", "instance_type": {"name": "instance", "resources": {"cpus": 1, "memory_mib": 512, "gpus": [], "spot": false, "disk": {"size_mib": 102400}, "description": ""}}, "instance_id": "running_instance.id", "ssh_proxy": null, "hostname": "running_instance.ip", "region": "running_instance.location", "price": 0.1, "username": "root", "ssh_port": 22, "dockerized": true, "backend_data": null}',
offer='{"backend": "datacrunch", "instance": {"name": "instance", "resources": {"cpus": 2, "memory_mib": 12000, "gpus": [], "spot": false, "disk": {"size_mib": 102400}, "description": ""}}, "region": "en", "price": 0.1, "availability": "available"}',
Expand Down
6 changes: 5 additions & 1 deletion src/tests/_internal/server/services/test_pools.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
from dstack._internal.core.models.users import GlobalRole
from dstack._internal.server.models import InstanceModel
from dstack._internal.server.testing.common import create_project, create_user
from dstack._internal.utils.common import get_current_datetime


@pytest.mark.asyncio
Expand Down Expand Up @@ -71,6 +72,7 @@ async def test_pool(session: AsyncSession, test_db):


def test_convert_instance():
created = get_current_datetime()
expected_instance = Instance(
backend=BackendType.LOCAL,
instance_type=InstanceType(
Expand All @@ -79,12 +81,14 @@ def test_convert_instance():
name="test_instance",
hostname="hostname_test",
status=InstanceStatus.PENDING,
region="eu-west-1",
created=created,
price=1.0,
)

im = InstanceModel(
id=str(uuid.uuid4()),
created_at=dt.datetime.now(),
created_at=created,
name="test_instance",
status=InstanceStatus.PENDING,
project_id=str(uuid.uuid4()),
Expand Down