dstack 0.18.44__py3-none-any.whl → 0.19.0__py3-none-any.whl

tests/_internal/server/background/tasks/test_process_instances.py

@@ -28,9 +28,9 @@ from dstack._internal.server.background.tasks.process_instances import (
     process_instances,
 )
 from dstack._internal.server.testing.common import (
+    ComputeMockSpec,
     create_instance,
     create_job,
-    create_pool,
     create_project,
     create_repo,
     create_run,
@@ -49,10 +49,10 @@ class TestCheckShim:
         self, test_db, session: AsyncSession
     ):
         project = await create_project(session=session)
-        pool = await create_pool(session, project)
-
         instance = await create_instance(
-            session, project, pool, status=InstanceStatus.PROVISIONING
+            session=session,
+            project=project,
+            status=InstanceStatus.PROVISIONING,
         )
         instance.termination_deadline = get_current_datetime() + dt.timedelta(days=1)
         instance.health_status = "ssh connect problem"
@@ -78,10 +78,10 @@ class TestCheckShim:
         self, test_db, session: AsyncSession
     ):
         project = await create_project(session=session)
-        pool = await create_pool(session, project)
-
         instance = await create_instance(
-            session, project, pool, status=InstanceStatus.PROVISIONING
+            session=session,
+            project=project,
+            status=InstanceStatus.PROVISIONING,
         )
         instance.started_at = get_current_datetime() + dt.timedelta(minutes=-20)
         instance.health_status = "ssh connect problem"
@@ -110,7 +110,6 @@ class TestCheckShim:
     ):
         user = await create_user(session=session)
         project = await create_project(session=session, owner=user)
-        pool = await create_pool(session, project)
         repo = await create_repo(
             session=session,
             project_id=project.id,
@@ -121,9 +120,10 @@ class TestCheckShim:
             repo=repo,
             user=user,
         )
-
         instance = await create_instance(
-            session, project, pool, status=InstanceStatus.PROVISIONING
+            session=session,
+            project=project,
+            status=InstanceStatus.PROVISIONING,
         )
         instance.termination_deadline = get_current_datetime().replace(
             tzinfo=dt.timezone.utc
@@ -158,10 +158,11 @@ class TestCheckShim:
     @pytest.mark.parametrize("test_db", ["sqlite", "postgres"], indirect=True)
     async def test_check_shim_start_termination_deadline(self, test_db, session: AsyncSession):
         project = await create_project(session=session)
-        pool = await create_pool(session, project)
-
-        instance = await create_instance(session, project, pool, status=InstanceStatus.IDLE)
-
+        instance = await create_instance(
+            session=session,
+            project=project,
+            status=InstanceStatus.IDLE,
+        )
         health_status = "SSH connection fail"
         with patch(
             "dstack._internal.server.background.tasks.process_instances._instance_healthcheck"
@@ -183,9 +184,11 @@ class TestCheckShim:
     @pytest.mark.parametrize("test_db", ["sqlite", "postgres"], indirect=True)
     async def test_check_shim_stop_termination_deadline(self, test_db, session: AsyncSession):
         project = await create_project(session=session)
-        pool = await create_pool(session, project)
-
-        instance = await create_instance(session, project, pool, status=InstanceStatus.IDLE)
+        instance = await create_instance(
+            session=session,
+            project=project,
+            status=InstanceStatus.IDLE,
+        )
         instance.termination_deadline = get_current_datetime() + dt.timedelta(minutes=19)
         await session.commit()
 
@@ -206,9 +209,11 @@ class TestCheckShim:
     @pytest.mark.parametrize("test_db", ["sqlite", "postgres"], indirect=True)
     async def test_check_shim_terminate_instance_by_dedaline(self, test_db, session: AsyncSession):
         project = await create_project(session=session)
-        pool = await create_pool(session, project)
-
-        instance = await create_instance(session, project, pool, status=InstanceStatus.IDLE)
+        instance = await create_instance(
+            session=session,
+            project=project,
+            status=InstanceStatus.IDLE,
+        )
         termination_deadline_time = get_current_datetime() + dt.timedelta(minutes=-19)
         instance.termination_deadline = termination_deadline_time
         await session.commit()
@@ -251,7 +256,6 @@ class TestCheckShim:
     ):
         # see https://github.com/dstackai/dstack/issues/2041
         project = await create_project(session=session)
-        pool = await create_pool(session, project)
         if has_job:
             user = await create_user(session=session)
             repo = await create_repo(
@@ -272,9 +276,8 @@ class TestCheckShim:
         else:
             job = None
         instance = await create_instance(
-            session,
-            project,
-            pool,
+            session=session,
+            project=project,
             created_at=get_current_datetime(),
             termination_policy=termination_policy,
             status=InstanceStatus.IDLE,
@@ -302,8 +305,9 @@ class TestTerminateIdleTime:
     @pytest.mark.parametrize("test_db", ["sqlite", "postgres"], indirect=True)
     async def test_terminate_by_idle_timeout(self, test_db, session: AsyncSession):
         project = await create_project(session=session)
-        pool = await create_pool(session, project)
-        instance = await create_instance(session, project, pool, status=InstanceStatus.IDLE)
+        instance = await create_instance(
+            session=session, project=project, status=InstanceStatus.IDLE
+        )
         instance.termination_idle_time = 300
         instance.termination_policy = TerminationPolicy.DESTROY_AFTER_IDLE
         instance.last_job_processed_at = get_current_datetime() + dt.timedelta(minutes=-19)
@@ -320,11 +324,9 @@ class TestSSHInstanceTerminateProvisionTimeoutExpired:
     @pytest.mark.parametrize("test_db", ["sqlite", "postgres"], indirect=True)
     async def test_terminate_by_idle_timeout(self, test_db, session: AsyncSession):
         project = await create_project(session=session)
-        pool = await create_pool(session, project)
         instance = await create_instance(
-            session,
-            project,
-            pool,
+            session=session,
+            project=project,
             status=InstanceStatus.PENDING,
             created_at=get_current_datetime() - dt.timedelta(days=100),
         )
@@ -357,10 +359,9 @@ class TestTerminate:
     @pytest.mark.parametrize("test_db", ["sqlite", "postgres"], indirect=True)
     async def test_terminate(self, test_db, session: AsyncSession):
         project = await create_project(session=session)
-        pool = await create_pool(session, project)
-
-        instance = await create_instance(session, project, pool, status=InstanceStatus.TERMINATING)
-
+        instance = await create_instance(
+            session=session, project=project, status=InstanceStatus.TERMINATING
+        )
         reason = "some reason"
         instance.termination_reason = reason
         instance.last_job_processed_at = get_current_datetime() + dt.timedelta(minutes=-19)
@@ -384,8 +385,9 @@ class TestTerminate:
     @pytest.mark.parametrize("error", [BackendError("err"), RuntimeError("err")])
     async def test_terminate_retry(self, test_db, session: AsyncSession, error: Exception):
         project = await create_project(session=session)
-        pool = await create_pool(session, project)
-        instance = await create_instance(session, project, pool, status=InstanceStatus.TERMINATING)
+        instance = await create_instance(
+            session=session, project=project, status=InstanceStatus.TERMINATING
+        )
         instance.termination_reason = "some reason"
         initial_time = dt.datetime(2025, 1, 1, tzinfo=dt.timezone.utc)
         instance.last_job_processed_at = initial_time
@@ -415,8 +417,9 @@ class TestTerminate:
     @pytest.mark.parametrize("test_db", ["sqlite", "postgres"], indirect=True)
     async def test_terminate_not_retries_if_too_early(self, test_db, session: AsyncSession):
         project = await create_project(session=session)
-        pool = await create_pool(session, project)
-        instance = await create_instance(session, project, pool, status=InstanceStatus.TERMINATING)
+        instance = await create_instance(
+            session=session, project=project, status=InstanceStatus.TERMINATING
+        )
         instance.termination_reason = "some reason"
         initial_time = dt.datetime(2025, 1, 1, tzinfo=dt.timezone.utc)
         instance.last_job_processed_at = initial_time
@@ -446,8 +449,9 @@ class TestTerminate:
     @pytest.mark.parametrize("test_db", ["sqlite", "postgres"], indirect=True)
     async def test_terminate_on_termination_deadline(self, test_db, session: AsyncSession):
         project = await create_project(session=session)
-        pool = await create_pool(session, project)
-        instance = await create_instance(session, project, pool, status=InstanceStatus.TERMINATING)
+        instance = await create_instance(
+            session=session, project=project, status=InstanceStatus.TERMINATING
+        )
         instance.termination_reason = "some reason"
         initial_time = dt.datetime(2025, 1, 1, tzinfo=dt.timezone.utc)
         instance.last_job_processed_at = initial_time
@@ -505,11 +509,9 @@ class TestCreateInstance:
         expected_blocks: int,
     ):
         project = await create_project(session=session)
-        pool = await create_pool(session, project)
         instance = await create_instance(
-            session,
-            project,
-            pool,
+            session=session,
+            project=project,
             status=InstanceStatus.PENDING,
             total_blocks=requested_blocks,
             busy_blocks=0,
@@ -531,6 +533,7 @@ class TestCreateInstance:
                 price=1.0,
                 availability=InstanceAvailability.AVAILABLE,
             )
+            backend_mock.compute.return_value = Mock(spec=ComputeMockSpec)
             backend_mock.compute.return_value.get_offers_cached.return_value = [offer]
             backend_mock.compute.return_value.create_instance.return_value = JobProvisioningData(
                 backend=offer.backend,
@@ -611,11 +614,9 @@ class TestAddSSHInstance:
         host_info["cpus"] = cpus
         host_info["gpu_count"] = gpus
         project = await create_project(session=session)
-        pool = await create_pool(session, project)
         instance = await create_instance(
-            session,
-            project,
-            pool,
+            session=session,
+            project=project,
             status=InstanceStatus.PENDING,
             created_at=get_current_datetime(),
             remote_connection_info=get_remote_connection_info(),

tests/_internal/server/background/tasks/test_process_metrics.py

@@ -21,7 +21,6 @@ from dstack._internal.server.testing.common import (
     create_instance,
     create_job,
     create_job_metrics_point,
-    create_pool,
     create_project,
     create_repo,
     create_run,
@@ -45,11 +44,9 @@ class TestCollectMetrics:
             session=session,
             project_id=project.id,
         )
-        pool = await create_pool(session=session, project=project)
         instance = await create_instance(
             session=session,
             project=project,
-            pool=pool,
             status=InstanceStatus.BUSY,
         )
         run = await create_run(

tests/_internal/server/background/tasks/test_process_placement_groups.py

@@ -7,6 +7,7 @@ from dstack._internal.server.background.tasks.process_placement_groups import (
     process_placement_groups,
 )
 from dstack._internal.server.testing.common import (
+    ComputeMockSpec,
     create_fleet,
     create_placement_group,
     create_project,
@@ -34,6 +35,7 @@ class TestProcessPlacementGroups:
         with patch("dstack._internal.server.services.backends.get_project_backend_by_type") as m:
             aws_mock = Mock()
             m.return_value = aws_mock
+            aws_mock.compute.return_value = Mock(spec=ComputeMockSpec)
             await process_placement_groups()
             aws_mock.compute.return_value.delete_placement_group.assert_called_once()
         await session.refresh(placement_group1)

tests/_internal/server/background/tasks/test_process_prometheus_metrics.py

@@ -21,7 +21,6 @@ from dstack._internal.server.testing.common import (
     create_instance,
     create_job,
     create_job_prometheus_metrics,
-    create_pool,
     create_project,
     create_repo,
     create_run,
@@ -45,11 +44,9 @@ class TestCollectPrometheusMetrics:
             session=session,
             project_id=project.id,
         )
-        pool = await create_pool(session=session, project=project)
         instance = await create_instance(
             session=session,
             project=project,
-            pool=pool,
             status=InstanceStatus.BUSY,
         )
         run = await create_run(

tests/_internal/server/background/tasks/test_process_running_jobs.py

@@ -42,7 +42,6 @@ from dstack._internal.server.testing.common import (
     create_instance,
     create_job,
     create_job_metrics_point,
-    create_pool,
     create_project,
     create_repo,
     create_run,
@@ -106,11 +105,9 @@ class TestProcessRunningJobs:
             repo=repo,
             user=user,
         )
-        pool = await create_pool(session=session, project=project)
         instance = await create_instance(
             session=session,
             project=project,
-            pool=pool,
             status=InstanceStatus.BUSY,
         )
         job_provisioning_data = get_job_provisioning_data(dockerized=False)
@@ -156,11 +153,9 @@ class TestProcessRunningJobs:
             repo=repo,
             user=user,
         )
-        pool = await create_pool(session=session, project=project)
         instance = await create_instance(
             session=session,
             project=project,
-            pool=pool,
             status=InstanceStatus.BUSY,
         )
         job_provisioning_data = get_job_provisioning_data(dockerized=False)
@@ -207,11 +202,9 @@ class TestProcessRunningJobs:
             repo=repo,
             user=user,
         )
-        pool = await create_pool(session=session, project=project)
         instance = await create_instance(
             session=session,
             project=project,
-            pool=pool,
             status=InstanceStatus.BUSY,
         )
         job_provisioning_data = get_job_provisioning_data(dockerized=False)
@@ -307,11 +300,9 @@ class TestProcessRunningJobs:
             run_name="test-run",
             run_spec=run_spec,
         )
-        pool = await create_pool(session=session, project=project)
         instance = await create_instance(
             session=session,
             project=project,
-            pool=pool,
             status=InstanceStatus.BUSY,
         )
         job_provisioning_data = get_job_provisioning_data(dockerized=True)
@@ -377,11 +368,9 @@ class TestProcessRunningJobs:
             repo=repo,
             user=user,
         )
-        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(
@@ -434,11 +423,9 @@ class TestProcessRunningJobs:
             repo=repo,
             user=user,
         )
-        pool = await create_pool(session=session, project=project)
         instance = await create_instance(
             session=session,
             project=project,
-            pool=pool,
             status=InstanceStatus.BUSY,
         )
         job_provisioning_data = get_job_provisioning_data(dockerized=True)
@@ -479,11 +466,9 @@ class TestProcessRunningJobs:
             repo=repo,
             user=user,
         )
-        pool = await create_pool(session, project)
         instance = await create_instance(
             session=session,
             project=project,
-            pool=pool,
             status=InstanceStatus.IDLE,
         )
         job_provisioning_data = get_job_provisioning_data(dockerized=True)
@@ -528,11 +513,9 @@ class TestProcessRunningJobs:
             run_name="test-run",
             run_spec=run_spec,
         )
-        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(
@@ -655,11 +638,9 @@ class TestProcessRunningJobs:
                 ),
             ),
         )
-        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(
@@ -762,11 +743,9 @@ class TestProcessRunningJobs:
                 ),
             ),
         )
-        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(

tests/_internal/server/background/tasks/test_process_runs.py

@@ -21,7 +21,6 @@ from dstack._internal.server.models import RunModel
 from dstack._internal.server.testing.common import (
     create_instance,
     create_job,
-    create_pool,
     create_project,
     create_repo,
     create_run,
@@ -42,9 +41,6 @@ async def make_run(
         session=session,
         project_id=project.id,
     )
-    project.default_pool = await create_pool(
-        session=session, project=project, pool_name="default-pool"
-    )
     run_name = "test-run"
     profile = Profile(
         name="test-profile",
@@ -60,7 +56,7 @@ async def make_run(
             replicas=parse_obj_as(Range[int], replicas),
         ),
     )
-    return await create_run(
+    run = await create_run(
         session=session,
         project=project,
         repo=repo,
@@ -69,6 +65,8 @@ async def make_run(
         run_spec=run_spec,
         status=status,
     )
+    run.project = project
+    return run
 
 
 class TestProcessRuns:
@@ -117,11 +115,9 @@ class TestProcessRuns:
     async def test_terminate_run_jobs(self, test_db, session: AsyncSession):
         run = await make_run(session, status=RunStatus.TERMINATING)
         run.termination_reason = RunTerminationReason.JOB_FAILED
-        pool = await create_pool(session=session, project=run.project)
         instance = await create_instance(
             session=session,
             project=run.project,
-            pool=pool,
             status=InstanceStatus.BUSY,
         )
         job = await create_job(
@@ -146,9 +142,7 @@ class TestProcessRuns:
     @pytest.mark.parametrize("test_db", ["sqlite", "postgres"], indirect=True)
     async def test_retry_running_to_pending(self, test_db, session: AsyncSession):
         run = await make_run(session, status=RunStatus.RUNNING)
-        instance = await create_instance(
-            session, project=run.project, pool=run.project.default_pool, spot=True
-        )
+        instance = await create_instance(session, project=run.project, spot=True)
         await create_job(
             session=session,
             run=run,
@@ -169,9 +163,7 @@ class TestProcessRuns:
     @pytest.mark.parametrize("test_db", ["sqlite", "postgres"], indirect=True)
     async def test_retry_running_to_failed(self, test_db, session: AsyncSession):
         run = await make_run(session, status=RunStatus.RUNNING)
-        instance = await create_instance(
-            session, project=run.project, pool=run.project.default_pool, spot=True
-        )
+        instance = await create_instance(session, project=run.project, spot=True)
         # job exited with non-zero code
         await create_job(
             session=session,
@@ -237,9 +229,7 @@ class TestProcessRunsReplicas:
             submitted_at=run.submitted_at,
             last_processed_at=run.submitted_at,
             replica_num=0,
-            instance=await create_instance(
-                session, project=run.project, pool=run.project.default_pool, spot=True
-            ),
+            instance=await create_instance(session, project=run.project, spot=True),
             job_provisioning_data=get_job_provisioning_data(),
         )
         await create_job(
@@ -250,9 +240,7 @@ class TestProcessRunsReplicas:
             submitted_at=run.submitted_at,
             last_processed_at=run.submitted_at,
             replica_num=1,
-            instance=await create_instance(
-                session, project=run.project, pool=run.project.default_pool, spot=True
-            ),
+            instance=await create_instance(session, project=run.project, spot=True),
             job_provisioning_data=get_job_provisioning_data(),
         )
         with patch("dstack._internal.utils.common.get_current_datetime") as datetime_mock:
@@ -273,9 +261,7 @@ class TestProcessRunsReplicas:
             submitted_at=run.submitted_at,
             last_processed_at=run.last_processed_at,
             replica_num=0,
-            instance=await create_instance(
-                session, project=run.project, pool=run.project.default_pool, spot=True
-            ),
+            instance=await create_instance(session, project=run.project, spot=True),
             job_provisioning_data=get_job_provisioning_data(),
         )
         await create_job(