Release

db/python/connect.py

@@ -8,7 +8,6 @@
 import json
 import logging
 import os
-from threading import Lock
 
 import databases
 
@@ -18,8 +17,6 @@
 logging.basicConfig(level=logging.DEBUG)
 logger = logging.getLogger(__name__)
 
-audit_log_lock = Lock()
-
 TABLES_ORDERED_BY_FK_DEPS = [
     'project',
     'group',
@@ -62,6 +59,7 @@ def __init__(
         self.meta = meta
 
         self._audit_log_id: int | None = None
+        self._audit_log_lock = asyncio.Lock()
 
     async def audit_log_id(self):
         """Get audit_log ID for write operations, cached per connection"""
@@ -70,7 +68,7 @@ async def audit_log_id(self):
                 'Trying to get a audit_log ID, but not a write connection'
             )
 
-        with audit_log_lock:
+        async with self._audit_log_lock:
             if not self._audit_log_id:
                 # pylint: disable=import-outside-toplevel
                 # make this import here, otherwise we'd have a circular import

models/models/analysis.py

@@ -85,10 +85,10 @@ def to_external(self):
 class Analysis(BaseModel):
     """Model for Analysis"""
 
-    id: int | None
     type: str
     status: AnalysisStatus
-    output: str = None
+    id: int | None = None
+    output: str | None = None
     sequencing_group_ids: list[str] = []
     author: str | None = None
     timestamp_completed: str | None = None