mirror of
https://github.com/nomadkaraoke/karaoke-gen.git
synced 2026-11-20 13:07:57 +09:00
## Summary Two invisible upload failures on the same song led to this: - **Job 8729f19a**: large audio upload (signed-URL flow) abandoned mid-upload. The only UI signal was the "Creating..." button text and the card already said "Setting up", so the job sat `pending` forever with the credit spent. - **Job 2d0c1ae0**: 44 MB instrumental upload on the review screen was a multipart POST through Cloud Run (32 MiB cap) and failed silently. Only the CORS preflight was logged. ## Changes **Shared upload layer (frontend)**: all user uploads now go through one path: - `lib/upload.ts`: signed-URL PUT with progress, sequential multi-file upload with aggregate progress, client-side duration check. - `hooks/useUploadTask.ts`: progress state plus a `beforeunload` guard. - `components/upload/UploadProgressModal.tsx`: a modal the user can't close, showing progress, speed, ETA, "file N of M" and a keep-tab-open warning. - Used by guided job creation, tenant single job and instrumental review. Tenant bulk keeps its per-row table and uses the shared guard. **Guided flow** - Always uses the signed-URL path, which also fixes `requires_audio_edit` being silently dropped for uploads of 25MB or more. - Private upload jobs can attach their own instrumental (`existing_instrumental`). This skips separation and instrumental review. The duration is checked before upload, and the backing-vocals option is hidden. **Instrumental review** - New `instrumental-upload-url` and `instrumental-upload-complete` endpoints: direct-to-GCS upload, then a finalize step. - One shared processing helper with the multipart route: duration check, FLAC conversion, `stems.custom_instrumental`. - Returns a signed `audio_url`. The old post-upload preview URL had no backend route. - Inline error plus toast for mismatches and failures. **Backend robustness** - `state_data.awaiting_upload`: the dashboard shows "Waiting for upload" instead of "Setting up". - The hourly stale-review run also cancels and refunds non-tenant jobs still awaiting upload after 2h with nothing uploaded. - `uploads-complete` now checks ownership (previously any signed-in user could finalize any pending job). On an instrumental duration mismatch it cancels and refunds the job instead of stranding it. ## Testing - `make test`: backend 1839 + 4788 + 150 emulator passed; frontend Jest 1391 passed across 117 suites. - New tests: - backend: stale-upload processor; signed instrumental endpoints (15 cases); `requires_audio_edit` persistence; uploads-complete ownership and cancel-on-mismatch - frontend: upload lib, `useUploadTask`, modal (speed/ETA, can't be dismissed), `OwnInstrumentalField`, `TenantJobFlow`, API flows - Manual check against the real frontend (local dev, prod read-only; create, upload and finalize endpoints mocked, uploads sent to a throttled local PUT server, so no prod data was changed): - guided flow with and without an instrumental - instrumental review upload on 2d0c1ae0, including a mismatch caught before upload - Escape and outside clicks don't close the modal; navigating away triggers the `beforeunload` prompt Plan: `docs/archive/2026-09-26-unified-upload-flow-plan.md` 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
148 lines
5.3 KiB
Python
148 lines
5.3 KiB
Python
"""
|
|
Unit tests for the stale upload processor — signed-URL upload jobs whose
|
|
browser upload never finished get cancelled (refunding the credit).
|
|
"""
|
|
|
|
import sys
|
|
from datetime import datetime, timedelta, timezone
|
|
from unittest.mock import MagicMock, Mock, patch
|
|
|
|
import pytest
|
|
|
|
sys.modules.setdefault('google.cloud.firestore', MagicMock())
|
|
sys.modules.setdefault('google.cloud.storage', MagicMock())
|
|
|
|
from backend.models.job import JobStatus
|
|
from backend.workers import stale_upload_processor
|
|
from backend.workers.stale_upload_processor import (
|
|
CANCEL_REASON,
|
|
STALE_PARTIAL_UPLOAD_HOURS,
|
|
STALE_UPLOAD_HOURS,
|
|
process_stale_uploads,
|
|
)
|
|
|
|
|
|
def _make_job(job_id="job-1", hours_ago=STALE_UPLOAD_HOURS + 1, awaiting_upload=True, tenant_id="", naive=False, batch_id=None):
|
|
job = Mock()
|
|
job.job_id = job_id
|
|
job.status = JobStatus.PENDING
|
|
job.tenant_id = tenant_id
|
|
created = datetime.now(timezone.utc) - timedelta(hours=hours_ago)
|
|
job.created_at = created.replace(tzinfo=None) if naive else created
|
|
job.state_data = {'awaiting_upload': True} if awaiting_upload else {}
|
|
if batch_id:
|
|
job.state_data['batch_id'] = batch_id
|
|
return job
|
|
|
|
|
|
@pytest.fixture
|
|
def services():
|
|
firestore = Mock()
|
|
job_manager = Mock()
|
|
job_manager.cancel_job.return_value = True
|
|
storage = Mock()
|
|
storage.list_files.return_value = []
|
|
with patch.object(stale_upload_processor, 'FirestoreService', return_value=firestore), \
|
|
patch.object(stale_upload_processor, 'JobManager', return_value=job_manager), \
|
|
patch.object(stale_upload_processor, 'StorageService', return_value=storage):
|
|
yield firestore, job_manager, storage
|
|
|
|
|
|
def test_cancels_stale_awaiting_upload_job(services):
|
|
firestore, job_manager, storage = services
|
|
firestore.list_jobs.return_value = [_make_job()]
|
|
|
|
result = process_stale_uploads()
|
|
|
|
firestore.list_jobs.assert_called_once_with(status=JobStatus.PENDING, limit=500)
|
|
storage.list_files.assert_called_once_with("uploads/job-1/")
|
|
job_manager.cancel_job.assert_called_once_with("job-1", reason=CANCEL_REASON)
|
|
assert result["cancelled"] == 1
|
|
assert result["errors"] == []
|
|
|
|
|
|
def test_handles_naive_created_at(services):
|
|
firestore, job_manager, _ = services
|
|
firestore.list_jobs.return_value = [_make_job(naive=True)]
|
|
|
|
assert process_stale_uploads()["cancelled"] == 1
|
|
|
|
|
|
def test_skips_recent_job_still_uploading(services):
|
|
firestore, job_manager, _ = services
|
|
# Signed PUTs can stream long after the URL "expires" — don't cancel mid-upload
|
|
firestore.list_jobs.return_value = [_make_job(hours_ago=STALE_UPLOAD_HOURS - 0.5)]
|
|
|
|
assert process_stale_uploads()["cancelled"] == 0
|
|
job_manager.cancel_job.assert_not_called()
|
|
|
|
|
|
def test_skips_pending_jobs_not_awaiting_upload(services):
|
|
"""URL/search jobs are also PENDING briefly — never touch them."""
|
|
firestore, job_manager, _ = services
|
|
firestore.list_jobs.return_value = [_make_job(hours_ago=10, awaiting_upload=False)]
|
|
|
|
process_stale_uploads()
|
|
job_manager.cancel_job.assert_not_called()
|
|
|
|
|
|
def test_skips_tenant_bulk_jobs(services):
|
|
"""Tenant bulk uploads use resumable sessions resumable for days."""
|
|
firestore, job_manager, _ = services
|
|
firestore.list_jobs.return_value = [_make_job(tenant_id="vocalstar", batch_id="b-1")]
|
|
|
|
process_stale_uploads()
|
|
job_manager.cancel_job.assert_not_called()
|
|
|
|
|
|
def test_cancels_stale_tenant_single_job(services):
|
|
"""Tenant single-job uploads use single-shot signed PUTs — abandoned ones are swept."""
|
|
firestore, job_manager, _ = services
|
|
firestore.list_jobs.return_value = [_make_job(tenant_id="vocalstar")]
|
|
|
|
process_stale_uploads()
|
|
job_manager.cancel_job.assert_called_once_with("job-1", reason=CANCEL_REASON)
|
|
|
|
|
|
def test_partial_upload_gets_grace_period(services):
|
|
firestore, job_manager, storage = services
|
|
firestore.list_jobs.return_value = [_make_job(hours_ago=STALE_PARTIAL_UPLOAD_HOURS - 1)]
|
|
storage.list_files.return_value = ["uploads/job-1/audio/song.wav"]
|
|
|
|
result = process_stale_uploads()
|
|
|
|
job_manager.cancel_job.assert_not_called()
|
|
assert result["skipped_has_files"] == 1
|
|
|
|
|
|
def test_one_job_error_does_not_stop_sweep(services):
|
|
firestore, job_manager, storage = services
|
|
firestore.list_jobs.return_value = [_make_job("bad"), _make_job("good")]
|
|
storage.list_files.side_effect = [RuntimeError("gcs down"), []]
|
|
|
|
result = process_stale_uploads()
|
|
|
|
job_manager.cancel_job.assert_called_once_with("good", reason=CANCEL_REASON)
|
|
assert result["cancelled"] == 1
|
|
assert len(result["errors"]) == 1
|
|
|
|
|
|
def test_query_failure_returns_error(services):
|
|
firestore, job_manager, _ = services
|
|
firestore.list_jobs.side_effect = RuntimeError("firestore down")
|
|
|
|
result = process_stale_uploads()
|
|
|
|
assert result["status"] == "error"
|
|
job_manager.cancel_job.assert_not_called()
|
|
|
|
|
|
def test_partial_upload_cancelled_after_grace_period(services):
|
|
"""e.g. mix landed but the instrumental PUT failed: don't strand it forever."""
|
|
firestore, job_manager, storage = services
|
|
firestore.list_jobs.return_value = [_make_job(hours_ago=STALE_PARTIAL_UPLOAD_HOURS + 1)]
|
|
storage.list_files.return_value = ["uploads/job-1/audio/song.wav"]
|
|
|
|
assert process_stale_uploads()["cancelled"] == 1
|
|
job_manager.cancel_job.assert_called_once_with("job-1", reason=CANCEL_REASON)
|