python3-commons 0.7.6__py3-none-any.whl → 0.8.0__py3-none-any.whl

python3_commons/conf.py

@@ -9,7 +9,15 @@ class CommonSettings(BaseSettings):
 
 
 class DBSettings(BaseSettings):
-    db_dsn: PostgresDsn | None = None
+    dsn: PostgresDsn | None = None
+    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):

python3_commons/db/__init__.py

@@ -1,60 +1,72 @@
-import asyncio
 import contextlib
 import logging
-from typing import AsyncGenerator
+from typing import AsyncGenerator, Callable, Mapping
 
-from asyncpg import CannotConnectNowError
-from pydantic import PostgresDsn
 from sqlalchemy import MetaData
-from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession
+from sqlalchemy.ext.asyncio import AsyncSession, AsyncEngine, async_engine_from_config
 from sqlalchemy.ext.asyncio.session import async_sessionmaker
 from sqlalchemy.orm import declarative_base
 
-from python3_commons.conf import db_settings
+from python3_commons.conf import DBSettings
 
 logger = logging.getLogger(__name__)
-
 metadata = MetaData()
 Base = declarative_base(metadata=metadata)
-engine = create_async_engine(
-    str(db_settings.db_dsn),
-    # echo=True,
-    pool_size=20,
-    max_overflow=0,
-    pool_timeout=30,
-    pool_recycle=1800,  # 30 minutes
-)
-async_session_maker = async_sessionmaker(engine, expire_on_commit=False)
 
 
-async def get_async_session() -> AsyncGenerator[AsyncSession, None]:
-    async with async_session_maker() as session:
-        yield session
+class AsyncSessionManager:
+    def __init__(self, config: Mapping[str: DBSettings]):
+        self.config: Mapping[str: DBSettings] = config
+        self.engines: dict[str, AsyncEngine] = {}
+        self.session_makers: dict = {}
+
+    def get_config(self, name: str) -> Mapping[str, str | int]:
+        try:
+            return self.config[name]
+        except KeyError:
+            logger.error(f'Missing database config: {name}')
 
+            raise
 
-get_async_session_context = contextlib.asynccontextmanager(get_async_session)
+    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])
+            self.engines[name] = engine
 
+        return engine
 
-async def is_healthy(pg) -> bool:
-    return await pg.fetchval('SELECT 1 FROM alembic_version;') == 1
+    def get_session_maker(self, name: str):
+        try:
+            session_maker = self.session_makers[name]
+        except KeyError:
+            logger.debug(f'Creating session maker: {name}')
+            engine = self.get_engine(name)
+            session_maker = async_sessionmaker(engine)
+            self.session_makers[name] = session_maker
 
+        return session_maker
 
-async def connect_to_db(database, dsn: PostgresDsn):
-    logger.info('Waiting for services')
-    logger.debug(f'DB_DSN: {dsn}')
-    timeout = 0.001
-    total_timeout = 0
+    def get_async_session(self, name: str) -> Callable[[], AsyncGenerator[AsyncSession, None]]:
+        async def get_session() -> AsyncGenerator[AsyncSession, None]:
+            async with self.get_session_maker(name) as session:
+                yield session
 
-    for i in range(15):
-        try:
-            await database.connect()
-        except (ConnectionRefusedError, CannotConnectNowError):
-            timeout *= 2
-            await asyncio.sleep(timeout)
-            total_timeout += timeout
-        else:
-            break
-    else:
-        msg = f'Unable to connect database for {int(total_timeout)}s'
-        logger.error(msg)
-        raise ConnectionRefusedError(msg)
+        return get_session
+
+    def get_session_context(self, name: str):
+        return contextlib.asynccontextmanager(lambda: self.get_async_session(name)())
+
+
+async def is_healthy(engine: AsyncEngine) -> bool:
+    try:
+        async with engine.begin() as conn:
+            result = await conn.execute('SELECT 1;')
+
+            return result.scalar() == 1
+    except Exception as e:
+        logger.error(f'Database connection is not healthy: {e}')
+
+        return False

{python3_commons-0.7.6.dist-info → python3_commons-0.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.7.6
+Version: 0.8.0
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License: gpl-3
@@ -27,6 +27,7 @@ Requires-Dist: zeep~=4.3.1
 Provides-Extra: testing
 Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pytest-cov; extra == "testing"
+Dynamic: license-file
 
 Re-usable Python3 code
 ======================

{python3_commons-0.7.6.dist-info → python3_commons-0.8.0.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=GAcjlFlloLriZXa9JmNGMtTPzvtHUActYDiE4C1DacU,749
+python3_commons/conf.py,sha256=iikzlfmz7acoB-q30LDpDVn0uqN5x9F1TosnAQu00pc,940
 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=pZk0Fv-Le2sFC-KaVDdJjDDsHtmv-IJz_aFP5o2PGHA,1682
+python3_commons/db/__init__.py,sha256=t9OsJXVbjsNZ0sW_96kzVMac_YKvKSlsrM5oP1uf9Vg,2338
 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.7.6.dist-info/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
-python3_commons-0.7.6.dist-info/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
-python3_commons-0.7.6.dist-info/METADATA,sha256=GtDliyLHNI1Y-zqZCrMXr7ggUb98BhvLffLIu3ROTIs,1127
-python3_commons-0.7.6.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-python3_commons-0.7.6.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
-python3_commons-0.7.6.dist-info/RECORD,,
+python3_commons-0.8.0.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
+python3_commons-0.8.0.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
+python3_commons-0.8.0.dist-info/METADATA,sha256=9JFDLJDERSBAArdTZSDt8TOX35dfQEAqR1Ri8-cXbHo,1149
+python3_commons-0.8.0.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+python3_commons-0.8.0.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
+python3_commons-0.8.0.dist-info/RECORD,,

{python3_commons-0.7.6.dist-info → python3_commons-0.8.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.1.0)
+Generator: setuptools (77.0.3)
 Root-Is-Purelib: true
 Tag: py3-none-any