Merge pull request 'master' (#15) from master into dev

Reviewed-on: #15

.deploy/deploy-dev.yaml

@@ -9,8 +9,6 @@ services:
     environment:
       MONGO_HOST: "mongo.develop.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_DEV
-      REDIS_HOST: "redis.develop.sprinthub.ru"
-      REDIS_PASSWORD: $REDIS_PASSWORD_DEV
     deploy:
       mode: replicated
       restart_policy:

.deploy/deploy-prod.yaml

@@ -9,8 +9,6 @@ services:
     environment:
       MONGO_HOST: "mongo.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
-      REDIS_HOST: "redis.sprinthub.ru"
-      REDIS_PASSWORD: $REDIS_PASSWORD_PROD
     deploy:
       mode: replicated
       restart_policy:

.gitea/workflows/deploy-dev.yaml

@@ -40,5 +40,4 @@ jobs:
       - name: deploy
         env:
           MONGO_PASSWORD_DEV: ${{ secrets.MONGO_PASSWORD_DEV }}
-          REDIS_PASSWORD_DEV: ${{ secrets.REDIS_PASSWORD_DEV }}
         run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-dev.yaml infra-development

.gitea/workflows/deploy-prod.yaml

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

app/routers/take.py

@@ -9,16 +9,22 @@ from app.storage import redis
 router = fastapi.APIRouter()
 
 
-class Response(pydantic.BaseModel):
+class Task(pydantic.BaseModel):
     id: str
     attempt: int
     payload: dict
 
 
+class Response(pydantic.BaseModel):
+    id: str
+    attempt: int
+    payload: dict
+    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 redis.database.lock(queue):
-        task = await tasks.take_task(queue)
+    task = await tasks.take_task(queue)
     if not task:
         raise fastapi.HTTPException(404)
-    return Response(id=str(task._id), attempt=task.attempts, payload=task.payload)
+    return Response(id=str(task._id), attempt=task.attempts, payload=task.payload, task=Task(id=str(task._id), attempt=task.attempts, payload=task.payload))

app/storage/redis/__init__.py

@@ -1,9 +0,0 @@
-import os
-import redis.asyncio as connection
-
-
-REDIS_HOST = os.getenv('REDIS_HOST', 'localhost')
-REDIS_PASSWORD = os.getenv('REDIS_PASSWORD')
-
-
-database = connection.Redis(host=REDIS_HOST, password=REDIS_PASSWORD)