dstack 0.18.40rc1__py3-none-any.whl → 0.18.41__py3-none-any.whl

tests/_internal/server/routers/test_fleets.py

@@ -340,6 +340,7 @@ class TestCreateFleet:
                     },
                     "backends": None,
                     "regions": None,
+                    "availability_zones": None,
                     "instance_types": None,
                     "spot_policy": None,
                     "retry": None,
@@ -350,10 +351,12 @@ class TestCreateFleet:
                     "type": "fleet",
                     "name": "test-fleet",
                     "reservation": None,
+                    "blocks": 1,
                 },
                 "profile": {
                     "backends": None,
                     "regions": None,
+                    "availability_zones": None,
                     "instance_types": None,
                     "spot_policy": None,
                     "retry": None,
@@ -393,15 +396,18 @@ class TestCreateFleet:
                     "pool_name": None,
                     "backend": None,
                     "region": None,
+                    "availability_zone": None,
                     "instance_type": None,
                     "price": None,
+                    "total_blocks": 1,
+                    "busy_blocks": 0,
                 }
             ],
         }
         res = await session.execute(select(FleetModel))
         assert res.scalar_one()
         res = await session.execute(select(InstanceModel))
-        assert res.scalar_one()
+        assert res.unique().scalar_one()
 
     @pytest.mark.asyncio
     @pytest.mark.parametrize("test_db", ["sqlite", "postgres"], indirect=True)
@@ -444,6 +450,7 @@ class TestCreateFleet:
                         "port": None,
                         "identity_file": None,
                         "ssh_key": None,  # should not return ssh_key
+                        "proxy_jump": None,
                         "hosts": ["1.1.1.1"],
                         "network": None,
                     },
@@ -458,6 +465,7 @@ class TestCreateFleet:
                     },
                     "backends": None,
                     "regions": None,
+                    "availability_zones": None,
                     "instance_types": None,
                     "spot_policy": None,
                     "retry": None,
@@ -468,10 +476,12 @@ class TestCreateFleet:
                     "type": "fleet",
                     "name": spec.configuration.name,
                     "reservation": None,
+                    "blocks": 1,
                 },
                 "profile": {
                     "backends": None,
                     "regions": None,
+                    "availability_zones": None,
                     "instance_types": None,
                     "spot_policy": None,
                     "retry": None,
@@ -522,14 +532,17 @@ class TestCreateFleet:
                     "termination_reason": None,
                     "created": "2023-01-02T03:04:00+00:00",
                     "region": "remote",
+                    "availability_zone": None,
                     "price": 0.0,
+                    "total_blocks": 1,
+                    "busy_blocks": 0,
                 }
             ],
         }
         res = await session.execute(select(FleetModel))
         assert res.scalar_one()
         res = await session.execute(select(InstanceModel))
-        instance = res.scalar_one()
+        instance = res.unique().scalar_one()
         assert instance.remote_connection_info is not None
 
     @pytest.mark.asyncio

tests/_internal/server/routers/test_pools.py

@@ -332,7 +332,10 @@ class TestShowPool:
                     "created": "2023-01-02T03:04:00+00:00",
                     "pool_name": None,
                     "region": "en",
+                    "availability_zone": None,
                     "price": 1,
+                    "total_blocks": 1,
+                    "busy_blocks": 0,
                 }
             ],
         }
@@ -503,7 +506,10 @@ class TestRemoveInstance:
                     "created": "2023-01-02T03:04:00+00:00",
                     "pool_name": None,
                     "region": "en",
+                    "availability_zone": None,
                     "price": 1,
+                    "total_blocks": 1,
+                    "busy_blocks": 0,
                 }
             ],
         }

tests/_internal/server/routers/test_runs.py

@@ -18,6 +18,7 @@ from dstack._internal.core.models.gateways import GatewayStatus
 from dstack._internal.core.models.instances import (
     InstanceAvailability,
     InstanceOfferWithAvailability,
+    InstanceStatus,
     InstanceType,
     Resources,
 )
@@ -47,7 +48,9 @@ from dstack._internal.server.testing.common import (
     create_backend,
     create_gateway,
     create_gateway_compute,
+    create_instance,
     create_job,
+    create_pool,
     create_project,
     create_repo,
     create_run,
@@ -85,6 +88,7 @@ def get_dev_env_run_plan_dict(
                 "working_dir": None,
                 "home_dir": "/root",
                 "ide": "vscode",
+                "inactivity_duration": None,
                 "version": None,
                 "image": None,
                 "user": None,
@@ -107,6 +111,7 @@ def get_dev_env_run_plan_dict(
                 "volumes": [json.loads(v.json()) for v in volumes],
                 "backends": ["local", "aws", "azure", "gcp", "lambda", "runpod"],
                 "regions": ["us"],
+                "availability_zones": None,
                 "instance_types": None,
                 "creation_policy": None,
                 "instance_name": None,
@@ -127,6 +132,7 @@ def get_dev_env_run_plan_dict(
             "profile": {
                 "backends": ["local", "aws", "azure", "gcp", "lambda", "runpod"],
                 "regions": ["us"],
+                "availability_zones": None,
                 "instance_types": None,
                 "creation_policy": None,
                 "default": False,
@@ -198,6 +204,7 @@ def get_dev_env_run_plan_dict(
                         "reservation": None,
                     },
                     "retry": None,
+                    "volumes": volumes,
                     "retry_policy": {"retry": False, "duration": None},
                     "working_dir": ".",
                 },
@@ -238,6 +245,7 @@ def get_dev_env_run_dict(
                 "home_dir": "/root",
                 "working_dir": None,
                 "ide": "vscode",
+                "inactivity_duration": None,
                 "version": None,
                 "image": None,
                 "user": None,
@@ -260,6 +268,7 @@ def get_dev_env_run_dict(
                 "volumes": [],
                 "backends": ["local", "aws", "azure", "gcp", "lambda"],
                 "regions": ["us"],
+                "availability_zones": None,
                 "instance_types": None,
                 "creation_policy": None,
                 "instance_name": None,
@@ -280,6 +289,7 @@ def get_dev_env_run_dict(
             "profile": {
                 "backends": ["local", "aws", "azure", "gcp", "lambda"],
                 "regions": ["us"],
+                "availability_zones": None,
                 "instance_types": None,
                 "creation_policy": None,
                 "default": False,
@@ -351,6 +361,7 @@ def get_dev_env_run_dict(
                         "reservation": None,
                     },
                     "retry": None,
+                    "volumes": [],
                     "retry_policy": {"retry": False, "duration": None},
                     "working_dir": ".",
                 },
@@ -361,6 +372,7 @@ def get_dev_env_run_dict(
                         "submitted_at": submitted_at,
                         "last_processed_at": last_processed_at,
                         "finished_at": finished_at,
+                        "inactivity_secs": None,
                         "status": "submitted",
                         "termination_reason": None,
                         "termination_reason_message": None,
@@ -375,6 +387,7 @@ def get_dev_env_run_dict(
             "submission_num": 0,
             "submitted_at": submitted_at,
             "last_processed_at": last_processed_at,
+            "inactivity_secs": None,
             "finished_at": finished_at,
             "status": "submitted",
             "termination_reason": None,
@@ -487,6 +500,7 @@ class TestListRuns:
                                 "submitted_at": run1_submitted_at.isoformat(),
                                 "last_processed_at": run1_submitted_at.isoformat(),
                                 "finished_at": None,
+                                "inactivity_secs": None,
                                 "status": "submitted",
                                 "termination_reason": None,
                                 "termination_reason_message": None,
@@ -502,6 +516,7 @@ class TestListRuns:
                     "submitted_at": run1_submitted_at.isoformat(),
                     "last_processed_at": run1_submitted_at.isoformat(),
                     "finished_at": None,
+                    "inactivity_secs": None,
                     "status": "submitted",
                     "termination_reason_message": None,
                     "termination_reason": None,
@@ -1303,11 +1318,20 @@ class TestStopRuns:
             user=user,
             status=RunStatus.RUNNING,
         )
+        pool = await create_pool(session=session, project=project)
+        instance = await create_instance(
+            session=session,
+            project=project,
+            pool=pool,
+            status=InstanceStatus.BUSY,
+        )
         job = await create_job(
             session=session,
             run=run,
             job_provisioning_data=get_job_provisioning_data(),
             status=JobStatus.RUNNING,
+            instance=instance,
+            instance_assigned=True,
         )
         with patch("dstack._internal.server.services.jobs._stop_runner") as stop_runner:
             response = await client.post(
@@ -1533,7 +1557,10 @@ class TestCreateInstance:
                 "created": result["created"],
                 "pool_name": None,
                 "region": None,
+                "availability_zone": None,
                 "price": None,
+                "total_blocks": 1,
+                "busy_blocks": 0,
             }
             assert result == expected
 

tests/_internal/server/services/jobs/configurators/test_base.py

@@ -0,0 +1,72 @@
+from typing import Union
+
+import pytest
+
+from dstack._internal.core.errors import ServerClientError
+from dstack._internal.core.models.volumes import InstanceMountPoint, MountPoint, VolumeMountPoint
+from dstack._internal.server.services.jobs.configurators.base import interpolate_job_volumes
+
+
+class TestInterpolateJobVolumes:
+    @pytest.mark.parametrize(
+        ["run_volumes", "job_num", "job_volumes"],
+        [
+            pytest.param(
+                [VolumeMountPoint(name="volume", path="/volume")],
+                0,
+                [VolumeMountPoint(name=["volume"], path="/volume")],
+                id="no_interpolation",
+            ),
+            pytest.param(
+                [InstanceMountPoint(instance_path="/volume", path="/volume")],
+                0,
+                [InstanceMountPoint(instance_path="/volume", path="/volume")],
+                id="instance_mount",
+            ),
+            pytest.param(
+                [
+                    VolumeMountPoint(
+                        name="job${{dstack.job_num}}-rank${{dstack.node_rank}}", path="/volume"
+                    )
+                ],
+                2,
+                [VolumeMountPoint(name=["job2-rank2"], path="/volume")],
+                id="job_num_and_node_rank",
+            ),
+        ],
+    )
+    def test_interpolates_volumes(
+        self,
+        run_volumes: list[Union[MountPoint, str]],
+        job_num: int,
+        job_volumes: list[MountPoint],
+    ):
+        assert interpolate_job_volumes(run_volumes, job_num) == job_volumes
+
+    @pytest.mark.parametrize(
+        ["run_volumes", "job_num"],
+        [
+            pytest.param(
+                [VolumeMountPoint(name="${{}", path="/volume")],
+                0,
+                id="invalid_syntax",
+            ),
+            pytest.param(
+                [VolumeMountPoint(name="${{ unknown.namespace }}", path="/volume")],
+                0,
+                id="unknown_namespace",
+            ),
+            pytest.param(
+                [VolumeMountPoint(name="${{ dstack.var }}", path="/volume")],
+                0,
+                id="unknown_var",
+            ),
+        ],
+    )
+    def test_raises_server_client_error(
+        self,
+        run_volumes: list[Union[MountPoint, str]],
+        job_num: int,
+    ):
+        with pytest.raises(ServerClientError):
+            assert interpolate_job_volumes(run_volumes, job_num)

tests/_internal/server/services/test_pools.py

@@ -66,6 +66,8 @@ class TestInstanceModelToInstance:
             created=created,
             region="eu-west-1",
             price=1.0,
+            total_blocks=1,
+            busy_blocks=0,
         )
         im = InstanceModel(
             id=instance_id,
@@ -78,6 +80,8 @@ class TestInstanceModelToInstance:
             pool=None,
             job_provisioning_data='{"ssh_proxy":null, "backend":"local","hostname":"hostname_test","region":"eu-west","price":1.0,"username":"user1","ssh_port":12345,"dockerized":false,"instance_id":"test_instance","instance_type": {"name": "instance", "resources": {"cpus": 1, "memory_mib": 512, "gpus": [], "spot": false, "disk": {"size_mib": 102400}, "description":""}}}',
             offer='{"price":"LOCAL", "price":1.0, "backend":"local", "region":"eu-west-1", "availability":"available","instance": {"name": "instance", "resources": {"cpus": 1, "memory_mib": 512, "gpus": [], "spot": false, "disk": {"size_mib": 102400}, "description":""}}}',
+            total_blocks=1,
+            busy_blocks=0,
         )
         instance = services_pools.instance_model_to_instance(im)
         assert instance == expected_instance

tests/_internal/server/services/test_runs.py

@@ -10,9 +10,9 @@ from dstack._internal.core.models.configurations import ScalingSpec, ServiceConf
 from dstack._internal.core.models.profiles import Profile
 from dstack._internal.core.models.resources import Range
 from dstack._internal.core.models.runs import JobStatus, JobTerminationReason, RunStatus
-from dstack._internal.core.models.volumes import VolumeMountPoint
 from dstack._internal.server.models import RunModel
-from dstack._internal.server.services.runs import check_can_attach_run_volumes, scale_run_replicas
+from dstack._internal.server.services.jobs import check_can_attach_job_volumes
+from dstack._internal.server.services.runs import scale_run_replicas
 from dstack._internal.server.testing.common import (
     create_job,
     create_pool,
@@ -241,19 +241,7 @@ class TestCanAttachRunVolumes:
         vol22.configuration.backend = BackendType.AWS
         vol22.configuration.region = "eu-west-2"
         volumes = [[vol11, vol12], [vol21, vol22]]
-        run_spec = get_run_spec(
-            run_name="test_run",
-            repo_id="test_repo",
-            configuration=ServiceConfiguration(
-                port=80,
-                commands=[""],
-                volumes=[
-                    VolumeMountPoint(name=["vol11", "vol12"], path="/vol1"),
-                    VolumeMountPoint(name=["vol21", "vol22"], path="/vol2"),
-                ],
-            ),
-        )
-        check_can_attach_run_volumes(run_spec, volumes)
+        check_can_attach_job_volumes(volumes)
 
     @pytest.mark.asyncio
     async def test_cannot_attach_different_mount_points_with_different_backends_regions(self):
@@ -264,20 +252,8 @@ class TestCanAttachRunVolumes:
         vol2.configuration.backend = BackendType.AWS
         vol2.configuration.region = "eu-west-2"
         volumes = [[vol1], [vol2]]
-        run_spec = get_run_spec(
-            run_name="test_run",
-            repo_id="test_repo",
-            configuration=ServiceConfiguration(
-                port=80,
-                commands=[""],
-                volumes=[
-                    VolumeMountPoint(name=["vol1"], path="/vol1"),
-                    VolumeMountPoint(name=["vol2"], path="/vol2"),
-                ],
-            ),
-        )
         with pytest.raises(ServerClientError):
-            check_can_attach_run_volumes(run_spec, volumes)
+            check_can_attach_job_volumes(volumes)
 
     @pytest.mark.asyncio
     async def test_cannot_attach_same_volume_at_different_mount_points(self):
@@ -285,17 +261,5 @@ class TestCanAttachRunVolumes:
         vol1.configuration.backend = BackendType.AWS
         vol1.configuration.region = "eu-west-1"
         volumes = [[vol1], [vol1]]
-        run_spec = get_run_spec(
-            run_name="test_run",
-            repo_id="test_repo",
-            configuration=ServiceConfiguration(
-                port=80,
-                commands=[""],
-                volumes=[
-                    VolumeMountPoint(name=["vol1"], path="/vol1"),
-                    VolumeMountPoint(name=["vol1"], path="/vol2"),
-                ],
-            ),
-        )
         with pytest.raises(ServerClientError):
-            check_can_attach_run_volumes(run_spec, volumes)
+            check_can_attach_job_volumes(volumes)

tests/_internal/utils/test_common.py

@@ -6,6 +6,7 @@ from freezegun import freeze_time
 
 from dstack._internal.utils.common import (
     concat_url_path,
+    format_duration_multiunit,
     local_time,
     make_proxy_url,
     parse_memory,
@@ -87,6 +88,26 @@ class TestPrettyDate:
         assert pretty_date(future_time) == ""
 
 
+class TestFormatDurationMultiunit:
+    @pytest.mark.parametrize(
+        ("input", "output"),
+        [
+            (0, "0s"),
+            (59, "59s"),
+            (60, "1m"),
+            (61, "1m 1s"),
+            (694861, "1w 1d 1h 1m 1s"),
+            (86401, "1d 1s"),
+        ],
+    )
+    def test(self, input: int, output: str) -> None:
+        assert format_duration_multiunit(input) == output
+
+    def test_forbids_negative(self) -> None:
+        with pytest.raises(ValueError):
+            format_duration_multiunit(-1)
+
+
 class TestParseMemory:
     @pytest.mark.parametrize(
         "memory,as_units,expected",

tests/_internal/utils/test_env.py

@@ -0,0 +1,38 @@
+import pytest
+
+from dstack._internal.utils.env import get_bool
+
+
+@pytest.mark.parametrize(
+    ["value", "expected"],
+    [
+        ["0", False],
+        ["1", True],
+        ["true", True],
+        ["True", True],
+        ["FALSE", False],
+        ["off", False],
+        ["ON", True],
+    ],
+)
+def test_get_bool_is_set(monkeypatch: pytest.MonkeyPatch, value: str, expected: bool):
+    monkeypatch.setenv("VAR", value)
+    assert get_bool("VAR") is expected
+
+
+def test_get_bool_not_set_default_not_set(monkeypatch: pytest.MonkeyPatch):
+    monkeypatch.delenv("VAR", raising=False)
+    assert get_bool("VAR") is False
+
+
+@pytest.mark.parametrize("default", [False, True])
+def test_get_bool_not_set_default_is_set(monkeypatch: pytest.MonkeyPatch, default: bool):
+    monkeypatch.delenv("VAR", raising=False)
+    assert get_bool("VAR", default) is default
+
+
+@pytest.mark.parametrize("value", ["", "2", "foo"])
+def test_get_bool_error_value(monkeypatch: pytest.MonkeyPatch, value: str):
+    monkeypatch.setenv("VAR", value)
+    with pytest.raises(ValueError, match=f"VAR={value}"):
+        assert get_bool("VAR")