dstack 0.18.43__py3-none-any.whl → 0.19.0rc1__py3-none-any.whl

tests/_internal/server/routers/test_fleets.py

@@ -27,7 +27,6 @@ from dstack._internal.server.testing.common import (
     create_fleet,
     create_instance,
     create_job,
-    create_pool,
     create_project,
     create_repo,
     create_run,
@@ -346,8 +345,6 @@ class TestCreateFleet:
                     "retry": None,
                     "max_price": None,
                     "idle_duration": None,
-                    "termination_policy": None,
-                    "termination_idle_time": None,
                     "type": "fleet",
                     "name": "test-fleet",
                     "reservation": None,
@@ -360,16 +357,12 @@ class TestCreateFleet:
                     "instance_types": None,
                     "spot_policy": None,
                     "retry": None,
-                    "retry_policy": None,
                     "max_duration": None,
                     "stop_duration": None,
                     "max_price": None,
-                    "pool_name": None,
-                    "instance_name": None,
                     "creation_policy": None,
                     "idle_duration": None,
-                    "termination_policy": None,
-                    "termination_idle_time": None,
+                    "utilization_policy": None,
                     "name": "",
                     "default": False,
                     "reservation": None,
@@ -393,7 +386,6 @@ class TestCreateFleet:
                     "unreachable": False,
                     "termination_reason": None,
                     "created": "2023-01-02T03:04:00+00:00",
-                    "pool_name": None,
                     "backend": None,
                     "region": None,
                     "availability_zone": None,
@@ -471,8 +463,6 @@ class TestCreateFleet:
                     "retry": None,
                     "max_price": None,
                     "idle_duration": None,
-                    "termination_policy": None,
-                    "termination_idle_time": None,
                     "type": "fleet",
                     "name": spec.configuration.name,
                     "reservation": None,
@@ -485,16 +475,12 @@ class TestCreateFleet:
                     "instance_types": None,
                     "spot_policy": None,
                     "retry": None,
-                    "retry_policy": None,
                     "max_duration": None,
                     "stop_duration": None,
                     "max_price": None,
-                    "pool_name": None,
-                    "instance_name": None,
                     "creation_policy": None,
                     "idle_duration": None,
-                    "termination_policy": None,
-                    "termination_idle_time": None,
+                    "utilization_policy": None,
                     "name": "",
                     "default": False,
                     "reservation": None,
@@ -524,7 +510,6 @@ class TestCreateFleet:
                     "fleet_id": "1b0e1b45-2f8c-4ab6-8010-a0d1a3e44e0e",
                     "fleet_name": spec.configuration.name,
                     "instance_num": 0,
-                    "pool_name": None,
                     "job_name": None,
                     "hostname": "1.1.1.1",
                     "status": "pending",
@@ -625,12 +610,10 @@ class TestDeleteFleets:
         await add_project_member(
             session=session, project=project, user=user, project_role=ProjectRole.USER
         )
-        pool = await create_pool(session=session, project=project)
         fleet = await create_fleet(session=session, project=project)
         instance = await create_instance(
             session=session,
             project=project,
-            pool=pool,
         )
         fleet.instances.append(instance)
         await session.commit()
@@ -652,7 +635,6 @@ class TestDeleteFleets:
     ):
         user = await create_user(session, global_role=GlobalRole.USER)
         project = await create_project(session)
-        pool = await create_pool(session=session, project=project)
         await add_project_member(
             session=session, project=project, user=user, project_role=ProjectRole.USER
         )
@@ -674,7 +656,6 @@ class TestDeleteFleets:
         instance = await create_instance(
             session=session,
             project=project,
-            pool=pool,
             status=InstanceStatus.BUSY,
             job=job,
         )
@@ -742,18 +723,15 @@ class TestDeleteFleetInstances:
         await add_project_member(
             session=session, project=project, user=user, project_role=ProjectRole.USER
         )
-        pool = await create_pool(session=session, project=project)
         fleet = await create_fleet(session=session, project=project)
         instance1 = await create_instance(
             session=session,
             project=project,
-            pool=pool,
             instance_num=1,
         )
         instance2 = await create_instance(
             session=session,
             project=project,
-            pool=pool,
             instance_num=2,
         )
         fleet.instances.append(instance1)
@@ -783,7 +761,6 @@ class TestDeleteFleetInstances:
         await add_project_member(
             session=session, project=project, user=user, project_role=ProjectRole.USER
         )
-        pool = await create_pool(session=session, project=project)
         fleet = await create_fleet(session=session, project=project)
         repo = await create_repo(
             session=session,
@@ -802,7 +779,6 @@ class TestDeleteFleetInstances:
         instance = await create_instance(
             session=session,
             project=project,
-            pool=pool,
             instance_num=1,
             status=InstanceStatus.BUSY,
             job=job,

tests/_internal/server/routers/test_gateways.py

@@ -13,6 +13,7 @@ from dstack._internal.server.services.gateways import (
 )
 from dstack._internal.server.services.projects import add_project_member
 from dstack._internal.server.testing.common import (
+    ComputeMockSpec,
     create_backend,
     create_gateway,
     create_gateway_compute,
@@ -174,7 +175,14 @@ class TestCreateGateway:
         backend = await create_backend(session, project.id, backend_type=BackendType.AWS)
         response = await client.post(
             f"/api/project/{project.name}/gateways/create",
-            json={"name": "test", "backend_type": "aws", "region": "us"},
+            json={
+                "configuration": {
+                    "type": "gateway",
+                    "name": "test",
+                    "backend": "aws",
+                    "region": "us",
+                },
+            },
             headers=get_auth_headers(user.token),
         )
         assert response.status_code == 200
@@ -217,7 +225,14 @@ class TestCreateGateway:
             g.return_value = "random-name"
             response = await client.post(
                 f"/api/project/{project.name}/gateways/create",
-                json={"name": None, "backend_type": "aws", "region": "us"},
+                json={
+                    "configuration": {
+                        "type": "gateway",
+                        "name": None,
+                        "backend": "aws",
+                        "region": "us",
+                    },
+                },
                 headers=get_auth_headers(user.token),
             )
             g.assert_called_once()
@@ -258,7 +273,14 @@ class TestCreateGateway:
         )
         response = await client.post(
             f"/api/project/{project.name}/gateways/create",
-            json={"name": "test", "backend_type": "aws", "region": "us"},
+            json={
+                "configuration": {
+                    "type": "gateway",
+                    "name": "test",
+                    "backend": "aws",
+                    "region": "us",
+                },
+            },
             headers=get_auth_headers(user.token),
         )
         assert response.status_code == 400
@@ -437,8 +459,10 @@ class TestDeleteGateway:
             "dstack._internal.server.services.gateways.get_project_backend_by_type_or_error"
         ) as m:
             aws = Mock()
+            aws.compute.return_value = Mock(spec=ComputeMockSpec)
             aws.compute.return_value.terminate_gateway.return_value = None  # success
             gcp = Mock()
+            gcp.compute.return_value = Mock(spec=ComputeMockSpec)
             gcp.compute.return_value.terminate_gateway.side_effect = DstackError()  # fail
 
             def get_backend(project, backend_type):

tests/_internal/server/routers/test_instances.py

@@ -15,7 +15,6 @@ from dstack._internal.server.services.projects import add_project_member
 from dstack._internal.server.testing.common import (
     create_fleet,
     create_instance,
-    create_pool,
     create_project,
     create_user,
     get_auth_headers,
@@ -59,11 +58,6 @@ class TestListInstances:
         await add_project_member(
             session, project=projects[2], user=users[1], project_role=ProjectRole.USER
         )
-        pools = [
-            await create_pool(session, projects[0]),
-            await create_pool(session, projects[1]),
-            await create_pool(session, projects[2]),
-        ]
         fleets = [
             await create_fleet(
                 session,
@@ -88,7 +82,6 @@ class TestListInstances:
             await create_instance(
                 session=session,
                 project=projects[0],
-                pool=pools[0],
                 fleet=fleets[0],
                 created_at=dt.datetime(2024, 1, 1, tzinfo=dt.timezone.utc),
                 name="fleet0-0",
@@ -96,7 +89,6 @@ class TestListInstances:
             await create_instance(
                 session=session,
                 project=projects[1],
-                pool=pools[1],
                 fleet=fleets[1],
                 created_at=dt.datetime(2024, 1, 2, tzinfo=dt.timezone.utc),
                 name="fleet1-0",
@@ -104,7 +96,6 @@ class TestListInstances:
             await create_instance(
                 session=session,
                 project=projects[2],
-                pool=pools[2],
                 fleet=fleets[2],
                 created_at=dt.datetime(2024, 1, 3, tzinfo=dt.timezone.utc),
                 name="fleet2-0",
@@ -112,7 +103,6 @@ class TestListInstances:
             await create_instance(
                 session=session,
                 project=projects[2],
-                pool=pools[2],
                 fleet=fleets[2],
                 created_at=dt.datetime(2024, 1, 4, tzinfo=dt.timezone.utc),
                 instance_num=1,

tests/_internal/server/routers/test_metrics.py

@@ -14,6 +14,9 @@ from dstack._internal.server.testing.common import (
     create_run,
     create_user,
     get_auth_headers,
+    get_instance_offer_with_availability,
+    get_job_provisioning_data,
+    get_job_runtime_data,
 )
 
 pytestmark = pytest.mark.usefixtures("image_config_mock")
@@ -51,15 +54,38 @@ class TestGetJobMetrics:
             repo=repo,
             user=user,
         )
+        jpd = get_job_provisioning_data(
+            cpu_count=128, memory_gib=256, gpu_count=2, gpu_memory_gib=32
+        )
+        offer = get_instance_offer_with_availability(
+            cpu_count=64, memory_gib=128, gpu_count=1, gpu_memory_gib=32
+        )
+        jrd = get_job_runtime_data(offer=offer)
         job = await create_job(
             session=session,
             run=run,
+            job_provisioning_data=jpd,
+            job_runtime_data=jrd,
+        )
+        await create_job_metrics_point(
+            session=session,
+            job_model=job,
+            timestamp=datetime(2023, 1, 2, 3, 4, 5, tzinfo=timezone.utc),
+            cpu_usage_micro=2 * 1_000_000,
+            memory_usage_bytes=256,
+            memory_working_set_bytes=128,
+            gpus_memory_usage_bytes=[256],
+            gpus_util_percent=[2],
         )
         await create_job_metrics_point(
             session=session,
             job_model=job,
             timestamp=datetime(2023, 1, 2, 3, 4, 15, tzinfo=timezone.utc),
             cpu_usage_micro=4 * 1_000_000,
+            memory_usage_bytes=512,
+            memory_working_set_bytes=256,
+            gpus_memory_usage_bytes=[512],
+            gpus_util_percent=[6],
         )
         await create_job_metrics_point(
             session=session,
@@ -76,6 +102,7 @@ class TestGetJobMetrics:
             headers=get_auth_headers(user.token),
         )
         assert response.status_code == 200
+        # Returns one last sample by default. Filtering is tested in services/test_metrics.py
         assert response.json() == {
             "metrics": [
                 {
@@ -93,11 +120,26 @@ class TestGetJobMetrics:
                     "timestamps": ["2023-01-02T03:04:25+00:00"],
                     "values": [512],
                 },
+                {
+                    "name": "cpus_detected_num",
+                    "timestamps": ["2023-01-02T03:04:25+00:00"],
+                    "values": [64],
+                },
+                {
+                    "name": "memory_total_bytes",
+                    "timestamps": ["2023-01-02T03:04:25+00:00"],
+                    "values": [137438953472],
+                },
                 {
                     "name": "gpus_detected_num",
                     "timestamps": ["2023-01-02T03:04:25+00:00"],
                     "values": [1],
                 },
+                {
+                    "name": "gpu_memory_total_bytes",
+                    "timestamps": ["2023-01-02T03:04:25+00:00"],
+                    "values": [34359738368],
+                },
                 {
                     "name": "gpu_memory_usage_bytes_gpu0",
                     "timestamps": ["2023-01-02T03:04:25+00:00"],

tests/_internal/server/routers/test_projects.py

@@ -503,6 +503,62 @@ class TestSetProjectMembers:
         members = res.scalars().all()
         assert len(members) == 3
 
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize("test_db", ["sqlite", "postgres"], indirect=True)
+    async def test_sets_project_members_by_email(
+        self, test_db, session: AsyncSession, client: AsyncClient
+    ):
+        project = await create_project(
+            session=session,
+            created_at=datetime(2023, 1, 2, 3, 4, tzinfo=timezone.utc),
+        )
+        admin = await create_user(
+            session=session,
+            created_at=datetime(2023, 1, 2, 3, 4, tzinfo=timezone.utc),
+            global_role=GlobalRole.ADMIN,
+        )
+        user1 = await create_user(
+            session=session,
+            name="user1",
+            created_at=datetime(2023, 1, 2, 3, 4, tzinfo=timezone.utc),
+            email="testemail@example.com",
+        )
+        members = [
+            {
+                "username": user1.email,
+                "project_role": ProjectRole.ADMIN,
+            },
+        ]
+        body = {"members": members}
+        response = await client.post(
+            f"/api/projects/{project.name}/set_members",
+            headers=get_auth_headers(admin.token),
+            json=body,
+        )
+        assert response.status_code == 200, response.json()
+        assert response.json()["members"] == [
+            {
+                "user": {
+                    "id": str(user1.id),
+                    "username": user1.name,
+                    "created_at": "2023-01-02T03:04:00+00:00",
+                    "global_role": user1.global_role,
+                    "email": user1.email,
+                    "active": True,
+                    "permissions": {
+                        "can_create_projects": True,
+                    },
+                },
+                "project_role": ProjectRole.ADMIN,
+                "permissions": {
+                    "can_manage_ssh_fleets": True,
+                },
+            },
+        ]
+        res = await session.execute(select(MemberModel))
+        members = res.scalars().all()
+        assert len(members) == 1
+
     @pytest.mark.asyncio
     @pytest.mark.parametrize("test_db", ["sqlite", "postgres"], indirect=True)
     async def test_manager_cannot_set_project_admins(