python3-commons 0.7.6__tar.gz → 0.8.0__tar.gz

{python3_commons-0.7.6/src/python3_commons.egg-info → python3_commons-0.8.0}/PKG-INFO

@@ -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 → python3_commons-0.8.0}/pyproject.toml

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

{python3_commons-0.7.6 → python3_commons-0.8.0}/src/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-0.8.0/src/python3_commons/db/__init__.py

@@ -0,0 +1,72 @@
+import contextlib
+import logging
+from typing import AsyncGenerator, Callable, Mapping
+
+from sqlalchemy import MetaData
+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 DBSettings
+
+logger = logging.getLogger(__name__)
+metadata = MetaData()
+Base = declarative_base(metadata=metadata)
+
+
+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
+
+    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
+
+    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
+
+    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
+
+        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 → python3_commons-0.8.0/src/python3_commons.egg-info}/PKG-INFO

@@ -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/src/python3_commons/db/__init__.py

@@ -1,60 +0,0 @@
-import asyncio
-import contextlib
-import logging
-from typing import AsyncGenerator
-
-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.session import async_sessionmaker
-from sqlalchemy.orm import declarative_base
-
-from python3_commons.conf import db_settings
-
-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
-
-
-get_async_session_context = contextlib.asynccontextmanager(get_async_session)
-
-
-async def is_healthy(pg) -> bool:
-    return await pg.fetchval('SELECT 1 FROM alembic_version;') == 1
-
-
-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
-
-    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)