Merge pull request 'up' (#2) from master into dev

Reviewed-on: #2

.deploy/deploy-dev.yaml

@@ -2,14 +2,14 @@ version: "3.4"
 
 
 services:
-  queues:
+  queues-nginx:
     image: mathwave/sprint-repo:queues
     networks:
-      - queues-development
+      - common-infra-nginx
     environment:
       MONGO_HOST: "mongo.develop.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_DEV
-      STAGE: "development"
+      QUEUES_TOKEN: $QUEUES_TOKEN_DEV
     deploy:
       mode: replicated
       restart_policy:
@@ -19,5 +19,5 @@ services:
         order: start-first
 
 networks:
-  queues-development:
+  common-infra-nginx:
     external: true

.deploy/deploy-prod.yaml

@@ -2,14 +2,14 @@ version: "3.4"
 
 
 services:
-  queues:
+  queues-nginx:
     image: mathwave/sprint-repo:queues
     networks:
-      - queues
+      - common-infra-nginx
     environment:
       MONGO_HOST: "mongo.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
-      STAGE: "production"
+      QUEUES_TOKEN: $QUEUES_TOKEN_PROD
     deploy:
       mode: replicated
       restart_policy:
@@ -19,5 +19,5 @@ services:
         order: start-first
 
 networks:
-  queues:
+  common-infra-nginx:
     external: true

.gitea/workflows/deploy-dev.yaml

@@ -28,7 +28,7 @@ jobs:
         run: docker push mathwave/sprint-repo:queues
   deploy-dev:
     name: Deploy dev
-    runs-on: [prod]
+    runs-on: [dev]
     needs: push
     steps:
       - name: login
@@ -40,4 +40,5 @@ jobs:
       - name: deploy
         env:
           MONGO_PASSWORD_DEV: ${{ secrets.MONGO_PASSWORD_DEV }}
-        run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-dev.yaml infra-development
+          QUEUES_TOKEN_DEV: ${{ secrets.QUEUES_TOKEN_DEV }}
+        run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-dev.yaml infra

.gitea/workflows/deploy-prod.yaml

@@ -40,4 +40,5 @@ jobs:
       - name: deploy
         env:
           MONGO_PASSWORD_PROD: ${{ secrets.MONGO_PASSWORD_PROD }}
+          QUEUES_TOKEN_PROD: ${{ secrets.QUEUES_TOKEN_PROD }}
         run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-prod.yaml infra

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12
+FROM python:3.10
 
 RUN mkdir /usr/src/app
 WORKDIR /usr/src/app
@@ -8,6 +8,4 @@ RUN pip install -r requirements.txt
 
 COPY . .
 
-ENV PYTHONUNBUFFERED=1
-
 ENTRYPOINT ["python", "main.py"]

app/middlewares/check_token.py

@@ -0,0 +1,13 @@
+import fastapi
+import os
+
+
+QUEUES_TOKEN = os.getenv('QUEUES_TOKEN')
+
+class CheckToken:
+    async def __call__(self, request: fastapi.Request, call_next):
+        if QUEUES_TOKEN:
+            token = request.headers.get('X-Queues-Token')
+            if not token or token != QUEUES_TOKEN:
+                raise fastapi.HTTPException(403)
+        return await call_next(request)

app/routers/take.py

@@ -1,5 +1,3 @@
-import asyncio
-import collections
 import fastapi
 import pydantic
 import typing
@@ -7,24 +5,18 @@ import typing
 from app.storage.mongo import tasks
 
 
-locks = collections.defaultdict(asyncio.Lock)
 router = fastapi.APIRouter()
 
 
-class Task(pydantic.BaseModel):
+class Response(pydantic.BaseModel):
     id: str
     attempt: int
     payload: dict
 
 
-class Response(pydantic.BaseModel):
-    task: Task|None
-
-
 @router.get('/api/v1/take', responses={404: {'description': 'Not found'}})
 async def execute(queue: typing.Annotated[str, fastapi.Header()]) -> Response:
-    async with locks[queue]:
-        task = await tasks.take_task(queue)
+    task = await tasks.take_task(queue)
     if not task:
-        return Response(task=None)
-    return Response(task=Task(id=str(task._id), attempt=task.attempts, payload=task.payload))
+        raise fastapi.HTTPException(404)
+    return Response(id=str(task._id), attempt=task.attempts, payload=task.payload)

app/storage/mongo/tasks.py

@@ -1,6 +1,8 @@
+import asyncio
 import bson
 import datetime
 import pydantic
+import typing
 
 from app.storage.mongo import database
 from app.utils import time
@@ -26,7 +28,7 @@ async def add_task(task: Task) -> str:
     return result.inserted_id
 
 
-async def take_task(queue: str) -> Task|None:
+async def take_task(queue: str) -> typing.Optional[Task]:
     now = time.now()
     async for raw_task in collection.find({'queue': queue, 'available_from': {'$lte': now}}):
         task = Task.model_validate(raw_task)

main.py

@@ -1,6 +1,8 @@
 import fastapi
 import uvicorn
 
+from app.middlewares import check_token
+
 from app.routers import take
 from app.routers import put
 from app.routers import finish
@@ -8,20 +10,16 @@ from app.routers import finish
 from app.storage import mongo
 
 
-app = fastapi.FastAPI(debug=True)
+app = fastapi.FastAPI()
+
+app.add_middleware(check_token.CheckToken())
 
 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)
+    uvicorn.run(app, host="0.0.0.0", port=1238)

requirements.txt

@@ -1,44 +1,20 @@
 annotated-types==0.7.0
 anyio==4.6.2.post1
 APScheduler==3.10.4
-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