Merge pull request 'fix' (#29) from master into prod

Reviewed-on: #29

.deploy/deploy-dev.yaml

@@ -7,7 +7,7 @@ services:
     networks:
       - queues-development
     environment:
-      MONGO_HOST: "mongo.dev.chocomarsh.com"
+      MONGO_HOST: "mongo.develop.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_DEV
       STAGE: "development"
     deploy:

.deploy/deploy-prod.yaml

@@ -7,7 +7,7 @@ services:
     networks:
       - queues
     environment:
-      MONGO_HOST: "mongo.chocomarsh.com"
+      MONGO_HOST: "mongo.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
       STAGE: "production"
     deploy:

app/routers/take.py

@@ -1,5 +1,3 @@
-import asyncio
-import collections
 import fastapi
 import pydantic
 import typing
@@ -7,7 +5,7 @@ import typing
 from app.storage.mongo import tasks
 
 
-locks = collections.defaultdict(asyncio.Lock)
+DEFAULT_RETRY_AFTER = 0.2
 router = fastapi.APIRouter()
 
 
@@ -21,10 +19,13 @@ class Response(pydantic.BaseModel):
     task: Task|None
 
 
-@router.get('/api/v1/take', responses={404: {'description': 'Not found'}})
+@router.get('/api/v1/take')
 async def execute(queue: typing.Annotated[str, fastapi.Header()]) -> Response:
-    async with locks[queue]:
+    try:
         task = await tasks.take_task(queue)
-    if not task:
+        if not task:
+            return Response(task=None)
+        return Response(task=Task(id=str(task._id), attempt=task.attempts, payload=task.payload))
+    except Exception as e:
+        print("GOT ERROR", e)
         return Response(task=None)
-    return Response(task=Task(id=str(task._id), attempt=task.attempts, payload=task.payload))

main.py

@@ -14,14 +14,8 @@ app.include_router(take.router)
 app.include_router(put.router)
 app.include_router(finish.router)
 
-@app.exception_handler(Exception)
-async def unicorn_exception_handler(request: fastapi.Request, exc: Exception):
-    return fastapi.JSONResponse(
-        status_code=500,
-        content={"message": f"Oops! {exc.name} did something. There goes a rainbow... {exc}"},
-    )
-
 mongo.create_indexes()
 
+
 if __name__ == '__main__':
     uvicorn.run(app, host="0.0.0.0", port=1239)

requirements.txt

@@ -5,40 +5,20 @@ certifi==2024.12.14
 charset-normalizer==3.4.1
 click==8.1.7
 dnspython==2.7.0
-email_validator==2.2.0
 fastapi==0.115.4
-fastapi-cli==0.0.7
 h11==0.14.0
-httpcore==1.0.7
-httptools==0.6.4
-httpx==0.28.1
 idna==3.10
-Jinja2==3.1.5
-markdown-it-py==3.0.0
-MarkupSafe==3.0.2
-mdurl==0.1.2
 motor==3.6.0
 pydantic==2.9.2
 pydantic_core==2.23.4
-Pygments==2.18.0
 pymongo==4.9.2
-python-dotenv==1.0.1
-python-multipart==0.0.20
 pytz==2024.2
-PyYAML==6.0.2
 redis==5.2.0
 requests==2.32.3
-rich==13.9.4
-rich-toolkit==0.12.0
-shellingham==1.5.4
 six==1.16.0
 sniffio==1.3.1
 starlette==0.41.2
-typer==0.15.1
 typing_extensions==4.12.2
 tzlocal==5.2
 urllib3==2.3.0
 uvicorn==0.32.0
-uvloop==0.21.0
-watchfiles==1.0.3
-websockets==14.1