minor changes

Author: bisgaard-itis

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

@@ -1,14 +1,13 @@
 from functools import cached_property
-from typing import Annotated
+from typing import Annotated, Self
 from urllib.parse import parse_qsl, urlencode, urlparse, urlunparse
 
 from pydantic import (
     AliasChoices,
     Field,
     PostgresDsn,
     SecretStr,
-    ValidationInfo,
-    field_validator,
+    model_validator,
 )
 from pydantic.config import JsonDict
 from pydantic_settings import SettingsConfigDict
@@ -50,13 +49,15 @@ class PostgresSettings(BaseCustomSettings):
         ),
     ] = None
 
-    @field_validator("POSTGRES_MAXSIZE")
-    @classmethod
-    def _check_size(cls, v, info: ValidationInfo):
-        if info.data["POSTGRES_MINSIZE"] > v:
-            msg = f"assert POSTGRES_MINSIZE={info.data['POSTGRES_MINSIZE']} <= POSTGRES_MAXSIZE={v}"
+    @model_validator(mode="after")
+    def validate_postgres_sizes(self) -> Self:
+        if self.POSTGRES_MINSIZE > self.POSTGRES_MAXSIZE:
+            msg = (
+                f"assert POSTGRES_MINSIZE={self.POSTGRES_MINSIZE} <= "
+                f"POSTGRES_MAXSIZE={self.POSTGRES_MAXSIZE}"
+            )
             raise ValueError(msg)
-        return v
+        return self
 
     @cached_property
     def dsn(self) -> str:
@@ -135,3 +136,4 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
         )
 
     model_config = SettingsConfigDict(json_schema_extra=_update_json_schema_extra)
+    model_config = SettingsConfigDict(json_schema_extra=_update_json_schema_extra)

services/api-server/tests/conftest.py

@@ -71,6 +71,9 @@ def default_app_env_vars(
     env_vars["API_SERVER_DEV_FEATURES_ENABLED"] = "1"
     env_vars["API_SERVER_LOG_FORMAT_LOCAL_DEV_ENABLED"] = "1"
     env_vars["API_SERVER_PROMETHEUS_INSTRUMENTATION_ENABLED"] = "0"
+    env_vars["POSTGRES_MINSIZE"] = "2"
+    env_vars["POSTGRES_MAXSIZE"] = "10"
+    env_vars["API_SERVER_CELERY"] = "null"
 
     return env_vars
 

services/api-server/tests/unit/conftest.py

@@ -88,8 +88,6 @@ def app_environment(
             "API_SERVER_HEALTH_CHECK_TASK_PERIOD_SECONDS": "3",
             "API_SERVER_HEALTH_CHECK_TASK_TIMEOUT_SECONDS": "1",
             "API_SERVER_LOG_CHECK_TIMEOUT_SECONDS": "1",
-            "API_SERVER_CELERY": "null",
-            "API_SERVER_WORKER_MODE": "false",
             **backend_env_vars_overrides,
         },
     )
@@ -116,7 +114,6 @@ def mock_missing_plugins(app_environment: EnvVarsDict, mocker: MockerFixture):
             "setup_prometheus_instrumentation",
             autospec=True,
         )
-
     return app_environment