self/queues
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix' (#18) from master into dev

Browse Source 
Reviewed-on: #18
This commit is contained in:
emmatveev 2024-11-27 02:48:54 +03:00
commit af1bd07d88
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/routers/take.py
View File

@ -25,5 +25,5 @@ class Response(pydantic.BaseModel):
async def execute(queue: typing.Annotated[str, fastapi.Header()]) -> Response:
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, task=Task(id=str(task._id), attempt=task.attempts, payload=task.payload))
return Response(task=None)
return Response(task=Task(id=str(task._id), attempt=task.attempts, payload=task.payload))

3
app/storage/mongo/tasks.py
View File

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