From cee69acbdc29325dd58c40ae9d304c14fe87e86a Mon Sep 17 00:00:00 2001 From: hailt Date: Thu, 12 Nov 2026 22:44:22 +0700 Subject: [PATCH] feat: process uploads through Redis worker and SSE --- models/tables.py | 2 ++ src/main.py | 3 +++ src/services/upload_jobs.py | 19 +++++++++---------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/models/tables.py b/models/tables.py index 017a7aa..1d95c68 100644 --- a/models/tables.py +++ b/models/tables.py @@ -144,6 +144,8 @@ class UploadItem(Base): file_name: Mapped[str] = mapped_column(String(1024)) content_type: Mapped[str] = mapped_column(String(255), default="application/octet-stream") size: Mapped[int] = mapped_column(Integer, default=0) + width: Mapped[int] = mapped_column(Integer, default=0, server_default="0") + height: Mapped[int] = mapped_column(Integer, default=0, server_default="0") r2_key: Mapped[str] = mapped_column(String(1024)) status: Mapped[str] = mapped_column(String(32), default="pending", index=True) image_id: Mapped[str | None] = mapped_column(String(64), nullable=True) diff --git a/src/main.py b/src/main.py index 164f15a..fc33bc8 100644 --- a/src/main.py +++ b/src/main.py @@ -8,6 +8,7 @@ from fastapi.middleware.cors import CORSMiddleware from fastapi.responses import JSONResponse from shared import events +from shared import upload_worker from shared.logger import get_logger from shared.tracing import TraceMiddleware from shared.traffic import TrafficMiddleware @@ -23,8 +24,10 @@ log = get_logger("danagble") @asynccontextmanager async def lifespan(app: FastAPI): drainer = asyncio.create_task(events.drain_forever()) + uploader = asyncio.create_task(upload_worker.run_forever()) yield drainer.cancel() + uploader.cancel() app = FastAPI(title=s.app_name, lifespan=lifespan) diff --git a/src/services/upload_jobs.py b/src/services/upload_jobs.py index b8e6b50..37c9bbd 100644 --- a/src/services/upload_jobs.py +++ b/src/services/upload_jobs.py @@ -79,21 +79,20 @@ async def complete_item(job_id: str, item_id: str, width: int, height: int, raise HTTPException(404, "upload job not found") if item.status == "done": return {**_job_dict(job), "imageId": item.image_id} + if item.status == "uploaded": + return _job_dict(job) if not r2.head_exists(item.r2_key): item.status = "error" item.error = "object not found in storage" job.failed_files += 1 await db.commit() raise HTTPException(400, item.error) - image = Image(project_id=item.project_id, file_name=item.file_name, - r2_key=item.r2_key, width=width, height=height, - status="unassigned", flags={}) - db.add(image) - item.status = "done" - item.image_id = image.id + item.status = "uploaded" + item.width = width + item.height = height job.uploaded_files += 1 - job.processed_files += 1 - if job.processed_files + job.failed_files >= job.total_files: - job.status = "done" if job.failed_files == 0 else "partial_error" + job.status = "processing" await db.commit() - return {**_job_dict(job), "imageId": image.id} + from shared.upload_worker import enqueue + await enqueue(item.id) + return _job_dict(job)