fix merge confilct

Author: hi-lei

CHANGELOG.md

@@ -11,8 +11,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `LongTermService` with `get_cluster_periods()` and `get_instance_periods()` methods
 - `VolumesService.delete_by_id()` method using `DELETE /v1/volumes/{volume_id}` endpoint
+- Support for querying OS images by instance type via `verda.images.get(instance_type=...)`
 
-## [1.22.0] - 2026-03-20
+### Changed
+
+- Refactored `Image` model to use `@dataclass` and `@dataclass_json` for consistency with `Instance` and `Volume`
+
+## [1.24.0] - 2026-03-30
+
+### Added
+
+- Added missing fields to the `Volume` class: `pseudo_path`, `mount_command`, `create_directory_command`, `filesystem_to_fstab_command`, `instances`, `contract`, `base_hourly_cost`, `monthly_price`, `currency`, `long_term`
+
+### Changed
+
+- Refactored `Volume` class to use `@dataclass` and `@dataclass_json` for consistency with `Instance` class. `Volume.create_from_dict()` is replaced by `Volume.from_dict()`; unknown API fields are now silently ignored via `Undefined.EXCLUDE`
+
+## [1.23.1] - 2026-03-25
+
+### Fixed
+
+- Fixed volume mount fields (`volume_id`, `secret_name`, `file_names`, `size_in_mb`) being silently dropped during deserialization, causing deployment updates to fail with `volume_mounts.*.volume_id should not be null or undefined`
+
+## [1.23.0] - 2026-03-20
 
 ### Added
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "verda"
-version = "1.23.0"
+version = "1.24.0"
 description = "Official Python SDK for Verda (formerly DataCrunch) Public API"
 readme = "README.md"
 requires-python = ">=3.10"

tests/unit_tests/images/test_images.py

@@ -1,21 +1,24 @@
+import json
+
 import responses  # https://github.com/getsentry/responses
+from responses import matchers
 
 from verda.images import Image, ImagesService
 
+IMAGE_RESPONSE = {
+    'id': '0888da25-bb0d-41cc-a191-dccae45d96fd',
+    'name': 'Ubuntu 20.04 + CUDA 11.0',
+    'details': ['Ubuntu 20.04', 'CUDA 11.0'],
+    'image_type': 'ubuntu-20.04-cuda-11.0',
+}
+
 
 def test_images(http_client):
-    # arrange - add response mock
+    # arrange
     responses.add(
         responses.GET,
         http_client._base_url + '/images',
-        json=[
-            {
-                'id': '0888da25-bb0d-41cc-a191-dccae45d96fd',
-                'name': 'Ubuntu 20.04 + CUDA 11.0',
-                'details': ['Ubuntu 20.04', 'CUDA 11.0'],
-                'image_type': 'ubuntu-20.04-cuda-11.0',
-            }
-        ],
+        json=[IMAGE_RESPONSE],
         status=200,
     )
 
@@ -34,4 +37,27 @@ def test_images(http_client):
     assert isinstance(images[0].details, list)
     assert images[0].details[0] == 'Ubuntu 20.04'
     assert images[0].details[1] == 'CUDA 11.0'
-    assert isinstance(images[0].__str__(), str)
+    assert json.loads(str(images[0])) == IMAGE_RESPONSE
+
+
+def test_images_filter_by_instance_type(http_client):
+    # arrange
+    responses.add(
+        responses.GET,
+        http_client._base_url + '/images',
+        match=[matchers.query_param_matcher({'instance_type': '1A100.22V'})],
+        json=[IMAGE_RESPONSE],
+        status=200,
+    )
+
+    image_service = ImagesService(http_client)
+
+    # act
+    images = image_service.get(instance_type='1A100.22V')
+
+    # assert
+    assert isinstance(images, list)
+    assert len(images) == 1
+    assert isinstance(images[0], Image)
+    assert images[0].id == '0888da25-bb0d-41cc-a191-dccae45d96fd'
+    assert images[0].image_type == 'ubuntu-20.04-cuda-11.0'

tests/unit_tests/job_deployments/test_job_deployments.py

@@ -1,9 +1,16 @@
 import json
+from dataclasses import replace
 
 import pytest
 import responses  # https://github.com/getsentry/responses
 
 from verda.containers import ComputeResource, Container, ContainerRegistrySettings
+from verda.containers._containers import (
+    GeneralStorageMount,
+    MemoryMount,
+    SecretMount,
+    SharedFileSystemMount,
+)
 from verda.exceptions import APIException
 from verda.job_deployments import (
     JobDeployment,
@@ -207,3 +214,71 @@ def test_purge_job_deployment_queue(self, service, endpoint):
         service.purge_queue(JOB_NAME)
 
         assert responses.assert_call_count(url, 1) is True
+
+    @responses.activate
+    def test_update_preserves_volume_mounts_round_trip(self, service, endpoint):
+        """Regression test: volume mount subclass fields (volume_id, secret_name, etc.)
+        must survive a get → update round trip without being dropped during deserialization."""
+        volume_id = '550e8400-e29b-41d4-a716-446655440000'
+        api_payload = {
+            'name': JOB_NAME,
+            'containers': [
+                {
+                    'name': CONTAINER_NAME,
+                    'image': 'busybox:latest',
+                    'exposed_port': 8080,
+                    'env': [],
+                    'volume_mounts': [
+                        {'type': 'scratch', 'mount_path': '/data'},
+                        {'type': 'shared', 'mount_path': '/sfs', 'volume_id': volume_id},
+                        {
+                            'type': 'secret',
+                            'mount_path': '/secrets',
+                            'secret_name': 'my-secret',
+                            'file_names': ['key.pem'],
+                        },
+                        {'type': 'memory', 'mount_path': '/dev/shm', 'size_in_mb': 512},
+                    ],
+                }
+            ],
+            'endpoint_base_url': 'https://test-job.datacrunch.io',
+            'created_at': '2024-01-01T00:00:00Z',
+            'compute': {'name': 'H100', 'size': 1},
+            'container_registry_settings': {'is_private': False, 'credentials': None},
+        }
+
+        get_url = f'{endpoint}/{JOB_NAME}'
+        responses.add(responses.GET, get_url, json=api_payload, status=200)
+        responses.add(responses.PATCH, get_url, json=api_payload, status=200)
+
+        # Simulate the user's flow: get → modify image → update
+        deployment = service.get_by_name(JOB_NAME)
+
+        # Verify deserialization produced the correct subclasses
+        vms = deployment.containers[0].volume_mounts
+        assert isinstance(vms[0], GeneralStorageMount)
+        assert isinstance(vms[1], SharedFileSystemMount)
+        assert vms[1].volume_id == volume_id
+        assert isinstance(vms[2], SecretMount)
+        assert vms[2].secret_name == 'my-secret'
+        assert vms[2].file_names == ['key.pem']
+        assert isinstance(vms[3], MemoryMount)
+        assert vms[3].size_in_mb == 512
+
+        # Update only the image (exactly what the reported user script does)
+        containers = list(deployment.containers)
+        containers[0] = replace(containers[0], image='busybox:v2')
+        updated_deployment = replace(deployment, containers=containers)
+
+        service.update(JOB_NAME, updated_deployment)
+
+        # Verify the PATCH request body still contains volume_id
+        request_body = json.loads(responses.calls[1].request.body.decode('utf-8'))
+        sent_vms = request_body['containers'][0]['volume_mounts']
+        assert sent_vms[0]['type'] == 'scratch'
+        assert sent_vms[1]['type'] == 'shared'
+        assert sent_vms[1]['volume_id'] == volume_id
+        assert sent_vms[2]['type'] == 'secret'
+        assert sent_vms[2]['secret_name'] == 'my-secret'
+        assert sent_vms[3]['type'] == 'memory'
+        assert sent_vms[3]['size_in_mb'] == 512

tests/unit_tests/volumes/test_volumes.py

@@ -49,7 +49,25 @@
     'is_os_volume': True,
     'created_at': NVME_VOL_CREATED_AT,
     'target': TARGET_VDA,
-    'ssh_key_ids': SSH_KEY_ID,
+    'ssh_key_ids': [SSH_KEY_ID],
+    'pseudo_path': 'volume-nxC2tf9F',
+    'mount_command': 'mount -t nfs -o nconnect=16 nfs.fin-01.datacrunch.io:volume-nxC2tf9F /mnt/volume',
+    'create_directory_command': 'mkdir -p /mnt/volume',
+    'filesystem_to_fstab_command': "grep -qxF 'nfs.fin-01.datacrunch.io:volume-nxC2tf9F /mnt/volume nfs defaults 0 0' /etc/fstab || echo 'nfs.fin-01.datacrunch.io:volume-nxC2tf9F /mnt/volume nfs defaults 0 0' | sudo tee -a /etc/fstab",
+    'instances': [
+        {
+            'id': INSTANCE_ID,
+            'ip': '123.123.123.123',
+            'instance_type': '4A100.88V',
+            'status': 'running',
+            'hostname': 'hazy-star-swims-fin-01',
+        }
+    ],
+    'contract': 'PAY_AS_YOU_GO',
+    'base_hourly_cost': 0.0273972602739726,
+    'monthly_price': 20,
+    'currency': 'eur',
+    'long_term': None,
 }
 
 HDD_VOLUME = {
@@ -64,6 +82,16 @@
     'created_at': HDD_VOL_CREATED_AT,
     'target': None,
     'ssh_key_ids': [],
+    'pseudo_path': 'volume-iHdL4ysR',
+    'mount_command': 'mount -t nfs -o nconnect=16 nfs.fin-01.datacrunch.io:volume-iHdL4ysR /mnt/volume',
+    'create_directory_command': 'mkdir -p /mnt/volume',
+    'filesystem_to_fstab_command': "grep -qxF 'nfs.fin-01.datacrunch.io:volume-iHdL4ysR /mnt/volume nfs defaults 0 0' /etc/fstab || echo 'nfs.fin-01.datacrunch.io:volume-iHdL4ysR /mnt/volume nfs defaults 0 0' | sudo tee -a /etc/fstab",
+    'instances': [],
+    'contract': 'PAY_AS_YOU_GO',
+    'base_hourly_cost': 0.01,
+    'monthly_price': 10,
+    'currency': 'eur',
+    'long_term': None,
 }
 
 PAYLOAD = [NVME_VOLUME, HDD_VOLUME]
@@ -80,13 +108,13 @@ def endpoint(self, http_client):
 
     def test_initialize_a_volume(self):
         volume = Volume(
-            RANDOM_VOL_ID,
-            VolumeStatus.DETACHED,
-            HDD_VOL_NAME,
-            HDD_VOL_SIZE,
-            HDD,
-            False,
-            HDD_VOL_CREATED_AT,
+            id=RANDOM_VOL_ID,
+            status=VolumeStatus.DETACHED,
+            name=HDD_VOL_NAME,
+            size=HDD_VOL_SIZE,
+            type=HDD,
+            is_os_volume=False,
+            created_at=HDD_VOL_CREATED_AT,
         )
 
         assert volume.id == RANDOM_VOL_ID
@@ -101,6 +129,34 @@ def test_initialize_a_volume(self):
         assert volume.target is None
         assert volume.ssh_key_ids == []
 
+    def test_from_dict_without_optional_fields(self):
+        """Test that from_dict handles API responses missing optional fields."""
+        minimal_dict = {
+            'id': RANDOM_VOL_ID,
+            'status': VolumeStatus.DETACHED,
+            'name': HDD_VOL_NAME,
+            'size': HDD_VOL_SIZE,
+            'type': HDD,
+            'is_os_volume': False,
+            'created_at': HDD_VOL_CREATED_AT,
+            'target': None,
+            'location': Locations.FIN_01,
+            'instance_id': None,
+            'ssh_key_ids': [],
+        }
+        volume = Volume.from_dict(minimal_dict)
+        assert volume.id == RANDOM_VOL_ID
+        assert volume.pseudo_path is None
+        assert volume.mount_command is None
+        assert volume.create_directory_command is None
+        assert volume.filesystem_to_fstab_command is None
+        assert volume.instances is None
+        assert volume.contract is None
+        assert volume.base_hourly_cost is None
+        assert volume.monthly_price is None
+        assert volume.currency is None
+        assert volume.long_term is None
+
     def test_get_volumes(self, volumes_service, endpoint):
         # arrange - add response mock
         responses.add(responses.GET, endpoint, json=PAYLOAD, status=200)
@@ -125,7 +181,17 @@ def test_get_volumes(self, volumes_service, endpoint):
         assert volume_nvme.is_os_volume
         assert volume_nvme.created_at == NVME_VOL_CREATED_AT
         assert volume_nvme.target == TARGET_VDA
-        assert volume_nvme.ssh_key_ids == SSH_KEY_ID
+        assert volume_nvme.ssh_key_ids == [SSH_KEY_ID]
+        assert volume_nvme.pseudo_path == NVME_VOLUME['pseudo_path']
+        assert volume_nvme.mount_command == NVME_VOLUME['mount_command']
+        assert volume_nvme.create_directory_command == NVME_VOLUME['create_directory_command']
+        assert volume_nvme.filesystem_to_fstab_command == NVME_VOLUME['filesystem_to_fstab_command']
+        assert volume_nvme.instances == NVME_VOLUME['instances']
+        assert volume_nvme.contract == 'PAY_AS_YOU_GO'
+        assert volume_nvme.base_hourly_cost == NVME_VOLUME['base_hourly_cost']
+        assert volume_nvme.monthly_price == 20
+        assert volume_nvme.currency == 'eur'
+        assert volume_nvme.long_term is None
 
         assert volume_hdd.id == HDD_VOL_ID
         assert volume_hdd.status == HDD_VOL_STATUS

uv.lock

@@ -10,7 +10,7 @@
 from enum import Enum
 from typing import Any
 
-from dataclasses_json import Undefined, dataclass_json  # type: ignore
+from dataclasses_json import Undefined, config, dataclass_json  # type: ignore
 
 from verda.http_client import HTTPClient
 from verda.inference_client import InferenceClient, InferenceResponse
@@ -203,6 +203,29 @@ def __init__(self, mount_path: str, volume_id: str):
         self.volume_id = volume_id
 
 
+def _decode_volume_mount(data: dict) -> VolumeMount:
+    """Decode a volume mount dict into the correct VolumeMount subclass based on type."""
+    mount_type = data.get('type')
+    if mount_type == VolumeMountType.SHARED or mount_type == 'shared':
+        return SharedFileSystemMount(mount_path=data['mount_path'], volume_id=data['volume_id'])
+    if mount_type == VolumeMountType.SECRET or mount_type == 'secret':
+        return SecretMount(
+            mount_path=data['mount_path'],
+            secret_name=data['secret_name'],
+            file_names=data.get('file_names'),
+        )
+    if mount_type == VolumeMountType.MEMORY or mount_type == 'memory':
+        return MemoryMount(size_in_mb=data['size_in_mb'])
+    return GeneralStorageMount(mount_path=data['mount_path'])
+
+
+def _decode_volume_mounts(data: list[dict] | None) -> list[VolumeMount] | None:
+    """Decode a list of volume mount dicts into the correct VolumeMount subclasses."""
+    if not data:
+        return None
+    return [_decode_volume_mount(v) for v in data]
+
+
 @dataclass_json
 @dataclass
 class Container:
@@ -224,7 +247,9 @@ class Container:
     healthcheck: HealthcheckSettings | None = None
     entrypoint_overrides: EntrypointOverridesSettings | None = None
     env: list[EnvVar] | None = None
-    volume_mounts: list[VolumeMount] | None = None
+    volume_mounts: list[VolumeMount] | None = field(
+        default=None, metadata=config(decoder=_decode_volume_mounts)
+    )
 
 
 @dataclass_json