extend ooil to support depends_on

Author: Andrei Neagu

packages/service-integration/src/service_integration/osparc_image_specs.py

@@ -2,7 +2,9 @@
 
 """
 
+from typing import Any
 
+from service_integration._compose_spec_model_autogenerated import ListOrDict
 from service_integration.compose_spec_model import (
     BuildItem,
     ComposeSpecification,
@@ -26,7 +28,7 @@ def create_image_spec(
 
     - the image-spec simplifies building an image to ``docker compose build``
     """
-    labels = {**meta_cfg.to_labels_annotations()}
+    labels: dict[str, str | float | bool | None] = {**meta_cfg.to_labels_annotations()}
     if extra_labels:
         labels.update(extra_labels)
     if runtime_cfg:
@@ -36,19 +38,26 @@ def create_image_spec(
 
     assert docker_compose_overwrite_cfg.services  # nosec
 
-    if not docker_compose_overwrite_cfg.services[service_name].build.context:
-        docker_compose_overwrite_cfg.services[service_name].build.context = "./"
+    build = docker_compose_overwrite_cfg.services[service_name].build
+    assert isinstance(build, BuildItem)  # nosec
+    if not build.context:
+        build.context = "./"
 
-    docker_compose_overwrite_cfg.services[service_name].build.labels = labels
+    build.labels = ListOrDict(root=labels)
 
-    overwrite_options = docker_compose_overwrite_cfg.services[
-        service_name
-    ].build.model_dump(exclude_none=True, serialize_as_any=True)
+    overwrite_options = build.model_dump(exclude_none=True, serialize_as_any=True)
     build_spec = BuildItem(**overwrite_options)
 
+    service_kwargs: dict[str, Any] = {
+        "image": meta_cfg.image_name(settings),
+        "build": build_spec,
+    }
+    if docker_compose_overwrite_cfg.services[service_name].depends_on:
+        service_kwargs["depends_on"] = docker_compose_overwrite_cfg.services[
+            service_name
+        ].depends_on
+
     return ComposeSpecification(
         version=settings.COMPOSE_VERSION,
-        services={
-            service_name: Service(image=meta_cfg.image_name(settings), build=build_spec)
-        },
+        services={service_name: Service(**service_kwargs)},
     )

packages/service-integration/tests/data/docker-compose.overwrite.yml

@@ -1,4 +1,6 @@
 services:
   osparc-python-runner:
+    depends_on:
+      - another-service
     build:
       dockerfile: Dockerfile

packages/service-integration/tests/test_command_compose.py

@@ -3,14 +3,22 @@
 # pylint: disable=unused-variable
 
 import os
+import traceback
 from collections.abc import Callable
 from pathlib import Path
 
 import yaml
+from click.testing import Result
 from service_integration.compose_spec_model import ComposeSpecification
 from service_integration.osparc_config import MetadataConfig
 
 
+def _format_cli_error(result: Result) -> str:
+    assert result.exception
+    tb_message = "\n".join(traceback.format_tb(result.exception.__traceback__))
+    return f"Below exception was raised by the cli:\n{tb_message}"
+
+
 def test_make_docker_compose_meta(
     run_program_with_args: Callable,
     docker_compose_overwrite_path: Path,
@@ -33,7 +41,7 @@ def test_make_docker_compose_meta(
         "--to-spec-file",
         target_compose_specs,
     )
-    assert result.exit_code == os.EX_OK, result.output
+    assert result.exit_code == os.EX_OK, _format_cli_error(result)
 
     # produces a compose spec
     assert target_compose_specs.exists()
@@ -50,6 +58,4 @@ def test_make_docker_compose_meta(
     assert compose_labels
     assert isinstance(compose_labels.root, dict)
 
-    assert (
-        MetadataConfig.from_labels_annotations(compose_labels.root) == metadata_cfg
-    )
+    assert MetadataConfig.from_labels_annotations(compose_labels.root) == metadata_cfg