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

Author: pcrespov

services/catalog/src/simcore_service_catalog/clients/director.py

@@ -1,6 +1,5 @@
 import asyncio
 import functools
-import json
 import logging
 import urllib.parse
 from collections.abc import AsyncIterator, Awaitable, Callable
@@ -9,7 +8,7 @@
 from typing import Any, Final
 
 import httpx
-from common_library.json_serialization import json_dumps
+from common_library.json_serialization import json_dumps, json_loads
 from fastapi import FastAPI, HTTPException
 from fastapi_lifespan_manager import State
 from models_library.api_schemas_directorv2.services import ServiceExtras
@@ -221,7 +220,7 @@ async def get_service_extras(
         _logger.debug("Compiling service extras from labels %s", pformat(labels))
 
         if _SERVICE_RUNTIME_SETTINGS in labels:
-            service_settings: list[dict[str, Any]] = json.loads(
+            service_settings: list[dict[str, Any]] = json_loads(
                 labels[_SERVICE_RUNTIME_SETTINGS]
             )
             for entry in service_settings:

services/director/src/simcore_service_director/producer.py

@@ -13,6 +13,7 @@
 import arrow
 import httpx
 import tenacity
+from common_library.json_serialization import json_loads
 from fastapi import FastAPI, status
 from packaging.version import Version
 from servicelib.async_utils import run_sequentially_in_context
@@ -135,7 +136,7 @@ async def _read_service_settings(
 ) -> dict[str, Any] | list[Any] | None:
     image_labels, _ = await registry_proxy.get_image_labels(app, key, tag)
     settings: dict[str, Any] | list[Any] | None = (
-        json.loads(image_labels[settings_name])
+        json_loads(image_labels[settings_name])
         if settings_name in image_labels
         else None
     )
@@ -306,28 +307,28 @@ async def _create_docker_service_params(
         ] += f", {service_name}_stripprefixregex"
 
     placement_constraints_to_substitute: list[str] = []
-    placement_substitutions: dict[
-        str, str
-    ] = app_settings.DIRECTOR_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS
+    placement_substitutions: dict[str, str] = (
+        app_settings.DIRECTOR_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS
+    )
     assert isinstance(service_parameters_labels, list)  # nosec
     for param in service_parameters_labels:
         _check_setting_correctness(param)
         # replace %service_uuid% by the given uuid
         if str(param["value"]).find("%service_uuid%") != -1:
             dummy_string = json.dumps(param["value"])
             dummy_string = dummy_string.replace("%service_uuid%", node_uuid)
-            param["value"] = json.loads(dummy_string)
+            param["value"] = json_loads(dummy_string)
 
         if param["type"] == "Resources":
             # python-API compatible for backward compatibility
             if "mem_limit" in param["value"]:
-                docker_params["task_template"]["Resources"]["Limits"][
-                    "MemoryBytes"
-                ] = param["value"]["mem_limit"]
+                docker_params["task_template"]["Resources"]["Limits"]["MemoryBytes"] = (
+                    param["value"]["mem_limit"]
+                )
             if "cpu_limit" in param["value"]:
-                docker_params["task_template"]["Resources"]["Limits"][
-                    "NanoCPUs"
-                ] = param["value"]["cpu_limit"]
+                docker_params["task_template"]["Resources"]["Limits"]["NanoCPUs"] = (
+                    param["value"]["cpu_limit"]
+                )
             if "mem_reservation" in param["value"]:
                 docker_params["task_template"]["Resources"]["Reservations"][
                     "MemoryBytes"
@@ -379,11 +380,11 @@ async def _create_docker_service_params(
 
         # publishing port on the ingress network.
         elif param["name"] == "ports" and param["type"] == "int":  # backward comp
-            docker_params["labels"][
-                _to_simcore_runtime_docker_label_key("port")
-            ] = docker_params["labels"][
-                f"traefik.http.services.{service_name}.loadbalancer.server.port"
-            ] = str(
+            docker_params["labels"][_to_simcore_runtime_docker_label_key("port")] = (
+                docker_params["labels"][
+                    f"traefik.http.services.{service_name}.loadbalancer.server.port"
+                ]
+            ) = str(
                 param["value"]
             )
         # REST-API compatible
@@ -445,11 +446,9 @@ async def _create_docker_service_params(
     ] = container_spec["Labels"][
         _to_simcore_runtime_docker_label_key("cpu_limit")
     ] = f"{float(nano_cpus_limit) / 1e9}"
-    docker_params["labels"][
-        _to_simcore_runtime_docker_label_key("memory_limit")
-    ] = container_spec["Labels"][
-        _to_simcore_runtime_docker_label_key("memory_limit")
-    ] = mem_limit
+    docker_params["labels"][_to_simcore_runtime_docker_label_key("memory_limit")] = (
+        container_spec["Labels"][_to_simcore_runtime_docker_label_key("memory_limit")]
+    ) = mem_limit
 
     # and make the container aware of them via env variables
     resource_limits = {

services/director/src/simcore_service_director/registry_proxy.py

@@ -8,6 +8,7 @@
 
 import httpx
 from aiocache import Cache, SimpleMemoryCache  # type: ignore[import-untyped]
+from common_library.json_serialization import json_loads
 from fastapi import FastAPI, status
 from servicelib.async_utils import cancel_wait_task
 from servicelib.background_task import create_periodic_task
@@ -380,7 +381,7 @@ async def get_image_labels(
     request_result, headers = await registry_request(
         app, path=path, method="GET", use_cache=not update_cache
     )
-    v1_compatibility_key = json.loads(request_result["history"][0]["v1Compatibility"])
+    v1_compatibility_key = json_loads(request_result["history"][0]["v1Compatibility"])
     container_config: dict[str, Any] = v1_compatibility_key.get(
         "container_config", v1_compatibility_key["config"]
     )
@@ -413,7 +414,7 @@ async def get_image_details(
         if not key.startswith("io.simcore."):
             continue
         try:
-            label_data = json.loads(labels[key])
+            label_data = json_loads(labels[key])
             for label_key in label_data:
                 image_details[label_key] = label_data[label_key]
         except json.decoder.JSONDecodeError:
@@ -483,7 +484,7 @@ async def list_interactive_service_dependencies(
     dependency_keys = []
     if DEPENDENCIES_LABEL_KEY in image_labels:
         try:
-            dependencies = json.loads(image_labels[DEPENDENCIES_LABEL_KEY])
+            dependencies = json_loads(image_labels[DEPENDENCIES_LABEL_KEY])
             dependency_keys = [
                 {"key": dependency["key"], "tag": dependency["tag"]}
                 for dependency in dependencies