arpakitlib 1.7.210__tar.gz → 1.7.212__tar.gz

{arpakitlib-1.7.210 → arpakitlib-1.7.212}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: arpakitlib
-Version: 1.7.210
+Version: 1.7.212
 Summary: arpakitlib
 License: Apache-2.0
 Keywords: arpakitlib,arpakit,arpakit-company,arpakitcompany,arpakit_company

{arpakitlib-1.7.210 → arpakitlib-1.7.212}/arpakitlib/_arpakit_project_template/src/core/settings.py

@@ -3,6 +3,8 @@ from functools import lru_cache
 from typing import Any
 
 import pytz
+from pydantic import field_validator
+from pydantic_core.core_schema import ValidationInfo
 
 from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str
 from arpakitlib.ar_settings_util import SimpleSettings
@@ -20,14 +22,19 @@ class Settings(SimpleSettings):
 
     sql_db_database: str | None = project_name
 
-    sql_db_url: str | None = (
-        f"postgresql://{sql_db_user}:{sql_db_password}@127.0.0.1:{sql_db_port}/{sql_db_database}"
-    ) if (
-            sql_db_user is not None
-            and sql_db_password is not None
-            and sql_db_port is not None
-            and sql_db_database is not None
-    ) else None
+    sql_db_url: str | None = None
+
+    @field_validator("sql_db_url", mode="after")
+    def validate_sql_db_url(cls, v: Any, validation_info: ValidationInfo) -> str | None:
+        if v is not None:
+            return None
+        user = validation_info.data.get('sql_db_user')
+        password = validation_info.data.get('sql_db_password')
+        port = validation_info.data.get('sql_db_port')
+        database = validation_info.data.get('sql_db_database')
+        if user is not None and password is not None and port is not None and database is not None:
+            return f"postgresql://{user}:{password}@127.0.0.1:{port}/{database}"
+        return None
 
     sql_db_echo: bool = False
 

{arpakitlib-1.7.210 → arpakitlib-1.7.212}/arpakitlib/ar_settings_util.py

@@ -1,8 +1,8 @@
 # arpakit
 
-from typing import Union
+from typing import Union, Any
 
-from pydantic import ConfigDict, field_validator
+from pydantic import ConfigDict, field_validator, model_validator
 from pydantic_core import PydanticUndefined
 from pydantic_settings import BaseSettings
 
@@ -31,6 +31,14 @@ class SimpleSettings(BaseSettings):
 
     mode_type: str = ModeTypes.not_prod
 
+    @model_validator(mode="before")
+    @classmethod
+    def validate_all_fields(cls, values: dict[str, Any]) -> dict[str, Any]:
+        for key, value in values.items():
+            if isinstance(value, str) and value.lower().strip() in {"null", "none", "nil"}:
+                values[key] = None
+        return values
+
     @field_validator("mode_type")
     @classmethod
     def validate_mode_type(cls, v: str):

{arpakitlib-1.7.210 → arpakitlib-1.7.212}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.7.210"
+version = "1.7.212"
 description = "arpakitlib"
 authors = [
     { name = "arpakit", email = "arpakit@gmail.com" },