python3-commons 0.8.19__tar.gz → 0.8.21__tar.gz

{python3_commons-0.8.19/src/python3_commons.egg-info → python3_commons-0.8.21}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.8.19
+Version: 0.8.21
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
-License: gpl-3
+License-Expression: GPL-3.0
 Project-URL: Homepage, https://github.com/kamikaze/python3-commons
 Project-URL: Documentation, https://github.com/kamikaze/python3-commons/wiki
 Classifier: Development Status :: 4 - Beta

{python3_commons-0.8.19 → python3_commons-0.8.21}/pyproject.toml

@@ -9,7 +9,7 @@ description = "Re-usable Python3 code"
 authors = [
     {name = "Oleg Korsak", email = "kamikaze.is.waiting.you@gmail.com"}
 ]
-license = {text = "gpl-3"}
+license = "GPL-3.0"
 readme = {file = "README.rst", content-type = "text/x-rst"}
 classifiers = [
     "Development Status :: 4 - Beta",

{python3_commons-0.8.19 → python3_commons-0.8.21}/src/python3_commons/conf.py

@@ -1,4 +1,4 @@
-from pydantic import Field, HttpUrl, PostgresDsn, RedisDsn, SecretStr
+from pydantic import Field, HttpUrl, PostgresDsn, RedisDsn, SecretStr, model_validator
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
@@ -27,12 +27,39 @@ class DBSettings(BaseSettings):
     model_config = SettingsConfigDict(env_prefix='DB_')
 
     dsn: PostgresDsn | None = Field(default=None, serialization_alias='url')
+    scheme: str = 'postgresql+asyncpg'
+    host: str = 'localhost'
+    port: int = 5432
+    name: str | None = None
+    user: str | None = None
+    password: SecretStr | None = Field(default=None, serialization_alias='pass')
+
     echo: bool = False
     pool_size: int = 20
     max_overflow: int = 0
     pool_timeout: int = 30
     pool_recycle: int = 1800  # 30 minutes
 
+    @model_validator(mode='after')
+    def build_dsn_if_missing(self) -> 'DBSettings':
+        if self.dsn is None and all(
+            (
+                self.user,
+                self.password,
+                self.name,
+            )
+        ):
+            self.dsn = PostgresDsn.build(
+                scheme=self.scheme,
+                username=self.user,
+                password=self.password.get_secret_value() if self.password else None,
+                host=self.host,
+                port=self.port,
+                path=f'/{self.name}',
+            )
+
+        return self
+
 
 class S3Settings(BaseSettings):
     s3_endpoint_url: str | None = None

{python3_commons-0.8.19 → python3_commons-0.8.21/src/python3_commons.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.8.19
+Version: 0.8.21
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
-License: gpl-3
+License-Expression: GPL-3.0
 Project-URL: Homepage, https://github.com/kamikaze/python3-commons
 Project-URL: Documentation, https://github.com/kamikaze/python3-commons/wiki
 Classifier: Development Status :: 4 - Beta

{python3_commons-0.8.19 → python3_commons-0.8.21}/src/python3_commons.egg-info/SOURCES.txt

@@ -38,9 +38,9 @@ src/python3_commons/db/models/__init__.py
 src/python3_commons/db/models/auth.py
 src/python3_commons/db/models/common.py
 src/python3_commons/db/models/rbac.py
-src/python3_commons/logging/__init__.py
-src/python3_commons/logging/filters.py
-src/python3_commons/logging/formatters.py
+src/python3_commons/log/__init__.py
+src/python3_commons/log/filters.py
+src/python3_commons/log/formatters.py
 src/python3_commons/serializers/__init__.py
 src/python3_commons/serializers/json.py
 src/python3_commons/serializers/msgpack.py