fix typing and revert

Author: Andrei Neagu

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

@@ -10,7 +10,11 @@
 from typing import Annotated, Any
 
 from models_library.basic_types import SHA1Str, VersionStr
-from models_library.utils.labels_annotations import from_labels, to_labels
+from models_library.utils.labels_annotations import (
+    LabelsAnnotationsDict,
+    from_labels,
+    to_labels,
+)
 from pydantic import BaseModel, ConfigDict, Field
 from pydantic.networks import AnyUrl
 
@@ -132,17 +136,16 @@ class OciImageSpecAnnotations(BaseModel):
 
     @classmethod
     def from_labels_annotations(
-        cls, labels: dict[str, str]
+        cls, labels: LabelsAnnotationsDict
     ) -> "OciImageSpecAnnotations":
         data = from_labels(labels, prefix_key=OCI_LABEL_PREFIX, trim_key_head=False)
         return cls.model_validate(data)
 
-    def to_labels_annotations(self) -> dict[str, str]:
-        labels: dict[str, str] = to_labels(
+    def to_labels_annotations(self) -> LabelsAnnotationsDict:
+        return to_labels(
             self.model_dump(exclude_unset=True, by_alias=True, exclude_none=True),
             prefix_key=OCI_LABEL_PREFIX,
         )
-        return labels
 
 
 class LabelSchemaAnnotations(BaseModel):

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

@@ -75,7 +75,7 @@ class DockerComposeOverwriteConfig(ComposeSpecification):
     def create_default(
         cls, service_name: str | None = None
     ) -> "DockerComposeOverwriteConfig":
-        return cls.model_validate(
+        model: "DockerComposeOverwriteConfig" = cls.model_validate(
             {
                 "services": {
                     service_name: {
@@ -86,12 +86,14 @@ def create_default(
                 }
             }
         )
+        return model
 
     @classmethod
     def from_yaml(cls, path: Path) -> "DockerComposeOverwriteConfig":
         with path.open() as fh:
             data = yaml_safe_load(fh)
-        return cls.model_validate(data)
+        model: "DockerComposeOverwriteConfig" = cls.model_validate(data)
+        return model
 
 
 class MetadataConfig(ServiceMetaDataPublished):