rm json_serializer option

Author: pcrespov

packages/settings-library/src/settings_library/utils_cli.py

@@ -70,16 +70,15 @@ def print_as_envfile(
         typer.echo(f"{name}={value}")
 
 
-def print_as_json(
+def _print_as_json(
     settings_obj,
     *,
     compact: bool = False,
     show_secrets: bool,
-    json_serializer,
     **pydantic_export_options,
 ):
     typer.echo(
-        json_serializer(
+        json_dumps(
             model_dump_with_secrets(
                 settings_obj, show_secrets=show_secrets, **pydantic_export_options
             ),
@@ -91,7 +90,6 @@ def print_as_json(
 def create_settings_command(
     settings_cls: type[BaseCustomSettings],
     logger: logging.Logger | None = None,
-    json_serializer=json_dumps,
 ) -> Callable:
     """Creates typer command function for settings"""
 
@@ -117,7 +115,7 @@ def settings(
 
         if as_json_schema:
             typer.echo(
-                json.dumps(
+                json_dumps(
                     settings_cls.model_json_schema(),
                     default=to_jsonable_python,
                     indent=0 if compact else 2,
@@ -129,7 +127,7 @@ def settings(
             settings_obj = settings_cls.create_from_envs()
 
         except ValidationError as err:
-            settings_schema = json.dumps(
+            settings_schema = json_dumps(
                 settings_cls.model_json_schema(),
                 default=to_jsonable_python,
                 indent=2,
@@ -162,11 +160,10 @@ def settings(
         pydantic_export_options: dict[str, Any] = {"exclude_unset": exclude_unset}
 
         if as_json:
-            print_as_json(
+            _print_as_json(
                 settings_obj,
                 compact=compact,
                 show_secrets=show_secrets,
-                json_serializer=json_serializer,
                 **pydantic_export_options,
             )
         else:

packages/settings-library/tests/test_utils_cli.py

@@ -11,16 +11,16 @@
 import pytest
 import typer
 from dotenv import dotenv_values
-from pydantic import Field, SecretStr
+from pydantic import AnyHttpUrl, Field, SecretStr
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_envfile
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from settings_library.base import BaseCustomSettings
 from settings_library.utils_cli import (
+    _print_as_json,
     create_settings_command,
     create_version_callback,
     model_dump_with_secrets,
     print_as_envfile,
-    print_as_json,
 )
 from typer.testing import CliRunner
 
@@ -416,8 +416,9 @@ def test_print_as(capsys: pytest.CaptureFixture):
     class FakeSettings(BaseCustomSettings):
         INTEGER: int = Field(..., description="Some info")
         SECRET: SecretStr
+        URL: AnyHttpUrl
 
-    settings_obj = FakeSettings(INTEGER=1, SECRET="secret")  # type: ignore
+    settings_obj = FakeSettings(INTEGER=1, SECRET="secret", URL="http://google.com")  # type: ignore
 
     print_as_envfile(settings_obj, compact=True, verbose=True, show_secrets=True)
     captured = capsys.readouterr()
@@ -434,9 +435,7 @@ class FakeSettings(BaseCustomSettings):
     assert "secret" not in captured.out
     assert "Some info" not in captured.out
 
-    print_as_json(
-        settings_obj, compact=True, show_secrets=False, json_serializer=json.dumps
-    )
+    _print_as_json(settings_obj, compact=True, show_secrets=False)
     captured = capsys.readouterr()
     assert "secret" not in captured.out
     assert "**" in captured.out

services/payments/src/simcore_service_payments/cli.py

@@ -3,7 +3,6 @@
 import os
 
 import typer
-from common_library.json_serialization import json_dumps
 from servicelib.utils_secrets import generate_password, generate_token_secret_key
 from settings_library.postgres import PostgresSettings
 from settings_library.rabbit import RabbitSettings
@@ -21,9 +20,7 @@
 main = typer.Typer(name=PROJECT_NAME)
 
 main.command()(
-    create_settings_command(
-        settings_cls=ApplicationSettings, logger=_logger, json_serializer=json_dumps
-    )
+    create_settings_command(settings_cls=ApplicationSettings, logger=_logger)
 )
 main.callback()(create_version_callback(__version__))
 

services/storage/src/simcore_service_storage/settings.py

@@ -105,7 +105,7 @@ def _validate_loglevel(cls, value: str) -> str:
         return log_level
 
     @model_validator(mode="after")
-    def ensure_settings_consistency(self) -> Self:
+    def _ensure_settings_consistency(self) -> Self:
         if self.STORAGE_CLEANER_INTERVAL_S is not None and not self.STORAGE_REDIS:
             msg = (
                 "STORAGE_CLEANER_INTERVAL_S cleaner cannot be set without STORAGE_REDIS! "