✨ Refactor: Replace json.loads with json_loads for consistency across modules

Author: pcrespov

packages/dask-task-models-library/src/dask_task_models_library/container_tasks/io.py

@@ -3,6 +3,7 @@
 from pathlib import Path
 from typing import Annotated, Any, TypeAlias
 
+from common_library.json_serialization import json_loads
 from models_library.basic_regex import MIME_TYPE_RE
 from models_library.generics import DictModel
 from models_library.services_types import ServicePortKey
@@ -160,7 +161,7 @@ def from_task_output(
             with suppress(json.JSONDecodeError):
                 # NOTE: The suppression here is ok, since if the data is empty,
                 # there will be a validation error anyway
-                data = json.loads(output_data_file.read_text())
+                data = json_loads(output_data_file.read_text())
 
         for output_key, output_params in schema.items():
             if isinstance(output_params, FilePortSchema):

packages/models-library/src/models_library/function_services_catalog/_settings.py

@@ -1,11 +1,12 @@
 import json
 import os
 
+from common_library.json_serialization import json_loads
 from pydantic_settings import BaseSettings
 
 # Expects env var: FUNCTION_SERVICES_AUTHORS='{"OM":{"name": ...}, "EN":{...} }'
 try:
-    AUTHORS = json.loads(os.environ.get("FUNCTION_SERVICES_AUTHORS", "{}"))
+    AUTHORS = json_loads(os.environ.get("FUNCTION_SERVICES_AUTHORS", "{}"))
 except json.decoder.JSONDecodeError:
     AUTHORS = {}
 

packages/models-library/src/models_library/utils/labels_annotations.py

@@ -1,14 +1,13 @@
-""" Image labels annotations
+"""Image labels annotations
 
 osparc expects the service configuration (in short: config) attached to the service's image as label annotations.
 This module defines how this config is serialized/deserialized to/from docker labels annotations
 """
 
-import json
 from json.decoder import JSONDecodeError
 from typing import Any, TypeAlias
 
-from common_library.json_serialization import json_dumps
+from common_library.json_serialization import json_dumps, json_loads
 
 LabelsAnnotationsDict: TypeAlias = dict[str, str | float | bool | None]
 
@@ -57,7 +56,7 @@ def from_labels(
     for key, label in labels.items():
         if key.startswith(f"{prefix_key}."):
             try:
-                value = json.loads(label)  # type: ignore
+                value = json_loads(label)  # type: ignore
             except JSONDecodeError:
                 value = label
 

packages/service-integration/src/service_integration/cli/_config.py

@@ -1,10 +1,10 @@
-import json
 from pathlib import Path
 from typing import Annotated, Final
 
 import rich
 import typer
 import yaml
+from common_library.json_serialization import json_loads
 from models_library.utils.labels_annotations import LabelsAnnotationsDict
 from pydantic import BaseModel
 
@@ -57,7 +57,7 @@ def _save(service_name: str, filename: Path, model: BaseModel):
             rich.print(f"Creating {output_path} ...", end="")
 
             with output_path.open("wt") as fh:
-                data = json.loads(
+                data = json_loads(
                     model.model_dump_json(by_alias=True, exclude_none=True)
                 )
                 yaml.safe_dump(data, fh, sort_keys=False)

packages/service-integration/src/service_integration/pytest_plugin/docker_integration.py

@@ -18,6 +18,7 @@
 import jsonschema
 import pytest
 import yaml
+from common_library.json_serialization import json_loads
 from docker.errors import APIError
 from docker.models.containers import Container
 
@@ -206,7 +207,7 @@ def convert_to_simcore_labels(image_labels: dict) -> dict:
     io_simcore_labels = {}
     for key, value in image_labels.items():
         if str(key).startswith("io.simcore."):
-            simcore_label = json.loads(value)
+            simcore_label = json_loads(value)
             simcore_keys = list(simcore_label.keys())
             assert len(simcore_keys) == 1
             simcore_key = simcore_keys[0]