replaces json.loads

Author: pcrespov

services/director-v2/src/simcore_service_director_v2/modules/db/repositories/projects_networks.py

@@ -1,7 +1,6 @@
-import json
-
 import sqlalchemy as sa
 from aiopg.sa.result import RowProxy
+from common_library.json_serialization import json_loads
 from models_library.projects import ProjectID
 from models_library.projects_networks import NetworksWithAliases, ProjectsNetworks
 from sqlalchemy.dialects.postgresql import insert as pg_insert
@@ -33,7 +32,7 @@ async def upsert_projects_networks(
         )
 
         async with self.db_engine.acquire() as conn:
-            row_data = json.loads(projects_networks_to_insert.model_dump_json())
+            row_data = json_loads(projects_networks_to_insert.model_dump_json())
             insert_stmt = pg_insert(projects_networks).values(**row_data)
             upsert_snapshot = insert_stmt.on_conflict_do_update(
                 constraint=projects_networks.primary_key, set_=row_data

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

@@ -3,6 +3,7 @@
 from collections import deque
 from typing import Any, cast
 
+from common_library.json_serialization import json_loads
 from models_library.basic_types import EnvVarKey, PortInt
 from models_library.boot_options import BootOption
 from models_library.docker import (
@@ -156,11 +157,15 @@ def update_service_params_from_settings(
     container_spec = create_service_params["task_template"]["ContainerSpec"]
     # set labels for CPU and Memory limits, for both service and container labels
     # NOTE: cpu-limit is a float not NanoCPUs!!
-    container_spec["Labels"][
-        f"{to_simcore_runtime_docker_label_key('cpu-limit')}"
-    ] = str(
-        float(create_service_params["task_template"]["Resources"]["Limits"]["NanoCPUs"])
-        / (1 * 10**9)
+    container_spec["Labels"][f"{to_simcore_runtime_docker_label_key('cpu-limit')}"] = (
+        str(
+            float(
+                create_service_params["task_template"]["Resources"]["Limits"][
+                    "NanoCPUs"
+                ]
+            )
+            / (1 * 10**9)
+        )
     )
     create_service_params["labels"][
         f"{to_simcore_runtime_docker_label_key('cpu-limit')}"
@@ -401,7 +406,7 @@ def _get_boot_options(
     if boot_options_encoded is None:
         return None
 
-    boot_options = json.loads(boot_options_encoded)["boot-options"]
+    boot_options = json_loads(boot_options_encoded)["boot-options"]
     log.debug("got boot_options=%s", boot_options)
     return {k: BootOption.model_validate(v) for k, v in boot_options.items()}
 
@@ -443,13 +448,13 @@ async def get_labels_for_involved_services(
     # paths_mapping express how to map dynamic-sidecar paths to the compose-spec volumes
     # where the service expects to find its certain folders
 
-    labels_for_involved_services: dict[
-        str, SimcoreServiceLabels
-    ] = await _extract_osparc_involved_service_labels(
-        catalog_client=catalog_client,
-        service_key=service_key,
-        service_tag=service_tag,
-        service_labels=simcore_service_labels,
+    labels_for_involved_services: dict[str, SimcoreServiceLabels] = (
+        await _extract_osparc_involved_service_labels(
+            catalog_client=catalog_client,
+            service_key=service_key,
+            service_tag=service_tag,
+            service_labels=simcore_service_labels,
+        )
     )
     logging.info("labels_for_involved_services=%s", labels_for_involved_services)
     return labels_for_involved_services

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/scheduler/_core/_events_utils.py

@@ -1,10 +1,10 @@
 # pylint: disable=relative-beyond-top-level
 
 import asyncio
-import json
 import logging
 from typing import TYPE_CHECKING, Any, cast
 
+from common_library.json_serialization import json_loads
 from fastapi import FastAPI
 from models_library.api_schemas_long_running_tasks.base import ProgressPercent
 from models_library.products import ProductName
@@ -565,7 +565,7 @@ async def _restore_service_state_with_metrics() -> None:
             scheduler_data.key, scheduler_data.version
         )
     )
-    service_outputs_labels = json.loads(
+    service_outputs_labels = json_loads(
         simcore_service_labels.model_dump().get("io.simcore.outputs", "{}")
     ).get("outputs", {})
     _logger.debug(

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/api/frontend/routes/_index.py

@@ -1,6 +1,7 @@
 import json
 
 import httpx
+from common_library.json_serialization import json_loads
 from fastapi import FastAPI
 from models_library.projects_nodes_io import NodeID
 from nicegui import APIRouter, app, ui
@@ -39,7 +40,7 @@ def _render_service_details(node_id: NodeID, service: TrackedServiceModel) -> No
             service.dynamic_service_start.product_name,
         )
         service_status = (
-            json.loads(service.service_status) if service.service_status else {}
+            json_loads(service.service_status) if service.service_status else {}
         )
         dict_to_render["Service State"] = (
             "label",

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/api/frontend/routes/_service.py

@@ -1,6 +1,7 @@
 import json
 
 import httpx
+from common_library.json_serialization import json_loads
 from models_library.api_schemas_dynamic_scheduler.dynamic_services import (
     DynamicServiceStop,
 )
@@ -89,7 +90,7 @@ async def service_details(node_id: NodeID):
 
         scheduler_internals = service_model.model_dump(mode="json")
         service_status = scheduler_internals.pop("service_status", "{}")
-        service_status = json.loads("{}" if service_status == "" else service_status)
+        service_status = json_loads("{}" if service_status == "" else service_status)
         dynamic_service_start = scheduler_internals.pop("dynamic_service_start")
 
         ui.markdown("**Service Status**")

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/api/rest/containers.py

@@ -1,10 +1,10 @@
 # pylint: disable=too-many-arguments
 
-import json
 import logging
 from asyncio import Lock
 from typing import Annotated, Any, Final
 
+from common_library.json_serialization import json_loads
 from fastapi import APIRouter, Depends, HTTPException
 from fastapi import Path as PathParam
 from fastapi import Query, Request, status
@@ -234,7 +234,7 @@ async def get_containers_name(
     """
     _ = request
 
-    filters_dict: dict[str, str] = json.loads(filters)
+    filters_dict: dict[str, str] = json_loads(filters)
     if not isinstance(filters_dict, dict):
         raise HTTPException(
             status.HTTP_422_UNPROCESSABLE_ENTITY,

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/core/validation.py

@@ -1,11 +1,11 @@
-import json
 import logging
 import os
 import re
 from collections.abc import Generator
 from typing import Any, NamedTuple
 
 import yaml
+from common_library.json_serialization import json_loads
 from servicelib.docker_constants import (
     DEFAULT_USER_SERVICES_NETWORK_NAME,
     SUFFIX_EGRESS_PROXY_NAME,
@@ -53,7 +53,7 @@ def _get_forwarded_env_vars(container_key: str) -> list[str]:
             new_entry_key = key.replace("FORWARD_ENV_", "")
 
             # parsing `VAR={"destination_containers": ["destination_container"], "env_var": "PAYLOAD"}`
-            new_entry_payload = json.loads(os.environ[key])
+            new_entry_payload = json_loads(os.environ[key])
             if container_key not in new_entry_payload["destination_containers"]:
                 continue
 

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/modules/nodeports.py

@@ -14,6 +14,7 @@
 import magic
 from aiofiles.os import remove
 from aiofiles.tempfile import TemporaryDirectory as AioTemporaryDirectory
+from common_library.json_serialization import json_loads
 from models_library.projects import ProjectIDStr
 from models_library.projects_nodes_io import NodeIDStr
 from models_library.services_types import ServicePortKey
@@ -208,7 +209,7 @@ async def _archive_dir_notified(
             else:
                 data_file = outputs_path / _KEY_VALUE_FILE_NAME
                 if data_file.exists():
-                    data = json.loads(data_file.read_text())
+                    data = json_loads(data_file.read_text())
                     if port.key in data and data[port.key] is not None:
                         ports_values[port.key] = (data[port.key], None)
                     else:
@@ -390,7 +391,7 @@ async def _get_date_from_port_notified(
     if data:
         data_file = target_dir / _KEY_VALUE_FILE_NAME
         if data_file.exists():
-            current_data = json.loads(data_file.read_text())
+            current_data = json_loads(data_file.read_text())
             # merge data
             data = {**current_data, **data}
         data_file.write_text(json.dumps(data))

services/storage/src/simcore_service_storage/utils/simcore_s3_dsm_utils.py

@@ -7,6 +7,7 @@
 from aws_library.s3 import S3MetaData, SimcoreS3API
 from aws_library.s3._constants import STREAM_READER_CHUNK_SIZE
 from aws_library.s3._models import S3ObjectKey
+from common_library.json_serialization import json_loads
 from models_library.api_schemas_storage.storage_schemas import S3BucketName
 from models_library.projects import ProjectID, ProjectIDStr
 from models_library.projects_nodes_io import (
@@ -250,7 +251,7 @@ async def list_child_paths_from_s3(
     """
     objects_cursor = None
     if cursor is not None:
-        cursor_params = orjson.loads(cursor)
+        cursor_params = json_loads(cursor)
         assert cursor_params["file_filter"] == f"{file_filter}"  # nosec
         objects_cursor = cursor_params["objects_next_cursor"]
     list_s3_objects, objects_next_cursor = await s3_client.list_objects(

services/web/server/src/simcore_service_webserver/db_listener/_db_comp_tasks_listening_task.py

@@ -4,7 +4,6 @@
 """
 
 import asyncio
-import json
 import logging
 from collections.abc import AsyncIterator
 from contextlib import suppress
@@ -14,6 +13,7 @@
 from aiohttp import web
 from aiopg.sa import Engine
 from aiopg.sa.connection import SAConnection
+from commontypes.json_serialization import json_loads
 from models_library.errors import ErrorDict
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID
@@ -152,7 +152,7 @@ async def _listen(app: web.Application, db_engine: Engine) -> NoReturn:
                 continue
             notification = conn.connection.notifies.get_nowait()
             # get the data and the info on what changed
-            payload = _CompTaskNotificationPayload(**json.loads(notification.payload))
+            payload = _CompTaskNotificationPayload(**json_loads(notification.payload))
             _logger.debug("received update from database: %s", f"{payload=}")
             await _handle_db_notification(app, payload, conn)