✨ Refactor: Replace json.dumps with json_dumps for consistency across modules

Author: pcrespov

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

@@ -1,10 +1,10 @@
 import hashlib
-import json
 import logging
 from collections.abc import Callable, Coroutine
 from copy import deepcopy
 from typing import Any
 
+from common_library.json_serialization import json_dumps
 from pydantic import BaseModel, TypeAdapter
 
 from ..projects import Project
@@ -67,6 +67,6 @@ async def compute_node_hash(
     # now create the hash
     # WARNING: Here we cannot change to json_serialization.json_dumps because if would create a different dump string and therefore a different hash
     # NOTE that these hashes might have been already stored elsewhere
-    block_string = json.dumps(resolved_payload, sort_keys=True).encode("utf-8")
+    block_string = json_dumps(resolved_payload, sort_keys=True).encode("utf-8")
     raw_hash = hashlib.sha256(block_string)
     return raw_hash.hexdigest()

packages/postgres-database/src/simcore_postgres_database/models/products.py

@@ -5,10 +5,10 @@
 - Every product has a front-end with exactly the same name
 """
 
-import json
 from typing import Literal
 
 import sqlalchemy as sa
+from common_library.json_serialization import json_dumps
 from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.sql import func
 from typing_extensions import (  # https://docs.pydantic.dev/latest/api/standard_library_types/#typeddict
@@ -114,7 +114,7 @@ class ProductLoginSettingsDict(TypedDict, total=False):
 
 # NOTE: defaults affects migration!!
 LOGIN_SETTINGS_DEFAULT = ProductLoginSettingsDict()  # = {}
-_LOGIN_SETTINGS_SERVER_DEFAULT = json.dumps(LOGIN_SETTINGS_DEFAULT)
+_LOGIN_SETTINGS_SERVER_DEFAULT = json_dumps(LOGIN_SETTINGS_DEFAULT)
 
 
 #

packages/simcore-sdk/src/simcore_sdk/node_ports_common/dbmanager.py

@@ -1,4 +1,3 @@
-import json
 import logging
 import os
 import socket
@@ -9,7 +8,7 @@
 import tenacity
 from aiopg.sa.engine import Engine
 from aiopg.sa.result import RowProxy
-from common_library.json_serialization import json_loads
+from common_library.json_serialization import json_dumps, json_loads
 from models_library.projects import ProjectID
 from models_library.users import UserID
 from servicelib.common_aiopg_utils import DataSourceName, create_pg_engine
@@ -145,7 +144,7 @@ async def get_ports_configuration_from_node_uuid(
             self._db_engine
         ) as engine, engine.acquire() as connection:
             node: RowProxy = await _get_node_from_db(project_id, node_uuid, connection)
-            node_json_config = json.dumps(
+            node_json_config = json_dumps(
                 {
                     "schema": node.schema,
                     "inputs": node.inputs,

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

@@ -1,5 +1,4 @@
-import json
-
+from common_library.json_serialization import json_dumps
 from fastapi import FastAPI
 
 from ..core.settings import ApplicationSettings
@@ -14,7 +13,7 @@ def create_lock_key_and_value(app: FastAPI) -> tuple[str, str]:
             "dynamic",
             *app_settings.AUTOSCALING_NODES_MONITORING.NODES_MONITORING_NODE_LABELS,
         ]
-        lock_value = json.dumps(
+        lock_value = json_dumps(
             {
                 "node_labels": app_settings.AUTOSCALING_NODES_MONITORING.NODES_MONITORING_NODE_LABELS
             }
@@ -24,7 +23,7 @@ def create_lock_key_and_value(app: FastAPI) -> tuple[str, str]:
             "computational",
             f"{app_settings.AUTOSCALING_DASK.DASK_MONITORING_URL}",
         ]
-        lock_value = json.dumps(
+        lock_value = json_dumps(
             {"scheduler_url": f"{app_settings.AUTOSCALING_DASK.DASK_MONITORING_URL}"}
         )
     lock_key = ":".join(f"{k}" for k in lock_key_parts)

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

@@ -1,14 +1,12 @@
-""" Free helper functions for AWS API
+"""Free helper functions for AWS API"""
 
-"""
-
-import json
 import logging
 from collections import OrderedDict
 from collections.abc import Callable
 from textwrap import dedent
 
 from aws_library.ec2 import AWSTagKey, AWSTagValue, EC2InstanceType, EC2Tags, Resources
+from common_library.json_serialization import json_dumps
 
 from .._meta import VERSION
 from ..core.errors import ConfigurationError, TaskBestFittingInstanceNotFoundError
@@ -23,12 +21,12 @@ def get_ec2_tags_dynamic(app_settings: ApplicationSettings) -> EC2Tags:
     return {
         AWSTagKey("io.simcore.autoscaling.version"): AWSTagValue(f"{VERSION}"),
         AWSTagKey("io.simcore.autoscaling.monitored_nodes_labels"): AWSTagValue(
-            json.dumps(
+            json_dumps(
                 app_settings.AUTOSCALING_NODES_MONITORING.NODES_MONITORING_NODE_LABELS
             )
         ),
         AWSTagKey("io.simcore.autoscaling.monitored_services_labels"): AWSTagValue(
-            json.dumps(
+            json_dumps(
                 app_settings.AUTOSCALING_NODES_MONITORING.NODES_MONITORING_SERVICE_LABELS
             )
         ),

services/clusters-keeper/src/simcore_service_clusters_keeper/utils/clusters.py

@@ -1,14 +1,14 @@
 import base64
 import datetime
 import functools
-import json
 from pathlib import Path
 from typing import Any, Final
 
 import arrow
 import yaml
 from aws_library.ec2 import EC2InstanceBootSpecific, EC2InstanceData, EC2Tags
 from aws_library.ec2._models import CommandStr
+from common_library.json_serialization import json_dumps
 from common_library.serialization import model_dump_with_secrets
 from fastapi.encoders import jsonable_encoder
 from models_library.api_schemas_clusters_keeper.clusters import (
@@ -80,7 +80,7 @@ def _convert_to_env_list(entries: list[Any]) -> str:
         return f"[{entries_as_str}]"
 
     def _convert_to_env_dict(entries: dict[str, Any]) -> str:
-        return f"'{json.dumps(jsonable_encoder(entries))}'"
+        return f"'{json_dumps(jsonable_encoder(entries))}'"
 
     assert app_settings.CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES  # nosec
 

services/dask-sidecar/src/simcore_service_dask_sidecar/computational_sidecar/core.py

@@ -1,5 +1,4 @@
 import asyncio
-import json
 import logging
 import os
 import socket
@@ -12,6 +11,7 @@
 from uuid import uuid4
 
 from aiodocker import Docker
+from common_library.json_serialization import json_dumps
 from dask_task_models_library.container_tasks.docker import DockerBasicAuth
 from dask_task_models_library.container_tasks.errors import ServiceRuntimeError
 from dask_task_models_library.container_tasks.io import FileUrl, TaskOutputData
@@ -95,7 +95,7 @@ async def _write_input_data(
         # NOTE: temporary solution until new version is created
         for task in download_tasks:
             await task
-        input_data_file.write_text(json.dumps(local_input_data_file))
+        input_data_file.write_text(json_dumps(local_input_data_file))
 
         await self._publish_sidecar_log("All the input data were downloaded.")
 

services/director-v2/src/simcore_service_director_v2/models/dynamic_services_scheduler.py

@@ -1,4 +1,3 @@
-import json
 import logging
 from collections.abc import Mapping
 from datetime import datetime
@@ -10,6 +9,7 @@
 
 import arrow
 from common_library.error_codes import ErrorCodeStr
+from common_library.json_serialization import json_dumps
 from models_library.api_schemas_directorv2.dynamic_services import DynamicServiceCreate
 from models_library.api_schemas_directorv2.dynamic_services_service import (
     CommonServiceDetails,
@@ -504,7 +504,7 @@ def from_http_request(
             "product_name": service.product_name,
             "paths_mapping": simcore_service_labels.paths_mapping,
             "callbacks_mapping": simcore_service_labels.callbacks_mapping,
-            "compose_spec": json.dumps(simcore_service_labels.compose_spec),
+            "compose_spec": json_dumps(simcore_service_labels.compose_spec),
             "container_http_entry": simcore_service_labels.container_http_entry,
             "restart_policy": simcore_service_labels.restart_policy,
             "dynamic_sidecar_network_name": names_helper.dynamic_sidecar_network_name,
@@ -541,7 +541,7 @@ def as_label_data(self) -> str:
         # compose_spec needs to be json encoded before encoding it to json
         # and storing it in the label
         return self.model_copy(
-            update={"compose_spec": json.dumps(self.compose_spec)},
+            update={"compose_spec": json_dumps(self.compose_spec)},
             deep=True,
         ).model_dump_json()
 

services/director-v2/src/simcore_service_director_v2/modules/dask_client.py

@@ -9,7 +9,6 @@
 """
 
 import asyncio
-import json
 import logging
 import traceback
 from collections.abc import Callable
@@ -21,6 +20,7 @@
 import dask.typing
 import distributed
 from aiohttp import ClientResponseError
+from common_library.json_serialization import json_dumps
 from dask_task_models_library.container_tasks.docker import DockerBasicAuth
 from dask_task_models_library.container_tasks.errors import TaskCancelledError
 from dask_task_models_library.container_tasks.io import (
@@ -162,11 +162,11 @@ async def create(
                 _logger.info(
                     "Connection to %s succeeded [%s]",
                     f"dask-scheduler at {endpoint}",
-                    json.dumps(attempt.retry_state.retry_object.statistics),
+                    json_dumps(attempt.retry_state.retry_object.statistics),
                 )
                 _logger.info(
                     "Scheduler info:\n%s",
-                    json.dumps(backend.client.scheduler_info(), indent=2),
+                    json_dumps(backend.client.scheduler_info(), indent=2),
                 )
                 return instance
         # this is to satisfy pylance
@@ -439,14 +439,14 @@ async def get_tasks_status(self, job_ids: list[str]) -> list[DaskClientTaskState
         def _get_pipeline_statuses(
             dask_scheduler: distributed.Scheduler,
         ) -> dict[dask.typing.Key, DaskSchedulerTaskState | None]:
-            statuses: dict[
-                dask.typing.Key, DaskSchedulerTaskState | None
-            ] = dask_scheduler.get_task_status(keys=job_ids)
+            statuses: dict[dask.typing.Key, DaskSchedulerTaskState | None] = (
+                dask_scheduler.get_task_status(keys=job_ids)
+            )
             return statuses
 
-        task_statuses: dict[
-            dask.typing.Key, DaskSchedulerTaskState | None
-        ] = await self.backend.client.run_on_scheduler(_get_pipeline_statuses)
+        task_statuses: dict[dask.typing.Key, DaskSchedulerTaskState | None] = (
+            await self.backend.client.run_on_scheduler(_get_pipeline_statuses)
+        )
         assert isinstance(task_statuses, dict)  # nosec
 
         _logger.debug("found dask task statuses: %s", f"{task_statuses=}")
@@ -578,10 +578,10 @@ def _get_worker_used_resources(
 
         with log_catch(_logger, reraise=False):
             # NOTE: this runs directly on the dask-scheduler and may rise exceptions
-            used_resources_per_worker: dict[
-                str, dict[str, Any]
-            ] = await dask_utils.wrap_client_async_routine(
-                self.backend.client.run_on_scheduler(_get_worker_used_resources)
+            used_resources_per_worker: dict[str, dict[str, Any]] = (
+                await dask_utils.wrap_client_async_routine(
+                    self.backend.client.run_on_scheduler(_get_worker_used_resources)
+                )
             )
 
             # let's update the scheduler info, with default to 0s since sometimes

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/api_client/_thin.py

@@ -1,6 +1,6 @@
-import json
 from typing import Any
 
+from common_library.json_serialization import json_dumps
 from fastapi import FastAPI, status
 from httpx import Response, Timeout
 from models_library.services_creation import CreateServiceMetricsAdditionalParams
@@ -123,7 +123,7 @@ async def post_containers_ports_outputs_dirs(
     async def get_containers_name(
         self, dynamic_sidecar_endpoint: AnyHttpUrl, *, dynamic_sidecar_network_name: str
     ) -> Response:
-        filters = json.dumps(
+        filters = json_dumps(
             {
                 "network": dynamic_sidecar_network_name,
                 "exclude": SUFFIX_EGRESS_PROXY_NAME,