Skip to content

Commit 281fe55

Browse files
committed
✨ Refactor: Replace json.loads with json_loads for consistency across modules
1 parent bc53255 commit 281fe55

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

packages/service-library/src/servicelib/aiohttp/rest_middlewares.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
SEE https://gist.github.com/amitripshtos/854da3f4217e3441e8fceea85b0cbd91
44
"""
55

6-
import json
76
import logging
87
from collections.abc import Awaitable, Callable
98
from typing import Any, Union
@@ -12,7 +11,7 @@
1211
from aiohttp.web_request import Request
1312
from aiohttp.web_response import StreamResponse
1413
from common_library.error_codes import create_error_code
15-
from common_library.json_serialization import json_dumps
14+
from common_library.json_serialization import json_dumps, json_loads
1615
from models_library.rest_error import ErrorGet, ErrorItemType, LogMessageType
1716

1817
from ..logging_errors import create_troubleshotting_log_kwargs
@@ -107,7 +106,7 @@ async def _middleware_handler(request: web.Request, handler: Handler):
107106
err.content_type = MIMETYPE_APPLICATION_JSON
108107
if err.text:
109108
try:
110-
payload = json.loads(err.text)
109+
payload = json_loads(err.text)
111110
if not is_enveloped_from_map(payload):
112111
payload = wrap_as_envelope(data=payload)
113112
err.text = json_dumps(payload)

packages/service-library/src/servicelib/rest_responses.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
from collections.abc import Mapping
33
from typing import Any
44

5+
from common_library.json_serialization import json_loads
6+
57
_ENVELOPE_KEYS = ("data", "error")
68

79

@@ -11,7 +13,7 @@ def is_enveloped_from_map(payload: Mapping) -> bool:
1113

1214
def is_enveloped_from_text(text: str) -> bool:
1315
try:
14-
payload = json.loads(text)
16+
payload = json_loads(text)
1517
except json.decoder.JSONDecodeError:
1618
return False
1719
return is_enveloped_from_map(payload)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import tenacity
1010
from aiopg.sa.engine import Engine
1111
from aiopg.sa.result import RowProxy
12+
from common_library.json_serialization import json_loads
1213
from models_library.projects import ProjectID
1314
from models_library.users import UserID
1415
from servicelib.common_aiopg_utils import DataSourceName, create_pg_engine
@@ -113,7 +114,7 @@ async def write_ports_configuration(
113114
)
114115
log.debug(message)
115116

116-
node_configuration = json.loads(json_configuration)
117+
node_configuration = json_loads(json_configuration)
117118
async with DBContextManager(
118119
self._db_engine
119120
) as engine, engine.acquire() as connection:

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import asyncio
2-
import json
32
import logging
43
from collections.abc import AsyncGenerator, Coroutine
54
from contextlib import AsyncExitStack
@@ -17,6 +16,7 @@
1716
ClientSession,
1817
RequestInfo,
1918
)
19+
from common_library.json_serialization import json_loads
2020
from models_library.api_schemas_storage.storage_schemas import (
2121
ETag,
2222
FileUploadSchema,
@@ -143,8 +143,7 @@ class ProgressData:
143143

144144
@runtime_checkable
145145
class LogRedirectCB(Protocol):
146-
async def __call__(self, log: str) -> None:
147-
...
146+
async def __call__(self, log: str) -> None: ...
148147

149148

150149
async def _file_chunk_writer(
@@ -276,7 +275,7 @@ async def _session_put(
276275
assert response.status == status.HTTP_200_OK # nosec
277276
assert response.headers # nosec
278277
assert "Etag" in response.headers # nosec
279-
etag: str = json.loads(response.headers["Etag"])
278+
etag: str = json_loads(response.headers["Etag"])
280279
return etag
281280

282281

packages/simcore-sdk/src/simcore_sdk/node_ports_v2/serialization_v2.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import functools
2-
import json
32
import logging
43
from pprint import pformat
54
from typing import Any
65

76
import pydantic
8-
from common_library.json_serialization import json_dumps
7+
from common_library.json_serialization import json_dumps, json_loads
98
from models_library.projects_nodes_io import NodeID
109
from models_library.utils.nodes import compute_node_hash
1110
from packaging import version
@@ -50,7 +49,7 @@ async def load(
5049
port_config_str: str = await db_manager.get_ports_configuration_from_node_uuid(
5150
project_id, node_uuid
5251
)
53-
port_cfg = json.loads(port_config_str)
52+
port_cfg = json_loads(port_config_str)
5453

5554
log.debug(f"{port_cfg=}") # pylint: disable=logging-fstring-interpolation
5655
if any(k not in port_cfg for k in NODE_REQUIRED_KEYS):

0 commit comments

Comments
 (0)