logdetective 2.4.1__py3-none-any.whl → 2.5.0__py3-none-any.whl

logdetective/server/database/base.py

@@ -1,15 +1,14 @@
 from os import getenv
-from contextlib import contextmanager
-from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker, declarative_base
-
+from contextlib import asynccontextmanager
+from sqlalchemy.orm import declarative_base
+from sqlalchemy.ext.asyncio import create_async_engine, async_sessionmaker
 from logdetective import logger
 
 
 def get_pg_url() -> str:
     """create postgresql connection string"""
     return (
-        f"postgresql+psycopg2://{getenv('POSTGRESQL_USER')}"
+        f"postgresql+asyncpg://{getenv('POSTGRESQL_USER')}"
         f":{getenv('POSTGRESQL_PASSWORD')}@{getenv('POSTGRESQL_HOST', 'postgres')}"
         f":{getenv('POSTGRESQL_PORT', '5432')}/{getenv('POSTGRESQL_DATABASE')}"
     )
@@ -23,13 +22,13 @@ sqlalchemy_echo = getenv("SQLALCHEMY_ECHO", "False").lower() in (
     "y",
     "1",
 )
-engine = create_engine(get_pg_url(), echo=sqlalchemy_echo)
-SessionFactory = sessionmaker(autoflush=True, bind=engine)
+engine = create_async_engine(get_pg_url(), echo=sqlalchemy_echo)
+SessionFactory = async_sessionmaker(autoflush=True, bind=engine)  # pylint: disable=invalid-name
 Base = declarative_base()
 
 
-@contextmanager
-def transaction(commit: bool = False):
+@asynccontextmanager
+async def transaction(commit: bool = False):
     """
     Context manager for 'framing' a db transaction.
 
@@ -39,27 +38,30 @@ def transaction(commit: bool = False):
     """
 
     session = SessionFactory()
-    try:
-        yield session
-        if commit:
-            session.commit()
-    except Exception as ex:
-        logger.warning("Exception while working with database: %s", str(ex))
-        session.rollback()
-        raise
-    finally:
-        session.close()
+    async with session:
+        try:
+            yield session
+            if commit:
+                await session.commit()
+        except Exception as ex:
+            logger.warning("Exception while working with database: %s", str(ex))
+            await session.rollback()
+            raise
+        finally:
+            await session.close()
 
 
-def init():
+async def init():
     """Init db"""
-    Base.metadata.create_all(engine)
+    async with engine.begin() as conn:
+        await conn.run_sync(Base.metadata.create_all)
     logger.debug("Database initialized")
 
 
-def destroy():
+async def destroy():
     """Destroy db"""
-    Base.metadata.drop_all(engine)
+    async with engine.begin() as conn:
+        await conn.run_sync(Base.metadata.drop_all)
     logger.warning("Database cleaned")
 
 

logdetective/server/database/models/koji.py

@@ -1,5 +1,5 @@
 from datetime import datetime, timedelta, timezone
-from sqlalchemy import Column, BigInteger, DateTime, ForeignKey, Integer, String
+from sqlalchemy import Column, BigInteger, DateTime, ForeignKey, Integer, String, select
 from sqlalchemy.orm import relationship
 from sqlalchemy.exc import OperationalError
 import backoff
@@ -26,7 +26,7 @@ class KojiTaskAnalysis(Base):
     task_id = Column(BigInteger, nullable=False, index=True, unique=True)
     log_file_name = Column(String(255), nullable=False, index=True)
     request_received_at = Column(
-        DateTime,
+        DateTime(timezone=True),
         nullable=False,
         index=True,
         default=datetime.now(timezone.utc),
@@ -43,20 +43,22 @@ class KojiTaskAnalysis(Base):
 
     @classmethod
     @backoff.on_exception(backoff.expo, OperationalError, max_tries=DB_MAX_RETRIES)
-    def create_or_restart(cls, koji_instance: str, task_id: int, log_file_name: str):
+    async def create_or_restart(
+        cls, koji_instance: str, task_id: int, log_file_name: str
+    ):
         """Create a new koji task analysis"""
-        with transaction(commit=True) as session:
+        query = select(cls).filter(
+            cls.koji_instance == koji_instance, cls.task_id == task_id
+        )
+        async with transaction(commit=True) as session:
             # Check if the task analysis already exists
-            koji_task_analysis = (
-                session.query(cls)
-                .filter_by(koji_instance=koji_instance, task_id=task_id)
-                .first()
-            )
+            query_result = await session.execute(query)
+            koji_task_analysis = query_result.first()
             if koji_task_analysis:
                 # If it does, update the request_received_at timestamp
                 koji_task_analysis.request_received_at = datetime.now(timezone.utc)
                 session.add(koji_task_analysis)
-                session.flush()
+                await session.flush()
                 return
 
             # If it doesn't, create a new one
@@ -65,14 +67,19 @@ class KojiTaskAnalysis(Base):
             koji_task_analysis.task_id = task_id
             koji_task_analysis.log_file_name = log_file_name
             session.add(koji_task_analysis)
-            session.flush()
+            await session.flush()
 
     @classmethod
     @backoff.on_exception(backoff.expo, OperationalError, max_tries=DB_MAX_RETRIES)
-    def add_response(cls, task_id: int, metric_id: int):
+    async def add_response(cls, task_id: int, metric_id: int):
         """Add a response to a koji task analysis"""
-        with transaction(commit=True) as session:
-            koji_task_analysis = session.query(cls).filter_by(task_id=task_id).first()
+        query = select(cls).filter(cls.task_id == task_id)
+        metrics_query = select(AnalyzeRequestMetrics).filter(
+            AnalyzeRequestMetrics.id == metric_id
+        )
+        async with transaction(commit=True) as session:
+            query_result = await session.execute(query)
+            koji_task_analysis = query_result.scalars().first()
             # Ensure that the task analysis doesn't already have a response
             if koji_task_analysis.response:
                 # This is probably due to an analysis that took so long that
@@ -81,20 +88,20 @@ class KojiTaskAnalysis(Base):
                 # returned to the consumer, so we'll just drop this extra one
                 # on the floor and keep the one saved in the database.
                 return
-
-            metric = (
-                session.query(AnalyzeRequestMetrics).filter_by(id=metric_id).first()
-            )
+            metrics_query_result = await session.execute(metrics_query)
+            metric = metrics_query_result.scalars().first()
             koji_task_analysis.response = metric
             session.add(koji_task_analysis)
-            session.flush()
+            await session.flush()
 
     @classmethod
     @backoff.on_exception(backoff.expo, OperationalError, max_tries=DB_MAX_RETRIES)
-    def get_response_by_task_id(cls, task_id: int) -> KojiStagedResponse:
+    async def get_response_by_task_id(cls, task_id: int) -> KojiStagedResponse:
         """Get a koji task analysis by task id"""
-        with transaction(commit=False) as session:
-            koji_task_analysis = session.query(cls).filter_by(task_id=task_id).first()
+        query = select(cls).filter(cls.task_id == task_id)
+        async with transaction(commit=False) as session:
+            query_result = await session.execute(query)
+            koji_task_analysis = query_result.scalars().first()
             if not koji_task_analysis:
                 raise KojiTaskNotFoundError(f"Task {task_id} not yet analyzed")