python3-commons 0.8.2__tar.gz → 0.8.4__tar.gz

{python3_commons-0.8.2/src/python3_commons.egg-info → python3_commons-0.8.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.8.2
+Version: 0.8.4
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License: gpl-3

{python3_commons-0.8.2 → python3_commons-0.8.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python3-commons"
-version = "0.8.2"
+version = "0.8.4"
 description = "Re-usable Python3 code"
 authors = [
     {name = "Oleg Korsak", email = "kamikaze.is.waiting.you@gmail.com"}

{python3_commons-0.8.2 → python3_commons-0.8.4}/src/python3_commons/conf.py

@@ -1,5 +1,5 @@
-from pydantic import SecretStr, PostgresDsn
-from pydantic_settings import BaseSettings
+from pydantic import SecretStr, PostgresDsn, Field
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 class CommonSettings(BaseSettings):
@@ -9,16 +9,15 @@ class CommonSettings(BaseSettings):
 
 
 class DBSettings(BaseSettings):
-    dsn: PostgresDsn | None = None
+    model_config = SettingsConfigDict(env_prefix='DB_')
+
+    dsn: PostgresDsn | None = Field(default=None, serialization_alias='url')
     echo: bool = False
     pool_size: int = 20
     max_overflow: int = 0
     pool_timeout: int = 30
     pool_recycle: int = 1800  # 30 minutes
 
-    class Config:
-        env_prefix = 'DB_'
-
 
 class S3Settings(BaseSettings):
     s3_endpoint_url: str | None = None

{python3_commons-0.8.2 → python3_commons-0.8.4}/src/python3_commons/db/__init__.py

@@ -15,25 +15,31 @@ Base = declarative_base(metadata=metadata)
 
 
 class AsyncSessionManager:
-    def __init__(self, config: Mapping[str: DBSettings]):
-        self.config: Mapping[str: DBSettings] = config
+    def __init__(self, db_settings: Mapping[str, DBSettings]):
+        self.db_settings: Mapping[str, DBSettings] = db_settings
         self.engines: dict[str, AsyncEngine] = {}
         self.session_makers: dict = {}
 
-    def get_config(self, name: str) -> Mapping[str, str | int]:
+    def get_db_settings(self, name: str) -> DBSettings:
         try:
-            return self.config[name]
+            return self.db_settings[name]
         except KeyError:
-            logger.error(f'Missing database config: {name}')
+            logger.error(f'Missing database settings: {name}')
 
             raise
 
+    def async_engine_from_db_settings(self, name):
+        db_settings = self.get_db_settings(name)
+        engine = async_engine_from_config(db_settings.model_dump(by_alias=True))
+
+        return engine
+
     def get_engine(self, name: str) -> AsyncEngine:
         try:
             engine = self.engines[name]
         except KeyError:
             logger.debug(f'Creating engine: {name}')
-            engine = async_engine_from_config(self.config[name])
+            engine = self.async_engine_from_db_settings(name)
             self.engines[name] = engine
 
         return engine

{python3_commons-0.8.2 → python3_commons-0.8.4/src/python3_commons.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.8.2
+Version: 0.8.4
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License: gpl-3