dstack 0.18.41__py3-none-any.whl → 0.18.42__py3-none-any.whl

dstack/_internal/server/services/volumes.py

@@ -15,19 +15,28 @@ from dstack._internal.core.errors import (
 from dstack._internal.core.models.users import GlobalRole
 from dstack._internal.core.models.volumes import (
     Volume,
+    VolumeAttachment,
     VolumeAttachmentData,
     VolumeConfiguration,
+    VolumeInstance,
     VolumeProvisioningData,
     VolumeStatus,
 )
 from dstack._internal.core.services import validate_dstack_resource_name
 from dstack._internal.server.db import get_db
-from dstack._internal.server.models import ProjectModel, UserModel, VolumeModel
+from dstack._internal.server.models import (
+    InstanceModel,
+    ProjectModel,
+    UserModel,
+    VolumeAttachmentModel,
+    VolumeModel,
+)
 from dstack._internal.server.services import backends as backends_services
 from dstack._internal.server.services.locking import (
     get_locker,
     string_to_lock_id,
 )
+from dstack._internal.server.services.pools import get_instance_provisioning_data
 from dstack._internal.server.services.projects import list_project_models, list_user_project_models
 from dstack._internal.utils import common, random_names
 from dstack._internal.utils.logging import get_logger
@@ -106,8 +115,13 @@ async def list_projects_volume_models(
         .order_by(*order_by)
         .limit(limit)
         .options(joinedload(VolumeModel.user))
+        .options(
+            joinedload(VolumeModel.attachments)
+            .joinedload(VolumeAttachmentModel.instance)
+            .joinedload(InstanceModel.fleet)
+        )
     )
-    volume_models = list(res.scalars().all())
+    volume_models = list(res.unique().scalars().all())
     return volume_models
 
 
@@ -134,9 +148,16 @@ async def list_project_volume_models(
     if not include_deleted:
         filters.append(VolumeModel.deleted == False)
     res = await session.execute(
-        select(VolumeModel).where(*filters).options(joinedload(VolumeModel.user))
+        select(VolumeModel)
+        .where(*filters)
+        .options(joinedload(VolumeModel.user))
+        .options(
+            joinedload(VolumeModel.attachments)
+            .joinedload(VolumeAttachmentModel.instance)
+            .joinedload(InstanceModel.fleet)
+        )
     )
-    return list(res.scalars().all())
+    return list(res.unique().scalars().all())
 
 
 async def get_volume_by_name(
@@ -163,9 +184,16 @@ async def get_project_volume_model_by_name(
     if not include_deleted:
         filters.append(VolumeModel.deleted == False)
     res = await session.execute(
-        select(VolumeModel).where(*filters).options(joinedload(VolumeModel.user))
+        select(VolumeModel)
+        .where(*filters)
+        .options(joinedload(VolumeModel.user))
+        .options(
+            joinedload(VolumeModel.attachments)
+            .joinedload(VolumeAttachmentModel.instance)
+            .joinedload(InstanceModel.fleet)
+        )
     )
-    return res.scalar_one_or_none()
+    return res.unique().scalar_one_or_none()
 
 
 async def create_volume(
@@ -205,10 +233,10 @@ async def create_volume(
             project=project,
             status=VolumeStatus.SUBMITTED,
             configuration=configuration.json(),
+            attachments=[],
         )
         session.add(volume_model)
         await session.commit()
-        await session.refresh(volume_model)
         return volume_model_to_volume(volume_model)
 
 
@@ -234,13 +262,13 @@ async def delete_volumes(session: AsyncSession, project: ProjectModel, names: Li
                 VolumeModel.deleted == False,
             )
             .options(selectinload(VolumeModel.user))
-            .options(selectinload(VolumeModel.instances))
+            .options(selectinload(VolumeModel.attachments))
             .execution_options(populate_existing=True)
             .with_for_update()
         )
         volume_models = res.scalars().unique().all()
         for volume_model in volume_models:
-            if len(volume_model.instances) > 0:
+            if len(volume_model.attachments) > 0:
                 raise ServerClientError(
                     f"Failed to delete volume {volume_model.name}. Volume is in use."
                 )
@@ -270,6 +298,15 @@ def volume_model_to_volume(volume_model: VolumeModel) -> Volume:
     # Initially VolumeProvisionigData lacked backend
     if vpd is not None and vpd.backend is None:
         vpd.backend = configuration.backend
+    attachments = []
+    for volume_attachment_model in volume_model.attachments:
+        instance = volume_attachment_model.instance
+        attachments.append(
+            VolumeAttachment(
+                instance=instance_model_to_volume_instance(instance),
+                attachment_data=get_attachment_data(volume_attachment_model),
+            )
+        )
     return Volume(
         name=volume_model.name,
         project_name=volume_model.project.name,
@@ -282,6 +319,7 @@ def volume_model_to_volume(volume_model: VolumeModel) -> Volume:
         deleted=volume_model.deleted,
         volume_id=vpd.volume_id if vpd is not None else None,
         provisioning_data=vpd,
+        attachments=attachments,
         attachment_data=vad,
         id=volume_model.id,
     )
@@ -303,6 +341,27 @@ def get_volume_attachment_data(volume_model: VolumeModel) -> Optional[VolumeAtta
     return VolumeAttachmentData.__response__.parse_raw(volume_model.volume_attachment_data)
 
 
+def get_attachment_data(
+    volume_attachment_model: VolumeAttachmentModel,
+) -> Optional[VolumeAttachmentData]:
+    if volume_attachment_model.attachment_data is None:
+        return None
+    return VolumeAttachmentData.__response__.parse_raw(volume_attachment_model.attachment_data)
+
+
+def instance_model_to_volume_instance(instance_model: InstanceModel) -> VolumeInstance:
+    instance_id = None
+    jpd = get_instance_provisioning_data(instance_model)
+    if jpd is not None:
+        instance_id = jpd.instance_id
+    return VolumeInstance(
+        name=instance_model.name,
+        fleet_name=instance_model.fleet.name if instance_model.fleet else None,
+        instance_num=instance_model.instance_num,
+        instance_id=instance_id,
+    )
+
+
 async def generate_volume_name(session: AsyncSession, project: ProjectModel) -> str:
     volume_models = await list_project_volume_models(session=session, project=project)
     names = {v.name for v in volume_models}

dstack/_internal/server/testing/common.py

@@ -55,7 +55,7 @@ from dstack._internal.core.models.runs import (
 from dstack._internal.core.models.users import GlobalRole
 from dstack._internal.core.models.volumes import (
     Volume,
-    VolumeAttachmentData,
+    VolumeAttachment,
     VolumeConfiguration,
     VolumeProvisioningData,
     VolumeStatus,
@@ -76,6 +76,7 @@ from dstack._internal.server.models import (
     RepoModel,
     RunModel,
     UserModel,
+    VolumeAttachmentModel,
     VolumeModel,
 )
 from dstack._internal.server.services.jobs import get_job_specs_from_run_spec
@@ -542,6 +543,9 @@ async def create_instance(
 
     if volumes is None:
         volumes = []
+    volume_attachments = []
+    for volume in volumes:
+        volume_attachments.append(VolumeAttachmentModel(volume=volume))
 
     im = InstanceModel(
         id=instance_id,
@@ -566,7 +570,7 @@ async def create_instance(
         requirements=requirements.json(),
         instance_configuration=instance_configuration.json(),
         remote_connection_info=remote_connection_info.json() if remote_connection_info else None,
-        volumes=volumes,
+        volume_attachments=volume_attachments,
         total_blocks=total_blocks,
         busy_blocks=busy_blocks,
     )
@@ -587,6 +591,7 @@ def get_instance_offer_with_availability(
     spot: bool = False,
     blocks: int = 1,
     total_blocks: int = 1,
+    availability_zones: Optional[List[str]] = None,
 ):
     gpus = [Gpu(name="T4", memory_mib=16384, vendor=gpuhunt.AcceleratorVendor.NVIDIA)] * gpu_count
     return InstanceOfferWithAvailability(
@@ -605,6 +610,7 @@ def get_instance_offer_with_availability(
         region=region,
         price=1,
         availability=InstanceAvailability.AVAILABLE,
+        availability_zones=availability_zones,
         blocks=blocks,
         total_blocks=total_blocks,
     )
@@ -669,7 +675,7 @@ async def create_volume(
         volume_provisioning_data=volume_provisioning_data.json()
         if volume_provisioning_data
         else None,
-        instances=[],
+        attachments=[],
         deleted_at=deleted_at,
         deleted=True if deleted_at else False,
     )
@@ -691,16 +697,14 @@ def get_volume(
     deleted: bool = False,
     volume_id: Optional[str] = None,
     provisioning_data: Optional[VolumeProvisioningData] = None,
-    attachment_data: Optional[VolumeAttachmentData] = None,
-    device_name: Optional[str] = None,
+    attachments: Optional[List[VolumeAttachment]] = None,
 ) -> Volume:
     if id_ is None:
         id_ = uuid.uuid4()
     if configuration is None:
         configuration = get_volume_configuration()
-    if device_name is not None:
-        assert attachment_data is None, "attachment_data and device_name are mutually exclusive"
-        attachment_data = VolumeAttachmentData(device_name=device_name)
+    if attachments is None:
+        attachments = []
     return Volume(
         id=id_,
         name=name,
@@ -714,7 +718,7 @@ def get_volume(
         deleted=deleted,
         volume_id=volume_id,
         provisioning_data=provisioning_data,
-        attachment_data=attachment_data,
+        attachments=attachments,
     )
 
 

dstack/version.py

@@ -1,3 +1,3 @@
-__version__ = "0.18.41"
+__version__ = "0.18.42"
 __is_release__ = True
 base_image = "0.6"

{dstack-0.18.41.dist-info → dstack-0.18.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dstack
-Version: 0.18.41
+Version: 0.18.42
 Summary: dstack is an open-source orchestration engine for running AI workloads on any cloud or on-premises.
 Home-page: https://dstack.ai
 Author: Andrey Cheptsov

{dstack-0.18.41.dist-info → dstack-0.18.42.dist-info}/RECORD

@@ -1,5 +1,5 @@
 dstack/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dstack/version.py,sha256=_y8GsLLZfsEC3VdxzEbtitoyheXaElaOvO21SlEehwY,65
+dstack/version.py,sha256=2vyD60hf6Ar7fKjyGNRtiogwJDCRrkoglz7oYuLU-uY,65
 dstack/_internal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dstack/_internal/compat.py,sha256=bF9U9fTMfL8UVhCouedoUSTYFl7UAOiU0WXrnRoByxw,40
 dstack/_internal/settings.py,sha256=8XODoSW2joaEndvZxuHUPSFK85sGgJ7fVL976isYeJM,557
@@ -38,14 +38,14 @@ dstack/_internal/cli/utils/gateway.py,sha256=jMytH6u3x8hctMhm9bcmXLJxSgTXmpW8M9a
 dstack/_internal/cli/utils/rich.py,sha256=Gx1MJU929kMKsbdo9qF7XHARNta2426Ssb-xMLVhwbQ,5710
 dstack/_internal/cli/utils/run.py,sha256=4NDhlcdE4bccQ4gWzhZ2EP8tHryZt4eI3BBho425VOA,7737
 dstack/_internal/cli/utils/updates.py,sha256=9KQcm_TEE_PiU0yc5WH4xRse0WIeHOubi9Et55odgvk,2601
-dstack/_internal/cli/utils/volume.py,sha256=dAdIBejLh-5vz34XcB4z2JkqQ3rrzmX5jKY0q7MyjNE,1639
+dstack/_internal/cli/utils/volume.py,sha256=mU9I06dVMFbpjfkefxrZNoSWadKLoib3U14rHudNQN4,1975
 dstack/_internal/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dstack/_internal/core/consts.py,sha256=c1Yd5UY6Qx7KeuYgloXWncWhMsYj6TqwlElda7NtB98,254
 dstack/_internal/core/errors.py,sha256=UvqMIBVHG1NIUP0w0g5dWjnxOz37sfFi4lh4yuYK0vw,2793
 dstack/_internal/core/backends/__init__.py,sha256=P7uX9QYj-aWSHOub1vIwr-MVERVCwTi8pcG4MQVuEYw,958
 dstack/_internal/core/backends/aws/__init__.py,sha256=gGXM9op3UJ3-OGDjNr4ywa_fNf--oywRbrOGUH2tTDA,850
 dstack/_internal/core/backends/aws/auth.py,sha256=lRBwNUdEWMWlblDnFSGlIcNkZMY2tSjapdq1OjwollU,1253
-dstack/_internal/core/backends/aws/compute.py,sha256=UgRb2S5TQ0dbrXIU1jauElNgpvU4OPuj1Nrxa7gg3G8,35236
+dstack/_internal/core/backends/aws/compute.py,sha256=I7DyBNc9wFqMQ9-9IxX3rmIyNzq4hCS5hT8uorSn9_E,35308
 dstack/_internal/core/backends/aws/config.py,sha256=bd4juOaiqsUsWeorIgqCW0xNigCFIRQIvaRxEHyhpwg,533
 dstack/_internal/core/backends/aws/resources.py,sha256=yKsMMLO4HMRTWero8cLDxtavWvqcne_y9VDXVH9G1lE,22551
 dstack/_internal/core/backends/azure/__init__.py,sha256=J-mWp413v0DQFaTochlvMJXlGf8ukQCH_6oGuYFR31U,718
@@ -68,7 +68,7 @@ dstack/_internal/core/backends/datacrunch/compute.py,sha256=gyOftmUdmS9fMqpyew0P
 dstack/_internal/core/backends/datacrunch/config.py,sha256=bShWTAb02PYP8fuBz7H7r-YhRkhy6_yfD0nuaKd9xd4,281
 dstack/_internal/core/backends/gcp/__init__.py,sha256=nxhPNTGd1pPag2DwBRKg3X5gEKlh32p7a9Yfyi7-d5k,546
 dstack/_internal/core/backends/gcp/auth.py,sha256=AL5i7VtXvMboTCk-dzvNykaogYV31xAYfEivXxzOD_k,1832
-dstack/_internal/core/backends/gcp/compute.py,sha256=VEAeaKYa-gIBNJ8MYBCnPf0xoELzlhoAZREHPupnqgQ,35929
+dstack/_internal/core/backends/gcp/compute.py,sha256=ksGatfOjPp78kTIpuxbEX3awMv9Wy2ErLX4FbGlrOI4,36001
 dstack/_internal/core/backends/gcp/config.py,sha256=AjNHgIsDqB5aKdyFXTKG9wNO2d3lgNyJW4Dk5Yb-LL4,722
 dstack/_internal/core/backends/gcp/resources.py,sha256=6khFYRZwMrjRxVAoHav3OsKFSVw-tuLVkJ_FzQCY8EI,14741
 dstack/_internal/core/backends/kubernetes/__init__.py,sha256=MpuT3Dxt2ZwZpAQomE_fXUDmgHBmfP8xvUP1YMAKTJQ,573
@@ -126,13 +126,13 @@ dstack/_internal/core/models/pools.py,sha256=SmxNQsSYolUMkraLi0BvEXDacuhp1cvbGQn
 dstack/_internal/core/models/profiles.py,sha256=Y0qsIV0DvvI-YxtcMLqmsrqulGKzJsE_0SdWU2Wusv8,8208
 dstack/_internal/core/models/projects.py,sha256=hY3rhLWkuDRsavAdNvQaK6IhnTr7yBHTmNwy9k7zjVE,643
 dstack/_internal/core/models/resources.py,sha256=AzBqGEZLHmg-HpjQtcb_W4pJQRxRtDyeuiHO4berdBA,12408
-dstack/_internal/core/models/runs.py,sha256=y41U2RLnLU9HZkXUcKi0c7-2CxXYKuOAlt9EtBogi3w,17919
+dstack/_internal/core/models/runs.py,sha256=ziWnqFRL1hORWJ10evwxLySAe9umiP7kTc3IUvEniSc,17940
 dstack/_internal/core/models/secrets.py,sha256=OlnBI8ESBnpjSqB0-Vr3z8JcqB2Ydfiwo8IJUuM5jAc,219
 dstack/_internal/core/models/server.py,sha256=Hkc1v2s3KOiwslsWVmhUOAzcSeREoG-HD1SzSX9WUGg,152
 dstack/_internal/core/models/services.py,sha256=2Hpi7j0Q1shaf_0wd0C0044AJAmuYi-D3qx3PH849oI,3076
 dstack/_internal/core/models/unix.py,sha256=KxnSQELnkAjjuUgYcQKVkf-UAbYREBD8WCWDvHfOkuA,1915
 dstack/_internal/core/models/users.py,sha256=o_rd0GAmd6jufypVUs9P12NRri3rgAPDt-KxnqNNsGw,703
-dstack/_internal/core/models/volumes.py,sha256=ox2HTqpDi5J1hHh-R-hPrgBQ9Ku_Vas3fPSVfj3nPpo,5335
+dstack/_internal/core/models/volumes.py,sha256=ZebkSybGXmnPQHjsDCWVofHavjwjLIovssmpXnLW6nU,6207
 dstack/_internal/core/models/backends/__init__.py,sha256=iPMAv4j7gpHc0cjt3SxzQGb-sywms8LUXt7IjtKNPnM,5589
 dstack/_internal/core/models/backends/aws.py,sha256=H0RB7pTVb7vjW_-MDpBBwPLbAoKDRtYFHe_n4ppXz6w,2463
 dstack/_internal/core/models/backends/azure.py,sha256=OhK3HBvI_ZfLmKVxlnm7AowWOlarp6QXb3tbcbFoACw,2076
@@ -223,20 +223,20 @@ dstack/_internal/server/app.py,sha256=pPto7JaBEkwvPF2FR8sqDzwIyMovI_85xk6WXfnnCY
 dstack/_internal/server/db.py,sha256=WjuqmjG3QAZmSMCeUaJ_ynbowlHuNAvYCZO649cTPHc,3210
 dstack/_internal/server/deps.py,sha256=31e8SU_ogPJWHIDLkgl7cuC_5V91xbJoLyAj17VanfM,670
 dstack/_internal/server/main.py,sha256=kztKhCYNoHSDyJJQScWfZXE0naNleJOCQULW6dd8SGw,109
-dstack/_internal/server/models.py,sha256=4DsizdUw1tOEpUKp9NQ_w9YKbjoJSc8SEGcaz5el5CI,27090
+dstack/_internal/server/models.py,sha256=VKh_lfgGUlc0Xy_CGo02IDgwPRp3membAJg07jm27j4,27405
 dstack/_internal/server/settings.py,sha256=tEPw0xIltvW4TpLBA-OzKRM_PmvDuD4vuXCo7ITyzpo,3067
 dstack/_internal/server/background/__init__.py,sha256=jNDwTgQwKhK1NYl0RJaKU4mwKIMOSIxPTKVyhizU1PM,3436
 dstack/_internal/server/background/tasks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dstack/_internal/server/background/tasks/process_fleets.py,sha256=lKXUvN_b7DNjD3psHzyCt_JYsTxPFuQ86iXi8fj8GkM,3202
 dstack/_internal/server/background/tasks/process_gateways.py,sha256=KN5n9r0cKizJ3oGpeLsv3euZKZOMf-02X0Sv09GE8N8,7141
-dstack/_internal/server/background/tasks/process_instances.py,sha256=gryg6-eKv6bQAtaX6v-GTi-Sc_g9Lk0CWauwYv7lWDA,37402
+dstack/_internal/server/background/tasks/process_instances.py,sha256=HaOTfcBcrwlRhHHbpeRflCcf3VYW-OkE6SB74SxvwXQ,37369
 dstack/_internal/server/background/tasks/process_metrics.py,sha256=BPv0S7pmMX91vObZiW51AJiNR0ULIj-OQlo5n97KISY,5328
 dstack/_internal/server/background/tasks/process_placement_groups.py,sha256=DZctiMF2TXKbYeygoz--ZiC9MXVL1sQJgq0oqRIc7hg,3858
-dstack/_internal/server/background/tasks/process_running_jobs.py,sha256=Y1-1CVwZ4q_R2Vqsb7BeRJFWsYMEKyBCp9siQfpGSm0,29899
+dstack/_internal/server/background/tasks/process_running_jobs.py,sha256=FAIwXKIOUbVM-svKo7aoAF9DdxIhcejQJfg6gs0z83k,30108
 dstack/_internal/server/background/tasks/process_runs.py,sha256=JWJqMzXXqvwQSxyKs4bKH2aBP8YQbiyO4tuwyMPVduk,16673
-dstack/_internal/server/background/tasks/process_submitted_jobs.py,sha256=QFV5sruEEswjprAukeF1rgzQSRtV5nvAFRdkc4deqLc,26785
-dstack/_internal/server/background/tasks/process_terminating_jobs.py,sha256=Tq6oZP6nMHLhtdKnWmC11VHNWaO409F6IwzajzE-kJs,3746
-dstack/_internal/server/background/tasks/process_volumes.py,sha256=UoMtYjX6MbSoMXOOuBhA0FVIlQMT_wZWsRNeYVV3cSI,4703
+dstack/_internal/server/background/tasks/process_submitted_jobs.py,sha256=xv1aW2umlOdbdZn4TOvlhl6td3Uam378yIwosfSO9ks,27022
+dstack/_internal/server/background/tasks/process_terminating_jobs.py,sha256=A8J6JabVih1nHl3Kgyaoh7eaKPywicZe7vx-4V_uvgk,4033
+dstack/_internal/server/background/tasks/process_volumes.py,sha256=YafZml-b-bD7M6S0UmY-rLV-pIIX-SdzuyaErqxrnyk,4939
 dstack/_internal/server/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dstack/_internal/server/migrations/env.py,sha256=RuhcN-CST86VzMatjqBMdYcG0fGGMZl_o1YgZTL-WDw,2831
 dstack/_internal/server/migrations/versions/065588ec72b8_add_vultr_to_backendtype_enum.py,sha256=wSdI_HWGUFgczhOPyoP6BTPmDbN3KmjokHVpZJGsq4Q,2112
@@ -277,6 +277,7 @@ dstack/_internal/server/migrations/versions/99b4c8c954ea_add_termination_reason_
 dstack/_internal/server/migrations/versions/9eea6af28e10_added_fail_reason_for_instancemodel.py,sha256=n0iWQ3L1DWQqPIT-IRs9TR74psf-ZDjcYvSIfn80etY,1027
 dstack/_internal/server/migrations/versions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dstack/_internal/server/migrations/versions/a060e2440936_.py,sha256=4wXIln1yzEowe-1_xFRJFGfaVIwkwlpAO9RlLeVQ-uY,8016
+dstack/_internal/server/migrations/versions/a751ef183f27_move_attachment_data_to_volumes_.py,sha256=befGXlRV7vP6u3VIyf7nMslyBHVAZuFbomQpmc7phRs,1023
 dstack/_internal/server/migrations/versions/a7b46c073fa1_add_placementgroupmodel.py,sha256=fXYI21V43UmHcIpq7KfD8Ggcjy_l4I_hfXWhB0SnSBM,2078
 dstack/_internal/server/migrations/versions/afbc600ff2b2_add_created_at_to_usermodel_and_.py,sha256=qRDvCdBaTjL82sdZN2GTWq0JCF2PZU-jFANzCJnM4Bw,3705
 dstack/_internal/server/migrations/versions/b4d6ad60db08_add_instancemodel_unreachable.py,sha256=rnmLqt_pzNtqMqcmzXIPZxs5WxDE7ieAdI6SnKUFjqM,1038
@@ -333,21 +334,21 @@ dstack/_internal/server/security/permissions.py,sha256=K756I8fnBLBrq4PZwz1ttt74H
 dstack/_internal/server/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dstack/_internal/server/services/config.py,sha256=b7m2wkVjtXDR46WMgYLw2uun9orM9lxXjnDp53oeASM,29525
 dstack/_internal/server/services/docker.py,sha256=3EcYPiVsrNBGDQYOb60QJ241mzTT6lJROYQXIwt-8dk,5351
-dstack/_internal/server/services/fleets.py,sha256=1b63NYpx4QMa1TaMZDEQxawpdrRLstFN5xUCPbm2_m8,28779
+dstack/_internal/server/services/fleets.py,sha256=h5LL8FGOZMOl0kzLycP36U6k3SWl_bSnSn7oFg8ubQY,28980
 dstack/_internal/server/services/locking.py,sha256=UV5kc-BgROBuNDpBrp8jkcf-fHPOpHLc8JufL-8mbN8,2453
 dstack/_internal/server/services/logging.py,sha256=Nu1628kW2hqB__N0Eyr07wGWjVWxfyJnczonTJ72kSM,417
 dstack/_internal/server/services/logs.py,sha256=53pymPDaM9-xXHFzCyEHdvM49JPTpsLI2aPTSP5zaPo,20090
 dstack/_internal/server/services/metrics.py,sha256=_YmAQ_oCzzklgk_O5iSJDZJhRk9rBqx8REkPcRQUTAo,3490
-dstack/_internal/server/services/offers.py,sha256=gHE7HM_6EdOkAVL35Eclh5INbtLRtaanw1kTd9is48A,6926
+dstack/_internal/server/services/offers.py,sha256=GIaICztEu4zbcpIGHvNsfMVYmPvoYg5zcQ0apHNdgBw,6954
 dstack/_internal/server/services/permissions.py,sha256=l7Ngdelmn65vjw13NcOdaC6lBYMRuSw6FbHzYwdK3nE,1005
 dstack/_internal/server/services/placement.py,sha256=DWZ8-iAE3o0J0xaHikuJYZzpuBiq7lj41LiAP1PfoEs,1773
-dstack/_internal/server/services/pools.py,sha256=ZJGZT2AtOxgm0m0BaSVdynelGXzr4Y0rRcH3BdyG_w4,28874
+dstack/_internal/server/services/pools.py,sha256=yDlNJn219satSuoxRmlxDG-BPrK0j7MdmGNa-HMyCsk,28886
 dstack/_internal/server/services/projects.py,sha256=HWOnFOC6LmvbjDzRKADv7tXKIDWthbO11zrsHU7vkew,14709
 dstack/_internal/server/services/repos.py,sha256=f9ztN7jz_2gvD9hXF5sJwWDVyG2-NHRfjIdSukowPh8,9342
 dstack/_internal/server/services/runs.py,sha256=3m9oYKq08QQF1GlaOa6_2nYp9SMYoqvfjVnO3-fpTGY,36045
 dstack/_internal/server/services/storage.py,sha256=6I0xI_3_RpJNbKZwHjDnjrEwXGdHfiaeb5li15T-M1I,1884
 dstack/_internal/server/services/users.py,sha256=L-exfxHdhj3TKX-gSjezHrYK6tnrt5qsQs-zZng1tUI,7123
-dstack/_internal/server/services/volumes.py,sha256=GMHUlSjeiIc9LSWKes-ZPRKgyvWD6y1VT8w6mH-URtg,12635
+dstack/_internal/server/services/volumes.py,sha256=UX-fqC3c240aG6EbdtVsXrJQbkF0O06IFZNtg6bA_tE,14551
 dstack/_internal/server/services/backends/__init__.py,sha256=Q8Ju0Shf2RAlIdi1CapJNUKOdUAFeRnxhNYti6GZiww,14923
 dstack/_internal/server/services/backends/handlers.py,sha256=j-MhBxrpdepoDG7f2tApjFnE23RVO5I15-hxHyOWnew,3251
 dstack/_internal/server/services/backends/configurators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -374,7 +375,7 @@ dstack/_internal/server/services/gateways/__init__.py,sha256=ceTzXRWu-pVghze9New
 dstack/_internal/server/services/gateways/client.py,sha256=1PH9gUjRkHegp37B27pjBVoPFk64KjxcE30eEPBTLM0,7321
 dstack/_internal/server/services/gateways/connection.py,sha256=ot3lV85XdmCT45vBWeyj57nLPcLPNm316zu3jMyeWjA,5625
 dstack/_internal/server/services/gateways/pool.py,sha256=0LclTl1tyx-doS78LeaAKjr-SMp98zuwh5f9s06JSd0,1914
-dstack/_internal/server/services/jobs/__init__.py,sha256=17TOvwep41_LrvaemVU8v5LK07vpjGDqbSNsRVBZz8E,25185
+dstack/_internal/server/services/jobs/__init__.py,sha256=zxKGDUo_6Sjoh3VGMQVrxQn9OkwgJQJXeKo3DZWkRI8,25283
 dstack/_internal/server/services/jobs/configurators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dstack/_internal/server/services/jobs/configurators/base.py,sha256=I21dp1P9XC49NNJL_bfihwXfhFd6G-yQXYFYk-EJPEI,10306
 dstack/_internal/server/services/jobs/configurators/dev.py,sha256=2EEtfOpNXP5d9b3ZErE3dA3Co8aAAv1fbx9wAjRZpGY,2018
@@ -392,7 +393,7 @@ dstack/_internal/server/services/proxy/routers/service_proxy.py,sha256=8rsuenv9L
 dstack/_internal/server/services/proxy/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dstack/_internal/server/services/proxy/services/service_proxy.py,sha256=4JrSxHqhBYqU1oENii89Db-bzkFWExYrOy-0mNEhWBs,4879
 dstack/_internal/server/services/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dstack/_internal/server/services/runner/client.py,sha256=eIMQkyB-2RBA220zBfif74-lHYSQ5nA5WAdvW9dcvuE,14804
+dstack/_internal/server/services/runner/client.py,sha256=lQBQoUIMtKviSSQV9rx8VKfWXlRswGJOEI0TF7QV_oA,14961
 dstack/_internal/server/services/runner/ssh.py,sha256=H-X0015ZPwYq5tc31ytFF1uNaUAr9itAsABI2oPJWrk,5017
 dstack/_internal/server/services/services/__init__.py,sha256=-kbk6Qb0mGImhNtYhG7JRsmyc0rKGl0A4rRuN1Wq2bA,10617
 dstack/_internal/server/services/services/autoscalers.py,sha256=0o_w9La-ex_P3VKG88w_XN3hkLkzryv5l1cH3pkZyAE,4315
@@ -502,7 +503,7 @@ dstack/_internal/server/statics/static/media/logo.f602feeb138844eda97c8cb6414614
 dstack/_internal/server/statics/static/media/okta.12f178e6873a1100965f2a4dbd18fcec.svg,sha256=KqFI05gQM135zC1plF1WBRF2F7CyKL7km97WKsZjAHI,319
 dstack/_internal/server/statics/static/media/theme.3994c817bb7dda191c1c9640dee0bf42.svg,sha256=ZxFFBVZWuRLqmWH4zhwGLNtKjOzHj-5MGJRunFAtu1I,561
 dstack/_internal/server/testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dstack/_internal/server/testing/common.py,sha256=lEvvOOZbKhxKHI1EZGEz9p_aGj3von2NLiHmaQd1cDk,28873
+dstack/_internal/server/testing/common.py,sha256=xwIk9mNec_9OBvJYw_RH9kdOou0Hs8S0qxMor9SH2x4,28949
 dstack/_internal/server/testing/conf.py,sha256=-zhujfFjTHNfQDOK-hBck32By11c_kC0OeinB3esQGg,1902
 dstack/_internal/server/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dstack/_internal/server/utils/common.py,sha256=PbjXtqYy1taKXpyG5ys8cIrz9MXqc9dBAsR_9D1brrk,1414
@@ -613,11 +614,11 @@ tests/_internal/server/background/tasks/test_process_gateways.py,sha256=h7jzDFQp
 tests/_internal/server/background/tasks/test_process_instances.py,sha256=-ATbgOT8XAeqGmPn4XPlSJzxnrm0haAJhX13nWOBOtM,24816
 tests/_internal/server/background/tasks/test_process_metrics.py,sha256=eirq386mVZqX_PqctuX7CxO38Prwy8RH2UesYXo3CnQ,5083
 tests/_internal/server/background/tasks/test_process_placement_groups.py,sha256=shHqZvS8QoNwQe8J29-aHk2X2HqX-gsxcQiZevU8yuY,1528
-tests/_internal/server/background/tasks/test_process_running_jobs.py,sha256=HrFPqsKJDTxaxj5Gounpqsx1Vr91-OrQ3-1c4PnfKNI,25483
+tests/_internal/server/background/tasks/test_process_running_jobs.py,sha256=zm0eGL3MY5H7YAZuKO0fTqyU0Tb-W2lGniHN6XwOXoE,25542
 tests/_internal/server/background/tasks/test_process_runs.py,sha256=Yv6f2CDZ-ejDGo7uOKyyAGxYLsvqyjNo4Zw1cCQbjgM,14489
-tests/_internal/server/background/tasks/test_process_submitted_jobs.py,sha256=XBgVD2DEzjh2dVj18qAYmRP6DDNnx6YINUbZOtVQT8M,24325
+tests/_internal/server/background/tasks/test_process_submitted_jobs.py,sha256=Sf4aDa1ZYw5Sz3xAw8K0hoI-VDesv7Ew3gZdAzQvj_4,24451
 tests/_internal/server/background/tasks/test_process_submitted_volumes.py,sha256=njfRDdDzVtDL8rech_004Wf5z5PpoQVWFufKh1yUyYY,2171
-tests/_internal/server/background/tasks/test_process_terminating_jobs.py,sha256=85X-HD9HHBduTxOBfiTDgwVOOwoMDxjfioT8SfWUrmA,13899
+tests/_internal/server/background/tasks/test_process_terminating_jobs.py,sha256=VZsfP1NVxkcLSNWfEXDFe_vQZUQfuG0B5i-krXKP_IQ,14147
 tests/_internal/server/routers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/_internal/server/routers/test_backends.py,sha256=4bY8oMMKB3xIRWUfVIUcI4dhDz1ukcpEeWOLllxmPUw,65231
 tests/_internal/server/routers/test_fleets.py,sha256=ap3Jjg2iiwuklosu2_-xx-cJBlM6uZN5CQfGudORPf0,35105
@@ -631,13 +632,14 @@ tests/_internal/server/routers/test_repos.py,sha256=4O4mCDlAPh8xJU_XWtwLhFWRkoTx
 tests/_internal/server/routers/test_runs.py,sha256=t6tuvN8JHKSKgd_PRTlPo3VzsJ3aE_EmW9f8cczxQ4M,71547
 tests/_internal/server/routers/test_server.py,sha256=ROkuRNNJEkMQuK8guZ3Qy3iRRfiWvPIJJJDc09BI0D4,489
 tests/_internal/server/routers/test_users.py,sha256=5QSLvfn9SroGsZoBGmSTEaaqJcdEO8EUUy_YuvLL8ss,12787
-tests/_internal/server/routers/test_volumes.py,sha256=4nv7ba9VkjbYFyYyQmO0coyav_Z9x5t_ayoiyKmvXVw,15947
+tests/_internal/server/routers/test_volumes.py,sha256=fVv7sVo9POFImal9Mlkaw8CJOAR67S_eYHxIReHebBU,16241
 tests/_internal/server/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/_internal/server/services/test_config.py,sha256=KfPyYSSsLaQszBAgqYeM2Tt5YkRiV-at0ik86ecdrtE,5168
 tests/_internal/server/services/test_docker.py,sha256=QsnoVJUnvzcd1Tpw0UtKXtDSCr9nh_jmtVSkOi7J4ug,5628
 tests/_internal/server/services/test_fleets.py,sha256=WqK9Bs3Nfew45n4WunZhvIvCw0VHJ2w5t0-4CakxFgU,8222
 tests/_internal/server/services/test_logs.py,sha256=QmaI07u9O0czwH8J2eZO3mOYnutAtIrDTUrF9CJLdwU,29647
-tests/_internal/server/services/test_pools.py,sha256=xbmrLoLlCxahnRhNUxvZNv2-u_JOOUXs5v1UKLJ_xlo,3719
+tests/_internal/server/services/test_offers.py,sha256=t0nQNjjm-fvIqHIOA_99hokrdTXwpYrgzjaQjqJXs8w,7814
+tests/_internal/server/services/test_pools.py,sha256=aPF4R6_VCeDR4AcjQ0H2J1BKivoVs-JUNQBJZ-IYdPg,7436
 tests/_internal/server/services/test_repos.py,sha256=o2D0xmOPYaiwDq6nNJNtqYMSuSz_xKJ_ZChVOvWIhJY,14289
 tests/_internal/server/services/test_runs.py,sha256=8frDxa3NTJzXir6fJTXRLm_0B_jUd36qV66DgHvRdDU,9289
 tests/_internal/server/services/encryption/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -651,7 +653,7 @@ tests/_internal/server/services/proxy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCe
 tests/_internal/server/services/proxy/routers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/_internal/server/services/proxy/routers/test_service_proxy.py,sha256=cGyBwfSgT268CRhkgpTEIM3O1U9z8tSNTYjHQrn3e0E,9843
 tests/_internal/server/services/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/_internal/server/services/runner/test_client.py,sha256=LRJzmyMOGtURc-S4uICfhHjO2K0fxvCa--yXflnoTDM,16212
+tests/_internal/server/services/runner/test_client.py,sha256=azCFqMipDCEhoTy4pjq3L5me4SD-mk0ldHTEQ6N6uu8,16855
 tests/_internal/server/services/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/_internal/server/services/services/test_autoscalers.py,sha256=YMi4W5gKFOpEdutc2Fli1L1DIUxCJLHE7ji-CJoiVac,3986
 tests/_internal/server/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -667,9 +669,9 @@ tests/_internal/utils/test_path.py,sha256=rzS-1YCxsFUocBe42dghLOMFNymPruGrA7bqFZ
 tests/_internal/utils/test_ssh.py,sha256=V-cBFPhD--9eM9d1uQQgpj2gnYLA3c43f4cX9uJ6E-U,1743
 tests/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/api/test_utils.py,sha256=SSSqHcNE5cZVqDq4n2sKZthRoXaZ_Bx7z1AAN5xTM9s,391
-dstack-0.18.41.dist-info/LICENSE.md,sha256=qDABaRGjSKVOib1U8viw2P_96sIK7Puo426784oD9f8,15976
-dstack-0.18.41.dist-info/METADATA,sha256=DyUee2y4XQJ8iDBDiDonQQIaqp-VfU9s_IV2Jfg4F2s,17690
-dstack-0.18.41.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-dstack-0.18.41.dist-info/entry_points.txt,sha256=GnLrMS8hx3rWAySQjA7tPNhtixV6a-brRkmal1PKoHc,58
-dstack-0.18.41.dist-info/top_level.txt,sha256=3BrIO1zrqxT9P20ymhRM6k15meZXzbPL6ykBlDZG2_k,13
-dstack-0.18.41.dist-info/RECORD,,
+dstack-0.18.42.dist-info/LICENSE.md,sha256=qDABaRGjSKVOib1U8viw2P_96sIK7Puo426784oD9f8,15976
+dstack-0.18.42.dist-info/METADATA,sha256=vSyb16zzc0XeDvb0drJPn91GJqIajnyIKNc8RY3THtE,17690
+dstack-0.18.42.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+dstack-0.18.42.dist-info/entry_points.txt,sha256=GnLrMS8hx3rWAySQjA7tPNhtixV6a-brRkmal1PKoHc,58
+dstack-0.18.42.dist-info/top_level.txt,sha256=3BrIO1zrqxT9P20ymhRM6k15meZXzbPL6ykBlDZG2_k,13
+dstack-0.18.42.dist-info/RECORD,,

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

@@ -349,6 +349,7 @@ class TestProcessRunningJobs:
             host_ssh_user="ubuntu",
             host_ssh_keys=["user_ssh_key"],
             container_ssh_keys=[project_ssh_pub_key, "user_ssh_key"],
+            instance_id=job_provisioning_data.instance_id,
         )
         await session.refresh(job)
         assert job is not None

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

@@ -27,7 +27,7 @@ from dstack._internal.core.models.volumes import (
     VolumeStatus,
 )
 from dstack._internal.server.background.tasks.process_submitted_jobs import process_submitted_jobs
-from dstack._internal.server.models import InstanceModel, JobModel
+from dstack._internal.server.models import InstanceModel, JobModel, VolumeAttachmentModel
 from dstack._internal.server.testing.common import (
     create_fleet,
     create_instance,
@@ -515,7 +515,9 @@ class TestProcessSubmittedJobs:
         await session.refresh(instance)
         res = await session.execute(
             select(JobModel).options(
-                joinedload(JobModel.instance).selectinload(InstanceModel.volumes)
+                joinedload(JobModel.instance)
+                .joinedload(InstanceModel.volume_attachments)
+                .joinedload(VolumeAttachmentModel.volume)
             )
         )
         job = res.unique().scalar_one()
@@ -523,7 +525,7 @@ class TestProcessSubmittedJobs:
         assert (
             job.instance_assigned and job.instance is not None and job.instance.id == instance.id
         )
-        assert job.instance.volumes == [volume]
+        assert job.instance.volume_attachments[0].volume == volume
 
     @pytest.mark.asyncio
     @pytest.mark.parametrize("test_db", ["sqlite", "postgres"], indirect=True)

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

@@ -13,7 +13,7 @@ from dstack._internal.core.models.volumes import VolumeStatus
 from dstack._internal.server.background.tasks.process_terminating_jobs import (
     process_terminating_jobs,
 )
-from dstack._internal.server.models import InstanceModel, JobModel
+from dstack._internal.server.models import InstanceModel, JobModel, VolumeAttachmentModel
 from dstack._internal.server.services.volumes import volume_model_to_volume
 from dstack._internal.server.testing.common import (
     create_instance,
@@ -176,7 +176,7 @@ class TestProcessTerminatingJobs:
         # so that stuck volumes don't prevent the instance from terminating.
         assert job.instance is None
         assert job.volumes_detached_at is not None
-        assert len(instance.volumes) == 1
+        assert len(instance.volume_attachments) == 1
 
         # Force detach called
         with (
@@ -214,11 +214,11 @@ class TestProcessTerminatingJobs:
         res = await session.execute(select(JobModel).options(joinedload(JobModel.instance)))
         job = res.unique().scalar_one()
         res = await session.execute(
-            select(InstanceModel).options(joinedload(InstanceModel.volumes))
+            select(InstanceModel).options(joinedload(InstanceModel.volume_attachments))
         )
         instance = res.unique().scalar_one()
         assert job.status == JobStatus.TERMINATED
-        assert len(instance.volumes) == 0
+        assert len(instance.volume_attachments) == 0
 
     async def test_terminates_job_on_shared_instance(self, session: AsyncSession):
         project = await create_project(session)
@@ -330,7 +330,12 @@ class TestProcessTerminatingJobs:
         await session.refresh(instance)
         assert job.status == JobStatus.TERMINATED
         res = await session.execute(
-            select(InstanceModel).options(joinedload(InstanceModel.volumes))
+            select(InstanceModel).options(
+                joinedload(InstanceModel.volume_attachments).joinedload(
+                    VolumeAttachmentModel.volume
+                )
+            )
         )
         instance = res.unique().scalar_one()
-        assert instance.volumes == [volume_2]
+        assert len(instance.volume_attachments) == 1
+        assert instance.volume_attachments[0].volume == volume_2

tests/_internal/server/routers/test_volumes.py

@@ -11,7 +11,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
 
 from dstack._internal.core.models.backends.base import BackendType
 from dstack._internal.core.models.users import GlobalRole, ProjectRole
-from dstack._internal.server.models import VolumeModel
+from dstack._internal.server.models import VolumeAttachmentModel, VolumeModel
 from dstack._internal.server.services.projects import add_project_member
 from dstack._internal.server.testing.common import (
     create_instance,
@@ -76,6 +76,7 @@ class TestListVolumes:
                 "deleted": False,
                 "volume_id": None,
                 "provisioning_data": None,
+                "attachments": [],
                 "attachment_data": None,
             },
             {
@@ -91,6 +92,7 @@ class TestListVolumes:
                 "deleted": False,
                 "volume_id": None,
                 "provisioning_data": None,
+                "attachments": [],
                 "attachment_data": None,
             },
         ]
@@ -117,6 +119,7 @@ class TestListVolumes:
                 "deleted": False,
                 "volume_id": None,
                 "provisioning_data": None,
+                "attachments": [],
                 "attachment_data": None,
             },
         ]
@@ -170,6 +173,7 @@ class TestListVolumes:
                 "deleted": False,
                 "volume_id": None,
                 "provisioning_data": None,
+                "attachments": [],
                 "attachment_data": None,
             },
         ]
@@ -217,6 +221,7 @@ class TestListProjectVolumes:
                 "deleted": False,
                 "volume_id": None,
                 "provisioning_data": None,
+                "attachments": [],
                 "attachment_data": None,
             }
         ]
@@ -264,6 +269,7 @@ class TestGetVolume:
             "deleted": False,
             "volume_id": None,
             "provisioning_data": None,
+            "attachments": [],
             "attachment_data": None,
         }
 
@@ -325,6 +331,7 @@ class TestCreateVolume:
             "deleted": False,
             "volume_id": None,
             "provisioning_data": None,
+            "attachments": [],
             "attachment_data": None,
         }
         res = await session.execute(select(VolumeModel))
@@ -391,7 +398,7 @@ class TestDeleteVolumes:
             project=project,
             pool=pool,
         )
-        volume.instances.append(instance)
+        volume.attachments.append(VolumeAttachmentModel(instance=instance))
         await session.commit()
         response = await client.post(
             f"/api/project/{project.name}/volumes/delete",