Skip to content

fix: validate thing_id before GCS upload to prevent orphaned blobs #698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jirhiker merged 1 commit into from
Jun 8, 2026
Merged

fix: validate thing_id before GCS upload to prevent orphaned blobs #698

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions api/asset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,15 +239,7 @@ async def upload_and_record_asset(
],
)

# ── 3. Upload file to GCS (blocking I/O — run in thread pool) ────────────
uri, blob_name = await run_in_threadpool(gcs_upload, file, bucket)

# ── 4. Return existing record for duplicate file + thing combinations ─────
existing = check_asset_exists(session, blob_name, thing_id=thing_id)
if existing:
return existing

# ── 5. Validate the Thing exists ─────────────────────────────────────────
# ── 3. Validate the Thing exists (before upload to avoid orphaned blobs) ─
thing = session.get(Thing, thing_id)
if thing is None:
raise PydanticStyleException(
Expand All @@ -262,6 +254,14 @@ async def upload_and_record_asset(
],
)

# ── 4. Upload file to GCS (blocking I/O — run in thread pool) ────────────
uri, blob_name = await run_in_threadpool(gcs_upload, file, bucket)

# ── 5. Return existing record for duplicate file + thing combinations ─────
existing = check_asset_exists(session, blob_name, thing_id=thing_id)
if existing:
return existing

# ── 6. Persist the Asset record ───────────────────────────────────────────
asset = Asset(
name=name or file.filename,
Expand Down
Loading