dockercomposefile 0.1.0__tar.gz → 0.1.1__tar.gz

{dockercomposefile-0.1.0 → dockercomposefile-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dockercomposefile
-Version: 0.1.0
+Version: 0.1.1
 Summary: Pydantic models for Docker Compose files with YAML builder and exporter
 License-Expression: Apache-2.0
 Project-URL: Homepage, https://github.com/thewiw/py-docker-compose-file

{dockercomposefile-0.1.0 → dockercomposefile-0.1.1}/dockercomposefile/models/service.py

@@ -380,6 +380,8 @@ class Service(ComposeBaseModel):
                     result.append(PortConfig.model_validate(item))
                 elif isinstance(item, int):
                     result.append(PortConfig.model_validate({"target": item}))
+                elif isinstance(item, PortConfig):
+                    result.append(item)
             return result
         return None
 
@@ -411,6 +413,8 @@ class Service(ComposeBaseModel):
                     result.append(VolumeMount.model_validate(_parse_service_volume(item)))
                 elif isinstance(item, dict):
                     result.append(VolumeMount.model_validate(item))
+                elif isinstance(item, VolumeMount):
+                    result.append(item)
             return result
         return None
 
@@ -511,6 +515,8 @@ class Service(ComposeBaseModel):
                     result.append(item)
                 elif isinstance(item, dict):
                     result.append(ServiceConfig.model_validate(item))
+                elif isinstance(item, ServiceConfig):
+                    result.append(item)
             return result
         return None
 
@@ -527,6 +533,8 @@ class Service(ComposeBaseModel):
                     result.append(item)
                 elif isinstance(item, dict):
                     result.append(ServiceSecret.model_validate(item))
+                elif isinstance(item, ServiceSecret):
+                    result.append(item)
             return result
         return None
 
@@ -566,6 +574,8 @@ class Service(ComposeBaseModel):
                     result[str(k)] = ServiceNetworkConfig()
                 elif isinstance(val, dict):
                     result[str(k)] = ServiceNetworkConfig.model_validate(val)
+                elif isinstance(val, ServiceNetworkConfig):
+                    result[str(k)] = val
             return result
         return None
 

{dockercomposefile-0.1.0 → dockercomposefile-0.1.1}/dockercomposefile.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dockercomposefile
-Version: 0.1.0
+Version: 0.1.1
 Summary: Pydantic models for Docker Compose files with YAML builder and exporter
 License-Expression: Apache-2.0
 Project-URL: Homepage, https://github.com/thewiw/py-docker-compose-file

{dockercomposefile-0.1.0 → dockercomposefile-0.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dockercomposefile"
-version = "0.1.0"
+version = "0.1.1"
 description = "Pydantic models for Docker Compose files with YAML builder and exporter"
 readme = "README.md"
 license = "Apache-2.0"

{dockercomposefile-0.1.0 → dockercomposefile-0.1.1}/tests/test_builder.py

@@ -6,6 +6,9 @@ from dockercomposefile import ComposeBuilder
 from dockercomposefile.models import (
     DockerComposeFile,
     PortConfig,
+    ServiceConfig,
+    ServiceNetworkConfig,
+    ServiceSecret,
     VolumeMount,
 )
 
@@ -445,3 +448,61 @@ class TestFromDict:
         }
         compose = ComposeBuilder.from_dict(data)
         assert compose.services["web"].image == "nginx"
+
+
+class TestPreInstantiatedModels:
+    """Tests for passing pre-instantiated model instances to Service."""
+
+    def test_volumes_with_pre_instantiated_volume_mount(self):
+        from dockercomposefile.models.service import Service
+        vol1 = VolumeMount(source="foo", target="bar")
+        vol2 = VolumeMount(source="truc", target="muche")
+        service = Service(
+            image="caddy:latest",
+            volumes=[vol1, vol2],
+        )
+        assert len(service.volumes) == 2
+        assert service.volumes[0] == vol1
+        assert service.volumes[1] == vol2
+
+    def test_ports_with_pre_instantiated_port_config(self):
+        port1 = PortConfig(target=80, published="80")
+        port2 = PortConfig(target=443, published="443")
+        from dockercomposefile.models.service import Service
+        service = Service(
+            image="nginx",
+            ports=[port1, port2],
+        )
+        assert len(service.ports) == 2
+        assert service.ports[0] == port1
+        assert service.ports[1] == port2
+
+    def test_configs_with_pre_instantiated_service_config(self):
+        cfg = ServiceConfig(source="app_config", target="/app/config.yml")
+        from dockercomposefile.models.service import Service
+        service = Service(
+            image="api",
+            configs=[cfg],
+        )
+        assert len(service.configs) == 1
+        assert service.configs[0] == cfg
+
+    def test_secrets_with_pre_instantiated_service_secret(self):
+        sec = ServiceSecret(source="db_password")
+        from dockercomposefile.models.service import Service
+        service = Service(
+            image="api",
+            secrets=[sec],
+        )
+        assert len(service.secrets) == 1
+        assert service.secrets[0] == sec
+
+    def test_networks_with_pre_instantiated_service_network_config(self):
+        net = ServiceNetworkConfig(aliases=["api-service"])
+        from dockercomposefile.models.service import Service
+        service = Service(
+            image="api",
+            networks={"backend": net},
+        )
+        assert "backend" in service.networks
+        assert service.networks["backend"] == net