python3-commons 0.8.2__py3-none-any.whl → 0.8.4__py3-none-any.whl

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/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.dist-info → python3_commons-0.8.4.dist-info}/METADATA

@@ -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.dist-info → python3_commons-0.8.4.dist-info}/RECORD

@@ -1,12 +1,12 @@
 python3_commons/__init__.py,sha256=0KgaYU46H_IMKn-BuasoRN3C4Hi45KlkHHoPbU9cwiA,189
 python3_commons/api_client.py,sha256=zj6zTF-DhUMu4bjj9VWLi63mVODG_SB47Q5qlmG-Sxg,4539
 python3_commons/audit.py,sha256=DMQ-nrWSs0qilD7wkz_8PV4jXcee75O8FgAm2YIuOiY,6256
-python3_commons/conf.py,sha256=p1wBPbDR8x6MgY7Lc707RVBnpVXVM9UotjYCgM2Qqls,935
+python3_commons/conf.py,sha256=jRk6kraRHVXsajmUPl0NjcZsH4_MgrN1IHlzdg06cSw,1015
 python3_commons/fs.py,sha256=wfLjybXndwLqNlOxTpm_HRJnuTcC4wbrHEOaEeCo9Wc,337
 python3_commons/helpers.py,sha256=OmuCF7UeJ6oe-rH1Y4ZYVW_uPQ973lCLsikj01wmNqs,3101
 python3_commons/object_storage.py,sha256=Bte49twIJ4l6VAzIqK6tLx7DFYwijErUmmhWkrZpSJE,4074
 python3_commons/permissions.py,sha256=V6kT7gBQ0fZRDQwreM9es90BvvpB3gUofuqnFvx2g-o,1553
-python3_commons/db/__init__.py,sha256=t9OsJXVbjsNZ0sW_96kzVMac_YKvKSlsrM5oP1uf9Vg,2338
+python3_commons/db/__init__.py,sha256=DCerYVTjJn0Xy-yDfGG5JGRB9xaq9YuDwdFmnFcm9rc,2554
 python3_commons/db/helpers.py,sha256=0z-pXAxQg0KqrqfoUcRooRHNrrKi-g2mSO6euVMscpE,1891
 python3_commons/db/models/__init__.py,sha256=AeeTLUqdqQrhCTi14ACWO0ccyVyWFppZVtCeWShSvR0,193
 python3_commons/db/models/auth.py,sha256=ctHiz_5x17TdXac7a3SjfuZ0-nEgnxK7RwKOY8qflZc,1195
@@ -19,9 +19,9 @@ python3_commons/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 python3_commons/serializers/json.py,sha256=P288wWz9ic38QWEMrpp_uwKPYkQiOgvE1cI4WZn6ZCg,808
 python3_commons/serializers/msgpack.py,sha256=tzIGGyDL3UpZnnouCtnxuYDx6InKM_C3PP1N4PN8wd4,1269
 python3_commons/serializers/msgspec.py,sha256=FuZVqOLJb0-lEKrs7dtjhwEbHIpfMUk5yu1hD64zRdc,2038
-python3_commons-0.8.2.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
-python3_commons-0.8.2.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
-python3_commons-0.8.2.dist-info/METADATA,sha256=c2z0yPdsGqXzarP4t2XV11C6_11SLfHjPhXg8Yvi2nk,1149
-python3_commons-0.8.2.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-python3_commons-0.8.2.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
-python3_commons-0.8.2.dist-info/RECORD,,
+python3_commons-0.8.4.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
+python3_commons-0.8.4.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
+python3_commons-0.8.4.dist-info/METADATA,sha256=hGEad9-rtB4j7n17p9tkMgRnHZlMEMcIA2_Mw3j2-PQ,1149
+python3_commons-0.8.4.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+python3_commons-0.8.4.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
+python3_commons-0.8.4.dist-info/RECORD,,