renamed

Author: sanderegg

packages/models-library/src/models_library/services_metadata_runtime.py

@@ -44,7 +44,7 @@ def to_simcore_runtime_docker_label_key(key: str) -> DockerLabelKey:
     )
 
 
-class StandardSimcoreDockerLabels(BaseModel):
+class SimcoreContainerLabels(BaseModel):
     """
     Represents the standard label on oSparc created containers (not yet services)
     In order to create this object in code, please use model_construct() method!
@@ -123,7 +123,7 @@ def to_simcore_runtime_docker_labels(self) -> dict[DockerLabelKey, str]:
         }
 
     @classmethod
-    def from_docker_task(cls, docker_task: Task) -> "StandardSimcoreDockerLabels":
+    def from_docker_task(cls, docker_task: Task) -> "SimcoreContainerLabels":
         assert docker_task.spec  # nosec
         assert docker_task.spec.container_spec  # nosec
         task_labels = docker_task.spec.container_spec.labels or {}

packages/models-library/tests/test_docker.py

@@ -14,7 +14,7 @@
 )
 from models_library.services_metadata_runtime import (
     _SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX,
-    StandardSimcoreDockerLabels,
+    SimcoreContainerLabels,
 )
 from pydantic import ByteSize, TypeAdapter, ValidationError
 
@@ -106,29 +106,27 @@ def test_docker_generic_tag(image_name: str, valid: bool):
 
 @pytest.mark.parametrize(
     "obj_data",
-    StandardSimcoreDockerLabels.model_config["json_schema_extra"]["examples"],
+    SimcoreContainerLabels.model_config["json_schema_extra"]["examples"],
     ids=str,
 )
 def test_simcore_service_docker_label_keys(obj_data: dict[str, Any]):
-    simcore_service_docker_label_keys = StandardSimcoreDockerLabels.model_validate(
-        obj_data
-    )
+    simcore_service_docker_label_keys = SimcoreContainerLabels.model_validate(obj_data)
     exported_dict = simcore_service_docker_label_keys.to_simcore_runtime_docker_labels()
     assert all(
         isinstance(v, str) for v in exported_dict.values()
     ), "docker labels must be strings!"
     assert all(
         key.startswith(_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX) for key in exported_dict
     )
-    re_imported_docker_label_keys = TypeAdapter(
-        StandardSimcoreDockerLabels
-    ).validate_python(exported_dict)
+    re_imported_docker_label_keys = TypeAdapter(SimcoreContainerLabels).validate_python(
+        exported_dict
+    )
     assert re_imported_docker_label_keys
     assert simcore_service_docker_label_keys == re_imported_docker_label_keys
 
 
 def test_simcore_service_docker_label_keys_construction():
-    simcore_service_docker_label_keys = StandardSimcoreDockerLabels(
+    simcore_service_docker_label_keys = SimcoreContainerLabels(
         user_id=8268,
         project_id=UUID("5ea24ce0-0e4d-4ee6-a3f1-e4799752a684"),
         node_id=UUID("c17c6279-23c6-412f-8826-867323a7711a"),

services/autoscaling/src/simcore_service_autoscaling/utils/rabbitmq.py

@@ -14,7 +14,7 @@
     ProgressType,
     RabbitAutoscalingStatusMessage,
 )
-from models_library.services_metadata_runtime import StandardSimcoreDockerLabels
+from models_library.services_metadata_runtime import SimcoreContainerLabels
 from models_library.users import UserID
 from servicelib.logging_utils import log_catch
 
@@ -27,7 +27,7 @@
 
 def _get_task_ids(task: DockerTask | DaskTask) -> tuple[UserID, ProjectID, NodeID]:
     if isinstance(task, DockerTask):
-        labels = StandardSimcoreDockerLabels.from_docker_task(task)
+        labels = SimcoreContainerLabels.from_docker_task(task)
         return labels.user_id, labels.project_id, labels.node_id
     _service_key, _service_version, user_id, project_id, node_id = parse_dask_job_id(
         task.task_id

services/autoscaling/tests/unit/conftest.py

@@ -51,7 +51,7 @@
     Service,
     TaskSpec,
 )
-from models_library.services_metadata_runtime import StandardSimcoreDockerLabels
+from models_library.services_metadata_runtime import SimcoreContainerLabels
 from pydantic import ByteSize, NonNegativeInt, PositiveInt, TypeAdapter
 from pytest_mock import MockType
 from pytest_mock.plugin import MockerFixture
@@ -812,8 +812,8 @@ def host_memory_total() -> ByteSize:
 @pytest.fixture
 def osparc_docker_label_keys(
     faker: Faker,
-) -> StandardSimcoreDockerLabels:
-    return StandardSimcoreDockerLabels.model_validate(
+) -> SimcoreContainerLabels:
+    return SimcoreContainerLabels.model_validate(
         {
             "user_id": faker.pyint(),
             "project_id": faker.uuid4(),

services/autoscaling/tests/unit/test_models.py

@@ -10,7 +10,7 @@
 import pytest
 from models_library.docker import DockerLabelKey
 from models_library.generated_models.docker_rest_api import Service, Task
-from models_library.services_metadata_runtime import StandardSimcoreDockerLabels
+from models_library.services_metadata_runtime import SimcoreContainerLabels
 from pydantic import TypeAdapter, ValidationError
 
 
@@ -29,7 +29,7 @@ async def test_get_simcore_service_docker_labels_from_task_with_missing_labels_r
     assert service_tasks
     assert len(service_tasks) == 1
     with pytest.raises(ValidationError):
-        StandardSimcoreDockerLabels.from_docker_task(service_tasks[0])
+        SimcoreContainerLabels.from_docker_task(service_tasks[0])
 
 
 async def test_get_simcore_service_docker_labels(
@@ -38,7 +38,7 @@ async def test_get_simcore_service_docker_labels(
         [dict[str, Any], dict[DockerLabelKey, str], str], Awaitable[Service]
     ],
     task_template: dict[str, Any],
-    osparc_docker_label_keys: StandardSimcoreDockerLabels,
+    osparc_docker_label_keys: SimcoreContainerLabels,
 ):
     service_with_labels = await create_service(
         task_template,
@@ -53,7 +53,7 @@ async def test_get_simcore_service_docker_labels(
     )
     assert service_tasks
     assert len(service_tasks) == 1
-    task_ownership = StandardSimcoreDockerLabels.from_docker_task(service_tasks[0])
+    task_ownership = SimcoreContainerLabels.from_docker_task(service_tasks[0])
     assert task_ownership
     assert task_ownership.user_id == osparc_docker_label_keys.user_id
     assert task_ownership.project_id == osparc_docker_label_keys.project_id

services/autoscaling/tests/unit/test_modules_cluster_scaling_dynamic.py

@@ -37,7 +37,7 @@
 from models_library.rabbitmq_messages import RabbitAutoscalingStatusMessage
 from models_library.services_metadata_runtime import (
     DOCKER_TASK_EC2_INSTANCE_TYPE_PLACEMENT_CONSTRAINT_KEY,
-    StandardSimcoreDockerLabels,
+    SimcoreContainerLabels,
 )
 from pydantic import ByteSize, TypeAdapter
 from pytest_mock import MockType
@@ -275,7 +275,7 @@ async def create_services_batch(
     task_template: dict[str, Any],
     create_task_reservations: Callable[[int, int], dict[str, Any]],
     service_monitored_labels: dict[DockerLabelKey, str],
-    osparc_docker_label_keys: StandardSimcoreDockerLabels,
+    osparc_docker_label_keys: SimcoreContainerLabels,
 ) -> Callable[[_ScaleUpParams], Awaitable[list[Service]]]:
     async def _(scale_up_params: _ScaleUpParams) -> list[Service]:
         return await asyncio.gather(

services/autoscaling/tests/unit/test_utils_rabbitmq.py

@@ -24,7 +24,7 @@
     ProgressRabbitMessageNode,
     ProgressType,
 )
-from models_library.services_metadata_runtime import StandardSimcoreDockerLabels
+from models_library.services_metadata_runtime import SimcoreContainerLabels
 from models_library.services_types import ServiceKey, ServiceVersion
 from models_library.users import UserID
 from pydantic import TypeAdapter
@@ -209,7 +209,7 @@ async def test_post_task_log_message_docker(
     mocked_redis_server: None,
     initialized_app: FastAPI,
     running_service_tasks: Callable[[dict[DockerLabelKey, str]], Awaitable[list[Task]]],
-    osparc_docker_label_keys: StandardSimcoreDockerLabels,
+    osparc_docker_label_keys: SimcoreContainerLabels,
     faker: Faker,
     logs_rabbitmq_consumer: AsyncMock,
 ):
@@ -289,7 +289,7 @@ async def test_post_task_progress_message_docker(
     mocked_redis_server: None,
     initialized_app: FastAPI,
     running_service_tasks: Callable[[dict[DockerLabelKey, str]], Awaitable[list[Task]]],
-    osparc_docker_label_keys: StandardSimcoreDockerLabels,
+    osparc_docker_label_keys: SimcoreContainerLabels,
     faker: Faker,
     progress_rabbitmq_consumer: AsyncMock,
 ):

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_compose_specs.py

@@ -14,7 +14,7 @@
     SimcoreServiceLabels,
 )
 from models_library.services import ServiceKey, ServiceVersion
-from models_library.services_metadata_runtime import StandardSimcoreDockerLabels
+from models_library.services_metadata_runtime import SimcoreContainerLabels
 from models_library.services_resources import (
     DEFAULT_SINGLE_SERVICE_NAME,
     ResourcesDict,
@@ -242,7 +242,7 @@ def _update_container_labels(
             spec_service_key, default_limits
         )
 
-        label_keys = StandardSimcoreDockerLabels.model_validate(
+        label_keys = SimcoreContainerLabels.model_validate(
             {
                 "user_id": user_id,
                 "project_id": project_id,

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/proxy.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-from models_library.services_metadata_runtime import StandardSimcoreDockerLabels
+from models_library.services_metadata_runtime import SimcoreContainerLabels
 from models_library.services_resources import (
     CPU_10_PERCENT,
     CPU_100_PERCENT,
@@ -116,7 +116,7 @@ def get_dynamic_proxy_spec(
             ),
             "dynamic_type": "dynamic-sidecar",  # tagged as dynamic service
         }
-        | StandardSimcoreDockerLabels(
+        | SimcoreContainerLabels(
             user_id=scheduler_data.user_id,
             project_id=scheduler_data.project_id,
             node_id=scheduler_data.node_uuid,
@@ -134,7 +134,7 @@ def get_dynamic_proxy_spec(
                 "Hosts": [],
                 "Image": f"caddy:{proxy_settings.DYNAMIC_SIDECAR_CADDY_VERSION}",
                 "Init": True,
-                "Labels": StandardSimcoreDockerLabels(
+                "Labels": SimcoreContainerLabels(
                     user_id=scheduler_data.user_id,
                     project_id=scheduler_data.project_id,
                     node_id=scheduler_data.node_uuid,

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/sidecar.py

@@ -15,7 +15,7 @@
 from models_library.service_settings_labels import SimcoreServiceSettingsLabel
 from models_library.services_metadata_runtime import (
     DOCKER_TASK_EC2_INSTANCE_TYPE_PLACEMENT_CONSTRAINT_KEY,
-    StandardSimcoreDockerLabels,
+    SimcoreContainerLabels,
     to_simcore_runtime_docker_label_key,
 )
 from pydantic import ByteSize, TypeAdapter
@@ -462,18 +462,16 @@ async def get_dynamic_sidecar_spec(  # pylint:disable=too-many-arguments# noqa:
         scheduler_data.product_name is not None
     ), "ONLY for legacy. This function should not be called with product_name==None"  # nosec
 
-    standard_simcore_docker_labels: dict[DockerLabelKey, str] = (
-        StandardSimcoreDockerLabels(
-            user_id=scheduler_data.user_id,
-            project_id=scheduler_data.project_id,
-            node_id=scheduler_data.node_uuid,
-            product_name=scheduler_data.product_name,
-            simcore_user_agent=scheduler_data.request_simcore_user_agent,
-            swarm_stack_name=dynamic_services_scheduler_settings.SWARM_STACK_NAME,
-            memory_limit=ByteSize(0),  # this should get overwritten
-            cpu_limit=0,  # this should get overwritten
-        ).to_simcore_runtime_docker_labels()
-    )
+    standard_simcore_docker_labels: dict[DockerLabelKey, str] = SimcoreContainerLabels(
+        user_id=scheduler_data.user_id,
+        project_id=scheduler_data.project_id,
+        node_id=scheduler_data.node_uuid,
+        product_name=scheduler_data.product_name,
+        simcore_user_agent=scheduler_data.request_simcore_user_agent,
+        swarm_stack_name=dynamic_services_scheduler_settings.SWARM_STACK_NAME,
+        memory_limit=ByteSize(0),  # this should get overwritten
+        cpu_limit=0,  # this should get overwritten
+    ).to_simcore_runtime_docker_labels()
 
     service_labels: dict[str, str] = (
         {