Remove sqs_manager singleton (#43)

app/application.py

@@ -18,7 +18,7 @@
 from app.config import settings
 from app.errors import ApiError, ApiErrorCode
 from app.logger import L
-from app.queue.session import sqs_manager
+from app.queue.session import SQSManager
 from app.schema.api import ErrorResponse
 
 
@@ -31,6 +31,7 @@ async def lifespan(_: FastAPI) -> AsyncIterator[dict[str, Any]]:
         os.cpu_count(),
         settings.ENVIRONMENT,
     )
+    sqs_manager = SQSManager()
     sqs_manager.configure(
         queue_names=[
             settings.SQS_LONGRUN_QUEUE_NAME,
@@ -41,7 +42,7 @@ async def lifespan(_: FastAPI) -> AsyncIterator[dict[str, Any]]:
     )
     try:
         async with sqs_manager:
-            yield {}
+            yield {"sqs_manager": sqs_manager}
     except asyncio.CancelledError as err:
         # this can happen if the task is cancelled without sending SIGINT
         L.info("Ignored {} in lifespan", err)

app/dependencies.py

@@ -5,9 +5,10 @@
 
 from fastapi import Depends
 from sqlalchemy.ext.asyncio import AsyncSession
+from starlette.requests import Request
 
 from app.db.session import database_session_manager
-from app.queue.session import SQSManager, sqs_manager
+from app.queue.session import SQSManager
 from app.repository.group import RepositoryGroup
 
 
@@ -22,9 +23,9 @@ def _repo_group(db: "SessionDep") -> RepositoryGroup:
     return RepositoryGroup(db=db)
 
 
-def _sqs_manager() -> SQSManager:
+def _sqs_manager(request: Request) -> SQSManager:
     """Return the SQS manager."""
-    return sqs_manager
+    return request.state.sqs_manager
 
 
 SessionDep = Annotated[AsyncSession, Depends(_database_session_factory)]

app/queue/session.py

@@ -79,6 +79,3 @@ def client(self) -> AioBaseClient:
     def queue_urls(self) -> dict[str, str]:
         """Return the dict of queue urls."""
         return self._queue_urls
-
-
-sqs_manager = SQSManager()