mirror of
https://github.com/nomadkaraoke/karaoke-gen.git
synced 2026-11-21 05:18:08 +09:00
Compare commits
74
Commits
No files matched your search
@@ -20,17 +20,26 @@ Then use GitHub tools to find the PR for this branch in the `nomadkaraoke/karaok
|
||||
|
||||
### 2. Fetch CodeRabbit Comments
|
||||
|
||||
Get all review comments and regular comments on the PR:
|
||||
Get all reviews, review comments, and regular comments on the PR:
|
||||
|
||||
**Review Comments (Potential Issues)**
|
||||
- Use `pull_request_read` with `method: "get_review_comments"` to get all review comment threads
|
||||
- Look for comments from the `coderabbitai` bot user
|
||||
- These are typically marked as "Potential issue" and MUST be resolved before merge
|
||||
**PR Reviews (MOST IMPORTANT - Contains Nitpicks and Issues)**
|
||||
- Use `pull_request_read` with `method: "get_reviews"` to get all PR reviews
|
||||
- Look for reviews from the `coderabbitai[bot]` user
|
||||
- The review `body` field contains the detailed analysis with:
|
||||
- "Nitpick comments" section with specific code suggestions
|
||||
- "Potential issues" flagged in the diff
|
||||
- Code improvement suggestions with file paths and line numbers
|
||||
- **This is the primary source of CodeRabbit feedback** - parse this carefully
|
||||
|
||||
**PR Comments (Including Nitpicks)**
|
||||
**Review Comments (Inline Code Comments)**
|
||||
- Use `pull_request_read` with `method: "get_review_comments"` to get inline code comments
|
||||
- These are comments attached to specific lines in the diff
|
||||
- Also check for `coderabbitai[bot]` comments here
|
||||
|
||||
**PR Comments (Summary)**
|
||||
- Use `pull_request_read` with `method: "get_comments"` to get regular PR comments
|
||||
- CodeRabbit posts a summary comment that includes "Nitpick comments" section
|
||||
- These should also be reviewed and considered for action
|
||||
- CodeRabbit posts a walkthrough/summary comment here
|
||||
- Less actionable than the review body, but may contain additional context
|
||||
|
||||
### 3. Analyze Each Comment
|
||||
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
---
|
||||
description: Maintain git worktrees - identify merged PRs for cleanup and rename generic branches
|
||||
allowed-tools: Read, Glob, Grep, Bash, mcp__github__list_pull_requests, mcp__github__pull_request_read, mcp__github__get_me, mcp__github__search_pull_requests, AskUserQuestion
|
||||
---
|
||||
|
||||
# Git Worktree Maintenance
|
||||
|
||||
You are performing maintenance on the project's git worktrees.
|
||||
|
||||
## Process
|
||||
|
||||
### 1. List All Worktrees
|
||||
Run `git worktree list` to see all current worktrees.
|
||||
|
||||
### 2. Get PR Status for Each Branch
|
||||
For each worktree (excluding main), check the PR status:
|
||||
- Use `gh pr list --state all --limit 50 --json number,title,headRefName,state,mergedAt` to get PR info
|
||||
- Match each worktree branch to its PR
|
||||
- Identify: MERGED (can cleanup), OPEN (keep), NO PR (investigate)
|
||||
|
||||
### 3. Categorize Worktrees
|
||||
|
||||
**Can be cleaned up (PRs merged):**
|
||||
- List worktrees where the associated PR has been merged
|
||||
- These are safe to remove with `git worktree remove <path>`
|
||||
|
||||
**Outstanding/WIP (keep):**
|
||||
- List worktrees with open PRs
|
||||
- Check if the worktree name is descriptive or generic (e.g., "work-20251230-151202", "session-YYYY-MM-DD-HHMM")
|
||||
- For generic names, read the PR title/description to suggest a better name
|
||||
|
||||
**No PR found:**
|
||||
- Flag these for user attention - may be abandoned work or local-only branches
|
||||
|
||||
### 4. Present Findings
|
||||
|
||||
Show a summary table:
|
||||
```
|
||||
## Can be cleaned up (merged):
|
||||
| Worktree | Branch | PR # |
|
||||
|----------|--------|------|
|
||||
|
||||
## Outstanding PRs (keep):
|
||||
| Worktree | Branch | PR # | Suggested Rename |
|
||||
|----------|--------|------|------------------|
|
||||
|
||||
## No PR found:
|
||||
| Worktree | Branch | Notes |
|
||||
|----------|--------|-------|
|
||||
```
|
||||
|
||||
### 5. Ask User for Action
|
||||
|
||||
Use AskUserQuestion to ask what to do:
|
||||
- Clean up all merged worktrees?
|
||||
- Rename generic worktree names to descriptive ones?
|
||||
- Investigate worktrees with no PR?
|
||||
|
||||
### 6. Execute Cleanup
|
||||
|
||||
If user approves:
|
||||
|
||||
**Removing merged worktrees:**
|
||||
```bash
|
||||
git worktree remove <path>
|
||||
```
|
||||
If there are uncommitted changes, check if they're already in main before force-removing.
|
||||
|
||||
**Renaming worktrees:**
|
||||
```bash
|
||||
mv <old-path> <new-path>
|
||||
git worktree repair <new-path>
|
||||
git worktree prune
|
||||
```
|
||||
|
||||
### 7. Final Verification
|
||||
|
||||
Run `git worktree list` again to confirm the final state.
|
||||
|
||||
## Important Notes
|
||||
|
||||
- Never remove the main worktree
|
||||
- Always check for uncommitted changes before removing
|
||||
- If a worktree has changes not in main, offer to create a PR first
|
||||
- Generic names to watch for: `work-YYYYMMDD-*`, `session-YYYY-MM-DD-*`, `feature/work-*`
|
||||
- Good descriptive names should reflect the PR content (e.g., `log-timing-analyzer`, `e2e-completion`)
|
||||
+95
-38
@@ -31,7 +31,6 @@ jobs:
|
||||
package: ${{ steps.filter.outputs.package }}
|
||||
infra: ${{ steps.filter.outputs.infra }}
|
||||
deps: ${{ steps.filter.outputs.deps }}
|
||||
buy_site: ${{ steps.filter.outputs.buy_site }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
@@ -51,8 +50,6 @@ jobs:
|
||||
- 'infrastructure/**'
|
||||
deps:
|
||||
- 'poetry.lock'
|
||||
buy_site:
|
||||
- 'buy-site/**'
|
||||
|
||||
- name: Summary
|
||||
run: |
|
||||
@@ -64,7 +61,6 @@ jobs:
|
||||
echo "| Package | ${{ steps.filter.outputs.package }} |" >> $GITHUB_STEP_SUMMARY
|
||||
echo "| Infrastructure | ${{ steps.filter.outputs.infra }} |" >> $GITHUB_STEP_SUMMARY
|
||||
echo "| Dependencies | ${{ steps.filter.outputs.deps }} |" >> $GITHUB_STEP_SUMMARY
|
||||
echo "| Buy Site | ${{ steps.filter.outputs.buy_site }} |" >> $GITHUB_STEP_SUMMARY
|
||||
|
||||
# ============================================
|
||||
# FRONTEND TESTS (PRs only - main skips tests)
|
||||
@@ -101,6 +97,81 @@ jobs:
|
||||
path: frontend/coverage/
|
||||
retention-days: 7
|
||||
|
||||
frontend-e2e-smoke:
|
||||
name: "Frontend - E2E Smoke (~2 min)"
|
||||
runs-on: ubuntu-latest
|
||||
needs: changes
|
||||
# Quick smoke tests run on every PR with frontend changes
|
||||
if: github.ref != 'refs/heads/main' && needs.changes.outputs.frontend == 'true'
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Node.js with caching
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '20'
|
||||
cache: 'npm'
|
||||
cache-dependency-path: frontend/package-lock.json
|
||||
|
||||
- name: Install dependencies
|
||||
working-directory: frontend
|
||||
run: npm ci --legacy-peer-deps
|
||||
|
||||
- name: Install Playwright browsers
|
||||
working-directory: frontend
|
||||
run: npx playwright install --with-deps chromium
|
||||
|
||||
- name: Run smoke tests only
|
||||
working-directory: frontend
|
||||
run: npx playwright test smoke.spec.ts --project=chromium --reporter=line
|
||||
|
||||
- name: Upload Playwright report
|
||||
if: failure()
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: playwright-smoke-report
|
||||
path: frontend/playwright-report/
|
||||
retention-days: 7
|
||||
|
||||
frontend-e2e-full:
|
||||
name: "Frontend - E2E Full"
|
||||
runs-on: [self-hosted, linux, gcp]
|
||||
needs: changes
|
||||
# Full E2E suite only runs when PR has 'e2e' label (on-demand)
|
||||
if: >-
|
||||
github.ref != 'refs/heads/main' &&
|
||||
needs.changes.outputs.frontend == 'true' &&
|
||||
contains(github.event.pull_request.labels.*.name, 'e2e')
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Node.js with caching
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '20'
|
||||
cache: 'npm'
|
||||
cache-dependency-path: frontend/package-lock.json
|
||||
|
||||
- name: Install dependencies
|
||||
working-directory: frontend
|
||||
run: npm ci --legacy-peer-deps
|
||||
|
||||
- name: Install Playwright browsers
|
||||
working-directory: frontend
|
||||
run: npx playwright install --with-deps chromium
|
||||
|
||||
- name: Run full E2E tests
|
||||
working-directory: frontend
|
||||
run: npx playwright test --reporter=list -x
|
||||
|
||||
- name: Upload Playwright report
|
||||
if: failure()
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: playwright-report
|
||||
path: frontend/playwright-report/
|
||||
retention-days: 7
|
||||
|
||||
frontend-build:
|
||||
name: "Frontend - Build"
|
||||
runs-on: ubuntu-latest
|
||||
@@ -404,13 +475,16 @@ jobs:
|
||||
ci-gate:
|
||||
name: "CI Gate"
|
||||
runs-on: ubuntu-latest
|
||||
needs: [frontend-unit-tests, frontend-build, package-unit-tests, package-integration-tests, backend-unit-tests, backend-emulator-tests, backend-lint]
|
||||
# Note: frontend-e2e-full is optional (requires 'e2e' label) so not included here
|
||||
# frontend-e2e-smoke IS required - fast smoke tests catch critical regressions
|
||||
needs: [frontend-unit-tests, frontend-e2e-smoke, frontend-build, package-unit-tests, package-integration-tests, backend-unit-tests, backend-emulator-tests, backend-lint]
|
||||
if: github.ref != 'refs/heads/main' && always()
|
||||
steps:
|
||||
- name: Check results
|
||||
run: |
|
||||
results=(
|
||||
"${{ needs.frontend-unit-tests.result }}"
|
||||
"${{ needs.frontend-e2e-smoke.result }}"
|
||||
"${{ needs.frontend-build.result }}"
|
||||
"${{ needs.package-unit-tests.result }}"
|
||||
"${{ needs.package-integration-tests.result }}"
|
||||
@@ -628,37 +702,9 @@ jobs:
|
||||
id: deployment
|
||||
uses: actions/deploy-pages@v4
|
||||
|
||||
deploy-buy-site:
|
||||
name: "Deploy - Buy Site (Cloudflare Pages)"
|
||||
runs-on: ubuntu-latest
|
||||
if: github.ref == 'refs/heads/main' && github.event_name == 'push'
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Node.js with caching
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '20'
|
||||
cache: 'npm'
|
||||
cache-dependency-path: buy-site/package-lock.json
|
||||
|
||||
- name: Install dependencies
|
||||
working-directory: buy-site
|
||||
run: npm ci
|
||||
|
||||
- name: Build buy-site (Next.js static export)
|
||||
working-directory: buy-site
|
||||
env:
|
||||
NEXT_PUBLIC_API_URL: https://api.nomadkaraoke.com
|
||||
run: npm run build
|
||||
|
||||
- name: Deploy to Cloudflare Pages
|
||||
uses: cloudflare/wrangler-action@v3
|
||||
with:
|
||||
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
|
||||
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
|
||||
command: pages deploy buy-site/out --project-name=nomadkaraoke-buy --branch=main
|
||||
# NOTE: buy-site was consolidated into the main frontend (PR #122, Dec 2024)
|
||||
# Landing page and payment flow are now at gen.nomadkaraoke.com (root)
|
||||
# buy.nomadkaraoke.com subdomain has been deleted
|
||||
|
||||
deploy-backend:
|
||||
name: "Deploy - Backend (Cloud Run)"
|
||||
@@ -733,8 +779,19 @@ jobs:
|
||||
BASE_IMAGE="${{ env.REGISTRY }}/${{ env.PROJECT_ID }}/${{ env.REPOSITORY }}/${{ env.BASE_IMAGE_NAME }}:latest"
|
||||
|
||||
# Try to get the existing base image's hash label
|
||||
# First check if image exists locally (fast, no network call)
|
||||
# Only pull from registry if not cached locally
|
||||
EXISTING_HASH=""
|
||||
if docker pull $BASE_IMAGE 2>/dev/null; then
|
||||
if docker image inspect $BASE_IMAGE >/dev/null 2>&1; then
|
||||
echo "✅ Base image found in local cache (skipping slow registry pull)"
|
||||
EXISTING_HASH=$(docker inspect $BASE_IMAGE --format='{{index .Config.Labels "base.content.hash"}}' 2>/dev/null || echo "")
|
||||
# Fallback to old label name for backwards compatibility
|
||||
if [ -z "$EXISTING_HASH" ]; then
|
||||
EXISTING_HASH=$(docker inspect $BASE_IMAGE --format='{{index .Config.Labels "poetry.lock.hash"}}' 2>/dev/null || echo "")
|
||||
fi
|
||||
echo "Existing base image hash: $EXISTING_HASH"
|
||||
elif docker pull $BASE_IMAGE 2>/dev/null; then
|
||||
echo "📥 Base image pulled from registry"
|
||||
EXISTING_HASH=$(docker inspect $BASE_IMAGE --format='{{index .Config.Labels "base.content.hash"}}' 2>/dev/null || echo "")
|
||||
# Fallback to old label name for backwards compatibility
|
||||
if [ -z "$EXISTING_HASH" ]; then
|
||||
@@ -817,7 +874,7 @@ jobs:
|
||||
--max-instances 50 \
|
||||
--min-instances 0 \
|
||||
--set-env-vars "GOOGLE_CLOUD_PROJECT=${{ env.PROJECT_ID }},GCS_BUCKET_NAME=karaoke-gen-storage-${{ env.PROJECT_ID }},FIRESTORE_COLLECTION=jobs,ENVIRONMENT=production,AUDIO_SEPARATOR_API_URL=https://nomadkaraoke--audio-separator-api.modal.run,KARAOKE_GEN_VERSION=$VERSION,DEFAULT_DROPBOX_PATH=/MediaUnsynced/Karaoke/Tracks-Organized,DEFAULT_GDRIVE_FOLDER_ID=1laRKAyxo0v817SstfM5XkpbWiNKNAMSX,ENABLE_CLOUD_TASKS=true,CLOUD_RUN_SERVICE_URL=https://api.nomadkaraoke.com,GCP_REGION=us-central1,DEFAULT_ENABLE_YOUTUBE_UPLOAD=true,DEFAULT_BRAND_PREFIX=NOMAD" \
|
||||
--set-secrets "AUDIOSHAKE_API_TOKEN=audioshake-api-key:latest,GENIUS_API_TOKEN=genius-api-key:latest,SPOTIFY_COOKIE_SP_DC=spotify-cookie:latest,RAPIDAPI_KEY=rapidapi-key:latest,DEFAULT_DISCORD_WEBHOOK_URL=discord-releases-webhook:latest,ADMIN_TOKENS=admin-tokens:latest,RED_API_KEY=red-api-key:latest,RED_API_URL=red-api-url:latest,OPS_API_KEY=ops-api-key:latest,OPS_API_URL=ops-api-url:latest,FLACFETCH_API_URL=flacfetch-api-url:latest,FLACFETCH_API_KEY=flacfetch-api-key:latest,SENDGRID_API_KEY=sendgrid-api-key:latest,STRIPE_SECRET_KEY=stripe-secret-key:latest,STRIPE_WEBHOOK_SECRET=stripe-webhook-secret:latest"
|
||||
--set-secrets "AUDIOSHAKE_API_TOKEN=audioshake-api-key:latest,GENIUS_API_TOKEN=genius-api-key:latest,SPOTIFY_COOKIE_SP_DC=spotify-cookie:latest,RAPIDAPI_KEY=rapidapi-key:latest,DEFAULT_DISCORD_WEBHOOK_URL=discord-releases-webhook:latest,ADMIN_TOKENS=admin-tokens:latest,RED_API_KEY=red-api-key:latest,RED_API_URL=red-api-url:latest,OPS_API_KEY=ops-api-key:latest,OPS_API_URL=ops-api-url:latest,FLACFETCH_API_URL=flacfetch-api-url:latest,FLACFETCH_API_KEY=flacfetch-api-key:latest,SENDGRID_API_KEY=sendgrid-api-key:latest,STRIPE_SECRET_KEY=stripe-secret-key:latest,STRIPE_WEBHOOK_SECRET=stripe-webhook-secret:latest,LANGFUSE_PUBLIC_KEY=langfuse-public-key:latest,LANGFUSE_SECRET_KEY=langfuse-secret-key:latest,LANGFUSE_HOST=langfuse-host:latest"
|
||||
|
||||
- name: Verify deployment and version
|
||||
run: |
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
|
||||
| What | Where |
|
||||
|------|-------|
|
||||
| Product vision & goals | `docs/PRODUCT-VISION.md` |
|
||||
| Current status | `docs/README.md` |
|
||||
| Architecture | `docs/ARCHITECTURE.md` |
|
||||
| Dev setup & testing | `docs/DEVELOPMENT.md` |
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
[
|
||||
{
|
||||
"test_name": "Sound-alike error (wurld -> world)",
|
||||
"success": true,
|
||||
"proposals": [
|
||||
{
|
||||
"action": "ReplaceWord",
|
||||
"word_id": null,
|
||||
"word_ids": [
|
||||
"w1"
|
||||
],
|
||||
"replacement_text": "world",
|
||||
"confidence": 0.75,
|
||||
"reason": "Sound-alike error. Reference suggests: 'world'. The transcription 'wurld' is a phonetic misspelling or sound-alike of the word 'world' which appears in both reference sources (Genius and LRCLIB).",
|
||||
"gap_category": "GapCategory.SOUND_ALIKE",
|
||||
"requires_human_review": false
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"test_name": "Punctuation difference",
|
||||
"success": true,
|
||||
"proposals": [
|
||||
{
|
||||
"action": "NoAction",
|
||||
"word_id": null,
|
||||
"word_ids": [
|
||||
"w2"
|
||||
],
|
||||
"replacement_text": null,
|
||||
"confidence": 0.99,
|
||||
"reason": "Transcription matches at least one reference source. The gap text 'Hello' followed by the context 'is it me you're looking for' matches the Genius reference lyrics exactly, excluding punctuation. According to the guidelines, if any reference source matches the transcription text (ignoring punctuation), it should be classified as NO_ERROR.",
|
||||
"gap_category": "GapCategory.NO_ERROR",
|
||||
"requires_human_review": false
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"test_name": "Extra filler word",
|
||||
"success": true,
|
||||
"proposals": [
|
||||
{
|
||||
"action": "DeleteWord",
|
||||
"word_id": "w3",
|
||||
"word_ids": null,
|
||||
"replacement_text": null,
|
||||
"confidence": 0.8,
|
||||
"reason": "Extra filler word 'And' at sentence start not in reference. The transcription includes the filler word 'And' at the beginning of the phrase, which is not present in the reference lyrics. This matches the definition of EXTRA_WORDS.",
|
||||
"gap_category": "GapCategory.EXTRA_WORDS",
|
||||
"requires_human_review": false
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"test_name": "Complex multi-word error",
|
||||
"success": true,
|
||||
"proposals": [
|
||||
{
|
||||
"action": "NoAction",
|
||||
"word_id": null,
|
||||
"word_ids": [
|
||||
"w7",
|
||||
"w8",
|
||||
"w9",
|
||||
"w10"
|
||||
],
|
||||
"replacement_text": null,
|
||||
"confidence": 0.99,
|
||||
"reason": "Transcription matches at least one reference source. The transcription text 'gonna give you up' matches the Genius reference lyrics exactly when ignoring punctuation and capitalization. In context, the full phrase 'never gonna give you up' is correctly transcribed and aligns perfectly with the known lyrics and title of the song.",
|
||||
"gap_category": "GapCategory.NO_ERROR",
|
||||
"requires_human_review": false
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
+182
-70
@@ -4,11 +4,11 @@ FastAPI dependencies for authentication and authorization.
|
||||
import logging
|
||||
import secrets
|
||||
from datetime import datetime, timedelta, UTC
|
||||
from typing import Optional, Tuple, Callable
|
||||
from typing import Optional, Tuple, Callable, Union
|
||||
from fastapi import Depends, HTTPException, Header, Query, Request, Path
|
||||
from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
|
||||
|
||||
from backend.services.auth_service import get_auth_service, UserType, AuthService
|
||||
from backend.services.auth_service import get_auth_service, UserType, AuthService, AuthResult
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
@@ -66,70 +66,130 @@ async def require_auth(
|
||||
auth_service: AuthService = Depends(get_auth_service),
|
||||
credentials: Optional[HTTPAuthorizationCredentials] = Depends(security),
|
||||
token: Optional[str] = Query(None)
|
||||
) -> Tuple[str, UserType, int]:
|
||||
) -> AuthResult:
|
||||
"""
|
||||
Require authentication for an endpoint.
|
||||
|
||||
|
||||
Returns:
|
||||
(token, user_type, remaining_uses)
|
||||
|
||||
AuthResult with full authentication context including:
|
||||
- is_valid, user_type, remaining_uses, message (backward compatible via tuple unpacking)
|
||||
- user_email: Email of authenticated user (if session/API key auth)
|
||||
- is_admin: Whether user has admin privileges
|
||||
|
||||
Raises:
|
||||
HTTPException: 401 if authentication fails
|
||||
"""
|
||||
# Get token from request
|
||||
token_str = await get_token_from_request(request, credentials, token)
|
||||
|
||||
|
||||
if not token_str:
|
||||
raise HTTPException(
|
||||
status_code=401,
|
||||
detail="Authentication required. Provide token via Authorization header or ?token= parameter"
|
||||
)
|
||||
|
||||
# Validate token
|
||||
is_valid, user_type, remaining_uses, message = auth_service.validate_token(token_str)
|
||||
|
||||
if not is_valid:
|
||||
# Log more details for debugging token issues
|
||||
|
||||
# Validate token using the full method
|
||||
auth_result = auth_service.validate_token_full(token_str)
|
||||
|
||||
# Get request_id from middleware for correlation
|
||||
request_id = getattr(request.state, "request_id", None)
|
||||
|
||||
if not auth_result.is_valid:
|
||||
# Log auth failure with request_id for correlation
|
||||
auth_header = request.headers.get("Authorization", "")
|
||||
logger.warning(
|
||||
f"Authentication failed: {message}. "
|
||||
f"Token provided: {bool(token_str)}, "
|
||||
f"Token length: {len(token_str) if token_str else 0}, "
|
||||
f"Auth header present: {bool(auth_header)}, "
|
||||
f"Header prefix: {auth_header[:20] if auth_header else 'none'}..."
|
||||
"auth_failed",
|
||||
extra={
|
||||
"request_id": request_id,
|
||||
"audit_type": "auth_event",
|
||||
"auth_message": auth_result.message,
|
||||
"token_provided": bool(token_str),
|
||||
"token_length": len(token_str) if token_str else 0,
|
||||
"auth_header_present": bool(auth_header),
|
||||
}
|
||||
)
|
||||
raise HTTPException(
|
||||
status_code=401,
|
||||
detail=f"Authentication failed: {auth_result.message}"
|
||||
)
|
||||
|
||||
# Log successful auth with request_id for correlation with request audit
|
||||
logger.info(
|
||||
"auth_success",
|
||||
extra={
|
||||
"request_id": request_id,
|
||||
"user_email": auth_result.user_email,
|
||||
"user_type": auth_result.user_type.value if auth_result.user_type else None,
|
||||
"is_admin": auth_result.is_admin,
|
||||
"remaining_uses": auth_result.remaining_uses,
|
||||
"audit_type": "auth_event",
|
||||
}
|
||||
)
|
||||
|
||||
return auth_result
|
||||
|
||||
|
||||
async def require_auth_legacy(
|
||||
request: Request,
|
||||
auth_service: AuthService = Depends(get_auth_service),
|
||||
credentials: Optional[HTTPAuthorizationCredentials] = Depends(security),
|
||||
token: Optional[str] = Query(None)
|
||||
) -> Tuple[str, UserType, int]:
|
||||
"""
|
||||
Legacy authentication dependency that returns tuple.
|
||||
|
||||
DEPRECATED: Use require_auth which returns AuthResult instead.
|
||||
|
||||
Returns:
|
||||
(token, user_type, remaining_uses)
|
||||
"""
|
||||
token_str = await get_token_from_request(request, credentials, token)
|
||||
|
||||
if not token_str:
|
||||
raise HTTPException(
|
||||
status_code=401,
|
||||
detail="Authentication required. Provide token via Authorization header or ?token= parameter"
|
||||
)
|
||||
|
||||
is_valid, user_type, remaining_uses, message = auth_service.validate_token(token_str)
|
||||
|
||||
if not is_valid:
|
||||
raise HTTPException(
|
||||
status_code=401,
|
||||
detail=f"Authentication failed: {message}"
|
||||
)
|
||||
|
||||
logger.info(f"Authenticated as {user_type} (remaining: {remaining_uses})")
|
||||
|
||||
|
||||
return token_str, user_type, remaining_uses
|
||||
|
||||
|
||||
async def require_admin(
|
||||
auth_data: Tuple[str, UserType, int] = Depends(require_auth)
|
||||
) -> Tuple[str, UserType, int]:
|
||||
auth_result: AuthResult = Depends(require_auth)
|
||||
) -> AuthResult:
|
||||
"""
|
||||
Require admin access for an endpoint.
|
||||
|
||||
|
||||
Admin access is granted if:
|
||||
- Using an admin token from ADMIN_TOKENS env var
|
||||
- User email is from admin domain (e.g., @nomadkaraoke.com)
|
||||
- User role is set to ADMIN in database
|
||||
|
||||
Returns:
|
||||
(token, user_type, remaining_uses)
|
||||
|
||||
AuthResult with admin privileges
|
||||
|
||||
Raises:
|
||||
HTTPException: 403 if user is not admin
|
||||
"""
|
||||
token, user_type, remaining_uses = auth_data
|
||||
|
||||
if user_type != UserType.ADMIN:
|
||||
logger.warning(f"Admin access denied for {user_type} user")
|
||||
if not auth_result.is_admin:
|
||||
logger.warning(
|
||||
f"Admin access denied for {auth_result.user_type} user "
|
||||
f"(email: {auth_result.user_email or 'unknown'})"
|
||||
)
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail="Admin access required"
|
||||
)
|
||||
|
||||
return token, user_type, remaining_uses
|
||||
|
||||
return auth_result
|
||||
|
||||
|
||||
def optional_auth(
|
||||
@@ -168,14 +228,14 @@ def optional_auth(
|
||||
def require_review_auth_factory(job_id_param: str = "job_id"):
|
||||
"""
|
||||
Factory to create a review authentication dependency.
|
||||
|
||||
|
||||
Accepts either:
|
||||
1. Full user authentication (admin/user token)
|
||||
1. Full user authentication (admin/user token) - also validates job ownership
|
||||
2. Job-specific review token (only valid for the specific job)
|
||||
|
||||
|
||||
Args:
|
||||
job_id_param: Name of the path parameter containing the job ID
|
||||
|
||||
|
||||
Returns:
|
||||
Dependency function that validates review access
|
||||
"""
|
||||
@@ -189,37 +249,63 @@ def require_review_auth_factory(job_id_param: str = "job_id"):
|
||||
) -> Tuple[str, str]:
|
||||
"""
|
||||
Validate review access for a job.
|
||||
|
||||
|
||||
Returns:
|
||||
(job_id, auth_type) where auth_type is "full" or "review_token"
|
||||
|
||||
|
||||
Raises:
|
||||
HTTPException: 401 if authentication fails
|
||||
HTTPException: 403 if user doesn't own the job (for full auth)
|
||||
"""
|
||||
# Import here to avoid circular dependency
|
||||
from backend.services.job_manager import JobManager
|
||||
|
||||
|
||||
job_manager = JobManager()
|
||||
|
||||
# Try full authentication first
|
||||
full_token = None
|
||||
if credentials:
|
||||
full_token = credentials.credentials
|
||||
elif token:
|
||||
full_token = token
|
||||
|
||||
|
||||
if full_token:
|
||||
is_valid, user_type, remaining_uses, message = auth_service.validate_token(full_token)
|
||||
if is_valid:
|
||||
logger.info(f"Review access granted via full auth ({user_type}) for job {job_id}")
|
||||
auth_result = auth_service.validate_token_full(full_token)
|
||||
if auth_result.is_valid:
|
||||
# For full auth, also verify job ownership
|
||||
job = job_manager.get_job(job_id)
|
||||
if not job:
|
||||
raise HTTPException(status_code=404, detail=f"Job {job_id} not found")
|
||||
|
||||
# Check ownership: admin can access all, users only their own jobs
|
||||
if not auth_result.is_admin:
|
||||
if auth_result.user_email and job.user_email:
|
||||
if auth_result.user_email.lower() != job.user_email.lower():
|
||||
logger.warning(
|
||||
f"Review access denied: user {auth_result.user_email} "
|
||||
f"tried to access job {job_id} owned by {job.user_email}"
|
||||
)
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail="You don't have permission to access this job's review"
|
||||
)
|
||||
elif job.user_email:
|
||||
# Token auth without email trying to access a job with owner
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail="You don't have permission to access this job's review"
|
||||
)
|
||||
|
||||
logger.info(f"Review access granted via full auth ({auth_result.user_type}) for job {job_id}")
|
||||
return job_id, "full"
|
||||
|
||||
|
||||
# Try review token
|
||||
if review_token:
|
||||
job_manager = JobManager()
|
||||
job = job_manager.get_job(job_id)
|
||||
|
||||
|
||||
if not job:
|
||||
raise HTTPException(status_code=404, detail=f"Job {job_id} not found")
|
||||
|
||||
|
||||
# Validate review token matches
|
||||
if job.review_token and secrets.compare_digest(job.review_token, review_token):
|
||||
# Check expiry if set
|
||||
@@ -229,25 +315,25 @@ def require_review_auth_factory(job_id_param: str = "job_id"):
|
||||
expiry = job.review_token_expires_at
|
||||
if expiry.tzinfo is None:
|
||||
expiry = expiry.replace(tzinfo=UTC)
|
||||
|
||||
|
||||
if now > expiry:
|
||||
logger.warning(f"Review token expired for job {job_id}")
|
||||
raise HTTPException(
|
||||
status_code=401,
|
||||
detail="Review token has expired. Please request a new review link."
|
||||
)
|
||||
|
||||
|
||||
logger.info(f"Review access granted via review_token for job {job_id}")
|
||||
return job_id, "review_token"
|
||||
else:
|
||||
logger.warning(f"Invalid review token for job {job_id}")
|
||||
|
||||
|
||||
# No valid authentication
|
||||
raise HTTPException(
|
||||
status_code=401,
|
||||
detail="Authentication required. Provide either a full access token or a valid review_token for this job."
|
||||
)
|
||||
|
||||
|
||||
return require_review_auth
|
||||
|
||||
|
||||
@@ -258,14 +344,14 @@ require_review_auth = require_review_auth_factory()
|
||||
def require_instrumental_auth_factory(job_id_param: str = "job_id"):
|
||||
"""
|
||||
Factory to create an instrumental review authentication dependency.
|
||||
|
||||
|
||||
Accepts either:
|
||||
1. Full user authentication (admin/user token)
|
||||
1. Full user authentication (admin/user token) - also validates job ownership
|
||||
2. Job-specific instrumental token (only valid for the specific job)
|
||||
|
||||
|
||||
Args:
|
||||
job_id_param: Name of the path parameter containing the job ID
|
||||
|
||||
|
||||
Returns:
|
||||
Dependency function that validates instrumental review access
|
||||
"""
|
||||
@@ -279,37 +365,63 @@ def require_instrumental_auth_factory(job_id_param: str = "job_id"):
|
||||
) -> Tuple[str, str]:
|
||||
"""
|
||||
Validate instrumental review access for a job.
|
||||
|
||||
|
||||
Returns:
|
||||
(job_id, auth_type) where auth_type is "full" or "instrumental_token"
|
||||
|
||||
|
||||
Raises:
|
||||
HTTPException: 401 if authentication fails
|
||||
HTTPException: 403 if user doesn't own the job (for full auth)
|
||||
"""
|
||||
# Import here to avoid circular dependency
|
||||
from backend.services.job_manager import JobManager
|
||||
|
||||
|
||||
job_manager = JobManager()
|
||||
|
||||
# Try full authentication first
|
||||
full_token = None
|
||||
if credentials:
|
||||
full_token = credentials.credentials
|
||||
elif token:
|
||||
full_token = token
|
||||
|
||||
|
||||
if full_token:
|
||||
is_valid, user_type, remaining_uses, message = auth_service.validate_token(full_token)
|
||||
if is_valid:
|
||||
logger.info(f"Instrumental access granted via full auth ({user_type}) for job {job_id}")
|
||||
auth_result = auth_service.validate_token_full(full_token)
|
||||
if auth_result.is_valid:
|
||||
# For full auth, also verify job ownership
|
||||
job = job_manager.get_job(job_id)
|
||||
if not job:
|
||||
raise HTTPException(status_code=404, detail=f"Job {job_id} not found")
|
||||
|
||||
# Check ownership: admin can access all, users only their own jobs
|
||||
if not auth_result.is_admin:
|
||||
if auth_result.user_email and job.user_email:
|
||||
if auth_result.user_email.lower() != job.user_email.lower():
|
||||
logger.warning(
|
||||
f"Instrumental access denied: user {auth_result.user_email} "
|
||||
f"tried to access job {job_id} owned by {job.user_email}"
|
||||
)
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail="You don't have permission to access this job's instrumental review"
|
||||
)
|
||||
elif job.user_email:
|
||||
# Token auth without email trying to access a job with owner
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail="You don't have permission to access this job's instrumental review"
|
||||
)
|
||||
|
||||
logger.info(f"Instrumental access granted via full auth ({auth_result.user_type}) for job {job_id}")
|
||||
return job_id, "full"
|
||||
|
||||
|
||||
# Try instrumental token
|
||||
if instrumental_token:
|
||||
job_manager = JobManager()
|
||||
job = job_manager.get_job(job_id)
|
||||
|
||||
|
||||
if not job:
|
||||
raise HTTPException(status_code=404, detail=f"Job {job_id} not found")
|
||||
|
||||
|
||||
# Validate instrumental token matches
|
||||
if job.instrumental_token and secrets.compare_digest(job.instrumental_token, instrumental_token):
|
||||
# Check expiry if set
|
||||
@@ -319,25 +431,25 @@ def require_instrumental_auth_factory(job_id_param: str = "job_id"):
|
||||
expiry = job.instrumental_token_expires_at
|
||||
if expiry.tzinfo is None:
|
||||
expiry = expiry.replace(tzinfo=UTC)
|
||||
|
||||
|
||||
if now > expiry:
|
||||
logger.warning(f"Instrumental token expired for job {job_id}")
|
||||
raise HTTPException(
|
||||
status_code=401,
|
||||
detail="Instrumental review token has expired. Please request a new review link."
|
||||
)
|
||||
|
||||
|
||||
logger.info(f"Instrumental access granted via instrumental_token for job {job_id}")
|
||||
return job_id, "instrumental_token"
|
||||
else:
|
||||
logger.warning(f"Invalid instrumental token for job {job_id}")
|
||||
|
||||
|
||||
# No valid authentication
|
||||
raise HTTPException(
|
||||
status_code=401,
|
||||
detail="Authentication required. Provide either a full access token or a valid instrumental_token for this job."
|
||||
)
|
||||
|
||||
|
||||
return require_instrumental_auth
|
||||
|
||||
|
||||
|
||||
@@ -1081,6 +1081,7 @@ async def create_job_with_upload_urls(
|
||||
brand_prefix=dist.brand_prefix,
|
||||
enable_youtube_upload=body.enable_youtube_upload,
|
||||
youtube_description=body.youtube_description,
|
||||
youtube_description_template=body.youtube_description, # video_worker reads this field
|
||||
discord_webhook_url=dist.discord_webhook_url,
|
||||
webhook_url=body.webhook_url,
|
||||
user_email=body.user_email,
|
||||
|
||||
+161
-49
@@ -27,7 +27,7 @@ from backend.services.worker_service import get_worker_service
|
||||
from backend.services.storage_service import StorageService
|
||||
from backend.config import get_settings
|
||||
from backend.api.dependencies import require_admin, require_auth, require_instrumental_auth
|
||||
from backend.services.auth_service import UserType
|
||||
from backend.services.auth_service import UserType, AuthResult
|
||||
from backend.services.metrics import metrics
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ async def _trigger_workers_parallel(job_id: str) -> None:
|
||||
async def create_job(
|
||||
request: URLSubmissionRequest,
|
||||
background_tasks: BackgroundTasks,
|
||||
auth_data: Tuple[str, UserType, int] = Depends(require_auth)
|
||||
auth_result: AuthResult = Depends(require_auth)
|
||||
) -> JobResponse:
|
||||
"""
|
||||
Create a new karaoke generation job from a URL.
|
||||
@@ -69,6 +69,24 @@ async def create_job(
|
||||
4. When both complete, job transitions to AWAITING_REVIEW
|
||||
"""
|
||||
try:
|
||||
# Determine job owner email:
|
||||
# All authentication methods must provide a user_email for job ownership
|
||||
if auth_result.user_email:
|
||||
# Use authenticated user's email (standard case)
|
||||
user_email = auth_result.user_email
|
||||
else:
|
||||
# This should never happen - all auth methods now require user_email
|
||||
logger.error("Authentication succeeded but no user_email provided")
|
||||
raise HTTPException(
|
||||
status_code=500,
|
||||
detail="Authentication error: no user identity available"
|
||||
)
|
||||
|
||||
# Admins can optionally create jobs on behalf of other users
|
||||
if request.user_email and auth_result.is_admin and request.user_email != auth_result.user_email:
|
||||
user_email = request.user_email
|
||||
logger.info(f"Admin {auth_result.user_email} creating job on behalf of {user_email}")
|
||||
|
||||
# Create job with all preferences
|
||||
job_create = JobCreate(
|
||||
url=str(request.url),
|
||||
@@ -79,7 +97,7 @@ async def create_job(
|
||||
enable_youtube_upload=request.enable_youtube_upload,
|
||||
youtube_description=request.youtube_description,
|
||||
webhook_url=request.webhook_url,
|
||||
user_email=request.user_email
|
||||
user_email=user_email
|
||||
)
|
||||
job = job_manager.create_job(job_create)
|
||||
|
||||
@@ -109,20 +127,49 @@ async def create_job(
|
||||
@router.get("/{job_id}", response_model=Job)
|
||||
async def get_job(
|
||||
job_id: str,
|
||||
auth_data: Tuple[str, UserType, int] = Depends(require_auth)
|
||||
auth_result: AuthResult = Depends(require_auth)
|
||||
) -> Job:
|
||||
"""Get job status and details."""
|
||||
job = job_manager.get_job(job_id)
|
||||
if not job:
|
||||
raise HTTPException(status_code=404, detail="Job not found")
|
||||
|
||||
|
||||
# Check ownership - users can only see their own jobs, admins can see all
|
||||
if not _check_job_ownership(job, auth_result):
|
||||
raise HTTPException(status_code=403, detail="You don't have permission to access this job")
|
||||
|
||||
# If job is complete, include download URLs
|
||||
if job.status == JobStatus.COMPLETE:
|
||||
job.download_urls = job_manager.get_output_urls(job_id)
|
||||
|
||||
|
||||
return job
|
||||
|
||||
|
||||
def _check_job_ownership(job: Job, auth_result: AuthResult) -> bool:
|
||||
"""
|
||||
Check if the authenticated user owns the job or has admin access.
|
||||
|
||||
Returns:
|
||||
True if user can access the job, False otherwise
|
||||
"""
|
||||
# Admins can access all jobs
|
||||
if auth_result.is_admin:
|
||||
return True
|
||||
|
||||
# Check if user owns the job
|
||||
if auth_result.user_email and job.user_email:
|
||||
return auth_result.user_email.lower() == job.user_email.lower()
|
||||
|
||||
# If no user_email on auth (token auth without email), deny access to jobs with user_email
|
||||
# This prevents token-based auth from accessing user jobs
|
||||
if job.user_email:
|
||||
return False
|
||||
|
||||
# Legacy jobs without user_email - allow access for backward compatibility
|
||||
# TODO: Consider restricting this in the future
|
||||
return True
|
||||
|
||||
|
||||
@router.get("", response_model=List[Job])
|
||||
async def list_jobs(
|
||||
status: Optional[JobStatus] = None,
|
||||
@@ -131,11 +178,13 @@ async def list_jobs(
|
||||
created_after: Optional[str] = None,
|
||||
created_before: Optional[str] = None,
|
||||
limit: int = 100,
|
||||
auth_data: Tuple[str, UserType, int] = Depends(require_auth)
|
||||
auth_result: AuthResult = Depends(require_auth)
|
||||
) -> List[Job]:
|
||||
"""
|
||||
List jobs with optional filters.
|
||||
|
||||
|
||||
Regular users only see their own jobs. Admins see all jobs.
|
||||
|
||||
Args:
|
||||
status: Filter by job status (pending, complete, failed, etc.)
|
||||
environment: Filter by request_metadata.environment (test/production/development)
|
||||
@@ -143,37 +192,52 @@ async def list_jobs(
|
||||
created_after: Filter jobs created after this ISO datetime (e.g., 2024-01-01T00:00:00Z)
|
||||
created_before: Filter jobs created before this ISO datetime
|
||||
limit: Maximum number of jobs to return (default 100)
|
||||
|
||||
|
||||
Returns:
|
||||
List of jobs matching filters, ordered by created_at descending
|
||||
"""
|
||||
from datetime import datetime
|
||||
|
||||
|
||||
try:
|
||||
# Parse datetime strings if provided
|
||||
created_after_dt = None
|
||||
created_before_dt = None
|
||||
|
||||
|
||||
if created_after:
|
||||
try:
|
||||
created_after_dt = datetime.fromisoformat(created_after.replace('Z', '+00:00'))
|
||||
except ValueError:
|
||||
raise HTTPException(status_code=400, detail=f"Invalid created_after format: {created_after}")
|
||||
|
||||
except ValueError as e:
|
||||
raise HTTPException(status_code=400, detail=f"Invalid created_after format: {created_after}") from e
|
||||
|
||||
if created_before:
|
||||
try:
|
||||
created_before_dt = datetime.fromisoformat(created_before.replace('Z', '+00:00'))
|
||||
except ValueError:
|
||||
raise HTTPException(status_code=400, detail=f"Invalid created_before format: {created_before}")
|
||||
|
||||
except ValueError as e:
|
||||
raise HTTPException(status_code=400, detail=f"Invalid created_before format: {created_before}") from e
|
||||
|
||||
# Determine user_email filter based on admin status
|
||||
# Admins see all jobs, regular users only see their own
|
||||
user_email_filter = None
|
||||
if not auth_result.is_admin:
|
||||
if auth_result.user_email:
|
||||
user_email_filter = auth_result.user_email
|
||||
logger.debug(f"Filtering jobs for user: {user_email_filter}")
|
||||
else:
|
||||
# Token-based auth without user email - show no jobs for security
|
||||
logger.warning("Non-admin auth without user_email, returning empty job list")
|
||||
return []
|
||||
|
||||
jobs = job_manager.list_jobs(
|
||||
status=status,
|
||||
environment=environment,
|
||||
client_id=client_id,
|
||||
created_after=created_after_dt,
|
||||
created_before=created_before_dt,
|
||||
user_email=user_email_filter,
|
||||
limit=limit
|
||||
)
|
||||
|
||||
logger.debug(f"Listed {len(jobs)} jobs for user={auth_result.user_email}, admin={auth_result.is_admin}")
|
||||
return jobs
|
||||
except HTTPException:
|
||||
raise
|
||||
@@ -186,16 +250,20 @@ async def list_jobs(
|
||||
async def delete_job(
|
||||
job_id: str,
|
||||
delete_files: bool = True,
|
||||
auth_data: Tuple[str, UserType, int] = Depends(require_auth)
|
||||
auth_result: AuthResult = Depends(require_auth)
|
||||
) -> dict:
|
||||
"""Delete a job and optionally its output files."""
|
||||
try:
|
||||
job = job_manager.get_job(job_id)
|
||||
if not job:
|
||||
raise HTTPException(status_code=404, detail="Job not found")
|
||||
|
||||
|
||||
# Check ownership - users can only delete their own jobs
|
||||
if not _check_job_ownership(job, auth_result):
|
||||
raise HTTPException(status_code=403, detail="You don't have permission to delete this job")
|
||||
|
||||
job_manager.delete_job(job_id, delete_files=delete_files)
|
||||
|
||||
|
||||
return {"status": "success", "message": f"Job {job_id} deleted"}
|
||||
except HTTPException:
|
||||
raise
|
||||
@@ -212,7 +280,7 @@ async def bulk_delete_jobs(
|
||||
created_before: Optional[str] = None,
|
||||
delete_files: bool = True,
|
||||
confirm: bool = False,
|
||||
auth_data: Tuple[str, UserType, int] = Depends(require_admin)
|
||||
_auth_result: AuthResult = Depends(require_admin)
|
||||
) -> dict:
|
||||
"""
|
||||
Delete multiple jobs matching filter criteria.
|
||||
@@ -316,18 +384,22 @@ async def bulk_delete_jobs(
|
||||
@router.get("/{job_id}/review-data")
|
||||
async def get_review_data(
|
||||
job_id: str,
|
||||
auth_data: Tuple[str, UserType, int] = Depends(require_auth)
|
||||
auth_result: AuthResult = Depends(require_auth)
|
||||
) -> Dict[str, Any]:
|
||||
"""
|
||||
Get data needed for lyrics review interface.
|
||||
|
||||
|
||||
Returns corrections JSON URL and audio URL.
|
||||
Frontend loads these to render the review UI.
|
||||
"""
|
||||
job = job_manager.get_job(job_id)
|
||||
if not job:
|
||||
raise HTTPException(status_code=404, detail="Job not found")
|
||||
|
||||
|
||||
# Check ownership
|
||||
if not _check_job_ownership(job, auth_result):
|
||||
raise HTTPException(status_code=403, detail="You don't have permission to access this job")
|
||||
|
||||
if job.status not in [JobStatus.AWAITING_REVIEW, JobStatus.IN_REVIEW]:
|
||||
raise HTTPException(
|
||||
status_code=400,
|
||||
@@ -376,13 +448,21 @@ async def get_review_data(
|
||||
async def start_review(
|
||||
job_id: str,
|
||||
request: StartReviewRequest,
|
||||
auth_data: Tuple[str, UserType, int] = Depends(require_auth)
|
||||
auth_result: AuthResult = Depends(require_auth)
|
||||
) -> dict:
|
||||
"""
|
||||
Mark job as IN_REVIEW (user opened review interface).
|
||||
|
||||
|
||||
This helps track that the user is actively working on the review.
|
||||
"""
|
||||
job = job_manager.get_job(job_id)
|
||||
if not job:
|
||||
raise HTTPException(status_code=404, detail="Job not found")
|
||||
|
||||
# Check ownership
|
||||
if not _check_job_ownership(job, auth_result):
|
||||
raise HTTPException(status_code=403, detail="You don't have permission to access this job")
|
||||
|
||||
success = job_manager.transition_to_state(
|
||||
job_id=job_id,
|
||||
new_status=JobStatus.IN_REVIEW,
|
||||
@@ -400,20 +480,24 @@ async def submit_corrections(
|
||||
job_id: str,
|
||||
submission: CorrectionsSubmission,
|
||||
background_tasks: BackgroundTasks,
|
||||
auth_data: Tuple[str, UserType, int] = Depends(require_auth)
|
||||
auth_result: AuthResult = Depends(require_auth)
|
||||
) -> dict:
|
||||
"""
|
||||
Save corrected lyrics during human review.
|
||||
|
||||
|
||||
This endpoint saves review progress but does NOT complete the review.
|
||||
Call POST /{job_id}/complete-review to finish and trigger video rendering.
|
||||
|
||||
|
||||
Can be called multiple times to save progress.
|
||||
"""
|
||||
job = job_manager.get_job(job_id)
|
||||
if not job:
|
||||
raise HTTPException(status_code=404, detail="Job not found")
|
||||
|
||||
|
||||
# Check ownership
|
||||
if not _check_job_ownership(job, auth_result):
|
||||
raise HTTPException(status_code=403, detail="You don't have permission to modify this job")
|
||||
|
||||
if job.status not in [JobStatus.AWAITING_REVIEW, JobStatus.IN_REVIEW]:
|
||||
raise HTTPException(
|
||||
status_code=400,
|
||||
@@ -459,11 +543,11 @@ async def submit_corrections(
|
||||
async def complete_review(
|
||||
job_id: str,
|
||||
background_tasks: BackgroundTasks,
|
||||
auth_data: Tuple[str, UserType, int] = Depends(require_auth)
|
||||
auth_result: AuthResult = Depends(require_auth)
|
||||
) -> dict:
|
||||
"""
|
||||
Complete the human review and trigger video rendering.
|
||||
|
||||
|
||||
This is the FIRST critical human-in-the-loop completion point.
|
||||
After this:
|
||||
1. Job transitions to REVIEW_COMPLETE
|
||||
@@ -474,7 +558,11 @@ async def complete_review(
|
||||
job = job_manager.get_job(job_id)
|
||||
if not job:
|
||||
raise HTTPException(status_code=404, detail="Job not found")
|
||||
|
||||
|
||||
# Check ownership
|
||||
if not _check_job_ownership(job, auth_result):
|
||||
raise HTTPException(status_code=403, detail="You don't have permission to modify this job")
|
||||
|
||||
if job.status not in [JobStatus.AWAITING_REVIEW, JobStatus.IN_REVIEW]:
|
||||
raise HTTPException(
|
||||
status_code=400,
|
||||
@@ -948,18 +1036,22 @@ async def select_instrumental(
|
||||
@router.get("/{job_id}/download-urls")
|
||||
async def get_download_urls(
|
||||
job_id: str,
|
||||
auth_data: Tuple[str, UserType, int] = Depends(require_auth)
|
||||
auth_result: AuthResult = Depends(require_auth)
|
||||
) -> dict:
|
||||
"""
|
||||
Get download URLs for all job output files.
|
||||
|
||||
|
||||
Returns a dictionary mapping file types to download URLs.
|
||||
Uses the streaming download endpoint which proxies through the backend.
|
||||
"""
|
||||
job = job_manager.get_job(job_id)
|
||||
if not job:
|
||||
raise HTTPException(status_code=404, detail="Job not found")
|
||||
|
||||
|
||||
# Check ownership
|
||||
if not _check_job_ownership(job, auth_result):
|
||||
raise HTTPException(status_code=403, detail="You don't have permission to access this job")
|
||||
|
||||
if job.status != JobStatus.COMPLETE:
|
||||
raise HTTPException(
|
||||
status_code=400,
|
||||
@@ -995,21 +1087,25 @@ async def download_file(
|
||||
job_id: str,
|
||||
category: str,
|
||||
file_key: str,
|
||||
auth_data: Tuple[str, UserType, int] = Depends(require_auth)
|
||||
auth_result: AuthResult = Depends(require_auth)
|
||||
):
|
||||
"""
|
||||
Stream download a specific file from a completed job.
|
||||
|
||||
|
||||
This endpoint proxies the file from GCS through the backend,
|
||||
so no client-side authentication is required.
|
||||
"""
|
||||
from fastapi.responses import StreamingResponse
|
||||
import tempfile
|
||||
|
||||
|
||||
job = job_manager.get_job(job_id)
|
||||
if not job:
|
||||
raise HTTPException(status_code=404, detail="Job not found")
|
||||
|
||||
|
||||
# Check ownership
|
||||
if not _check_job_ownership(job, auth_result):
|
||||
raise HTTPException(status_code=403, detail="You don't have permission to access this job")
|
||||
|
||||
if job.status != JobStatus.COMPLETE:
|
||||
raise HTTPException(
|
||||
status_code=400,
|
||||
@@ -1086,13 +1182,21 @@ async def download_file(
|
||||
async def cancel_job(
|
||||
job_id: str,
|
||||
request: CancelJobRequest,
|
||||
auth_data: Tuple[str, UserType, int] = Depends(require_auth)
|
||||
auth_result: AuthResult = Depends(require_auth)
|
||||
) -> dict:
|
||||
"""
|
||||
Cancel a job.
|
||||
|
||||
|
||||
Jobs can be cancelled at any stage before completion.
|
||||
"""
|
||||
job = job_manager.get_job(job_id)
|
||||
if not job:
|
||||
raise HTTPException(status_code=404, detail="Job not found")
|
||||
|
||||
# Check ownership
|
||||
if not _check_job_ownership(job, auth_result):
|
||||
raise HTTPException(status_code=403, detail="You don't have permission to cancel this job")
|
||||
|
||||
success = job_manager.cancel_job(job_id, reason=request.reason)
|
||||
|
||||
if not success:
|
||||
@@ -1109,7 +1213,7 @@ async def cancel_job(
|
||||
async def retry_job(
|
||||
job_id: str,
|
||||
background_tasks: BackgroundTasks,
|
||||
auth_data: Tuple[str, UserType, int] = Depends(require_auth)
|
||||
auth_result: AuthResult = Depends(require_auth)
|
||||
) -> dict:
|
||||
"""
|
||||
Retry a failed or cancelled job from the last successful checkpoint.
|
||||
@@ -1127,6 +1231,10 @@ async def retry_job(
|
||||
if not job:
|
||||
raise HTTPException(status_code=404, detail="Job not found")
|
||||
|
||||
# Check ownership
|
||||
if not _check_job_ownership(job, auth_result):
|
||||
raise HTTPException(status_code=403, detail="You don't have permission to retry this job")
|
||||
|
||||
if job.status not in [JobStatus.FAILED, JobStatus.CANCELLED]:
|
||||
raise HTTPException(
|
||||
status_code=400,
|
||||
@@ -1301,19 +1409,19 @@ async def get_worker_logs(
|
||||
job_id: str,
|
||||
since_index: int = 0,
|
||||
worker: Optional[str] = None,
|
||||
auth_data: Tuple[str, UserType, int] = Depends(require_auth)
|
||||
auth_result: AuthResult = Depends(require_auth)
|
||||
) -> Dict[str, Any]:
|
||||
"""
|
||||
Get worker logs for debugging.
|
||||
|
||||
|
||||
This endpoint returns worker logs stored in Firestore.
|
||||
Use `since_index` for efficient polling (returns only new logs).
|
||||
|
||||
|
||||
Args:
|
||||
job_id: Job ID
|
||||
since_index: Return only logs after this index (for pagination/polling)
|
||||
worker: Filter by worker name (audio, lyrics, screens, video, render)
|
||||
|
||||
|
||||
Returns:
|
||||
{
|
||||
"logs": [{"timestamp": "...", "level": "INFO", "worker": "audio", "message": "..."}],
|
||||
@@ -1324,10 +1432,14 @@ async def get_worker_logs(
|
||||
job = job_manager.get_job(job_id)
|
||||
if not job:
|
||||
raise HTTPException(status_code=404, detail="Job not found")
|
||||
|
||||
|
||||
# Check ownership - users can only see logs for their own jobs
|
||||
if not _check_job_ownership(job, auth_result):
|
||||
raise HTTPException(status_code=403, detail="You don't have permission to access logs for this job")
|
||||
|
||||
logs = job_manager.get_worker_logs(job_id, since_index=since_index, worker=worker)
|
||||
total = len(job.worker_logs) if job.worker_logs else 0
|
||||
|
||||
|
||||
return {
|
||||
"logs": logs,
|
||||
"next_index": total,
|
||||
|
||||
@@ -10,6 +10,7 @@ from backend.config import settings
|
||||
from backend.api.routes import health, jobs, internal, file_upload, review, auth, audio_search, themes, users
|
||||
from backend.services.tracing import setup_tracing, instrument_app, get_current_trace_id
|
||||
from backend.services.structured_logging import setup_structured_logging
|
||||
from backend.middleware.audit_logging import AuditLoggingMiddleware
|
||||
|
||||
|
||||
from backend.version import VERSION
|
||||
@@ -100,6 +101,9 @@ app.add_middleware(
|
||||
allow_headers=["*"],
|
||||
)
|
||||
|
||||
# Add audit logging middleware (captures all requests with request_id for correlation)
|
||||
app.add_middleware(AuditLoggingMiddleware)
|
||||
|
||||
# Include routers
|
||||
app.include_router(health.router, prefix="/api")
|
||||
app.include_router(jobs.router, prefix="/api")
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
"""Middleware package for FastAPI application."""
|
||||
|
||||
from backend.middleware.audit_logging import AuditLoggingMiddleware
|
||||
|
||||
__all__ = ["AuditLoggingMiddleware"]
|
||||
@@ -0,0 +1,124 @@
|
||||
"""
|
||||
Audit logging middleware for tracking all HTTP requests.
|
||||
|
||||
This middleware captures request metadata and logs it to Cloud Logging
|
||||
for audit trail and user activity investigation purposes.
|
||||
"""
|
||||
import logging
|
||||
import time
|
||||
import uuid
|
||||
from starlette.middleware.base import BaseHTTPMiddleware
|
||||
from starlette.requests import Request
|
||||
from starlette.responses import Response
|
||||
|
||||
|
||||
logger = logging.getLogger("audit")
|
||||
|
||||
# Endpoints to exclude from audit logging (high-frequency health checks)
|
||||
EXCLUDED_PATHS = {
|
||||
"/",
|
||||
"/api/health",
|
||||
"/api/health/detailed",
|
||||
"/api/readiness",
|
||||
"/healthz",
|
||||
"/ready",
|
||||
}
|
||||
|
||||
|
||||
class AuditLoggingMiddleware(BaseHTTPMiddleware):
|
||||
"""
|
||||
Middleware that logs all HTTP requests for audit purposes.
|
||||
|
||||
Captures:
|
||||
- request_id: UUID for correlating with auth logs
|
||||
- method: HTTP method
|
||||
- path: Request path
|
||||
- status_code: Response status
|
||||
- latency_ms: Request duration
|
||||
- client_ip: Client IP (from X-Forwarded-For for proxied requests)
|
||||
- user_agent: Browser/client identifier
|
||||
|
||||
The request_id is stored in request.state and added to response headers,
|
||||
allowing correlation with auth logs that capture user_email.
|
||||
"""
|
||||
|
||||
async def dispatch(self, request: Request, call_next) -> Response:
|
||||
# Skip excluded paths (health checks)
|
||||
if request.url.path in EXCLUDED_PATHS:
|
||||
return await call_next(request)
|
||||
|
||||
# Generate unique request ID for correlation
|
||||
request_id = str(uuid.uuid4())
|
||||
request.state.request_id = request_id
|
||||
|
||||
# Capture start time
|
||||
start_time = time.time()
|
||||
|
||||
# Extract client info
|
||||
client_ip = self._get_client_ip(request)
|
||||
user_agent = request.headers.get("user-agent", "")
|
||||
|
||||
# Process request
|
||||
try:
|
||||
response = await call_next(request)
|
||||
except Exception:
|
||||
# Log failed requests too (exception() auto-includes stack trace)
|
||||
latency_ms = int((time.time() - start_time) * 1000)
|
||||
logger.exception(
|
||||
"request_audit_error",
|
||||
extra={
|
||||
"request_id": request_id,
|
||||
"method": request.method,
|
||||
"path": request.url.path,
|
||||
"query_string": str(request.query_params) if request.query_params else None,
|
||||
"latency_ms": latency_ms,
|
||||
"client_ip": client_ip,
|
||||
"user_agent": user_agent[:200] if user_agent else None,
|
||||
"audit_type": "http_request",
|
||||
}
|
||||
)
|
||||
raise
|
||||
|
||||
# Calculate latency
|
||||
latency_ms = int((time.time() - start_time) * 1000)
|
||||
|
||||
# Log audit entry (INFO level for successful requests)
|
||||
log_level = logging.WARNING if response.status_code >= 400 else logging.INFO
|
||||
logger.log(
|
||||
log_level,
|
||||
"request_audit",
|
||||
extra={
|
||||
"request_id": request_id,
|
||||
"method": request.method,
|
||||
"path": request.url.path,
|
||||
"query_string": str(request.query_params) if request.query_params else None,
|
||||
"status_code": response.status_code,
|
||||
"latency_ms": latency_ms,
|
||||
"client_ip": client_ip,
|
||||
"user_agent": user_agent[:200] if user_agent else None,
|
||||
"audit_type": "http_request",
|
||||
}
|
||||
)
|
||||
|
||||
# Add request_id to response headers for debugging/correlation
|
||||
response.headers["X-Request-ID"] = request_id
|
||||
|
||||
return response
|
||||
|
||||
def _get_client_ip(self, request: Request) -> str:
|
||||
"""
|
||||
Extract client IP address, handling proxy scenarios.
|
||||
|
||||
Cloud Run and other proxies set X-Forwarded-For header.
|
||||
"""
|
||||
# Check X-Forwarded-For for proxy scenarios (Cloud Run, load balancers)
|
||||
forwarded = request.headers.get("x-forwarded-for", "")
|
||||
if forwarded:
|
||||
# First IP is the original client
|
||||
return forwarded.split(",")[0].strip()
|
||||
|
||||
# Fall back to direct connection
|
||||
if request.client:
|
||||
return request.client.host
|
||||
|
||||
return "unknown"
|
||||
@@ -3,48 +3,81 @@ Authentication service for karaoke backend.
|
||||
|
||||
Provides token-based authentication with support for:
|
||||
- Admin tokens (hardcoded in environment)
|
||||
- Admin by email domain (@nomadkaraoke.com)
|
||||
- User tokens (stored in Firestore auth_tokens collection)
|
||||
- Session tokens (stored in Firestore sessions collection, from magic link auth)
|
||||
- API keys for business users
|
||||
- Usage tracking and limits
|
||||
- Token management API
|
||||
"""
|
||||
import logging
|
||||
import hashlib
|
||||
import time
|
||||
import secrets
|
||||
from dataclasses import dataclass
|
||||
from enum import Enum
|
||||
from typing import Optional, Tuple, Dict, Any
|
||||
from typing import Optional, Tuple, Dict, Any, List
|
||||
from datetime import datetime
|
||||
|
||||
from backend.services.firestore_service import FirestoreService
|
||||
from backend.config import get_settings
|
||||
from backend.models.user import UserRole
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# Admin email domains - users with these domains are automatically admin
|
||||
ADMIN_EMAIL_DOMAINS = ["nomadkaraoke.com"]
|
||||
|
||||
|
||||
class UserType(str, Enum):
|
||||
"""User access levels."""
|
||||
ADMIN = "admin" # Unlimited access, can manage tokens
|
||||
UNLIMITED = "unlimited" # Unlimited karaoke generation
|
||||
LIMITED = "limited" # Limited number of uses
|
||||
STRIPE = "stripe" # Paid access via Stripe (future)
|
||||
STRIPE = "stripe" # Paid access via Stripe
|
||||
API_KEY = "api_key" # Business API key access
|
||||
|
||||
|
||||
@dataclass
|
||||
class AuthResult:
|
||||
"""Result of authentication validation."""
|
||||
is_valid: bool
|
||||
user_type: UserType
|
||||
remaining_uses: int # -1 = unlimited, 0 = exhausted, >0 = remaining
|
||||
message: str
|
||||
user_email: Optional[str] = None # Email if authenticated via session/API key
|
||||
is_admin: bool = False # True if admin token or admin email domain
|
||||
api_key_id: Optional[str] = None # API key ID if authenticated via API key
|
||||
|
||||
def __iter__(self):
|
||||
"""Allow unpacking as tuple for backward compatibility."""
|
||||
return iter((self.is_valid, self.user_type, self.remaining_uses, self.message))
|
||||
|
||||
|
||||
def is_admin_email(email: str) -> bool:
|
||||
"""Check if an email belongs to an admin domain."""
|
||||
if not email:
|
||||
return False
|
||||
email_lower = email.lower()
|
||||
return any(email_lower.endswith(f"@{domain}") for domain in ADMIN_EMAIL_DOMAINS)
|
||||
|
||||
|
||||
class AuthService:
|
||||
"""Service for authentication and token management."""
|
||||
|
||||
|
||||
def __init__(self):
|
||||
"""Initialize auth service."""
|
||||
self.firestore = FirestoreService()
|
||||
self.settings = get_settings()
|
||||
self._init_admin_tokens()
|
||||
|
||||
|
||||
def _init_admin_tokens(self):
|
||||
"""Load admin tokens from environment variables."""
|
||||
# Get admin tokens from secret manager or env vars
|
||||
admin_tokens_str = self.settings.admin_tokens or ""
|
||||
self.admin_tokens = [t.strip() for t in admin_tokens_str.split(",") if t.strip()]
|
||||
|
||||
|
||||
if self.admin_tokens:
|
||||
logger.info(f"Loaded {len(self.admin_tokens)} admin token(s)")
|
||||
else:
|
||||
@@ -147,7 +180,261 @@ class AuthService:
|
||||
return True, token_type, -1, "Stripe access granted"
|
||||
|
||||
return False, UserType.LIMITED, 0, "Unknown token type"
|
||||
|
||||
|
||||
def validate_token_full(self, token: str) -> AuthResult:
|
||||
"""
|
||||
Validate an access token and return full authentication details.
|
||||
|
||||
This is the preferred method for new code as it returns complete
|
||||
authentication context including user email and admin status.
|
||||
|
||||
Returns:
|
||||
AuthResult with full authentication details
|
||||
"""
|
||||
if not token:
|
||||
return AuthResult(
|
||||
is_valid=False,
|
||||
user_type=UserType.LIMITED,
|
||||
remaining_uses=0,
|
||||
message="No token provided"
|
||||
)
|
||||
|
||||
# Check for admin tokens (highest priority)
|
||||
# Admin tokens from env var are associated with the system admin email
|
||||
if token in self.admin_tokens:
|
||||
logger.info("Admin token validated")
|
||||
return AuthResult(
|
||||
is_valid=True,
|
||||
user_type=UserType.ADMIN,
|
||||
remaining_uses=-1,
|
||||
message="Admin access granted",
|
||||
user_email="admin@nomadkaraoke.com",
|
||||
is_admin=True
|
||||
)
|
||||
|
||||
# Check stored tokens in Firestore (auth_tokens collection)
|
||||
token_data = self.firestore.get_token(token)
|
||||
|
||||
if not token_data:
|
||||
# Fall back to checking session tokens (from magic link auth)
|
||||
from backend.services.user_service import get_user_service
|
||||
|
||||
user_service = get_user_service()
|
||||
is_valid, user, _message = user_service.validate_session(token)
|
||||
|
||||
if is_valid and user:
|
||||
# Session is valid - user is authenticated via magic link
|
||||
credits = user.credits
|
||||
user_email = user.email
|
||||
|
||||
# Check if user is admin by email domain or role
|
||||
user_is_admin = is_admin_email(user_email) or user.role == UserRole.ADMIN
|
||||
|
||||
if user_is_admin:
|
||||
logger.info(f"Admin session validated for {user_email}")
|
||||
return AuthResult(
|
||||
is_valid=True,
|
||||
user_type=UserType.ADMIN,
|
||||
remaining_uses=-1,
|
||||
message="Admin access granted (domain)",
|
||||
user_email=user_email,
|
||||
is_admin=True
|
||||
)
|
||||
|
||||
logger.info(f"Session token validated for user {user_email} (credits: {credits})")
|
||||
|
||||
if credits <= 0:
|
||||
return AuthResult(
|
||||
is_valid=True,
|
||||
user_type=UserType.STRIPE,
|
||||
remaining_uses=0,
|
||||
message="Authenticated but no credits remaining",
|
||||
user_email=user_email,
|
||||
is_admin=False
|
||||
)
|
||||
|
||||
return AuthResult(
|
||||
is_valid=True,
|
||||
user_type=UserType.STRIPE,
|
||||
remaining_uses=credits,
|
||||
message=f"Session valid: {credits} credits",
|
||||
user_email=user_email,
|
||||
is_admin=False
|
||||
)
|
||||
|
||||
# Neither auth_token nor session found
|
||||
return AuthResult(
|
||||
is_valid=False,
|
||||
user_type=UserType.LIMITED,
|
||||
remaining_uses=0,
|
||||
message="Invalid token"
|
||||
)
|
||||
|
||||
# Check if token is active
|
||||
if not token_data.get("active", True):
|
||||
return AuthResult(
|
||||
is_valid=False,
|
||||
user_type=UserType(token_data["type"]),
|
||||
remaining_uses=0,
|
||||
message="Token has been revoked"
|
||||
)
|
||||
|
||||
token_type = UserType(token_data["type"])
|
||||
max_uses = token_data.get("max_uses", -1)
|
||||
# All auth_tokens must have an associated user_email for job ownership
|
||||
token_user_email = token_data.get("user_email")
|
||||
api_key_id = token_data.get("api_key_id")
|
||||
|
||||
# Require user_email on all auth_tokens (no anonymous token auth)
|
||||
if not token_user_email:
|
||||
logger.warning("Auth token missing required user_email field")
|
||||
return AuthResult(
|
||||
is_valid=False,
|
||||
user_type=token_type,
|
||||
remaining_uses=0,
|
||||
message="Token configuration error: missing user_email. Please contact support."
|
||||
)
|
||||
|
||||
# Check if token's user is an admin (by email domain)
|
||||
token_is_admin = is_admin_email(token_user_email)
|
||||
|
||||
# UNLIMITED tokens: no usage limits
|
||||
if token_type == UserType.UNLIMITED:
|
||||
return AuthResult(
|
||||
is_valid=True,
|
||||
user_type=token_type,
|
||||
remaining_uses=-1,
|
||||
message="Unlimited access granted",
|
||||
user_email=token_user_email,
|
||||
is_admin=token_is_admin,
|
||||
api_key_id=api_key_id
|
||||
)
|
||||
|
||||
# LIMITED tokens: check usage count
|
||||
if token_type == UserType.LIMITED:
|
||||
if max_uses <= 0: # -1 means unlimited
|
||||
return AuthResult(
|
||||
is_valid=True,
|
||||
user_type=token_type,
|
||||
remaining_uses=-1,
|
||||
message="Limited token with unlimited uses",
|
||||
user_email=token_user_email,
|
||||
is_admin=token_is_admin,
|
||||
api_key_id=api_key_id
|
||||
)
|
||||
|
||||
current_uses = token_data.get("usage_count", 0)
|
||||
remaining = max_uses - current_uses
|
||||
|
||||
if remaining <= 0:
|
||||
return AuthResult(
|
||||
is_valid=False,
|
||||
user_type=token_type,
|
||||
remaining_uses=0,
|
||||
message="Token usage limit exceeded",
|
||||
user_email=token_user_email,
|
||||
api_key_id=api_key_id
|
||||
)
|
||||
|
||||
return AuthResult(
|
||||
is_valid=True,
|
||||
user_type=token_type,
|
||||
remaining_uses=remaining,
|
||||
message=f"Limited token: {remaining} uses remaining",
|
||||
user_email=token_user_email,
|
||||
is_admin=token_is_admin,
|
||||
api_key_id=api_key_id
|
||||
)
|
||||
|
||||
# STRIPE tokens: check expiration and usage
|
||||
if token_type == UserType.STRIPE:
|
||||
expires_at = token_data.get("expires_at")
|
||||
|
||||
if expires_at and time.time() > expires_at:
|
||||
return AuthResult(
|
||||
is_valid=False,
|
||||
user_type=token_type,
|
||||
remaining_uses=0,
|
||||
message="Token has expired",
|
||||
user_email=token_user_email,
|
||||
api_key_id=api_key_id
|
||||
)
|
||||
|
||||
if max_uses > 0:
|
||||
current_uses = token_data.get("usage_count", 0)
|
||||
remaining = max_uses - current_uses
|
||||
|
||||
if remaining <= 0:
|
||||
return AuthResult(
|
||||
is_valid=False,
|
||||
user_type=token_type,
|
||||
remaining_uses=0,
|
||||
message="Token usage limit exceeded",
|
||||
user_email=token_user_email,
|
||||
api_key_id=api_key_id
|
||||
)
|
||||
|
||||
return AuthResult(
|
||||
is_valid=True,
|
||||
user_type=token_type,
|
||||
remaining_uses=remaining,
|
||||
message=f"Stripe token: {remaining} uses remaining",
|
||||
user_email=token_user_email,
|
||||
is_admin=token_is_admin,
|
||||
api_key_id=api_key_id
|
||||
)
|
||||
|
||||
return AuthResult(
|
||||
is_valid=True,
|
||||
user_type=token_type,
|
||||
remaining_uses=-1,
|
||||
message="Stripe access granted",
|
||||
user_email=token_user_email,
|
||||
is_admin=token_is_admin,
|
||||
api_key_id=api_key_id
|
||||
)
|
||||
|
||||
# API_KEY tokens
|
||||
if token_type == UserType.API_KEY:
|
||||
if max_uses > 0:
|
||||
current_uses = token_data.get("usage_count", 0)
|
||||
remaining = max_uses - current_uses
|
||||
if remaining <= 0:
|
||||
return AuthResult(
|
||||
is_valid=False,
|
||||
user_type=token_type,
|
||||
remaining_uses=0,
|
||||
message="API key usage limit exceeded",
|
||||
user_email=token_user_email,
|
||||
api_key_id=api_key_id
|
||||
)
|
||||
return AuthResult(
|
||||
is_valid=True,
|
||||
user_type=token_type,
|
||||
remaining_uses=remaining,
|
||||
message=f"API key valid: {remaining} uses remaining",
|
||||
user_email=token_user_email,
|
||||
is_admin=token_is_admin,
|
||||
api_key_id=api_key_id
|
||||
)
|
||||
|
||||
return AuthResult(
|
||||
is_valid=True,
|
||||
user_type=token_type,
|
||||
remaining_uses=-1,
|
||||
message="API key access granted",
|
||||
user_email=token_user_email,
|
||||
is_admin=token_is_admin,
|
||||
api_key_id=api_key_id
|
||||
)
|
||||
|
||||
return AuthResult(
|
||||
is_valid=False,
|
||||
user_type=UserType.LIMITED,
|
||||
remaining_uses=0,
|
||||
message="Unknown token type"
|
||||
)
|
||||
|
||||
def increment_token_usage(self, token: str, job_id: str) -> bool:
|
||||
"""
|
||||
Increment usage count for a token and track the job.
|
||||
|
||||
@@ -199,7 +199,7 @@ class DropboxService:
|
||||
|
||||
def upload_folder(self, local_dir: str, remote_path: str) -> None:
|
||||
"""
|
||||
Upload all files in a directory to Dropbox folder.
|
||||
Recursively upload all files and subdirectories to Dropbox folder.
|
||||
|
||||
Args:
|
||||
local_dir: Local directory to upload
|
||||
@@ -212,10 +212,17 @@ class DropboxService:
|
||||
logger.info(f"Uploading folder {local_dir} to {remote_path}")
|
||||
|
||||
uploaded_count = 0
|
||||
for filename in os.listdir(local_dir):
|
||||
local_file = os.path.join(local_dir, filename)
|
||||
if os.path.isfile(local_file):
|
||||
remote_file = f"{remote_path}/{filename}"
|
||||
for root, _dirs, files in os.walk(local_dir):
|
||||
# Calculate the relative path from local_dir to current root
|
||||
rel_root = os.path.relpath(root, local_dir)
|
||||
if rel_root == ".":
|
||||
current_remote = remote_path
|
||||
else:
|
||||
current_remote = f"{remote_path}/{rel_root}"
|
||||
|
||||
for filename in files:
|
||||
local_file = os.path.join(root, filename)
|
||||
remote_file = f"{current_remote}/{filename}"
|
||||
self.upload_file(local_file, remote_file)
|
||||
uploaded_count += 1
|
||||
|
||||
|
||||
@@ -121,12 +121,13 @@ class EmailService:
|
||||
self.settings = get_settings()
|
||||
self.provider = self._get_provider()
|
||||
self.frontend_url = os.getenv("FRONTEND_URL", "https://gen.nomadkaraoke.com")
|
||||
self.buy_url = os.getenv("BUY_URL", "https://buy.nomadkaraoke.com")
|
||||
# After consolidation, buy URL is the same as frontend URL
|
||||
self.buy_url = os.getenv("BUY_URL", self.frontend_url)
|
||||
|
||||
def _get_provider(self) -> EmailProvider:
|
||||
"""Get the configured email provider."""
|
||||
sendgrid_api_key = os.getenv("SENDGRID_API_KEY")
|
||||
from_email = os.getenv("EMAIL_FROM", "noreply@nomadkaraoke.com")
|
||||
from_email = os.getenv("EMAIL_FROM", "gen@nomadkaraoke.com")
|
||||
from_name = os.getenv("EMAIL_FROM_NAME", "Nomad Karaoke")
|
||||
|
||||
if sendgrid_api_key:
|
||||
|
||||
@@ -114,47 +114,53 @@ class FirestoreService:
|
||||
client_id: Optional[str] = None,
|
||||
created_after: Optional[datetime] = None,
|
||||
created_before: Optional[datetime] = None,
|
||||
user_email: Optional[str] = None,
|
||||
limit: int = 100
|
||||
) -> List[Job]:
|
||||
"""
|
||||
List jobs with optional filters.
|
||||
|
||||
|
||||
Args:
|
||||
status: Filter by job status
|
||||
environment: Filter by request_metadata.environment (test/production/development)
|
||||
client_id: Filter by request_metadata.client_id
|
||||
created_after: Filter jobs created after this datetime
|
||||
created_before: Filter jobs created before this datetime
|
||||
user_email: Filter by user_email (owner of the job)
|
||||
limit: Maximum number of jobs to return
|
||||
|
||||
|
||||
Returns:
|
||||
List of Job objects matching filters, ordered by created_at descending
|
||||
"""
|
||||
try:
|
||||
query = self.db.collection(self.collection)
|
||||
|
||||
|
||||
if status:
|
||||
query = query.where(filter=FieldFilter('status', '==', status.value))
|
||||
|
||||
|
||||
# Filter by request_metadata fields using dot notation
|
||||
if environment:
|
||||
query = query.where(filter=FieldFilter('request_metadata.environment', '==', environment))
|
||||
|
||||
|
||||
if client_id:
|
||||
query = query.where(filter=FieldFilter('request_metadata.client_id', '==', client_id))
|
||||
|
||||
|
||||
# Filter by user_email (job owner)
|
||||
if user_email:
|
||||
query = query.where(filter=FieldFilter('user_email', '==', user_email.lower()))
|
||||
|
||||
# Date range filters
|
||||
if created_after:
|
||||
query = query.where(filter=FieldFilter('created_at', '>=', created_after))
|
||||
|
||||
|
||||
if created_before:
|
||||
query = query.where(filter=FieldFilter('created_at', '<=', created_before))
|
||||
|
||||
|
||||
query = query.order_by('created_at', direction=firestore.Query.DESCENDING).limit(limit)
|
||||
|
||||
|
||||
docs = query.stream()
|
||||
jobs = [Job(**doc.to_dict()) for doc in docs]
|
||||
|
||||
|
||||
return jobs
|
||||
except Exception as e:
|
||||
logger.error(f"Error listing jobs: {e}")
|
||||
|
||||
@@ -111,19 +111,21 @@ class JobManager:
|
||||
client_id: Optional[str] = None,
|
||||
created_after: Optional[datetime] = None,
|
||||
created_before: Optional[datetime] = None,
|
||||
user_email: Optional[str] = None,
|
||||
limit: int = 100
|
||||
) -> List[Job]:
|
||||
"""
|
||||
List jobs with optional filtering.
|
||||
|
||||
|
||||
Args:
|
||||
status: Filter by job status
|
||||
environment: Filter by request_metadata.environment (test/production/development)
|
||||
client_id: Filter by request_metadata.client_id (customer identifier)
|
||||
created_after: Filter jobs created after this datetime
|
||||
created_before: Filter jobs created before this datetime
|
||||
user_email: Filter by user_email (job owner)
|
||||
limit: Maximum number of jobs to return
|
||||
|
||||
|
||||
Returns:
|
||||
List of Job objects matching filters
|
||||
"""
|
||||
@@ -133,6 +135,7 @@ class JobManager:
|
||||
client_id=client_id,
|
||||
created_after=created_after,
|
||||
created_before=created_before,
|
||||
user_email=user_email,
|
||||
limit=limit
|
||||
)
|
||||
|
||||
|
||||
@@ -56,7 +56,8 @@ class StripeService:
|
||||
self.secret_key = os.getenv("STRIPE_SECRET_KEY")
|
||||
self.webhook_secret = os.getenv("STRIPE_WEBHOOK_SECRET")
|
||||
self.frontend_url = os.getenv("FRONTEND_URL", "https://gen.nomadkaraoke.com")
|
||||
self.buy_url = os.getenv("BUY_URL", "https://buy.nomadkaraoke.com")
|
||||
# After consolidation, buy URL is the same as frontend URL
|
||||
self.buy_url = os.getenv("BUY_URL", self.frontend_url)
|
||||
|
||||
if self.secret_key:
|
||||
stripe.api_key = self.secret_key
|
||||
|
||||
@@ -91,7 +91,15 @@ class StructuredFormatter(logging.Formatter):
|
||||
|
||||
# Add custom fields from 'extra' dict
|
||||
# Common fields we want to extract from log records
|
||||
custom_fields = ["job_id", "worker", "operation", "duration", "status", "error"]
|
||||
custom_fields = [
|
||||
# Job-related fields
|
||||
"job_id", "worker", "operation", "duration", "status", "error",
|
||||
# Audit logging fields (from middleware and auth)
|
||||
"request_id", "user_email", "client_ip", "latency_ms",
|
||||
"audit_type", "method", "path", "status_code", "query_string",
|
||||
"user_agent", "user_type", "is_admin", "remaining_uses",
|
||||
"auth_message", "token_provided", "token_length", "auth_header_present",
|
||||
]
|
||||
for field in custom_fields:
|
||||
value = getattr(record, field, None)
|
||||
if value is not None:
|
||||
|
||||
@@ -10,7 +10,7 @@ Handles:
|
||||
import logging
|
||||
import secrets
|
||||
import uuid
|
||||
from datetime import datetime, timedelta
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from typing import Optional, List, Tuple
|
||||
|
||||
from google.cloud import firestore
|
||||
@@ -47,6 +47,9 @@ MAX_CREDIT_TRANSACTIONS = 100 # Keep last N transactions
|
||||
class UserService:
|
||||
"""Service for user management and authentication."""
|
||||
|
||||
# Number of free credits granted to new users
|
||||
NEW_USER_FREE_CREDITS = 1
|
||||
|
||||
def __init__(self):
|
||||
"""Initialize user service with Firestore client."""
|
||||
self.settings = get_settings()
|
||||
@@ -71,17 +74,32 @@ class UserService:
|
||||
return None
|
||||
|
||||
def get_or_create_user(self, email: str) -> User:
|
||||
"""Get existing user or create a new one."""
|
||||
"""
|
||||
Get existing user or create a new one.
|
||||
|
||||
New users receive a welcome credit to try the service.
|
||||
"""
|
||||
email = email.lower()
|
||||
user = self.get_user(email)
|
||||
|
||||
if user:
|
||||
return user
|
||||
|
||||
# Create new user
|
||||
user = User(email=email)
|
||||
# Create new user with welcome credit
|
||||
welcome_credit = self.NEW_USER_FREE_CREDITS
|
||||
welcome_transaction = CreditTransaction(
|
||||
id=str(uuid.uuid4()),
|
||||
amount=welcome_credit,
|
||||
reason="welcome_credit",
|
||||
)
|
||||
|
||||
user = User(
|
||||
email=email,
|
||||
credits=welcome_credit,
|
||||
credit_transactions=[welcome_transaction],
|
||||
)
|
||||
self._save_user(user)
|
||||
logger.info(f"Created new user: {email}")
|
||||
logger.info(f"Created new user: {email} with {welcome_credit} welcome credit(s)")
|
||||
return user
|
||||
|
||||
def _save_user(self, user: User) -> None:
|
||||
@@ -248,6 +266,7 @@ class UserService:
|
||||
) -> Session:
|
||||
"""Create a new session for an authenticated user."""
|
||||
token = secrets.token_urlsafe(32)
|
||||
token_prefix = token[:12]
|
||||
|
||||
session = Session(
|
||||
token=token,
|
||||
@@ -257,10 +276,19 @@ class UserService:
|
||||
user_agent=user_agent,
|
||||
)
|
||||
|
||||
# Serialize and write to Firestore
|
||||
session_data = session.model_dump(mode='json')
|
||||
doc_ref = self.db.collection(SESSIONS_COLLECTION).document(token)
|
||||
doc_ref.set(session.model_dump(mode='json'))
|
||||
doc_ref.set(session_data)
|
||||
|
||||
# Verify the write succeeded by reading back
|
||||
verify_doc = doc_ref.get()
|
||||
if not verify_doc.exists:
|
||||
logger.error(f"Session write verification FAILED for {user_email}: {token_prefix}...")
|
||||
raise RuntimeError(f"Failed to persist session for {user_email}")
|
||||
|
||||
logger.info(f"Created and verified session for {user_email}: {token_prefix}... (expires: {session.expires_at})")
|
||||
|
||||
logger.info(f"Created session for {user_email}")
|
||||
return session
|
||||
|
||||
def validate_session(self, token: str) -> Tuple[bool, Optional[User], str]:
|
||||
@@ -270,43 +298,71 @@ class UserService:
|
||||
Returns:
|
||||
(valid, user, message)
|
||||
"""
|
||||
# Log token info for debugging (only prefix for security)
|
||||
token_prefix = token[:12] if token and len(token) >= 12 else token
|
||||
logger.debug(f"Validating session token: {token_prefix}... (len={len(token) if token else 0})")
|
||||
|
||||
try:
|
||||
doc_ref = self.db.collection(SESSIONS_COLLECTION).document(token)
|
||||
doc = doc_ref.get()
|
||||
|
||||
if not doc.exists:
|
||||
logger.warning(f"Session not found in Firestore: {token_prefix}...")
|
||||
return False, None, "Invalid session"
|
||||
|
||||
session = Session(**doc.to_dict())
|
||||
raw_data = doc.to_dict()
|
||||
logger.debug(f"Session data found for {token_prefix}...: user_email={raw_data.get('user_email')}, is_active={raw_data.get('is_active')}")
|
||||
|
||||
session = Session(**raw_data)
|
||||
|
||||
# Check if active
|
||||
if not session.is_active:
|
||||
logger.warning(f"Session revoked for {token_prefix}... (user: {session.user_email})")
|
||||
return False, None, "Session has been revoked"
|
||||
|
||||
# Use timezone-aware datetime for all comparisons
|
||||
# Firestore returns timezone-aware datetimes, so we must use aware datetimes
|
||||
now = datetime.now(timezone.utc)
|
||||
|
||||
# Normalize session datetimes to be timezone-aware for comparison
|
||||
# (handles legacy naive datetimes that may exist in Firestore)
|
||||
expires_at = session.expires_at
|
||||
if expires_at.tzinfo is None:
|
||||
expires_at = expires_at.replace(tzinfo=timezone.utc)
|
||||
|
||||
last_activity = session.last_activity_at
|
||||
if last_activity.tzinfo is None:
|
||||
last_activity = last_activity.replace(tzinfo=timezone.utc)
|
||||
|
||||
# Check expiry
|
||||
if datetime.utcnow() > session.expires_at:
|
||||
if now > expires_at:
|
||||
logger.warning(f"Session expired for {token_prefix}... (user: {session.user_email}, expired_at: {expires_at}, now: {now})")
|
||||
return False, None, "Session has expired"
|
||||
|
||||
# Check inactivity (7 days)
|
||||
inactivity_limit = datetime.utcnow() - timedelta(days=SESSION_EXPIRY_DAYS)
|
||||
if session.last_activity_at < inactivity_limit:
|
||||
inactivity_limit = now - timedelta(days=SESSION_EXPIRY_DAYS)
|
||||
if last_activity < inactivity_limit:
|
||||
logger.warning(f"Session inactive for {token_prefix}... (user: {session.user_email}, last_activity: {last_activity}, limit: {inactivity_limit})")
|
||||
return False, None, "Session expired due to inactivity"
|
||||
|
||||
# Update last activity
|
||||
doc_ref.update({'last_activity_at': datetime.utcnow()})
|
||||
# Update last activity (use timezone-aware datetime)
|
||||
doc_ref.update({'last_activity_at': now})
|
||||
|
||||
# Get user
|
||||
user = self.get_user(session.user_email)
|
||||
if not user:
|
||||
logger.warning(f"User not found for session {token_prefix}...: {session.user_email}")
|
||||
return False, None, "User not found"
|
||||
|
||||
if not user.is_active:
|
||||
logger.warning(f"User account disabled for session {token_prefix}...: {session.user_email}")
|
||||
return False, None, "User account is disabled"
|
||||
|
||||
logger.debug(f"Session valid for {token_prefix}... (user: {user.email}, credits: {user.credits})")
|
||||
return True, user, "Valid session"
|
||||
|
||||
except Exception:
|
||||
logger.exception("Error validating session")
|
||||
logger.exception(f"Error validating session {token_prefix}...")
|
||||
return False, None, "An error occurred during validation"
|
||||
|
||||
def revoke_session(self, token: str) -> bool:
|
||||
@@ -340,6 +396,47 @@ class UserService:
|
||||
logger.exception("Error revoking sessions")
|
||||
return 0
|
||||
|
||||
def list_sessions_for_user(
|
||||
self,
|
||||
user_email: str,
|
||||
include_revoked: bool = False,
|
||||
limit: int = 50
|
||||
) -> List[Session]:
|
||||
"""
|
||||
List all sessions for a user.
|
||||
|
||||
Args:
|
||||
user_email: User's email address
|
||||
include_revoked: If True, include revoked/inactive sessions
|
||||
limit: Maximum number of sessions to return
|
||||
|
||||
Returns:
|
||||
List of Session objects, ordered by created_at descending
|
||||
"""
|
||||
try:
|
||||
query = self.db.collection(SESSIONS_COLLECTION).where(
|
||||
filter=FieldFilter('user_email', '==', user_email.lower())
|
||||
)
|
||||
|
||||
if not include_revoked:
|
||||
query = query.where(filter=FieldFilter('is_active', '==', True))
|
||||
|
||||
query = query.order_by('created_at', direction=firestore.Query.DESCENDING)
|
||||
query = query.limit(limit)
|
||||
|
||||
sessions = []
|
||||
for doc in query.stream():
|
||||
try:
|
||||
sessions.append(Session(**doc.to_dict()))
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to parse session document: {e}")
|
||||
|
||||
logger.debug(f"Found {len(sessions)} sessions for {user_email}")
|
||||
return sessions
|
||||
except Exception:
|
||||
logger.exception(f"Error listing sessions for {user_email}")
|
||||
return []
|
||||
|
||||
# =========================================================================
|
||||
# Credit Operations
|
||||
# =========================================================================
|
||||
|
||||
@@ -321,31 +321,95 @@ class TestUploadFile:
|
||||
|
||||
class TestUploadFolder:
|
||||
"""Test upload_folder method."""
|
||||
|
||||
|
||||
@patch("backend.services.dropbox_service.secretmanager.SecretManagerServiceClient")
|
||||
def test_upload_folder(self, mock_sm_client_class, tmp_path):
|
||||
"""Test uploading a folder with multiple files."""
|
||||
from backend.services.dropbox_service import DropboxService
|
||||
|
||||
|
||||
mock_sm_client = Mock()
|
||||
mock_response = Mock()
|
||||
mock_response.payload.data = json.dumps({"access_token": "token"}).encode()
|
||||
mock_sm_client.access_secret_version.return_value = mock_response
|
||||
mock_sm_client_class.return_value = mock_sm_client
|
||||
|
||||
# Create test folder with files
|
||||
|
||||
# Create test folder with files (no subdirs for this test)
|
||||
(tmp_path / "file1.txt").write_text("content1")
|
||||
(tmp_path / "file2.txt").write_text("content2")
|
||||
(tmp_path / "subdir").mkdir() # Should be skipped
|
||||
|
||||
|
||||
service = DropboxService()
|
||||
|
||||
|
||||
with patch.object(service, "upload_file") as mock_upload:
|
||||
service.upload_folder(str(tmp_path), "/Uploads/folder")
|
||||
|
||||
# Should upload 2 files (not subdir)
|
||||
|
||||
# Should upload 2 files
|
||||
assert mock_upload.call_count == 2
|
||||
|
||||
@patch("backend.services.dropbox_service.secretmanager.SecretManagerServiceClient")
|
||||
def test_upload_folder_recursive(self, mock_sm_client_class, tmp_path):
|
||||
"""Test uploading a folder recursively includes subdirectories."""
|
||||
from backend.services.dropbox_service import DropboxService
|
||||
|
||||
mock_sm_client = Mock()
|
||||
mock_response = Mock()
|
||||
mock_response.payload.data = json.dumps({"access_token": "token"}).encode()
|
||||
mock_sm_client.access_secret_version.return_value = mock_response
|
||||
mock_sm_client_class.return_value = mock_sm_client
|
||||
|
||||
# Create test folder with files and subdirectories
|
||||
(tmp_path / "root_file.txt").write_text("root content")
|
||||
(tmp_path / "stems").mkdir()
|
||||
(tmp_path / "stems" / "vocals.flac").write_text("vocals")
|
||||
(tmp_path / "stems" / "instrumental.flac").write_text("instrumental")
|
||||
(tmp_path / "lyrics").mkdir()
|
||||
(tmp_path / "lyrics" / "song.lrc").write_text("lyrics")
|
||||
|
||||
service = DropboxService()
|
||||
|
||||
uploaded_files = []
|
||||
def capture_upload(local_path, remote_path):
|
||||
uploaded_files.append(remote_path)
|
||||
|
||||
with patch.object(service, "upload_file", side_effect=capture_upload) as mock_upload:
|
||||
service.upload_folder(str(tmp_path), "/Uploads/folder")
|
||||
|
||||
# Should upload 4 files (1 root + 2 stems + 1 lyrics)
|
||||
assert mock_upload.call_count == 4
|
||||
|
||||
# Check that subdirectory structure is preserved
|
||||
assert "/Uploads/folder/root_file.txt" in uploaded_files
|
||||
assert "/Uploads/folder/stems/vocals.flac" in uploaded_files
|
||||
assert "/Uploads/folder/stems/instrumental.flac" in uploaded_files
|
||||
assert "/Uploads/folder/lyrics/song.lrc" in uploaded_files
|
||||
|
||||
@patch("backend.services.dropbox_service.secretmanager.SecretManagerServiceClient")
|
||||
def test_upload_folder_deeply_nested(self, mock_sm_client_class, tmp_path):
|
||||
"""Test uploading deeply nested folder structure."""
|
||||
from backend.services.dropbox_service import DropboxService
|
||||
|
||||
mock_sm_client = Mock()
|
||||
mock_response = Mock()
|
||||
mock_response.payload.data = json.dumps({"access_token": "token"}).encode()
|
||||
mock_sm_client.access_secret_version.return_value = mock_response
|
||||
mock_sm_client_class.return_value = mock_sm_client
|
||||
|
||||
# Create deeply nested structure
|
||||
(tmp_path / "level1").mkdir()
|
||||
(tmp_path / "level1" / "level2").mkdir()
|
||||
(tmp_path / "level1" / "level2" / "deep_file.txt").write_text("deep")
|
||||
|
||||
service = DropboxService()
|
||||
|
||||
uploaded_files = []
|
||||
def capture_upload(local_path, remote_path):
|
||||
uploaded_files.append(remote_path)
|
||||
|
||||
with patch.object(service, "upload_file", side_effect=capture_upload):
|
||||
service.upload_folder(str(tmp_path), "/Uploads/folder")
|
||||
|
||||
# Check deeply nested file is uploaded with correct path
|
||||
assert "/Uploads/folder/level1/level2/deep_file.txt" in uploaded_files
|
||||
|
||||
|
||||
class TestCreateSharedLink:
|
||||
"""Test create_shared_link method."""
|
||||
|
||||
@@ -54,10 +54,16 @@ def client(mock_job_manager, mock_worker_service):
|
||||
"""Create TestClient with mocked dependencies."""
|
||||
mock_creds = MagicMock()
|
||||
mock_creds.universe_domain = 'googleapis.com'
|
||||
|
||||
|
||||
# Create a JobManager class that returns our mock instance
|
||||
def mock_job_manager_factory(*args, **kwargs):
|
||||
return mock_job_manager
|
||||
|
||||
# Patch at the module level where jobs.py imports them
|
||||
# Also patch JobManager class used in dependencies.py for auth checks
|
||||
with patch('backend.api.routes.jobs.job_manager', mock_job_manager), \
|
||||
patch('backend.api.routes.jobs.worker_service', mock_worker_service), \
|
||||
patch('backend.services.job_manager.JobManager', mock_job_manager_factory), \
|
||||
patch('backend.services.firestore_service.firestore'), \
|
||||
patch('backend.services.storage_service.storage'), \
|
||||
patch('google.auth.default', return_value=(mock_creds, 'test-project')):
|
||||
@@ -87,9 +93,13 @@ class TestGetJob:
|
||||
mock_job_manager.get_job.return_value = None
|
||||
mock_creds = MagicMock()
|
||||
mock_creds.universe_domain = 'googleapis.com'
|
||||
|
||||
|
||||
def mock_job_manager_factory(*args, **kwargs):
|
||||
return mock_job_manager
|
||||
|
||||
with patch('backend.api.routes.jobs.job_manager', mock_job_manager), \
|
||||
patch('backend.api.routes.jobs.worker_service', mock_worker_service), \
|
||||
patch('backend.services.job_manager.JobManager', mock_job_manager_factory), \
|
||||
patch('backend.services.firestore_service.firestore'), \
|
||||
patch('backend.services.storage_service.storage'), \
|
||||
patch('google.auth.default', return_value=(mock_creds, 'test-project')):
|
||||
@@ -173,12 +183,17 @@ class TestDeleteJob:
|
||||
def test_delete_nonexistent_job(self, mock_worker_service, auth_headers):
|
||||
"""Test deleting non-existent job."""
|
||||
mock_job_manager = MagicMock()
|
||||
mock_job_manager.get_job.return_value = None # Job doesn't exist
|
||||
mock_job_manager.delete_job.return_value = False
|
||||
mock_creds = MagicMock()
|
||||
mock_creds.universe_domain = 'googleapis.com'
|
||||
|
||||
|
||||
def mock_job_manager_factory(*args, **kwargs):
|
||||
return mock_job_manager
|
||||
|
||||
with patch('backend.api.routes.jobs.job_manager', mock_job_manager), \
|
||||
patch('backend.api.routes.jobs.worker_service', mock_worker_service), \
|
||||
patch('backend.services.job_manager.JobManager', mock_job_manager_factory), \
|
||||
patch('backend.services.firestore_service.firestore'), \
|
||||
patch('backend.services.storage_service.storage'), \
|
||||
patch('google.auth.default', return_value=(mock_creds, 'test-project')):
|
||||
|
||||
@@ -970,10 +970,147 @@ class TestBackingVocalsAnalysis:
|
||||
def test_analysis_service_can_be_instantiated(self):
|
||||
"""Test that AudioAnalysisService can be instantiated."""
|
||||
from backend.services.audio_analysis_service import AudioAnalysisService
|
||||
|
||||
|
||||
mock_storage = MagicMock()
|
||||
service = AudioAnalysisService(storage_service=mock_storage)
|
||||
|
||||
|
||||
assert service is not None
|
||||
assert service.storage_service == mock_storage
|
||||
|
||||
|
||||
class TestModelNamesStorage:
|
||||
"""Tests for model names storage in audio_worker.
|
||||
|
||||
These tests verify that model names are stored in job state_data
|
||||
for use by video_worker in distribution directory preparation.
|
||||
"""
|
||||
|
||||
def test_effective_model_names_defaults(self):
|
||||
"""Test that default model names are used when not specified on job."""
|
||||
from backend.workers.audio_worker import (
|
||||
DEFAULT_CLEAN_MODEL,
|
||||
DEFAULT_BACKING_MODELS,
|
||||
DEFAULT_OTHER_MODELS,
|
||||
)
|
||||
|
||||
# Simulate the logic from process_audio_separation
|
||||
job_clean_model = None
|
||||
job_backing_models = None
|
||||
job_other_models = None
|
||||
|
||||
effective_model_names = {
|
||||
'clean_instrumental_model': job_clean_model or DEFAULT_CLEAN_MODEL,
|
||||
'backing_vocals_models': job_backing_models or DEFAULT_BACKING_MODELS,
|
||||
'other_stems_models': job_other_models or DEFAULT_OTHER_MODELS,
|
||||
}
|
||||
|
||||
assert effective_model_names['clean_instrumental_model'] == DEFAULT_CLEAN_MODEL
|
||||
assert effective_model_names['backing_vocals_models'] == DEFAULT_BACKING_MODELS
|
||||
assert effective_model_names['other_stems_models'] == DEFAULT_OTHER_MODELS
|
||||
|
||||
def test_effective_model_names_custom(self):
|
||||
"""Test that custom model names override defaults."""
|
||||
from backend.workers.audio_worker import (
|
||||
DEFAULT_CLEAN_MODEL,
|
||||
DEFAULT_BACKING_MODELS,
|
||||
DEFAULT_OTHER_MODELS,
|
||||
)
|
||||
|
||||
custom_clean = "custom_clean_model.ckpt"
|
||||
custom_backing = ["custom_backing.ckpt"]
|
||||
custom_other = ["custom_demucs.yaml"]
|
||||
|
||||
# Simulate the logic from process_audio_separation
|
||||
effective_model_names = {
|
||||
'clean_instrumental_model': custom_clean or DEFAULT_CLEAN_MODEL,
|
||||
'backing_vocals_models': custom_backing or DEFAULT_BACKING_MODELS,
|
||||
'other_stems_models': custom_other or DEFAULT_OTHER_MODELS,
|
||||
}
|
||||
|
||||
assert effective_model_names['clean_instrumental_model'] == custom_clean
|
||||
assert effective_model_names['backing_vocals_models'] == custom_backing
|
||||
assert effective_model_names['other_stems_models'] == custom_other
|
||||
|
||||
|
||||
class TestDistributionDirectoryPreparation:
|
||||
"""Tests for _prepare_distribution_directory in video_worker.
|
||||
|
||||
These tests verify that the distribution directory is prepared with:
|
||||
- stems/ subfolder containing all audio stems with model names
|
||||
- lyrics/ subfolder containing intermediate lyrics files
|
||||
- Properly named instrumentals at root level
|
||||
"""
|
||||
|
||||
def test_distribution_directory_creates_stems_folder(self, tmp_path):
|
||||
"""Test that stems directory is created."""
|
||||
stems_dir = tmp_path / "stems"
|
||||
stems_dir.mkdir()
|
||||
|
||||
assert stems_dir.exists()
|
||||
assert stems_dir.is_dir()
|
||||
|
||||
def test_distribution_directory_creates_lyrics_folder(self, tmp_path):
|
||||
"""Test that lyrics directory is created."""
|
||||
lyrics_dir = tmp_path / "lyrics"
|
||||
lyrics_dir.mkdir()
|
||||
|
||||
assert lyrics_dir.exists()
|
||||
assert lyrics_dir.is_dir()
|
||||
|
||||
def test_instrumental_naming_with_model(self):
|
||||
"""Test that instrumental files are named with model names."""
|
||||
base_name = "Artist - Song"
|
||||
clean_model = "model_bs_roformer_ep_317_sdr_12.9755.ckpt"
|
||||
backing_model = "mel_band_roformer_karaoke_aufr33_viperx_sdr_10.1956.ckpt"
|
||||
|
||||
clean_instrumental_name = f"{base_name} (Instrumental {clean_model}).flac"
|
||||
backing_instrumental_name = f"{base_name} (Instrumental +BV {backing_model}).flac"
|
||||
|
||||
# Verify expected format
|
||||
assert "model_bs_roformer" in clean_instrumental_name
|
||||
assert "+BV" in backing_instrumental_name
|
||||
assert backing_model in backing_instrumental_name
|
||||
|
||||
def test_stem_naming_convention(self):
|
||||
"""Test that stems are named with proper model suffixes."""
|
||||
base_name = "Artist - Song"
|
||||
clean_model = "model_bs_roformer_ep_317_sdr_12.9755.ckpt"
|
||||
backing_model = "mel_band_roformer_karaoke_aufr33_viperx_sdr_10.1956.ckpt"
|
||||
other_model = "htdemucs_6s.yaml"
|
||||
|
||||
# Expected stem filenames
|
||||
expected_stems = {
|
||||
'vocals_clean': f"{base_name} (Vocals {clean_model}).flac",
|
||||
'lead_vocals': f"{base_name} (Lead Vocals {backing_model}).flac",
|
||||
'backing_vocals': f"{base_name} (Backing Vocals {backing_model}).flac",
|
||||
'bass': f"{base_name} (Bass {other_model}).flac",
|
||||
'drums': f"{base_name} (Drums {other_model}).flac",
|
||||
}
|
||||
|
||||
# Verify naming convention
|
||||
for _key, name in expected_stems.items():
|
||||
assert ".flac" in name
|
||||
assert base_name in name
|
||||
|
||||
def test_simplified_instrumental_cleanup(self, tmp_path):
|
||||
"""Test that simplified instrumental names are cleaned up."""
|
||||
base_name = "Artist - Song"
|
||||
|
||||
# Create simplified-named files (as created by _setup_working_directory)
|
||||
simplified_clean = tmp_path / f"{base_name} (Instrumental Clean).flac"
|
||||
simplified_backing = tmp_path / f"{base_name} (Instrumental Backing).flac"
|
||||
simplified_clean.write_text("fake")
|
||||
simplified_backing.write_text("fake")
|
||||
|
||||
# Verify they exist
|
||||
assert simplified_clean.exists()
|
||||
assert simplified_backing.exists()
|
||||
|
||||
# Simulate cleanup
|
||||
simplified_clean.unlink()
|
||||
simplified_backing.unlink()
|
||||
|
||||
# Verify they're removed
|
||||
assert not simplified_clean.exists()
|
||||
assert not simplified_backing.exists()
|
||||
|
||||
@@ -36,6 +36,12 @@ from karaoke_gen.audio_processor import AudioProcessor
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
# Default model names - used by create_audio_processor and stored in state_data
|
||||
DEFAULT_CLEAN_MODEL = "model_bs_roformer_ep_317_sdr_12.9755.ckpt"
|
||||
DEFAULT_BACKING_MODELS = ["mel_band_roformer_karaoke_aufr33_viperx_sdr_10.1956.ckpt"]
|
||||
DEFAULT_OTHER_MODELS = ["htdemucs_6s.yaml"]
|
||||
|
||||
|
||||
# Loggers to capture for audio worker
|
||||
AUDIO_WORKER_LOGGERS = [
|
||||
"karaoke_gen.audio_processor",
|
||||
@@ -181,10 +187,10 @@ def create_audio_processor(
|
||||
audio_logger = logging.getLogger("karaoke_gen.audio_processor")
|
||||
audio_logger.setLevel(logging.INFO)
|
||||
|
||||
# Model configurations - use provided values or CLI defaults
|
||||
effective_clean_model = clean_instrumental_model or "model_bs_roformer_ep_317_sdr_12.9755.ckpt"
|
||||
effective_backing_models = backing_vocals_models or ["mel_band_roformer_karaoke_aufr33_viperx_sdr_10.1956.ckpt"]
|
||||
effective_other_models = other_stems_models or ["htdemucs_6s.yaml"] # For 6-stem separation (bass, drums, etc.)
|
||||
# Model configurations - use provided values or defaults from module constants
|
||||
effective_clean_model = clean_instrumental_model or DEFAULT_CLEAN_MODEL
|
||||
effective_backing_models = backing_vocals_models or DEFAULT_BACKING_MODELS
|
||||
effective_other_models = other_stems_models or DEFAULT_OTHER_MODELS # For 6-stem separation (bass, drums, etc.)
|
||||
|
||||
# FFmpeg command for combining audio files (must be a string, not a list)
|
||||
ffmpeg_base_command = "ffmpeg -hide_banner -loglevel error -nostats -y"
|
||||
@@ -303,7 +309,17 @@ async def process_audio_separation(job_id: str) -> bool:
|
||||
backing_vocals_models=job.backing_vocals_models,
|
||||
other_stems_models=job.other_stems_models
|
||||
)
|
||||
|
||||
|
||||
# Store effective model names in state_data for video_worker to use in file naming
|
||||
# This ensures output filenames match local CLI behavior (e.g., "Instrumental model_bs_roformer_ep_317_sdr_12.9755.ckpt")
|
||||
effective_model_names = {
|
||||
'clean_instrumental_model': job.clean_instrumental_model or DEFAULT_CLEAN_MODEL,
|
||||
'backing_vocals_models': job.backing_vocals_models or DEFAULT_BACKING_MODELS,
|
||||
'other_stems_models': job.other_stems_models or DEFAULT_OTHER_MODELS,
|
||||
}
|
||||
job_manager.update_state_data(job_id, 'model_names', effective_model_names)
|
||||
job_log.info(f"Stored effective model names: clean={effective_model_names['clean_instrumental_model']}")
|
||||
|
||||
# Format artist-title for file naming (matches CLI behavior)
|
||||
artist_title = f"{job.artist} - {job.title}"
|
||||
|
||||
|
||||
@@ -268,6 +268,7 @@ async def generate_video(job_id: str) -> bool:
|
||||
job_manager=job_manager,
|
||||
temp_dir=temp_dir,
|
||||
result=result,
|
||||
storage=storage,
|
||||
)
|
||||
|
||||
# Upload generated files to GCS
|
||||
@@ -348,16 +349,17 @@ async def _handle_native_distribution(
|
||||
job_manager: JobManager,
|
||||
temp_dir: str,
|
||||
result: Dict[str, Any],
|
||||
storage: StorageService = None,
|
||||
) -> None:
|
||||
"""
|
||||
Handle distribution uploads using native APIs (Dropbox SDK, Google Drive API).
|
||||
|
||||
|
||||
This is used by the remote CLI instead of rclone-based uploads.
|
||||
The native APIs provide:
|
||||
- Better error handling and retry logic
|
||||
- No need for rclone binary in container
|
||||
- Credentials managed via Secret Manager
|
||||
|
||||
|
||||
Args:
|
||||
job_id: Job ID
|
||||
job: Job object with dropbox_path and gdrive_folder_id fields
|
||||
@@ -365,6 +367,7 @@ async def _handle_native_distribution(
|
||||
job_manager: Job manager for updating job state
|
||||
temp_dir: Temporary directory with output files
|
||||
result: Result dict from KaraokeFinalise.process()
|
||||
storage: StorageService instance for downloading stems/lyrics
|
||||
"""
|
||||
brand_code = result.get('brand_code')
|
||||
base_name = f"{job.artist} - {job.title}"
|
||||
@@ -397,10 +400,22 @@ async def _handle_native_distribution(
|
||||
result['brand_code'] = brand_code
|
||||
job_log.info(f"Generated brand code: {brand_code}")
|
||||
|
||||
# Prepare full distribution directory with stems/ and lyrics/ subfolders
|
||||
# This must be done before upload to ensure complete output structure
|
||||
if storage:
|
||||
await _prepare_distribution_directory(
|
||||
job_id=job_id,
|
||||
job=job,
|
||||
storage=storage,
|
||||
temp_dir=temp_dir,
|
||||
base_name=base_name,
|
||||
job_log=job_log,
|
||||
)
|
||||
|
||||
# Create folder name and upload files
|
||||
folder_name = f"{brand_code} - {base_name}"
|
||||
remote_folder = f"{dropbox_path}/{folder_name}"
|
||||
|
||||
|
||||
job_log.info(f"Uploading to Dropbox folder: {remote_folder}")
|
||||
dropbox.upload_folder(temp_dir, remote_folder)
|
||||
|
||||
@@ -606,6 +621,139 @@ async def _setup_working_directory(
|
||||
log_progress("Downloaded end JPG")
|
||||
|
||||
|
||||
async def _prepare_distribution_directory(
|
||||
job_id: str,
|
||||
job,
|
||||
storage: StorageService,
|
||||
temp_dir: str,
|
||||
base_name: str,
|
||||
job_log=None
|
||||
) -> None:
|
||||
"""
|
||||
Prepare the full distribution directory structure matching local CLI output.
|
||||
|
||||
Creates:
|
||||
- stems/ subfolder with all audio stems (proper model names)
|
||||
- lyrics/ subfolder with intermediate lyrics files
|
||||
- Root-level instrumentals with proper model names
|
||||
|
||||
This ensures the Dropbox upload contains the complete output structure.
|
||||
"""
|
||||
def log_progress(message: str):
|
||||
"""Log to both module logger and job logger if available."""
|
||||
logger.info(f"Job {job_id}: {message}")
|
||||
if job_log:
|
||||
job_log.info(message)
|
||||
|
||||
log_progress("Preparing full distribution directory structure")
|
||||
|
||||
# Get model names from state_data (stored by audio_worker)
|
||||
model_names = job.state_data.get('model_names', {})
|
||||
clean_model = model_names.get('clean_instrumental_model', 'model_bs_roformer_ep_317_sdr_12.9755.ckpt')
|
||||
backing_models = model_names.get('backing_vocals_models', ['mel_band_roformer_karaoke_aufr33_viperx_sdr_10.1956.ckpt'])
|
||||
other_models = model_names.get('other_stems_models', ['htdemucs_6s.yaml'])
|
||||
backing_model = backing_models[0] if backing_models else 'mel_band_roformer_karaoke_aufr33_viperx_sdr_10.1956.ckpt'
|
||||
other_model = other_models[0] if other_models else 'htdemucs_6s.yaml'
|
||||
|
||||
# Create stems subdirectory
|
||||
stems_dir = os.path.join(temp_dir, "stems")
|
||||
os.makedirs(stems_dir, exist_ok=True)
|
||||
|
||||
# Create lyrics subdirectory
|
||||
lyrics_dir = os.path.join(temp_dir, "lyrics")
|
||||
os.makedirs(lyrics_dir, exist_ok=True)
|
||||
|
||||
stems = job.file_urls.get('stems', {})
|
||||
lyrics = job.file_urls.get('lyrics', {})
|
||||
|
||||
# --- Download stems to stems/ subfolder with proper model names ---
|
||||
|
||||
# Clean up simplified-named instrumentals from _setup_working_directory
|
||||
# These were needed for KaraokeFinalise but shouldn't go to distribution
|
||||
simplified_instrumental_patterns = [
|
||||
f"{base_name} (Instrumental Clean).flac",
|
||||
f"{base_name} (Instrumental Backing).flac",
|
||||
]
|
||||
for pattern in simplified_instrumental_patterns:
|
||||
simplified_path = os.path.join(temp_dir, pattern)
|
||||
if os.path.exists(simplified_path):
|
||||
os.remove(simplified_path)
|
||||
log_progress(f"Removed simplified instrumental: {pattern}")
|
||||
|
||||
# Clean instrumental (from clean_instrumental_model)
|
||||
if stems.get('instrumental_clean'):
|
||||
dest_path = os.path.join(stems_dir, f"{base_name} (Instrumental {clean_model}).flac")
|
||||
storage.download_file(stems['instrumental_clean'], dest_path)
|
||||
log_progress("Downloaded clean instrumental to stems/")
|
||||
|
||||
# Also copy to root level for distribution
|
||||
root_path = os.path.join(temp_dir, f"{base_name} (Instrumental {clean_model}).flac")
|
||||
shutil.copy2(dest_path, root_path)
|
||||
|
||||
# Clean vocals (from clean_instrumental_model)
|
||||
if stems.get('vocals_clean'):
|
||||
dest_path = os.path.join(stems_dir, f"{base_name} (Vocals {clean_model}).flac")
|
||||
storage.download_file(stems['vocals_clean'], dest_path)
|
||||
log_progress("Downloaded clean vocals to stems/")
|
||||
|
||||
# Instrumental with backing vocals (from backing_vocals_model)
|
||||
if stems.get('instrumental_with_backing'):
|
||||
dest_path = os.path.join(stems_dir, f"{base_name} (Instrumental +BV {backing_model}).flac")
|
||||
storage.download_file(stems['instrumental_with_backing'], dest_path)
|
||||
log_progress("Downloaded instrumental+BV to stems/")
|
||||
|
||||
# Also copy to root level for distribution
|
||||
root_path = os.path.join(temp_dir, f"{base_name} (Instrumental +BV {backing_model}).flac")
|
||||
shutil.copy2(dest_path, root_path)
|
||||
|
||||
# Lead vocals (from backing_vocals_model)
|
||||
if stems.get('lead_vocals'):
|
||||
dest_path = os.path.join(stems_dir, f"{base_name} (Lead Vocals {backing_model}).flac")
|
||||
storage.download_file(stems['lead_vocals'], dest_path)
|
||||
log_progress("Downloaded lead vocals to stems/")
|
||||
|
||||
# Backing vocals (from backing_vocals_model)
|
||||
if stems.get('backing_vocals'):
|
||||
dest_path = os.path.join(stems_dir, f"{base_name} (Backing Vocals {backing_model}).flac")
|
||||
storage.download_file(stems['backing_vocals'], dest_path)
|
||||
log_progress("Downloaded backing vocals to stems/")
|
||||
|
||||
# Other stems (from other_stems_model - typically htdemucs_6s)
|
||||
other_stem_keys = ['bass', 'drums', 'guitar', 'piano', 'other']
|
||||
for stem_key in other_stem_keys:
|
||||
if stems.get(stem_key):
|
||||
stem_name = stem_key.capitalize()
|
||||
dest_path = os.path.join(stems_dir, f"{base_name} ({stem_name} {other_model}).flac")
|
||||
storage.download_file(stems[stem_key], dest_path)
|
||||
log_progress(f"Downloaded {stem_key} to stems/")
|
||||
|
||||
# --- Download lyrics files to lyrics/ subfolder ---
|
||||
|
||||
# Common lyrics file types
|
||||
lyrics_file_keys = ['lrc', 'ass', 'srt', 'txt', 'json', 'original_json', 'corrected_json']
|
||||
for lyrics_key in lyrics_file_keys:
|
||||
if lyrics.get(lyrics_key):
|
||||
# Determine proper extension
|
||||
ext_map = {
|
||||
'lrc': '.lrc',
|
||||
'ass': '.ass',
|
||||
'srt': '.srt',
|
||||
'txt': '.txt',
|
||||
'json': '.json',
|
||||
'original_json': '_original.json',
|
||||
'corrected_json': '_corrected.json',
|
||||
}
|
||||
ext = ext_map.get(lyrics_key, f'.{lyrics_key}')
|
||||
dest_path = os.path.join(lyrics_dir, f"{base_name} (Karaoke){ext}")
|
||||
try:
|
||||
storage.download_file(lyrics[lyrics_key], dest_path)
|
||||
log_progress(f"Downloaded {lyrics_key} to lyrics/")
|
||||
except Exception as e:
|
||||
log_progress(f"Could not download {lyrics_key}: {e}")
|
||||
|
||||
log_progress("Distribution directory prepared with stems/ and lyrics/ subfolders")
|
||||
|
||||
|
||||
async def _upload_results(
|
||||
job_id: str,
|
||||
job_manager: JobManager,
|
||||
@@ -614,7 +762,7 @@ async def _upload_results(
|
||||
result: Dict[str, Any]
|
||||
) -> None:
|
||||
"""Upload generated files to GCS."""
|
||||
|
||||
|
||||
# Map of result keys to GCS paths
|
||||
file_mappings = [
|
||||
('final_video', 'finals', 'lossless_4k_mp4'),
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
# API URL for the karaoke backend
|
||||
NEXT_PUBLIC_API_URL=https://api.nomadkaraoke.com
|
||||
@@ -1,38 +0,0 @@
|
||||
# Dependencies
|
||||
node_modules/
|
||||
.pnp
|
||||
.pnp.js
|
||||
|
||||
# Build output
|
||||
.next/
|
||||
out/
|
||||
build/
|
||||
|
||||
# Debug
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
|
||||
# Local env files
|
||||
.env
|
||||
.env.local
|
||||
.env.development.local
|
||||
.env.test.local
|
||||
.env.production.local
|
||||
|
||||
# Vercel
|
||||
.vercel
|
||||
|
||||
# IDE
|
||||
.idea/
|
||||
.vscode/
|
||||
*.swp
|
||||
*.swo
|
||||
|
||||
# OS
|
||||
.DS_Store
|
||||
Thumbs.db
|
||||
|
||||
# TypeScript
|
||||
*.tsbuildinfo
|
||||
next-env.d.ts
|
||||
@@ -1,99 +0,0 @@
|
||||
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700;800&display=swap');
|
||||
|
||||
@tailwind base;
|
||||
@tailwind components;
|
||||
@tailwind utilities;
|
||||
|
||||
:root {
|
||||
--foreground: #f8fafc;
|
||||
--background: #0f172a;
|
||||
}
|
||||
|
||||
body {
|
||||
color: var(--foreground);
|
||||
background: var(--background);
|
||||
font-family: 'Inter', system-ui, sans-serif;
|
||||
}
|
||||
|
||||
/* Smooth scrolling */
|
||||
html {
|
||||
scroll-behavior: smooth;
|
||||
}
|
||||
|
||||
/* Custom scrollbar for dark theme */
|
||||
::-webkit-scrollbar {
|
||||
width: 8px;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-track {
|
||||
background: #1e293b;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-thumb {
|
||||
background: #475569;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-thumb:hover {
|
||||
background: #64748b;
|
||||
}
|
||||
|
||||
/* Glow effect for primary buttons */
|
||||
.btn-glow {
|
||||
box-shadow: 0 0 20px rgba(59, 130, 246, 0.5);
|
||||
}
|
||||
|
||||
.btn-glow:hover {
|
||||
box-shadow: 0 0 30px rgba(59, 130, 246, 0.7);
|
||||
}
|
||||
|
||||
/* Gradient text */
|
||||
.gradient-text {
|
||||
background: linear-gradient(135deg, #3b82f6 0%, #8b5cf6 50%, #ec4899 100%);
|
||||
-webkit-background-clip: text;
|
||||
-webkit-text-fill-color: transparent;
|
||||
background-clip: text;
|
||||
}
|
||||
|
||||
/* Card hover effect */
|
||||
.card-hover {
|
||||
transition: transform 0.2s ease, box-shadow 0.2s ease;
|
||||
}
|
||||
|
||||
.card-hover:hover {
|
||||
transform: translateY(-4px);
|
||||
box-shadow: 0 20px 40px rgba(0, 0, 0, 0.3);
|
||||
}
|
||||
|
||||
/* Animated background gradient */
|
||||
@keyframes gradient-shift {
|
||||
0% {
|
||||
background-position: 0% 50%;
|
||||
}
|
||||
50% {
|
||||
background-position: 100% 50%;
|
||||
}
|
||||
100% {
|
||||
background-position: 0% 50%;
|
||||
}
|
||||
}
|
||||
|
||||
.animated-gradient {
|
||||
background: linear-gradient(-45deg, #0f172a, #1e293b, #1e3a8a, #312e81);
|
||||
background-size: 400% 400%;
|
||||
animation: gradient-shift 15s ease infinite;
|
||||
}
|
||||
|
||||
/* Price highlight animation */
|
||||
@keyframes pulse-subtle {
|
||||
0%, 100% {
|
||||
opacity: 1;
|
||||
}
|
||||
50% {
|
||||
opacity: 0.8;
|
||||
}
|
||||
}
|
||||
|
||||
.pulse-subtle {
|
||||
animation: pulse-subtle 2s ease-in-out infinite;
|
||||
}
|
||||
@@ -1,45 +0,0 @@
|
||||
import type { Metadata } from 'next';
|
||||
import './globals.css';
|
||||
|
||||
export const metadata: Metadata = {
|
||||
title: 'Nomad Karaoke - Turn Any Song Into a Karaoke Video',
|
||||
description: 'Create professional karaoke videos in minutes. AI-powered vocal separation, perfect lyrics sync, and 4K video output.',
|
||||
keywords: ['karaoke', 'karaoke video', 'karaoke maker', 'vocal removal', 'lyrics sync'],
|
||||
authors: [{ name: 'Nomad Karaoke' }],
|
||||
openGraph: {
|
||||
title: 'Nomad Karaoke - Turn Any Song Into a Karaoke Video',
|
||||
description: 'Create professional karaoke videos in minutes with AI.',
|
||||
type: 'website',
|
||||
url: 'https://buy.nomadkaraoke.com',
|
||||
images: [
|
||||
{
|
||||
url: 'https://gen.nomadkaraoke.com/nomad-logo.png',
|
||||
width: 512,
|
||||
height: 512,
|
||||
alt: 'Nomad Karaoke',
|
||||
},
|
||||
],
|
||||
},
|
||||
twitter: {
|
||||
card: 'summary_large_image',
|
||||
title: 'Nomad Karaoke - Turn Any Song Into a Karaoke Video',
|
||||
description: 'Create professional karaoke videos in minutes with AI.',
|
||||
},
|
||||
};
|
||||
|
||||
export default function RootLayout({
|
||||
children,
|
||||
}: {
|
||||
children: React.ReactNode;
|
||||
}) {
|
||||
return (
|
||||
<html lang="en">
|
||||
<head>
|
||||
<link rel="icon" href="https://nomadkaraoke.com/favicon.ico" />
|
||||
</head>
|
||||
<body className="min-h-screen animated-gradient">
|
||||
{children}
|
||||
</body>
|
||||
</html>
|
||||
);
|
||||
}
|
||||
@@ -1,585 +0,0 @@
|
||||
'use client';
|
||||
|
||||
import { useState } from 'react';
|
||||
import { Mic2, Music, Sparkles, Video, Youtube, Check, ChevronDown, Mail, Loader2, Gift, MessageSquare, CheckCircle2 } from 'lucide-react';
|
||||
import { enrollBetaTester } from '../lib/api';
|
||||
|
||||
// Credit packages (matching backend)
|
||||
const CREDIT_PACKAGES = [
|
||||
{
|
||||
id: '1_credit',
|
||||
credits: 1,
|
||||
price_cents: 500,
|
||||
name: '1 Credit',
|
||||
description: 'Create 1 karaoke video',
|
||||
popular: false,
|
||||
},
|
||||
{
|
||||
id: '3_credits',
|
||||
credits: 3,
|
||||
price_cents: 1200,
|
||||
name: '3 Credits',
|
||||
description: 'Save 20%',
|
||||
popular: false,
|
||||
},
|
||||
{
|
||||
id: '5_credits',
|
||||
credits: 5,
|
||||
price_cents: 1750,
|
||||
name: '5 Credits',
|
||||
description: 'Save 30%',
|
||||
popular: true,
|
||||
},
|
||||
{
|
||||
id: '10_credits',
|
||||
credits: 10,
|
||||
price_cents: 3000,
|
||||
name: '10 Credits',
|
||||
description: 'Save 40%',
|
||||
popular: false,
|
||||
},
|
||||
];
|
||||
|
||||
const API_BASE_URL = process.env.NEXT_PUBLIC_API_URL || 'https://api.nomadkaraoke.com';
|
||||
|
||||
function formatPrice(cents: number): string {
|
||||
return `$${(cents / 100).toFixed(0)}`;
|
||||
}
|
||||
|
||||
function pricePerCredit(priceCents: number, credits: number): string {
|
||||
return `$${(priceCents / 100 / credits).toFixed(2)}`;
|
||||
}
|
||||
|
||||
export default function Home() {
|
||||
const [selectedPackage, setSelectedPackage] = useState(CREDIT_PACKAGES[2]); // Default to 5 credits
|
||||
const [email, setEmail] = useState('');
|
||||
const [isLoading, setIsLoading] = useState(false);
|
||||
const [error, setError] = useState('');
|
||||
const [expandedFaq, setExpandedFaq] = useState<number | null>(null);
|
||||
|
||||
// Beta tester form state
|
||||
const [showBetaForm, setShowBetaForm] = useState(false);
|
||||
const [betaEmail, setBetaEmail] = useState('');
|
||||
const [betaPromise, setBetaPromise] = useState('');
|
||||
const [betaAcceptCorrections, setBetaAcceptCorrections] = useState(false);
|
||||
const [betaLoading, setBetaLoading] = useState(false);
|
||||
const [betaError, setBetaError] = useState('');
|
||||
const [betaSuccess, setBetaSuccess] = useState(false);
|
||||
|
||||
const handleBetaEnroll = async (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
setBetaError('');
|
||||
|
||||
if (!betaEmail) {
|
||||
setBetaError('Please enter your email');
|
||||
return;
|
||||
}
|
||||
|
||||
if (!betaAcceptCorrections) {
|
||||
setBetaError('Please accept that you may need to review/correct lyrics');
|
||||
return;
|
||||
}
|
||||
|
||||
if (betaPromise.trim().length < 10) {
|
||||
setBetaError('Please write a sentence confirming your promise to provide feedback');
|
||||
return;
|
||||
}
|
||||
|
||||
setBetaLoading(true);
|
||||
|
||||
try {
|
||||
const response = await enrollBetaTester(betaEmail.toLowerCase(), betaPromise, betaAcceptCorrections);
|
||||
|
||||
// Store the session token
|
||||
if (response.session_token) {
|
||||
localStorage.setItem('nomad_karaoke_token', response.session_token);
|
||||
}
|
||||
|
||||
setBetaSuccess(true);
|
||||
|
||||
// Redirect to the main app after a short delay
|
||||
setTimeout(() => {
|
||||
window.location.href = 'https://gen.nomadkaraoke.com';
|
||||
}, 2000);
|
||||
} catch (err) {
|
||||
setBetaError(err instanceof Error ? err.message : 'Something went wrong');
|
||||
setBetaLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleCheckout = async (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
setError('');
|
||||
|
||||
if (!email) {
|
||||
setError('Please enter your email');
|
||||
return;
|
||||
}
|
||||
|
||||
setIsLoading(true);
|
||||
|
||||
try {
|
||||
const response = await fetch(`${API_BASE_URL}/api/users/credits/checkout`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({
|
||||
package_id: selectedPackage.id,
|
||||
email: email.toLowerCase(),
|
||||
}),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
const data = await response.json();
|
||||
throw new Error(data.detail || 'Failed to create checkout');
|
||||
}
|
||||
|
||||
const data = await response.json();
|
||||
window.location.href = data.checkout_url;
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Something went wrong');
|
||||
setIsLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
const faqs = [
|
||||
{
|
||||
q: 'How does it work?',
|
||||
a: 'Just enter a song (artist + title), and our AI finds the audio, removes the vocals, transcribes the lyrics, and creates a professional karaoke video with perfectly synced lyrics.',
|
||||
},
|
||||
{
|
||||
q: 'What songs can I use?',
|
||||
a: "Most popular songs are available. We search multiple high-quality audio sources to find the best version. If we can't find a song, you won't be charged.",
|
||||
},
|
||||
{
|
||||
q: 'What format is the output?',
|
||||
a: 'You get a high-quality MP4 video file (up to 4K) with the instrumental audio and synchronized lyrics. You can also upload directly to YouTube.',
|
||||
},
|
||||
{
|
||||
q: 'What if something goes wrong?',
|
||||
a: "We offer generous refunds. If the quality isn't what you expected or there's an issue with the output, contact us and we'll refund your credit.",
|
||||
},
|
||||
{
|
||||
q: 'Do credits expire?',
|
||||
a: 'No, your credits never expire. Use them whenever you want.',
|
||||
},
|
||||
];
|
||||
|
||||
return (
|
||||
<div className="min-h-screen">
|
||||
{/* Navigation */}
|
||||
<nav className="fixed top-0 left-0 right-0 z-50 bg-dark-900/80 backdrop-blur-md border-b border-dark-700">
|
||||
<div className="max-w-6xl mx-auto px-4 py-4 flex items-center justify-between">
|
||||
<div className="flex items-center gap-2">
|
||||
<Mic2 className="w-8 h-8 text-primary-500" />
|
||||
<span className="text-xl font-bold">Nomad Karaoke</span>
|
||||
</div>
|
||||
<a
|
||||
href="https://gen.nomadkaraoke.com"
|
||||
className="text-sm text-dark-300 hover:text-white transition-colors"
|
||||
>
|
||||
Already have credits? Sign in
|
||||
</a>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
{/* Hero Section */}
|
||||
<section className="pt-32 pb-16 px-4">
|
||||
<div className="max-w-4xl mx-auto text-center">
|
||||
<h1 className="text-4xl sm:text-5xl md:text-6xl font-extrabold mb-6 leading-tight">
|
||||
Turn Any Song Into a{' '}
|
||||
<span className="gradient-text">Karaoke Video</span>
|
||||
</h1>
|
||||
<p className="text-xl text-dark-300 mb-8 max-w-2xl mx-auto">
|
||||
Professional karaoke videos in minutes. AI-powered vocal removal,
|
||||
perfect lyrics sync, and stunning video output.
|
||||
</p>
|
||||
<a
|
||||
href="#pricing"
|
||||
className="inline-flex items-center gap-2 bg-primary-500 hover:bg-primary-600 text-white font-semibold px-8 py-4 rounded-xl transition-all btn-glow"
|
||||
>
|
||||
Get Started
|
||||
<ChevronDown className="w-5 h-5" />
|
||||
</a>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{/* How It Works */}
|
||||
<section className="py-16 px-4">
|
||||
<div className="max-w-6xl mx-auto">
|
||||
<h2 className="text-3xl font-bold text-center mb-12">How It Works</h2>
|
||||
<div className="grid md:grid-cols-4 gap-8">
|
||||
{[
|
||||
{
|
||||
icon: Music,
|
||||
title: 'Search',
|
||||
desc: 'Enter artist & song title',
|
||||
},
|
||||
{
|
||||
icon: Sparkles,
|
||||
title: 'AI Magic',
|
||||
desc: 'We remove vocals & sync lyrics',
|
||||
},
|
||||
{
|
||||
icon: Video,
|
||||
title: 'Review',
|
||||
desc: 'Preview and fine-tune',
|
||||
},
|
||||
{
|
||||
icon: Youtube,
|
||||
title: 'Export',
|
||||
desc: 'Download or upload to YouTube',
|
||||
},
|
||||
].map((step, i) => (
|
||||
<div key={i} className="text-center">
|
||||
<div className="w-16 h-16 bg-primary-500/20 rounded-2xl flex items-center justify-center mx-auto mb-4">
|
||||
<step.icon className="w-8 h-8 text-primary-400" />
|
||||
</div>
|
||||
<h3 className="font-semibold text-lg mb-2">{step.title}</h3>
|
||||
<p className="text-dark-400 text-sm">{step.desc}</p>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{/* Features */}
|
||||
<section className="py-16 px-4 bg-dark-800/50">
|
||||
<div className="max-w-6xl mx-auto">
|
||||
<h2 className="text-3xl font-bold text-center mb-12">What You Get</h2>
|
||||
<div className="grid md:grid-cols-3 gap-6">
|
||||
{[
|
||||
{
|
||||
title: 'Studio-Quality Separation',
|
||||
desc: 'State-of-the-art AI removes vocals cleanly, keeping the instrumental crisp.',
|
||||
},
|
||||
{
|
||||
title: 'Perfect Lyrics Sync',
|
||||
desc: 'Word-by-word timing that highlights exactly when to sing.',
|
||||
},
|
||||
{
|
||||
title: 'Multiple Instrumental Options',
|
||||
desc: 'Choose from different vocal removal levels to get the sound you want.',
|
||||
},
|
||||
{
|
||||
title: '4K Video Output',
|
||||
desc: 'Stunning video quality that looks great on any screen.',
|
||||
},
|
||||
{
|
||||
title: 'YouTube Integration',
|
||||
desc: 'Upload directly to your YouTube channel with one click.',
|
||||
},
|
||||
{
|
||||
title: 'Edit Before Export',
|
||||
desc: 'Fix any lyrics issues before generating your final video.',
|
||||
},
|
||||
].map((feature, i) => (
|
||||
<div
|
||||
key={i}
|
||||
className="bg-dark-800 border border-dark-700 rounded-xl p-6 card-hover"
|
||||
>
|
||||
<h3 className="font-semibold text-lg mb-2">{feature.title}</h3>
|
||||
<p className="text-dark-400 text-sm">{feature.desc}</p>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{/* Beta Tester Promo */}
|
||||
<section className="py-12 px-4">
|
||||
<div className="max-w-2xl mx-auto">
|
||||
{!showBetaForm && !betaSuccess ? (
|
||||
<div className="bg-gradient-to-r from-purple-900/40 to-pink-900/40 border border-purple-500/30 rounded-2xl p-8 text-center">
|
||||
<div className="inline-flex items-center gap-2 bg-purple-500/20 text-purple-300 px-4 py-2 rounded-full text-sm font-medium mb-4">
|
||||
<Gift className="w-4 h-4" />
|
||||
Beta Tester Program
|
||||
</div>
|
||||
<h3 className="text-2xl font-bold mb-3">Try It Free!</h3>
|
||||
<p className="text-dark-300 mb-6">
|
||||
Help us improve by testing the tool and sharing your feedback.
|
||||
Get a <span className="text-green-400 font-semibold">free credit</span> to create your first karaoke video!
|
||||
</p>
|
||||
<button
|
||||
onClick={() => setShowBetaForm(true)}
|
||||
className="inline-flex items-center gap-2 bg-purple-500 hover:bg-purple-600 text-white font-semibold px-6 py-3 rounded-xl transition-all"
|
||||
>
|
||||
Join Beta Program
|
||||
<MessageSquare className="w-5 h-5" />
|
||||
</button>
|
||||
</div>
|
||||
) : betaSuccess ? (
|
||||
<div className="bg-green-900/30 border border-green-500/30 rounded-2xl p-8 text-center">
|
||||
<CheckCircle2 className="w-16 h-16 text-green-400 mx-auto mb-4" />
|
||||
<h3 className="text-2xl font-bold mb-3 text-green-400">Welcome to the Beta!</h3>
|
||||
<p className="text-dark-300 mb-4">
|
||||
You've got 1 free credit! Redirecting you to create your first karaoke video...
|
||||
</p>
|
||||
<Loader2 className="w-6 h-6 animate-spin mx-auto text-green-400" />
|
||||
</div>
|
||||
) : (
|
||||
<div className="bg-dark-800 border border-purple-500/30 rounded-2xl p-8">
|
||||
<div className="flex items-center justify-between mb-6">
|
||||
<div className="inline-flex items-center gap-2 bg-purple-500/20 text-purple-300 px-4 py-2 rounded-full text-sm font-medium">
|
||||
<Gift className="w-4 h-4" />
|
||||
Beta Tester Signup
|
||||
</div>
|
||||
<button
|
||||
onClick={() => setShowBetaForm(false)}
|
||||
className="text-dark-400 hover:text-white transition-colors text-sm"
|
||||
>
|
||||
Cancel
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<h3 className="text-xl font-bold mb-2">Get 1 Free Credit</h3>
|
||||
<p className="text-dark-400 text-sm mb-6">
|
||||
In exchange for your honest feedback after trying the tool.
|
||||
</p>
|
||||
|
||||
<form onSubmit={handleBetaEnroll} className="space-y-4">
|
||||
<div>
|
||||
<label htmlFor="beta-email" className="block text-sm font-medium text-dark-300 mb-2">
|
||||
Email address
|
||||
</label>
|
||||
<div className="relative">
|
||||
<Mail className="absolute left-3 top-1/2 -translate-y-1/2 w-5 h-5 text-dark-500" />
|
||||
<input
|
||||
type="email"
|
||||
id="beta-email"
|
||||
value={betaEmail}
|
||||
onChange={(e) => setBetaEmail(e.target.value)}
|
||||
placeholder="you@example.com"
|
||||
className="w-full pl-10 pr-4 py-3 bg-dark-900 border border-dark-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-purple-500 focus:border-transparent text-white placeholder-dark-500"
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="bg-dark-900/50 border border-dark-700 rounded-lg p-4">
|
||||
<h4 className="font-medium mb-3 text-sm">Your Promise</h4>
|
||||
|
||||
<label className="flex items-start gap-3 cursor-pointer mb-4">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={betaAcceptCorrections}
|
||||
onChange={(e) => setBetaAcceptCorrections(e.target.checked)}
|
||||
className="mt-1 w-4 h-4 rounded border-dark-600 bg-dark-800 text-purple-500 focus:ring-purple-500 focus:ring-offset-dark-900"
|
||||
/>
|
||||
<span className="text-sm text-dark-300">
|
||||
I understand I may need to review and correct lyrics timing to get the best results
|
||||
</span>
|
||||
</label>
|
||||
|
||||
<div>
|
||||
<label htmlFor="promise" className="block text-sm text-dark-400 mb-2">
|
||||
Write a quick sentence promising to share feedback after you try it:
|
||||
</label>
|
||||
<textarea
|
||||
id="promise"
|
||||
value={betaPromise}
|
||||
onChange={(e) => setBetaPromise(e.target.value)}
|
||||
placeholder="I promise to share my honest feedback about my experience..."
|
||||
rows={2}
|
||||
className="w-full px-4 py-3 bg-dark-800 border border-dark-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-purple-500 focus:border-transparent text-white placeholder-dark-500 text-sm resize-none"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{betaError && (
|
||||
<div className="text-red-400 text-sm bg-red-400/10 border border-red-400/20 rounded-lg p-3">
|
||||
{betaError}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<button
|
||||
type="submit"
|
||||
disabled={betaLoading}
|
||||
className="w-full bg-purple-500 hover:bg-purple-600 disabled:bg-purple-500/50 text-white font-semibold py-4 rounded-xl transition-all flex items-center justify-center gap-2"
|
||||
>
|
||||
{betaLoading ? (
|
||||
<>
|
||||
<Loader2 className="w-5 h-5 animate-spin" />
|
||||
Enrolling...
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
Get My Free Credit
|
||||
<Gift className="w-5 h-5" />
|
||||
</>
|
||||
)}
|
||||
</button>
|
||||
|
||||
<p className="text-xs text-dark-500 text-center">
|
||||
We'll send you a feedback form after your video is created.
|
||||
Your feedback helps us improve the tool for everyone!
|
||||
</p>
|
||||
</form>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{/* Pricing */}
|
||||
<section id="pricing" className="py-20 px-4">
|
||||
<div className="max-w-4xl mx-auto">
|
||||
<h2 className="text-3xl font-bold text-center mb-4">Simple Pricing</h2>
|
||||
<p className="text-dark-400 text-center mb-12 max-w-xl mx-auto">
|
||||
One credit = one karaoke video. Buy more to save more.
|
||||
</p>
|
||||
|
||||
{/* Package Selection */}
|
||||
<div className="grid grid-cols-2 md:grid-cols-4 gap-4 mb-8">
|
||||
{CREDIT_PACKAGES.map((pkg) => (
|
||||
<button
|
||||
key={pkg.id}
|
||||
onClick={() => setSelectedPackage(pkg)}
|
||||
className={`relative p-4 rounded-xl border-2 transition-all ${
|
||||
selectedPackage.id === pkg.id
|
||||
? 'border-primary-500 bg-primary-500/10'
|
||||
: 'border-dark-700 hover:border-dark-500 bg-dark-800/50'
|
||||
}`}
|
||||
>
|
||||
{pkg.popular && (
|
||||
<span className="absolute -top-3 left-1/2 -translate-x-1/2 bg-primary-500 text-white text-xs font-semibold px-3 py-1 rounded-full">
|
||||
Best Value
|
||||
</span>
|
||||
)}
|
||||
<div className="text-2xl font-bold mb-1">{pkg.credits}</div>
|
||||
<div className="text-sm text-dark-400 mb-2">
|
||||
{pkg.credits === 1 ? 'credit' : 'credits'}
|
||||
</div>
|
||||
<div className="text-xl font-semibold text-primary-400">
|
||||
{formatPrice(pkg.price_cents)}
|
||||
</div>
|
||||
<div className="text-xs text-dark-500">
|
||||
{pricePerCredit(pkg.price_cents, pkg.credits)}/video
|
||||
</div>
|
||||
{pkg.credits > 1 && (
|
||||
<div className="text-xs text-green-400 mt-1">{pkg.description}</div>
|
||||
)}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
|
||||
{/* Checkout Form */}
|
||||
<div className="bg-dark-800 border border-dark-700 rounded-2xl p-8 max-w-md mx-auto">
|
||||
<div className="text-center mb-6">
|
||||
<div className="text-sm text-dark-400 mb-1">Selected package</div>
|
||||
<div className="text-2xl font-bold">
|
||||
{selectedPackage.credits} {selectedPackage.credits === 1 ? 'Credit' : 'Credits'}
|
||||
</div>
|
||||
<div className="text-3xl font-bold text-primary-400">
|
||||
{formatPrice(selectedPackage.price_cents)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<form onSubmit={handleCheckout} className="space-y-4">
|
||||
<div>
|
||||
<label htmlFor="email" className="block text-sm font-medium text-dark-300 mb-2">
|
||||
Email address
|
||||
</label>
|
||||
<div className="relative">
|
||||
<Mail className="absolute left-3 top-1/2 -translate-y-1/2 w-5 h-5 text-dark-500" />
|
||||
<input
|
||||
type="email"
|
||||
id="email"
|
||||
value={email}
|
||||
onChange={(e) => setEmail(e.target.value)}
|
||||
placeholder="you@example.com"
|
||||
className="w-full pl-10 pr-4 py-3 bg-dark-900 border border-dark-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary-500 focus:border-transparent text-white placeholder-dark-500"
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
<p className="text-xs text-dark-500 mt-2">
|
||||
We'll send your login link to this email
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{error && (
|
||||
<div className="text-red-400 text-sm bg-red-400/10 border border-red-400/20 rounded-lg p-3">
|
||||
{error}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<button
|
||||
type="submit"
|
||||
disabled={isLoading}
|
||||
className="w-full bg-primary-500 hover:bg-primary-600 disabled:bg-primary-500/50 text-white font-semibold py-4 rounded-xl transition-all btn-glow flex items-center justify-center gap-2"
|
||||
>
|
||||
{isLoading ? (
|
||||
<>
|
||||
<Loader2 className="w-5 h-5 animate-spin" />
|
||||
Redirecting to checkout...
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
Continue to Payment
|
||||
<Check className="w-5 h-5" />
|
||||
</>
|
||||
)}
|
||||
</button>
|
||||
</form>
|
||||
|
||||
<div className="mt-4 flex items-center justify-center gap-4 text-xs text-dark-500">
|
||||
<span>Secure checkout</span>
|
||||
<span>powered by Stripe</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{/* FAQ */}
|
||||
<section className="py-16 px-4 bg-dark-800/50">
|
||||
<div className="max-w-2xl mx-auto">
|
||||
<h2 className="text-3xl font-bold text-center mb-12">Questions?</h2>
|
||||
<div className="space-y-4">
|
||||
{faqs.map((faq, i) => (
|
||||
<div
|
||||
key={i}
|
||||
className="bg-dark-800 border border-dark-700 rounded-xl overflow-hidden"
|
||||
>
|
||||
<button
|
||||
onClick={() => setExpandedFaq(expandedFaq === i ? null : i)}
|
||||
className="w-full px-6 py-4 text-left flex items-center justify-between hover:bg-dark-700/50 transition-colors"
|
||||
>
|
||||
<span className="font-medium">{faq.q}</span>
|
||||
<ChevronDown
|
||||
className={`w-5 h-5 text-dark-400 transition-transform ${
|
||||
expandedFaq === i ? 'rotate-180' : ''
|
||||
}`}
|
||||
/>
|
||||
</button>
|
||||
{expandedFaq === i && (
|
||||
<div className="px-6 pb-4 text-dark-400">{faq.a}</div>
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{/* Footer */}
|
||||
<footer className="py-12 px-4 border-t border-dark-700">
|
||||
<div className="max-w-6xl mx-auto flex flex-col md:flex-row items-center justify-between gap-4">
|
||||
<div className="flex items-center gap-2">
|
||||
<Mic2 className="w-6 h-6 text-primary-500" />
|
||||
<span className="font-semibold">Nomad Karaoke</span>
|
||||
</div>
|
||||
<div className="text-sm text-dark-500">
|
||||
© {new Date().getFullYear()} Nomad Karaoke. All rights reserved.
|
||||
</div>
|
||||
<div className="flex gap-6 text-sm text-dark-400">
|
||||
<a href="mailto:support@nomadkaraoke.com" className="hover:text-white transition-colors">
|
||||
Support
|
||||
</a>
|
||||
<a href="https://nomadkaraoke.com" className="hover:text-white transition-colors">
|
||||
About
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -1,120 +0,0 @@
|
||||
/**
|
||||
* API client for the Nomad Karaoke backend.
|
||||
*/
|
||||
|
||||
const API_BASE_URL = process.env.NEXT_PUBLIC_API_URL || 'https://api.nomadkaraoke.com';
|
||||
|
||||
export interface CreditPackage {
|
||||
id: string;
|
||||
credits: number;
|
||||
price_cents: number;
|
||||
name: string;
|
||||
description: string;
|
||||
}
|
||||
|
||||
export interface CreditPackagesResponse {
|
||||
packages: CreditPackage[];
|
||||
}
|
||||
|
||||
export interface CheckoutResponse {
|
||||
status: string;
|
||||
checkout_url: string;
|
||||
message: string;
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetch available credit packages.
|
||||
*/
|
||||
export async function getCreditPackages(): Promise<CreditPackage[]> {
|
||||
const response = await fetch(`${API_BASE_URL}/api/users/credits/packages`);
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error('Failed to fetch credit packages');
|
||||
}
|
||||
|
||||
const data: CreditPackagesResponse = await response.json();
|
||||
return data.packages;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a Stripe checkout session.
|
||||
*/
|
||||
export async function createCheckout(packageId: string, email: string): Promise<string> {
|
||||
const response = await fetch(`${API_BASE_URL}/api/users/credits/checkout`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({
|
||||
package_id: packageId,
|
||||
email: email,
|
||||
}),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
const error = await response.json();
|
||||
throw new Error(error.detail || 'Failed to create checkout session');
|
||||
}
|
||||
|
||||
const data: CheckoutResponse = await response.json();
|
||||
return data.checkout_url;
|
||||
}
|
||||
|
||||
/**
|
||||
* Format price from cents to display string.
|
||||
*/
|
||||
export function formatPrice(cents: number): string {
|
||||
return `$${(cents / 100).toFixed(2)}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Calculate per-credit price.
|
||||
*/
|
||||
export function pricePerCredit(pkg: CreditPackage): number {
|
||||
return pkg.price_cents / pkg.credits;
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// Beta Tester Program
|
||||
// ============================================================================
|
||||
|
||||
export interface BetaEnrollRequest {
|
||||
email: string;
|
||||
promise_text: string;
|
||||
accept_corrections_work: boolean;
|
||||
}
|
||||
|
||||
export interface BetaEnrollResponse {
|
||||
status: string;
|
||||
message: string;
|
||||
credits_granted: number;
|
||||
session_token: string | null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Enroll as a beta tester to receive free credits.
|
||||
*/
|
||||
export async function enrollBetaTester(
|
||||
email: string,
|
||||
promiseText: string,
|
||||
acceptCorrectionsWork: boolean
|
||||
): Promise<BetaEnrollResponse> {
|
||||
const response = await fetch(`${API_BASE_URL}/api/users/beta/enroll`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({
|
||||
email: email,
|
||||
promise_text: promiseText,
|
||||
accept_corrections_work: acceptCorrectionsWork,
|
||||
}),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
const error = await response.json();
|
||||
throw new Error(error.detail || 'Failed to enroll in beta program');
|
||||
}
|
||||
|
||||
return response.json();
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
/** @type {import('next').NextConfig} */
|
||||
const nextConfig = {
|
||||
output: 'export',
|
||||
trailingSlash: true,
|
||||
images: {
|
||||
unoptimized: true,
|
||||
},
|
||||
// For GitHub Pages deployment
|
||||
basePath: '',
|
||||
assetPrefix: '',
|
||||
};
|
||||
|
||||
export default nextConfig;
|
||||
Generated
-2092
File diff suppressed because it is too large.
Load diff
@@ -1,27 +0,0 @@
|
||||
{
|
||||
"name": "buy-nomadkaraoke",
|
||||
"version": "1.0.0",
|
||||
"private": true,
|
||||
"description": "Landing page and payment flow for Nomad Karaoke",
|
||||
"scripts": {
|
||||
"dev": "next dev",
|
||||
"build": "next build",
|
||||
"start": "next start",
|
||||
"lint": "next lint"
|
||||
},
|
||||
"dependencies": {
|
||||
"next": "^15.0.0",
|
||||
"react": "^19.0.0",
|
||||
"react-dom": "^19.0.0",
|
||||
"lucide-react": "^0.468.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "^22.0.0",
|
||||
"@types/react": "^19.0.0",
|
||||
"@types/react-dom": "^19.0.0",
|
||||
"typescript": "^5.0.0",
|
||||
"tailwindcss": "^3.4.0",
|
||||
"postcss": "^8.4.0",
|
||||
"autoprefixer": "^10.4.0"
|
||||
}
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
/** @type {import('postcss-load-config').Config} */
|
||||
const config = {
|
||||
plugins: {
|
||||
tailwindcss: {},
|
||||
autoprefixer: {},
|
||||
},
|
||||
};
|
||||
|
||||
export default config;
|
||||
@@ -1,43 +0,0 @@
|
||||
/** @type {import('tailwindcss').Config} */
|
||||
module.exports = {
|
||||
content: [
|
||||
'./app/**/*.{js,ts,jsx,tsx,mdx}',
|
||||
'./components/**/*.{js,ts,jsx,tsx,mdx}',
|
||||
],
|
||||
theme: {
|
||||
extend: {
|
||||
colors: {
|
||||
// Match the existing karaoke-gen dark theme
|
||||
primary: {
|
||||
50: '#eff6ff',
|
||||
100: '#dbeafe',
|
||||
200: '#bfdbfe',
|
||||
300: '#93c5fd',
|
||||
400: '#60a5fa',
|
||||
500: '#3b82f6',
|
||||
600: '#2563eb',
|
||||
700: '#1d4ed8',
|
||||
800: '#1e40af',
|
||||
900: '#1e3a8a',
|
||||
},
|
||||
dark: {
|
||||
50: '#f8fafc',
|
||||
100: '#f1f5f9',
|
||||
200: '#e2e8f0',
|
||||
300: '#cbd5e1',
|
||||
400: '#94a3b8',
|
||||
500: '#64748b',
|
||||
600: '#475569',
|
||||
700: '#334155',
|
||||
800: '#1e293b',
|
||||
900: '#0f172a',
|
||||
950: '#020617',
|
||||
},
|
||||
},
|
||||
fontFamily: {
|
||||
sans: ['Inter', 'system-ui', 'sans-serif'],
|
||||
},
|
||||
},
|
||||
},
|
||||
plugins: [],
|
||||
};
|
||||
@@ -1,26 +0,0 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"lib": ["dom", "dom.iterable", "esnext"],
|
||||
"allowJs": true,
|
||||
"skipLibCheck": true,
|
||||
"strict": true,
|
||||
"noEmit": true,
|
||||
"esModuleInterop": true,
|
||||
"module": "esnext",
|
||||
"moduleResolution": "bundler",
|
||||
"resolveJsonModule": true,
|
||||
"isolatedModules": true,
|
||||
"jsx": "preserve",
|
||||
"incremental": true,
|
||||
"plugins": [
|
||||
{
|
||||
"name": "next"
|
||||
}
|
||||
],
|
||||
"paths": {
|
||||
"@/*": ["./*"]
|
||||
}
|
||||
},
|
||||
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
|
||||
"exclude": ["node_modules"]
|
||||
}
|
||||
+196
-1
@@ -34,6 +34,28 @@ Audio separation and lyrics transcription run in parallel:
|
||||
|
||||
## Common Gotchas
|
||||
|
||||
### Cross-Domain localStorage Isolation
|
||||
|
||||
**Problem**: Auth tokens stored in localStorage on one subdomain are invisible to other subdomains.
|
||||
|
||||
We had `buy.nomadkaraoke.com` for purchases and `gen.nomadkaraoke.com` for the app. Users who purchased credits on `buy.` appeared logged out when redirected to `gen.` because localStorage is domain-isolated.
|
||||
|
||||
**Symptoms**:
|
||||
- User completes purchase, redirected to app, sees "auth required"
|
||||
- Token exists in browser dev tools for one domain but not the other
|
||||
- Works fine in local dev (same localhost origin)
|
||||
|
||||
**Solution**: Keep auth on a single domain. We consolidated `buy-site/` into the main `frontend/`:
|
||||
- Landing/pricing at `/` (root)
|
||||
- Main app at `/app`
|
||||
- Single localStorage for all auth tokens
|
||||
|
||||
**Alternative** (if subdomains required): Use cookies with `domain=.nomadkaraoke.com` instead of localStorage, or implement a token exchange flow.
|
||||
|
||||
**Lesson**: Before splitting functionality across subdomains, verify your auth storage strategy works cross-domain. E2E tests that exercise the full user journey catch this; unit tests don't.
|
||||
|
||||
See `docs/archive/2025-12-29-buy-site-consolidation.md` for full details.
|
||||
|
||||
### Frontend Polling vs Tab Visibility
|
||||
|
||||
**Problem**: After completing review in a new tab (lyrics or instrumental selection), returning to the main frontend showed stale status for up to 10 seconds due to polling interval.
|
||||
@@ -181,8 +203,69 @@ def _get_effective_distribution_settings(...) -> EffectiveDistributionSettings:
|
||||
|
||||
**Lesson**: When you see the same logic repeated in multiple places, refactor into a helper function immediately. Otherwise bugs will be fixed in one place but not others.
|
||||
|
||||
### Field Name Mismatches Between Endpoints
|
||||
|
||||
**Problem**: Different endpoints setting different field names for the same logical value, where consumers check only one field name.
|
||||
|
||||
Example: `youtube_description` vs `youtube_description_template`
|
||||
- `audio_search.py` endpoint set `youtube_description_template`
|
||||
- `file_upload.py` endpoint set only `youtube_description`
|
||||
- `video_worker.py` checked `youtube_description_template`
|
||||
- Result: YouTube uploads silently failed for remote CLI jobs
|
||||
|
||||
**Symptoms**:
|
||||
- Feature works via one code path but silently fails via another
|
||||
- No errors in logs (the field is just empty/None)
|
||||
- Difficult to debug because both paths appear correct in isolation
|
||||
|
||||
**Solution**: When adding fields that control behavior:
|
||||
1. Grep for all places that read the field
|
||||
2. Grep for all places that write the field
|
||||
3. Ensure all writers set what all readers expect
|
||||
|
||||
**Lesson**: Silent failures from field name mismatches are hard to catch. When a feature works in one flow but not another, check if different endpoints are setting different field names.
|
||||
|
||||
See `docs/archive/2025-12-30-cloud-output-structure-fix.md` for full details.
|
||||
|
||||
## Testing Insights
|
||||
|
||||
### E2E Mock Responses Must Match API Types Exactly
|
||||
|
||||
**Problem**: E2E tests with mocked API responses were failing silently because mock response format didn't match the TypeScript type the app expected.
|
||||
|
||||
The test mocked `/api/users/me` returning:
|
||||
```javascript
|
||||
{ body: { email: 'test@example.com', credits: 5 } }
|
||||
```
|
||||
|
||||
But `UserProfileResponse` type expects:
|
||||
```typescript
|
||||
interface UserProfileResponse {
|
||||
user: UserPublic; // { email, credits, role }
|
||||
has_session: boolean;
|
||||
}
|
||||
```
|
||||
|
||||
**Symptoms**:
|
||||
- Tests passed initial auth check but `/api/jobs` was never called
|
||||
- Mock server showed only 2 of 4 endpoints being called
|
||||
- App redirected to `/` instead of loading job list
|
||||
- No error messages (silent failure)
|
||||
|
||||
**Root cause**: The auth module's `fetchUser()` ran at page load and tried to access `response.user.email`. With the wrong mock format, this threw an error, the catch block called `clearAccessToken()`, and the app page saw no token and redirected.
|
||||
|
||||
**Solution**: Mock must return the exact structure the TypeScript type expects:
|
||||
```javascript
|
||||
{
|
||||
body: {
|
||||
user: { email: 'test@example.com', credits: 5, role: 'user' },
|
||||
has_session: true,
|
||||
},
|
||||
}
|
||||
```
|
||||
|
||||
**Lesson**: When writing E2E test mocks, check the TypeScript interface/type definition for the API response, not just what fields the UI displays. Silent failures from type mismatches are hard to debug.
|
||||
|
||||
### Emulator Tests Catch Real Bugs
|
||||
|
||||
Unit tests with mocks didn't catch the `input_media_gcs_path` bug. Emulator integration tests did because they use real Firestore behavior.
|
||||
@@ -246,10 +329,33 @@ gcloud run deploy service-name \
|
||||
For Gemini via Vertex AI, use Application Default Credentials (ADC) rather than API keys:
|
||||
- **Cloud Run**: Service account automatically authenticated - just grant `roles/aiplatform.user`
|
||||
- **Local dev**: Run `gcloud auth application-default login`
|
||||
- **Config**: Set `GOOGLE_CLOUD_PROJECT` and optionally `GCP_LOCATION` (defaults to `us-central1`)
|
||||
- **Config**: Set `GOOGLE_CLOUD_PROJECT` and optionally `GCP_LOCATION` (defaults to `global`)
|
||||
|
||||
This approach uses GCP's free credits and existing IAM rather than separate API key management.
|
||||
|
||||
### Gemini 3 Models Require Global Location
|
||||
|
||||
**Problem**: Gemini 3 Flash (`gemini-3-flash-preview`) returns 404 errors when using regional Vertex AI endpoints.
|
||||
|
||||
```
|
||||
404 Publisher Model `projects/PROJECT/locations/us-central1/publishers/google/models/gemini-3-flash-preview` was not found
|
||||
```
|
||||
|
||||
**Solution**: Use `global` location instead of regional endpoints like `us-central1`:
|
||||
```python
|
||||
gcp_location: str = "global" # Required for Gemini 3 models
|
||||
```
|
||||
|
||||
**Additional gotcha**: Gemini 3 returns multimodal response format:
|
||||
```python
|
||||
# Gemini 2: response.content = "text"
|
||||
# Gemini 3: response.content = [{'type': 'text', 'text': '...'}]
|
||||
```
|
||||
|
||||
Code must handle both formats when invoking LangChain ChatVertexAI.
|
||||
|
||||
See `docs/archive/2025-12-30-gemini3-agentic-correction-fix.md` for full details.
|
||||
|
||||
### CI/CD: GitHub Actions
|
||||
|
||||
Migrated from Cloud Build to GitHub Actions for:
|
||||
@@ -313,6 +419,95 @@ def verify_in_transaction(transaction):
|
||||
transaction.update(doc_ref, {'used': True})
|
||||
```
|
||||
|
||||
### Firestore Returns Timezone-Aware Datetimes
|
||||
|
||||
**Problem**: Firestore stores datetimes as timezone-aware (UTC). Code using `datetime.utcnow()` (naive) for comparisons fails with `TypeError: can't compare offset-naive and offset-aware datetimes`.
|
||||
|
||||
**Symptoms**:
|
||||
- Session validation fails silently (exception caught, returns error)
|
||||
- Session exists and appears valid in database
|
||||
- First request after login may work, subsequent requests fail (because `last_activity_at` is updated to TZ-aware on first access)
|
||||
|
||||
**Solution**: Always use timezone-aware datetimes:
|
||||
```python
|
||||
from datetime import datetime, timezone
|
||||
|
||||
# GOOD
|
||||
now = datetime.now(timezone.utc)
|
||||
|
||||
# Normalize Firestore datetimes that might be naive (legacy data)
|
||||
if session.expires_at.tzinfo is None:
|
||||
expires_at = session.expires_at.replace(tzinfo=timezone.utc)
|
||||
```
|
||||
|
||||
**Note**: `datetime.utcnow()` is deprecated in Python 3.12+. Use `datetime.now(timezone.utc)` instead.
|
||||
|
||||
See `docs/archive/2025-12-30-auth-session-persistence-fix.md` for full details.
|
||||
|
||||
### Frontend Module-Level State in Next.js
|
||||
|
||||
**Problem**: Caching values in module-level variables can cause stale state in Next.js due to module caching and hydration timing.
|
||||
|
||||
```javascript
|
||||
// BAD - may return stale value
|
||||
let accessToken = localStorage.getItem('key');
|
||||
export function getToken() { return accessToken; }
|
||||
|
||||
// GOOD - always fresh
|
||||
export function getToken() {
|
||||
if (typeof window !== 'undefined') {
|
||||
return localStorage.getItem('key');
|
||||
}
|
||||
return null;
|
||||
}
|
||||
```
|
||||
|
||||
**Lesson**: For values that can change (auth tokens, user preferences), read fresh from storage on each access rather than caching in module scope.
|
||||
|
||||
### GCP Organization Policies Block Service Account Keys
|
||||
|
||||
**Problem**: GCP organization policies can block service account key creation even when you have Owner access to the project.
|
||||
|
||||
```
|
||||
ERROR: Key creation is not allowed on this service account.
|
||||
violations: constraints/iam.disableServiceAccountKeyCreation
|
||||
```
|
||||
|
||||
**Solution**: If you have Organization Policy Administrator role, temporarily disable the constraint:
|
||||
|
||||
```bash
|
||||
# Disable at organization level (find org ID with: gcloud projects describe PROJECT --format="value(parent)")
|
||||
cat > /tmp/policy.yaml << 'EOF'
|
||||
name: organizations/ORG_ID/policies/iam.disableServiceAccountKeyCreation
|
||||
spec:
|
||||
rules:
|
||||
- enforce: false
|
||||
EOF
|
||||
gcloud org-policies set-policy /tmp/policy.yaml
|
||||
|
||||
# Wait ~30 seconds for propagation
|
||||
sleep 30
|
||||
|
||||
# Create key
|
||||
gcloud iam service-accounts keys create key.json --iam-account=SA_EMAIL
|
||||
|
||||
# Re-enable immediately
|
||||
cat > /tmp/policy.yaml << 'EOF'
|
||||
name: organizations/ORG_ID/policies/iam.disableServiceAccountKeyCreation
|
||||
spec:
|
||||
rules:
|
||||
- enforce: true
|
||||
EOF
|
||||
gcloud org-policies set-policy /tmp/policy.yaml
|
||||
|
||||
# Clean up
|
||||
rm /tmp/policy.yaml key.json # After copying key contents
|
||||
```
|
||||
|
||||
**Note**: Also check for the newer managed constraint `iam.managed.disableServiceAccountKeyCreation` and disable both if needed.
|
||||
|
||||
**Lesson**: Service account keys are a security risk and should be avoided when possible. Use Workload Identity Federation instead. But for third-party services that require JSON keys (like LangFuse), this temporary policy override is the safest approach.
|
||||
|
||||
## What We'd Do Differently
|
||||
|
||||
1. **Add Pydantic model fields test first** - Would have caught the silent field issue immediately
|
||||
|
||||
@@ -0,0 +1,234 @@
|
||||
# Product Vision
|
||||
|
||||
## What is Nomad Karaoke?
|
||||
|
||||
Nomad Karaoke is a karaoke video generation platform that creates professional-quality karaoke videos from any song in under 10 minutes. Founded by Andrew Beveridge and based in South Carolina, it combines state-of-the-art AI for audio separation and lyrics synchronization with human review to produce accurate, polished results.
|
||||
|
||||
**Mission**: Make any song singable by automating the complex, time-consuming process of creating karaoke videos.
|
||||
|
||||
## The Problem
|
||||
|
||||
Creating high-quality karaoke is surprisingly difficult:
|
||||
|
||||
1. **Vocal Removal**: Separating vocals from instrumentals without artifacts requires sophisticated AI models and significant compute power.
|
||||
|
||||
2. **Lyrics Accuracy**: Getting the right lyrics, with correct spelling, formatting, and line breaks, is error-prone when scraping from various sources.
|
||||
|
||||
3. **Timestamp Synchronization**: Aligning each word or syllable to the exact moment in the audio is the hardest part. No existing tool does this reliably for all songs.
|
||||
|
||||
4. **Multiple Formats**: Professional karaoke needs multiple output formats (MP4, MKV, CDG) at various resolutions, with proper encoding.
|
||||
|
||||
5. **Distribution**: Uploading to YouTube with proper metadata, sharing to cloud storage, and notifying users adds complexity.
|
||||
|
||||
Existing solutions either produce poor quality (DIY tools), cost too much time ($50-100/track from manual services), or don't exist at all for many songs.
|
||||
|
||||
## Target Audiences
|
||||
|
||||
### 1. Individual Karaoke Enthusiasts
|
||||
People who want custom karaoke for songs not available in commercial libraries - for home parties, personal practice, or sharing with friends.
|
||||
|
||||
### 2. Professional KJs and Venues
|
||||
Karaoke DJs ("KJs") and bars who need to fulfill on-demand song requests. When a patron asks for a song that isn't in the library, generating it in under 10 minutes means it can be ready within 1-2 performances.
|
||||
|
||||
### 3. Commercial Karaoke Producers (B2B)
|
||||
Companies that produce karaoke tracks at scale for distribution. They have their own instrumentals, branding, and distribution channels - they need automated generation infrastructure that can handle 5,000+ tracks with custom theming.
|
||||
|
||||
## Technical Approach
|
||||
|
||||
The system uses a multi-stage pipeline:
|
||||
|
||||
```
|
||||
Input (audio + metadata)
|
||||
│
|
||||
├──────────────────────────────────────┐
|
||||
│ │
|
||||
v v
|
||||
┌───────────────────┐ ┌───────────────────┐
|
||||
│ Audio Separation │ │ Lyrics Processing │
|
||||
│ (Modal GPU) │ │ (AudioShake API) │
|
||||
│ │ │ │
|
||||
│ • Clean vocal │ │ • Fetch reference │
|
||||
│ removal │ │ lyrics │
|
||||
│ • Backing vocal │ │ • Transcribe with │
|
||||
│ options │ │ timestamps │
|
||||
└─────────┬─────────┘ │ • AI correction │
|
||||
│ │ • HUMAN REVIEW │
|
||||
│ └─────────┬─────────┘
|
||||
│ │
|
||||
└──────────────┬───────────────────┘
|
||||
v
|
||||
┌───────────────────┐
|
||||
│ Video Generation │
|
||||
│ • Title screen │
|
||||
│ • Synced lyrics │
|
||||
│ • End screen │
|
||||
└─────────┬─────────┘
|
||||
│
|
||||
v
|
||||
┌───────────────────┐
|
||||
│ Output & Distro │
|
||||
│ • Multiple formats│
|
||||
│ • YouTube upload │
|
||||
│ • Cloud storage │
|
||||
└───────────────────┘
|
||||
```
|
||||
|
||||
### Why Human Review?
|
||||
|
||||
The hardest unsolved problem in karaoke generation is **reliable lyrics transcription with accurate timestamps**. Current approaches:
|
||||
|
||||
- **Whisper (open source)**: Free, but inconsistent for sung audio. Works well ~60% of the time, poorly the rest.
|
||||
- **AudioShake (paid API)**: Proprietary lyrics transcription model specifically trained for music. Much more accurate/consistent than Whisper.
|
||||
- **Agentic AI Correction**: LLM-based system that compares transcriptions against reference lyrics, fixing errors and improving sync. Costs tokens but catches many issues.
|
||||
|
||||
Even with the best AI, some songs have tricky timing, unusual pronunciations, or ambiguous lyrics. Human review catches these edge cases and ensures quality. The review UI lets users:
|
||||
- Correct misspelled words
|
||||
- Adjust word/line timing
|
||||
- Fix line breaks and formatting
|
||||
- Preview changes in real-time
|
||||
|
||||
## Open Source Philosophy
|
||||
|
||||
All code is open source (MIT license) because:
|
||||
|
||||
1. **Community**: Others can learn from, contribute to, and build upon the work
|
||||
2. **Transparency**: Users can see exactly how their data is processed
|
||||
3. **Self-hosting option**: Technical users can run their own instance
|
||||
|
||||
However, reliable fully-automated generation requires:
|
||||
- **AudioShake API**: ~$0.50-1.00 per track for high-quality transcription
|
||||
- **LLM tokens**: ~$0.50-1.00 for agentic correction workflow
|
||||
- **GPU compute**: ~$0.20-0.50 for audio separation on Modal
|
||||
- **Infrastructure**: Cloud Run, Firestore, GCS, etc.
|
||||
|
||||
**Cost per track: ~$2-3** for fully-automated processing, making a paid service necessary to sustain development.
|
||||
|
||||
The open source CLI (`karaoke-gen`) works with local processing and free APIs for users willing to accept lower reliability and do more manual correction. The hosted service (`gen.nomadkaraoke.com`) provides the premium, reliable experience.
|
||||
|
||||
## Business Model
|
||||
|
||||
### Credit-Based Pricing
|
||||
|
||||
Users purchase credits to generate karaoke videos:
|
||||
|
||||
| Credits | Price | Per Track | Savings |
|
||||
|---------|-------|-----------|---------|
|
||||
| 1 | $5 | $5.00 | - |
|
||||
| 3 | $12 | $4.00 | 20% |
|
||||
| 5 | $18 | $3.50 | 30% |
|
||||
| 10 | $30 | $3.00 | 40% |
|
||||
|
||||
This is significantly cheaper than:
|
||||
- Manual services: $10-50 per track
|
||||
- Hiring a studio: $100+ per track
|
||||
- DIY tools + your time: Hours of frustration
|
||||
|
||||
### Beta Tester Program
|
||||
|
||||
New users can join the beta program to get free credits in exchange for feedback, helping improve the system while building initial user base.
|
||||
|
||||
### B2B / White-Label
|
||||
|
||||
Commercial producers pay for API access or custom integration to generate tracks at scale with their own branding, instrumentals, and distribution.
|
||||
|
||||
## Current State (December 2025)
|
||||
|
||||
### What Works
|
||||
- Audio upload and separation (Modal API)
|
||||
- Lyrics transcription (AudioShake API)
|
||||
- Agentic AI correction (Gemini 3 Flash via Vertex AI)
|
||||
- Human lyrics review (React UI)
|
||||
- Preview video generation
|
||||
- Instrumental selection (clean vs. with backing vocals)
|
||||
- Multi-format encoding (4K, 720p, lossless, lossy)
|
||||
- Token-based authentication
|
||||
- Magic link authentication
|
||||
- Payment flow (Stripe)
|
||||
- Beta tester program
|
||||
- YouTube upload integration
|
||||
- Dropbox/Google Drive distribution
|
||||
|
||||
### Known Limitations
|
||||
- CDG format needs additional style configuration
|
||||
- Very long audio (>10 min) may timeout
|
||||
- Some edge cases in lyrics timing still need manual correction
|
||||
|
||||
## Product Ecosystem
|
||||
|
||||
### Active Products
|
||||
|
||||
1. **gen.nomadkaraoke.com** - Web application for generating karaoke videos (includes landing page, pricing, and payment)
|
||||
2. **karaoke-gen CLI** - Local command-line tool for power users
|
||||
3. **karaoke-gen-remote CLI** - CLI that uses the cloud backend
|
||||
4. **Nomad Karaoke YouTube Channel** - Hosts generated videos for users
|
||||
|
||||
### Future Products
|
||||
|
||||
1. **KaraokeHunt** (revival planned) - Song discovery app that analyzes streaming history to suggest songs you'd enjoy singing. Previously launched as a separate product; will be rebranded and integrated with the karaoke generator.
|
||||
|
||||
2. **New nomadkaraoke.com Homepage** - Replace the legacy static site with a modern landing page showcasing the generator (currently deployed from `nomadkaraoke/public-website` repo).
|
||||
|
||||
## Differentiators
|
||||
|
||||
### vs. DIY Tools (Whisper + Demucs + manual editing)
|
||||
- **Quality**: AudioShake's proprietary model beats open source transcription
|
||||
- **Speed**: 10 minutes vs. hours of manual work
|
||||
- **Convenience**: One-click generation with human review UI
|
||||
|
||||
### vs. Manual Services ($10-50/track)
|
||||
- **Price**: $3-5 per track
|
||||
- **Speed**: Minutes instead of days
|
||||
- **Scale**: Generate as many as you need, when you need them
|
||||
|
||||
### vs. Other Automated Tools
|
||||
- **Accuracy**: Human review catches AI errors
|
||||
- **Output quality**: 4K video, multiple formats, proper encoding
|
||||
- **Distribution**: YouTube upload, cloud storage, notifications built in
|
||||
- **Open source**: Transparency and community contributions
|
||||
|
||||
## Technical Stack
|
||||
|
||||
- **Backend**: FastAPI on Google Cloud Run
|
||||
- **Frontend**: Next.js on Cloudflare Pages
|
||||
- **Database**: Firestore
|
||||
- **Storage**: Google Cloud Storage
|
||||
- **Secrets**: Google Secret Manager
|
||||
- **Audio Separation**: Modal (GPU compute)
|
||||
- **Lyrics Transcription**: AudioShake API
|
||||
- **AI Correction**: Vertex AI (Gemini 3 Flash)
|
||||
- **Payments**: Stripe
|
||||
- **Email**: SendGrid
|
||||
- **IaC**: Pulumi
|
||||
- **CI/CD**: GitHub Actions (self-hosted runner on GCP)
|
||||
|
||||
## Roadmap
|
||||
|
||||
### Near-term
|
||||
- Public launch of gen.nomadkaraoke.com
|
||||
- New marketing homepage at nomadkaraoke.com
|
||||
- B2B API for commercial producer integration
|
||||
- Bulk generation features for high-volume clients
|
||||
|
||||
### Medium-term
|
||||
- KaraokeHunt revival and integration
|
||||
- Mobile-optimized experience
|
||||
- Real-time generation status notifications
|
||||
- Additional output format support
|
||||
|
||||
### Long-term
|
||||
- Karaoke Eternal integration (community request)
|
||||
- On-premises deployment option for venues
|
||||
- Live karaoke event features
|
||||
|
||||
## Links
|
||||
|
||||
- **Web App**: https://gen.nomadkaraoke.com
|
||||
- **API**: https://api.nomadkaraoke.com
|
||||
- **GitHub**: https://github.com/nomadkaraoke/karaoke-gen
|
||||
- **YouTube Channel**: https://www.youtube.com/@nomadkaraoke
|
||||
- **Updates Signup**: https://nomadkaraoke.kit.com/
|
||||
- **Contact**: https://cal.com/beveradb
|
||||
|
||||
## About the Founder
|
||||
|
||||
Andrew Beveridge is a software engineer based in South Carolina who runs a weekly karaoke night and built Nomad Karaoke to solve his own problem: wanting to sing songs that don't exist as karaoke. What started as a personal tool evolved into a platform that can help anyone create professional karaoke for any song.
|
||||
+15
-1
@@ -4,7 +4,9 @@
|
||||
|
||||
## What Works
|
||||
|
||||
- **Web App**: https://gen.nomadkaraoke.com - Upload audio, review lyrics, download videos
|
||||
- **Web App**: https://gen.nomadkaraoke.com
|
||||
- `/` - Landing page with pricing and beta enrollment
|
||||
- `/app` - Main app (upload audio, review lyrics, download videos)
|
||||
- **Backend API**: https://api.nomadkaraoke.com - FastAPI on Cloud Run
|
||||
- **CLI Tools**: `karaoke-gen` (local), `karaoke-gen-remote` (cloud)
|
||||
|
||||
@@ -30,14 +32,26 @@
|
||||
- CDG format generation requires additional style configuration
|
||||
- Long audio files (>10 min) may timeout on some workers
|
||||
|
||||
## Recent Changes
|
||||
|
||||
- **LangFuse Prompt Management** (2025-12-30): Replaced hardcoded LLM prompts with LangFuse-managed prompts for dynamic iteration without redeploying. Added migration script, LangFuse Vertex AI service account for GCP credits. See [archive/2025-12-30-langfuse-prompt-management.md](archive/2025-12-30-langfuse-prompt-management.md)
|
||||
- **Gemini 3 Flash Agentic Correction Fix** (2025-12-30): Fixed agentic correction hanging due to Gemini 3 requiring `global` location instead of regional endpoints, and multimodal response format handling. Added local test script for faster iteration. See [archive/2025-12-30-gemini3-agentic-correction-fix.md](archive/2025-12-30-gemini3-agentic-correction-fix.md)
|
||||
- **Cold Start UX** (2025-12-30): Frontend now shows friendly "Warming up the generator..." messages when backend is slow to respond (cold start after deployment or inactivity). Progressive messages appear after 5s and 15s to reassure users during 30s+ cold starts.
|
||||
- **Cloud Output Structure Fix** (2025-12-30): Fixed remote CLI (`karaoke-gen-remote`) to produce identical output as local CLI: YouTube uploads now work, Dropbox includes stems/ and lyrics/ subfolders, instrumental filenames use actual model names. See [archive/2025-12-30-cloud-output-structure-fix.md](archive/2025-12-30-cloud-output-structure-fix.md)
|
||||
- **Auth Session Persistence Fix** (2025-12-30): Fixed two bugs causing 401 errors despite valid sessions: timezone-aware datetime comparisons in backend, and stale token caching in frontend. Firestore indexes now tracked in Pulumi. See [archive/2025-12-30-auth-session-persistence-fix.md](archive/2025-12-30-auth-session-persistence-fix.md)
|
||||
- **E2E Test Suite Consolidated** (2025-12-29): Tests reorganized into `production/` (real API) and `regression/` (mocked API, CI-safe). See [archive/2025-12-29-e2e-test-consolidation-plan.md](archive/2025-12-29-e2e-test-consolidation-plan.md)
|
||||
|
||||
## Quick Links
|
||||
|
||||
| Doc | Purpose |
|
||||
|-----|---------|
|
||||
| [PRODUCT-VISION.md](PRODUCT-VISION.md) | Product goals, audience, business model |
|
||||
| [ARCHITECTURE.md](ARCHITECTURE.md) | System design, data flow, integrations |
|
||||
| [DEVELOPMENT.md](DEVELOPMENT.md) | Local setup, testing, deployment |
|
||||
| [API.md](API.md) | Backend endpoint reference |
|
||||
| [LESSONS-LEARNED.md](LESSONS-LEARNED.md) | Key insights for future agents |
|
||||
| [STRIPE-SETUP.md](STRIPE-SETUP.md) | Payment integration setup |
|
||||
| [MOBILE-UX-BEST-PRACTICES.md](MOBILE-UX-BEST-PRACTICES.md) | Mobile/responsive design guidelines |
|
||||
| [archive/](archive/) | Historical documentation |
|
||||
|
||||
## Workflow Summary
|
||||
|
||||
@@ -60,7 +60,7 @@ STRIPE_WEBHOOK_SECRET=whsec_your_webhook_secret
|
||||
|
||||
# Optional (defaults shown)
|
||||
FRONTEND_URL=https://gen.nomadkaraoke.com
|
||||
BUY_URL=https://buy.nomadkaraoke.com
|
||||
# BUY_URL defaults to FRONTEND_URL after site consolidation
|
||||
```
|
||||
|
||||
### For Cloud Run deployment:
|
||||
@@ -80,7 +80,7 @@ echo -n "SG.your_sendgrid_api_key" | gcloud secrets versions add sendgrid-api-ke
|
||||
```
|
||||
|
||||
4. The environment variables are configured in the Cloud Run deployment. Defaults:
|
||||
- `EMAIL_FROM=noreply@nomadkaraoke.com`
|
||||
- `EMAIL_FROM=gen@nomadkaraoke.com`
|
||||
- `EMAIL_FROM_NAME=Nomad Karaoke`
|
||||
|
||||
## 6. Test the Integration
|
||||
|
||||
@@ -0,0 +1,230 @@
|
||||
# API Key Management System - Phase 2 Plan
|
||||
|
||||
**Status:** Planned (Phase 1 complete)
|
||||
**Created:** 2024-12-29
|
||||
|
||||
## Background
|
||||
|
||||
Phase 1 (completed) established that all auth_tokens must have a `user_email` field for job ownership tracking. This eliminated anonymous token authentication and ensures all jobs have proper attribution.
|
||||
|
||||
Phase 2 will add self-service API key management for B2B/bulk karaoke generation users.
|
||||
|
||||
## Current State (After Phase 1)
|
||||
|
||||
- All `auth_tokens` in Firestore require a `user_email` field
|
||||
- Admin tokens (from `ADMIN_TOKENS` env var) are associated with `admin@nomadkaraoke.com`
|
||||
- Session tokens (magic link auth) have user_email from the authenticated user
|
||||
- Jobs created via any auth method are attributed to the token's user_email
|
||||
|
||||
## Phase 2: Self-Service API Key Management
|
||||
|
||||
### New Endpoints
|
||||
|
||||
```
|
||||
POST /api/keys - Generate new API key for current user
|
||||
GET /api/keys - List user's API keys (masked)
|
||||
DELETE /api/keys/{key_id} - Revoke an API key
|
||||
```
|
||||
|
||||
### API Key Schema (auth_tokens collection)
|
||||
|
||||
```python
|
||||
{
|
||||
"token": "sk_live_...", # The API key (document ID)
|
||||
"type": "api_key", # UserType.API_KEY
|
||||
"user_email": "user@example.com", # Owner's email (required)
|
||||
"api_key_id": "key_abc123", # Short ID for display/revocation
|
||||
"name": "Production Server", # User-provided name
|
||||
"max_uses": -1, # -1 = unlimited, or specific limit
|
||||
"usage_count": 0, # Current usage
|
||||
"active": True, # Can be revoked
|
||||
"created_at": 1703894400, # Unix timestamp
|
||||
"last_used": null, # Last usage timestamp
|
||||
"expires_at": null, # Optional expiration
|
||||
"ip_allowlist": [], # Optional IP restrictions
|
||||
"jobs": [] # Job history [{job_id, created_at}]
|
||||
}
|
||||
```
|
||||
|
||||
### Implementation Details
|
||||
|
||||
#### 1. Generate API Key Endpoint
|
||||
|
||||
```python
|
||||
@router.post("/keys", response_model=APIKeyResponse)
|
||||
async def create_api_key(
|
||||
request: CreateAPIKeyRequest,
|
||||
auth_result: AuthResult = Depends(require_auth)
|
||||
) -> APIKeyResponse:
|
||||
"""
|
||||
Generate a new API key for the authenticated user.
|
||||
|
||||
The full key is only shown once at creation time.
|
||||
"""
|
||||
# Require authenticated user (not anonymous)
|
||||
if not auth_result.user_email:
|
||||
raise HTTPException(403, "Must be logged in to create API keys")
|
||||
|
||||
# Check user's API key limit (e.g., max 5 per user)
|
||||
existing_keys = firestore.list_user_api_keys(auth_result.user_email)
|
||||
if len(existing_keys) >= settings.max_api_keys_per_user:
|
||||
raise HTTPException(400, f"Maximum {settings.max_api_keys_per_user} API keys allowed")
|
||||
|
||||
# Generate secure key
|
||||
key_id = shortuuid.uuid()[:8]
|
||||
token = f"sk_{'live' if settings.environment == 'production' else 'test'}_{secrets.token_urlsafe(32)}"
|
||||
|
||||
# Store in Firestore
|
||||
firestore.create_token(token, {
|
||||
"token": token,
|
||||
"type": "api_key",
|
||||
"user_email": auth_result.user_email,
|
||||
"api_key_id": key_id,
|
||||
"name": request.name or f"API Key {key_id}",
|
||||
"max_uses": request.max_uses or -1,
|
||||
"usage_count": 0,
|
||||
"active": True,
|
||||
"created_at": time.time(),
|
||||
"ip_allowlist": request.ip_allowlist or [],
|
||||
"jobs": []
|
||||
})
|
||||
|
||||
return APIKeyResponse(
|
||||
key_id=key_id,
|
||||
token=token, # Only shown once!
|
||||
name=request.name,
|
||||
created_at=datetime.utcnow(),
|
||||
message="Save this key - it won't be shown again"
|
||||
)
|
||||
```
|
||||
|
||||
#### 2. List API Keys Endpoint
|
||||
|
||||
```python
|
||||
@router.get("/keys", response_model=List[APIKeyInfo])
|
||||
async def list_api_keys(
|
||||
auth_result: AuthResult = Depends(require_auth)
|
||||
) -> List[APIKeyInfo]:
|
||||
"""List user's API keys with masked tokens."""
|
||||
keys = firestore.list_user_api_keys(auth_result.user_email)
|
||||
|
||||
return [
|
||||
APIKeyInfo(
|
||||
key_id=k["api_key_id"],
|
||||
name=k.get("name"),
|
||||
token_prefix=k["token"][:12] + "...", # Masked
|
||||
created_at=datetime.fromtimestamp(k["created_at"]),
|
||||
last_used=datetime.fromtimestamp(k["last_used"]) if k.get("last_used") else None,
|
||||
usage_count=k.get("usage_count", 0),
|
||||
max_uses=k.get("max_uses", -1),
|
||||
is_active=k.get("active", True)
|
||||
)
|
||||
for k in keys
|
||||
]
|
||||
```
|
||||
|
||||
#### 3. Revoke API Key Endpoint
|
||||
|
||||
```python
|
||||
@router.delete("/keys/{key_id}")
|
||||
async def revoke_api_key(
|
||||
key_id: str,
|
||||
auth_result: AuthResult = Depends(require_auth)
|
||||
) -> dict:
|
||||
"""Revoke an API key."""
|
||||
# Find key by key_id
|
||||
key = firestore.get_api_key_by_id(key_id)
|
||||
|
||||
if not key:
|
||||
raise HTTPException(404, "API key not found")
|
||||
|
||||
# Verify ownership
|
||||
if key["user_email"] != auth_result.user_email and not auth_result.is_admin:
|
||||
raise HTTPException(403, "Not authorized to revoke this key")
|
||||
|
||||
# Revoke (soft delete)
|
||||
firestore.update_token(key["token"], {"active": False})
|
||||
|
||||
return {"status": "revoked", "key_id": key_id}
|
||||
```
|
||||
|
||||
### Firestore Indexes Needed
|
||||
|
||||
```json
|
||||
{
|
||||
"collectionGroup": "auth_tokens",
|
||||
"fields": [
|
||||
{ "fieldPath": "user_email", "order": "ASCENDING" },
|
||||
{ "fieldPath": "type", "order": "ASCENDING" },
|
||||
{ "fieldPath": "created_at", "order": "DESCENDING" }
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
### Models
|
||||
|
||||
```python
|
||||
class CreateAPIKeyRequest(BaseModel):
|
||||
name: Optional[str] = None
|
||||
max_uses: Optional[int] = None # -1 = unlimited
|
||||
ip_allowlist: Optional[List[str]] = None
|
||||
|
||||
class APIKeyResponse(BaseModel):
|
||||
key_id: str
|
||||
token: str # Full token - only shown at creation
|
||||
name: Optional[str]
|
||||
created_at: datetime
|
||||
message: str
|
||||
|
||||
class APIKeyInfo(BaseModel):
|
||||
key_id: str
|
||||
name: Optional[str]
|
||||
token_prefix: str # Masked token
|
||||
created_at: datetime
|
||||
last_used: Optional[datetime]
|
||||
usage_count: int
|
||||
max_uses: int
|
||||
is_active: bool
|
||||
```
|
||||
|
||||
### Frontend Integration
|
||||
|
||||
Add "API Keys" section to user settings page:
|
||||
|
||||
1. **List view**: Show all keys with name, prefix, usage, created date
|
||||
2. **Create button**: Opens modal to name new key, shows full key once
|
||||
3. **Revoke button**: Confirmation dialog, then revokes key
|
||||
4. **Copy button**: Copy masked key prefix (for reference)
|
||||
|
||||
### Security Considerations
|
||||
|
||||
1. **Rate limiting**: Limit key creation (e.g., 5 keys max per user)
|
||||
2. **Key rotation**: Encourage periodic rotation, show last_used date
|
||||
3. **IP allowlist**: Optional IP restriction for production keys
|
||||
4. **Audit logging**: Log all key creation/revocation events
|
||||
5. **Key prefix**: Use `sk_live_` / `sk_test_` prefix for identification
|
||||
6. **No key retrieval**: Full key only shown at creation, cannot be retrieved
|
||||
|
||||
### Migration
|
||||
|
||||
Existing auth_tokens without `user_email`:
|
||||
- Already handled in Phase 1 - tokens without user_email are rejected
|
||||
- The one existing admin token should be updated in Firestore to have `user_email: "admin@nomadkaraoke.com"`
|
||||
|
||||
### Testing
|
||||
|
||||
1. Create key as authenticated user
|
||||
2. Use key to create job - verify job.user_email matches key owner
|
||||
3. List keys - verify only own keys shown
|
||||
4. Revoke key - verify subsequent requests fail
|
||||
5. Test IP allowlist enforcement (if implemented)
|
||||
|
||||
## Timeline
|
||||
|
||||
Phase 2 can be implemented when there's B2B demand. Estimated effort: 1-2 days.
|
||||
|
||||
## Open Questions
|
||||
|
||||
1. Should API keys have expiration dates by default?
|
||||
2. What usage limits should free users have?
|
||||
3. Should we support webhook notifications for key events?
|
||||
@@ -0,0 +1,250 @@
|
||||
# Buy Site Architecture Analysis
|
||||
|
||||
**Date**: 2025-12-29
|
||||
**Status**: Analysis Complete - Consolidation Recommended
|
||||
|
||||
## Executive Summary
|
||||
|
||||
The current two-site architecture (buy.nomadkaraoke.com + gen.nomadkaraoke.com) has fundamental issues that break the user authentication flow. **Strong recommendation: Consolidate into a single site** to simplify the architecture, fix auth issues, and improve user experience.
|
||||
|
||||
## Critical Bugs Found
|
||||
|
||||
### 1. Token Storage Key Mismatch
|
||||
|
||||
**Location**: `buy-site/app/page.tsx:95` vs `frontend/lib/api.ts:18`
|
||||
|
||||
```javascript
|
||||
// buy-site stores token as:
|
||||
localStorage.setItem('nomad_karaoke_token', response.session_token);
|
||||
|
||||
// frontend reads token as:
|
||||
localStorage.getItem('karaoke_access_token');
|
||||
```
|
||||
|
||||
Even if the user stays on the same domain, this key mismatch means tokens wouldn't transfer.
|
||||
|
||||
### 2. Cross-Domain localStorage Isolation
|
||||
|
||||
**The fundamental problem**: localStorage is domain-specific. Data stored on `buy.nomadkaraoke.com` is completely inaccessible from `gen.nomadkaraoke.com`.
|
||||
|
||||
This means:
|
||||
- Beta tester enrollment stores a session token on buy.nomadkaraoke.com
|
||||
- Redirect to gen.nomadkaraoke.com loses the token
|
||||
- User appears unauthenticated on the main app
|
||||
|
||||
### 3. Broken Beta Tester Flow
|
||||
|
||||
**Expected user experience**:
|
||||
1. User fills beta form on buy site
|
||||
2. Gets session token
|
||||
3. Redirects to gen site
|
||||
4. Is authenticated and can create karaoke
|
||||
|
||||
**Actual experience**:
|
||||
1. User fills beta form on buy site
|
||||
2. Token stored in buy site's localStorage
|
||||
3. Redirects to gen site (different domain!)
|
||||
4. Token is NOT accessible
|
||||
5. User sees "Authentication Required" message
|
||||
6. User is confused
|
||||
|
||||
## Architecture Comparison
|
||||
|
||||
### Current: Two Sites
|
||||
|
||||
```
|
||||
buy.nomadkaraoke.com (Cloudflare Pages) gen.nomadkaraoke.com (GitHub Pages)
|
||||
├── Landing page ├── Main app
|
||||
├── Pricing ├── Job creation
|
||||
├── Beta enrollment ├── Job management
|
||||
├── Stripe checkout redirect ├── Auth dialog
|
||||
└── localStorage: nomad_karaoke_token └── localStorage: karaoke_access_token
|
||||
↓ ↑
|
||||
└───── REDIRECT (token lost!) ──────────────┘
|
||||
```
|
||||
|
||||
**Problems**:
|
||||
- Cross-domain auth doesn't work with localStorage
|
||||
- Two separate codebases to maintain
|
||||
- Two separate deployments (Cloudflare + GitHub Pages)
|
||||
- Duplicate dependencies (React, Next.js, Tailwind on both)
|
||||
- Confusing user navigation between sites
|
||||
- "Already have credits? Sign in" link goes to unauthenticated state
|
||||
|
||||
### Proposed: Single Site
|
||||
|
||||
```
|
||||
gen.nomadkaraoke.com (GitHub Pages)
|
||||
├── Landing page (new /welcome or / route)
|
||||
├── Pricing (/pricing or landing page section)
|
||||
├── Beta enrollment (modal or dedicated route)
|
||||
├── Stripe checkout redirect
|
||||
├── Main app (/app or /)
|
||||
├── Job creation
|
||||
├── Job management
|
||||
└── localStorage: karaoke_access_token (single key)
|
||||
```
|
||||
|
||||
**Benefits**:
|
||||
- Single domain = single localStorage = no auth issues
|
||||
- One codebase to maintain
|
||||
- One deployment pipeline
|
||||
- Shared components and styles
|
||||
- Clear user navigation
|
||||
- Consistent branding/experience
|
||||
|
||||
## Migration Path
|
||||
|
||||
### Phase 1: Integrate Landing/Pricing into Main Frontend
|
||||
|
||||
1. Create new routes in `frontend/`:
|
||||
- `/welcome` - Landing page (can be set as default for unauthenticated users)
|
||||
- `/pricing` - Pricing section (or integrate into landing)
|
||||
|
||||
2. Move buy-site components to frontend:
|
||||
- Copy pricing UI from `buy-site/app/page.tsx`
|
||||
- Copy beta enrollment form
|
||||
- Reuse existing auth components
|
||||
|
||||
3. Update frontend routing:
|
||||
- Unauthenticated users → Landing page
|
||||
- Authenticated users → Main app
|
||||
|
||||
### Phase 2: Update Auth Flow
|
||||
|
||||
1. Fix token key to be consistent:
|
||||
```javascript
|
||||
localStorage.setItem('karaoke_access_token', token);
|
||||
```
|
||||
|
||||
2. Beta enrollment flow:
|
||||
- Show form on gen.nomadkaraoke.com directly
|
||||
- On success, store token and redirect to app (same domain)
|
||||
- User is immediately authenticated
|
||||
|
||||
### Phase 3: Cleanup
|
||||
|
||||
1. Delete buy-site directory
|
||||
2. Remove Cloudflare Pages deployment
|
||||
3. Delete buy.nomadkaraoke.com DNS record (or redirect to gen)
|
||||
4. Update CI/CD to remove buy-site jobs
|
||||
|
||||
## Files to Delete
|
||||
|
||||
```
|
||||
buy-site/ # Entire directory
|
||||
├── app/
|
||||
│ ├── globals.css
|
||||
│ ├── layout.tsx
|
||||
│ └── page.tsx
|
||||
├── lib/
|
||||
│ └── api.ts
|
||||
├── next.config.mjs
|
||||
├── package.json
|
||||
├── package-lock.json
|
||||
├── postcss.config.mjs
|
||||
├── tailwind.config.js
|
||||
└── tsconfig.json
|
||||
```
|
||||
|
||||
## CI/CD Changes
|
||||
|
||||
In `.github/workflows/ci.yml`:
|
||||
- Remove `buy_site` from path filters
|
||||
- Remove `deploy-buy-site` job
|
||||
|
||||
## DNS/Infrastructure Changes
|
||||
|
||||
- Remove or redirect `buy.nomadkaraoke.com` → `gen.nomadkaraoke.com`
|
||||
- Delete Cloudflare Pages project `nomadkaraoke-buy`
|
||||
|
||||
## Alternative Solutions (Not Recommended)
|
||||
|
||||
### Option A: Shared Auth via URL Token
|
||||
|
||||
Pass token in URL when redirecting:
|
||||
```
|
||||
https://gen.nomadkaraoke.com?token=xxx
|
||||
```
|
||||
|
||||
**Problems**:
|
||||
- Token in URL is a security risk (logs, referrer headers)
|
||||
- Requires frontend to parse and clear URL
|
||||
- Still two codebases to maintain
|
||||
|
||||
### Option B: Cookie with Shared Domain
|
||||
|
||||
Use cookies with `domain=.nomadkaraoke.com`:
|
||||
```javascript
|
||||
document.cookie = `session=${token}; domain=.nomadkaraoke.com; secure; samesite=strict`;
|
||||
```
|
||||
|
||||
**Problems**:
|
||||
- Still two codebases to maintain
|
||||
- Cookie handling adds complexity
|
||||
- CORS issues with API calls
|
||||
|
||||
### Option C: Subdomain with Shared localStorage
|
||||
|
||||
If both sites were on same origin (e.g., `gen.nomadkaraoke.com/buy`), localStorage would be shared.
|
||||
|
||||
**This is essentially the consolidation approach** - just with a different URL structure.
|
||||
|
||||
## Testing the Fix
|
||||
|
||||
Created Playwright e2e test: `frontend/e2e/production-user-journey.spec.ts`
|
||||
|
||||
Key test scenarios:
|
||||
1. Landing page loads correctly
|
||||
2. Beta enrollment validation works
|
||||
3. Token storage is consistent
|
||||
4. Auth persists after redirect
|
||||
5. Cross-domain issues documented (will fail until fixed)
|
||||
|
||||
Run tests:
|
||||
```bash
|
||||
cd frontend
|
||||
npx playwright test production-user-journey --config=playwright.production.config.ts --headed
|
||||
```
|
||||
|
||||
## Email Testing for E2E
|
||||
|
||||
For full end-to-end magic link testing, options evaluated:
|
||||
|
||||
1. **MailSlurp** - Free tier (50 emails/month), good API
|
||||
- Set `MAILSLURP_API_KEY` env var
|
||||
- Creates temporary inbox
|
||||
- Waits for magic link email
|
||||
- Extracts and follows link
|
||||
|
||||
2. **Mailosaur** - Paid, very reliable
|
||||
|
||||
3. **Gmail API** - Works with user's personal Gmail
|
||||
|
||||
For now, tests document the flows but skip actual email verification unless `MAILSLURP_API_KEY` is set.
|
||||
|
||||
## Recommendation
|
||||
|
||||
**Strongly recommend consolidating to a single site** because:
|
||||
|
||||
1. **Fixes fundamental auth bug** - localStorage sharing isn't possible cross-domain
|
||||
2. **Simpler architecture** - One codebase, one deployment
|
||||
3. **Better UX** - No confusing navigation between sites
|
||||
4. **Easier maintenance** - Single set of dependencies
|
||||
5. **Consistent branding** - Same styles/components everywhere
|
||||
6. **Aligns with PRODUCT-VISION.md** - Single gen.nomadkaraoke.com as the product
|
||||
|
||||
## References
|
||||
|
||||
- Product Vision: `docs/PRODUCT-VISION.md`
|
||||
- Frontend auth: `frontend/lib/auth.ts`
|
||||
- Frontend API: `frontend/lib/api.ts`
|
||||
- Buy site page: `buy-site/app/page.tsx`
|
||||
- E2E tests: `frontend/e2e/production-user-journey.spec.ts`
|
||||
|
||||
## Sources
|
||||
|
||||
Research on email testing:
|
||||
- [Mailosaur Playwright guide](https://mailosaur.com/blog/playwright-email-verification)
|
||||
- [MailSlurp Next Auth testing](https://www.mailslurp.com/guides/test-next-auth-magic-links/)
|
||||
- [Better Stack signup testing guide](https://betterstack.com/community/guides/testing/playwright-signup-login/)
|
||||
@@ -0,0 +1,70 @@
|
||||
# Buy-Site Consolidation into Main Frontend
|
||||
|
||||
**Date**: 2025-12-29
|
||||
**PR**: #122
|
||||
**Branch**: `consolidate-buy-site`
|
||||
|
||||
## Summary
|
||||
|
||||
Consolidated the separate `buy-site/` Next.js application into the main `frontend/` application. This eliminates cross-domain issues and simplifies deployment.
|
||||
|
||||
## Problem
|
||||
|
||||
The original architecture had two separate frontends:
|
||||
- `gen.nomadkaraoke.com` - Main karaoke generation app
|
||||
- `buy.nomadkaraoke.com` - Credit purchase and beta enrollment
|
||||
|
||||
This caused a critical bug: **localStorage is domain-isolated**. Auth tokens stored on `buy.nomadkaraoke.com` were invisible to `gen.nomadkaraoke.com`, so users who purchased credits appeared logged out when redirected to the main app.
|
||||
|
||||
## Solution
|
||||
|
||||
Merged all buy-site functionality into the main frontend:
|
||||
- Landing page with pricing, beta enrollment at `/` (root)
|
||||
- Main app (job submission, job list) at `/app`
|
||||
- Payment success page at `/payment/success`
|
||||
|
||||
## Key Changes
|
||||
|
||||
### Route Structure
|
||||
| Before | After |
|
||||
|--------|-------|
|
||||
| `gen.nomadkaraoke.com/` | Main app (auth required) |
|
||||
| `buy.nomadkaraoke.com/` | Landing/pricing |
|
||||
|
||||
| After | Route |
|
||||
|-------|-------|
|
||||
| Landing/pricing | `/` (root) |
|
||||
| Main app | `/app` |
|
||||
| Auth verify | `/auth/verify` |
|
||||
| Payment success | `/payment/success` |
|
||||
|
||||
### Auth Flow
|
||||
- Unauthenticated users see landing page at root
|
||||
- Authenticated users are redirected to `/app`
|
||||
- Magic link verification redirects to `/app`
|
||||
- Payment success redirects to `/app`
|
||||
|
||||
### Files Changed
|
||||
- Created `frontend/app/app/page.tsx` (main app moved from root)
|
||||
- Updated `frontend/app/page.tsx` (landing page from buy-site)
|
||||
- Deleted `frontend/app/welcome/` (no longer needed)
|
||||
- Updated redirect paths in auth/payment pages
|
||||
- Updated E2E tests for new URL structure
|
||||
|
||||
### Deleted
|
||||
- Entire `buy-site/` directory (merged into frontend)
|
||||
- `buy.nomadkaraoke.com` DNS CNAME
|
||||
|
||||
## Lessons Learned
|
||||
|
||||
1. **Cross-domain localStorage isolation** is a common gotcha when splitting apps across subdomains. Unless you need true multi-tenant isolation, keep auth on a single domain.
|
||||
|
||||
2. **Token storage key consistency** matters - we also fixed a mismatch where buy-site stored tokens as `access_token` but frontend expected `auth_token`.
|
||||
|
||||
3. **E2E tests caught the real user journey bug** that unit tests missed - the redirect after payment led to an "auth required" state.
|
||||
|
||||
## Testing
|
||||
|
||||
- Updated `frontend/e2e/production-user-journey.spec.ts` for new URLs
|
||||
- Added MailSlurp integration for email verification testing
|
||||
- All E2E tests pass with new route structure
|
||||
@@ -0,0 +1,484 @@
|
||||
# E2E Test Suite Consolidation Plan
|
||||
|
||||
**Date**: December 29, 2025
|
||||
**Status**: Completed
|
||||
**Author**: Claude (with Andrew's direction)
|
||||
|
||||
---
|
||||
|
||||
## Executive Summary
|
||||
|
||||
This document outlines a plan to consolidate and improve the frontend E2E test suite. The goal is to create:
|
||||
|
||||
1. **A single, comprehensive production E2E test** that exercises the full user journey with real APIs (manual execution only)
|
||||
2. **A robust regression test suite** using recorded API fixtures that can run in CI without hitting production
|
||||
|
||||
---
|
||||
|
||||
## Current State Analysis
|
||||
|
||||
### Test File Inventory
|
||||
|
||||
| File | Lines | Purpose | Test Song | Runs Against |
|
||||
|------|-------|---------|-----------|--------------|
|
||||
| `production-user-journey.spec.ts` | 533 | Landing page, pricing, beta enrollment, auth, token persistence | `piri/dog` (defined but unused) | Production |
|
||||
| `production-e2e.spec.ts` | 319 | Full 8-step karaoke generation flow | `piri/dog` ✅ | Production |
|
||||
| `karaoke-generation.spec.ts` | 570 | App UI, job interactions, search, audio selection | ABBA, LCMDF, Rick Astley ❌ | Local dev (proxy to prod) |
|
||||
| `screenshot-audio-dialog.spec.ts` | 297 | Audio dialog screenshot capture | Radiohead ❌ | Local dev |
|
||||
| `mobile-responsiveness.spec.ts` | 163 | Mobile viewport testing | N/A | Local dev |
|
||||
| `fixtures-example.spec.ts` | 119 | Demo of mock fixture system | N/A (mocked) | Local dev |
|
||||
|
||||
**Total: 6 test files, ~2000 lines of test code**
|
||||
|
||||
### Playwright Configurations
|
||||
|
||||
| Config | Base URL | Test Pattern | Purpose |
|
||||
|--------|----------|--------------|---------|
|
||||
| `playwright.config.ts` | `localhost:3000` | All `e2e/*.spec.ts` | Local dev with proxy to prod API |
|
||||
| `playwright.production.config.ts` | `gen.nomadkaraoke.com` | `production-*.spec.ts` only | Direct production testing |
|
||||
|
||||
### Key Issues Identified
|
||||
|
||||
#### 1. Inconsistent Test Songs
|
||||
Only `production-e2e.spec.ts` uses the designated test song (`piri - dog`). Other files use:
|
||||
- ABBA - Waterloo
|
||||
- LCMDF - Take Me To The Mountains
|
||||
- Rick Astley - Never Gonna Give You Up
|
||||
- Radiohead - Creep
|
||||
|
||||
This causes unnecessary flacfetch API calls and tracker lookups instead of using cached results.
|
||||
|
||||
#### 2. Overlapping Test Coverage
|
||||
- `production-user-journey.spec.ts` and `karaoke-generation.spec.ts` both test homepage/job UI
|
||||
- `production-e2e.spec.ts` duplicates parts of both files
|
||||
- Auth helper functions are copy-pasted across multiple files
|
||||
|
||||
#### 3. Unused Fixture System
|
||||
There's a sophisticated mock/recording system in `fixtures/`:
|
||||
- `recorder.ts` - Records real API calls
|
||||
- `mock-server.ts` - Replays recorded fixtures
|
||||
- `test-helper.ts` - Unified setup interface
|
||||
- `review-cli.ts` - CLI to review/approve recordings
|
||||
|
||||
Only `fixtures-example.spec.ts` uses this system. The original intent was to:
|
||||
1. Run production tests to capture API responses
|
||||
2. Store those responses as fixtures
|
||||
3. Replay them for offline regression testing
|
||||
|
||||
This was never completed because the full production flow wasn't working yet.
|
||||
|
||||
#### 4. CI Only Runs Unit Tests
|
||||
From `.github/workflows/ci.yml`:
|
||||
```yaml
|
||||
name: "Frontend - Unit Tests"
|
||||
run: npm run test:ci # Jest unit tests only
|
||||
```
|
||||
No E2E tests run in CI currently.
|
||||
|
||||
#### 5. Auth Token Configuration
|
||||
- `.env.local` contains `KARAOKE_ACCESS_TOKEN` (session token hash)
|
||||
- Also contains `MAILSLURP_API_KEY` for email testing
|
||||
- Token is loaded by both Playwright configs via custom env file parsing
|
||||
|
||||
### Fixture System Architecture
|
||||
|
||||
```
|
||||
frontend/e2e/fixtures/
|
||||
├── index.ts # Exports all modules
|
||||
├── types.ts # TypeScript interfaces
|
||||
├── recorder.ts # Intercepts & records API calls
|
||||
├── mock-server.ts # Replays recorded fixtures
|
||||
├── test-helper.ts # Unified test setup API
|
||||
└── review-cli.ts # CLI for reviewing recordings
|
||||
|
||||
frontend/e2e/fixtures/data/
|
||||
├── recordings/ # Raw captured API calls (not committed)
|
||||
├── approved/ # Reviewed & approved fixtures (committed)
|
||||
└── sets/ # Named fixture sets for specific scenarios
|
||||
```
|
||||
|
||||
The system supports two modes:
|
||||
- **Recording mode** (`RECORD_FIXTURES=true`): Captures real API responses
|
||||
- **Mock mode** (default): Replays approved fixtures
|
||||
|
||||
---
|
||||
|
||||
## Target Architecture
|
||||
|
||||
### Test Organization
|
||||
|
||||
```
|
||||
frontend/e2e/
|
||||
├── production/ # Real production tests (manual only)
|
||||
│ └── full-user-journey.spec.ts # Single comprehensive test
|
||||
│
|
||||
├── regression/ # Offline tests using fixtures (CI)
|
||||
│ ├── landing-page.spec.ts # Landing, pricing, FAQ
|
||||
│ ├── authentication.spec.ts # Magic link, beta enrollment
|
||||
│ ├── job-management.spec.ts # Create, view, cancel jobs
|
||||
│ ├── karaoke-generation.spec.ts # Audio selection, lyrics review
|
||||
│ └── mobile.spec.ts # Mobile responsiveness
|
||||
│
|
||||
├── fixtures/ # Mock/replay infrastructure
|
||||
│ ├── data/
|
||||
│ │ ├── approved/ # Committed fixture files
|
||||
│ │ └── recordings/ # Temp recordings (gitignored)
|
||||
│ ├── index.ts
|
||||
│ ├── recorder.ts
|
||||
│ ├── mock-server.ts
|
||||
│ └── test-helper.ts
|
||||
│
|
||||
└── helpers/
|
||||
├── auth.ts # Shared auth utilities
|
||||
├── email-testing.ts # MailSlurp helpers
|
||||
└── constants.ts # TEST_ARTIST, TEST_TITLE, URLs
|
||||
```
|
||||
|
||||
### Playwright Configurations
|
||||
|
||||
```
|
||||
frontend/
|
||||
├── playwright.config.ts # CI regression tests (fixtures)
|
||||
├── playwright.production.config.ts # Manual production tests
|
||||
└── playwright.record.config.ts # Fixture recording mode (new)
|
||||
```
|
||||
|
||||
### NPM Scripts
|
||||
|
||||
```json
|
||||
{
|
||||
"test:e2e": "playwright test", // CI regression tests
|
||||
"test:e2e:ui": "playwright test --ui", // Interactive UI
|
||||
"test:e2e:prod": "playwright test --config=playwright.production.config.ts",
|
||||
"test:e2e:prod:headed": "playwright test --config=playwright.production.config.ts --headed",
|
||||
"test:e2e:record": "RECORD_FIXTURES=true playwright test --config=playwright.record.config.ts",
|
||||
"fixtures:review": "npx ts-node e2e/fixtures/review-cli.ts"
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Implementation Plan
|
||||
|
||||
### Phase 1: Create Production E2E Test (Priority: High)
|
||||
|
||||
**Goal**: Single comprehensive test that validates the entire user journey in production.
|
||||
|
||||
#### Test Flow
|
||||
```
|
||||
1. Landing Page
|
||||
└─ Verify hero, pricing, FAQ sections visible
|
||||
|
||||
2. Beta Enrollment (with MailSlurp)
|
||||
├─ Create test inbox
|
||||
├─ Fill beta form with real feedback promise
|
||||
├─ Submit and verify session token received
|
||||
├─ Verify welcome email received
|
||||
└─ Verify redirected to /app with 2 credits (1 welcome + 1 beta)
|
||||
|
||||
3. Create Karaoke Job
|
||||
├─ Go to Search tab
|
||||
├─ Enter "piri" / "dog"
|
||||
├─ Submit search
|
||||
└─ Verify job created
|
||||
|
||||
4. Audio Selection
|
||||
├─ Wait for audio search to complete
|
||||
├─ Open audio selection dialog
|
||||
├─ Select first result (should be cached)
|
||||
└─ Verify audio download starts
|
||||
|
||||
5. Wait for Processing
|
||||
├─ Poll job status
|
||||
├─ Wait for lyrics transcription (AudioShake)
|
||||
├─ Wait for agentic correction (Vertex AI)
|
||||
└─ Verify job reaches "in_review" status
|
||||
|
||||
6. Lyrics Review
|
||||
├─ Open review UI (new tab)
|
||||
├─ Verify lyrics loaded
|
||||
├─ Click "Preview Video"
|
||||
├─ Wait for preview to generate
|
||||
├─ Click "Complete Review"
|
||||
└─ Verify review completed
|
||||
|
||||
7. Instrumental Selection
|
||||
├─ Wait for job to reach instrumental selection
|
||||
├─ Open instrumental dialog
|
||||
├─ Select "Clean" instrumental
|
||||
└─ Verify selection saved
|
||||
|
||||
8. Wait for Completion
|
||||
├─ Poll job status
|
||||
├─ Wait for video rendering
|
||||
├─ Wait for encoding (4K, 720p, CDG)
|
||||
└─ Verify job status = "completed"
|
||||
|
||||
9. Verify Outputs
|
||||
├─ Check download URLs exist
|
||||
├─ Verify YouTube upload (if enabled)
|
||||
├─ Verify Dropbox upload (if configured)
|
||||
└─ Verify Google Drive upload (if configured)
|
||||
|
||||
10. Cleanup (Optional)
|
||||
└─ Delete test job to avoid clutter
|
||||
```
|
||||
|
||||
#### File: `frontend/e2e/production/full-user-journey.spec.ts`
|
||||
|
||||
Key characteristics:
|
||||
- Uses `piri - dog` consistently
|
||||
- Uses MailSlurp for real email testing
|
||||
- 15-minute timeout (karaoke generation takes time)
|
||||
- Detailed console logging at each step
|
||||
- Screenshots at every milestone
|
||||
- Graceful error handling with diagnostic info
|
||||
|
||||
### Phase 2: Extract Shared Utilities
|
||||
|
||||
**Goal**: Eliminate code duplication and create a single source of truth.
|
||||
|
||||
#### `frontend/e2e/helpers/constants.ts`
|
||||
```typescript
|
||||
export const TEST_SONG = {
|
||||
artist: 'piri',
|
||||
title: 'dog',
|
||||
} as const;
|
||||
|
||||
export const URLS = {
|
||||
production: {
|
||||
frontend: 'https://gen.nomadkaraoke.com',
|
||||
api: 'https://api.nomadkaraoke.com',
|
||||
},
|
||||
local: {
|
||||
frontend: 'http://localhost:3000',
|
||||
api: 'http://localhost:8000',
|
||||
},
|
||||
} as const;
|
||||
|
||||
export const TIMEOUTS = {
|
||||
action: 30_000, // 30s for UI actions
|
||||
expect: 60_000, // 60s for assertions
|
||||
apiCall: 120_000, // 2min for API calls
|
||||
jobProcessing: 600_000, // 10min for job processing
|
||||
fullTest: 900_000, // 15min for full test
|
||||
} as const;
|
||||
```
|
||||
|
||||
#### `frontend/e2e/helpers/auth.ts`
|
||||
```typescript
|
||||
export async function setAuthToken(page: Page, token: string): Promise<void>;
|
||||
export async function clearAuthToken(page: Page): Promise<void>;
|
||||
export async function authenticatePage(page: Page): Promise<boolean>;
|
||||
export async function getAuthToken(): string | undefined;
|
||||
```
|
||||
|
||||
### Phase 3: Record API Fixtures
|
||||
|
||||
**Goal**: Capture real API responses from a successful production run.
|
||||
|
||||
#### Process
|
||||
1. Run the production E2E test with `RECORD_FIXTURES=true`
|
||||
2. The recorder captures all API calls/responses
|
||||
3. Review recordings with `npm run fixtures:review`
|
||||
4. Approve fixtures and commit to `fixtures/data/approved/`
|
||||
|
||||
#### Fixtures to Capture
|
||||
```
|
||||
GET /api/health
|
||||
GET /api/users/credits/packages
|
||||
POST /api/users/beta/enroll
|
||||
GET /api/users/me
|
||||
POST /api/audio-search/search
|
||||
GET /api/jobs
|
||||
GET /api/jobs/:id
|
||||
POST /api/jobs/:id/select-audio
|
||||
GET /api/review/:id/correction-data
|
||||
GET /api/review/:id/audio/:type
|
||||
POST /api/review/:id/preview-video
|
||||
POST /api/review/:id/complete
|
||||
POST /api/jobs/:id/select-instrumental
|
||||
GET /api/jobs/:id/download-urls
|
||||
```
|
||||
|
||||
### Phase 4: Create Regression Test Suite
|
||||
|
||||
**Goal**: Comprehensive offline tests that run in CI.
|
||||
|
||||
#### Test Files
|
||||
|
||||
**`regression/landing-page.spec.ts`**
|
||||
- Hero section displays correctly
|
||||
- Pricing packages show all 4 options
|
||||
- Package selection updates checkout form
|
||||
- FAQ accordion works
|
||||
- Sign in button opens auth dialog
|
||||
- Logged-in users redirect to /app
|
||||
|
||||
**`regression/authentication.spec.ts`**
|
||||
- Magic link dialog opens and validates email
|
||||
- Beta form validates required fields
|
||||
- Beta enrollment success flow (mocked)
|
||||
- Token persistence across navigation
|
||||
- Unauthenticated users redirect to landing
|
||||
|
||||
**`regression/job-management.spec.ts`**
|
||||
- Job list displays correctly
|
||||
- Job cards show status badges
|
||||
- Job details expand on click
|
||||
- Job logs can be viewed
|
||||
- Job can be cancelled
|
||||
- Completed job shows download links
|
||||
|
||||
**`regression/karaoke-generation.spec.ts`**
|
||||
- Search tab shows artist/title inputs
|
||||
- Audio selection dialog opens
|
||||
- Audio options display correctly
|
||||
- Instrumental selection dialog opens
|
||||
- Review UI loads with lyrics data
|
||||
|
||||
**`regression/mobile.spec.ts`**
|
||||
- Pages render without horizontal scroll
|
||||
- Touch targets are adequate size
|
||||
- Forms are usable on mobile
|
||||
- Dialogs fit mobile viewport
|
||||
|
||||
### Phase 5: Update CI Configuration
|
||||
|
||||
**Goal**: Run regression tests on every PR.
|
||||
|
||||
#### `.github/workflows/ci.yml` Changes
|
||||
```yaml
|
||||
frontend-e2e:
|
||||
name: "Frontend - E2E Tests"
|
||||
runs-on: ubuntu-latest
|
||||
needs: [detect-changes]
|
||||
if: needs.detect-changes.outputs.frontend == 'true'
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '20'
|
||||
cache: 'npm'
|
||||
cache-dependency-path: frontend/package-lock.json
|
||||
- run: npm ci
|
||||
working-directory: frontend
|
||||
- run: npx playwright install --with-deps chromium
|
||||
working-directory: frontend
|
||||
- run: npm run test:e2e
|
||||
working-directory: frontend
|
||||
- uses: actions/upload-artifact@v4
|
||||
if: failure()
|
||||
with:
|
||||
name: playwright-report
|
||||
path: frontend/playwright-report/
|
||||
```
|
||||
|
||||
### Phase 6: Cleanup Legacy Files
|
||||
|
||||
**Goal**: Remove redundant test files.
|
||||
|
||||
#### Files to Delete
|
||||
- `karaoke-generation.spec.ts` - Functionality merged into regression tests
|
||||
- `screenshot-audio-dialog.spec.ts` - One-off utility, not a test
|
||||
- `production-user-journey.spec.ts` - Merged into production test
|
||||
- `production-e2e.spec.ts` - Merged into production test
|
||||
- `fixtures-example.spec.ts` - Example no longer needed
|
||||
|
||||
#### Files to Keep (Refactored)
|
||||
- `mobile-responsiveness.spec.ts` → `regression/mobile.spec.ts`
|
||||
|
||||
---
|
||||
|
||||
## Success Criteria
|
||||
|
||||
### Production Test
|
||||
- [ ] Single test file covers entire user journey
|
||||
- [ ] Uses `piri - dog` exclusively
|
||||
- [ ] MailSlurp validates email delivery
|
||||
- [ ] Verifies all distribution outputs
|
||||
- [ ] Completes in < 15 minutes
|
||||
- [ ] Produces clear diagnostic output on failure
|
||||
|
||||
### Regression Tests
|
||||
- [ ] All tests pass with mocked API
|
||||
- [ ] No network calls to production
|
||||
- [ ] Tests complete in < 2 minutes total
|
||||
- [ ] Mobile tests cover key viewports
|
||||
- [ ] CI runs on every frontend PR
|
||||
|
||||
### Fixture System
|
||||
- [ ] Fixtures captured from real production run
|
||||
- [ ] Fixtures committed and versioned
|
||||
- [ ] Recording mode works for updates
|
||||
- [ ] Review CLI allows fixture management
|
||||
|
||||
---
|
||||
|
||||
## Risk Mitigation
|
||||
|
||||
### Production Test Risks
|
||||
| Risk | Mitigation |
|
||||
|------|------------|
|
||||
| Flaky due to timing | Generous timeouts, retry logic |
|
||||
| Costs money (AudioShake, Modal) | Only run manually, use cached song |
|
||||
| Creates test data | Use identifiable test data, optional cleanup |
|
||||
| Email delivery delays | MailSlurp has 60s timeout |
|
||||
|
||||
### Regression Test Risks
|
||||
| Risk | Mitigation |
|
||||
|------|------------|
|
||||
| Fixtures become stale | Re-record periodically, version control |
|
||||
| API changes break fixtures | Fixture review process catches mismatches |
|
||||
| Mock doesn't match real API | Use exact recorded responses |
|
||||
|
||||
---
|
||||
|
||||
## Estimated Effort
|
||||
|
||||
| Phase | Effort | Dependencies |
|
||||
|-------|--------|--------------|
|
||||
| Phase 1: Production Test | 4-6 hours | None |
|
||||
| Phase 2: Extract Utilities | 1-2 hours | Phase 1 |
|
||||
| Phase 3: Record Fixtures | 1-2 hours | Phase 1 working |
|
||||
| Phase 4: Regression Tests | 4-6 hours | Phase 2, 3 |
|
||||
| Phase 5: CI Configuration | 1-2 hours | Phase 4 |
|
||||
| Phase 6: Cleanup | 1 hour | Phase 4 |
|
||||
|
||||
**Total: 12-19 hours**
|
||||
|
||||
---
|
||||
|
||||
## Open Questions
|
||||
|
||||
1. **Distribution Testing**: Should the production test verify actual Dropbox/GDrive/YouTube uploads, or just that the job completed successfully?
|
||||
|
||||
2. **Test Data Cleanup**: Should we automatically delete test jobs after the production test runs, or keep them for debugging?
|
||||
|
||||
3. **Fixture Versioning**: Should fixtures be versioned separately from code (e.g., in a fixtures branch)?
|
||||
|
||||
4. **Review UI Testing**: How deeply should we test the lyrics review UI? It opens in a new tab with complex interactions.
|
||||
|
||||
---
|
||||
|
||||
## Next Steps
|
||||
|
||||
1. Create the production test file (`full-user-journey.spec.ts`)
|
||||
2. Run it against production to identify current bugs
|
||||
3. Fix any bugs discovered
|
||||
4. Once passing, record API fixtures
|
||||
5. Build regression test suite from fixtures
|
||||
6. Add to CI pipeline
|
||||
7. Clean up legacy files
|
||||
|
||||
---
|
||||
|
||||
## Appendix: Current Auth Token
|
||||
|
||||
The `.env.local` file contains:
|
||||
```
|
||||
KARAOKE_ACCESS_TOKEN=9021de39...
|
||||
MAILSLURP_API_KEY=sk_B1mlu...
|
||||
```
|
||||
|
||||
This token should work with the current auth system (session token hash format).
|
||||
@@ -0,0 +1,92 @@
|
||||
# Auth Session Persistence Fix
|
||||
|
||||
**Date**: 2025-12-30
|
||||
**PR**: #130
|
||||
|
||||
## Problem
|
||||
|
||||
Users were being logged out immediately after logging in via magic link:
|
||||
1. User clicks magic link, successfully authenticates
|
||||
2. User is shown as logged in
|
||||
3. On page reload (or even without reload), API calls return 401 Unauthorized
|
||||
4. Session exists and is valid in Firestore, but requests fail
|
||||
|
||||
## Root Causes
|
||||
|
||||
### 1. Frontend Token Caching Bug
|
||||
|
||||
`frontend/lib/api.ts` cached the auth token in a module-level variable:
|
||||
|
||||
```javascript
|
||||
// OLD - Buggy
|
||||
let accessToken: string | null = null;
|
||||
if (typeof window !== 'undefined') {
|
||||
accessToken = localStorage.getItem('karaoke_access_token');
|
||||
}
|
||||
|
||||
export function getAccessToken(): string | null {
|
||||
return accessToken; // Returns cached value, may be stale
|
||||
}
|
||||
```
|
||||
|
||||
**Issue**: In Next.js, if the module initializes before localStorage is properly hydrated, or if there's any module caching behavior, the cached value could be stale or null.
|
||||
|
||||
**Fix**: Always read fresh from localStorage:
|
||||
|
||||
```javascript
|
||||
export function getAccessToken(): string | null {
|
||||
if (typeof window !== 'undefined') {
|
||||
return localStorage.getItem('karaoke_access_token');
|
||||
}
|
||||
return null;
|
||||
}
|
||||
```
|
||||
|
||||
### 2. Backend Timezone Comparison Bug (Main Culprit)
|
||||
|
||||
`backend/services/user_service.py` compared naive and timezone-aware datetimes:
|
||||
|
||||
```python
|
||||
# OLD - Buggy
|
||||
now = datetime.utcnow() # Naive datetime (no timezone)
|
||||
if session.last_activity_at < inactivity_limit: # last_activity_at from Firestore is TZ-aware!
|
||||
# TypeError: can't compare offset-naive and offset-aware datetimes
|
||||
```
|
||||
|
||||
**What happens**: Firestore stores datetimes as timezone-aware. The first time a session is validated, `last_activity_at` is updated in Firestore. On subsequent reads, Firestore returns it as timezone-aware. Comparing this against `datetime.utcnow()` (naive) raises TypeError, caught by the exception handler, returning "An error occurred during validation" → 401.
|
||||
|
||||
**Fix**: Use timezone-aware datetimes throughout:
|
||||
|
||||
```python
|
||||
now = datetime.now(timezone.utc)
|
||||
|
||||
# Normalize session datetimes to be timezone-aware
|
||||
expires_at = session.expires_at
|
||||
if expires_at.tzinfo is None:
|
||||
expires_at = expires_at.replace(tzinfo=timezone.utc)
|
||||
```
|
||||
|
||||
## Additional Changes
|
||||
|
||||
### Firestore Indexes Added to Pulumi
|
||||
|
||||
The `scripts/investigate_user.py` script requires composite indexes. These were created manually and are now tracked in Pulumi IaC:
|
||||
|
||||
- `jobs`: user_email + created_at (user job lists)
|
||||
- `jobs`: status + created_at (admin/system job lists)
|
||||
- `sessions`: is_active + user_email + created_at (active session queries)
|
||||
- `magic_links`: email + created_at (magic link history)
|
||||
|
||||
### Script Deprecation Fix
|
||||
|
||||
Fixed `datetime.utcnow()` deprecation warning in `scripts/investigate_user.py`.
|
||||
|
||||
## Debugging Tools Used
|
||||
|
||||
1. **Direct Firestore query** to verify session exists and is valid
|
||||
2. **Browser DevTools Network tab** to see 401 responses with valid-looking Authorization header
|
||||
3. **`scripts/investigate_user.py`** to check user's sessions, jobs, magic links
|
||||
|
||||
## Key Insight
|
||||
|
||||
The session was valid in the database the entire time. The bug was in the *validation code*, not in session creation or storage. Always check the validation logic when auth fails unexpectedly.
|
||||
@@ -0,0 +1,77 @@
|
||||
# Cloud Output Structure Fix
|
||||
|
||||
**Date**: 2025-12-30
|
||||
|
||||
## Summary
|
||||
|
||||
Fixed three issues causing cloud backend (`karaoke-gen-remote`) output to differ from local CLI (`karaoke-gen`) output:
|
||||
|
||||
1. **YouTube upload silent failure** - Jobs with `--enable_youtube_upload` weren't uploading
|
||||
2. **Missing subdirectories** - Dropbox uploads didn't include stems/ and lyrics/ subfolders
|
||||
3. **Simplified filenames** - Instrumentals named "(Instrumental Clean)" instead of "(Instrumental model_bs_roformer_ep_317_sdr_12.9755.ckpt)"
|
||||
|
||||
## Root Causes
|
||||
|
||||
### YouTube Upload
|
||||
|
||||
The `create-with-upload-urls` endpoint (used by remote CLI) set `youtube_description` but NOT `youtube_description_template`. The video worker checks `youtube_description_template` for YouTube uploads, so they silently failed.
|
||||
|
||||
```python
|
||||
# BEFORE: Only youtube_description was set
|
||||
job_create = JobCreate(
|
||||
youtube_description=body.youtube_description,
|
||||
# youtube_description_template NOT set!
|
||||
)
|
||||
|
||||
# AFTER: Both fields set
|
||||
job_create = JobCreate(
|
||||
youtube_description=body.youtube_description,
|
||||
youtube_description_template=body.youtube_description,
|
||||
)
|
||||
```
|
||||
|
||||
### Missing Subdirectories
|
||||
|
||||
`dropbox_service.upload_folder()` used `os.listdir()` + `os.path.isfile()`, which skipped directories. Changed to `os.walk()` for recursive upload.
|
||||
|
||||
### Simplified Filenames
|
||||
|
||||
Video worker hardcoded "Clean" and "Backing" suffixes instead of using actual model names. Fixed by:
|
||||
|
||||
1. Storing effective model names in job `state_data` during audio separation
|
||||
2. Using those names in `_prepare_distribution_directory()` for proper file naming
|
||||
|
||||
## Files Modified
|
||||
|
||||
| File | Change |
|
||||
|------|--------|
|
||||
| `backend/api/routes/file_upload.py` | Set `youtube_description_template` |
|
||||
| `backend/services/dropbox_service.py` | Recursive `upload_folder()` |
|
||||
| `backend/workers/audio_worker.py` | Store model names in state_data |
|
||||
| `backend/workers/video_worker.py` | Add `_prepare_distribution_directory()` |
|
||||
| `backend/tests/test_dropbox_service.py` | Tests for recursive upload |
|
||||
| `backend/tests/test_workers.py` | Tests for model names and distribution |
|
||||
|
||||
## Expected Output Structure
|
||||
|
||||
After this fix, cloud jobs produce identical output to local CLI:
|
||||
|
||||
```text
|
||||
NOMAD-XXXX - Artist - Title/
|
||||
├── Artist - Title (Final Karaoke Lossless 4k).mp4
|
||||
├── Artist - Title (Final Karaoke Lossless 4k).mkv
|
||||
├── Artist - Title (Instrumental model_bs_roformer_ep_317_sdr_12.9755.ckpt).flac
|
||||
├── Artist - Title (Instrumental +BV mel_band_roformer_karaoke_aufr33_viperx_sdr_10.1956.ckpt).flac
|
||||
├── stems/
|
||||
│ ├── Artist - Title (Instrumental model_bs_roformer_...).flac
|
||||
│ ├── Artist - Title (Vocals model_bs_roformer_...).flac
|
||||
│ ├── Artist - Title (Lead Vocals mel_band_roformer_...).flac
|
||||
│ └── ... (all stems with model names)
|
||||
└── lyrics/
|
||||
└── (intermediate lyrics files)
|
||||
```
|
||||
|
||||
## Testing
|
||||
|
||||
- All 803 existing tests pass
|
||||
- Added new tests for recursive upload and distribution directory preparation
|
||||
@@ -0,0 +1,58 @@
|
||||
# Gemini 3 Flash Agentic Correction Fix
|
||||
|
||||
**Date**: 2025-12-30
|
||||
**PR**: #137
|
||||
|
||||
## Problem
|
||||
|
||||
Karaoke jobs were hanging at the agentic correction stage with no visible errors in Langfuse traces. Cloud Run logs showed:
|
||||
|
||||
```
|
||||
404 Publisher Model `projects/nomadkaraoke/locations/us-central1/publishers/google/models/gemini-3-flash-preview` was not found
|
||||
```
|
||||
|
||||
## Root Cause
|
||||
|
||||
**Gemini 3 models require the `global` location**, not regional endpoints like `us-central1`. This is different from Gemini 2 models which work with regional endpoints.
|
||||
|
||||
Additionally, Gemini 3 returns a **multimodal response format** instead of plain strings:
|
||||
```python
|
||||
# Gemini 2 response.content:
|
||||
"some text response"
|
||||
|
||||
# Gemini 3 response.content:
|
||||
[{'type': 'text', 'text': 'some text response'}]
|
||||
```
|
||||
|
||||
## Solution
|
||||
|
||||
1. Changed default `gcp_location` from `us-central1` to `global` in `config.py`
|
||||
2. Added multimodal response parsing in `langchain_bridge.py`:
|
||||
```python
|
||||
if isinstance(content, list):
|
||||
for part in content:
|
||||
if isinstance(part, dict) and part.get('type') == 'text':
|
||||
return part.get('text', '')
|
||||
```
|
||||
|
||||
## Files Changed
|
||||
|
||||
- `lyrics_transcriber_temp/lyrics_transcriber/correction/agentic/providers/config.py` - Default location
|
||||
- `lyrics_transcriber_temp/lyrics_transcriber/correction/agentic/providers/langchain_bridge.py` - Response parsing
|
||||
- `lyrics_transcriber_temp/lyrics_transcriber/correction/agentic/router.py` - Model name comment
|
||||
|
||||
## Testing
|
||||
|
||||
Created `scripts/test_agentic_correction.py` for local testing without Cloud Run deployment:
|
||||
```bash
|
||||
GOOGLE_CLOUD_PROJECT=nomadkaraoke python scripts/test_agentic_correction.py
|
||||
```
|
||||
|
||||
Four test cases covering sound-alike errors, punctuation, extra words, and no-error scenarios all pass.
|
||||
|
||||
## Key Learnings
|
||||
|
||||
1. **Gemini 3 requires global location** - Not documented prominently; discovered via error message
|
||||
2. **Model response formats differ between versions** - Always handle both string and list content types
|
||||
3. **Local test scripts are essential** - Enabled rapid iteration without Cloud Run deploy cycles
|
||||
4. **Clear LLM cache when debugging** - Cached broken responses can mask fixes: `rm -rf ~/lyrics-transcriber-cache/*.json`
|
||||
@@ -0,0 +1,91 @@
|
||||
# LangFuse Prompt Management Integration
|
||||
|
||||
**Date**: 2025-12-30
|
||||
**PR**: https://github.com/nomadkaraoke/karaoke-gen/pull/140
|
||||
|
||||
## Summary
|
||||
|
||||
Replaced hardcoded LLM prompts in the agentic correction workflow with LangFuse-managed prompts, enabling prompt iteration without redeploying the backend.
|
||||
|
||||
## What Changed
|
||||
|
||||
### New Components
|
||||
|
||||
1. **LangFusePromptService** (`lyrics_transcriber/.../prompts/langfuse_prompts.py`)
|
||||
- Fetches prompts from LangFuse with hardcoded fallback for local development
|
||||
- Fetches few-shot examples from LangFuse datasets
|
||||
- Singleton pattern with fail-fast when LangFuse is configured
|
||||
|
||||
2. **Migration Script** (`scripts/migrate-prompts-to-langfuse.py`)
|
||||
- Uploads `gap-classifier` prompt template to LangFuse
|
||||
- Uploads 9 few-shot examples as `gap-classifier-examples` dataset
|
||||
- Supports `--dry-run`, `--force`, `--verify-only` flags
|
||||
|
||||
3. **LangFuse Vertex AI Service Account** (Pulumi)
|
||||
- `langfuse-vertexai@nomadkaraoke.iam.gserviceaccount.com`
|
||||
- Has `roles/aiplatform.user` for calling Gemini models
|
||||
- JSON key generated for LangFuse to use GCP credits
|
||||
|
||||
### Modified Components
|
||||
|
||||
- `langfuse_integration.py` - Added `fetch_prompt()` and `fetch_dataset()` with label fallback
|
||||
- `classifier.py` - Now uses LangFusePromptService, hardcoded function renamed to `build_classification_prompt_hardcoded`
|
||||
- Default LangFuse host changed to US region (`https://us.cloud.langfuse.com`)
|
||||
|
||||
### Deleted Components
|
||||
|
||||
- `handlers/llm.py` - Legacy LLM handler not being used
|
||||
- `handlers/llm_providers.py` - Legacy provider implementations
|
||||
|
||||
## Configuration
|
||||
|
||||
### LangFuse Credentials (GCP Secret Manager)
|
||||
|
||||
- `langfuse-public-key` - Project: nomadkaraoke
|
||||
- `langfuse-secret-key` - Project: nomadkaraoke
|
||||
|
||||
### Environment Variables
|
||||
|
||||
```bash
|
||||
LANGFUSE_PUBLIC_KEY=pk-lf-...
|
||||
LANGFUSE_SECRET_KEY=sk-lf-...
|
||||
LANGFUSE_HOST=https://us.cloud.langfuse.com # Optional, this is the default
|
||||
```
|
||||
|
||||
### LangFuse Resources
|
||||
|
||||
- **Prompt**: `gap-classifier` (promote to "production" label for default fetch)
|
||||
- **Dataset**: `gap-classifier-examples` (9 few-shot examples)
|
||||
- **Project**: nomadkaraoke at https://us.cloud.langfuse.com
|
||||
|
||||
## How Prompt Fetching Works
|
||||
|
||||
1. Try to fetch prompt with "production" label (default)
|
||||
2. If not found, fall back to version 1 (for newly created prompts)
|
||||
3. If LangFuse not configured, use hardcoded fallback
|
||||
|
||||
This allows:
|
||||
- New prompts to work immediately after upload
|
||||
- Production prompts to be explicitly promoted
|
||||
- Local development without LangFuse credentials
|
||||
|
||||
## GCP Organization Policy Issue
|
||||
|
||||
Creating service account keys was blocked by organization policy `iam.disableServiceAccountKeyCreation`. Solution:
|
||||
|
||||
1. Temporarily disable policy at organization level
|
||||
2. Create key via `gcloud iam service-accounts keys create`
|
||||
3. Re-enable policy immediately
|
||||
4. Delete local key file after pasting into LangFuse
|
||||
|
||||
This is a one-time operation. The key is now stored in LangFuse, not in any repo or GCP secret.
|
||||
|
||||
## Testing
|
||||
|
||||
All 676 unit tests pass. The prompt service has dedicated tests in `test_langfuse_prompts.py` that mock the LangFuse client.
|
||||
|
||||
## Future Work
|
||||
|
||||
- Add more prompts for other agentic workflows
|
||||
- Set up LangFuse evaluations for prompt quality
|
||||
- Consider A/B testing different prompt versions
|
||||
@@ -0,0 +1,263 @@
|
||||
"use client"
|
||||
|
||||
import { useState, useEffect, useCallback } from "react"
|
||||
import { useRouter } from "next/navigation"
|
||||
import { api, Job, getAccessToken } from "@/lib/api"
|
||||
import { useAutoMode, getAutoModeFromUrl } from "@/lib/auto-mode"
|
||||
import { useJobNotifications, useVisibilityRefresh } from "@/hooks/use-notifications"
|
||||
import { Button } from "@/components/ui/button"
|
||||
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
|
||||
import { Music2, RefreshCw, Loader2, Zap, ZapOff, Moon, Sun } from "lucide-react"
|
||||
import { WarmingUpLoader } from "@/components/WarmingUpLoader"
|
||||
import { JobCard } from "@/components/job"
|
||||
import { JobSubmission } from "@/components/job/JobSubmission"
|
||||
import { AuthStatus } from "@/components/auth"
|
||||
import { AutoProcessor } from "@/components/AutoProcessor"
|
||||
import { VersionFooter } from "@/components/version-footer"
|
||||
import { useTheme } from "@/lib/theme"
|
||||
import {
|
||||
Tooltip,
|
||||
TooltipContent,
|
||||
TooltipProvider,
|
||||
TooltipTrigger,
|
||||
} from "@/components/ui/tooltip"
|
||||
|
||||
export default function AppPage() {
|
||||
const router = useRouter()
|
||||
const [jobs, setJobs] = useState<Job[]>([])
|
||||
const [isLoadingJobs, setIsLoadingJobs] = useState(true)
|
||||
const [isInitialLoad, setIsInitialLoad] = useState(true)
|
||||
const [isAuthenticated, setIsAuthenticated] = useState<boolean | null>(null)
|
||||
const { enabled: autoModeEnabled, setEnabled: setAutoMode, toggle: toggleAutoMode } = useAutoMode()
|
||||
const { isDarkMode, toggleTheme, mounted } = useTheme()
|
||||
|
||||
// Memoize loadJobs for use with visibility refresh
|
||||
const loadJobs = useCallback(async () => {
|
||||
if (!getAccessToken()) {
|
||||
setIsLoadingJobs(false)
|
||||
setIsInitialLoad(false)
|
||||
return
|
||||
}
|
||||
try {
|
||||
const data = await api.listJobs({ limit: 20 })
|
||||
setJobs(data)
|
||||
} catch (err: any) {
|
||||
// Don't log auth errors - user just needs to authenticate
|
||||
if (err?.status !== 401) {
|
||||
console.error("Failed to load jobs:", err)
|
||||
}
|
||||
} finally {
|
||||
setIsLoadingJobs(false)
|
||||
setIsInitialLoad(false)
|
||||
}
|
||||
}, [])
|
||||
|
||||
// Enable notifications for job status changes (sound + title animation)
|
||||
useJobNotifications(jobs)
|
||||
|
||||
// Refresh jobs immediately when tab becomes visible (after returning from review UIs)
|
||||
useVisibilityRefresh(loadJobs, isAuthenticated === true)
|
||||
|
||||
// Check auth status on mount and redirect if not authenticated
|
||||
useEffect(() => {
|
||||
const token = getAccessToken()
|
||||
if (!token) {
|
||||
// Redirect to landing page if not authenticated
|
||||
router.replace('/')
|
||||
return
|
||||
}
|
||||
setIsAuthenticated(true)
|
||||
}, [router])
|
||||
|
||||
// Initialize auto-mode from URL parameter on mount
|
||||
useEffect(() => {
|
||||
const urlAutoMode = getAutoModeFromUrl()
|
||||
if (urlAutoMode) {
|
||||
setAutoMode(true)
|
||||
}
|
||||
}, [setAutoMode])
|
||||
|
||||
// Load jobs on mount (only if authenticated)
|
||||
useEffect(() => {
|
||||
if (isAuthenticated !== true) {
|
||||
setIsLoadingJobs(false)
|
||||
return
|
||||
}
|
||||
loadJobs()
|
||||
// Poll for updates every 10 seconds
|
||||
const interval = setInterval(loadJobs, 10000)
|
||||
return () => clearInterval(interval)
|
||||
}, [isAuthenticated, loadJobs])
|
||||
|
||||
// Show nothing while checking auth (prevents flash)
|
||||
if (isAuthenticated === null) {
|
||||
return (
|
||||
<div className="min-h-screen flex items-center justify-center" style={{ background: 'var(--bg)' }}>
|
||||
<Loader2 className="w-8 h-8 animate-spin" style={{ color: 'var(--text-muted)' }} />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
// Show warming up loader during initial job load (cold start scenario)
|
||||
if (isInitialLoad && isLoadingJobs) {
|
||||
return (
|
||||
<div className="min-h-screen flex items-center justify-center" style={{ background: 'var(--bg)' }}>
|
||||
<WarmingUpLoader spinnerClassName="w-10 h-10" />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="min-h-screen" style={{ background: 'var(--bg)' }}>
|
||||
{/* AutoProcessor - handles non-interactive mode */}
|
||||
<AutoProcessor jobs={jobs} onJobsChanged={loadJobs} />
|
||||
|
||||
{/* Header */}
|
||||
<header className="border-b backdrop-blur-sm sticky top-0 z-10" style={{ borderColor: 'var(--card-border)', backgroundColor: 'var(--card)' }}>
|
||||
<div className="px-3 sm:px-4 py-2 sm:py-3 flex items-center justify-between gap-2">
|
||||
<div className="flex items-center gap-2 sm:gap-3 min-w-0">
|
||||
<img src="/nomad-karaoke-logo.svg" alt="Nomad Karaoke" className="h-8 sm:h-10 shrink-0" />
|
||||
<div className="min-w-0">
|
||||
<h1 className="text-base sm:text-xl font-bold truncate" style={{ color: 'var(--text)' }}>Karaoke Generator</h1>
|
||||
</div>
|
||||
</div>
|
||||
<div className="flex items-center gap-1 sm:gap-2 shrink-0">
|
||||
<TooltipProvider>
|
||||
<Tooltip>
|
||||
<TooltipTrigger asChild>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
onClick={toggleAutoMode}
|
||||
className={`min-h-[40px] px-2 sm:px-3 ${autoModeEnabled ? "text-amber-400 hover:text-amber-300 bg-amber-500/10" : ""}`}
|
||||
style={!autoModeEnabled ? { color: 'var(--text-muted)' } : undefined}
|
||||
>
|
||||
{autoModeEnabled ? (
|
||||
<Zap className="w-4 h-4 sm:mr-2" />
|
||||
) : (
|
||||
<ZapOff className="w-4 h-4 sm:mr-2" />
|
||||
)}
|
||||
<span className="hidden sm:inline">Auto</span>
|
||||
</Button>
|
||||
</TooltipTrigger>
|
||||
<TooltipContent side="bottom" className="max-w-xs">
|
||||
<p className="font-medium">
|
||||
{autoModeEnabled ? "Auto Mode Enabled" : "Auto Mode Disabled"}
|
||||
</p>
|
||||
<p className="text-xs mt-1" style={{ color: 'var(--text-muted)' }}>
|
||||
{autoModeEnabled
|
||||
? "Jobs will auto-complete review and select clean instrumental (like -y flag)"
|
||||
: "Click to enable non-interactive mode"}
|
||||
</p>
|
||||
</TooltipContent>
|
||||
</Tooltip>
|
||||
</TooltipProvider>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
onClick={loadJobs}
|
||||
disabled={isLoadingJobs || !isAuthenticated}
|
||||
className="min-h-[40px] px-2 sm:px-3"
|
||||
style={{ color: 'var(--text-muted)' }}
|
||||
>
|
||||
<RefreshCw className={`w-4 h-4 sm:mr-2 ${isLoadingJobs ? 'animate-spin' : ''}`} />
|
||||
<span className="hidden sm:inline">Refresh</span>
|
||||
</Button>
|
||||
<AuthStatus />
|
||||
{mounted && (
|
||||
<TooltipProvider>
|
||||
<Tooltip>
|
||||
<TooltipTrigger asChild>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
onClick={toggleTheme}
|
||||
className="min-h-[40px] px-2 sm:px-3"
|
||||
style={{ color: 'var(--text-muted)' }}
|
||||
>
|
||||
{isDarkMode ? (
|
||||
<Sun className="w-4 h-4" />
|
||||
) : (
|
||||
<Moon className="w-4 h-4" />
|
||||
)}
|
||||
</Button>
|
||||
</TooltipTrigger>
|
||||
<TooltipContent side="bottom">
|
||||
<p>{isDarkMode ? "Switch to light mode" : "Switch to dark mode"}</p>
|
||||
</TooltipContent>
|
||||
</Tooltip>
|
||||
</TooltipProvider>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
<main className="px-4 py-8 space-y-6">
|
||||
{/* Auto Mode Banner */}
|
||||
{autoModeEnabled && (
|
||||
<div className="bg-amber-500/10 border border-amber-500/30 rounded-lg p-4 flex items-center gap-3">
|
||||
<Zap className="w-5 h-5 text-amber-400 flex-shrink-0" />
|
||||
<div className="flex-1">
|
||||
<p className="text-sm text-amber-200 font-medium">Non-Interactive Mode Active</p>
|
||||
<p className="text-xs text-amber-200/70 mt-0.5">
|
||||
Jobs will automatically accept lyrics and select clean instrumental (equivalent to -y flag)
|
||||
</p>
|
||||
</div>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
onClick={toggleAutoMode}
|
||||
className="text-amber-200 hover:text-amber-100 hover:bg-amber-500/20"
|
||||
>
|
||||
Disable
|
||||
</Button>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="grid lg:grid-cols-2 gap-8">
|
||||
{/* Submit Job Card */}
|
||||
<Card className="backdrop-blur" style={{ borderColor: 'var(--card-border)', backgroundColor: 'var(--card)' }}>
|
||||
<CardHeader>
|
||||
<CardTitle style={{ color: 'var(--text)' }}>Create Karaoke Video</CardTitle>
|
||||
<CardDescription style={{ color: 'var(--text-muted)' }}>
|
||||
Upload an audio file, provide a YouTube URL, or search for audio by artist & title
|
||||
</CardDescription>
|
||||
</CardHeader>
|
||||
<CardContent>
|
||||
<JobSubmission onJobCreated={loadJobs} />
|
||||
</CardContent>
|
||||
</Card>
|
||||
|
||||
{/* Jobs List Card */}
|
||||
<Card className="backdrop-blur" style={{ borderColor: 'var(--card-border)', backgroundColor: 'var(--card)' }}>
|
||||
<CardHeader>
|
||||
<CardTitle className="flex items-center justify-between" style={{ color: 'var(--text)' }}>
|
||||
Recent Jobs
|
||||
{isLoadingJobs && <Loader2 className="w-4 h-4 animate-spin" style={{ color: 'var(--text-muted)' }} />}
|
||||
</CardTitle>
|
||||
<CardDescription style={{ color: 'var(--text-muted)' }}>
|
||||
{jobs.length} job{jobs.length !== 1 ? 's' : ''} found
|
||||
</CardDescription>
|
||||
</CardHeader>
|
||||
<CardContent>
|
||||
{jobs.length === 0 ? (
|
||||
<div className="text-center py-8" style={{ color: 'var(--text-muted)' }}>
|
||||
<Music2 className="w-12 h-12 mx-auto mb-3 opacity-50" />
|
||||
<p>No jobs yet. Create one to get started!</p>
|
||||
</div>
|
||||
) : (
|
||||
<div className="space-y-3 max-h-[500px] overflow-y-auto pr-2">
|
||||
{jobs.map((job) => (
|
||||
<JobCard key={job.job_id} job={job} onRefresh={loadJobs} />
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</CardContent>
|
||||
</Card>
|
||||
</div>
|
||||
</main>
|
||||
|
||||
<VersionFooter />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -37,7 +37,7 @@ function VerifyMagicLinkContent() {
|
||||
setState("success")
|
||||
// Redirect to main app after short delay
|
||||
setTimeout(() => {
|
||||
router.push("/")
|
||||
router.push("/app")
|
||||
}, 2000)
|
||||
} else {
|
||||
setState("error")
|
||||
@@ -90,7 +90,7 @@ function VerifyMagicLinkContent() {
|
||||
</p>
|
||||
<div className="space-y-2">
|
||||
<Button
|
||||
onClick={() => router.push("/")}
|
||||
onClick={() => router.push("/app")}
|
||||
className="w-full bg-blue-600 hover:bg-blue-500"
|
||||
>
|
||||
Go to App
|
||||
|
||||
@@ -96,3 +96,66 @@
|
||||
@apply bg-background text-foreground;
|
||||
}
|
||||
}
|
||||
|
||||
/* Landing page utilities */
|
||||
@layer utilities {
|
||||
/* Glow effect for primary buttons */
|
||||
.btn-glow {
|
||||
box-shadow: 0 0 20px rgba(59, 130, 246, 0.5);
|
||||
}
|
||||
.btn-glow:hover {
|
||||
box-shadow: 0 0 30px rgba(59, 130, 246, 0.7);
|
||||
}
|
||||
|
||||
/* Gradient text */
|
||||
.gradient-text {
|
||||
background: linear-gradient(135deg, #3b82f6 0%, #8b5cf6 50%, #ec4899 100%);
|
||||
-webkit-background-clip: text;
|
||||
-webkit-text-fill-color: transparent;
|
||||
background-clip: text;
|
||||
}
|
||||
|
||||
/* Card hover effect */
|
||||
.card-hover {
|
||||
transition: transform 0.2s ease, box-shadow 0.2s ease;
|
||||
}
|
||||
.card-hover:hover {
|
||||
transform: translateY(-4px);
|
||||
box-shadow: 0 20px 40px rgba(0, 0, 0, 0.3);
|
||||
}
|
||||
|
||||
/* Animated background gradient */
|
||||
@keyframes gradient-shift {
|
||||
0% { background-position: 0% 50%; }
|
||||
50% { background-position: 100% 50%; }
|
||||
100% { background-position: 0% 50%; }
|
||||
}
|
||||
.animated-gradient {
|
||||
background: linear-gradient(-45deg, #0f172a, #1e293b, #1e3a8a, #312e81);
|
||||
background-size: 400% 400%;
|
||||
animation: gradient-shift 15s ease infinite;
|
||||
}
|
||||
|
||||
/* Dark theme color utilities for landing page */
|
||||
.text-dark-300 { color: #d1d5db; }
|
||||
.text-dark-400 { color: #9ca3af; }
|
||||
.text-dark-500 { color: #6b7280; }
|
||||
.bg-dark-700 { background-color: #374151; }
|
||||
.bg-dark-800 { background-color: #1f2937; }
|
||||
.bg-dark-900 { background-color: #111827; }
|
||||
.border-dark-600 { border-color: #4b5563; }
|
||||
.border-dark-700 { border-color: #374151; }
|
||||
.text-primary-400 { color: #60a5fa; }
|
||||
.text-primary-500 { color: #3b82f6; }
|
||||
.bg-primary-500 { background-color: #3b82f6; }
|
||||
.hover\:bg-primary-600:hover { background-color: #2563eb; }
|
||||
|
||||
/* Fade in animation for cold start messages */
|
||||
@keyframes fade-in {
|
||||
from { opacity: 0; transform: translateY(-4px); }
|
||||
to { opacity: 1; transform: translateY(0); }
|
||||
}
|
||||
.animate-fade-in {
|
||||
animation: fade-in 0.3s ease-out forwards;
|
||||
}
|
||||
}
|
||||
+533
-220
@@ -1,244 +1,557 @@
|
||||
"use client"
|
||||
'use client';
|
||||
|
||||
import { useState, useEffect, useCallback } from "react"
|
||||
import { api, Job, getAccessToken } from "@/lib/api"
|
||||
import { useAutoMode, getAutoModeFromUrl } from "@/lib/auto-mode"
|
||||
import { useJobNotifications, useVisibilityRefresh } from "@/hooks/use-notifications"
|
||||
import { Button } from "@/components/ui/button"
|
||||
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
|
||||
import { Music2, RefreshCw, Loader2, Zap, ZapOff, KeyRound, Moon, Sun } from "lucide-react"
|
||||
import { JobCard } from "@/components/job"
|
||||
import { JobSubmission } from "@/components/job/JobSubmission"
|
||||
import { AuthStatus } from "@/components/auth"
|
||||
import { AutoProcessor } from "@/components/AutoProcessor"
|
||||
import { VersionFooter } from "@/components/version-footer"
|
||||
import { useTheme } from "@/lib/theme"
|
||||
import { useState, useEffect, useRef } from 'react';
|
||||
import { useRouter } from 'next/navigation';
|
||||
import {
|
||||
Tooltip,
|
||||
TooltipContent,
|
||||
TooltipProvider,
|
||||
TooltipTrigger,
|
||||
} from "@/components/ui/tooltip"
|
||||
MicVocal,
|
||||
Music,
|
||||
Sparkles,
|
||||
Video,
|
||||
Youtube,
|
||||
ChevronDown,
|
||||
Check,
|
||||
Gift,
|
||||
MessageSquare,
|
||||
Mail,
|
||||
Loader2,
|
||||
} from 'lucide-react';
|
||||
import { api, setAccessToken, getAccessToken, CreditPackage, BetaEnrollResponse } from '@/lib/api';
|
||||
import { AuthDialog } from '@/components/auth/AuthDialog';
|
||||
import { WarmingUpLoader } from '@/components/WarmingUpLoader';
|
||||
|
||||
export default function HomePage() {
|
||||
const [jobs, setJobs] = useState<Job[]>([])
|
||||
const [isLoadingJobs, setIsLoadingJobs] = useState(true)
|
||||
const [isAuthenticated, setIsAuthenticated] = useState(false)
|
||||
const { enabled: autoModeEnabled, setEnabled: setAutoMode, toggle: toggleAutoMode } = useAutoMode()
|
||||
const { isDarkMode, toggleTheme, mounted } = useTheme()
|
||||
// FAQ data
|
||||
const faqs = [
|
||||
{
|
||||
question: 'How does it work?',
|
||||
answer:
|
||||
'Enter the artist and song title, and our AI finds the audio, removes the vocals, transcribes and syncs the lyrics, then generates a professional karaoke video. You can review and edit the lyrics before final export.',
|
||||
},
|
||||
{
|
||||
question: 'What songs can I use?',
|
||||
answer:
|
||||
'Any song! Our system searches multiple audio sources to find high-quality versions. If a song exists online, we can likely create a karaoke video for it.',
|
||||
},
|
||||
{
|
||||
question: 'What format is the output?',
|
||||
answer:
|
||||
'You get a 4K MP4 video file with perfectly synced lyrics. We also offer direct YouTube upload and cloud storage integration.',
|
||||
},
|
||||
{
|
||||
question: 'What if something goes wrong?',
|
||||
answer:
|
||||
"If the AI makes mistakes, you can edit the lyrics and timing before generating the final video. If there's a technical issue, contact us and we'll make it right.",
|
||||
},
|
||||
{
|
||||
question: 'Do credits expire?',
|
||||
answer:
|
||||
'No! Your credits never expire. Use them whenever you want.',
|
||||
},
|
||||
];
|
||||
|
||||
// Memoize loadJobs for use with visibility refresh
|
||||
const loadJobs = useCallback(async () => {
|
||||
if (!getAccessToken()) {
|
||||
setIsLoadingJobs(false)
|
||||
return
|
||||
}
|
||||
try {
|
||||
const data = await api.listJobs({ limit: 20 })
|
||||
setJobs(data)
|
||||
} catch (err: any) {
|
||||
// Don't log auth errors - user just needs to authenticate
|
||||
if (err?.status !== 401) {
|
||||
console.error("Failed to load jobs:", err)
|
||||
export default function LandingPage() {
|
||||
const router = useRouter();
|
||||
const [isCheckingAuth, setIsCheckingAuth] = useState(true);
|
||||
const [packages, setPackages] = useState<CreditPackage[]>([]);
|
||||
const [packagesLoading, setPackagesLoading] = useState(true);
|
||||
const [packagesError, setPackagesError] = useState<string | null>(null);
|
||||
const [selectedPackage, setSelectedPackage] = useState<CreditPackage | null>(null);
|
||||
const [email, setEmail] = useState('');
|
||||
const [isLoading, setIsLoading] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
// Beta form state
|
||||
const [showBetaForm, setShowBetaForm] = useState(false);
|
||||
const [betaEmail, setBetaEmail] = useState('');
|
||||
const [betaPromise, setBetaPromise] = useState('');
|
||||
const [betaAccept, setBetaAccept] = useState(false);
|
||||
const [betaLoading, setBetaLoading] = useState(false);
|
||||
const [betaError, setBetaError] = useState<string | null>(null);
|
||||
const [betaSuccess, setBetaSuccess] = useState(false);
|
||||
const [betaWillRedirect, setBetaWillRedirect] = useState(false);
|
||||
|
||||
// FAQ expansion state
|
||||
const [expandedFaq, setExpandedFaq] = useState<number | null>(null);
|
||||
|
||||
// Auth dialog state
|
||||
const [showAuthDialog, setShowAuthDialog] = useState(false);
|
||||
|
||||
// Ref for redirect timeout cleanup
|
||||
const redirectTimeoutRef = useRef<NodeJS.Timeout | null>(null);
|
||||
|
||||
// Cleanup timeout on unmount
|
||||
useEffect(() => {
|
||||
return () => {
|
||||
if (redirectTimeoutRef.current) {
|
||||
clearTimeout(redirectTimeoutRef.current);
|
||||
}
|
||||
};
|
||||
}, []);
|
||||
|
||||
// Check if already logged in and redirect to app
|
||||
useEffect(() => {
|
||||
const token = getAccessToken();
|
||||
if (token) {
|
||||
router.replace('/app');
|
||||
return;
|
||||
}
|
||||
setIsCheckingAuth(false);
|
||||
}, [router]);
|
||||
|
||||
// Handle successful auth from dialog
|
||||
const handleAuthSuccess = () => {
|
||||
setShowAuthDialog(false);
|
||||
router.push('/app');
|
||||
};
|
||||
|
||||
// Load credit packages on mount
|
||||
useEffect(() => {
|
||||
if (isCheckingAuth) return;
|
||||
|
||||
async function loadPackages() {
|
||||
try {
|
||||
const pkgs = await api.getCreditPackages();
|
||||
setPackages(pkgs);
|
||||
// Default to 5 credits (best value)
|
||||
const bestValue = pkgs.find((p) => p.credits === 5);
|
||||
setSelectedPackage(bestValue || pkgs[0]);
|
||||
} catch (err) {
|
||||
console.error('Failed to load packages:', err);
|
||||
setPackagesError('Failed to load pricing. Please refresh the page.');
|
||||
} finally {
|
||||
setPackagesLoading(false);
|
||||
}
|
||||
}
|
||||
loadPackages();
|
||||
}, [isCheckingAuth]);
|
||||
|
||||
// Handle checkout
|
||||
const handleCheckout = async (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
if (!selectedPackage || !email) return;
|
||||
|
||||
setIsLoading(true);
|
||||
setError(null);
|
||||
|
||||
try {
|
||||
const checkoutUrl = await api.createCheckout(selectedPackage.id, email);
|
||||
// Validate that the URL is a Stripe checkout URL
|
||||
if (!checkoutUrl.startsWith('https://checkout.stripe.com/')) {
|
||||
throw new Error('Invalid checkout URL received');
|
||||
}
|
||||
window.location.href = checkoutUrl;
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Failed to create checkout session');
|
||||
setIsLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
// Handle beta enrollment
|
||||
const handleBetaEnroll = async (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
setBetaError(null);
|
||||
|
||||
// Validation
|
||||
if (!betaEmail) {
|
||||
setBetaError('Please enter your email address');
|
||||
return;
|
||||
}
|
||||
if (!betaAccept) {
|
||||
setBetaError('Please accept the corrections work agreement');
|
||||
return;
|
||||
}
|
||||
if (!betaPromise || betaPromise.length < 10) {
|
||||
setBetaError('Please write a sentence about a song you want to make into karaoke');
|
||||
return;
|
||||
}
|
||||
|
||||
setBetaLoading(true);
|
||||
|
||||
try {
|
||||
const response: BetaEnrollResponse = await api.enrollBetaTester(
|
||||
betaEmail,
|
||||
betaPromise,
|
||||
betaAccept
|
||||
);
|
||||
|
||||
// If we got a session token, store it and redirect to main app
|
||||
if (response.session_token) {
|
||||
setAccessToken(response.session_token);
|
||||
setBetaSuccess(true);
|
||||
setBetaWillRedirect(true);
|
||||
// Redirect to main app after showing success message
|
||||
redirectTimeoutRef.current = setTimeout(() => {
|
||||
router.push('/app');
|
||||
}, 2000);
|
||||
} else {
|
||||
// No token means email verification needed
|
||||
setBetaSuccess(true);
|
||||
setBetaWillRedirect(false);
|
||||
}
|
||||
} catch (err) {
|
||||
setBetaError(err instanceof Error ? err.message : 'Failed to enroll in beta program');
|
||||
} finally {
|
||||
setIsLoadingJobs(false)
|
||||
setBetaLoading(false);
|
||||
}
|
||||
}, [])
|
||||
};
|
||||
|
||||
// Enable notifications for job status changes (sound + title animation)
|
||||
useJobNotifications(jobs)
|
||||
const formatPrice = (cents: number) => `$${(cents / 100).toFixed(0)}`;
|
||||
const pricePerVideo = (pkg: CreditPackage) =>
|
||||
`$${(pkg.price_cents / 100 / pkg.credits).toFixed(2)}`;
|
||||
|
||||
// Refresh jobs immediately when tab becomes visible (after returning from review UIs)
|
||||
useVisibilityRefresh(loadJobs, isAuthenticated)
|
||||
|
||||
// Check auth status on mount
|
||||
useEffect(() => {
|
||||
setIsAuthenticated(!!getAccessToken())
|
||||
}, [])
|
||||
|
||||
// Initialize auto-mode from URL parameter on mount
|
||||
useEffect(() => {
|
||||
const urlAutoMode = getAutoModeFromUrl()
|
||||
if (urlAutoMode) {
|
||||
setAutoMode(true)
|
||||
}
|
||||
}, [setAutoMode])
|
||||
|
||||
// Load jobs on mount (only if authenticated)
|
||||
useEffect(() => {
|
||||
if (!isAuthenticated) {
|
||||
setIsLoadingJobs(false)
|
||||
return
|
||||
}
|
||||
loadJobs()
|
||||
// Poll for updates every 10 seconds
|
||||
const interval = setInterval(loadJobs, 10000)
|
||||
return () => clearInterval(interval)
|
||||
}, [isAuthenticated, loadJobs])
|
||||
// Show loading while checking auth
|
||||
if (isCheckingAuth) {
|
||||
return (
|
||||
<div className="min-h-screen flex items-center justify-center animated-gradient">
|
||||
<Loader2 className="w-8 h-8 animate-spin text-white" />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="min-h-screen" style={{ background: 'var(--bg)' }}>
|
||||
{/* AutoProcessor - handles non-interactive mode */}
|
||||
<AutoProcessor jobs={jobs} onJobsChanged={loadJobs} />
|
||||
|
||||
{/* Header */}
|
||||
<header className="border-b backdrop-blur-sm sticky top-0 z-10" style={{ borderColor: 'var(--card-border)', backgroundColor: 'var(--card)' }}>
|
||||
<div className="px-3 sm:px-4 py-2 sm:py-3 flex items-center justify-between gap-2">
|
||||
<div className="flex items-center gap-2 sm:gap-3 min-w-0">
|
||||
<img src="/nomad-karaoke-logo.svg" alt="Nomad Karaoke" className="h-8 sm:h-10 shrink-0" />
|
||||
<div className="min-w-0">
|
||||
<h1 className="text-base sm:text-xl font-bold truncate" style={{ color: 'var(--text)' }}>Karaoke Generator</h1>
|
||||
</div>
|
||||
<div className="min-h-screen animated-gradient">
|
||||
{/* Navigation */}
|
||||
<nav className="fixed top-0 left-0 right-0 z-50 bg-dark-900/80 backdrop-blur-md border-b border-dark-700">
|
||||
<div className="max-w-6xl mx-auto px-4 py-4 flex items-center justify-between">
|
||||
<div className="flex items-center gap-2">
|
||||
<MicVocal className="w-8 h-8 text-primary-500" />
|
||||
<span className="text-xl font-bold">Nomad Karaoke</span>
|
||||
</div>
|
||||
<div className="flex items-center gap-1 sm:gap-2 shrink-0">
|
||||
<TooltipProvider>
|
||||
<Tooltip>
|
||||
<TooltipTrigger asChild>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
onClick={toggleAutoMode}
|
||||
className={`min-h-[40px] px-2 sm:px-3 ${autoModeEnabled ? "text-amber-400 hover:text-amber-300 bg-amber-500/10" : ""}`}
|
||||
style={!autoModeEnabled ? { color: 'var(--text-muted)' } : undefined}
|
||||
>
|
||||
{autoModeEnabled ? (
|
||||
<Zap className="w-4 h-4 sm:mr-2" />
|
||||
) : (
|
||||
<ZapOff className="w-4 h-4 sm:mr-2" />
|
||||
)}
|
||||
<span className="hidden sm:inline">Auto</span>
|
||||
</Button>
|
||||
</TooltipTrigger>
|
||||
<TooltipContent side="bottom" className="max-w-xs">
|
||||
<p className="font-medium">
|
||||
{autoModeEnabled ? "Auto Mode Enabled" : "Auto Mode Disabled"}
|
||||
</p>
|
||||
<p className="text-xs mt-1" style={{ color: 'var(--text-muted)' }}>
|
||||
{autoModeEnabled
|
||||
? "Jobs will auto-complete review and select clean instrumental (like -y flag)"
|
||||
: "Click to enable non-interactive mode"}
|
||||
</p>
|
||||
</TooltipContent>
|
||||
</Tooltip>
|
||||
</TooltipProvider>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
onClick={loadJobs}
|
||||
disabled={isLoadingJobs || !isAuthenticated}
|
||||
className="min-h-[40px] px-2 sm:px-3"
|
||||
style={{ color: 'var(--text-muted)' }}
|
||||
>
|
||||
<RefreshCw className={`w-4 h-4 sm:mr-2 ${isLoadingJobs ? 'animate-spin' : ''}`} />
|
||||
<span className="hidden sm:inline">Refresh</span>
|
||||
</Button>
|
||||
<AuthStatus />
|
||||
{mounted && (
|
||||
<TooltipProvider>
|
||||
<Tooltip>
|
||||
<TooltipTrigger asChild>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
onClick={toggleTheme}
|
||||
className="min-h-[40px] px-2 sm:px-3"
|
||||
style={{ color: 'var(--text-muted)' }}
|
||||
>
|
||||
{isDarkMode ? (
|
||||
<Sun className="w-4 h-4" />
|
||||
) : (
|
||||
<Moon className="w-4 h-4" />
|
||||
)}
|
||||
</Button>
|
||||
</TooltipTrigger>
|
||||
<TooltipContent side="bottom">
|
||||
<p>{isDarkMode ? "Switch to light mode" : "Switch to dark mode"}</p>
|
||||
</TooltipContent>
|
||||
</Tooltip>
|
||||
</TooltipProvider>
|
||||
<button
|
||||
onClick={() => setShowAuthDialog(true)}
|
||||
className="text-sm text-dark-300 hover:text-white transition-colors"
|
||||
>
|
||||
Already have credits? Sign in
|
||||
</button>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
{/* Hero Section */}
|
||||
<section className="pt-32 pb-16 px-4">
|
||||
<div className="max-w-4xl mx-auto text-center">
|
||||
<h1 className="text-4xl sm:text-5xl md:text-6xl font-extrabold mb-6 leading-tight">
|
||||
Turn Any Song Into a{' '}
|
||||
<span className="gradient-text">Karaoke Video</span>
|
||||
</h1>
|
||||
<p className="text-xl text-dark-300 mb-8 max-w-2xl mx-auto">
|
||||
Professional karaoke videos in minutes. AI-powered vocal removal,
|
||||
perfect lyrics sync, and stunning video output.
|
||||
</p>
|
||||
<a
|
||||
href="#pricing"
|
||||
className="inline-flex items-center gap-2 bg-primary-500 hover:bg-primary-600 text-white font-semibold px-8 py-4 rounded-xl transition-all btn-glow"
|
||||
>
|
||||
Get Started
|
||||
<ChevronDown className="w-5 h-5" />
|
||||
</a>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{/* How It Works */}
|
||||
<section className="py-16 px-4">
|
||||
<div className="max-w-6xl mx-auto">
|
||||
<h2 className="text-3xl font-bold text-center mb-12">How It Works</h2>
|
||||
<div className="grid md:grid-cols-4 gap-8">
|
||||
{[
|
||||
{ icon: Music, title: 'Search', desc: 'Enter artist & song title' },
|
||||
{ icon: Sparkles, title: 'AI Magic', desc: 'We remove vocals & sync lyrics' },
|
||||
{ icon: Video, title: 'Review', desc: 'Preview and fine-tune' },
|
||||
{ icon: Youtube, title: 'Export', desc: 'Download or upload to YouTube' },
|
||||
].map((step, i) => (
|
||||
<div key={i} className="text-center">
|
||||
<div className="w-16 h-16 bg-primary-500/20 rounded-2xl flex items-center justify-center mx-auto mb-4">
|
||||
<step.icon className="w-8 h-8 text-primary-400" />
|
||||
</div>
|
||||
<h3 className="font-semibold text-lg mb-2">{step.title}</h3>
|
||||
<p className="text-dark-400 text-sm">{step.desc}</p>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{/* Features */}
|
||||
<section className="py-16 px-4 bg-dark-800/50">
|
||||
<div className="max-w-6xl mx-auto">
|
||||
<h2 className="text-3xl font-bold text-center mb-12">What You Get</h2>
|
||||
<div className="grid md:grid-cols-3 gap-6">
|
||||
{[
|
||||
{ title: 'Studio-Quality Separation', desc: 'State-of-the-art AI removes vocals cleanly, keeping the instrumental crisp.' },
|
||||
{ title: 'Perfect Lyrics Sync', desc: 'Word-by-word timing that highlights exactly when to sing.' },
|
||||
{ title: 'Multiple Instrumental Options', desc: 'Choose from different vocal removal levels to get the sound you want.' },
|
||||
{ title: '4K Video Output', desc: 'Stunning video quality that looks great on any screen.' },
|
||||
{ title: 'YouTube Integration', desc: 'Upload directly to your YouTube channel with one click.' },
|
||||
{ title: 'Edit Before Export', desc: 'Fix any lyrics issues before generating your final video.' },
|
||||
].map((feature, i) => (
|
||||
<div key={i} className="bg-dark-800 border border-dark-700 rounded-xl p-6 card-hover">
|
||||
<h3 className="font-semibold text-lg mb-2">{feature.title}</h3>
|
||||
<p className="text-dark-400 text-sm">{feature.desc}</p>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{/* Beta Tester Program */}
|
||||
<section className="py-12 px-4">
|
||||
<div className="max-w-2xl mx-auto">
|
||||
<div className="bg-gradient-to-r from-purple-900/40 to-pink-900/40 border border-purple-500/30 rounded-2xl p-8 text-center">
|
||||
<div className="inline-flex items-center gap-2 bg-purple-500/20 text-purple-300 px-4 py-2 rounded-full text-sm font-medium mb-4">
|
||||
<Gift className="w-4 h-4" />
|
||||
Beta Tester Program
|
||||
</div>
|
||||
<h3 className="text-2xl font-bold mb-3">Try It Free!</h3>
|
||||
<p className="text-dark-300 mb-6">
|
||||
Help us improve by testing the tool and sharing your feedback. Get a{' '}
|
||||
<span className="text-green-400 font-semibold">free credit</span> to
|
||||
create your first karaoke video!
|
||||
</p>
|
||||
|
||||
{!showBetaForm && !betaSuccess && (
|
||||
<button
|
||||
onClick={() => setShowBetaForm(true)}
|
||||
className="inline-flex items-center gap-2 bg-purple-500 hover:bg-purple-600 text-white font-semibold px-6 py-3 rounded-xl transition-all"
|
||||
>
|
||||
Join Beta Program
|
||||
<MessageSquare className="w-5 h-5" />
|
||||
</button>
|
||||
)}
|
||||
|
||||
{showBetaForm && !betaSuccess && (
|
||||
<form onSubmit={handleBetaEnroll} className="mt-6 text-left space-y-4">
|
||||
<div>
|
||||
<label htmlFor="beta-email" className="block text-sm font-medium text-dark-300 mb-2">
|
||||
Email address
|
||||
</label>
|
||||
<input
|
||||
type="email"
|
||||
id="beta-email"
|
||||
value={betaEmail}
|
||||
onChange={(e) => setBetaEmail(e.target.value)}
|
||||
placeholder="you@example.com"
|
||||
className="w-full px-4 py-3 bg-dark-900 border border-dark-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-purple-500 text-white placeholder-dark-500"
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label htmlFor="beta-promise" className="block text-sm font-medium text-dark-300 mb-2">
|
||||
What song do you want to make into karaoke?
|
||||
</label>
|
||||
<textarea
|
||||
id="beta-promise"
|
||||
value={betaPromise}
|
||||
onChange={(e) => setBetaPromise(e.target.value)}
|
||||
placeholder="Tell us about a song you'd love to sing..."
|
||||
rows={3}
|
||||
className="w-full px-4 py-3 bg-dark-900 border border-dark-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-purple-500 text-white placeholder-dark-500 resize-none"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="flex items-start gap-3">
|
||||
<input
|
||||
type="checkbox"
|
||||
id="beta-accept"
|
||||
checked={betaAccept}
|
||||
onChange={(e) => setBetaAccept(e.target.checked)}
|
||||
className="mt-1 w-4 h-4 rounded border-dark-600 bg-dark-900 text-purple-500 focus:ring-purple-500"
|
||||
/>
|
||||
<label htmlFor="beta-accept" className="text-sm text-dark-300">
|
||||
I understand that beta testers help improve lyrics accuracy by reviewing and correcting AI-generated lyrics
|
||||
</label>
|
||||
</div>
|
||||
|
||||
{betaError && (
|
||||
<p className="text-red-400 text-sm">{betaError}</p>
|
||||
)}
|
||||
|
||||
<button
|
||||
type="submit"
|
||||
disabled={betaLoading}
|
||||
className="w-full bg-purple-500 hover:bg-purple-600 disabled:bg-purple-500/50 text-white font-semibold py-3 rounded-xl transition-all flex items-center justify-center gap-2"
|
||||
>
|
||||
{betaLoading ? 'Enrolling...' : 'Get My Free Credit'}
|
||||
{!betaLoading && <Gift className="w-5 h-5" />}
|
||||
</button>
|
||||
</form>
|
||||
)}
|
||||
|
||||
{betaSuccess && (
|
||||
<div className="mt-6 p-4 bg-green-500/20 border border-green-500/30 rounded-xl">
|
||||
<p className="text-green-400 font-semibold">
|
||||
Welcome to the beta program!{' '}
|
||||
{betaWillRedirect
|
||||
? 'Redirecting to the app...'
|
||||
: 'Check your email for a sign-in link.'}
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</header>
|
||||
</section>
|
||||
|
||||
<main className="px-4 py-8 space-y-6">
|
||||
{/* Auto Mode Banner */}
|
||||
{autoModeEnabled && (
|
||||
<div className="bg-amber-500/10 border border-amber-500/30 rounded-lg p-4 flex items-center gap-3">
|
||||
<Zap className="w-5 h-5 text-amber-400 flex-shrink-0" />
|
||||
<div className="flex-1">
|
||||
<p className="text-sm text-amber-200 font-medium">Non-Interactive Mode Active</p>
|
||||
<p className="text-xs text-amber-200/70 mt-0.5">
|
||||
Jobs will automatically accept lyrics and select clean instrumental (equivalent to -y flag)
|
||||
</p>
|
||||
{/* Pricing */}
|
||||
<section id="pricing" className="py-20 px-4">
|
||||
<div className="max-w-4xl mx-auto">
|
||||
<h2 className="text-3xl font-bold text-center mb-4">Simple Pricing</h2>
|
||||
<p className="text-dark-400 text-center mb-12 max-w-xl mx-auto">
|
||||
One credit = one karaoke video. Buy more to save more.
|
||||
</p>
|
||||
|
||||
{/* Package Selection */}
|
||||
{packagesLoading && (
|
||||
<WarmingUpLoader className="py-8" />
|
||||
)}
|
||||
{packagesError && (
|
||||
<div className="text-center py-8 text-red-400">
|
||||
{packagesError}
|
||||
</div>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
onClick={toggleAutoMode}
|
||||
className="text-amber-200 hover:text-amber-100 hover:bg-amber-500/20"
|
||||
>
|
||||
Disable
|
||||
</Button>
|
||||
)}
|
||||
<div className="grid grid-cols-2 md:grid-cols-4 gap-4 mb-8">
|
||||
{packages.map((pkg) => {
|
||||
const isSelected = selectedPackage?.id === pkg.id;
|
||||
const isBestValue = pkg.credits === 5;
|
||||
const savings = pkg.credits > 1 ? Math.round((1 - pkg.price_cents / (pkg.credits * 500)) * 100) : 0;
|
||||
|
||||
return (
|
||||
<button
|
||||
key={pkg.id}
|
||||
onClick={() => setSelectedPackage(pkg)}
|
||||
className={`relative p-4 rounded-xl border-2 transition-all ${
|
||||
isSelected
|
||||
? 'border-primary-500 bg-primary-500/10'
|
||||
: 'border-dark-700 hover:border-dark-500 bg-dark-800/50'
|
||||
}`}
|
||||
>
|
||||
{isBestValue && (
|
||||
<span className="absolute -top-3 left-1/2 -translate-x-1/2 bg-primary-500 text-white text-xs font-semibold px-3 py-1 rounded-full">
|
||||
Best Value
|
||||
</span>
|
||||
)}
|
||||
<div className="text-2xl font-bold mb-1">{pkg.credits}</div>
|
||||
<div className="text-sm text-dark-400 mb-2">
|
||||
{pkg.credits === 1 ? 'credit' : 'credits'}
|
||||
</div>
|
||||
<div className="text-xl font-semibold text-primary-400">
|
||||
{formatPrice(pkg.price_cents)}
|
||||
</div>
|
||||
<div className="text-xs text-dark-500">{pricePerVideo(pkg)}/video</div>
|
||||
{savings > 0 && (
|
||||
<div className="text-xs text-green-400 mt-1">Save {savings}%</div>
|
||||
)}
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Unauthenticated state */}
|
||||
{!isAuthenticated && (
|
||||
<div className="bg-amber-500/10 border border-amber-500/30 rounded-lg p-6 text-center">
|
||||
<KeyRound className="w-8 h-8 text-amber-400 mx-auto mb-3" />
|
||||
<h3 className="text-lg font-medium mb-2" style={{ color: 'var(--text)' }}>Authentication Required</h3>
|
||||
<p className="text-sm mb-4" style={{ color: 'var(--text-muted)' }}>
|
||||
Click the Login button in the header to enter your access token
|
||||
</p>
|
||||
{/* Checkout Form */}
|
||||
<div className="bg-dark-800 border border-dark-700 rounded-2xl p-8 max-w-md mx-auto">
|
||||
<div className="text-center mb-6">
|
||||
<div className="text-sm text-dark-400 mb-1">Selected package</div>
|
||||
<div className="text-2xl font-bold">
|
||||
{selectedPackage?.credits} Credits
|
||||
</div>
|
||||
<div className="text-3xl font-bold text-primary-400">
|
||||
{selectedPackage && formatPrice(selectedPackage.price_cents)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<form onSubmit={handleCheckout} className="space-y-4">
|
||||
<div>
|
||||
<label htmlFor="email" className="block text-sm font-medium text-dark-300 mb-2">
|
||||
Email address
|
||||
</label>
|
||||
<div className="relative">
|
||||
<Mail className="absolute left-3 top-1/2 -translate-y-1/2 w-5 h-5 text-dark-500" />
|
||||
<input
|
||||
type="email"
|
||||
id="email"
|
||||
value={email}
|
||||
onChange={(e) => setEmail(e.target.value)}
|
||||
placeholder="you@example.com"
|
||||
className="w-full pl-10 pr-4 py-3 bg-dark-900 border border-dark-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary-500 focus:border-transparent text-white placeholder-dark-500"
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
<p className="text-xs text-dark-500 mt-2">
|
||||
We'll send your login link to this email
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{error && <p className="text-red-400 text-sm">{error}</p>}
|
||||
|
||||
<button
|
||||
type="submit"
|
||||
disabled={isLoading || !selectedPackage}
|
||||
className="w-full bg-primary-500 hover:bg-primary-600 disabled:bg-primary-500/50 text-white font-semibold py-4 rounded-xl transition-all btn-glow flex items-center justify-center gap-2"
|
||||
>
|
||||
{isLoading ? 'Redirecting...' : 'Continue to Payment'}
|
||||
{!isLoading && <Check className="w-5 h-5" />}
|
||||
</button>
|
||||
</form>
|
||||
|
||||
<div className="mt-4 flex items-center justify-center gap-4 text-xs text-dark-500">
|
||||
<span>Secure checkout</span>
|
||||
<span>powered by Stripe</span>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="grid lg:grid-cols-2 gap-8">
|
||||
{/* Submit Job Card */}
|
||||
<Card className="backdrop-blur" style={{ borderColor: 'var(--card-border)', backgroundColor: 'var(--card)' }}>
|
||||
<CardHeader>
|
||||
<CardTitle style={{ color: 'var(--text)' }}>Create Karaoke Video</CardTitle>
|
||||
<CardDescription style={{ color: 'var(--text-muted)' }}>
|
||||
Upload an audio file, provide a YouTube URL, or search for audio by artist & title
|
||||
</CardDescription>
|
||||
</CardHeader>
|
||||
<CardContent>
|
||||
<JobSubmission onJobCreated={loadJobs} />
|
||||
</CardContent>
|
||||
</Card>
|
||||
|
||||
{/* Jobs List Card */}
|
||||
<Card className="backdrop-blur" style={{ borderColor: 'var(--card-border)', backgroundColor: 'var(--card)' }}>
|
||||
<CardHeader>
|
||||
<CardTitle className="flex items-center justify-between" style={{ color: 'var(--text)' }}>
|
||||
Recent Jobs
|
||||
{isLoadingJobs && <Loader2 className="w-4 h-4 animate-spin" style={{ color: 'var(--text-muted)' }} />}
|
||||
</CardTitle>
|
||||
<CardDescription style={{ color: 'var(--text-muted)' }}>
|
||||
{jobs.length} job{jobs.length !== 1 ? 's' : ''} found
|
||||
</CardDescription>
|
||||
</CardHeader>
|
||||
<CardContent>
|
||||
{jobs.length === 0 ? (
|
||||
<div className="text-center py-8" style={{ color: 'var(--text-muted)' }}>
|
||||
<Music2 className="w-12 h-12 mx-auto mb-3 opacity-50" />
|
||||
<p>No jobs yet. Create one to get started!</p>
|
||||
</div>
|
||||
) : (
|
||||
<div className="space-y-3 max-h-[500px] overflow-y-auto pr-2">
|
||||
{jobs.map((job) => (
|
||||
<JobCard key={job.job_id} job={job} onRefresh={loadJobs} />
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</CardContent>
|
||||
</Card>
|
||||
</div>
|
||||
</main>
|
||||
</section>
|
||||
|
||||
<VersionFooter />
|
||||
{/* FAQ */}
|
||||
<section className="py-16 px-4 bg-dark-800/50">
|
||||
<div className="max-w-2xl mx-auto">
|
||||
<h2 className="text-3xl font-bold text-center mb-12">Questions?</h2>
|
||||
<div className="space-y-4">
|
||||
{faqs.map((faq, i) => (
|
||||
<div key={i} className="bg-dark-800 border border-dark-700 rounded-xl overflow-hidden">
|
||||
<button
|
||||
onClick={() => setExpandedFaq(expandedFaq === i ? null : i)}
|
||||
aria-expanded={expandedFaq === i}
|
||||
className="w-full px-6 py-4 text-left flex items-center justify-between hover:bg-dark-700/50 transition-colors"
|
||||
>
|
||||
<span className="font-medium">{faq.question}</span>
|
||||
<ChevronDown
|
||||
className={`w-5 h-5 text-dark-400 transition-transform ${
|
||||
expandedFaq === i ? 'rotate-180' : ''
|
||||
}`}
|
||||
/>
|
||||
</button>
|
||||
{expandedFaq === i && (
|
||||
<div className="px-6 pb-4 text-dark-300 text-sm">{faq.answer}</div>
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{/* Footer */}
|
||||
<footer className="py-12 px-4 border-t border-dark-700">
|
||||
<div className="max-w-6xl mx-auto flex flex-col md:flex-row items-center justify-between gap-4">
|
||||
<div className="flex items-center gap-2">
|
||||
<MicVocal className="w-6 h-6 text-primary-500" />
|
||||
<span className="font-semibold">Nomad Karaoke</span>
|
||||
</div>
|
||||
<div className="text-sm text-dark-500">
|
||||
© {new Date().getFullYear()} Nomad Karaoke. All rights reserved.
|
||||
</div>
|
||||
<div className="flex gap-6 text-sm text-dark-400">
|
||||
<a href="mailto:support@nomadkaraoke.com" className="hover:text-white transition-colors">
|
||||
Support
|
||||
</a>
|
||||
<a href="https://nomadkaraoke.com" className="hover:text-white transition-colors">
|
||||
About
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
{/* Auth Dialog for sign-in */}
|
||||
<AuthDialog
|
||||
open={showAuthDialog}
|
||||
onClose={() => setShowAuthDialog(false)}
|
||||
onSuccess={handleAuthSuccess}
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
);
|
||||
}
|
||||
@@ -53,7 +53,7 @@ function PaymentSuccessContent() {
|
||||
|
||||
<div className="space-y-3">
|
||||
<Button
|
||||
onClick={() => router.push("/")}
|
||||
onClick={() => router.push("/app")}
|
||||
className="w-full bg-blue-600 hover:bg-blue-500"
|
||||
>
|
||||
Start Creating Karaoke
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
'use client';
|
||||
|
||||
import { useState, useEffect } from 'react';
|
||||
import { Loader2 } from 'lucide-react';
|
||||
|
||||
interface WarmingUpLoaderProps {
|
||||
/** Custom class name for the container */
|
||||
className?: string;
|
||||
/** Custom class name for the spinner */
|
||||
spinnerClassName?: string;
|
||||
/** Time in ms before showing "warming up" message (default: 5000) */
|
||||
warmUpDelay?: number;
|
||||
/** Time in ms before showing "almost there" message (default: 15000) */
|
||||
almostThereDelay?: number;
|
||||
}
|
||||
|
||||
/**
|
||||
* A loading component that gracefully handles cold start delays.
|
||||
* Shows increasingly reassuring messages as load time increases.
|
||||
*/
|
||||
export function WarmingUpLoader({
|
||||
className = '',
|
||||
spinnerClassName = 'w-8 h-8',
|
||||
warmUpDelay = 5000,
|
||||
almostThereDelay = 15000,
|
||||
}: WarmingUpLoaderProps) {
|
||||
const [phase, setPhase] = useState<'initial' | 'warming' | 'almost'>('initial');
|
||||
|
||||
useEffect(() => {
|
||||
const warmUpTimer = setTimeout(() => {
|
||||
setPhase('warming');
|
||||
}, warmUpDelay);
|
||||
|
||||
const almostThereTimer = setTimeout(() => {
|
||||
setPhase('almost');
|
||||
}, almostThereDelay);
|
||||
|
||||
return () => {
|
||||
clearTimeout(warmUpTimer);
|
||||
clearTimeout(almostThereTimer);
|
||||
};
|
||||
}, [warmUpDelay, almostThereDelay]);
|
||||
|
||||
return (
|
||||
<div className={`flex flex-col items-center justify-center gap-3 ${className}`}>
|
||||
<Loader2
|
||||
className={`animate-spin ${spinnerClassName}`}
|
||||
style={{ color: 'var(--primary)' }}
|
||||
/>
|
||||
{phase === 'warming' && (
|
||||
<p className="text-sm animate-fade-in" style={{ color: 'var(--text-muted)' }}>
|
||||
Warming up the generator...
|
||||
</p>
|
||||
)}
|
||||
{phase === 'almost' && (
|
||||
<div className="text-center animate-fade-in">
|
||||
<p className="text-sm" style={{ color: 'var(--text-muted)' }}>Almost there...</p>
|
||||
<p className="text-xs mt-1" style={{ color: 'var(--text-muted)', opacity: 0.7 }}>
|
||||
First load can take up to 30 seconds
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -41,13 +41,12 @@ export function AuthStatus({ onAuthChange }: AuthStatusProps) {
|
||||
}
|
||||
|
||||
const handleBuyCredits = () => {
|
||||
// Navigate to buy site with email prefilled if available
|
||||
const buyBaseUrl = process.env.NEXT_PUBLIC_BUY_URL || "https://buy.nomadkaraoke.com"
|
||||
const buyUrl = new URL(buyBaseUrl)
|
||||
// Navigate to landing page pricing section with email prefilled if available
|
||||
const buyUrl = new URL('/#pricing', window.location.origin)
|
||||
if (user?.email) {
|
||||
buyUrl.searchParams.set("email", user.email)
|
||||
}
|
||||
window.open(buyUrl.toString(), "_blank")
|
||||
window.location.href = buyUrl.toString()
|
||||
}
|
||||
|
||||
// Don't render until mounted (avoids hydration issues)
|
||||
|
||||
@@ -150,7 +150,7 @@ export function JobSubmission({ onJobCreated }: JobSubmissionProps) {
|
||||
<TabsList className="grid w-full grid-cols-3 h-auto rounded-lg p-1" style={{ backgroundColor: 'var(--secondary)' }}>
|
||||
<TabsTrigger
|
||||
value="search"
|
||||
className="gap-1.5 sm:gap-2 py-3 min-h-[44px] text-xs sm:text-sm rounded-md data-[state=active]:bg-amber-500 data-[state=active]:text-white data-[state=active]:shadow-md data-[state=inactive]:hover:bg-amber-500/10"
|
||||
className="gap-1.5 sm:gap-2 py-3 min-h-[44px] text-xs sm:text-sm rounded-md data-[state=active]:!bg-amber-600 data-[state=active]:!text-white data-[state=active]:shadow-md data-[state=inactive]:hover:bg-amber-600/10"
|
||||
style={{ color: activeTab === 'search' ? 'white' : 'var(--text-muted)' }}
|
||||
>
|
||||
<Music className="w-4 h-4 shrink-0" />
|
||||
@@ -158,7 +158,7 @@ export function JobSubmission({ onJobCreated }: JobSubmissionProps) {
|
||||
</TabsTrigger>
|
||||
<TabsTrigger
|
||||
value="upload"
|
||||
className="gap-1.5 sm:gap-2 py-3 min-h-[44px] text-xs sm:text-sm rounded-md data-[state=active]:bg-amber-500 data-[state=active]:text-white data-[state=active]:shadow-md data-[state=inactive]:hover:bg-amber-500/10"
|
||||
className="gap-1.5 sm:gap-2 py-3 min-h-[44px] text-xs sm:text-sm rounded-md data-[state=active]:!bg-amber-600 data-[state=active]:!text-white data-[state=active]:shadow-md data-[state=inactive]:hover:bg-amber-600/10"
|
||||
style={{ color: activeTab === 'upload' ? 'white' : 'var(--text-muted)' }}
|
||||
>
|
||||
<Upload className="w-4 h-4 shrink-0" />
|
||||
@@ -166,7 +166,7 @@ export function JobSubmission({ onJobCreated }: JobSubmissionProps) {
|
||||
</TabsTrigger>
|
||||
<TabsTrigger
|
||||
value="url"
|
||||
className="gap-1.5 sm:gap-2 py-3 min-h-[44px] text-xs sm:text-sm rounded-md data-[state=active]:bg-amber-500 data-[state=active]:text-white data-[state=active]:shadow-md data-[state=inactive]:hover:bg-amber-500/10"
|
||||
className="gap-1.5 sm:gap-2 py-3 min-h-[44px] text-xs sm:text-sm rounded-md data-[state=active]:!bg-amber-600 data-[state=active]:!text-white data-[state=active]:shadow-md data-[state=inactive]:hover:bg-amber-600/10"
|
||||
style={{ color: activeTab === 'url' ? 'white' : 'var(--text-muted)' }}
|
||||
>
|
||||
<Youtube className="w-4 h-4 shrink-0" />
|
||||
@@ -232,6 +232,9 @@ export function JobSubmission({ onJobCreated }: JobSubmissionProps) {
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<p className="text-xs" style={{ color: 'var(--text-muted)' }}>
|
||||
<span className="text-amber-500 font-medium">Note:</span> Format these exactly as you want them on the title card and video filename.
|
||||
</p>
|
||||
|
||||
{/* Theme Selection */}
|
||||
<div className="space-y-4 pt-4 border-t" style={{ borderColor: 'var(--card-border)' }}>
|
||||
@@ -311,6 +314,9 @@ export function JobSubmission({ onJobCreated }: JobSubmissionProps) {
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<p className="text-xs" style={{ color: 'var(--text-muted)' }}>
|
||||
<span className="text-amber-500 font-medium">Note:</span> Override auto-detected values if needed. These appear on the title card and video filename.
|
||||
</p>
|
||||
|
||||
{/* Theme Selection */}
|
||||
<div className="space-y-4 pt-4 border-t" style={{ borderColor: 'var(--card-border)' }}>
|
||||
@@ -373,6 +379,9 @@ export function JobSubmission({ onJobCreated }: JobSubmissionProps) {
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<p className="text-xs" style={{ color: 'var(--text-muted)' }}>
|
||||
<span className="text-amber-500 font-medium">Note:</span> Format these exactly as you want them on the title card and video filename.
|
||||
</p>
|
||||
|
||||
{/* Theme Selection */}
|
||||
<div className="space-y-4 pt-4 border-t" style={{ borderColor: 'var(--card-border)' }}>
|
||||
|
||||
@@ -1,118 +0,0 @@
|
||||
/**
|
||||
* Example E2E test demonstrating the API fixture system
|
||||
*
|
||||
* This test shows how to use the fixture system to run tests against
|
||||
* mock data instead of a real backend.
|
||||
*
|
||||
* Run in recording mode to capture new fixtures:
|
||||
* RECORD_FIXTURES=true npm run test:e2e -- fixtures-example.spec.ts
|
||||
*
|
||||
* Then review and approve fixtures:
|
||||
* npm run fixtures:review
|
||||
*/
|
||||
|
||||
import { test, expect } from '@playwright/test';
|
||||
import { setupApiFixtures, setupMocks, setAuthToken } from './fixtures';
|
||||
|
||||
test.describe('API Fixtures Example', () => {
|
||||
test('shows empty state when no jobs exist', async ({ page }) => {
|
||||
// Set up mock API responses (frontend uses /api/jobs, not /api/v1/jobs)
|
||||
await setupMocks(page, [
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/jobs',
|
||||
response: { body: [] },
|
||||
},
|
||||
]);
|
||||
|
||||
// Set auth token before navigating
|
||||
await setAuthToken(page, 'test-token');
|
||||
|
||||
await page.goto('/');
|
||||
|
||||
// Verify the empty state message
|
||||
await expect(page.getByText(/No jobs yet/i)).toBeVisible();
|
||||
});
|
||||
|
||||
test('shows jobs when they exist', async ({ page }) => {
|
||||
// Set up mock with sample job data (frontend uses /api/jobs)
|
||||
await setupMocks(page, [
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/jobs',
|
||||
response: {
|
||||
body: [
|
||||
{
|
||||
job_id: 'job-123',
|
||||
title: 'Test Song',
|
||||
artist: 'Test Artist',
|
||||
status: 'completed',
|
||||
created_at: '2024-01-15T10:00:00Z',
|
||||
updated_at: '2024-01-15T10:05:00Z',
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
]);
|
||||
|
||||
await setAuthToken(page, 'test-token');
|
||||
await page.goto('/');
|
||||
|
||||
// Verify job is displayed
|
||||
await expect(page.getByText('Test Song')).toBeVisible();
|
||||
await expect(page.getByText('Test Artist')).toBeVisible();
|
||||
});
|
||||
|
||||
test.skip('shows error when API fails', async ({ page }) => {
|
||||
// NOTE: Currently the frontend doesn't display API errors visibly
|
||||
// This test is skipped until error handling UI is added
|
||||
await setupMocks(page, [
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/jobs',
|
||||
response: {
|
||||
status: 500,
|
||||
body: { detail: 'Internal server error' },
|
||||
},
|
||||
},
|
||||
]);
|
||||
|
||||
await setAuthToken(page, 'test-token');
|
||||
await page.goto('/');
|
||||
|
||||
// This would require the frontend to display API errors
|
||||
await expect(page.getByText(/error/i)).toBeVisible();
|
||||
});
|
||||
|
||||
test('shows login prompt when not authenticated', async ({ page }) => {
|
||||
// No mock needed - just don't set auth token
|
||||
await page.goto('/');
|
||||
|
||||
// Verify login prompt is shown (actual UI text)
|
||||
await expect(page.getByText(/Authentication Required/i)).toBeVisible();
|
||||
});
|
||||
|
||||
test.skip('records real API responses when RECORD_FIXTURES=true', async ({ page }) => {
|
||||
// This test only runs in recording mode
|
||||
// It will capture actual API responses for review
|
||||
|
||||
const api = await setupApiFixtures(page, {
|
||||
testFile: 'fixtures-example.spec.ts',
|
||||
});
|
||||
|
||||
if (!api.isRecording) {
|
||||
test.skip();
|
||||
return;
|
||||
}
|
||||
|
||||
await setAuthToken(page, process.env.TEST_ACCESS_TOKEN || 'your-token');
|
||||
await page.goto('/');
|
||||
|
||||
// Perform actions that trigger API calls
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Stop recording and show captured fixtures
|
||||
const fixtures = api.stopRecording();
|
||||
console.log(`Captured ${fixtures.length} API calls`);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,107 @@
|
||||
/**
|
||||
* Shared authentication utilities for E2E tests
|
||||
*/
|
||||
|
||||
import { Page, APIRequestContext } from '@playwright/test';
|
||||
import { STORAGE_KEYS, URLS, TIMEOUTS } from './constants';
|
||||
|
||||
/**
|
||||
* Set the auth token in localStorage before page navigation.
|
||||
* Must be called BEFORE navigating to the page.
|
||||
*/
|
||||
export async function setAuthToken(page: Page, token: string): Promise<void> {
|
||||
await page.addInitScript((t) => {
|
||||
localStorage.setItem('karaoke_access_token', t);
|
||||
}, token);
|
||||
}
|
||||
|
||||
/**
|
||||
* Clear the auth token from localStorage.
|
||||
* Useful for testing unauthenticated flows.
|
||||
*/
|
||||
export async function clearAuthToken(page: Page): Promise<void> {
|
||||
await page.evaluate(() => {
|
||||
localStorage.removeItem('karaoke_access_token');
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the current auth token from localStorage.
|
||||
*/
|
||||
export async function getPageAuthToken(page: Page): Promise<string | null> {
|
||||
return await page.evaluate(() => {
|
||||
return localStorage.getItem('karaoke_access_token');
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the auth token from environment variable.
|
||||
*/
|
||||
export function getEnvAuthToken(): string | undefined {
|
||||
return process.env.KARAOKE_ACCESS_TOKEN;
|
||||
}
|
||||
|
||||
/**
|
||||
* Authenticate a page using environment token if available.
|
||||
* Returns true if authenticated, false otherwise.
|
||||
*/
|
||||
export async function authenticatePage(page: Page): Promise<boolean> {
|
||||
const token = getEnvAuthToken();
|
||||
if (!token) {
|
||||
console.warn('No KARAOKE_ACCESS_TOKEN set - authentication skipped');
|
||||
return false;
|
||||
}
|
||||
|
||||
await setAuthToken(page, token);
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Verify that the current token is valid by making an API call.
|
||||
*/
|
||||
export async function verifyToken(
|
||||
request: APIRequestContext,
|
||||
token: string,
|
||||
apiUrl: string = URLS.production.api
|
||||
): Promise<{ valid: boolean; user?: any }> {
|
||||
const response = await request.get(`${apiUrl}/api/users/me`, {
|
||||
headers: { Authorization: `Bearer ${token}` },
|
||||
timeout: TIMEOUTS.apiCall,
|
||||
});
|
||||
|
||||
if (response.ok()) {
|
||||
const user = await response.json();
|
||||
return { valid: true, user };
|
||||
}
|
||||
|
||||
return { valid: false };
|
||||
}
|
||||
|
||||
/**
|
||||
* Get user info for the current token.
|
||||
*/
|
||||
export async function getUserInfo(
|
||||
request: APIRequestContext,
|
||||
token: string,
|
||||
apiUrl: string = URLS.production.api
|
||||
): Promise<{
|
||||
email: string;
|
||||
credits: number;
|
||||
isBeta: boolean;
|
||||
} | null> {
|
||||
const response = await request.get(`${apiUrl}/api/users/me`, {
|
||||
headers: { Authorization: `Bearer ${token}` },
|
||||
timeout: TIMEOUTS.apiCall,
|
||||
});
|
||||
|
||||
if (response.ok()) {
|
||||
const data = await response.json();
|
||||
return {
|
||||
email: data.email,
|
||||
credits: data.credits,
|
||||
isBeta: data.is_beta || false,
|
||||
};
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
/**
|
||||
* Shared constants for E2E tests
|
||||
*/
|
||||
|
||||
/**
|
||||
* Test song - uses cached flacfetch results for speed and cost savings.
|
||||
* "piri - dog" is the designated test song that has cached results in production.
|
||||
*/
|
||||
export const TEST_SONG = {
|
||||
artist: 'piri',
|
||||
title: 'dog',
|
||||
} as const;
|
||||
|
||||
/**
|
||||
* URLs for different environments
|
||||
*/
|
||||
export const URLS = {
|
||||
production: {
|
||||
frontend: 'https://gen.nomadkaraoke.com',
|
||||
api: 'https://api.nomadkaraoke.com',
|
||||
},
|
||||
local: {
|
||||
frontend: 'http://localhost:3000',
|
||||
api: 'http://localhost:8000',
|
||||
},
|
||||
} as const;
|
||||
|
||||
/**
|
||||
* Timeout values for different operations
|
||||
*/
|
||||
export const TIMEOUTS = {
|
||||
/** 30s for UI actions like clicks, fills */
|
||||
action: 30_000,
|
||||
/** 60s for expect assertions */
|
||||
expect: 60_000,
|
||||
/** 2min for API calls that may take a while */
|
||||
apiCall: 120_000,
|
||||
/** 10min for job processing (transcription, rendering) */
|
||||
jobProcessing: 600_000,
|
||||
/** 15min for full test run */
|
||||
fullTest: 900_000,
|
||||
} as const;
|
||||
|
||||
/**
|
||||
* Common job statuses
|
||||
*/
|
||||
export const JOB_STATUS = {
|
||||
PENDING: 'pending',
|
||||
AUDIO_SEARCH: 'audio_search',
|
||||
AWAITING_AUDIO_SELECTION: 'awaiting_audio_selection',
|
||||
DOWNLOADING: 'downloading',
|
||||
SEPARATING: 'separating',
|
||||
TRANSCRIBING: 'transcribing',
|
||||
AGENTIC_CORRECTION: 'agentic_correction',
|
||||
IN_REVIEW: 'in_review',
|
||||
AWAITING_INSTRUMENTAL: 'awaiting_instrumental_selection',
|
||||
RENDERING: 'rendering',
|
||||
ENCODING: 'encoding',
|
||||
DISTRIBUTING: 'distributing',
|
||||
COMPLETED: 'completed',
|
||||
FAILED: 'failed',
|
||||
CANCELLED: 'cancelled',
|
||||
} as const;
|
||||
|
||||
/**
|
||||
* LocalStorage keys
|
||||
*/
|
||||
export const STORAGE_KEYS = {
|
||||
accessToken: 'karaoke_access_token',
|
||||
} as const;
|
||||
@@ -0,0 +1,170 @@
|
||||
/**
|
||||
* Email Testing Utilities using MailSlurp
|
||||
*
|
||||
* MailSlurp provides disposable email inboxes for e2e testing.
|
||||
* Free tier: 50 emails/month - perfect for CI/CD testing.
|
||||
*
|
||||
* Setup:
|
||||
* 1. Create account at https://app.mailslurp.com
|
||||
* 2. Get API key from dashboard
|
||||
* 3. Set MAILSLURP_API_KEY environment variable
|
||||
*
|
||||
* Usage in tests:
|
||||
* const emailHelper = await createEmailHelper();
|
||||
* const inbox = await emailHelper.createInbox();
|
||||
* // ... trigger email send to inbox.emailAddress ...
|
||||
* const email = await emailHelper.waitForEmail(inbox.id);
|
||||
* const magicLink = emailHelper.extractMagicLink(email);
|
||||
*/
|
||||
|
||||
import { MailSlurp, InboxDto, Email } from 'mailslurp-client';
|
||||
|
||||
const MAILSLURP_API_KEY = process.env.MAILSLURP_API_KEY;
|
||||
|
||||
export interface EmailHelper {
|
||||
isAvailable: boolean;
|
||||
createInbox: () => Promise<InboxDto>;
|
||||
waitForEmail: (inboxId: string, timeout?: number) => Promise<Email>;
|
||||
extractMagicLink: (email: Email) => string | null;
|
||||
extractVerificationCode: (email: Email) => string | null;
|
||||
deleteInbox: (inboxId: string) => Promise<void>;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates an email testing helper.
|
||||
* Returns a helper with isAvailable=false if MAILSLURP_API_KEY is not set.
|
||||
*/
|
||||
export async function createEmailHelper(): Promise<EmailHelper> {
|
||||
if (!MAILSLURP_API_KEY) {
|
||||
console.warn('MAILSLURP_API_KEY not set - email testing disabled');
|
||||
return createDisabledHelper();
|
||||
}
|
||||
|
||||
const mailslurp = new MailSlurp({ apiKey: MAILSLURP_API_KEY });
|
||||
|
||||
return {
|
||||
isAvailable: true,
|
||||
|
||||
/**
|
||||
* Create a new disposable inbox for testing
|
||||
*/
|
||||
async createInbox(): Promise<InboxDto> {
|
||||
const inbox = await mailslurp.createInbox();
|
||||
console.log(`Created test inbox: ${inbox.emailAddress}`);
|
||||
return inbox;
|
||||
},
|
||||
|
||||
/**
|
||||
* Wait for an email to arrive in the inbox
|
||||
* @param inboxId - The inbox ID to check
|
||||
* @param timeout - Timeout in ms (default: 60000 = 1 minute)
|
||||
*/
|
||||
async waitForEmail(inboxId: string, timeout = 60000): Promise<Email> {
|
||||
console.log(`Waiting for email in inbox ${inboxId}...`);
|
||||
const email = await mailslurp.waitForLatestEmail(inboxId, timeout);
|
||||
console.log(`Received email: ${email.subject}`);
|
||||
return email;
|
||||
},
|
||||
|
||||
/**
|
||||
* Extract magic link URL from email body
|
||||
*/
|
||||
extractMagicLink(email: Email): string | null {
|
||||
const body = email.body || '';
|
||||
|
||||
// Debug: Log email structure
|
||||
console.log('Email subject:', email.subject);
|
||||
console.log('Email body length:', body.length);
|
||||
console.log('Email body preview (first 500 chars):', body.substring(0, 500));
|
||||
|
||||
// Look for common magic link patterns
|
||||
const patterns = [
|
||||
// gen.nomadkaraoke.com verify link
|
||||
/https:\/\/gen\.nomadkaraoke\.com\/auth\/verify\?token=[a-zA-Z0-9_-]+/,
|
||||
// api.nomadkaraoke.com verify link
|
||||
/https:\/\/api\.nomadkaraoke\.com\/api\/users\/auth\/verify\?token=[a-zA-Z0-9_-]+/,
|
||||
// Generic magic link patterns - allow URL-encoded characters
|
||||
/https?:\/\/[^\s<>"]+\/auth\/verify[^\s<>"]*/,
|
||||
/https?:\/\/[^\s<>"]+verify\?token=[a-zA-Z0-9_%-]+/,
|
||||
/https?:\/\/[^\s<>"]+token=[a-zA-Z0-9_%-]+/,
|
||||
];
|
||||
|
||||
for (const pattern of patterns) {
|
||||
const match = body.match(pattern);
|
||||
if (match) {
|
||||
console.log(`Found magic link with pattern ${pattern}: ${match[0]}`);
|
||||
return match[0];
|
||||
}
|
||||
}
|
||||
|
||||
// Also check HTML links
|
||||
if (email.body) {
|
||||
const htmlLinkPattern = /href=["']([^"']*(?:verify|token)[^"']*)["']/i;
|
||||
const htmlMatch = email.body.match(htmlLinkPattern);
|
||||
if (htmlMatch) {
|
||||
console.log(`Found magic link in HTML href: ${htmlMatch[1]}`);
|
||||
return htmlMatch[1];
|
||||
}
|
||||
}
|
||||
|
||||
// Debug: Log all URLs found in the email
|
||||
const allUrls = body.match(/https?:\/\/[^\s<>"]+/g) || [];
|
||||
console.log('All URLs found in email:', allUrls);
|
||||
|
||||
console.warn('No magic link found in email');
|
||||
return null;
|
||||
},
|
||||
|
||||
/**
|
||||
* Extract verification code from email body
|
||||
*/
|
||||
extractVerificationCode(email: Email): string | null {
|
||||
const body = email.body || '';
|
||||
|
||||
// Look for 6-digit codes
|
||||
const codePattern = /\b(\d{6})\b/;
|
||||
const match = body.match(codePattern);
|
||||
|
||||
if (match) {
|
||||
console.log(`Found verification code: ${match[1]}`);
|
||||
return match[1];
|
||||
}
|
||||
|
||||
console.warn('No verification code found in email');
|
||||
return null;
|
||||
},
|
||||
|
||||
/**
|
||||
* Delete an inbox after testing
|
||||
*/
|
||||
async deleteInbox(inboxId: string): Promise<void> {
|
||||
await mailslurp.deleteInbox(inboxId);
|
||||
console.log(`Deleted inbox ${inboxId}`);
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a disabled helper for when MailSlurp is not configured
|
||||
*/
|
||||
function createDisabledHelper(): EmailHelper {
|
||||
const notAvailable = () => {
|
||||
throw new Error('Email testing not available - set MAILSLURP_API_KEY');
|
||||
};
|
||||
|
||||
return {
|
||||
isAvailable: false,
|
||||
createInbox: notAvailable,
|
||||
waitForEmail: notAvailable,
|
||||
extractMagicLink: () => null,
|
||||
extractVerificationCode: () => null,
|
||||
deleteInbox: notAvailable,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if email testing is available
|
||||
*/
|
||||
export function isEmailTestingAvailable(): boolean {
|
||||
return !!MAILSLURP_API_KEY;
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
/**
|
||||
* E2E Test Helpers
|
||||
*
|
||||
* Re-exports all helper utilities for convenient importing:
|
||||
* import { TEST_SONG, setAuthToken, createEmailHelper } from './helpers';
|
||||
*/
|
||||
|
||||
export * from './constants';
|
||||
export * from './auth';
|
||||
export * from './email-testing';
|
||||
@@ -1,569 +0,0 @@
|
||||
import { test, expect, Page, ConsoleMessage, Request, Response } from '@playwright/test';
|
||||
|
||||
/**
|
||||
* E2E tests for karaoke generation flow using real cloud backend.
|
||||
*
|
||||
* These tests run against localhost:3000 which proxies to api.nomadkaraoke.com
|
||||
*
|
||||
* IMPORTANT: Set KARAOKE_ACCESS_TOKEN environment variable for authenticated tests:
|
||||
* KARAOKE_ACCESS_TOKEN=your-token npm run test:e2e
|
||||
*/
|
||||
|
||||
const ACCESS_TOKEN = process.env.KARAOKE_ACCESS_TOKEN;
|
||||
|
||||
// Helper to authenticate the page by setting localStorage token
|
||||
async function authenticatePage(page: Page) {
|
||||
if (!ACCESS_TOKEN) {
|
||||
console.warn('No KARAOKE_ACCESS_TOKEN set - tests requiring auth will fail');
|
||||
return false;
|
||||
}
|
||||
|
||||
// Set the token in localStorage before navigating
|
||||
await page.addInitScript((token) => {
|
||||
localStorage.setItem('karaoke_access_token', token);
|
||||
}, ACCESS_TOKEN);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
// Helper to log network requests and responses
|
||||
function setupNetworkLogging(page: Page, testInfo: any) {
|
||||
const networkLogs: { type: string; url: string; status?: number; body?: any }[] = [];
|
||||
|
||||
page.on('request', (request: Request) => {
|
||||
if (request.url().includes('/api/')) {
|
||||
networkLogs.push({
|
||||
type: 'REQUEST',
|
||||
url: request.url(),
|
||||
body: request.postData() ? tryParseJson(request.postData()!) : undefined,
|
||||
});
|
||||
console.log(`>> ${request.method()} ${request.url()}`);
|
||||
}
|
||||
});
|
||||
|
||||
page.on('response', async (response: Response) => {
|
||||
if (response.url().includes('/api/')) {
|
||||
let body;
|
||||
try {
|
||||
body = await response.json();
|
||||
} catch {
|
||||
body = 'non-JSON response';
|
||||
}
|
||||
networkLogs.push({
|
||||
type: 'RESPONSE',
|
||||
url: response.url(),
|
||||
status: response.status(),
|
||||
body,
|
||||
});
|
||||
console.log(`<< ${response.status()} ${response.url()}`);
|
||||
if (response.status() >= 400) {
|
||||
console.log(' Error body:', JSON.stringify(body, null, 2));
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
return networkLogs;
|
||||
}
|
||||
|
||||
// Helper to log console messages
|
||||
function setupConsoleLogging(page: Page) {
|
||||
const consoleLogs: { type: string; text: string }[] = [];
|
||||
|
||||
page.on('console', (msg: ConsoleMessage) => {
|
||||
const type = msg.type();
|
||||
const text = msg.text();
|
||||
consoleLogs.push({ type, text });
|
||||
if (type === 'error') {
|
||||
console.log(`[CONSOLE ERROR] ${text}`);
|
||||
} else if (type === 'warning') {
|
||||
console.log(`[CONSOLE WARN] ${text}`);
|
||||
}
|
||||
});
|
||||
|
||||
return consoleLogs;
|
||||
}
|
||||
|
||||
function tryParseJson(str: string): any {
|
||||
try {
|
||||
return JSON.parse(str);
|
||||
} catch {
|
||||
return str;
|
||||
}
|
||||
}
|
||||
|
||||
// Wait for job to reach a specific status or set of statuses
|
||||
async function waitForJobStatus(
|
||||
page: Page,
|
||||
targetStatuses: string[],
|
||||
timeoutMs: number = 300000 // 5 minutes default
|
||||
): Promise<string> {
|
||||
const startTime = Date.now();
|
||||
|
||||
while (Date.now() - startTime < timeoutMs) {
|
||||
// Look for status badges in the job cards
|
||||
const badges = await page.locator('[class*="Badge"]').allTextContents();
|
||||
|
||||
for (const status of targetStatuses) {
|
||||
if (badges.some(badge => badge.toLowerCase().includes(status.toLowerCase()))) {
|
||||
console.log(`Found target status: ${status}`);
|
||||
return status;
|
||||
}
|
||||
}
|
||||
|
||||
// Also check if failed or cancelled
|
||||
if (badges.some(badge => badge.toLowerCase().includes('failed'))) {
|
||||
throw new Error('Job failed');
|
||||
}
|
||||
if (badges.some(badge => badge.toLowerCase().includes('cancelled'))) {
|
||||
throw new Error('Job was cancelled');
|
||||
}
|
||||
|
||||
// Wait and refresh
|
||||
await page.waitForTimeout(3000);
|
||||
await page.click('button:has-text("Refresh")');
|
||||
await page.waitForTimeout(1000);
|
||||
}
|
||||
|
||||
throw new Error(`Timed out waiting for status: ${targetStatuses.join(' or ')}`);
|
||||
}
|
||||
|
||||
test.describe('Karaoke Generation', () => {
|
||||
test.beforeEach(async ({ page }, testInfo) => {
|
||||
// Set up auth if token available
|
||||
await authenticatePage(page);
|
||||
|
||||
// Set up logging
|
||||
setupNetworkLogging(page, testInfo);
|
||||
setupConsoleLogging(page);
|
||||
});
|
||||
|
||||
test('homepage loads and shows job submission form', async ({ page }) => {
|
||||
await page.goto('/');
|
||||
|
||||
// Check header
|
||||
await expect(page.locator('h1')).toContainText('Karaoke Generator');
|
||||
|
||||
// Check tabs exist
|
||||
await expect(page.getByRole('tab', { name: /upload/i })).toBeVisible();
|
||||
await expect(page.getByRole('tab', { name: /url/i })).toBeVisible();
|
||||
await expect(page.getByRole('tab', { name: /search/i })).toBeVisible();
|
||||
|
||||
// Check Recent Jobs section
|
||||
await expect(page.locator('text=Recent Jobs')).toBeVisible();
|
||||
});
|
||||
|
||||
test('search tab shows artist and title inputs', async ({ page }) => {
|
||||
await page.goto('/');
|
||||
|
||||
// Click Search tab
|
||||
await page.getByRole('tab', { name: /search/i }).click();
|
||||
|
||||
// Verify inputs exist
|
||||
await expect(page.getByLabel('Artist')).toBeVisible();
|
||||
await expect(page.getByLabel('Title')).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: /search.*create/i })).toBeVisible();
|
||||
});
|
||||
|
||||
test('can submit audio search request', async ({ page }) => {
|
||||
await page.goto('/');
|
||||
|
||||
// Click Search tab
|
||||
await page.getByRole('tab', { name: /search/i }).click();
|
||||
|
||||
// Fill in artist and title
|
||||
await page.getByLabel('Artist').fill('ABBA');
|
||||
await page.getByLabel('Title').fill('Waterloo');
|
||||
|
||||
// Submit
|
||||
await page.getByRole('button', { name: /search.*create/i }).click();
|
||||
|
||||
// Wait for the button to show loading or for a new job to appear
|
||||
await page.waitForTimeout(2000);
|
||||
|
||||
// Check for either success (job appears) or error message
|
||||
const errorDiv = page.locator('div.text-red-400').first();
|
||||
const hasError = await errorDiv.isVisible().catch(() => false);
|
||||
if (hasError) {
|
||||
const errorText = await errorDiv.textContent();
|
||||
console.log('Search error:', errorText);
|
||||
}
|
||||
|
||||
// Should see either a new job or an error - both are valid test results
|
||||
// that tell us about the system state
|
||||
});
|
||||
|
||||
test('full song search and selection flow', async ({ page }) => {
|
||||
test.setTimeout(300000); // 5 minutes for this test (backend can be slow)
|
||||
|
||||
// Skip if no auth token
|
||||
if (!ACCESS_TOKEN) {
|
||||
test.skip(true, 'KARAOKE_ACCESS_TOKEN not set');
|
||||
return;
|
||||
}
|
||||
|
||||
await page.goto('/');
|
||||
|
||||
// Wait for jobs to load
|
||||
await page.waitForTimeout(2000);
|
||||
|
||||
// First check if there's already a job awaiting audio selection we can use
|
||||
let jobCard = page.locator('[class*="rounded-lg"][class*="border"]').filter({
|
||||
hasText: /select audio/i
|
||||
}).first();
|
||||
|
||||
if (await jobCard.isVisible()) {
|
||||
console.log('Found existing job awaiting audio selection, using it...');
|
||||
} else {
|
||||
// Create a new job via search
|
||||
console.log('No existing job found, creating new one...');
|
||||
|
||||
// Click Search tab
|
||||
await page.getByRole('tab', { name: /search/i }).click();
|
||||
|
||||
// Fill in artist and title - use a test song
|
||||
await page.getByLabel('Artist').fill('LCMDF');
|
||||
await page.getByLabel('Title').fill('Take Me To The Mountains');
|
||||
|
||||
console.log('Submitting search for LCMDF - Take Me To The Mountains...');
|
||||
|
||||
// Submit and wait for response (backend search can take 30+ seconds)
|
||||
await page.getByRole('button', { name: /search.*create/i }).click();
|
||||
|
||||
// Wait longer for backend response (audio search takes time)
|
||||
await page.waitForTimeout(10000);
|
||||
|
||||
// Check for error
|
||||
const errorLocator = page.locator('div.text-red-400').first();
|
||||
if (await errorLocator.isVisible().catch(() => false)) {
|
||||
const errorText = await errorLocator.textContent();
|
||||
console.log('Error:', errorText);
|
||||
|
||||
// Network errors or timeouts - retry by looking for existing jobs
|
||||
if (errorText?.includes('Internal Server Error') || errorText?.includes('Failed to fetch')) {
|
||||
console.log('Search request failed, checking for existing jobs...');
|
||||
} else {
|
||||
throw new Error(`Search failed: ${errorText}`);
|
||||
}
|
||||
}
|
||||
|
||||
// Refresh to see jobs
|
||||
await page.click('button:has-text("Refresh")');
|
||||
await page.waitForTimeout(3000);
|
||||
|
||||
// Look for any job awaiting audio selection
|
||||
jobCard = page.locator('[class*="rounded-lg"][class*="border"]').filter({
|
||||
hasText: /select audio/i
|
||||
}).first();
|
||||
}
|
||||
|
||||
// Now work with the job that needs audio selection
|
||||
if (await jobCard.isVisible()) {
|
||||
console.log('Found job awaiting audio selection');
|
||||
|
||||
// Click to expand
|
||||
await jobCard.click();
|
||||
await page.waitForTimeout(1000);
|
||||
|
||||
// Take a screenshot of current state
|
||||
await page.screenshot({ path: 'test-results/job-expanded.png' });
|
||||
|
||||
// Look for the Select Audio button
|
||||
const selectAudioBtn = page.getByRole('button', { name: /select audio/i });
|
||||
|
||||
if (await selectAudioBtn.isVisible()) {
|
||||
console.log('Opening audio selection dialog...');
|
||||
await selectAudioBtn.click();
|
||||
await page.waitForTimeout(2000);
|
||||
|
||||
// Look for dialog
|
||||
const dialog = page.locator('[role="dialog"]');
|
||||
if (await dialog.isVisible()) {
|
||||
console.log('Audio selection dialog opened');
|
||||
await page.screenshot({ path: 'test-results/audio-selection-dialog.png' });
|
||||
|
||||
// Select the first audio result
|
||||
const selectButtons = dialog.getByRole('button', { name: /^select$/i });
|
||||
const selectCount = await selectButtons.count();
|
||||
console.log(`Found ${selectCount} audio options`);
|
||||
|
||||
if (selectCount > 0) {
|
||||
console.log('Selecting first audio option...');
|
||||
// Use JavaScript click to bypass Playwright's viewport restrictions
|
||||
// This is needed because the dialog is in a portal with nested scrolling
|
||||
const firstButton = selectButtons.first();
|
||||
await firstButton.evaluate((btn: HTMLButtonElement) => btn.click());
|
||||
|
||||
// Wait for dialog to close - selection can take a while (audio download)
|
||||
// The backend may timeout, so we handle that gracefully
|
||||
const dialogClosed = await dialog.waitFor({ state: 'hidden', timeout: 120000 }).then(() => true).catch(() => false);
|
||||
|
||||
if (!dialogClosed) {
|
||||
console.log('Dialog still open - selection may have failed or is still processing');
|
||||
// Close dialog manually by clicking outside or pressing escape
|
||||
await page.keyboard.press('Escape');
|
||||
await page.waitForTimeout(1000);
|
||||
}
|
||||
|
||||
await page.screenshot({ path: 'test-results/after-audio-selection.png' });
|
||||
|
||||
// Verify the job status changed
|
||||
await page.click('button:has-text("Refresh")');
|
||||
await page.waitForTimeout(2000);
|
||||
|
||||
console.log('Audio selection flow completed!');
|
||||
} else {
|
||||
console.log('No audio options found in dialog');
|
||||
await page.screenshot({ path: 'test-results/empty-audio-dialog.png' });
|
||||
}
|
||||
} else {
|
||||
console.log('Dialog did not open');
|
||||
}
|
||||
} else {
|
||||
console.log('Select Audio button not visible');
|
||||
await page.screenshot({ path: 'test-results/no-select-button.png' });
|
||||
}
|
||||
} else {
|
||||
console.log('No job awaiting audio selection found');
|
||||
await page.screenshot({ path: 'test-results/no-awaiting-job.png' });
|
||||
}
|
||||
|
||||
console.log('Audio search/selection test completed');
|
||||
});
|
||||
|
||||
test.skip('complete karaoke generation with auto mode', async ({ page }) => {
|
||||
// This test uses auto mode to go through the full flow
|
||||
// Skip for now - enable once basic flow works
|
||||
test.setTimeout(600000); // 10 minutes
|
||||
|
||||
await page.goto('/?auto=true');
|
||||
|
||||
// Verify auto mode is enabled
|
||||
await expect(page.locator('text=Non-Interactive Mode Active')).toBeVisible();
|
||||
|
||||
// Submit a search
|
||||
await page.getByRole('tab', { name: /search/i }).click();
|
||||
await page.getByLabel('Artist').fill('Rick Astley');
|
||||
await page.getByLabel('Title').fill('Never Gonna Give You Up');
|
||||
await page.getByRole('button', { name: /search.*create/i }).click();
|
||||
|
||||
// With auto mode, the job should progress automatically through:
|
||||
// 1. Audio search -> auto-selects first result
|
||||
// 2. Lyrics review -> auto-accepts
|
||||
// 3. Instrumental selection -> auto-selects clean
|
||||
|
||||
// Wait for completion (or timeout)
|
||||
try {
|
||||
await waitForJobStatus(page, ['Complete'], 540000); // 9 minutes
|
||||
console.log('Job completed successfully!');
|
||||
} catch (error) {
|
||||
console.log('Job did not complete:', error);
|
||||
await page.screenshot({ path: 'test-results/auto-mode-final-state.png' });
|
||||
throw error;
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('Job States and Interactions', () => {
|
||||
test.beforeEach(async ({ page }, testInfo) => {
|
||||
await authenticatePage(page);
|
||||
setupNetworkLogging(page, testInfo);
|
||||
setupConsoleLogging(page);
|
||||
});
|
||||
|
||||
test('completed job shows download links', async ({ page }) => {
|
||||
if (!ACCESS_TOKEN) {
|
||||
test.skip(true, 'KARAOKE_ACCESS_TOKEN not set');
|
||||
return;
|
||||
}
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForTimeout(2000);
|
||||
|
||||
// Find a completed job
|
||||
const completedJob = page.locator('[class*="rounded-lg"][class*="border"]').filter({
|
||||
hasText: /complete/i
|
||||
}).first();
|
||||
|
||||
if (await completedJob.isVisible()) {
|
||||
console.log('Found completed job');
|
||||
await completedJob.click();
|
||||
await page.waitForTimeout(2000);
|
||||
|
||||
// Look for download links
|
||||
const downloadSection = page.locator('text=Downloads').first();
|
||||
const hasDownloads = await downloadSection.isVisible().catch(() => false);
|
||||
|
||||
if (hasDownloads) {
|
||||
console.log('Download links visible');
|
||||
// Check for video download buttons
|
||||
const videoLink = page.locator('a:has-text("720p Video"), a:has-text("4K Video")').first();
|
||||
if (await videoLink.isVisible()) {
|
||||
console.log('Video download link found');
|
||||
}
|
||||
} else {
|
||||
console.log('No download section visible (may still be loading)');
|
||||
}
|
||||
|
||||
await page.screenshot({ path: 'test-results/completed-job.png' });
|
||||
} else {
|
||||
console.log('No completed jobs found');
|
||||
}
|
||||
});
|
||||
|
||||
test('instrumental selection dialog opens and shows options', async ({ page }) => {
|
||||
if (!ACCESS_TOKEN) {
|
||||
test.skip(true, 'KARAOKE_ACCESS_TOKEN not set');
|
||||
return;
|
||||
}
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForTimeout(2000);
|
||||
|
||||
// Find a job awaiting instrumental selection
|
||||
const instrumentalJob = page.locator('[class*="rounded-lg"][class*="border"]').filter({
|
||||
hasText: /select instrumental/i
|
||||
}).first();
|
||||
|
||||
if (await instrumentalJob.isVisible()) {
|
||||
console.log('Found job awaiting instrumental selection');
|
||||
await instrumentalJob.click();
|
||||
await page.waitForTimeout(1000);
|
||||
|
||||
// Click the Select Instrumental button
|
||||
const selectBtn = page.getByRole('button', { name: /select instrumental/i });
|
||||
if (await selectBtn.isVisible()) {
|
||||
await selectBtn.click();
|
||||
await page.waitForTimeout(2000);
|
||||
|
||||
// Check dialog opened
|
||||
const dialog = page.locator('[role="dialog"]');
|
||||
if (await dialog.isVisible()) {
|
||||
console.log('Instrumental selection dialog opened');
|
||||
|
||||
// Look for options
|
||||
const options = dialog.locator('text=Clean, text=with backing').first();
|
||||
const hasOptions = await dialog.getByRole('button', { name: /select/i }).count();
|
||||
console.log(`Found ${hasOptions} instrumental options`);
|
||||
|
||||
await page.screenshot({ path: 'test-results/instrumental-dialog.png' });
|
||||
|
||||
// Close dialog
|
||||
await page.keyboard.press('Escape');
|
||||
}
|
||||
}
|
||||
} else {
|
||||
console.log('No jobs awaiting instrumental selection');
|
||||
}
|
||||
});
|
||||
|
||||
test('job card expands to show details', async ({ page }) => {
|
||||
if (!ACCESS_TOKEN) {
|
||||
test.skip(true, 'KARAOKE_ACCESS_TOKEN not set');
|
||||
return;
|
||||
}
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForTimeout(2000);
|
||||
|
||||
// Find job cards by looking for elements with status badges (unique to job cards)
|
||||
// Job cards have status like "Complete", "Failed", "Select Audio", etc.
|
||||
const statusBadges = ['Complete', 'Failed', 'Select Audio', 'Downloading', 'Awaiting Review', 'Select Instrumental'];
|
||||
let jobCard = null;
|
||||
|
||||
for (const status of statusBadges) {
|
||||
const card = page.locator(`[class*="rounded-lg"][class*="border"]:has-text("${status}")`).first();
|
||||
if (await card.isVisible().catch(() => false)) {
|
||||
jobCard = card;
|
||||
console.log(`Found job with status: ${status}`);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (jobCard) {
|
||||
console.log('Clicking on job card...');
|
||||
await jobCard.click();
|
||||
await page.waitForTimeout(1000);
|
||||
|
||||
// Check that job details are visible - look for Job ID text
|
||||
const jobIdText = page.locator('text=/Job ID:/i').first();
|
||||
const isExpanded = await jobIdText.isVisible().catch(() => false);
|
||||
|
||||
if (isExpanded) {
|
||||
console.log('Job card expanded successfully');
|
||||
|
||||
// Check for actions section
|
||||
const viewLogsBtn = page.getByRole('button', { name: /logs/i }).first();
|
||||
const hasLogsBtn = await viewLogsBtn.isVisible().catch(() => false);
|
||||
console.log(`View logs button visible: ${hasLogsBtn}`);
|
||||
} else {
|
||||
console.log('Job card did not expand - may need to debug selector');
|
||||
}
|
||||
|
||||
await page.screenshot({ path: 'test-results/job-details-expanded.png' });
|
||||
} else {
|
||||
console.log('No job cards found with recognizable status');
|
||||
}
|
||||
});
|
||||
|
||||
test('job logs can be viewed', async ({ page }) => {
|
||||
if (!ACCESS_TOKEN) {
|
||||
test.skip(true, 'KARAOKE_ACCESS_TOKEN not set');
|
||||
return;
|
||||
}
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForTimeout(2000);
|
||||
|
||||
// Find and click a job
|
||||
const jobCard = page.locator('[class*="rounded-lg"][class*="border"]').first();
|
||||
|
||||
if (await jobCard.isVisible()) {
|
||||
await jobCard.click();
|
||||
await page.waitForTimeout(500);
|
||||
|
||||
// Click View Logs button
|
||||
const logsBtn = page.getByRole('button', { name: /logs/i }).first();
|
||||
if (await logsBtn.isVisible()) {
|
||||
await logsBtn.click();
|
||||
await page.waitForTimeout(2000);
|
||||
|
||||
// Check that logs appear
|
||||
const logsSection = page.locator('[class*="font-mono"]').first();
|
||||
const hasLogs = await logsSection.isVisible().catch(() => false);
|
||||
console.log(`Logs section visible: ${hasLogs}`);
|
||||
|
||||
await page.screenshot({ path: 'test-results/job-logs.png' });
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('API Health', () => {
|
||||
test('backend health check', async ({ page }) => {
|
||||
// Direct API call through proxy
|
||||
const response = await page.request.get('/api/health');
|
||||
expect(response.ok()).toBeTruthy();
|
||||
|
||||
const data = await response.json();
|
||||
console.log('Health check response:', data);
|
||||
expect(data.status).toBe('healthy');
|
||||
});
|
||||
|
||||
test('jobs list endpoint (authenticated)', async ({ page }) => {
|
||||
// Skip if no auth token
|
||||
if (!ACCESS_TOKEN) {
|
||||
test.skip(true, 'KARAOKE_ACCESS_TOKEN not set');
|
||||
return;
|
||||
}
|
||||
|
||||
const response = await page.request.get('/api/jobs?limit=5', {
|
||||
headers: {
|
||||
'Authorization': `Bearer ${ACCESS_TOKEN}`,
|
||||
},
|
||||
});
|
||||
expect(response.ok()).toBeTruthy();
|
||||
|
||||
const jobs = await response.json();
|
||||
console.log(`Found ${jobs.length} jobs`);
|
||||
});
|
||||
});
|
||||
@@ -1,162 +0,0 @@
|
||||
import { test, expect, Page } from '@playwright/test';
|
||||
|
||||
/**
|
||||
* Mobile Responsiveness E2E Tests
|
||||
*
|
||||
* Tests the entire user journey on mobile devices to ensure:
|
||||
* 1. All content is visible and accessible
|
||||
* 2. No horizontal scrolling occurs
|
||||
* 3. Touch targets are appropriately sized
|
||||
* 4. Text is readable without zooming
|
||||
*/
|
||||
|
||||
// Common mobile viewport sizes
|
||||
const MOBILE_VIEWPORTS = {
|
||||
'iPhone SE': { width: 375, height: 667 },
|
||||
'iPhone 14': { width: 390, height: 844 },
|
||||
'Pixel 7': { width: 412, height: 915 },
|
||||
};
|
||||
|
||||
// Helper to set auth token
|
||||
async function setAuthToken(page: Page) {
|
||||
const token = process.env.KARAOKE_ACCESS_TOKEN;
|
||||
if (token) {
|
||||
await page.evaluate((t) => {
|
||||
localStorage.setItem('karaoke_access_token', t);
|
||||
}, token);
|
||||
}
|
||||
}
|
||||
|
||||
// Helper to check no horizontal overflow
|
||||
async function hasNoHorizontalOverflow(page: Page): Promise<boolean> {
|
||||
return await page.evaluate(() => {
|
||||
const docWidth = document.documentElement.scrollWidth;
|
||||
const viewportWidth = window.innerWidth;
|
||||
return docWidth <= viewportWidth + 2;
|
||||
});
|
||||
}
|
||||
|
||||
test.describe('Mobile Responsiveness', () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
await setAuthToken(page);
|
||||
});
|
||||
|
||||
for (const [deviceName, viewport] of Object.entries(MOBILE_VIEWPORTS)) {
|
||||
test.describe(`${deviceName} (${viewport.width}x${viewport.height})`, () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
await page.setViewportSize(viewport);
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('domcontentloaded');
|
||||
await page.waitForTimeout(1000);
|
||||
});
|
||||
|
||||
test('page loads without horizontal scroll', async ({ page }) => {
|
||||
const noOverflow = await hasNoHorizontalOverflow(page);
|
||||
expect(noOverflow).toBe(true);
|
||||
});
|
||||
|
||||
test('header is visible and accessible', async ({ page }) => {
|
||||
// Logo should be visible
|
||||
const logo = page.locator('header img, .logo');
|
||||
await expect(logo.first()).toBeVisible();
|
||||
|
||||
// Header title should be visible (may be truncated on mobile)
|
||||
const title = page.locator('h1');
|
||||
await expect(title.first()).toBeVisible();
|
||||
});
|
||||
|
||||
test('form inputs are visible and usable', async ({ page }) => {
|
||||
// Tab buttons should be visible
|
||||
const tabs = page.locator('[role="tablist"] button, .tabs button');
|
||||
if (await tabs.count() > 0) {
|
||||
await expect(tabs.first()).toBeVisible();
|
||||
}
|
||||
|
||||
// Check that Artist/Title inputs exist (after clicking upload tab if needed)
|
||||
const uploadTab = page.locator('button:has-text("Upload")');
|
||||
if (await uploadTab.count() > 0) {
|
||||
await uploadTab.first().click();
|
||||
await page.waitForTimeout(300);
|
||||
}
|
||||
|
||||
// Artist input
|
||||
const artistInput = page.locator('input').first();
|
||||
if (await artistInput.count() > 0) {
|
||||
const box = await artistInput.boundingBox();
|
||||
if (box) {
|
||||
expect(box.width).toBeGreaterThan(100);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
test('buttons have adequate touch target size', async ({ page }) => {
|
||||
const buttons = page.locator('button:visible');
|
||||
const count = await buttons.count();
|
||||
|
||||
let smallButtonCount = 0;
|
||||
for (let i = 0; i < Math.min(count, 10); i++) {
|
||||
const button = buttons.nth(i);
|
||||
const box = await button.boundingBox();
|
||||
if (box && (box.width < 28 || box.height < 28)) {
|
||||
smallButtonCount++;
|
||||
}
|
||||
}
|
||||
|
||||
// Allow some small buttons (icons) but not too many
|
||||
expect(smallButtonCount).toBeLessThan(3);
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
test.describe('Mobile Interactions', () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
await setAuthToken(page);
|
||||
await page.setViewportSize({ width: 375, height: 667 });
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('domcontentloaded');
|
||||
});
|
||||
|
||||
test('can switch between tabs', async ({ page }) => {
|
||||
const urlTab = page.locator('button:has-text("URL")');
|
||||
if (await urlTab.count() > 0) {
|
||||
await urlTab.first().click();
|
||||
await page.waitForTimeout(300);
|
||||
|
||||
// URL input should now be visible
|
||||
const urlInput = page.locator('input[type="url"], input[placeholder*="youtube"], input[placeholder*="URL"]');
|
||||
if (await urlInput.count() > 0) {
|
||||
await expect(urlInput.first()).toBeVisible();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
test('can type in input fields', async ({ page }) => {
|
||||
// Find a text input (not file input)
|
||||
const textInput = page.locator('input[type="text"], input[placeholder*="Artist"], input[placeholder*="title"]');
|
||||
if (await textInput.count() > 0) {
|
||||
await textInput.first().focus();
|
||||
await textInput.first().fill('Test Input');
|
||||
await expect(textInput.first()).toHaveValue('Test Input');
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('Accessibility', () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
await setAuthToken(page);
|
||||
await page.setViewportSize({ width: 375, height: 667 });
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('domcontentloaded');
|
||||
});
|
||||
|
||||
test('has proper viewport meta tag', async ({ page }) => {
|
||||
const viewportMeta = await page.evaluate(() => {
|
||||
const meta = document.querySelector('meta[name="viewport"]');
|
||||
return meta?.getAttribute('content') || '';
|
||||
});
|
||||
|
||||
expect(viewportMeta).toContain('width=device-width');
|
||||
expect(viewportMeta).toContain('initial-scale=1');
|
||||
});
|
||||
});
|
||||
@@ -1,318 +0,0 @@
|
||||
import { test, expect, Page } from '@playwright/test';
|
||||
|
||||
/**
|
||||
* Production E2E test - Single complete karaoke generation flow.
|
||||
*
|
||||
* This test runs against gen.nomadkaraoke.com and creates a REAL karaoke video.
|
||||
*
|
||||
* Run with:
|
||||
* npx playwright test --config=playwright.production.config.ts --headed
|
||||
*
|
||||
* The test follows the complete user journey:
|
||||
* 1. Select a theme
|
||||
* 2. Enter artist/title and search
|
||||
* 3. Select an audio source
|
||||
* 4. Wait for processing
|
||||
* 5. Complete lyrics review
|
||||
* 6. Select instrumental
|
||||
* 7. Wait for final render
|
||||
* 8. Verify completion
|
||||
*/
|
||||
|
||||
const ACCESS_TOKEN = process.env.KARAOKE_ACCESS_TOKEN;
|
||||
const PROD_URL = 'https://gen.nomadkaraoke.com';
|
||||
const API_URL = 'https://api.nomadkaraoke.com';
|
||||
|
||||
// Real song - uses cached flacfetch results
|
||||
const TEST_ARTIST = 'piri';
|
||||
const TEST_TITLE = 'dog';
|
||||
|
||||
async function authenticatePage(page: Page) {
|
||||
if (!ACCESS_TOKEN) {
|
||||
throw new Error('KARAOKE_ACCESS_TOKEN environment variable is required');
|
||||
}
|
||||
await page.addInitScript((token) => {
|
||||
localStorage.setItem('karaoke_access_token', token);
|
||||
}, ACCESS_TOKEN);
|
||||
}
|
||||
|
||||
test.describe('Production E2E', () => {
|
||||
test('Complete karaoke generation flow', async ({ page, request }) => {
|
||||
test.setTimeout(900000); // 15 minutes
|
||||
|
||||
await authenticatePage(page);
|
||||
|
||||
// ========== STEP 1: Go to homepage ==========
|
||||
console.log('\n=== STEP 1: Loading homepage ===');
|
||||
await page.goto(PROD_URL);
|
||||
await page.waitForLoadState('networkidle');
|
||||
await expect(page.locator('h1')).toContainText('Karaoke Generator');
|
||||
console.log('Homepage loaded');
|
||||
|
||||
// ========== STEP 2: Go to Search tab and select theme ==========
|
||||
console.log('\n=== STEP 2: Search tab + theme selection ===');
|
||||
await page.getByRole('tab', { name: /search/i }).click();
|
||||
await page.waitForTimeout(1000);
|
||||
|
||||
// Select theme (first one in dropdown)
|
||||
const themeSelect = page.locator('button[role="combobox"]').first();
|
||||
if (await themeSelect.isVisible({ timeout: 3000 })) {
|
||||
const currentTheme = await themeSelect.textContent();
|
||||
console.log(`Current theme: ${currentTheme}`);
|
||||
|
||||
if (currentTheme?.toLowerCase().includes('select')) {
|
||||
await themeSelect.click();
|
||||
await page.waitForTimeout(500);
|
||||
await page.locator('[role="option"]').first().click();
|
||||
await page.waitForTimeout(500);
|
||||
console.log('Selected first theme');
|
||||
}
|
||||
}
|
||||
|
||||
// ========== STEP 3: Fill in artist/title and search ==========
|
||||
console.log('\n=== STEP 3: Filling form and searching ===');
|
||||
await page.getByLabel('Artist').fill(TEST_ARTIST);
|
||||
await page.getByLabel('Title').fill(TEST_TITLE);
|
||||
console.log(`Searching for: ${TEST_ARTIST} - ${TEST_TITLE}`);
|
||||
|
||||
await page.screenshot({ path: 'test-results/step3-before-search.png' });
|
||||
|
||||
await page.getByRole('button', { name: /search.*create/i }).click();
|
||||
|
||||
// Wait for search to complete (loading spinner -> results)
|
||||
console.log('Waiting for search results...');
|
||||
await page.waitForTimeout(10000);
|
||||
await page.screenshot({ path: 'test-results/step3-after-search.png' });
|
||||
|
||||
// ========== STEP 4: Select audio source ==========
|
||||
console.log('\n=== STEP 4: Selecting audio source ===');
|
||||
|
||||
// The search creates a job and shows audio options
|
||||
// Look for "Select Audio" button on the job card
|
||||
const selectAudioBtn = page.getByRole('button', { name: /select audio/i }).first();
|
||||
|
||||
if (await selectAudioBtn.isVisible({ timeout: 30000 })) {
|
||||
console.log('Found "Select Audio" button, clicking...');
|
||||
await selectAudioBtn.click();
|
||||
await page.waitForTimeout(2000);
|
||||
|
||||
// A dialog should open with audio options
|
||||
const dialog = page.locator('[role="dialog"]');
|
||||
if (await dialog.isVisible({ timeout: 5000 })) {
|
||||
await page.screenshot({ path: 'test-results/step4-audio-dialog.png' });
|
||||
|
||||
// Find all "Select" buttons in the dialog
|
||||
const selectButtons = dialog.getByRole('button', { name: /^select$/i });
|
||||
const count = await selectButtons.count();
|
||||
console.log(`Found ${count} audio options`);
|
||||
|
||||
if (count > 0) {
|
||||
console.log('Clicking first audio option...');
|
||||
await selectButtons.first().click();
|
||||
|
||||
// Wait for dialog to close and download to start
|
||||
await page.waitForTimeout(5000);
|
||||
console.log('Audio selected, download should start');
|
||||
} else {
|
||||
console.log('ERROR: No Select buttons found in dialog');
|
||||
const dialogContent = await dialog.textContent();
|
||||
console.log('Dialog content:', dialogContent?.substring(0, 500));
|
||||
}
|
||||
} else {
|
||||
console.log('ERROR: Dialog did not open');
|
||||
}
|
||||
} else {
|
||||
console.log('ERROR: "Select Audio" button not found');
|
||||
// Maybe job auto-started? Check job status
|
||||
const pageContent = await page.locator('body').textContent();
|
||||
console.log('Page contains:', pageContent?.substring(0, 500));
|
||||
}
|
||||
|
||||
await page.screenshot({ path: 'test-results/step4-after-audio-select.png' });
|
||||
|
||||
// ========== STEP 5: Wait for processing and lyrics review ==========
|
||||
console.log('\n=== STEP 5: Waiting for job to reach review stage ===');
|
||||
|
||||
// Poll the jobs API to check status
|
||||
let jobId: string | null = null;
|
||||
let jobStatus: string | null = null;
|
||||
|
||||
for (let i = 0; i < 60; i++) { // 5 minutes of polling
|
||||
const response = await request.get(`${API_URL}/api/jobs`, {
|
||||
headers: { 'Authorization': `Bearer ${ACCESS_TOKEN}` },
|
||||
timeout: 120000 // 2 minute timeout for API calls
|
||||
});
|
||||
|
||||
if (response.ok()) {
|
||||
const data = await response.json();
|
||||
const jobs = data.jobs || data;
|
||||
|
||||
// Find our job
|
||||
const ourJob = Array.isArray(jobs)
|
||||
? jobs.find((j: any) =>
|
||||
j.artist?.toLowerCase() === TEST_ARTIST.toLowerCase() &&
|
||||
j.title?.toLowerCase() === TEST_TITLE.toLowerCase())
|
||||
: null;
|
||||
|
||||
if (ourJob) {
|
||||
jobId = ourJob.job_id;
|
||||
jobStatus = ourJob.status;
|
||||
console.log(`Job ${jobId}: ${jobStatus}`);
|
||||
|
||||
// Check if we've reached a milestone
|
||||
if (jobStatus === 'in_review') {
|
||||
console.log('Job reached lyrics review stage!');
|
||||
break;
|
||||
} else if (jobStatus === 'awaiting_instrumental_selection') {
|
||||
console.log('Job skipped review, at instrumental selection');
|
||||
break;
|
||||
} else if (jobStatus === 'completed') {
|
||||
console.log('Job already completed!');
|
||||
break;
|
||||
} else if (jobStatus === 'failed') {
|
||||
throw new Error(`Job failed: ${ourJob.error_message || 'Unknown error'}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Refresh the page periodically
|
||||
if (i % 6 === 0) {
|
||||
await page.getByRole('button', { name: /refresh/i }).click().catch(() => {});
|
||||
}
|
||||
|
||||
await page.waitForTimeout(5000);
|
||||
}
|
||||
|
||||
if (!jobId) {
|
||||
throw new Error('Could not find our job after 5 minutes');
|
||||
}
|
||||
|
||||
await page.screenshot({ path: 'test-results/step5-job-status.png' });
|
||||
|
||||
// ========== STEP 6: Complete lyrics review (if needed) ==========
|
||||
if (jobStatus === 'in_review') {
|
||||
console.log('\n=== STEP 6: Completing lyrics review ===');
|
||||
|
||||
await page.reload();
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
const reviewBtn = page.getByRole('button', { name: /review.*lyrics/i }).first();
|
||||
|
||||
if (await reviewBtn.isVisible({ timeout: 10000 })) {
|
||||
console.log('Opening lyrics review...');
|
||||
|
||||
// This opens a new tab
|
||||
const [popup] = await Promise.all([
|
||||
page.context().waitForEvent('page', { timeout: 15000 }).catch(() => null),
|
||||
reviewBtn.click()
|
||||
]);
|
||||
|
||||
if (popup) {
|
||||
await popup.waitForLoadState('networkidle');
|
||||
await popup.waitForTimeout(5000);
|
||||
await popup.screenshot({ path: 'test-results/step6-review-ui.png', fullPage: true });
|
||||
|
||||
// Click Preview Video
|
||||
const previewBtn = popup.getByRole('button', { name: /preview.*video/i }).first();
|
||||
if (await previewBtn.isVisible({ timeout: 5000 })) {
|
||||
console.log('Clicking Preview Video...');
|
||||
await previewBtn.click();
|
||||
await popup.waitForTimeout(30000); // Wait for preview to generate
|
||||
|
||||
// Click Complete Review
|
||||
const completeBtn = popup.getByRole('button', { name: /complete.*review/i }).first();
|
||||
if (await completeBtn.isVisible({ timeout: 60000 })) {
|
||||
console.log('Clicking Complete Review...');
|
||||
await completeBtn.click();
|
||||
await popup.waitForTimeout(3000);
|
||||
}
|
||||
}
|
||||
|
||||
if (!popup.isClosed()) {
|
||||
await popup.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ========== STEP 7: Handle instrumental selection (if needed) ==========
|
||||
console.log('\n=== STEP 7: Checking for instrumental selection ===');
|
||||
|
||||
// Wait and check status
|
||||
for (let i = 0; i < 12; i++) { // 1 minute
|
||||
const response = await request.get(`${API_URL}/api/jobs/${jobId}`, {
|
||||
headers: { 'Authorization': `Bearer ${ACCESS_TOKEN}` },
|
||||
timeout: 120000
|
||||
});
|
||||
|
||||
if (response.ok()) {
|
||||
const job = await response.json();
|
||||
console.log(`Job status: ${job.status}`);
|
||||
|
||||
if (job.status === 'awaiting_instrumental_selection') {
|
||||
console.log('Handling instrumental selection...');
|
||||
|
||||
await page.reload();
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
const instrumentalBtn = page.getByRole('button', { name: /select.*instrumental/i }).first();
|
||||
if (await instrumentalBtn.isVisible({ timeout: 10000 })) {
|
||||
await instrumentalBtn.click();
|
||||
await page.waitForTimeout(2000);
|
||||
|
||||
const dialog = page.locator('[role="dialog"]');
|
||||
if (await dialog.isVisible()) {
|
||||
await page.screenshot({ path: 'test-results/step7-instrumental.png' });
|
||||
|
||||
// Select clean instrumental
|
||||
const cleanBtn = dialog.getByRole('button').first();
|
||||
await cleanBtn.click();
|
||||
await page.waitForTimeout(3000);
|
||||
console.log('Selected instrumental');
|
||||
}
|
||||
}
|
||||
break;
|
||||
} else if (job.status === 'completed' || job.status === 'processing') {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
await page.waitForTimeout(5000);
|
||||
}
|
||||
|
||||
// ========== STEP 8: Wait for completion ==========
|
||||
console.log('\n=== STEP 8: Waiting for completion ===');
|
||||
|
||||
for (let i = 0; i < 60; i++) { // 5 minutes
|
||||
const response = await request.get(`${API_URL}/api/jobs/${jobId}`, {
|
||||
headers: { 'Authorization': `Bearer ${ACCESS_TOKEN}` },
|
||||
timeout: 120000
|
||||
});
|
||||
|
||||
if (response.ok()) {
|
||||
const job = await response.json();
|
||||
console.log(`Job status: ${job.status}`);
|
||||
|
||||
if (job.status === 'completed') {
|
||||
console.log('\n🎉 JOB COMPLETED SUCCESSFULLY!');
|
||||
console.log(`Theme ID: ${job.theme_id}`);
|
||||
console.log(`YouTube URL: ${job.youtube_url || 'N/A'}`);
|
||||
console.log(`Dropbox URL: ${job.dropbox_url || 'N/A'}`);
|
||||
|
||||
// Final verification
|
||||
expect(job.theme_id).toBeTruthy();
|
||||
|
||||
await page.reload();
|
||||
await page.screenshot({ path: 'test-results/step8-completed.png', fullPage: true });
|
||||
return; // SUCCESS
|
||||
} else if (job.status === 'failed') {
|
||||
throw new Error(`Job failed: ${job.error_message || 'Unknown error'}`);
|
||||
}
|
||||
}
|
||||
|
||||
await page.waitForTimeout(5000);
|
||||
}
|
||||
|
||||
throw new Error('Job did not complete within timeout');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,616 @@
|
||||
import { test, expect, Page, APIRequestContext } from '@playwright/test';
|
||||
import { createEmailHelper, isEmailTestingAvailable } from '../helpers/email-testing';
|
||||
|
||||
/**
|
||||
* Production E2E Test - Full User Journey
|
||||
*
|
||||
* This is the SINGLE comprehensive test that validates the entire user journey
|
||||
* in production. It exercises the complete flow from landing page to completed
|
||||
* karaoke video.
|
||||
*
|
||||
* Run with:
|
||||
* npx playwright test --config=playwright.production.config.ts --headed
|
||||
* npm run test:e2e:prod:headed
|
||||
*
|
||||
* Test Flow:
|
||||
* 1. Landing Page - Verify hero, pricing, FAQ
|
||||
* 2. Beta Enrollment - Create inbox, submit form, verify email
|
||||
* 3. App Authentication - Verify token and credits
|
||||
* 4. Create Karaoke Job - Search for test song
|
||||
* 5. Audio Selection - Select cached audio
|
||||
* 6. Wait for Processing - Poll job status
|
||||
* 7. Lyrics Review - Preview and complete
|
||||
* 8. Instrumental Selection - Select clean instrumental
|
||||
* 9. Wait for Completion - Poll until done
|
||||
* 10. Verify Outputs - Check download URLs
|
||||
*
|
||||
* Environment Variables:
|
||||
* - MAILSLURP_API_KEY: For email testing (required for full flow)
|
||||
* - KARAOKE_ACCESS_TOKEN: Skip enrollment and use existing token
|
||||
*/
|
||||
|
||||
// =============================================================================
|
||||
// CONSTANTS
|
||||
// =============================================================================
|
||||
|
||||
const PROD_URL = 'https://gen.nomadkaraoke.com';
|
||||
const API_URL = 'https://api.nomadkaraoke.com';
|
||||
|
||||
// Test song - uses cached flacfetch results for speed and cost savings
|
||||
const TEST_SONG = {
|
||||
artist: 'piri',
|
||||
title: 'dog',
|
||||
} as const;
|
||||
|
||||
// Timeouts
|
||||
const TIMEOUTS = {
|
||||
action: 30_000, // 30s for UI actions
|
||||
expect: 60_000, // 60s for assertions
|
||||
apiCall: 120_000, // 2min for API calls
|
||||
jobProcessing: 600_000, // 10min for job processing
|
||||
fullTest: 900_000, // 15min for full test
|
||||
} as const;
|
||||
|
||||
// =============================================================================
|
||||
// HELPERS
|
||||
// =============================================================================
|
||||
|
||||
async function authenticatePage(page: Page, token: string): Promise<void> {
|
||||
await page.addInitScript((t) => {
|
||||
localStorage.setItem('karaoke_access_token', t);
|
||||
}, token);
|
||||
}
|
||||
|
||||
async function getAuthToken(): Promise<string | undefined> {
|
||||
return process.env.KARAOKE_ACCESS_TOKEN;
|
||||
}
|
||||
|
||||
async function pollJobStatus(
|
||||
request: APIRequestContext,
|
||||
jobId: string,
|
||||
targetStatuses: string[],
|
||||
token: string,
|
||||
timeoutMs: number = TIMEOUTS.jobProcessing
|
||||
): Promise<{ status: string; job: any }> {
|
||||
const startTime = Date.now();
|
||||
|
||||
while (Date.now() - startTime < timeoutMs) {
|
||||
const response = await request.get(`${API_URL}/api/jobs/${jobId}`, {
|
||||
headers: { Authorization: `Bearer ${token}` },
|
||||
timeout: TIMEOUTS.apiCall,
|
||||
});
|
||||
|
||||
if (response.ok()) {
|
||||
const job = await response.json();
|
||||
console.log(` Job ${jobId}: ${job.status}`);
|
||||
|
||||
if (targetStatuses.includes(job.status)) {
|
||||
return { status: job.status, job };
|
||||
}
|
||||
|
||||
if (job.status === 'failed') {
|
||||
throw new Error(`Job failed: ${job.error_message || 'Unknown error'}`);
|
||||
}
|
||||
}
|
||||
|
||||
await new Promise((resolve) => setTimeout(resolve, 5000));
|
||||
}
|
||||
|
||||
throw new Error(`Timed out waiting for status: ${targetStatuses.join(' or ')}`);
|
||||
}
|
||||
|
||||
async function findJobByArtistTitle(
|
||||
request: APIRequestContext,
|
||||
artist: string,
|
||||
title: string,
|
||||
token: string
|
||||
): Promise<string | null> {
|
||||
const response = await request.get(`${API_URL}/api/jobs`, {
|
||||
headers: { Authorization: `Bearer ${token}` },
|
||||
timeout: TIMEOUTS.apiCall,
|
||||
});
|
||||
|
||||
if (response.ok()) {
|
||||
const data = await response.json();
|
||||
const jobs = data.jobs || data;
|
||||
|
||||
const job = Array.isArray(jobs)
|
||||
? jobs.find(
|
||||
(j: any) =>
|
||||
j.artist?.toLowerCase() === artist.toLowerCase() &&
|
||||
j.title?.toLowerCase() === title.toLowerCase()
|
||||
)
|
||||
: null;
|
||||
|
||||
return job?.job_id || null;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
// =============================================================================
|
||||
// TESTS
|
||||
// =============================================================================
|
||||
|
||||
test.describe('Production E2E - Full User Journey', () => {
|
||||
test('Complete flow: Landing -> Beta Enrollment -> Karaoke Generation', async ({
|
||||
page,
|
||||
request,
|
||||
}) => {
|
||||
test.setTimeout(TIMEOUTS.fullTest);
|
||||
|
||||
let accessToken = await getAuthToken();
|
||||
let jobId: string | null = null;
|
||||
|
||||
// =========================================================================
|
||||
// STEP 1: Landing Page
|
||||
// =========================================================================
|
||||
console.log('\n========================================');
|
||||
console.log('STEP 1: Landing Page');
|
||||
console.log('========================================');
|
||||
|
||||
await page.goto(PROD_URL);
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Verify hero section
|
||||
await expect(page.locator('h1')).toContainText('Karaoke Video', { timeout: TIMEOUTS.expect });
|
||||
console.log(' Hero section visible');
|
||||
|
||||
// Verify pricing section
|
||||
await expect(page.locator('#pricing')).toBeVisible({ timeout: TIMEOUTS.expect });
|
||||
console.log(' Pricing section visible');
|
||||
|
||||
// Verify FAQ section
|
||||
await expect(page.getByText('Questions?')).toBeVisible({ timeout: TIMEOUTS.expect });
|
||||
console.log(' FAQ section visible');
|
||||
|
||||
await page.screenshot({ path: 'test-results/01-landing-page.png', fullPage: true });
|
||||
console.log('STEP 1 COMPLETE: Landing page loads correctly');
|
||||
|
||||
// =========================================================================
|
||||
// STEP 2: Beta Enrollment (or use existing token)
|
||||
// =========================================================================
|
||||
console.log('\n========================================');
|
||||
console.log('STEP 2: Beta Enrollment / Authentication');
|
||||
console.log('========================================');
|
||||
|
||||
if (accessToken) {
|
||||
console.log(' Using existing KARAOKE_ACCESS_TOKEN');
|
||||
await authenticatePage(page, accessToken);
|
||||
|
||||
// Navigate to app and verify authentication
|
||||
await page.goto(`${PROD_URL}/app`);
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Should see the app, not be redirected to landing
|
||||
await expect(page.locator('h1')).toContainText('Karaoke Generator', {
|
||||
timeout: TIMEOUTS.expect,
|
||||
});
|
||||
console.log(' Authenticated successfully with existing token');
|
||||
} else if (isEmailTestingAvailable()) {
|
||||
console.log(' Starting beta enrollment with MailSlurp');
|
||||
const emailHelper = await createEmailHelper();
|
||||
|
||||
if (!emailHelper.isAvailable) {
|
||||
throw new Error('MailSlurp not available');
|
||||
}
|
||||
|
||||
// Create test inbox
|
||||
const inbox = await emailHelper.createInbox();
|
||||
console.log(` Test email: ${inbox.emailAddress}`);
|
||||
|
||||
try {
|
||||
// Open beta form
|
||||
await page.getByRole('button', { name: /join beta program/i }).click();
|
||||
await expect(page.locator('#beta-email')).toBeVisible({ timeout: TIMEOUTS.expect });
|
||||
|
||||
// Fill beta form
|
||||
await page.locator('#beta-email').fill(inbox.emailAddress!);
|
||||
await page.locator('textarea').fill(
|
||||
'I want to create karaoke for my favorite indie songs! Testing the beta program.'
|
||||
);
|
||||
await page.locator('input[type="checkbox"]').check();
|
||||
|
||||
await page.screenshot({ path: 'test-results/02a-beta-form-filled.png' });
|
||||
|
||||
// Submit form
|
||||
await page.getByRole('button', { name: /get my free credit/i }).click();
|
||||
|
||||
// Wait for success and redirect
|
||||
await expect(
|
||||
page.getByText(/welcome to the beta|redirecting to the app/i)
|
||||
).toBeVisible({ timeout: 15000 });
|
||||
|
||||
await page.waitForURL(/\/app/, { timeout: 10000 });
|
||||
console.log(' Redirected to /app');
|
||||
|
||||
// Get the token from localStorage
|
||||
accessToken = await page.evaluate(() =>
|
||||
localStorage.getItem('karaoke_access_token')
|
||||
) ?? undefined;
|
||||
|
||||
if (!accessToken) {
|
||||
throw new Error('No access token received after beta enrollment');
|
||||
}
|
||||
console.log(' Session token received');
|
||||
|
||||
// Verify welcome email
|
||||
console.log(' Waiting for welcome email...');
|
||||
const email = await emailHelper.waitForEmail(inbox.id!, 60000);
|
||||
console.log(` Email received: "${email.subject}"`);
|
||||
expect(email.subject).toMatch(/welcome.*beta|beta.*tester/i);
|
||||
|
||||
await page.screenshot({ path: 'test-results/02b-app-after-enrollment.png' });
|
||||
} finally {
|
||||
if (inbox.id) {
|
||||
await emailHelper.deleteInbox(inbox.id);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
throw new Error(
|
||||
'No KARAOKE_ACCESS_TOKEN and no MAILSLURP_API_KEY - cannot authenticate'
|
||||
);
|
||||
}
|
||||
|
||||
console.log('STEP 2 COMPLETE: Authentication successful');
|
||||
|
||||
// =========================================================================
|
||||
// STEP 3: Verify Credits
|
||||
// =========================================================================
|
||||
console.log('\n========================================');
|
||||
console.log('STEP 3: Verify Credits');
|
||||
console.log('========================================');
|
||||
|
||||
// Check user credits via API
|
||||
const userResponse = await request.get(`${API_URL}/api/users/me`, {
|
||||
headers: { Authorization: `Bearer ${accessToken}` },
|
||||
timeout: TIMEOUTS.apiCall,
|
||||
});
|
||||
|
||||
if (userResponse.ok()) {
|
||||
const userData = await userResponse.json();
|
||||
console.log(` Credits: ${userData.credits}`);
|
||||
console.log(` Email: ${userData.email}`);
|
||||
|
||||
if (userData.credits < 1) {
|
||||
console.log(' WARNING: No credits available, test may fail');
|
||||
}
|
||||
}
|
||||
|
||||
console.log('STEP 3 COMPLETE: User has credits');
|
||||
|
||||
// =========================================================================
|
||||
// STEP 4: Create Karaoke Job
|
||||
// =========================================================================
|
||||
console.log('\n========================================');
|
||||
console.log('STEP 4: Create Karaoke Job');
|
||||
console.log('========================================');
|
||||
|
||||
// Make sure we're on the app page
|
||||
if (!page.url().includes('/app')) {
|
||||
await page.goto(`${PROD_URL}/app`);
|
||||
await page.waitForLoadState('networkidle');
|
||||
}
|
||||
|
||||
// Navigate to Search tab
|
||||
await page.getByRole('tab', { name: /search/i }).click();
|
||||
await page.waitForTimeout(1000);
|
||||
|
||||
// Select a theme if required
|
||||
const themeSelect = page.locator('button[role="combobox"]').first();
|
||||
if (await themeSelect.isVisible({ timeout: 3000 }).catch(() => false)) {
|
||||
const currentTheme = await themeSelect.textContent();
|
||||
if (currentTheme?.toLowerCase().includes('select')) {
|
||||
await themeSelect.click();
|
||||
await page.waitForTimeout(500);
|
||||
await page.locator('[role="option"]').first().click();
|
||||
await page.waitForTimeout(500);
|
||||
console.log(' Selected first theme');
|
||||
}
|
||||
}
|
||||
|
||||
// Fill artist and title
|
||||
await page.getByLabel('Artist').fill(TEST_SONG.artist);
|
||||
await page.getByLabel('Title').fill(TEST_SONG.title);
|
||||
console.log(` Searching for: ${TEST_SONG.artist} - ${TEST_SONG.title}`);
|
||||
|
||||
await page.screenshot({ path: 'test-results/04a-search-form.png' });
|
||||
|
||||
// Submit search
|
||||
await page.getByRole('button', { name: /search.*create/i }).click();
|
||||
|
||||
// Wait for job to be created
|
||||
console.log(' Waiting for search results...');
|
||||
await page.waitForTimeout(10000);
|
||||
|
||||
// Find our job
|
||||
jobId = await findJobByArtistTitle(
|
||||
request,
|
||||
TEST_SONG.artist,
|
||||
TEST_SONG.title,
|
||||
accessToken!
|
||||
);
|
||||
|
||||
if (!jobId) {
|
||||
throw new Error('Job not created after search');
|
||||
}
|
||||
console.log(` Job created: ${jobId}`);
|
||||
|
||||
await page.screenshot({ path: 'test-results/04b-job-created.png' });
|
||||
console.log('STEP 4 COMPLETE: Job created');
|
||||
|
||||
// =========================================================================
|
||||
// STEP 5: Audio Selection
|
||||
// =========================================================================
|
||||
console.log('\n========================================');
|
||||
console.log('STEP 5: Audio Selection');
|
||||
console.log('========================================');
|
||||
|
||||
// Refresh the page to see updated job state
|
||||
await page.getByRole('button', { name: /refresh/i }).click().catch(() => {});
|
||||
await page.waitForTimeout(3000);
|
||||
|
||||
// Look for Select Audio button
|
||||
const selectAudioBtn = page.getByRole('button', { name: /select audio/i }).first();
|
||||
|
||||
if (await selectAudioBtn.isVisible({ timeout: 30000 }).catch(() => false)) {
|
||||
console.log(' Opening audio selection dialog...');
|
||||
await selectAudioBtn.click();
|
||||
await page.waitForTimeout(2000);
|
||||
|
||||
const dialog = page.locator('[role="dialog"]');
|
||||
if (await dialog.isVisible({ timeout: 5000 })) {
|
||||
await page.screenshot({ path: 'test-results/05a-audio-dialog.png' });
|
||||
|
||||
// Find and click first Select button
|
||||
const selectButtons = dialog.getByRole('button', { name: /^select$/i });
|
||||
const count = await selectButtons.count();
|
||||
console.log(` Found ${count} audio options`);
|
||||
|
||||
if (count > 0) {
|
||||
await selectButtons.first().click();
|
||||
console.log(' Audio selected, downloading...');
|
||||
|
||||
// Wait for dialog to close (download can take a while)
|
||||
await dialog.waitFor({ state: 'hidden', timeout: TIMEOUTS.apiCall }).catch(() => {
|
||||
console.log(' Dialog still open - pressing Escape');
|
||||
return page.keyboard.press('Escape');
|
||||
});
|
||||
} else {
|
||||
console.log(' WARNING: No audio options found');
|
||||
}
|
||||
}
|
||||
} else {
|
||||
console.log(' No "Select Audio" button - job may have auto-selected or cached');
|
||||
}
|
||||
|
||||
await page.screenshot({ path: 'test-results/05b-after-audio.png' });
|
||||
console.log('STEP 5 COMPLETE: Audio selection handled');
|
||||
|
||||
// =========================================================================
|
||||
// STEP 6: Wait for Processing (Lyrics)
|
||||
// =========================================================================
|
||||
console.log('\n========================================');
|
||||
console.log('STEP 6: Wait for Processing');
|
||||
console.log('========================================');
|
||||
|
||||
console.log(' Polling job status...');
|
||||
const { status: statusAfterProcessing, job: jobAfterProcessing } = await pollJobStatus(
|
||||
request,
|
||||
jobId,
|
||||
['in_review', 'awaiting_instrumental_selection', 'completed'],
|
||||
accessToken!
|
||||
);
|
||||
|
||||
console.log(`STEP 6 COMPLETE: Job reached ${statusAfterProcessing}`);
|
||||
|
||||
// =========================================================================
|
||||
// STEP 7: Lyrics Review
|
||||
// =========================================================================
|
||||
console.log('\n========================================');
|
||||
console.log('STEP 7: Lyrics Review');
|
||||
console.log('========================================');
|
||||
|
||||
if (statusAfterProcessing === 'in_review') {
|
||||
await page.reload();
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
const reviewBtn = page.getByRole('button', { name: /review.*lyrics/i }).first();
|
||||
|
||||
if (await reviewBtn.isVisible({ timeout: 10000 }).catch(() => false)) {
|
||||
console.log(' Opening lyrics review...');
|
||||
|
||||
// This opens a new tab
|
||||
const [popup] = await Promise.all([
|
||||
page.context().waitForEvent('page', { timeout: 15000 }).catch(() => null),
|
||||
reviewBtn.click(),
|
||||
]);
|
||||
|
||||
if (popup) {
|
||||
await popup.waitForLoadState('networkidle');
|
||||
await popup.waitForTimeout(5000);
|
||||
await popup.screenshot({
|
||||
path: 'test-results/07a-review-ui.png',
|
||||
fullPage: true,
|
||||
});
|
||||
|
||||
// Click Preview Video
|
||||
const previewBtn = popup.getByRole('button', { name: /preview.*video/i }).first();
|
||||
if (await previewBtn.isVisible({ timeout: 5000 }).catch(() => false)) {
|
||||
console.log(' Clicking Preview Video...');
|
||||
await previewBtn.click();
|
||||
await popup.waitForTimeout(30000); // Preview generation
|
||||
|
||||
// Click Complete Review
|
||||
const completeBtn = popup.getByRole('button', { name: /complete.*review/i }).first();
|
||||
if (await completeBtn.isVisible({ timeout: 60000 }).catch(() => false)) {
|
||||
console.log(' Clicking Complete Review...');
|
||||
await completeBtn.click();
|
||||
await popup.waitForTimeout(3000);
|
||||
console.log(' Review completed');
|
||||
}
|
||||
}
|
||||
|
||||
if (!popup.isClosed()) {
|
||||
await popup.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
console.log(` Skipping - job status is ${statusAfterProcessing}`);
|
||||
}
|
||||
|
||||
console.log('STEP 7 COMPLETE: Lyrics review handled');
|
||||
|
||||
// =========================================================================
|
||||
// STEP 8: Instrumental Selection
|
||||
// =========================================================================
|
||||
console.log('\n========================================');
|
||||
console.log('STEP 8: Instrumental Selection');
|
||||
console.log('========================================');
|
||||
|
||||
// Wait for job to reach instrumental selection
|
||||
const { status: statusBeforeInstrumental } = await pollJobStatus(
|
||||
request,
|
||||
jobId,
|
||||
['awaiting_instrumental_selection', 'completed'],
|
||||
accessToken!,
|
||||
120000 // 2 minutes
|
||||
).catch(() => ({ status: 'unknown', job: null }));
|
||||
|
||||
if (statusBeforeInstrumental === 'awaiting_instrumental_selection') {
|
||||
await page.reload();
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
const instrumentalBtn = page.getByRole('button', { name: /select.*instrumental/i }).first();
|
||||
if (await instrumentalBtn.isVisible({ timeout: 10000 }).catch(() => false)) {
|
||||
console.log(' Opening instrumental selection...');
|
||||
await instrumentalBtn.click();
|
||||
await page.waitForTimeout(2000);
|
||||
|
||||
const dialog = page.locator('[role="dialog"]');
|
||||
if (await dialog.isVisible()) {
|
||||
await page.screenshot({ path: 'test-results/08-instrumental-dialog.png' });
|
||||
|
||||
// Select first instrumental (usually "Clean")
|
||||
const selectBtn = dialog.getByRole('button', { name: /select/i }).first();
|
||||
if (await selectBtn.isVisible({ timeout: 5000 }).catch(() => false)) {
|
||||
await selectBtn.click();
|
||||
console.log(' Instrumental selected');
|
||||
await page.waitForTimeout(3000);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
console.log(` Skipping - job status is ${statusBeforeInstrumental}`);
|
||||
}
|
||||
|
||||
console.log('STEP 8 COMPLETE: Instrumental selection handled');
|
||||
|
||||
// =========================================================================
|
||||
// STEP 9: Wait for Completion
|
||||
// =========================================================================
|
||||
console.log('\n========================================');
|
||||
console.log('STEP 9: Wait for Completion');
|
||||
console.log('========================================');
|
||||
|
||||
console.log(' Waiting for job to complete...');
|
||||
const { status: finalStatus, job: finalJob } = await pollJobStatus(
|
||||
request,
|
||||
jobId,
|
||||
['completed'],
|
||||
accessToken!,
|
||||
TIMEOUTS.jobProcessing
|
||||
);
|
||||
|
||||
console.log('STEP 9 COMPLETE: Job completed');
|
||||
|
||||
// =========================================================================
|
||||
// STEP 10: Verify Outputs
|
||||
// =========================================================================
|
||||
console.log('\n========================================');
|
||||
console.log('STEP 10: Verify Outputs');
|
||||
console.log('========================================');
|
||||
|
||||
console.log(` Theme ID: ${finalJob.theme_id || 'N/A'}`);
|
||||
console.log(` YouTube URL: ${finalJob.youtube_url || 'N/A'}`);
|
||||
console.log(` Dropbox URL: ${finalJob.dropbox_url || 'N/A'}`);
|
||||
console.log(` Google Drive URL: ${finalJob.gdrive_url || 'N/A'}`);
|
||||
|
||||
// Verify required outputs
|
||||
expect(finalJob.theme_id).toBeTruthy();
|
||||
|
||||
// Check for download URLs
|
||||
const downloadResponse = await request.get(`${API_URL}/api/jobs/${jobId}/download-urls`, {
|
||||
headers: { Authorization: `Bearer ${accessToken}` },
|
||||
timeout: TIMEOUTS.apiCall,
|
||||
}).catch(() => null);
|
||||
|
||||
if (downloadResponse?.ok()) {
|
||||
const downloadUrls = await downloadResponse.json();
|
||||
console.log(` Download URLs available: ${Object.keys(downloadUrls).length}`);
|
||||
}
|
||||
|
||||
await page.reload();
|
||||
await page.screenshot({ path: 'test-results/10-completed.png', fullPage: true });
|
||||
|
||||
console.log('STEP 10 COMPLETE: Outputs verified');
|
||||
|
||||
// =========================================================================
|
||||
// SUCCESS
|
||||
// =========================================================================
|
||||
console.log('\n========================================');
|
||||
console.log('TEST COMPLETE: Full user journey successful!');
|
||||
console.log('========================================');
|
||||
console.log(`Job ID: ${jobId}`);
|
||||
console.log(`Final Status: ${finalStatus}`);
|
||||
});
|
||||
});
|
||||
|
||||
// =============================================================================
|
||||
// SUPPLEMENTARY TESTS
|
||||
// =============================================================================
|
||||
|
||||
test.describe('Production E2E - Landing Page', () => {
|
||||
test('Pricing packages display correctly', async ({ page }) => {
|
||||
await page.goto(PROD_URL);
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
await page.locator('#pricing').scrollIntoViewIfNeeded();
|
||||
|
||||
// Check all 4 credit packages
|
||||
await expect(page.getByRole('button', { name: /1\s+credit/i })).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: /3\s+credits/i })).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: /5\s+credits/i })).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: /10\s+credits/i })).toBeVisible();
|
||||
|
||||
await page.screenshot({ path: 'test-results/landing-pricing.png' });
|
||||
});
|
||||
|
||||
test('Sign in button opens auth dialog', async ({ page }) => {
|
||||
await page.goto(PROD_URL);
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
await page.getByRole('button', { name: /sign in/i }).click();
|
||||
|
||||
const dialog = page.locator('[role="dialog"]');
|
||||
await expect(dialog).toBeVisible();
|
||||
await expect(dialog.getByText('Enter your email to receive a sign-in link')).toBeVisible();
|
||||
|
||||
await page.screenshot({ path: 'test-results/landing-signin-dialog.png' });
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('Production E2E - API Health', () => {
|
||||
test('Health endpoints respond', async ({ request }) => {
|
||||
const healthResponse = await request.get(`${API_URL}/api/health`);
|
||||
expect(healthResponse.ok()).toBe(true);
|
||||
|
||||
const rootResponse = await request.get(`${API_URL}/`);
|
||||
expect(rootResponse.ok()).toBe(true);
|
||||
|
||||
const rootData = await rootResponse.json();
|
||||
expect(rootData.service).toContain('karaoke-gen');
|
||||
console.log(`API Version: ${rootData.version}`);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,198 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
import { setupApiFixtures, setAuthToken, clearAuthToken } from '../fixtures/test-helper';
|
||||
|
||||
/**
|
||||
* Regression Tests - Authentication
|
||||
*
|
||||
* Tests authentication flows using mocked API responses.
|
||||
* These tests run offline in CI without hitting production.
|
||||
*/
|
||||
|
||||
test.describe('Authentication - Magic Link', () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
await clearAuthToken(page);
|
||||
});
|
||||
|
||||
test('magic link dialog opens from sign in button', async ({ page }) => {
|
||||
await setupApiFixtures(page, { mocks: [] });
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
await page.getByRole('button', { name: /sign in/i }).click();
|
||||
|
||||
const dialog = page.locator('[role="dialog"]');
|
||||
await expect(dialog).toBeVisible();
|
||||
await expect(dialog.getByText('Enter your email to receive a sign-in link')).toBeVisible();
|
||||
});
|
||||
|
||||
test('magic link dialog validates email format', async ({ page }) => {
|
||||
await setupApiFixtures(page, { mocks: [] });
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
await page.getByRole('button', { name: /sign in/i }).click();
|
||||
|
||||
const dialog = page.locator('[role="dialog"]');
|
||||
const emailInput = dialog.locator('input[type="email"]');
|
||||
|
||||
// Fill invalid email
|
||||
await emailInput.fill('invalid');
|
||||
|
||||
// Try to submit
|
||||
await dialog.getByRole('button', { name: /send/i }).click();
|
||||
|
||||
// Should not close dialog (validation failed)
|
||||
await expect(dialog).toBeVisible();
|
||||
});
|
||||
|
||||
test('magic link request succeeds with valid email', async ({ page }) => {
|
||||
await setupApiFixtures(page, {
|
||||
mocks: [
|
||||
{
|
||||
method: 'POST',
|
||||
path: '/api/users/auth/magic-link',
|
||||
response: {
|
||||
status: 200,
|
||||
body: { success: true, message: 'Magic link sent' },
|
||||
},
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
await page.getByRole('button', { name: /sign in/i }).click();
|
||||
|
||||
const dialog = page.locator('[role="dialog"]');
|
||||
await dialog.locator('input[type="email"]').fill('test@example.com');
|
||||
await dialog.getByRole('button', { name: /send/i }).click();
|
||||
|
||||
// Should show success message
|
||||
await expect(page.getByText(/check your email|magic link sent/i)).toBeVisible({
|
||||
timeout: 10000,
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('Authentication - Beta Enrollment', () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
await clearAuthToken(page);
|
||||
});
|
||||
|
||||
test('beta form opens when clicking join button', async ({ page }) => {
|
||||
await setupApiFixtures(page, { mocks: [] });
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
await page.getByRole('button', { name: /join beta program/i }).click();
|
||||
|
||||
await expect(page.locator('#beta-email')).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: /get my free credit/i })).toBeVisible();
|
||||
});
|
||||
|
||||
test('beta form validates required fields', async ({ page }) => {
|
||||
await setupApiFixtures(page, { mocks: [] });
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
await page.getByRole('button', { name: /join beta program/i }).click();
|
||||
await expect(page.locator('#beta-email')).toBeVisible();
|
||||
|
||||
// Fill email but not checkbox
|
||||
await page.locator('#beta-email').fill('test@example.com');
|
||||
await page.getByRole('button', { name: /get my free credit/i }).click();
|
||||
|
||||
// Should show validation error
|
||||
await expect(page.getByText(/please accept/i)).toBeVisible();
|
||||
});
|
||||
|
||||
test('beta form validates feedback promise length', async ({ page }) => {
|
||||
await setupApiFixtures(page, { mocks: [] });
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
await page.getByRole('button', { name: /join beta program/i }).click();
|
||||
|
||||
// Fill form with short promise
|
||||
await page.locator('#beta-email').fill('test@example.com');
|
||||
await page.locator('input[type="checkbox"]').check();
|
||||
await page.locator('textarea').fill('ok');
|
||||
|
||||
await page.getByRole('button', { name: /get my free credit/i }).click();
|
||||
|
||||
// Should show validation error
|
||||
await expect(page.getByText(/please write a sentence/i)).toBeVisible();
|
||||
});
|
||||
|
||||
test('beta enrollment success redirects to app', async ({ page }) => {
|
||||
await setupApiFixtures(page, {
|
||||
mocks: [
|
||||
{
|
||||
method: 'POST',
|
||||
path: '/api/users/beta/enroll',
|
||||
response: {
|
||||
status: 200,
|
||||
body: {
|
||||
success: true,
|
||||
session_token: 'mock-session-token-123',
|
||||
credits: 2,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/jobs',
|
||||
response: { body: [] },
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
await page.getByRole('button', { name: /join beta program/i }).click();
|
||||
|
||||
// Fill valid form
|
||||
await page.locator('#beta-email').fill('test@example.com');
|
||||
await page.locator('textarea').fill(
|
||||
'I want to create karaoke videos for my favorite songs!'
|
||||
);
|
||||
await page.locator('input[type="checkbox"]').check();
|
||||
|
||||
await page.getByRole('button', { name: /get my free credit/i }).click();
|
||||
|
||||
// Should redirect to app
|
||||
await page.waitForURL(/\/app/, { timeout: 10000 });
|
||||
expect(page.url()).toContain('/app');
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('Authentication - Token Persistence', () => {
|
||||
test('localStorage can store and retrieve tokens', async ({ page }) => {
|
||||
// This tests the browser's localStorage functionality
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Set a token
|
||||
await page.evaluate(() => {
|
||||
localStorage.setItem('test_token', 'my-test-value');
|
||||
});
|
||||
|
||||
// Retrieve the token
|
||||
const token = await page.evaluate(() => localStorage.getItem('test_token'));
|
||||
expect(token).toBe('my-test-value');
|
||||
|
||||
// Token survives navigation
|
||||
await page.goto('/#pricing');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
const tokenAfter = await page.evaluate(() => localStorage.getItem('test_token'));
|
||||
expect(tokenAfter).toBe('my-test-value');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,360 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
import { setupApiFixtures, setAuthToken } from '../fixtures/test-helper';
|
||||
|
||||
/**
|
||||
* Regression Tests - Job Management
|
||||
*
|
||||
* Tests job list, job details, and job actions using mocked API responses.
|
||||
* These tests run offline in CI without hitting production.
|
||||
*/
|
||||
|
||||
// Standard mocks for app page tests
|
||||
const APP_PAGE_BASE_MOCKS = [
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/users/me',
|
||||
response: {
|
||||
body: {
|
||||
user: { email: 'test@example.com', credits: 5, role: 'user' },
|
||||
has_session: true,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/themes',
|
||||
response: { body: { themes: [] } },
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/users/credits/packages',
|
||||
response: { body: { packages: [] } },
|
||||
},
|
||||
];
|
||||
|
||||
// Mock job data for tests
|
||||
const MOCK_JOBS = [
|
||||
{
|
||||
job_id: 'job-completed-1',
|
||||
artist: 'Test Artist',
|
||||
title: 'Completed Song',
|
||||
status: 'completed',
|
||||
theme_id: 'theme-123',
|
||||
created_at: '2025-12-29T10:00:00Z',
|
||||
youtube_url: 'https://youtube.com/watch?v=abc123',
|
||||
},
|
||||
{
|
||||
job_id: 'job-in-review-2',
|
||||
artist: 'Another Artist',
|
||||
title: 'In Review Song',
|
||||
status: 'in_review',
|
||||
created_at: '2025-12-29T11:00:00Z',
|
||||
},
|
||||
{
|
||||
job_id: 'job-awaiting-audio-3',
|
||||
artist: 'Third Artist',
|
||||
title: 'Awaiting Audio',
|
||||
status: 'awaiting_audio_selection',
|
||||
created_at: '2025-12-29T12:00:00Z',
|
||||
},
|
||||
{
|
||||
job_id: 'job-failed-4',
|
||||
artist: 'Failed Artist',
|
||||
title: 'Failed Song',
|
||||
status: 'failed',
|
||||
error_message: 'Audio download failed',
|
||||
created_at: '2025-12-29T09:00:00Z',
|
||||
},
|
||||
];
|
||||
|
||||
test.describe('Job Management - Job List', () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
await setAuthToken(page, 'test-token');
|
||||
});
|
||||
|
||||
test('displays job list correctly', async ({ page }) => {
|
||||
await setupApiFixtures(page, {
|
||||
mocks: [
|
||||
...APP_PAGE_BASE_MOCKS,
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/jobs',
|
||||
response: { body: MOCK_JOBS },
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Should show Recent Jobs section
|
||||
await expect(page.getByText('Recent Jobs')).toBeVisible();
|
||||
|
||||
// Should show job cards with artist/title
|
||||
await expect(page.getByText('Test Artist')).toBeVisible();
|
||||
await expect(page.getByText('Completed Song')).toBeVisible();
|
||||
});
|
||||
|
||||
test('shows status badges on job cards', async ({ page }) => {
|
||||
await setupApiFixtures(page, {
|
||||
mocks: [
|
||||
...APP_PAGE_BASE_MOCKS,
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/jobs',
|
||||
response: { body: MOCK_JOBS },
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Should show different status badges
|
||||
await expect(page.getByText(/complete/i).first()).toBeVisible();
|
||||
await expect(page.getByText(/review/i).first()).toBeVisible();
|
||||
await expect(page.getByText(/failed/i).first()).toBeVisible();
|
||||
});
|
||||
|
||||
test('shows empty state when no jobs', async ({ page }) => {
|
||||
await setupApiFixtures(page, {
|
||||
mocks: [
|
||||
...APP_PAGE_BASE_MOCKS,
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/jobs',
|
||||
response: { body: [] },
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Should show empty state or "no jobs" message
|
||||
const noJobsIndicator = page
|
||||
.locator('text=/no jobs|create your first|get started/i')
|
||||
.first();
|
||||
const jobsList = page.locator('[data-testid="jobs-list"]');
|
||||
|
||||
// Either shows empty message or empty list
|
||||
const hasNoJobsText = await noJobsIndicator.isVisible().catch(() => false);
|
||||
const hasEmptyList = (await jobsList.locator('> *').count()) === 0;
|
||||
|
||||
expect(hasNoJobsText || hasEmptyList).toBe(true);
|
||||
});
|
||||
|
||||
test('refresh button fetches updated jobs', async ({ page }) => {
|
||||
await setupApiFixtures(page, {
|
||||
mocks: [
|
||||
...APP_PAGE_BASE_MOCKS,
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/jobs',
|
||||
response: { body: MOCK_JOBS },
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Click refresh
|
||||
const refreshBtn = page.getByRole('button', { name: /refresh/i });
|
||||
if (await refreshBtn.isVisible()) {
|
||||
await refreshBtn.click();
|
||||
await page.waitForTimeout(1000);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('Job Management - Job Details', () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
await setAuthToken(page, 'test-token');
|
||||
});
|
||||
|
||||
test('job card shows artist and title', async ({ page }) => {
|
||||
await setupApiFixtures(page, {
|
||||
mocks: [
|
||||
...APP_PAGE_BASE_MOCKS,
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/jobs',
|
||||
response: { body: MOCK_JOBS },
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Should show job with artist and title
|
||||
await expect(page.getByText('Test Artist')).toBeVisible();
|
||||
await expect(page.getByText('Completed Song')).toBeVisible();
|
||||
});
|
||||
|
||||
// TODO: Fix this test - needs to properly expand job card and verify download UI
|
||||
// The job card expansion mechanism and download link display need investigation
|
||||
test.skip('completed job shows download links', async ({ page }) => {
|
||||
await setupApiFixtures(page, {
|
||||
mocks: [
|
||||
...APP_PAGE_BASE_MOCKS,
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/jobs',
|
||||
response: {
|
||||
body: [MOCK_JOBS[0]], // Just completed job
|
||||
},
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/jobs/job-completed-1/download-urls',
|
||||
response: {
|
||||
body: {
|
||||
video_720p: 'https://storage.example.com/video.mp4',
|
||||
video_4k: 'https://storage.example.com/video_4k.mp4',
|
||||
cdg: 'https://storage.example.com/karaoke.cdg',
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Expand completed job
|
||||
const jobCard = page.locator('text=Test Artist').locator('..');
|
||||
await jobCard.click();
|
||||
await page.waitForTimeout(500);
|
||||
|
||||
// Should show download section
|
||||
const downloadSection = page.locator('text=/download|720p|4k/i').first();
|
||||
const hasDownloads = await downloadSection.isVisible().catch(() => false);
|
||||
|
||||
// Downloads might be in expanded view or separate section
|
||||
expect(hasDownloads).toBe(true);
|
||||
});
|
||||
|
||||
test('job with failed status is displayed', async ({ page }) => {
|
||||
const failedJob = {
|
||||
job_id: 'job-failed-1',
|
||||
artist: 'Failed Test Artist',
|
||||
title: 'Failed Test Song',
|
||||
status: 'failed',
|
||||
error_message: 'Test error message',
|
||||
created_at: '2025-12-29T09:00:00Z',
|
||||
};
|
||||
|
||||
await setupApiFixtures(page, {
|
||||
mocks: [
|
||||
...APP_PAGE_BASE_MOCKS,
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/jobs',
|
||||
response: { body: [failedJob] },
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Should show the job artist
|
||||
await expect(page.getByText('Failed Test Artist')).toBeVisible();
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('Job Management - Actions', () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
await setAuthToken(page, 'test-token');
|
||||
});
|
||||
|
||||
test('view logs button opens logs', async ({ page }) => {
|
||||
await setupApiFixtures(page, {
|
||||
mocks: [
|
||||
...APP_PAGE_BASE_MOCKS,
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/jobs',
|
||||
response: { body: MOCK_JOBS },
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/jobs/job-completed-1/logs',
|
||||
response: {
|
||||
body: {
|
||||
logs: [
|
||||
{ timestamp: '2025-12-29T10:00:00Z', message: 'Job started' },
|
||||
{ timestamp: '2025-12-29T10:05:00Z', message: 'Audio processed' },
|
||||
{ timestamp: '2025-12-29T10:10:00Z', message: 'Job completed' },
|
||||
],
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Expand a job
|
||||
const jobCard = page.locator('text=Test Artist').locator('..');
|
||||
await jobCard.click();
|
||||
await page.waitForTimeout(500);
|
||||
|
||||
// Click logs button
|
||||
const logsBtn = page.getByRole('button', { name: /logs/i }).first();
|
||||
if (await logsBtn.isVisible()) {
|
||||
await logsBtn.click();
|
||||
await page.waitForTimeout(1000);
|
||||
|
||||
// Should show logs (monospace text area)
|
||||
const logsSection = page.locator('[class*="font-mono"]').first();
|
||||
const hasLogs = await logsSection.isVisible().catch(() => false);
|
||||
expect(hasLogs).toBe(true);
|
||||
}
|
||||
});
|
||||
|
||||
test('cancel job button works', async ({ page }) => {
|
||||
await setupApiFixtures(page, {
|
||||
mocks: [
|
||||
...APP_PAGE_BASE_MOCKS,
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/jobs',
|
||||
response: {
|
||||
body: [MOCK_JOBS[2]], // Awaiting audio selection
|
||||
},
|
||||
},
|
||||
{
|
||||
method: 'POST',
|
||||
path: '/api/jobs/job-awaiting-audio-3/cancel',
|
||||
response: {
|
||||
body: { success: true },
|
||||
},
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Expand job
|
||||
const jobCard = page.locator('text=Third Artist').locator('..');
|
||||
await jobCard.click();
|
||||
await page.waitForTimeout(500);
|
||||
|
||||
// Look for cancel button
|
||||
const cancelBtn = page.getByRole('button', { name: /cancel/i }).first();
|
||||
if (await cancelBtn.isVisible()) {
|
||||
await cancelBtn.click();
|
||||
|
||||
// Should either show confirmation or cancel immediately
|
||||
const confirmBtn = page.getByRole('button', { name: /confirm|yes/i }).first();
|
||||
if (await confirmBtn.isVisible({ timeout: 2000 }).catch(() => false)) {
|
||||
await confirmBtn.click();
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,371 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
import { setupApiFixtures, setAuthToken } from '../fixtures/test-helper';
|
||||
|
||||
/**
|
||||
* Regression Tests - Karaoke Generation Flow
|
||||
*
|
||||
* Tests the karaoke generation UI elements using mocked API responses.
|
||||
* These tests run offline in CI without hitting production.
|
||||
*/
|
||||
|
||||
// Mock data
|
||||
const MOCK_USER = {
|
||||
email: 'test@example.com',
|
||||
credits: 5,
|
||||
is_beta: true,
|
||||
};
|
||||
|
||||
const MOCK_AUDIO_RESULTS = [
|
||||
{
|
||||
id: 'audio-1',
|
||||
title: 'Test Song - High Quality',
|
||||
format: 'FLAC',
|
||||
bitrate: '1411',
|
||||
size: '45MB',
|
||||
source: 'Deezer',
|
||||
},
|
||||
{
|
||||
id: 'audio-2',
|
||||
title: 'Test Song - Standard',
|
||||
format: 'MP3',
|
||||
bitrate: '320',
|
||||
size: '12MB',
|
||||
source: 'Tidal',
|
||||
},
|
||||
];
|
||||
|
||||
const MOCK_INSTRUMENTALS = [
|
||||
{
|
||||
id: 'instrumental-clean',
|
||||
name: 'Clean (no backing vocals)',
|
||||
description: 'Pure instrumental with all vocals removed',
|
||||
},
|
||||
{
|
||||
id: 'instrumental-backing',
|
||||
name: 'With backing vocals',
|
||||
description: 'Lead vocals removed, backing vocals preserved',
|
||||
},
|
||||
];
|
||||
|
||||
// Standard mocks for app page tests
|
||||
const APP_PAGE_MOCKS = [
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/jobs',
|
||||
response: { body: [] },
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/users/me',
|
||||
response: {
|
||||
body: {
|
||||
user: { email: 'test@example.com', credits: 5, role: 'user' },
|
||||
has_session: true,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/themes',
|
||||
response: { body: { themes: [] } },
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/users/credits/packages',
|
||||
response: { body: { packages: [] } },
|
||||
},
|
||||
];
|
||||
|
||||
test.describe('Karaoke Generation - Search Tab', () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
await setAuthToken(page, 'test-token');
|
||||
});
|
||||
|
||||
test('search tab shows artist and title inputs', async ({ page }) => {
|
||||
await setupApiFixtures(page, { mocks: APP_PAGE_MOCKS });
|
||||
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Click Search tab
|
||||
await page.getByRole('tab', { name: /search/i }).click();
|
||||
|
||||
// Verify inputs
|
||||
await expect(page.getByLabel('Artist')).toBeVisible();
|
||||
await expect(page.getByLabel('Title')).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: /search.*create/i })).toBeVisible();
|
||||
});
|
||||
|
||||
test('search form validates required fields', async ({ page }) => {
|
||||
await setupApiFixtures(page, { mocks: APP_PAGE_MOCKS });
|
||||
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
await page.getByRole('tab', { name: /search/i }).click();
|
||||
|
||||
// Try to submit without filling fields
|
||||
await page.getByRole('button', { name: /search.*create/i }).click();
|
||||
|
||||
// Form should not submit (fields are required)
|
||||
// Page should still be on app
|
||||
expect(page.url()).toContain('/app');
|
||||
});
|
||||
|
||||
test('search creates a new job', async ({ page }) => {
|
||||
await setupApiFixtures(page, {
|
||||
mocks: [
|
||||
...APP_PAGE_MOCKS,
|
||||
{
|
||||
method: 'POST',
|
||||
path: '/api/audio-search/search',
|
||||
response: {
|
||||
body: {
|
||||
job_id: 'new-job-123',
|
||||
status: 'audio_search',
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
await page.getByRole('tab', { name: /search/i }).click();
|
||||
|
||||
// Fill form
|
||||
await page.getByLabel('Artist').fill('piri');
|
||||
await page.getByLabel('Title').fill('dog');
|
||||
|
||||
// Submit
|
||||
await page.getByRole('button', { name: /search.*create/i }).click();
|
||||
|
||||
// Should show loading or job created indication
|
||||
await page.waitForTimeout(2000);
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('Karaoke Generation - Audio Selection', () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
await setAuthToken(page, 'test-token');
|
||||
});
|
||||
|
||||
test('job awaiting audio shows select audio button', async ({ page }) => {
|
||||
await setupApiFixtures(page, {
|
||||
mocks: [
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/jobs',
|
||||
response: {
|
||||
body: [
|
||||
{
|
||||
job_id: 'job-1',
|
||||
artist: 'Test Artist',
|
||||
title: 'Test Song',
|
||||
status: 'awaiting_audio_selection',
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/users/me',
|
||||
response: {
|
||||
body: {
|
||||
user: { email: 'test@example.com', credits: 5, role: 'user' },
|
||||
has_session: true,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/themes',
|
||||
response: { body: { themes: [] } },
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/users/credits/packages',
|
||||
response: { body: { packages: [] } },
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/audio-search/job-1/results',
|
||||
response: { body: { results: MOCK_AUDIO_RESULTS } },
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Should show Select Audio button for job awaiting audio selection
|
||||
await expect(page.getByRole('button', { name: /select audio/i }).first()).toBeVisible();
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('Karaoke Generation - Instrumental Selection', () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
await setAuthToken(page, 'test-token');
|
||||
});
|
||||
|
||||
test('instrumental selection dialog shows options', async ({ page }) => {
|
||||
await setupApiFixtures(page, {
|
||||
mocks: [
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/jobs',
|
||||
response: {
|
||||
body: [
|
||||
{
|
||||
job_id: 'job-1',
|
||||
artist: 'Test Artist',
|
||||
title: 'Test Song',
|
||||
status: 'awaiting_instrumental_selection',
|
||||
instrumental_options: MOCK_INSTRUMENTALS,
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/users/me',
|
||||
response: {
|
||||
body: {
|
||||
user: { email: 'test@example.com', credits: 5, role: 'user' },
|
||||
has_session: true,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/themes',
|
||||
response: { body: { themes: [] } },
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/users/credits/packages',
|
||||
response: { body: { packages: [] } },
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
const instrumentalBtn = page.getByRole('button', { name: /select instrumental/i }).first();
|
||||
if (await instrumentalBtn.isVisible({ timeout: 5000 })) {
|
||||
await instrumentalBtn.click();
|
||||
|
||||
const dialog = page.locator('[role="dialog"]');
|
||||
await expect(dialog).toBeVisible();
|
||||
|
||||
// Should show instrumental options
|
||||
await expect(dialog.getByText(/clean|backing/i).first()).toBeVisible();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('Karaoke Generation - Lyrics Review', () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
await setAuthToken(page, 'test-token');
|
||||
});
|
||||
|
||||
test('job in review status is displayed', async ({ page }) => {
|
||||
await setupApiFixtures(page, {
|
||||
mocks: [
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/jobs',
|
||||
response: {
|
||||
body: [
|
||||
{
|
||||
job_id: 'job-1',
|
||||
artist: 'Test Artist',
|
||||
title: 'Test Song',
|
||||
status: 'in_review',
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/users/me',
|
||||
response: {
|
||||
body: {
|
||||
user: { email: 'test@example.com', credits: 5, role: 'user' },
|
||||
has_session: true,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/themes',
|
||||
response: { body: { themes: [] } },
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/users/credits/packages',
|
||||
response: { body: { packages: [] } },
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Should show job artist
|
||||
await expect(page.getByText('Test Artist')).toBeVisible();
|
||||
// Should show review status indicator (button or badge)
|
||||
await expect(page.getByText(/review/i).first()).toBeVisible();
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('Karaoke Generation - Tabs', () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
await setAuthToken(page, 'test-token');
|
||||
});
|
||||
|
||||
test('all input tabs are visible', async ({ page }) => {
|
||||
await setupApiFixtures(page, { mocks: APP_PAGE_MOCKS });
|
||||
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Check all tabs exist
|
||||
await expect(page.getByRole('tab', { name: /upload/i })).toBeVisible();
|
||||
await expect(page.getByRole('tab', { name: /url/i })).toBeVisible();
|
||||
await expect(page.getByRole('tab', { name: /search/i })).toBeVisible();
|
||||
});
|
||||
|
||||
test('URL tab shows URL input', async ({ page }) => {
|
||||
await setupApiFixtures(page, { mocks: APP_PAGE_MOCKS });
|
||||
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
await page.getByRole('tab', { name: /url/i }).click();
|
||||
|
||||
// Should show URL input
|
||||
const urlInput = page.locator('input[type="url"], input[placeholder*="youtube"], input[placeholder*="URL"]');
|
||||
await expect(urlInput.first()).toBeVisible();
|
||||
});
|
||||
|
||||
test('Upload tab shows file input', async ({ page }) => {
|
||||
await setupApiFixtures(page, { mocks: APP_PAGE_MOCKS });
|
||||
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
await page.getByRole('tab', { name: /upload/i }).click();
|
||||
|
||||
// Should show file upload area
|
||||
const fileInput = page.locator('input[type="file"]');
|
||||
const dropZone = page.locator('text=/drag|drop|upload/i').first();
|
||||
|
||||
const hasFileInput = await fileInput.isVisible().catch(() => false);
|
||||
const hasDropZone = await dropZone.isVisible().catch(() => false);
|
||||
|
||||
expect(hasFileInput || hasDropZone).toBe(true);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,203 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
import { setupApiFixtures, setAuthToken, clearAuthToken } from '../fixtures/test-helper';
|
||||
|
||||
/**
|
||||
* Regression Tests - Landing Page
|
||||
*
|
||||
* Tests the landing page UI elements using mocked API responses.
|
||||
* These tests run offline in CI without hitting production.
|
||||
*/
|
||||
|
||||
test.describe('Landing Page', () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
// Ensure user is logged out for landing page tests
|
||||
await clearAuthToken(page);
|
||||
});
|
||||
|
||||
test('displays hero section correctly', async ({ page }) => {
|
||||
await setupApiFixtures(page, { mocks: [] });
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Check hero content
|
||||
await expect(page.locator('h1')).toContainText('Karaoke Video');
|
||||
await expect(page.locator('nav')).toBeVisible();
|
||||
await expect(page.getByRole('navigation').getByText('Nomad Karaoke')).toBeVisible();
|
||||
});
|
||||
|
||||
test('displays pricing section with 4 packages', async ({ page }) => {
|
||||
await setupApiFixtures(page, {
|
||||
mocks: [
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/users/credits/packages',
|
||||
response: {
|
||||
body: {
|
||||
packages: [
|
||||
{ id: 'credit_1', credits: 1, price_cents: 500 },
|
||||
{ id: 'credit_3', credits: 3, price_cents: 1200 },
|
||||
{ id: 'credit_5', credits: 5, price_cents: 1750 },
|
||||
{ id: 'credit_10', credits: 10, price_cents: 3000 },
|
||||
],
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
await page.locator('#pricing').scrollIntoViewIfNeeded();
|
||||
|
||||
// Check all 4 credit packages
|
||||
await expect(page.getByRole('button', { name: /1\s+credit/i })).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: /3\s+credits/i })).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: /5\s+credits/i })).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: /10\s+credits/i })).toBeVisible();
|
||||
|
||||
// Check "Best Value" badge
|
||||
await expect(page.getByText('Best Value')).toBeVisible();
|
||||
});
|
||||
|
||||
test('package selection updates checkout form', async ({ page }) => {
|
||||
await setupApiFixtures(page, {
|
||||
mocks: [
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/users/credits/packages',
|
||||
response: {
|
||||
body: {
|
||||
packages: [
|
||||
{ id: 'credit_1', credits: 1, price_cents: 500 },
|
||||
{ id: 'credit_3', credits: 3, price_cents: 1200 },
|
||||
{ id: 'credit_5', credits: 5, price_cents: 1750 },
|
||||
{ id: 'credit_10', credits: 10, price_cents: 3000 },
|
||||
],
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
await page.locator('#pricing').scrollIntoViewIfNeeded();
|
||||
|
||||
// Click on 10 credits
|
||||
await page.getByRole('button', { name: /10\s+credits/i }).click();
|
||||
|
||||
// Check summary updated
|
||||
const summaryContainer = page.locator('text=Selected package').locator('..');
|
||||
await expect(summaryContainer.getByText('10 Credits')).toBeVisible({ timeout: 10000 });
|
||||
await expect(summaryContainer.getByText('$30')).toBeVisible();
|
||||
});
|
||||
|
||||
test('displays FAQ section', async ({ page }) => {
|
||||
await setupApiFixtures(page, { mocks: [] });
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Scroll to FAQ section
|
||||
await page.getByText('Questions?').scrollIntoViewIfNeeded();
|
||||
|
||||
// Check FAQ section exists
|
||||
await expect(page.getByText('Questions?')).toBeVisible();
|
||||
});
|
||||
|
||||
test('displays beta tester program section', async ({ page }) => {
|
||||
await setupApiFixtures(page, { mocks: [] });
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
await expect(page.getByText('Beta Tester Program')).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: /join beta program/i })).toBeVisible();
|
||||
});
|
||||
|
||||
test('sign in button opens auth dialog', async ({ page }) => {
|
||||
await setupApiFixtures(page, { mocks: [] });
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Click Sign In
|
||||
await page.getByRole('button', { name: /sign in/i }).click();
|
||||
|
||||
// Dialog should open
|
||||
const dialog = page.locator('[role="dialog"]');
|
||||
await expect(dialog).toBeVisible();
|
||||
await expect(dialog.getByText('Enter your email to receive a sign-in link')).toBeVisible();
|
||||
await expect(dialog.locator('input[type="email"]')).toBeVisible();
|
||||
});
|
||||
|
||||
test('logged in users see app content', async ({ page }) => {
|
||||
await setAuthToken(page, 'test-valid-token');
|
||||
|
||||
await setupApiFixtures(page, {
|
||||
mocks: [
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/jobs',
|
||||
response: { body: [] },
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/themes',
|
||||
response: { body: { themes: [] } },
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/users/me',
|
||||
response: { body: { email: 'test@example.com', credits: 5 } },
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
// Go directly to /app with auth token
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Should see app content
|
||||
await expect(page.locator('h1')).toContainText('Karaoke');
|
||||
});
|
||||
|
||||
test('checkout form validates email', async ({ page }) => {
|
||||
await setupApiFixtures(page, {
|
||||
mocks: [
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/users/credits/packages',
|
||||
response: {
|
||||
body: {
|
||||
packages: [
|
||||
{ id: 'credit_5', credits: 5, price_cents: 1750 },
|
||||
],
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
await page.locator('#pricing').scrollIntoViewIfNeeded();
|
||||
|
||||
// Email input should be visible
|
||||
const emailInput = page.locator('input[type="email"]').first();
|
||||
await expect(emailInput).toBeVisible();
|
||||
|
||||
// Enter invalid email
|
||||
await emailInput.fill('invalid');
|
||||
|
||||
// Click checkout - should not proceed (browser validation)
|
||||
await page.getByRole('button', { name: /continue to payment/i }).click();
|
||||
|
||||
// Page should still be on landing (not redirected)
|
||||
expect(page.url()).not.toContain('stripe.com');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,378 @@
|
||||
import { test, expect, Page } from '@playwright/test';
|
||||
import { setupApiFixtures, setAuthToken, clearAuthToken } from '../fixtures/test-helper';
|
||||
|
||||
/**
|
||||
* Regression Tests - Mobile Responsiveness
|
||||
*
|
||||
* Tests mobile viewport rendering and interactions using mocked API responses.
|
||||
* These tests run offline in CI without hitting production.
|
||||
*/
|
||||
|
||||
// Common mobile viewport sizes
|
||||
const MOBILE_VIEWPORTS = {
|
||||
'iPhone SE': { width: 375, height: 667 },
|
||||
'iPhone 14': { width: 390, height: 844 },
|
||||
'Pixel 7': { width: 412, height: 915 },
|
||||
} as const;
|
||||
|
||||
// Standard mocks for app page tests
|
||||
const APP_PAGE_MOCKS = [
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/jobs',
|
||||
response: { body: [] },
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/users/me',
|
||||
response: {
|
||||
body: {
|
||||
user: { email: 'test@example.com', credits: 5, role: 'user' },
|
||||
has_session: true,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/themes',
|
||||
response: { body: { themes: [] } },
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/users/credits/packages',
|
||||
response: { body: { packages: [] } },
|
||||
},
|
||||
];
|
||||
|
||||
// Helper to check no horizontal overflow
|
||||
async function hasNoHorizontalOverflow(page: Page): Promise<boolean> {
|
||||
return await page.evaluate(() => {
|
||||
const docWidth = document.documentElement.scrollWidth;
|
||||
const viewportWidth = window.innerWidth;
|
||||
return docWidth <= viewportWidth + 2; // Allow 2px tolerance
|
||||
});
|
||||
}
|
||||
|
||||
test.describe('Mobile - Landing Page', () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
await clearAuthToken(page);
|
||||
});
|
||||
|
||||
for (const [deviceName, viewport] of Object.entries(MOBILE_VIEWPORTS)) {
|
||||
test(`${deviceName}: Landing page loads without horizontal scroll`, async ({ page }) => {
|
||||
await page.setViewportSize(viewport);
|
||||
|
||||
await setupApiFixtures(page, { mocks: [] });
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
const noOverflow = await hasNoHorizontalOverflow(page);
|
||||
expect(noOverflow).toBe(true);
|
||||
});
|
||||
|
||||
test(`${deviceName}: Hero section is visible`, async ({ page }) => {
|
||||
await page.setViewportSize(viewport);
|
||||
|
||||
await setupApiFixtures(page, { mocks: [] });
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Hero should be visible
|
||||
await expect(page.locator('h1')).toBeVisible();
|
||||
await expect(page.locator('h1')).toContainText('Karaoke');
|
||||
});
|
||||
|
||||
test(`${deviceName}: Navigation is accessible`, async ({ page }) => {
|
||||
await page.setViewportSize(viewport);
|
||||
|
||||
await setupApiFixtures(page, { mocks: [] });
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Navigation should be visible (might be hamburger menu)
|
||||
const nav = page.locator('nav');
|
||||
await expect(nav).toBeVisible();
|
||||
});
|
||||
|
||||
test(`${deviceName}: Pricing section scrolls into view`, async ({ page }) => {
|
||||
await page.setViewportSize(viewport);
|
||||
|
||||
await setupApiFixtures(page, {
|
||||
mocks: [
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/users/credits/packages',
|
||||
response: {
|
||||
body: {
|
||||
packages: [
|
||||
{ id: 'credit_1', credits: 1, price_cents: 500 },
|
||||
],
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
await page.locator('#pricing').scrollIntoViewIfNeeded();
|
||||
|
||||
// Pricing section should be in viewport
|
||||
await expect(page.locator('#pricing')).toBeInViewport();
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
test.describe('Mobile - App Page', () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
await setAuthToken(page, 'test-token');
|
||||
});
|
||||
|
||||
for (const [deviceName, viewport] of Object.entries(MOBILE_VIEWPORTS)) {
|
||||
test(`${deviceName}: App page loads without horizontal scroll`, async ({ page }) => {
|
||||
await page.setViewportSize(viewport);
|
||||
|
||||
await setupApiFixtures(page, { mocks: APP_PAGE_MOCKS });
|
||||
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
const noOverflow = await hasNoHorizontalOverflow(page);
|
||||
expect(noOverflow).toBe(true);
|
||||
});
|
||||
|
||||
test(`${deviceName}: Tab buttons are visible and clickable`, async ({ page }) => {
|
||||
await page.setViewportSize(viewport);
|
||||
|
||||
await setupApiFixtures(page, { mocks: APP_PAGE_MOCKS });
|
||||
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Tabs should be visible
|
||||
const searchTab = page.getByRole('tab', { name: /search/i });
|
||||
await expect(searchTab).toBeVisible();
|
||||
|
||||
// Should be clickable
|
||||
await searchTab.click();
|
||||
await expect(page.getByLabel('Artist')).toBeVisible();
|
||||
});
|
||||
|
||||
test(`${deviceName}: Form inputs fit viewport`, async ({ page }) => {
|
||||
await page.setViewportSize(viewport);
|
||||
|
||||
await setupApiFixtures(page, { mocks: APP_PAGE_MOCKS });
|
||||
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
await page.getByRole('tab', { name: /search/i }).click();
|
||||
|
||||
// Input should fit within viewport
|
||||
const artistInput = page.getByLabel('Artist');
|
||||
const box = await artistInput.boundingBox();
|
||||
|
||||
if (box) {
|
||||
expect(box.width).toBeLessThanOrEqual(viewport.width);
|
||||
expect(box.x).toBeGreaterThanOrEqual(0);
|
||||
expect(box.x + box.width).toBeLessThanOrEqual(viewport.width + 10);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
test.describe('Mobile - Touch Targets', () => {
|
||||
const MINIMUM_TOUCH_TARGET = 44; // iOS HIG minimum
|
||||
|
||||
test('buttons have adequate touch target size', async ({ page }) => {
|
||||
await page.setViewportSize(MOBILE_VIEWPORTS['iPhone SE']);
|
||||
|
||||
await clearAuthToken(page);
|
||||
await setupApiFixtures(page, { mocks: [] });
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
const buttons = page.locator('button:visible');
|
||||
const count = await buttons.count();
|
||||
|
||||
let smallButtonCount = 0;
|
||||
for (let i = 0; i < Math.min(count, 10); i++) {
|
||||
const button = buttons.nth(i);
|
||||
const box = await button.boundingBox();
|
||||
|
||||
if (box && (box.width < 28 || box.height < 28)) {
|
||||
smallButtonCount++;
|
||||
}
|
||||
}
|
||||
|
||||
// Allow some small buttons (icon buttons) but not too many
|
||||
expect(smallButtonCount).toBeLessThan(3);
|
||||
});
|
||||
|
||||
test('form inputs have adequate height', async ({ page }) => {
|
||||
await setAuthToken(page, 'test-token');
|
||||
await page.setViewportSize(MOBILE_VIEWPORTS['iPhone SE']);
|
||||
|
||||
await setupApiFixtures(page, { mocks: APP_PAGE_MOCKS });
|
||||
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
await page.getByRole('tab', { name: /search/i }).click();
|
||||
|
||||
const artistInput = page.getByLabel('Artist');
|
||||
const box = await artistInput.boundingBox();
|
||||
|
||||
if (box) {
|
||||
// Input should be at least 36px tall for easy touch
|
||||
expect(box.height).toBeGreaterThanOrEqual(36);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('Mobile - Interactions', () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
await setAuthToken(page, 'test-token');
|
||||
await page.setViewportSize(MOBILE_VIEWPORTS['iPhone SE']);
|
||||
});
|
||||
|
||||
test('can type in input fields', async ({ page }) => {
|
||||
await setupApiFixtures(page, { mocks: APP_PAGE_MOCKS });
|
||||
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
await page.getByRole('tab', { name: /search/i }).click();
|
||||
|
||||
const artistInput = page.getByLabel('Artist');
|
||||
await artistInput.focus();
|
||||
await artistInput.fill('Test Artist');
|
||||
|
||||
await expect(artistInput).toHaveValue('Test Artist');
|
||||
});
|
||||
|
||||
test('dialogs fit mobile viewport', async ({ page }) => {
|
||||
await setupApiFixtures(page, {
|
||||
mocks: [
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/jobs',
|
||||
response: {
|
||||
body: [
|
||||
{
|
||||
job_id: 'job-1',
|
||||
artist: 'Test',
|
||||
title: 'Song',
|
||||
status: 'awaiting_audio_selection',
|
||||
audio_options: [{ id: '1', title: 'Audio 1' }],
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/users/me',
|
||||
response: {
|
||||
body: {
|
||||
user: { email: 'test@example.com', credits: 5, role: 'user' },
|
||||
has_session: true,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/themes',
|
||||
response: { body: { themes: [] } },
|
||||
},
|
||||
{
|
||||
method: 'GET',
|
||||
path: '/api/users/credits/packages',
|
||||
response: { body: { packages: [] } },
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await page.goto('/app');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
const selectAudioBtn = page.getByRole('button', { name: /select audio/i }).first();
|
||||
if (await selectAudioBtn.isVisible({ timeout: 3000 }).catch(() => false)) {
|
||||
await selectAudioBtn.click();
|
||||
|
||||
const dialog = page.locator('[role="dialog"]');
|
||||
if (await dialog.isVisible({ timeout: 3000 }).catch(() => false)) {
|
||||
const box = await dialog.boundingBox();
|
||||
|
||||
if (box) {
|
||||
const viewport = MOBILE_VIEWPORTS['iPhone SE'];
|
||||
// Dialog should fit within viewport (with some margin)
|
||||
expect(box.width).toBeLessThanOrEqual(viewport.width);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
test('can scroll through content', async ({ page }) => {
|
||||
await clearAuthToken(page);
|
||||
|
||||
await setupApiFixtures(page, { mocks: [] });
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Get initial scroll position
|
||||
const initialScroll = await page.evaluate(() => window.scrollY);
|
||||
|
||||
// Scroll down
|
||||
await page.evaluate(() => window.scrollBy(0, 500));
|
||||
await page.waitForTimeout(300);
|
||||
|
||||
// Scroll position should have changed
|
||||
const newScroll = await page.evaluate(() => window.scrollY);
|
||||
expect(newScroll).toBeGreaterThan(initialScroll);
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('Mobile - Accessibility', () => {
|
||||
test('has proper viewport meta tag', async ({ page }) => {
|
||||
await page.setViewportSize(MOBILE_VIEWPORTS['iPhone SE']);
|
||||
await clearAuthToken(page);
|
||||
|
||||
await setupApiFixtures(page, { mocks: [] });
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
const viewportMeta = await page.evaluate(() => {
|
||||
const meta = document.querySelector('meta[name="viewport"]');
|
||||
return meta?.getAttribute('content') || '';
|
||||
});
|
||||
|
||||
expect(viewportMeta).toContain('width=device-width');
|
||||
expect(viewportMeta).toContain('initial-scale=1');
|
||||
});
|
||||
|
||||
test('text is readable without zooming', async ({ page }) => {
|
||||
await page.setViewportSize(MOBILE_VIEWPORTS['iPhone SE']);
|
||||
await clearAuthToken(page);
|
||||
|
||||
await setupApiFixtures(page, { mocks: [] });
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Check body font size is at least 14px
|
||||
const fontSize = await page.evaluate(() => {
|
||||
const body = document.body;
|
||||
const style = window.getComputedStyle(body);
|
||||
return parseFloat(style.fontSize);
|
||||
});
|
||||
|
||||
expect(fontSize).toBeGreaterThanOrEqual(14);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,55 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
import { setupApiFixtures, clearAuthToken } from '../fixtures/test-helper';
|
||||
|
||||
/**
|
||||
* Smoke Tests - Quick CI validation (~1 min max)
|
||||
*
|
||||
* These tests run on every PR to catch critical regressions fast.
|
||||
* They only test the landing page (no auth required) for reliability.
|
||||
*
|
||||
* For comprehensive E2E tests including authenticated flows,
|
||||
* add the 'e2e' label to the PR.
|
||||
*/
|
||||
|
||||
test.describe('Smoke Tests', () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
await clearAuthToken(page);
|
||||
});
|
||||
|
||||
test('landing page loads and shows hero', async ({ page }) => {
|
||||
await setupApiFixtures(page, { mocks: [] });
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Hero section visible
|
||||
await expect(page.locator('h1')).toContainText('Karaoke');
|
||||
await expect(page.locator('nav')).toBeVisible();
|
||||
});
|
||||
|
||||
test('sign in button is visible and clickable', async ({ page }) => {
|
||||
await setupApiFixtures(page, { mocks: [] });
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
const signInBtn = page.getByRole('button', { name: /sign in/i });
|
||||
await expect(signInBtn).toBeVisible();
|
||||
await signInBtn.click();
|
||||
|
||||
// Dialog should open
|
||||
const dialog = page.locator('[role="dialog"]');
|
||||
await expect(dialog).toBeVisible();
|
||||
await expect(dialog.locator('input[type="email"]')).toBeVisible();
|
||||
});
|
||||
|
||||
test('beta program section is visible', async ({ page }) => {
|
||||
await setupApiFixtures(page, { mocks: [] });
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
await expect(page.getByText('Beta Tester Program')).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: /join beta program/i })).toBeVisible();
|
||||
});
|
||||
});
|
||||
@@ -1,296 +0,0 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
|
||||
/**
|
||||
* Test to capture a screenshot of the Audio Search Dialog for visual review
|
||||
*/
|
||||
test.describe('Audio Search Dialog Screenshot', () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
// Set the auth token before navigating
|
||||
const token = process.env.KARAOKE_ACCESS_TOKEN;
|
||||
if (!token) {
|
||||
throw new Error('KARAOKE_ACCESS_TOKEN environment variable is required - set in .env.local');
|
||||
}
|
||||
|
||||
// Navigate to the app first
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Wait a bit for any dialogs to appear
|
||||
await page.waitForTimeout(1000);
|
||||
|
||||
// Check if auth dialog is visible - try multiple selectors
|
||||
const authDialog = page.locator('[role="dialog"]').filter({ hasText: /authentication|access token/i });
|
||||
const authDialogAlt = page.locator('text=Authentication Required').locator('xpath=ancestor::div[contains(@class, "fixed")]');
|
||||
|
||||
let authVisible = await authDialog.isVisible().catch(() => false);
|
||||
if (!authVisible) {
|
||||
authVisible = await authDialogAlt.isVisible().catch(() => false);
|
||||
}
|
||||
|
||||
// Also check for auth input directly on page
|
||||
const authInput = page.locator('input[placeholder*="token" i], input[placeholder*="access" i]').first();
|
||||
if (!authVisible && await authInput.isVisible().catch(() => false)) {
|
||||
authVisible = true;
|
||||
}
|
||||
|
||||
console.log('Auth dialog visible:', authVisible);
|
||||
|
||||
if (authVisible) {
|
||||
console.log('Auth dialog detected, filling token...');
|
||||
|
||||
// Find and fill the token input - try multiple strategies
|
||||
let tokenInputField = page.locator('input[placeholder*="token" i], input[placeholder*="access" i]').first();
|
||||
if (!await tokenInputField.isVisible().catch(() => false)) {
|
||||
tokenInputField = page.locator('[role="dialog"] input').first();
|
||||
}
|
||||
if (!await tokenInputField.isVisible().catch(() => false)) {
|
||||
tokenInputField = page.locator('input').first();
|
||||
}
|
||||
|
||||
await tokenInputField.waitFor({ state: 'visible', timeout: 5000 });
|
||||
await tokenInputField.click();
|
||||
await tokenInputField.fill(token);
|
||||
console.log('Token filled in input');
|
||||
|
||||
// Wait a moment for the button to become enabled
|
||||
await page.waitForTimeout(500);
|
||||
|
||||
// Click the save/submit/authenticate button - look for any enabled button nearby
|
||||
const saveButton = page.locator('button:not([disabled])').filter({ hasText: /save|submit|authenticate|connect/i }).first();
|
||||
if (await saveButton.isVisible().catch(() => false)) {
|
||||
console.log('Clicking save button');
|
||||
await saveButton.click();
|
||||
} else {
|
||||
// Try clicking any enabled submit button
|
||||
const anyButton = page.locator('button[type="submit"]:not([disabled]), button:not([disabled])').first();
|
||||
console.log('Clicking any enabled button');
|
||||
await anyButton.click();
|
||||
}
|
||||
|
||||
// Wait for the auth form to disappear
|
||||
await page.waitForTimeout(1000);
|
||||
console.log('Auth completed');
|
||||
} else {
|
||||
console.log('No auth dialog, setting token in localStorage');
|
||||
// Set the token in localStorage directly (must match key in lib/api.ts)
|
||||
await page.evaluate((t) => {
|
||||
localStorage.setItem('karaoke_access_token', t);
|
||||
}, token);
|
||||
await page.reload();
|
||||
}
|
||||
|
||||
await page.waitForLoadState('networkidle');
|
||||
});
|
||||
|
||||
test('capture audio search dialog screenshot', async ({ page }) => {
|
||||
// Set a larger viewport to see full dialog
|
||||
await page.setViewportSize({ width: 1920, height: 1080 });
|
||||
|
||||
// Wait for the page to fully load
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Take screenshot of initial page state
|
||||
await page.screenshot({
|
||||
path: 'e2e/screenshots/01-initial-page.png',
|
||||
fullPage: true
|
||||
});
|
||||
|
||||
// Find a job that's in awaiting_audio_selection state
|
||||
// First, let's check what jobs are visible
|
||||
const jobCards = await page.locator('[class*="border"][class*="rounded"]').filter({
|
||||
has: page.locator('text=/processing|pending|awaiting|completed|failed/i')
|
||||
}).all();
|
||||
|
||||
console.log(`Found ${jobCards.length} job cards`);
|
||||
|
||||
// Look for a job with "Select Audio" button - wait a bit for the page to fully load
|
||||
await page.waitForTimeout(2000);
|
||||
|
||||
// Take a debug screenshot
|
||||
await page.screenshot({
|
||||
path: 'e2e/screenshots/02-debug-before-button-search.png',
|
||||
fullPage: true
|
||||
});
|
||||
|
||||
// Log all buttons on the page
|
||||
const allButtons = await page.locator('button').all();
|
||||
console.log(`Found ${allButtons.length} buttons on page`);
|
||||
for (let i = 0; i < Math.min(allButtons.length, 10); i++) {
|
||||
const text = await allButtons[i].textContent().catch(() => 'N/A');
|
||||
const visible = await allButtons[i].isVisible().catch(() => false);
|
||||
console.log(`Button ${i}: "${text?.trim()}" visible=${visible}`);
|
||||
}
|
||||
|
||||
// Try multiple selectors for the Select Audio button (cards are no longer collapsible)
|
||||
const selectAudioButton = page.locator('button').filter({ hasText: /^Select Audio$/i }).first();
|
||||
const selectAudioAlt = page.locator('button').filter({ hasText: /Select Audio/i }).first();
|
||||
const selectByColor = page.locator('button.bg-blue-600, button[class*="blue-600"]').first();
|
||||
|
||||
let buttonFound = await selectAudioButton.isVisible().catch(() => false);
|
||||
console.log('selectAudioButton visible:', buttonFound);
|
||||
|
||||
if (!buttonFound) {
|
||||
buttonFound = await selectAudioAlt.isVisible().catch(() => false);
|
||||
console.log('selectAudioAlt visible:', buttonFound);
|
||||
}
|
||||
|
||||
if (!buttonFound) {
|
||||
buttonFound = await selectByColor.isVisible().catch(() => false);
|
||||
console.log('selectByColor visible:', buttonFound);
|
||||
}
|
||||
|
||||
console.log('Select Audio button found:', buttonFound);
|
||||
|
||||
if (buttonFound) {
|
||||
console.log('Found existing job with Select Audio button');
|
||||
|
||||
// Take screenshot before clicking
|
||||
await page.screenshot({
|
||||
path: 'e2e/screenshots/03-before-select-audio.png',
|
||||
fullPage: true
|
||||
});
|
||||
|
||||
// Click the Select Audio button directly (cards are no longer collapsible)
|
||||
const clickTarget = await selectAudioButton.isVisible().catch(() => false)
|
||||
? selectAudioButton
|
||||
: selectAudioAlt;
|
||||
console.log('Clicking Select Audio button');
|
||||
await clickTarget.click();
|
||||
|
||||
// Wait for dialog to appear
|
||||
await page.waitForSelector('[role="dialog"]', { timeout: 10000 });
|
||||
|
||||
// Wait a bit for results to load
|
||||
await page.waitForTimeout(2000);
|
||||
|
||||
// Take screenshot of the dialog
|
||||
await page.screenshot({
|
||||
path: 'e2e/screenshots/04-audio-dialog-full-page.png',
|
||||
fullPage: true
|
||||
});
|
||||
|
||||
// Also capture just the dialog element
|
||||
const dialog = page.locator('[role="dialog"]');
|
||||
await dialog.screenshot({
|
||||
path: 'e2e/screenshots/05-audio-dialog-element.png'
|
||||
});
|
||||
|
||||
// Log dialog dimensions
|
||||
const dialogBox = await dialog.boundingBox();
|
||||
console.log('Dialog bounding box:', dialogBox);
|
||||
|
||||
// Log viewport size
|
||||
const viewport = page.viewportSize();
|
||||
console.log('Viewport size:', viewport);
|
||||
|
||||
// Check if dialog is clipped
|
||||
if (dialogBox) {
|
||||
const isClippedTop = dialogBox.y < 0;
|
||||
const isClippedBottom = dialogBox.y + dialogBox.height > (viewport?.height || 0);
|
||||
const isClippedLeft = dialogBox.x < 0;
|
||||
const isClippedRight = dialogBox.x + dialogBox.width > (viewport?.width || 0);
|
||||
|
||||
console.log('Dialog clipping status:', {
|
||||
clippedTop: isClippedTop,
|
||||
clippedBottom: isClippedBottom,
|
||||
clippedLeft: isClippedLeft,
|
||||
clippedRight: isClippedRight,
|
||||
dialogHeight: dialogBox.height,
|
||||
dialogWidth: dialogBox.width,
|
||||
viewportHeight: viewport?.height,
|
||||
viewportWidth: viewport?.width
|
||||
});
|
||||
}
|
||||
|
||||
// Check scrollability of the dialog content
|
||||
const scrollableContent = dialog.locator('[class*="overflow"]').first();
|
||||
if (await scrollableContent.isVisible().catch(() => false)) {
|
||||
const scrollInfo = await scrollableContent.evaluate((el) => ({
|
||||
scrollHeight: el.scrollHeight,
|
||||
clientHeight: el.clientHeight,
|
||||
scrollTop: el.scrollTop,
|
||||
isScrollable: el.scrollHeight > el.clientHeight
|
||||
}));
|
||||
console.log('Scroll info:', scrollInfo);
|
||||
}
|
||||
|
||||
} else {
|
||||
console.log('No Select Audio button found, creating a new job...');
|
||||
|
||||
// The form is already visible on the page (not in a dialog)
|
||||
// Fill in the form - use a song that will return multiple results
|
||||
const artistInput = page.locator('input').filter({ has: page.locator('..', { hasText: /artist/i }) }).first();
|
||||
const titleInput = page.locator('input').filter({ has: page.locator('..', { hasText: /title/i }) }).first();
|
||||
|
||||
// Try different selectors for artist/title inputs
|
||||
const artistField = page.locator('input[placeholder*="artist" i], input[name*="artist" i]').first();
|
||||
const titleField = page.locator('input[placeholder*="title" i], input[name*="title" i]').first();
|
||||
|
||||
if (await artistField.isVisible().catch(() => false)) {
|
||||
await artistField.fill('Radiohead');
|
||||
await titleField.fill('Creep');
|
||||
} else {
|
||||
// Find by label
|
||||
await page.getByLabel(/artist/i).fill('Radiohead');
|
||||
await page.getByLabel(/title/i).fill('Creep');
|
||||
}
|
||||
|
||||
await page.screenshot({
|
||||
path: 'e2e/screenshots/02-filled-form.png',
|
||||
fullPage: true
|
||||
});
|
||||
|
||||
// Submit the job - look for the orange "Create Karaoke Video" button
|
||||
await page.locator('button:has-text("Create Karaoke Video"), button:has-text("Create"), button[type="submit"]').first().click();
|
||||
|
||||
// Wait for job to be created and transition to audio selection
|
||||
console.log('Waiting for job to start audio search...');
|
||||
await page.waitForTimeout(5000);
|
||||
|
||||
await page.screenshot({
|
||||
path: 'e2e/screenshots/03-after-submit.png',
|
||||
fullPage: true
|
||||
});
|
||||
|
||||
// Now look for Select Audio button - wait up to 60 seconds for audio search to complete
|
||||
const newSelectButton = page.locator('button').filter({ hasText: /Select Audio/i }).first();
|
||||
console.log('Waiting for Select Audio button...');
|
||||
|
||||
try {
|
||||
await newSelectButton.waitFor({ state: 'visible', timeout: 60000 });
|
||||
|
||||
await page.screenshot({
|
||||
path: 'e2e/screenshots/04-job-awaiting-selection.png',
|
||||
fullPage: true
|
||||
});
|
||||
|
||||
// Click it
|
||||
await newSelectButton.click();
|
||||
|
||||
// Wait for dialog
|
||||
await page.waitForSelector('[role="dialog"]', { timeout: 10000 });
|
||||
await page.waitForTimeout(2000);
|
||||
|
||||
await page.screenshot({
|
||||
path: 'e2e/screenshots/05-audio-dialog-full-page.png',
|
||||
fullPage: true
|
||||
});
|
||||
|
||||
const dialog = page.locator('[role="dialog"]');
|
||||
await dialog.screenshot({
|
||||
path: 'e2e/screenshots/06-audio-dialog-element.png'
|
||||
});
|
||||
|
||||
const dialogBox = await dialog.boundingBox();
|
||||
console.log('Dialog bounding box:', dialogBox);
|
||||
} catch (err) {
|
||||
console.log('Could not find Select Audio button within timeout');
|
||||
await page.screenshot({
|
||||
path: 'e2e/screenshots/05-timeout-state.png',
|
||||
fullPage: true
|
||||
});
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
+82
-10
@@ -12,25 +12,23 @@ const API_BASE_URL = typeof window !== 'undefined' && window.location.hostname =
|
||||
: (process.env.NEXT_PUBLIC_API_URL || 'https://api.nomadkaraoke.com');
|
||||
|
||||
// Token management - stored in localStorage (client-side only)
|
||||
let accessToken: string | null = null;
|
||||
|
||||
if (typeof window !== 'undefined') {
|
||||
accessToken = localStorage.getItem('karaoke_access_token');
|
||||
}
|
||||
// Always read fresh from localStorage to avoid stale cached values
|
||||
// during Next.js module caching or hydration edge cases
|
||||
|
||||
export function setAccessToken(token: string) {
|
||||
accessToken = token;
|
||||
if (typeof window !== 'undefined') {
|
||||
localStorage.setItem('karaoke_access_token', token);
|
||||
}
|
||||
}
|
||||
|
||||
export function getAccessToken(): string | null {
|
||||
return accessToken;
|
||||
if (typeof window !== 'undefined') {
|
||||
return localStorage.getItem('karaoke_access_token');
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
export function clearAccessToken() {
|
||||
accessToken = null;
|
||||
if (typeof window !== 'undefined') {
|
||||
localStorage.removeItem('karaoke_access_token');
|
||||
}
|
||||
@@ -38,8 +36,9 @@ export function clearAccessToken() {
|
||||
|
||||
function getAuthHeaders(): HeadersInit {
|
||||
const headers: HeadersInit = {};
|
||||
if (accessToken) {
|
||||
headers['Authorization'] = `Bearer ${accessToken}`;
|
||||
const token = getAccessToken();
|
||||
if (token) {
|
||||
headers['Authorization'] = `Bearer ${token}`;
|
||||
}
|
||||
return headers;
|
||||
}
|
||||
@@ -586,7 +585,80 @@ export const api = {
|
||||
});
|
||||
return handleResponse(response);
|
||||
},
|
||||
|
||||
// ==========================================================================
|
||||
// Credits/Payment API endpoints
|
||||
// ==========================================================================
|
||||
|
||||
/**
|
||||
* Get available credit packages
|
||||
*/
|
||||
async getCreditPackages(): Promise<CreditPackage[]> {
|
||||
const response = await fetch(`${API_BASE_URL}/api/users/credits/packages`);
|
||||
const data = await handleResponse<{ packages: CreditPackage[] }>(response);
|
||||
return data.packages;
|
||||
},
|
||||
|
||||
/**
|
||||
* Create a Stripe checkout session
|
||||
*/
|
||||
async createCheckout(packageId: string, email: string): Promise<string> {
|
||||
const response = await fetch(`${API_BASE_URL}/api/users/credits/checkout`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({
|
||||
package_id: packageId,
|
||||
email: email.toLowerCase(),
|
||||
}),
|
||||
});
|
||||
const data = await handleResponse<{ checkout_url: string }>(response);
|
||||
return data.checkout_url;
|
||||
},
|
||||
|
||||
// ==========================================================================
|
||||
// Beta Tester API endpoints
|
||||
// ==========================================================================
|
||||
|
||||
/**
|
||||
* Enroll as a beta tester to receive free credits
|
||||
*/
|
||||
async enrollBetaTester(
|
||||
email: string,
|
||||
promiseText: string,
|
||||
acceptCorrectionsWork: boolean
|
||||
): Promise<BetaEnrollResponse> {
|
||||
const response = await fetch(`${API_BASE_URL}/api/users/beta/enroll`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({
|
||||
email: email.toLowerCase(),
|
||||
promise_text: promiseText,
|
||||
accept_corrections_work: acceptCorrectionsWork,
|
||||
}),
|
||||
});
|
||||
return handleResponse(response);
|
||||
},
|
||||
};
|
||||
|
||||
// Types for credits/payment
|
||||
export interface CreditPackage {
|
||||
id: string;
|
||||
credits: number;
|
||||
price_cents: number;
|
||||
name: string;
|
||||
description: string;
|
||||
}
|
||||
|
||||
export interface BetaEnrollResponse {
|
||||
status: string;
|
||||
message: string;
|
||||
credits_granted: number;
|
||||
session_token: string | null;
|
||||
}
|
||||
|
||||
export { ApiError };
|
||||
|
||||
Generated
+69
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "karaoke-gen-frontend",
|
||||
"version": "0.76.26",
|
||||
"version": "0.77.0",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "karaoke-gen-frontend",
|
||||
"version": "0.76.26",
|
||||
"version": "0.77.0",
|
||||
"dependencies": {
|
||||
"@hookform/resolvers": "^3.10.0",
|
||||
"@radix-ui/react-accordion": "1.2.2",
|
||||
@@ -75,6 +75,7 @@
|
||||
"concurrently": "^9.2.1",
|
||||
"jest": "^29.7.0",
|
||||
"jest-environment-jsdom": "^29.7.0",
|
||||
"mailslurp-client": "^16.0.0",
|
||||
"postcss": "^8.5",
|
||||
"tailwindcss": "^4.1.9",
|
||||
"ts-node": "^10.9.2",
|
||||
@@ -4503,6 +4504,16 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/cross-fetch": {
|
||||
"version": "4.1.0",
|
||||
"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.1.0.tgz",
|
||||
"integrity": "sha512-uKm5PU+MHTootlWEY+mZ4vvXoCn4fLQxT9dSc1sXVMSFkINTJVN8cAQROpwcKm8bJ/c7rgZVIBWzH5T78sNZZw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"node-fetch": "^2.7.0"
|
||||
}
|
||||
},
|
||||
"node_modules/cross-spawn": {
|
||||
"version": "7.0.6",
|
||||
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
|
||||
@@ -7092,6 +7103,16 @@
|
||||
"@jridgewell/sourcemap-codec": "^1.5.5"
|
||||
}
|
||||
},
|
||||
"node_modules/mailslurp-client": {
|
||||
"version": "16.0.0",
|
||||
"resolved": "https://registry.npmjs.org/mailslurp-client/-/mailslurp-client-16.0.0.tgz",
|
||||
"integrity": "sha512-4g3Zauq5vcHZ2HAanfLpdcXcsZhZj6ToL/hUY10YS1vHK2DGt9EEO43ms5wzLFHCMFOCsx6So1JMIER/n8rIXw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"cross-fetch": "^4.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/make-dir": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
|
||||
@@ -7334,6 +7355,52 @@
|
||||
"node": "^10 || ^12 || >=14"
|
||||
}
|
||||
},
|
||||
"node_modules/node-fetch": {
|
||||
"version": "2.7.0",
|
||||
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
|
||||
"integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"whatwg-url": "^5.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": "4.x || >=6.0.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"encoding": "^0.1.0"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"encoding": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/node-fetch/node_modules/tr46": {
|
||||
"version": "0.0.3",
|
||||
"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
|
||||
"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/node-fetch/node_modules/webidl-conversions": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
|
||||
"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
|
||||
"dev": true,
|
||||
"license": "BSD-2-Clause"
|
||||
},
|
||||
"node_modules/node-fetch/node_modules/whatwg-url": {
|
||||
"version": "5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
|
||||
"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"tr46": "~0.0.3",
|
||||
"webidl-conversions": "^3.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/node-int64": {
|
||||
"version": "0.4.0",
|
||||
"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "karaoke-gen-frontend",
|
||||
"version": "0.76.27",
|
||||
"version": "0.78.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"build": "next build",
|
||||
@@ -17,7 +17,8 @@
|
||||
"test:e2e:ui": "playwright test --ui",
|
||||
"test:e2e:debug": "playwright test --debug",
|
||||
"test:e2e:headed": "playwright test --headed",
|
||||
"test:e2e:record": "RECORD_FIXTURES=true playwright test",
|
||||
"test:e2e:ci": "playwright test --reporter=list",
|
||||
"test:e2e:record": "playwright test --config=playwright.record.config.ts",
|
||||
"test:e2e:prod": "playwright test --config=playwright.production.config.ts",
|
||||
"test:e2e:prod:headed": "playwright test --config=playwright.production.config.ts --headed",
|
||||
"test:e2e:prod:debug": "playwright test --config=playwright.production.config.ts --debug",
|
||||
@@ -92,6 +93,7 @@
|
||||
"concurrently": "^9.2.1",
|
||||
"jest": "^29.7.0",
|
||||
"jest-environment-jsdom": "^29.7.0",
|
||||
"mailslurp-client": "^16.0.0",
|
||||
"postcss": "^8.5",
|
||||
"tailwindcss": "^4.1.9",
|
||||
"ts-node": "^10.9.2",
|
||||
|
||||
@@ -21,14 +21,17 @@ if (fs.existsSync(envLocalPath)) {
|
||||
/**
|
||||
* Playwright configuration for karaoke-gen frontend E2E tests.
|
||||
*
|
||||
* Tests run against the local dev server (localhost:3000) which proxies
|
||||
* API requests to the real cloud backend (api.nomadkaraoke.com).
|
||||
* DEFAULT: Runs regression tests with mocked API (CI-safe, offline).
|
||||
* Tests run against the local dev server (localhost:3000) with mocked API responses.
|
||||
*
|
||||
* For production tests: use playwright.production.config.ts
|
||||
* For fixture recording: use playwright.record.config.ts
|
||||
*/
|
||||
export default defineConfig({
|
||||
testDir: './e2e',
|
||||
testDir: './e2e/regression',
|
||||
|
||||
// Run tests in parallel
|
||||
fullyParallel: false, // Sequential for now since tests may share state
|
||||
// Run tests in parallel for faster CI
|
||||
fullyParallel: true,
|
||||
|
||||
// Fail the build on CI if you accidentally left test.only in the source code
|
||||
forbidOnly: !!process.env.CI,
|
||||
@@ -77,20 +80,13 @@ export default defineConfig({
|
||||
},
|
||||
|
||||
// Configure projects (browsers)
|
||||
// Regression tests only use Chromium for CI speed
|
||||
// Mobile tests set their own viewport sizes within tests
|
||||
projects: [
|
||||
{
|
||||
name: 'chromium',
|
||||
use: { ...devices['Desktop Chrome'] },
|
||||
},
|
||||
// Mobile device testing
|
||||
{
|
||||
name: 'mobile-chrome',
|
||||
use: { ...devices['Pixel 7'] },
|
||||
},
|
||||
{
|
||||
name: 'mobile-safari',
|
||||
use: { ...devices['iPhone 14'] },
|
||||
},
|
||||
],
|
||||
|
||||
// Run local dev server before starting tests
|
||||
|
||||
@@ -29,8 +29,8 @@ if (fs.existsSync(envLocalPath)) {
|
||||
* npm run test:e2e:prod
|
||||
*/
|
||||
export default defineConfig({
|
||||
testDir: './e2e',
|
||||
testMatch: '**/production-*.spec.ts',
|
||||
testDir: './e2e/production',
|
||||
testMatch: '**/*.spec.ts',
|
||||
|
||||
// Run tests sequentially - we're testing real production
|
||||
fullyParallel: false,
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
import { defineConfig, devices } from '@playwright/test';
|
||||
import * as fs from 'fs';
|
||||
import * as path from 'path';
|
||||
|
||||
// Load .env.local file if it exists (for KARAOKE_ACCESS_TOKEN, MAILSLURP_API_KEY)
|
||||
const envLocalPath = path.join(__dirname, '.env.local');
|
||||
if (fs.existsSync(envLocalPath)) {
|
||||
const envContent = fs.readFileSync(envLocalPath, 'utf-8');
|
||||
for (const line of envContent.split('\n')) {
|
||||
const trimmed = line.trim();
|
||||
if (trimmed && !trimmed.startsWith('#')) {
|
||||
const [key, ...valueParts] = trimmed.split('=');
|
||||
const value = valueParts.join('=');
|
||||
if (key && value && !process.env[key]) {
|
||||
process.env[key] = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Enable fixture recording mode
|
||||
process.env.RECORD_FIXTURES = 'true';
|
||||
|
||||
/**
|
||||
* Playwright configuration for FIXTURE RECORDING mode.
|
||||
*
|
||||
* This config runs tests against production while capturing API responses
|
||||
* as fixtures for later use in offline regression tests.
|
||||
*
|
||||
* Usage:
|
||||
* npx playwright test --config=playwright.record.config.ts
|
||||
* npm run test:e2e:record
|
||||
*
|
||||
* After recording:
|
||||
* 1. Review recordings with: npm run fixtures:review
|
||||
* 2. Approve fixtures to move them to approved/
|
||||
* 3. Commit approved fixtures
|
||||
*/
|
||||
export default defineConfig({
|
||||
testDir: './e2e/production',
|
||||
testMatch: '**/*.spec.ts',
|
||||
|
||||
// Run tests sequentially for consistent recordings
|
||||
fullyParallel: false,
|
||||
|
||||
// Fail on test.only
|
||||
forbidOnly: !!process.env.CI,
|
||||
|
||||
// No retries during recording - we want clean captures
|
||||
retries: 0,
|
||||
|
||||
// Single worker for consistent API ordering
|
||||
workers: 1,
|
||||
|
||||
// Reporter
|
||||
reporter: [
|
||||
['html', { open: 'never', outputFolder: 'playwright-report-record' }],
|
||||
['list'],
|
||||
],
|
||||
|
||||
// Shared settings
|
||||
use: {
|
||||
// Run against production to capture real responses
|
||||
baseURL: 'https://gen.nomadkaraoke.com',
|
||||
|
||||
// Always collect trace for debugging
|
||||
trace: 'on',
|
||||
|
||||
// Capture screenshots
|
||||
screenshot: 'on',
|
||||
|
||||
// Record video
|
||||
video: 'on',
|
||||
|
||||
// Longer timeout for API calls
|
||||
actionTimeout: 60000,
|
||||
|
||||
// Mark as recording mode
|
||||
extraHTTPHeaders: {
|
||||
'x-playwright-test': 'recording',
|
||||
},
|
||||
},
|
||||
|
||||
// Long timeout for full flow
|
||||
timeout: 900000, // 15 minutes
|
||||
|
||||
// Expect timeout
|
||||
expect: {
|
||||
timeout: 60000,
|
||||
},
|
||||
|
||||
// Browser
|
||||
projects: [
|
||||
{
|
||||
name: 'chromium',
|
||||
use: { ...devices['Desktop Chrome'] },
|
||||
},
|
||||
],
|
||||
|
||||
// No webServer - using production
|
||||
});
|
||||
File renamed without changes.
@@ -33,6 +33,65 @@ firestore_db = firestore.Database(
|
||||
app_engine_integration_mode="DISABLED",
|
||||
)
|
||||
|
||||
# =============================================================================
|
||||
# Firestore Composite Indexes
|
||||
# These are required for queries that filter/sort on multiple fields.
|
||||
# Created manually via console, now managed here for reproducibility.
|
||||
# =============================================================================
|
||||
|
||||
# Jobs: query by user_email, order by created_at (for user job lists)
|
||||
firestore_index_jobs_user_email = firestore.Index(
|
||||
"firestore-index-jobs-user-email",
|
||||
project=project_id,
|
||||
database=firestore_db.name,
|
||||
collection="jobs",
|
||||
fields=[
|
||||
firestore.IndexFieldArgs(field_path="user_email", order="ASCENDING"),
|
||||
firestore.IndexFieldArgs(field_path="created_at", order="DESCENDING"),
|
||||
],
|
||||
opts=pulumi.ResourceOptions(depends_on=[firestore_db]),
|
||||
)
|
||||
|
||||
# Jobs: query by status, order by created_at (for admin/system job lists)
|
||||
firestore_index_jobs_status = firestore.Index(
|
||||
"firestore-index-jobs-status",
|
||||
project=project_id,
|
||||
database=firestore_db.name,
|
||||
collection="jobs",
|
||||
fields=[
|
||||
firestore.IndexFieldArgs(field_path="status", order="ASCENDING"),
|
||||
firestore.IndexFieldArgs(field_path="created_at", order="DESCENDING"),
|
||||
],
|
||||
opts=pulumi.ResourceOptions(depends_on=[firestore_db]),
|
||||
)
|
||||
|
||||
# Sessions: query by user_email + is_active, order by created_at (for active session lists)
|
||||
firestore_index_sessions_active = firestore.Index(
|
||||
"firestore-index-sessions-active",
|
||||
project=project_id,
|
||||
database=firestore_db.name,
|
||||
collection="sessions",
|
||||
fields=[
|
||||
firestore.IndexFieldArgs(field_path="is_active", order="ASCENDING"),
|
||||
firestore.IndexFieldArgs(field_path="user_email", order="ASCENDING"),
|
||||
firestore.IndexFieldArgs(field_path="created_at", order="DESCENDING"),
|
||||
],
|
||||
opts=pulumi.ResourceOptions(depends_on=[firestore_db]),
|
||||
)
|
||||
|
||||
# Magic links: query by email, order by created_at (for user magic link history)
|
||||
firestore_index_magic_links = firestore.Index(
|
||||
"firestore-index-magic-links",
|
||||
project=project_id,
|
||||
database=firestore_db.name,
|
||||
collection="magic_links",
|
||||
fields=[
|
||||
firestore.IndexFieldArgs(field_path="email", order="ASCENDING"),
|
||||
firestore.IndexFieldArgs(field_path="created_at", order="DESCENDING"),
|
||||
],
|
||||
opts=pulumi.ResourceOptions(depends_on=[firestore_db]),
|
||||
)
|
||||
|
||||
# Create Cloud Storage Bucket
|
||||
bucket = storage.Bucket(
|
||||
"karaoke-storage",
|
||||
@@ -640,6 +699,37 @@ sendgrid_api_key = secretmanager.Secret(
|
||||
),
|
||||
)
|
||||
|
||||
# ==================== Langfuse Observability Secrets ====================
|
||||
# Langfuse provides LLM observability for the agentic AI correction workflow.
|
||||
# These secrets enable tracing of all Vertex AI/LLM calls for debugging and monitoring.
|
||||
|
||||
# Langfuse Public Key (for client identification)
|
||||
langfuse_public_key = secretmanager.Secret(
|
||||
"langfuse-public-key",
|
||||
secret_id="langfuse-public-key",
|
||||
replication=secretmanager.SecretReplicationArgs(
|
||||
auto=secretmanager.SecretReplicationAutoArgs(),
|
||||
),
|
||||
)
|
||||
|
||||
# Langfuse Secret Key (for authentication)
|
||||
langfuse_secret_key = secretmanager.Secret(
|
||||
"langfuse-secret-key",
|
||||
secret_id="langfuse-secret-key",
|
||||
replication=secretmanager.SecretReplicationArgs(
|
||||
auto=secretmanager.SecretReplicationAutoArgs(),
|
||||
),
|
||||
)
|
||||
|
||||
# Langfuse Host (API endpoint - US region)
|
||||
langfuse_host = secretmanager.Secret(
|
||||
"langfuse-host",
|
||||
secret_id="langfuse-host",
|
||||
replication=secretmanager.SecretReplicationArgs(
|
||||
auto=secretmanager.SecretReplicationAutoArgs(),
|
||||
),
|
||||
)
|
||||
|
||||
# Create Cloud Run Domain Mapping
|
||||
# Maps api.nomadkaraoke.com to the karaoke-backend service
|
||||
domain_mapping = cloudrun.DomainMapping(
|
||||
@@ -658,6 +748,10 @@ domain_mapping = cloudrun.DomainMapping(
|
||||
pulumi.export("project_id", project_id)
|
||||
pulumi.export("bucket_name", bucket.name)
|
||||
pulumi.export("firestore_database", firestore_db.name)
|
||||
pulumi.export("firestore_index_jobs_user_email", firestore_index_jobs_user_email.name)
|
||||
pulumi.export("firestore_index_jobs_status", firestore_index_jobs_status.name)
|
||||
pulumi.export("firestore_index_sessions_active", firestore_index_sessions_active.name)
|
||||
pulumi.export("firestore_index_magic_links", firestore_index_magic_links.name)
|
||||
pulumi.export("service_account_email", service_account.email)
|
||||
pulumi.export("artifact_repo_url", artifact_repo.name.apply(
|
||||
lambda name: f"us-central1-docker.pkg.dev/{project_id}/karaoke-repo"
|
||||
@@ -1451,6 +1545,30 @@ docker system prune -af --filter "until=168h"
|
||||
CRON
|
||||
chmod +x /etc/cron.daily/docker-cleanup
|
||||
|
||||
# ==================== Docker pre-warm cron ====================
|
||||
# Keep base images fresh by pulling hourly
|
||||
echo "Setting up Docker pre-warm cron..."
|
||||
cat > /etc/cron.hourly/docker-prewarm << 'CRON'
|
||||
#!/bin/bash
|
||||
# Pre-warm Docker images used by CI/CD
|
||||
# This ensures runners always have the latest base images cached
|
||||
|
||||
# Log to syslog
|
||||
exec 1> >(logger -t docker-prewarm) 2>&1
|
||||
|
||||
echo "Starting Docker image pre-warm..."
|
||||
|
||||
# Configure Docker auth (uses instance service account)
|
||||
gcloud auth configure-docker us-central1-docker.pkg.dev --quiet 2>/dev/null
|
||||
|
||||
# Pull latest images (|| true to not fail if network issues)
|
||||
docker pull us-central1-docker.pkg.dev/nomadkaraoke/karaoke-repo/karaoke-backend-base:latest || true
|
||||
docker pull us-central1-docker.pkg.dev/nomadkaraoke/karaoke-repo/karaoke-backend:latest || true
|
||||
|
||||
echo "Docker image pre-warm complete"
|
||||
CRON
|
||||
chmod +x /etc/cron.hourly/docker-prewarm
|
||||
|
||||
# ==================== Pre-warm Docker images ====================
|
||||
# Pre-fetch commonly used Docker images to speed up first CI runs
|
||||
echo "Pre-warming Docker images for faster CI builds..."
|
||||
|
||||
+178
-5
@@ -1,28 +1,115 @@
|
||||
from typing import Optional, Dict, Any
|
||||
"""LangFuse integration for agentic correction observability and prompt management.
|
||||
|
||||
This module provides:
|
||||
- Client initialization with fail-fast behavior when configured
|
||||
- Metrics recording for observability
|
||||
- Prompt fetching for dynamic prompt management
|
||||
- Dataset fetching for few-shot examples
|
||||
"""
|
||||
|
||||
from typing import Optional, Dict, Any, List
|
||||
import os
|
||||
import threading
|
||||
import logging
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# Module-level client singleton
|
||||
_langfuse_client: Optional[Any] = None
|
||||
_client_initialized: bool = False
|
||||
|
||||
|
||||
def setup_langfuse(client_name: str = "agentic-corrector") -> Optional[object]:
|
||||
class LangFuseConfigError(Exception):
|
||||
"""Raised when LangFuse is configured but initialization fails."""
|
||||
pass
|
||||
|
||||
|
||||
def is_langfuse_configured() -> bool:
|
||||
"""Check if LangFuse credentials are configured in environment."""
|
||||
public_key = os.getenv("LANGFUSE_PUBLIC_KEY")
|
||||
secret_key = os.getenv("LANGFUSE_SECRET_KEY")
|
||||
return bool(public_key and secret_key)
|
||||
|
||||
|
||||
def setup_langfuse() -> Optional[object]:
|
||||
"""Initialize Langfuse client if keys are present; return client or None.
|
||||
|
||||
This avoids hard dependency at import time; caller can check for None and
|
||||
no-op if observability is not configured.
|
||||
|
||||
Note: This function does NOT fail fast - use get_langfuse_client() for
|
||||
fail-fast behavior when LangFuse is required.
|
||||
"""
|
||||
secret = os.getenv("LANGFUSE_SECRET_KEY")
|
||||
public = os.getenv("LANGFUSE_PUBLIC_KEY")
|
||||
host = os.getenv("LANGFUSE_HOST", "https://cloud.langfuse.com")
|
||||
host = os.getenv("LANGFUSE_HOST", "https://us.cloud.langfuse.com")
|
||||
if not (secret and public):
|
||||
return None
|
||||
try:
|
||||
from langfuse import Langfuse # type: ignore
|
||||
|
||||
client = Langfuse(secret_key=secret, public_key=public, host=host, sdk_integration=client_name)
|
||||
client = Langfuse(secret_key=secret, public_key=public, host=host)
|
||||
return client
|
||||
except Exception:
|
||||
return None
|
||||
|
||||
|
||||
def get_langfuse_client() -> Optional[Any]:
|
||||
"""Get or create the LangFuse client singleton.
|
||||
|
||||
Unlike setup_langfuse(), this function implements fail-fast behavior:
|
||||
if LangFuse keys are configured but initialization fails, it raises
|
||||
an exception rather than returning None.
|
||||
|
||||
Returns:
|
||||
Langfuse client instance, or None if not configured
|
||||
|
||||
Raises:
|
||||
LangFuseConfigError: If keys are set but initialization fails
|
||||
"""
|
||||
global _langfuse_client, _client_initialized
|
||||
|
||||
if _client_initialized:
|
||||
return _langfuse_client
|
||||
|
||||
secret = os.getenv("LANGFUSE_SECRET_KEY")
|
||||
public = os.getenv("LANGFUSE_PUBLIC_KEY")
|
||||
host = os.getenv("LANGFUSE_HOST", "https://us.cloud.langfuse.com")
|
||||
|
||||
if not (secret and public):
|
||||
logger.debug("LangFuse keys not configured, client disabled")
|
||||
_client_initialized = True
|
||||
return None
|
||||
|
||||
try:
|
||||
from langfuse import Langfuse
|
||||
|
||||
_langfuse_client = Langfuse(
|
||||
secret_key=secret,
|
||||
public_key=public,
|
||||
host=host,
|
||||
)
|
||||
_client_initialized = True
|
||||
logger.info(f"LangFuse client initialized (host: {host})")
|
||||
return _langfuse_client
|
||||
|
||||
except Exception as e:
|
||||
# Fail fast - if keys are set, we expect LangFuse to work
|
||||
raise LangFuseConfigError(
|
||||
f"LangFuse keys are set but initialization failed: {e}\n"
|
||||
f"Check:\n"
|
||||
f" - LANGFUSE_PUBLIC_KEY: {public[:10] if public else 'not set'}...\n"
|
||||
f" - LANGFUSE_SECRET_KEY: {'set' if secret else 'not set'}\n"
|
||||
f" - LANGFUSE_HOST: {host}"
|
||||
) from e
|
||||
|
||||
|
||||
def reset_langfuse_client() -> None:
|
||||
"""Reset the global LangFuse client (for testing)."""
|
||||
global _langfuse_client, _client_initialized
|
||||
_langfuse_client = None
|
||||
_client_initialized = False
|
||||
|
||||
|
||||
def record_metrics(client: Optional[object], name: str, metrics: Dict[str, Any]) -> None:
|
||||
"""Record custom metrics to Langfuse if initialized."""
|
||||
if client is None:
|
||||
@@ -33,3 +120,89 @@ def record_metrics(client: Optional[object], name: str, metrics: Dict[str, Any])
|
||||
except Exception:
|
||||
# Swallow observability errors to never impact core flow
|
||||
pass
|
||||
|
||||
|
||||
def fetch_prompt(name: str, client: Optional[Any] = None, label: Optional[str] = "production") -> Any:
|
||||
"""Fetch a prompt template from LangFuse.
|
||||
|
||||
Args:
|
||||
name: The prompt name in LangFuse
|
||||
client: Optional pre-initialized client. If None, uses get_langfuse_client()
|
||||
label: Prompt label to fetch (default: "production"). If the labeled version
|
||||
is not found, falls back to version 1.
|
||||
|
||||
Returns:
|
||||
LangFuse prompt object
|
||||
|
||||
Raises:
|
||||
LangFuseConfigError: If LangFuse is not configured
|
||||
RuntimeError: If prompt fetch fails
|
||||
"""
|
||||
if client is None:
|
||||
client = get_langfuse_client()
|
||||
|
||||
if client is None:
|
||||
raise LangFuseConfigError(
|
||||
f"Cannot fetch prompt '{name}': LangFuse is not configured. "
|
||||
f"Set LANGFUSE_PUBLIC_KEY and LANGFUSE_SECRET_KEY."
|
||||
)
|
||||
|
||||
try:
|
||||
# Try to fetch with the specified label (default: production)
|
||||
prompt = client.get_prompt(name, label=label)
|
||||
logger.debug(f"Fetched prompt '{name}' (label={label}) from LangFuse")
|
||||
return prompt
|
||||
except Exception as label_error:
|
||||
# If labeled version not found, try fetching version 1 as fallback
|
||||
# This handles newly created prompts that haven't been promoted yet
|
||||
try:
|
||||
prompt = client.get_prompt(name, version=1)
|
||||
logger.warning(
|
||||
f"Prompt '{name}' label '{label}' not found, using version 1. "
|
||||
f"Consider promoting this prompt in LangFuse UI."
|
||||
)
|
||||
return prompt
|
||||
except Exception as version_error:
|
||||
raise RuntimeError(
|
||||
f"Failed to fetch prompt '{name}' from LangFuse: "
|
||||
f"Label '{label}' error: {label_error}, "
|
||||
f"Version 1 fallback error: {version_error}"
|
||||
) from version_error
|
||||
|
||||
|
||||
def fetch_dataset(name: str, client: Optional[Any] = None) -> List[Dict[str, Any]]:
|
||||
"""Fetch a dataset from LangFuse and return its items.
|
||||
|
||||
Args:
|
||||
name: The dataset name in LangFuse
|
||||
client: Optional pre-initialized client. If None, uses get_langfuse_client()
|
||||
|
||||
Returns:
|
||||
List of dataset item inputs (the actual example data)
|
||||
|
||||
Raises:
|
||||
LangFuseConfigError: If LangFuse is not configured
|
||||
RuntimeError: If dataset fetch fails
|
||||
"""
|
||||
if client is None:
|
||||
client = get_langfuse_client()
|
||||
|
||||
if client is None:
|
||||
raise LangFuseConfigError(
|
||||
f"Cannot fetch dataset '{name}': LangFuse is not configured. "
|
||||
f"Set LANGFUSE_PUBLIC_KEY and LANGFUSE_SECRET_KEY."
|
||||
)
|
||||
|
||||
try:
|
||||
dataset = client.get_dataset(name)
|
||||
items = []
|
||||
for item in dataset.items:
|
||||
if hasattr(item, 'input') and item.input:
|
||||
items.append(item.input)
|
||||
|
||||
logger.debug(f"Fetched {len(items)} items from dataset '{name}'")
|
||||
return items
|
||||
except Exception as e:
|
||||
raise RuntimeError(
|
||||
f"Failed to fetch dataset '{name}' from LangFuse: {e}"
|
||||
) from e
|
||||
@@ -1,2 +1,25 @@
|
||||
"""Prompt templates for agentic correction."""
|
||||
|
||||
from .classifier import (
|
||||
build_classification_prompt,
|
||||
build_classification_prompt_hardcoded,
|
||||
get_hardcoded_examples,
|
||||
)
|
||||
from .langfuse_prompts import (
|
||||
LangFusePromptService,
|
||||
LangFusePromptError,
|
||||
LangFuseDatasetError,
|
||||
get_prompt_service,
|
||||
reset_prompt_service,
|
||||
)
|
||||
|
||||
__all__ = [
|
||||
"build_classification_prompt",
|
||||
"build_classification_prompt_hardcoded",
|
||||
"get_hardcoded_examples",
|
||||
"LangFusePromptService",
|
||||
"LangFusePromptError",
|
||||
"LangFuseDatasetError",
|
||||
"get_prompt_service",
|
||||
"reset_prompt_service",
|
||||
]
|
||||
+66
-6
@@ -1,23 +1,35 @@
|
||||
"""Gap classification prompt builder for agentic correction."""
|
||||
"""Gap classification prompt builder for agentic correction.
|
||||
|
||||
This module provides two modes of operation:
|
||||
1. LangFuse mode: Prompts and examples fetched from LangFuse for dynamic iteration
|
||||
2. Hardcoded mode: Fallback for local development when LangFuse is not configured
|
||||
|
||||
The main entry point is `build_classification_prompt()` which automatically
|
||||
selects the appropriate mode based on LangFuse configuration.
|
||||
"""
|
||||
|
||||
from typing import Dict, List, Optional
|
||||
import yaml
|
||||
import os
|
||||
import logging
|
||||
from pathlib import Path
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def load_few_shot_examples() -> Dict[str, List[Dict]]:
|
||||
"""Load few-shot examples from examples.yaml if it exists."""
|
||||
examples_path = Path(__file__).parent / "examples.yaml"
|
||||
|
||||
|
||||
if not examples_path.exists():
|
||||
return get_hardcoded_examples()
|
||||
|
||||
|
||||
try:
|
||||
with open(examples_path, 'r') as f:
|
||||
data = yaml.safe_load(f)
|
||||
return data.get('examples_by_category', {})
|
||||
except Exception:
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to load examples.yaml, using hardcoded examples: {e}")
|
||||
return get_hardcoded_examples()
|
||||
|
||||
|
||||
@@ -122,7 +134,12 @@ def build_classification_prompt(
|
||||
gap_id: Optional[str] = None
|
||||
) -> str:
|
||||
"""Build a prompt for classifying a gap in the transcription.
|
||||
|
||||
|
||||
This function automatically selects between LangFuse and hardcoded prompts:
|
||||
- If LangFuse is configured (LANGFUSE_PUBLIC_KEY and LANGFUSE_SECRET_KEY set),
|
||||
fetches the prompt template and examples from LangFuse.
|
||||
- Otherwise, uses hardcoded prompts for local development.
|
||||
|
||||
Args:
|
||||
gap_text: The text of the gap that needs classification
|
||||
preceding_words: Text immediately before the gap
|
||||
@@ -131,7 +148,50 @@ def build_classification_prompt(
|
||||
artist: Song artist name for context
|
||||
title: Song title for context
|
||||
gap_id: Identifier for the gap
|
||||
|
||||
|
||||
Returns:
|
||||
Formatted prompt string for the LLM
|
||||
|
||||
Raises:
|
||||
LangFusePromptError: If LangFuse is configured but prompt fetch fails
|
||||
"""
|
||||
from .langfuse_prompts import get_prompt_service
|
||||
|
||||
service = get_prompt_service()
|
||||
return service.get_classification_prompt(
|
||||
gap_text=gap_text,
|
||||
preceding_words=preceding_words,
|
||||
following_words=following_words,
|
||||
reference_contexts=reference_contexts,
|
||||
artist=artist,
|
||||
title=title,
|
||||
gap_id=gap_id
|
||||
)
|
||||
|
||||
|
||||
def build_classification_prompt_hardcoded(
|
||||
gap_text: str,
|
||||
preceding_words: str,
|
||||
following_words: str,
|
||||
reference_contexts: Dict[str, str],
|
||||
artist: Optional[str] = None,
|
||||
title: Optional[str] = None,
|
||||
gap_id: Optional[str] = None
|
||||
) -> str:
|
||||
"""Build a prompt for classifying a gap using hardcoded templates.
|
||||
|
||||
This is the fallback implementation used when LangFuse is not configured.
|
||||
It is also used as the source of truth for migrating prompts to LangFuse.
|
||||
|
||||
Args:
|
||||
gap_text: The text of the gap that needs classification
|
||||
preceding_words: Text immediately before the gap
|
||||
following_words: Text immediately after the gap
|
||||
reference_contexts: Dictionary of reference lyrics from each source
|
||||
artist: Song artist name for context
|
||||
title: Song title for context
|
||||
gap_id: Identifier for the gap
|
||||
|
||||
Returns:
|
||||
Formatted prompt string for the LLM
|
||||
"""
|
||||
|
||||
+298
@@ -0,0 +1,298 @@
|
||||
"""LangFuse prompt management for agentic correction.
|
||||
|
||||
This module provides prompt fetching from LangFuse, enabling dynamic prompt
|
||||
iteration without code redeployment.
|
||||
"""
|
||||
|
||||
from typing import Dict, List, Optional, Any
|
||||
import logging
|
||||
import os
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class LangFusePromptError(Exception):
|
||||
"""Raised when LangFuse prompt fetching fails."""
|
||||
pass
|
||||
|
||||
|
||||
class LangFuseDatasetError(Exception):
|
||||
"""Raised when LangFuse dataset fetching fails."""
|
||||
pass
|
||||
|
||||
|
||||
class LangFusePromptService:
|
||||
"""Fetches prompts and datasets from LangFuse for agentic correction.
|
||||
|
||||
This service handles:
|
||||
- Fetching prompt templates from LangFuse
|
||||
- Fetching few-shot examples from LangFuse datasets
|
||||
- Compiling prompts with dynamic variables
|
||||
- Fail-fast behavior when LangFuse is configured but unavailable
|
||||
|
||||
When LangFuse keys are not configured, falls back to hardcoded prompts
|
||||
for local development.
|
||||
"""
|
||||
|
||||
# Prompt and dataset names in LangFuse
|
||||
CLASSIFIER_PROMPT_NAME = "gap-classifier"
|
||||
EXAMPLES_DATASET_NAME = "gap-classifier-examples"
|
||||
|
||||
def __init__(self, client: Optional[Any] = None):
|
||||
"""Initialize the prompt service.
|
||||
|
||||
Args:
|
||||
client: Optional pre-initialized Langfuse client (for testing).
|
||||
If None, will initialize from environment variables.
|
||||
"""
|
||||
self._client = client
|
||||
self._initialized = False
|
||||
self._use_langfuse = self._should_use_langfuse()
|
||||
|
||||
if self._use_langfuse and client is None:
|
||||
self._init_client()
|
||||
|
||||
def _should_use_langfuse(self) -> bool:
|
||||
"""Check if LangFuse credentials are configured."""
|
||||
public_key = os.getenv("LANGFUSE_PUBLIC_KEY")
|
||||
secret_key = os.getenv("LANGFUSE_SECRET_KEY")
|
||||
return bool(public_key and secret_key)
|
||||
|
||||
def _init_client(self) -> None:
|
||||
"""Initialize the Langfuse client using the shared singleton."""
|
||||
from ..observability.langfuse_integration import get_langfuse_client, LangFuseConfigError
|
||||
|
||||
try:
|
||||
self._client = get_langfuse_client()
|
||||
if self._client:
|
||||
self._initialized = True
|
||||
logger.info("LangFuse prompt service initialized")
|
||||
else:
|
||||
logger.debug("LangFuse keys not configured, will use hardcoded prompts")
|
||||
except LangFuseConfigError as e:
|
||||
# Re-raise as RuntimeError for consistent error handling
|
||||
raise RuntimeError(str(e)) from e
|
||||
|
||||
def get_classification_prompt(
|
||||
self,
|
||||
gap_text: str,
|
||||
preceding_words: str,
|
||||
following_words: str,
|
||||
reference_contexts: Dict[str, str],
|
||||
artist: Optional[str] = None,
|
||||
title: Optional[str] = None,
|
||||
gap_id: Optional[str] = None
|
||||
) -> str:
|
||||
"""Fetch and compile the gap classification prompt.
|
||||
|
||||
If LangFuse is configured, fetches the prompt template and examples
|
||||
from LangFuse. Otherwise, falls back to hardcoded prompts.
|
||||
|
||||
Args:
|
||||
gap_text: The text of the gap that needs classification
|
||||
preceding_words: Text immediately before the gap
|
||||
following_words: Text immediately after the gap
|
||||
reference_contexts: Dictionary of reference lyrics from each source
|
||||
artist: Song artist name for context
|
||||
title: Song title for context
|
||||
gap_id: Identifier for the gap
|
||||
|
||||
Returns:
|
||||
Compiled prompt string ready for LLM
|
||||
|
||||
Raises:
|
||||
LangFusePromptError: If LangFuse is configured but prompt fetch fails
|
||||
"""
|
||||
if not self._use_langfuse:
|
||||
# Fall back to hardcoded prompt for development
|
||||
from .classifier import build_classification_prompt_hardcoded
|
||||
return build_classification_prompt_hardcoded(
|
||||
gap_text=gap_text,
|
||||
preceding_words=preceding_words,
|
||||
following_words=following_words,
|
||||
reference_contexts=reference_contexts,
|
||||
artist=artist,
|
||||
title=title,
|
||||
gap_id=gap_id
|
||||
)
|
||||
|
||||
# Fetch from LangFuse
|
||||
try:
|
||||
prompt_template = self._fetch_prompt(self.CLASSIFIER_PROMPT_NAME)
|
||||
examples = self._fetch_examples()
|
||||
|
||||
# Build component strings
|
||||
song_context = self._build_song_context(artist, title)
|
||||
examples_text = self._format_examples(examples)
|
||||
references_text = self._format_references(reference_contexts)
|
||||
|
||||
# Compile the prompt with variables
|
||||
compiled = prompt_template.compile(
|
||||
song_context=song_context,
|
||||
examples_text=examples_text,
|
||||
gap_id=gap_id or "unknown",
|
||||
preceding_words=preceding_words,
|
||||
gap_text=gap_text,
|
||||
following_words=following_words,
|
||||
references_text=references_text
|
||||
)
|
||||
|
||||
logger.debug(f"Compiled LangFuse prompt for gap {gap_id}")
|
||||
return compiled
|
||||
|
||||
except Exception as e:
|
||||
raise LangFusePromptError(
|
||||
f"Failed to fetch/compile prompt from LangFuse: {e}"
|
||||
) from e
|
||||
|
||||
def _fetch_prompt(self, name: str, label: str = "production") -> Any:
|
||||
"""Fetch a prompt template from LangFuse.
|
||||
|
||||
Args:
|
||||
name: The prompt name in LangFuse
|
||||
label: Prompt label to fetch (default: "production"). Falls back to
|
||||
version 1 if labeled version not found.
|
||||
|
||||
Returns:
|
||||
LangFuse prompt object
|
||||
|
||||
Raises:
|
||||
LangFusePromptError: If fetch fails
|
||||
"""
|
||||
if not self._client:
|
||||
raise LangFusePromptError("LangFuse client not initialized")
|
||||
|
||||
try:
|
||||
# Try to fetch with the specified label (default: production)
|
||||
prompt = self._client.get_prompt(name, label=label)
|
||||
logger.debug(f"Fetched prompt '{name}' (label={label}) from LangFuse")
|
||||
return prompt
|
||||
except Exception as label_error:
|
||||
# If labeled version not found, try fetching version 1 as fallback
|
||||
# This handles newly created prompts that haven't been promoted yet
|
||||
try:
|
||||
prompt = self._client.get_prompt(name, version=1)
|
||||
logger.warning(
|
||||
f"Prompt '{name}' label '{label}' not found, using version 1. "
|
||||
f"Consider promoting this prompt in LangFuse UI."
|
||||
)
|
||||
return prompt
|
||||
except Exception as version_error:
|
||||
raise LangFusePromptError(
|
||||
f"Failed to fetch prompt '{name}' from LangFuse: "
|
||||
f"Label '{label}' error: {label_error}, "
|
||||
f"Version 1 fallback error: {version_error}"
|
||||
) from version_error
|
||||
|
||||
def _fetch_examples(self) -> List[Dict[str, Any]]:
|
||||
"""Fetch few-shot examples from LangFuse dataset.
|
||||
|
||||
Returns:
|
||||
List of example dictionaries
|
||||
|
||||
Raises:
|
||||
LangFuseDatasetError: If fetch fails
|
||||
"""
|
||||
if not self._client:
|
||||
raise LangFuseDatasetError("LangFuse client not initialized")
|
||||
|
||||
try:
|
||||
dataset = self._client.get_dataset(self.EXAMPLES_DATASET_NAME)
|
||||
examples = []
|
||||
for item in dataset.items:
|
||||
# Dataset items have 'input' field with the example data
|
||||
if hasattr(item, 'input') and item.input:
|
||||
examples.append(item.input)
|
||||
|
||||
logger.debug(f"Fetched {len(examples)} examples from LangFuse dataset")
|
||||
return examples
|
||||
except Exception as e:
|
||||
raise LangFuseDatasetError(
|
||||
f"Failed to fetch dataset '{self.EXAMPLES_DATASET_NAME}' from LangFuse: {e}"
|
||||
) from e
|
||||
|
||||
def _build_song_context(self, artist: Optional[str], title: Optional[str]) -> str:
|
||||
"""Build song context section for the prompt."""
|
||||
if artist and title:
|
||||
return (
|
||||
f"\n## Song Context\n\n"
|
||||
f"**Artist:** {artist}\n"
|
||||
f"**Title:** {title}\n\n"
|
||||
f"Note: The song title and artist name may help identify proper nouns "
|
||||
f"or unusual words that could be mis-heard.\n"
|
||||
)
|
||||
return ""
|
||||
|
||||
def _format_examples(self, examples: List[Dict[str, Any]]) -> str:
|
||||
"""Format few-shot examples for inclusion in prompt.
|
||||
|
||||
Args:
|
||||
examples: List of example dictionaries from LangFuse dataset
|
||||
|
||||
Returns:
|
||||
Formatted examples string
|
||||
"""
|
||||
if not examples:
|
||||
return ""
|
||||
|
||||
# Group examples by category
|
||||
examples_by_category: Dict[str, List[Dict]] = {}
|
||||
for ex in examples:
|
||||
category = ex.get("category", "unknown")
|
||||
if category not in examples_by_category:
|
||||
examples_by_category[category] = []
|
||||
examples_by_category[category].append(ex)
|
||||
|
||||
# Build formatted text
|
||||
text = "## Example Classifications\n\n"
|
||||
for category, category_examples in examples_by_category.items():
|
||||
text += f"### {category.upper().replace('_', ' ')}\n\n"
|
||||
for ex in category_examples[:2]: # Limit to 2 examples per category
|
||||
text += f"**Gap:** {ex.get('gap_text', '')}\n"
|
||||
text += f"**Context:** ...{ex.get('preceding', '')}... [GAP] ...{ex.get('following', '')}...\n"
|
||||
if 'reference' in ex:
|
||||
text += f"**Reference:** {ex['reference']}\n"
|
||||
text += f"**Reasoning:** {ex.get('reasoning', '')}\n"
|
||||
text += f"**Action:** {ex.get('action', '')}\n\n"
|
||||
|
||||
return text
|
||||
|
||||
def _format_references(self, reference_contexts: Dict[str, str]) -> str:
|
||||
"""Format reference lyrics for inclusion in prompt.
|
||||
|
||||
Args:
|
||||
reference_contexts: Dictionary of reference lyrics from each source
|
||||
|
||||
Returns:
|
||||
Formatted references string
|
||||
"""
|
||||
if not reference_contexts:
|
||||
return ""
|
||||
|
||||
text = "## Available Reference Lyrics\n\n"
|
||||
for source, context in reference_contexts.items():
|
||||
text += f"**{source.upper()}:** {context}\n\n"
|
||||
|
||||
return text
|
||||
|
||||
|
||||
# Module-level singleton for convenience
|
||||
_prompt_service: Optional[LangFusePromptService] = None
|
||||
|
||||
|
||||
def get_prompt_service() -> LangFusePromptService:
|
||||
"""Get or create the global prompt service instance.
|
||||
|
||||
Returns:
|
||||
LangFusePromptService singleton instance
|
||||
"""
|
||||
global _prompt_service
|
||||
if _prompt_service is None:
|
||||
_prompt_service = LangFusePromptService()
|
||||
return _prompt_service
|
||||
|
||||
|
||||
def reset_prompt_service() -> None:
|
||||
"""Reset the global prompt service instance (for testing)."""
|
||||
global _prompt_service
|
||||
_prompt_service = None
|
||||
@@ -19,8 +19,9 @@ class ProviderConfig:
|
||||
cache_dir: str
|
||||
|
||||
# GCP/Vertex AI settings
|
||||
# Note: Gemini 3 models require 'global' location (not regional like us-central1)
|
||||
gcp_project_id: Optional[str] = None
|
||||
gcp_location: str = "us-central1"
|
||||
gcp_location: str = "global"
|
||||
|
||||
request_timeout_seconds: float = 30.0
|
||||
max_retries: int = 2
|
||||
@@ -51,7 +52,7 @@ class ProviderConfig:
|
||||
privacy_mode=os.getenv("PRIVACY_MODE", "false").lower() in {"1", "true", "yes"},
|
||||
cache_dir=cache_dir,
|
||||
gcp_project_id=os.getenv("GOOGLE_CLOUD_PROJECT") or os.getenv("GCP_PROJECT_ID"),
|
||||
gcp_location=os.getenv("GCP_LOCATION", "us-central1"),
|
||||
gcp_location=os.getenv("GCP_LOCATION", "global"),
|
||||
request_timeout_seconds=float(os.getenv("AGENTIC_TIMEOUT_SECONDS", "30.0")),
|
||||
max_retries=int(os.getenv("AGENTIC_MAX_RETRIES", "2")),
|
||||
retry_backoff_base_seconds=float(os.getenv("AGENTIC_BACKOFF_BASE_SECONDS", "0.2")),
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@ RESPONSE_LOG_LENGTH = 500 # Characters to log from responses
|
||||
MODEL_SPEC_FORMAT = "provider/model" # Expected format for model identifiers
|
||||
|
||||
# Default Langfuse host
|
||||
DEFAULT_LANGFUSE_HOST = "https://cloud.langfuse.com"
|
||||
DEFAULT_LANGFUSE_HOST = "https://us.cloud.langfuse.com"
|
||||
|
||||
# Raw response indicator
|
||||
RAW_RESPONSE_KEY = "raw" # Key used to wrap unparsed responses
|
||||
|
||||
+22
-7
@@ -187,26 +187,41 @@ class LangChainBridge(BaseAIProvider):
|
||||
|
||||
def _invoke_model(self, prompt: str) -> str:
|
||||
"""Invoke the chat model with a prompt.
|
||||
|
||||
|
||||
This is a simple wrapper that can be passed to the retry executor.
|
||||
|
||||
|
||||
Args:
|
||||
prompt: The prompt to send
|
||||
|
||||
|
||||
Returns:
|
||||
Response content as string
|
||||
|
||||
|
||||
Raises:
|
||||
Exception: Any error from the model invocation
|
||||
"""
|
||||
from langchain_core.messages import HumanMessage
|
||||
|
||||
|
||||
# Prepare config with session_id in metadata (Langfuse format)
|
||||
config = {}
|
||||
if hasattr(self, '_session_id') and self._session_id:
|
||||
config["metadata"] = {"langfuse_session_id": self._session_id}
|
||||
logger.debug(f"🤖 [LangChain] Invoking with session_id: {self._session_id}")
|
||||
|
||||
|
||||
response = self._chat_model.invoke([HumanMessage(content=prompt)], config=config)
|
||||
return response.content
|
||||
content = response.content
|
||||
|
||||
# Handle multimodal response format from Gemini 3+ models
|
||||
# Response can be a list of content parts: [{'type': 'text', 'text': '...'}]
|
||||
if isinstance(content, list):
|
||||
# Extract text from the first text content part
|
||||
for part in content:
|
||||
if isinstance(part, dict) and part.get('type') == 'text':
|
||||
return part.get('text', '')
|
||||
# Fallback: concatenate all text parts
|
||||
return ''.join(
|
||||
part.get('text', '') if isinstance(part, dict) else str(part)
|
||||
for part in content
|
||||
)
|
||||
|
||||
return content
|
||||
|
||||
+4
-12
@@ -100,19 +100,10 @@ class ModelFactory:
|
||||
return
|
||||
|
||||
try:
|
||||
from langfuse import Langfuse
|
||||
from langfuse.langchain import CallbackHandler
|
||||
|
||||
# Initialize Langfuse client first (this is required!)
|
||||
langfuse_client = Langfuse(
|
||||
public_key=public_key,
|
||||
secret_key=secret_key,
|
||||
host=os.getenv("LANGFUSE_HOST", "https://cloud.langfuse.com"),
|
||||
)
|
||||
|
||||
# Then create callback handler with the same public_key
|
||||
# The handler will use the initialized client
|
||||
self._langfuse_handler = CallbackHandler(public_key=public_key)
|
||||
|
||||
# CallbackHandler auto-discovers credentials from environment variables
|
||||
self._langfuse_handler = CallbackHandler()
|
||||
logger.info(f"🤖 Langfuse callback handler initialized for {model_spec}")
|
||||
except Exception as e:
|
||||
# If Langfuse keys are set, we MUST fail fast
|
||||
@@ -224,6 +215,7 @@ class ModelFactory:
|
||||
model=model_name,
|
||||
project=config.gcp_project_id,
|
||||
location=config.gcp_location,
|
||||
timeout=config.request_timeout_seconds,
|
||||
max_retries=config.max_retries,
|
||||
callbacks=callbacks,
|
||||
)
|
||||
|
||||
@@ -6,6 +6,7 @@ from typing import Dict, Any
|
||||
from .providers.config import ProviderConfig
|
||||
|
||||
# Default model for cloud deployments - Gemini 3 Flash via Vertex AI
|
||||
# Note: Gemini 3 models require 'global' location (not regional like us-central1)
|
||||
DEFAULT_CLOUD_MODEL = "vertexai/gemini-3-flash-preview"
|
||||
|
||||
|
||||
@@ -33,7 +34,7 @@ class ModelRouter:
|
||||
if self._config.privacy_mode:
|
||||
return "ollama/llama3.2:latest"
|
||||
|
||||
# Default to Gemini 3 Flash for all cases (fast, cost-effective)
|
||||
# Default to Gemini 3 Flash for all cases (fast, cost-effective, latest capabilities)
|
||||
return DEFAULT_CLOUD_MODEL
|
||||
|
||||
|
||||
@@ -6,7 +6,6 @@ import os
|
||||
import shortuuid
|
||||
|
||||
from lyrics_transcriber.correction.handlers.levenshtein import LevenshteinHandler
|
||||
from lyrics_transcriber.correction.handlers.llm import LLMHandler
|
||||
from lyrics_transcriber.correction.handlers.no_space_punct_match import NoSpacePunctuationMatchHandler
|
||||
from lyrics_transcriber.correction.handlers.relaxed_word_count_match import RelaxedWordCountMatchHandler
|
||||
from lyrics_transcriber.correction.handlers.repeat import RepeatCorrectionHandler
|
||||
@@ -27,7 +26,6 @@ from lyrics_transcriber.correction.anchor_sequence import AnchorSequenceFinder
|
||||
from lyrics_transcriber.correction.handlers.base import GapCorrectionHandler
|
||||
from lyrics_transcriber.correction.handlers.extend_anchor import ExtendAnchorHandler
|
||||
from lyrics_transcriber.utils.word_utils import WordUtils
|
||||
from lyrics_transcriber.correction.handlers.llm_providers import OllamaProvider, OpenAIProvider
|
||||
|
||||
|
||||
class LyricsCorrector:
|
||||
@@ -57,60 +55,18 @@ class LyricsCorrector:
|
||||
]
|
||||
|
||||
# Create all handlers but respect enabled_handlers if provided
|
||||
# Note: Legacy LLMHandler removed - use AgenticCorrector via USE_AGENTIC_AI=1 instead
|
||||
all_handlers = [
|
||||
("ExtendAnchorHandler", ExtendAnchorHandler(logger=self.logger)),
|
||||
("WordCountMatchHandler", WordCountMatchHandler(logger=self.logger)),
|
||||
("SyllablesMatchHandler", SyllablesMatchHandler(logger=self.logger)),
|
||||
("RelaxedWordCountMatchHandler", RelaxedWordCountMatchHandler(logger=self.logger)),
|
||||
("NoSpacePunctuationMatchHandler", NoSpacePunctuationMatchHandler(logger=self.logger)),
|
||||
(
|
||||
"LLMHandler_Ollama_R17B",
|
||||
LLMHandler(
|
||||
provider=OllamaProvider(model="deepseek-r1:7b", logger=self.logger),
|
||||
name="LLMHandler_Ollama_R17B",
|
||||
logger=self.logger,
|
||||
cache_dir=self._cache_dir,
|
||||
),
|
||||
),
|
||||
("RepeatCorrectionHandler", RepeatCorrectionHandler(logger=self.logger)),
|
||||
("SoundAlikeHandler", SoundAlikeHandler(logger=self.logger)),
|
||||
("LevenshteinHandler", LevenshteinHandler(logger=self.logger)),
|
||||
]
|
||||
|
||||
# Add OpenRouter handlers only if API key is available
|
||||
if os.getenv("OPENROUTER_API_KEY"):
|
||||
openrouter_handlers = [
|
||||
(
|
||||
"LLMHandler_OpenRouter_Sonnet",
|
||||
LLMHandler(
|
||||
provider=OpenAIProvider(
|
||||
model="anthropic/claude-3-sonnet",
|
||||
api_key=os.getenv("OPENROUTER_API_KEY"),
|
||||
base_url="https://openrouter.ai/api/v1",
|
||||
logger=self.logger,
|
||||
),
|
||||
name="LLMHandler_OpenRouter_Sonnet",
|
||||
logger=self.logger,
|
||||
cache_dir=self._cache_dir,
|
||||
),
|
||||
),
|
||||
(
|
||||
"LLMHandler_OpenRouter_R1",
|
||||
LLMHandler(
|
||||
provider=OpenAIProvider(
|
||||
model="deepseek/deepseek-r1",
|
||||
api_key=os.getenv("OPENROUTER_API_KEY"),
|
||||
base_url="https://openrouter.ai/api/v1",
|
||||
logger=self.logger,
|
||||
),
|
||||
name="LLMHandler_OpenRouter_R1",
|
||||
logger=self.logger,
|
||||
cache_dir=self._cache_dir,
|
||||
),
|
||||
),
|
||||
]
|
||||
all_handlers.extend(openrouter_handlers)
|
||||
|
||||
# Store all handler information
|
||||
self.all_handlers = [
|
||||
{
|
||||
|
||||
@@ -1,293 +0,0 @@
|
||||
from typing import List, Optional, Tuple, Dict, Any, Union
|
||||
import logging
|
||||
import json
|
||||
from datetime import datetime
|
||||
from pathlib import Path
|
||||
|
||||
from lyrics_transcriber.types import GapSequence, WordCorrection
|
||||
from lyrics_transcriber.correction.handlers.base import GapCorrectionHandler
|
||||
from lyrics_transcriber.correction.handlers.word_operations import WordOperations
|
||||
from lyrics_transcriber.correction.handlers.llm_providers import LLMProvider
|
||||
|
||||
|
||||
class LLMHandler(GapCorrectionHandler):
|
||||
"""Uses an LLM to analyze and correct gaps by comparing with reference lyrics."""
|
||||
|
||||
def __init__(
|
||||
self, provider: LLMProvider, name: str, logger: Optional[logging.Logger] = None, cache_dir: Optional[Union[str, Path]] = None
|
||||
):
|
||||
super().__init__(logger)
|
||||
self.logger = logger or logging.getLogger(__name__)
|
||||
self.provider = provider
|
||||
self.name = name
|
||||
self.cache_dir = Path(cache_dir) if cache_dir else None
|
||||
|
||||
def _format_prompt(self, gap: GapSequence, data: Optional[Dict[str, Any]] = None) -> str:
|
||||
"""Format the prompt for the LLM with context about the gap and reference lyrics."""
|
||||
word_map = data.get("word_map", {})
|
||||
metadata = data.get("metadata", {}) if data else {}
|
||||
|
||||
if not word_map:
|
||||
self.logger.error("No word_map provided in data")
|
||||
return ""
|
||||
|
||||
# Format transcribed words with their IDs
|
||||
transcribed_words = [{"id": word_id, "text": word_map[word_id].text} for word_id in gap.transcribed_word_ids if word_id in word_map]
|
||||
|
||||
prompt = (
|
||||
"You are a lyrics correction expert. You will be given transcribed lyrics that may contain errors "
|
||||
"and reference lyrics from multiple sources. Your task is to analyze each word in the transcribed text "
|
||||
"and suggest specific corrections based on the reference lyrics.\n\n"
|
||||
"Each word has a unique ID. When suggesting corrections, you must specify the ID of the word being corrected. "
|
||||
"This ensures accuracy in applying your corrections.\n\n"
|
||||
"For each correction, specify:\n"
|
||||
"1. The word ID being corrected\n"
|
||||
"2. The correction type ('replace', 'split', 'combine', or 'delete')\n"
|
||||
"3. The corrected text\n"
|
||||
"4. Your confidence level\n"
|
||||
"5. The reason for the correction\n\n"
|
||||
)
|
||||
|
||||
# Add song context if available
|
||||
if metadata and metadata.get("artist") and metadata.get("title"):
|
||||
prompt += f"Song: {metadata['title']}\nArtist: {metadata['artist']}\n\n"
|
||||
|
||||
# Format transcribed words with IDs
|
||||
prompt += "Transcribed words:\n"
|
||||
for word in transcribed_words:
|
||||
prompt += f"- ID: {word['id']}, Text: '{word['text']}'\n"
|
||||
|
||||
prompt += "\nReference lyrics from different sources:\n"
|
||||
|
||||
# Add each reference source with words and their IDs
|
||||
for source, word_ids in gap.reference_word_ids.items():
|
||||
reference_words = [{"id": word_id, "text": word_map[word_id].text} for word_id in word_ids if word_id in word_map]
|
||||
prompt += f"\n{source} immediate context:\n"
|
||||
for word in reference_words:
|
||||
prompt += f"- ID: {word['id']}, Text: '{word['text']}'\n"
|
||||
|
||||
# Add full lyrics if available
|
||||
if metadata and metadata.get("full_reference_texts", {}).get(source):
|
||||
prompt += f"\nFull {source} lyrics:\n{metadata['full_reference_texts'][source]}\n"
|
||||
|
||||
# Add context about surrounding anchors if available
|
||||
if gap.preceding_anchor_id:
|
||||
preceding_anchor = next((a.anchor for a in data.get("anchor_sequences", []) if a.anchor.id == gap.preceding_anchor_id), None)
|
||||
if preceding_anchor:
|
||||
anchor_words = [
|
||||
{"id": word_id, "text": word_map[word_id].text}
|
||||
for word_id in preceding_anchor.transcribed_word_ids
|
||||
if word_id in word_map
|
||||
]
|
||||
prompt += "\nPreceding correct words:\n"
|
||||
for word in anchor_words:
|
||||
prompt += f"- ID: {word['id']}, Text: '{word['text']}'\n"
|
||||
|
||||
prompt += (
|
||||
"\nProvide corrections in the following JSON format:\n"
|
||||
"{\n"
|
||||
' "corrections": [\n'
|
||||
" {\n"
|
||||
' "word_id": "id_of_word_to_correct",\n'
|
||||
' "type": "replace|split|combine|delete",\n'
|
||||
' "corrected_text": "new text",\n'
|
||||
' "reference_word_id": "id_from_reference_lyrics", // Optional, use when matching a specific reference word\n'
|
||||
' "confidence": 0.9,\n'
|
||||
' "reason": "explanation of correction"\n'
|
||||
" }\n"
|
||||
" ]\n"
|
||||
"}\n\n"
|
||||
"Important rules:\n"
|
||||
"1. Always include the word_id for each correction\n"
|
||||
"2. For 'split' type, corrected_text should contain the space-separated words\n"
|
||||
"3. For 'combine' type, word_id should be the first word to combine\n"
|
||||
"4. Include reference_word_id when the correction matches a specific reference word\n"
|
||||
"5. Only suggest corrections when you're confident they improve the lyrics\n"
|
||||
"6. Preserve any existing words that match the reference lyrics\n"
|
||||
"7. Respond ONLY with the JSON object, no other text"
|
||||
)
|
||||
|
||||
return prompt
|
||||
|
||||
def can_handle(self, gap: GapSequence, data: Optional[Dict[str, Any]] = None) -> Tuple[bool, Dict[str, Any]]:
|
||||
"""LLM handler can attempt to handle any gap with reference words."""
|
||||
if not gap.reference_word_ids:
|
||||
self.logger.debug("No reference words available")
|
||||
return False, {}
|
||||
|
||||
return True, {}
|
||||
|
||||
def _write_debug_info(self, prompt: str, response: str, gap_index: int, audio_file_hash: Optional[str] = None) -> None:
|
||||
"""Write prompt and response to debug files."""
|
||||
if not self.cache_dir:
|
||||
self.logger.warning("No cache directory provided, skipping LLM debug output")
|
||||
return
|
||||
|
||||
timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
|
||||
debug_dir = self.cache_dir / "llm_debug"
|
||||
debug_dir.mkdir(exist_ok=True, parents=True)
|
||||
|
||||
hash_prefix = f"{audio_file_hash}_" if audio_file_hash else ""
|
||||
filename = debug_dir / f"llm_debug_{hash_prefix}{gap_index}_{timestamp}.txt"
|
||||
|
||||
debug_content = "=== LLM PROMPT ===\n" f"{prompt}\n\n" "=== LLM RESPONSE ===\n" f"{response}\n"
|
||||
|
||||
try:
|
||||
with open(filename, "w", encoding="utf-8") as f:
|
||||
f.write(debug_content)
|
||||
except IOError as e:
|
||||
self.logger.error(f"Failed to write LLM debug file: {e}")
|
||||
|
||||
def handle(self, gap: GapSequence, data: Optional[Dict[str, Any]] = None) -> List[WordCorrection]:
|
||||
"""Process the gap using the LLM and create corrections based on its response."""
|
||||
if not data or "word_map" not in data:
|
||||
self.logger.error("No word_map provided in data")
|
||||
return []
|
||||
|
||||
word_map = data["word_map"]
|
||||
transcribed_words = [word_map[word_id].text for word_id in gap.transcribed_word_ids if word_id in word_map]
|
||||
|
||||
# Calculate reference positions using the centralized method
|
||||
reference_positions = (
|
||||
WordOperations.calculate_reference_positions(gap, anchor_sequences=data.get("anchor_sequences", [])) or {}
|
||||
) # Ensure empty dict if None
|
||||
|
||||
prompt = self._format_prompt(gap, data)
|
||||
if not prompt:
|
||||
return []
|
||||
|
||||
# Get a unique index for this gap based on its position
|
||||
gap_index = gap.transcription_position
|
||||
|
||||
try:
|
||||
self.logger.debug(f"Processing gap words: {transcribed_words}")
|
||||
self.logger.debug(f"Reference word IDs: {gap.reference_word_ids}")
|
||||
|
||||
response = self.provider.generate_response(prompt)
|
||||
|
||||
# Write debug info to files
|
||||
self._write_debug_info(prompt, response, gap_index, audio_file_hash=data.get("audio_file_hash"))
|
||||
|
||||
try:
|
||||
corrections_data = json.loads(response)
|
||||
except json.JSONDecodeError as e:
|
||||
self.logger.error(f"Failed to parse LLM response as JSON: {e}")
|
||||
self.logger.error(f"Raw response content: {response}")
|
||||
return []
|
||||
|
||||
# Check if corrections exist and are non-empty
|
||||
if not corrections_data.get("corrections"):
|
||||
self.logger.debug("No corrections suggested by LLM")
|
||||
return []
|
||||
|
||||
corrections = []
|
||||
for correction in corrections_data["corrections"]:
|
||||
# Validate word_id exists in gap
|
||||
if correction["word_id"] not in gap.transcribed_word_ids:
|
||||
self.logger.error(f"LLM suggested correction for word_id {correction['word_id']} which is not in the gap")
|
||||
continue
|
||||
|
||||
# Get original word from word map
|
||||
original_word = word_map[correction["word_id"]]
|
||||
position = gap.transcription_position + gap.transcribed_word_ids.index(correction["word_id"])
|
||||
|
||||
self.logger.debug(f"Processing correction: {correction}")
|
||||
|
||||
if correction["type"] == "replace":
|
||||
self.logger.debug(
|
||||
f"Creating replacement: '{original_word.text}' -> '{correction['corrected_text']}' " f"at position {position}"
|
||||
)
|
||||
corrections.append(
|
||||
WordOperations.create_word_replacement_correction(
|
||||
original_word=original_word.text,
|
||||
corrected_word=correction["corrected_text"],
|
||||
original_position=position,
|
||||
source="LLM",
|
||||
confidence=correction["confidence"],
|
||||
reason=correction["reason"],
|
||||
handler=self.name,
|
||||
reference_positions=reference_positions,
|
||||
original_word_id=correction["word_id"],
|
||||
corrected_word_id=correction.get("reference_word_id"),
|
||||
)
|
||||
)
|
||||
elif correction["type"] == "split":
|
||||
split_words = correction["corrected_text"].split()
|
||||
self.logger.debug(f"Creating split: '{original_word.text}' -> {split_words} " f"at position {position}")
|
||||
|
||||
# Get reference word IDs if provided
|
||||
reference_word_ids = correction.get("reference_word_ids", [None] * len(split_words))
|
||||
|
||||
corrections.extend(
|
||||
WordOperations.create_word_split_corrections(
|
||||
original_word=original_word.text,
|
||||
reference_words=split_words,
|
||||
original_position=position,
|
||||
source="LLM",
|
||||
confidence=correction["confidence"],
|
||||
reason=correction["reason"],
|
||||
handler=self.name,
|
||||
reference_positions=reference_positions,
|
||||
original_word_id=correction["word_id"],
|
||||
corrected_word_ids=reference_word_ids,
|
||||
)
|
||||
)
|
||||
elif correction["type"] == "combine":
|
||||
# Get all word IDs to combine
|
||||
word_ids_to_combine = []
|
||||
current_idx = gap.transcribed_word_ids.index(correction["word_id"])
|
||||
words_needed = len(correction["corrected_text"].split())
|
||||
|
||||
if current_idx + words_needed <= len(gap.transcribed_word_ids):
|
||||
word_ids_to_combine = gap.transcribed_word_ids[current_idx : current_idx + words_needed]
|
||||
else:
|
||||
self.logger.error(f"Not enough words available to combine at position {position}")
|
||||
continue
|
||||
|
||||
words_to_combine = [word_map[word_id].text for word_id in word_ids_to_combine]
|
||||
|
||||
self.logger.debug(
|
||||
f"Creating combine: {words_to_combine} -> '{correction['corrected_text']}' " f"at position {position}"
|
||||
)
|
||||
|
||||
corrections.extend(
|
||||
WordOperations.create_word_combine_corrections(
|
||||
original_words=words_to_combine,
|
||||
reference_word=correction["corrected_text"],
|
||||
original_position=position,
|
||||
source="LLM",
|
||||
confidence=correction["confidence"],
|
||||
combine_reason=correction["reason"],
|
||||
delete_reason=f"Part of combining words: {correction['reason']}",
|
||||
handler=self.name,
|
||||
reference_positions=reference_positions,
|
||||
original_word_ids=word_ids_to_combine,
|
||||
corrected_word_id=correction.get("reference_word_id"),
|
||||
)
|
||||
)
|
||||
elif correction["type"] == "delete":
|
||||
self.logger.debug(f"Creating deletion: '{original_word.text}' at position {position}")
|
||||
corrections.append(
|
||||
WordCorrection(
|
||||
original_word=original_word.text,
|
||||
corrected_word="",
|
||||
segment_index=0,
|
||||
original_position=position,
|
||||
confidence=correction["confidence"],
|
||||
source="LLM",
|
||||
reason=correction["reason"],
|
||||
alternatives={},
|
||||
is_deletion=True,
|
||||
handler=self.name,
|
||||
reference_positions=reference_positions,
|
||||
word_id=correction["word_id"],
|
||||
corrected_word_id=None,
|
||||
)
|
||||
)
|
||||
|
||||
self.logger.debug(f"Created {len(corrections)} corrections: {[f'{c.original_word}->{c.corrected_word}' for c in corrections]}")
|
||||
return corrections
|
||||
|
||||
except Exception as e:
|
||||
self.logger.error(f"Unexpected error in LLM handler: {e}")
|
||||
return []
|
||||
@@ -1,60 +0,0 @@
|
||||
from abc import ABC, abstractmethod
|
||||
from typing import Optional
|
||||
import logging
|
||||
from ollama import chat as ollama_chat
|
||||
import openai
|
||||
|
||||
|
||||
class LLMProvider(ABC):
|
||||
"""Abstract base class for LLM providers."""
|
||||
|
||||
def __init__(self, logger: Optional[logging.Logger] = None):
|
||||
self.logger = logger or logging.getLogger(__name__)
|
||||
|
||||
@abstractmethod
|
||||
def generate_response(self, prompt: str, **kwargs) -> str:
|
||||
"""Generate a response from the LLM.
|
||||
|
||||
Args:
|
||||
prompt: The prompt to send to the LLM
|
||||
**kwargs: Additional provider-specific parameters
|
||||
|
||||
Returns:
|
||||
str: The LLM's response
|
||||
"""
|
||||
pass
|
||||
|
||||
|
||||
class OllamaProvider(LLMProvider):
|
||||
"""Provider for local Ollama models."""
|
||||
|
||||
def __init__(self, model: str, logger: Optional[logging.Logger] = None):
|
||||
super().__init__(logger)
|
||||
self.model = model
|
||||
|
||||
def generate_response(self, prompt: str, **kwargs) -> str:
|
||||
try:
|
||||
response = ollama_chat(model=self.model, messages=[{"role": "user", "content": prompt}], format="json")
|
||||
return response.message.content
|
||||
except Exception as e:
|
||||
self.logger.error(f"Error generating Ollama response: {e}")
|
||||
raise
|
||||
|
||||
|
||||
class OpenAIProvider(LLMProvider):
|
||||
"""Provider for OpenAI-compatible APIs (including OpenRouter)."""
|
||||
|
||||
def __init__(self, model: str, api_key: str, base_url: Optional[str] = None, logger: Optional[logging.Logger] = None):
|
||||
super().__init__(logger)
|
||||
self.model = model
|
||||
self.client = openai.OpenAI(api_key=api_key, base_url=base_url)
|
||||
|
||||
def generate_response(self, prompt: str, **kwargs) -> str:
|
||||
try:
|
||||
response = self.client.chat.completions.create(
|
||||
model=self.model, messages=[{"role": "user", "content": prompt}], response_format={"type": "json_object"}, **kwargs
|
||||
)
|
||||
return response.choices[0].message.content
|
||||
except Exception as e:
|
||||
self.logger.error(f"Error generating OpenAI response: {e}")
|
||||
raise
|
||||
Generated
+936
-19
File diff suppressed because it is too large.
Load diff
@@ -55,7 +55,7 @@ langchain-core = ">=0.3.0"
|
||||
langchain-openai = ">=0.2.0"
|
||||
langchain-anthropic = ">=0.2.0"
|
||||
langchain-ollama = ">=0.2.0"
|
||||
langchain-google-vertexai = ">=2.0.0"
|
||||
langchain-google-vertexai = ">=3.1.1"
|
||||
langfuse = ">=3.0.0"
|
||||
pydantic = ">=2.7.0"
|
||||
jiwer = ">=3.0.0"
|
||||
|
||||
@@ -62,6 +62,25 @@ def test_logger():
|
||||
return logger
|
||||
|
||||
|
||||
def _reset_langfuse_state():
|
||||
"""Helper to reset LangFuse singletons."""
|
||||
try:
|
||||
from lyrics_transcriber.correction.agentic.prompts.langfuse_prompts import reset_prompt_service
|
||||
from lyrics_transcriber.correction.agentic.observability.langfuse_integration import reset_langfuse_client
|
||||
reset_prompt_service()
|
||||
reset_langfuse_client()
|
||||
except ImportError:
|
||||
pass # Module may not be available in all test contexts
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def reset_langfuse_singletons():
|
||||
"""Reset LangFuse singletons before and after each test to avoid state leakage."""
|
||||
_reset_langfuse_state()
|
||||
yield # Run the test
|
||||
_reset_langfuse_state()
|
||||
|
||||
|
||||
@pytest.fixture(scope="session", autouse=True)
|
||||
def cleanup_test_directories():
|
||||
"""Clean up test directories after all tests complete."""
|
||||
|
||||
@@ -0,0 +1,309 @@
|
||||
"""Tests for LangFuse prompt management integration."""
|
||||
|
||||
import pytest
|
||||
from unittest.mock import Mock, patch, MagicMock
|
||||
import os
|
||||
|
||||
from lyrics_transcriber.correction.agentic.prompts.langfuse_prompts import (
|
||||
LangFusePromptService,
|
||||
LangFusePromptError,
|
||||
LangFuseDatasetError,
|
||||
get_prompt_service,
|
||||
reset_prompt_service,
|
||||
)
|
||||
from lyrics_transcriber.correction.agentic.observability.langfuse_integration import (
|
||||
get_langfuse_client,
|
||||
reset_langfuse_client,
|
||||
fetch_prompt,
|
||||
fetch_dataset,
|
||||
is_langfuse_configured,
|
||||
LangFuseConfigError,
|
||||
)
|
||||
|
||||
|
||||
class TestLangFusePromptService:
|
||||
"""Tests for the LangFusePromptService class."""
|
||||
|
||||
def setup_method(self):
|
||||
"""Reset singletons before each test."""
|
||||
reset_prompt_service()
|
||||
reset_langfuse_client()
|
||||
|
||||
def teardown_method(self):
|
||||
"""Clean up after each test."""
|
||||
reset_prompt_service()
|
||||
reset_langfuse_client()
|
||||
|
||||
def test_service_uses_hardcoded_when_langfuse_not_configured(self):
|
||||
"""Service falls back to hardcoded prompts when LangFuse keys not set."""
|
||||
with patch.dict(os.environ, {}, clear=True):
|
||||
# Remove LangFuse keys
|
||||
os.environ.pop("LANGFUSE_PUBLIC_KEY", None)
|
||||
os.environ.pop("LANGFUSE_SECRET_KEY", None)
|
||||
|
||||
service = LangFusePromptService()
|
||||
|
||||
# Should not use LangFuse
|
||||
assert not service._use_langfuse
|
||||
assert service._client is None
|
||||
|
||||
def test_service_uses_langfuse_when_configured(self):
|
||||
"""Service uses LangFuse when keys are set."""
|
||||
with patch.dict(os.environ, {
|
||||
"LANGFUSE_PUBLIC_KEY": "pk-test",
|
||||
"LANGFUSE_SECRET_KEY": "sk-test",
|
||||
}):
|
||||
with patch("langfuse.Langfuse") as mock_langfuse:
|
||||
mock_client = Mock()
|
||||
mock_langfuse.return_value = mock_client
|
||||
|
||||
service = LangFusePromptService()
|
||||
|
||||
assert service._use_langfuse
|
||||
assert service._client == mock_client
|
||||
|
||||
def test_service_fails_fast_on_init_error(self):
|
||||
"""Service raises error if LangFuse keys set but init fails."""
|
||||
with patch.dict(os.environ, {
|
||||
"LANGFUSE_PUBLIC_KEY": "pk-test",
|
||||
"LANGFUSE_SECRET_KEY": "sk-test",
|
||||
}):
|
||||
with patch("langfuse.Langfuse") as mock_langfuse:
|
||||
mock_langfuse.side_effect = Exception("Connection failed")
|
||||
|
||||
with pytest.raises(RuntimeError) as excinfo:
|
||||
LangFusePromptService()
|
||||
|
||||
assert "initialization failed" in str(excinfo.value)
|
||||
|
||||
def test_get_classification_prompt_hardcoded_fallback(self):
|
||||
"""get_classification_prompt returns hardcoded prompt when LangFuse not configured."""
|
||||
with patch.dict(os.environ, {}, clear=True):
|
||||
os.environ.pop("LANGFUSE_PUBLIC_KEY", None)
|
||||
os.environ.pop("LANGFUSE_SECRET_KEY", None)
|
||||
|
||||
service = LangFusePromptService()
|
||||
prompt = service.get_classification_prompt(
|
||||
gap_text="out, I'm starting",
|
||||
preceding_words="Oh no, was it",
|
||||
following_words="gonna sleep",
|
||||
reference_contexts={"genius": "now, I'm starting"},
|
||||
artist="Test Artist",
|
||||
title="Test Song",
|
||||
gap_id="gap_1",
|
||||
)
|
||||
|
||||
# Should contain key elements of the hardcoded prompt
|
||||
assert "transcription errors" in prompt
|
||||
assert "SOUND_ALIKE" in prompt
|
||||
assert "PUNCTUATION_ONLY" in prompt
|
||||
assert "gap_1" in prompt
|
||||
assert "Test Artist" in prompt
|
||||
|
||||
def test_get_classification_prompt_from_langfuse(self):
|
||||
"""get_classification_prompt fetches from LangFuse when configured."""
|
||||
with patch.dict(os.environ, {
|
||||
"LANGFUSE_PUBLIC_KEY": "pk-test",
|
||||
"LANGFUSE_SECRET_KEY": "sk-test",
|
||||
}):
|
||||
# Create mock client
|
||||
mock_client = Mock()
|
||||
|
||||
# Mock prompt
|
||||
mock_prompt = Mock()
|
||||
mock_prompt.compile.return_value = "Compiled prompt with {{gap_text}}"
|
||||
mock_client.get_prompt.return_value = mock_prompt
|
||||
|
||||
# Mock dataset
|
||||
mock_dataset = Mock()
|
||||
mock_item = Mock()
|
||||
mock_item.input = {"category": "sound_alike", "gap_text": "example"}
|
||||
mock_dataset.items = [mock_item]
|
||||
mock_client.get_dataset.return_value = mock_dataset
|
||||
|
||||
with patch("langfuse.Langfuse", return_value=mock_client):
|
||||
service = LangFusePromptService()
|
||||
prompt = service.get_classification_prompt(
|
||||
gap_text="test gap",
|
||||
preceding_words="before",
|
||||
following_words="after",
|
||||
reference_contexts={"source": "reference"},
|
||||
gap_id="gap_1",
|
||||
)
|
||||
|
||||
# Verify prompt was returned from compile
|
||||
assert prompt == "Compiled prompt with {{gap_text}}"
|
||||
# Verify LangFuse was called with label parameter
|
||||
mock_client.get_prompt.assert_called_once_with("gap-classifier", label="production")
|
||||
mock_client.get_dataset.assert_called_once_with("gap-classifier-examples")
|
||||
mock_prompt.compile.assert_called_once()
|
||||
|
||||
def test_service_raises_on_prompt_fetch_error(self):
|
||||
"""Service raises LangFusePromptError on fetch failure."""
|
||||
with patch.dict(os.environ, {
|
||||
"LANGFUSE_PUBLIC_KEY": "pk-test",
|
||||
"LANGFUSE_SECRET_KEY": "sk-test",
|
||||
}):
|
||||
mock_client = Mock()
|
||||
mock_client.get_prompt.side_effect = Exception("Network error")
|
||||
|
||||
with patch("langfuse.Langfuse", return_value=mock_client):
|
||||
service = LangFusePromptService()
|
||||
|
||||
with pytest.raises(LangFusePromptError) as excinfo:
|
||||
service.get_classification_prompt(
|
||||
gap_text="test",
|
||||
preceding_words="before",
|
||||
following_words="after",
|
||||
reference_contexts={},
|
||||
)
|
||||
|
||||
assert "Failed to fetch" in str(excinfo.value)
|
||||
|
||||
|
||||
class TestLangFuseIntegration:
|
||||
"""Tests for the langfuse_integration module functions."""
|
||||
|
||||
def setup_method(self):
|
||||
"""Reset singletons before each test."""
|
||||
reset_langfuse_client()
|
||||
|
||||
def teardown_method(self):
|
||||
"""Clean up after each test."""
|
||||
reset_langfuse_client()
|
||||
|
||||
def test_is_langfuse_configured_false_when_no_keys(self):
|
||||
"""is_langfuse_configured returns False when keys not set."""
|
||||
with patch.dict(os.environ, {}, clear=True):
|
||||
os.environ.pop("LANGFUSE_PUBLIC_KEY", None)
|
||||
os.environ.pop("LANGFUSE_SECRET_KEY", None)
|
||||
|
||||
assert not is_langfuse_configured()
|
||||
|
||||
def test_is_langfuse_configured_true_when_keys_set(self):
|
||||
"""is_langfuse_configured returns True when both keys set."""
|
||||
with patch.dict(os.environ, {
|
||||
"LANGFUSE_PUBLIC_KEY": "pk-test",
|
||||
"LANGFUSE_SECRET_KEY": "sk-test",
|
||||
}):
|
||||
assert is_langfuse_configured()
|
||||
|
||||
def test_get_langfuse_client_returns_none_when_not_configured(self):
|
||||
"""get_langfuse_client returns None when keys not set."""
|
||||
with patch.dict(os.environ, {}, clear=True):
|
||||
os.environ.pop("LANGFUSE_PUBLIC_KEY", None)
|
||||
os.environ.pop("LANGFUSE_SECRET_KEY", None)
|
||||
|
||||
client = get_langfuse_client()
|
||||
assert client is None
|
||||
|
||||
def test_get_langfuse_client_fails_fast_on_error(self):
|
||||
"""get_langfuse_client raises LangFuseConfigError on init failure."""
|
||||
with patch.dict(os.environ, {
|
||||
"LANGFUSE_PUBLIC_KEY": "pk-test",
|
||||
"LANGFUSE_SECRET_KEY": "sk-test",
|
||||
}):
|
||||
with patch("langfuse.Langfuse") as mock_langfuse:
|
||||
mock_langfuse.side_effect = Exception("Auth failed")
|
||||
|
||||
with pytest.raises(LangFuseConfigError) as excinfo:
|
||||
get_langfuse_client()
|
||||
|
||||
assert "initialization failed" in str(excinfo.value)
|
||||
|
||||
def test_fetch_prompt_raises_when_not_configured(self):
|
||||
"""fetch_prompt raises LangFuseConfigError when not configured."""
|
||||
with patch.dict(os.environ, {}, clear=True):
|
||||
os.environ.pop("LANGFUSE_PUBLIC_KEY", None)
|
||||
os.environ.pop("LANGFUSE_SECRET_KEY", None)
|
||||
|
||||
with pytest.raises(LangFuseConfigError):
|
||||
fetch_prompt("test-prompt")
|
||||
|
||||
def test_fetch_dataset_raises_when_not_configured(self):
|
||||
"""fetch_dataset raises LangFuseConfigError when not configured."""
|
||||
with patch.dict(os.environ, {}, clear=True):
|
||||
os.environ.pop("LANGFUSE_PUBLIC_KEY", None)
|
||||
os.environ.pop("LANGFUSE_SECRET_KEY", None)
|
||||
|
||||
with pytest.raises(LangFuseConfigError):
|
||||
fetch_dataset("test-dataset")
|
||||
|
||||
|
||||
class TestPromptServiceSingleton:
|
||||
"""Tests for the prompt service singleton pattern."""
|
||||
|
||||
def setup_method(self):
|
||||
"""Reset singletons before each test."""
|
||||
reset_prompt_service()
|
||||
reset_langfuse_client()
|
||||
|
||||
def teardown_method(self):
|
||||
"""Clean up after each test."""
|
||||
reset_prompt_service()
|
||||
reset_langfuse_client()
|
||||
|
||||
def test_get_prompt_service_returns_same_instance(self):
|
||||
"""get_prompt_service returns the same instance on subsequent calls."""
|
||||
with patch.dict(os.environ, {}, clear=True):
|
||||
os.environ.pop("LANGFUSE_PUBLIC_KEY", None)
|
||||
os.environ.pop("LANGFUSE_SECRET_KEY", None)
|
||||
|
||||
service1 = get_prompt_service()
|
||||
service2 = get_prompt_service()
|
||||
|
||||
assert service1 is service2
|
||||
|
||||
def test_reset_prompt_service_clears_singleton(self):
|
||||
"""reset_prompt_service clears the singleton instance."""
|
||||
with patch.dict(os.environ, {}, clear=True):
|
||||
os.environ.pop("LANGFUSE_PUBLIC_KEY", None)
|
||||
os.environ.pop("LANGFUSE_SECRET_KEY", None)
|
||||
|
||||
service1 = get_prompt_service()
|
||||
reset_prompt_service()
|
||||
service2 = get_prompt_service()
|
||||
|
||||
assert service1 is not service2
|
||||
|
||||
|
||||
class TestBuildClassificationPrompt:
|
||||
"""Tests for the build_classification_prompt function."""
|
||||
|
||||
def setup_method(self):
|
||||
"""Reset singletons before each test."""
|
||||
reset_prompt_service()
|
||||
reset_langfuse_client()
|
||||
|
||||
def teardown_method(self):
|
||||
"""Clean up after each test."""
|
||||
reset_prompt_service()
|
||||
reset_langfuse_client()
|
||||
|
||||
def test_build_classification_prompt_works_without_langfuse(self):
|
||||
"""build_classification_prompt works when LangFuse not configured."""
|
||||
from lyrics_transcriber.correction.agentic.prompts.classifier import build_classification_prompt
|
||||
|
||||
with patch.dict(os.environ, {}, clear=True):
|
||||
os.environ.pop("LANGFUSE_PUBLIC_KEY", None)
|
||||
os.environ.pop("LANGFUSE_SECRET_KEY", None)
|
||||
|
||||
prompt = build_classification_prompt(
|
||||
gap_text="test gap text",
|
||||
preceding_words="words before",
|
||||
following_words="words after",
|
||||
reference_contexts={"genius": "reference text"},
|
||||
artist="Artist Name",
|
||||
title="Song Title",
|
||||
gap_id="gap_123",
|
||||
)
|
||||
|
||||
# Verify prompt contains expected content
|
||||
assert "test gap text" in prompt
|
||||
assert "words before" in prompt
|
||||
assert "words after" in prompt
|
||||
assert "gap_123" in prompt
|
||||
assert "Artist Name" in prompt
|
||||
assert "Song Title" in prompt
|
||||
assert "GENIUS" in prompt # Source name should be uppercase
|
||||
assert "SOUND_ALIKE" in prompt # Categories should be present
|
||||
@@ -284,9 +284,13 @@ class TestRepeatedSectionHandler:
|
||||
|
||||
class TestClassificationPrompt:
|
||||
"""Test classification prompt generation."""
|
||||
|
||||
def test_prompt_includes_all_context(self):
|
||||
|
||||
def test_prompt_includes_all_context(self, monkeypatch):
|
||||
"""Test that prompt includes all required context."""
|
||||
# Clear LangFuse env vars to force hardcoded fallback
|
||||
monkeypatch.delenv("LANGFUSE_PUBLIC_KEY", raising=False)
|
||||
monkeypatch.delenv("LANGFUSE_SECRET_KEY", raising=False)
|
||||
|
||||
prompt = build_classification_prompt(
|
||||
gap_text="out I'm starting over",
|
||||
preceding_words="Oh no, was it worth it? Starting",
|
||||
|
||||
Generated
+496
-27
@@ -486,6 +486,72 @@ files = [
|
||||
[package.dependencies]
|
||||
numpy = {version = ">=1.19.0,<3.0.0", markers = "python_version >= \"3.9\""}
|
||||
|
||||
[[package]]
|
||||
name = "bottleneck"
|
||||
version = "1.6.0"
|
||||
description = "Fast NumPy array functions written in C"
|
||||
optional = false
|
||||
python-versions = ">=3.10"
|
||||
groups = ["main"]
|
||||
files = [
|
||||
{file = "bottleneck-1.6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:40de6be68218ba32cd15addbf4ad7bbbf0075b5c5c4347c579aeae110a5c9a96"},
|
||||
{file = "bottleneck-1.6.0-cp310-cp310-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:1ad1882ba8c8da1f404de2610b45b05291e39eec56150270b03b5b25cf2bbb7f"},
|
||||
{file = "bottleneck-1.6.0-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f29b14b0ba5a816df6ab559add415c88ea8cf2146364e55f5f4c24ff7c85e494"},
|
||||
{file = "bottleneck-1.6.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:17c227ed361cf9a2ab3751a727620298faca9a1e33dd76711ae80834cf34b254"},
|
||||
{file = "bottleneck-1.6.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:d278b5633cea38bdae6eaf7df23d54ecb5e4db52f2ebc13fe40c0e738842f2a1"},
|
||||
{file = "bottleneck-1.6.0-cp310-cp310-win32.whl", hash = "sha256:26c87c2f6364d82b67eab7218f0346e9c42f336088ca4e19d77dc76eecf272fc"},
|
||||
{file = "bottleneck-1.6.0-cp310-cp310-win_amd64.whl", hash = "sha256:9d33bcd60a13d0603f5db9d953352a3c098242c46f8f919290fd11c54b42b9e5"},
|
||||
{file = "bottleneck-1.6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:69ef4514782afe39db2497aaea93b1c167ab7ab3bc5e3930500ef9cf11841db7"},
|
||||
{file = "bottleneck-1.6.0-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:727363f99edc6dc83d52ed28224d4cb858c07a01c336c7499c0c2e5dd4fd3e4a"},
|
||||
{file = "bottleneck-1.6.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:847671a9e392220d1dfd2ff2524b4d61ec47b2a36ea78e169d2aa357fd9d933a"},
|
||||
{file = "bottleneck-1.6.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:daef2603ab7b4ec4f032bb54facf5fa92dacd3a264c2fd9677c9fc22bcb5a245"},
|
||||
{file = "bottleneck-1.6.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:fc7f09bda980d967f2e9f1a746eda57479f824f66de0b92b9835c431a8c922d4"},
|
||||
{file = "bottleneck-1.6.0-cp311-cp311-win32.whl", hash = "sha256:1f78bad13ad190180f73cceb92d22f4101bde3d768f4647030089f704ae7cac7"},
|
||||
{file = "bottleneck-1.6.0-cp311-cp311-win_amd64.whl", hash = "sha256:8f2adef59fdb9edf2983fe3a4c07e5d1b677c43e5669f4711da2c3daad8321ad"},
|
||||
{file = "bottleneck-1.6.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:3bb16a16a86a655fdbb34df672109a8a227bb5f9c9cf5bb8ae400a639bc52fa3"},
|
||||
{file = "bottleneck-1.6.0-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:0fbf5d0787af9aee6cef4db9cdd14975ce24bd02e0cc30155a51411ebe2ff35f"},
|
||||
{file = "bottleneck-1.6.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d08966f4a22384862258940346a72087a6f7cebb19038fbf3a3f6690ee7fd39f"},
|
||||
{file = "bottleneck-1.6.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:604f0b898b43b7bc631c564630e936a8759d2d952641c8b02f71e31dbcd9deaa"},
|
||||
{file = "bottleneck-1.6.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:d33720bad761e642abc18eda5f188ff2841191c9f63f9d0c052245decc0faeb9"},
|
||||
{file = "bottleneck-1.6.0-cp312-cp312-win32.whl", hash = "sha256:a1e5907ec2714efbe7075d9207b58c22ab6984a59102e4ecd78dced80dab8374"},
|
||||
{file = "bottleneck-1.6.0-cp312-cp312-win_amd64.whl", hash = "sha256:81e3822499f057a917b7d3972ebc631ac63c6bbcc79ad3542a66c4c40634e3a6"},
|
||||
{file = "bottleneck-1.6.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:d015de414ca016ebe56440bdf5d3d1204085080527a3c51f5b7b7a3e704fe6fd"},
|
||||
{file = "bottleneck-1.6.0-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:456757c9525b0b12356f472e38020ed4b76b18375fd76e055f8d33fb62956f5e"},
|
||||
{file = "bottleneck-1.6.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1c65254d51b6063c55f6272f175e867e2078342ae75f74be29d6612e9627b2c0"},
|
||||
{file = "bottleneck-1.6.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a172322895fbb79c6127474f1b0db0866895f0b804a18d5c6b841fea093927fe"},
|
||||
{file = "bottleneck-1.6.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:d5e81b642eb0d5a5bf00312598d7ed142d389728b694322a118c26813f3d1fa9"},
|
||||
{file = "bottleneck-1.6.0-cp313-cp313-win32.whl", hash = "sha256:543d3a89d22880cd322e44caff859af6c0489657bf9897977d1f5d3d3f77299c"},
|
||||
{file = "bottleneck-1.6.0-cp313-cp313-win_amd64.whl", hash = "sha256:48a44307d604ceb81e256903e5d57d3adb96a461b1d3c6a69baa2c67e823bd36"},
|
||||
{file = "bottleneck-1.6.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:547e6715115867c4657c9ae8cc5ddac1fec8fdad66690be3a322a7488721b06b"},
|
||||
{file = "bottleneck-1.6.0-cp313-cp313t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:5e4a4a6e05b6f014c307969129e10d1a0afd18f3a2c127b085532a4a76677aef"},
|
||||
{file = "bottleneck-1.6.0-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2baae0d1589b4a520b2f9cf03528c0c8b20717b3f05675e212ec2200cf628f12"},
|
||||
{file = "bottleneck-1.6.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:2e407139b322f01d8d5b6b2e8091b810f48a25c7fa5c678cfcdc420dfe8aea0a"},
|
||||
{file = "bottleneck-1.6.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:1adefb89b92aba6de9c6ea871d99bcd29d519f4fb012cc5197917813b4fc2c7f"},
|
||||
{file = "bottleneck-1.6.0-cp313-cp313t-win32.whl", hash = "sha256:64b8690393494074923780f6abdf5f5577d844b9d9689725d1575a936e74e5f0"},
|
||||
{file = "bottleneck-1.6.0-cp313-cp313t-win_amd64.whl", hash = "sha256:cb67247f65dcdf62af947c76c6c8b77d9f0ead442cac0edbaa17850d6da4e48d"},
|
||||
{file = "bottleneck-1.6.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:98f1d789042511a0f042b3bdcd2903e8567e956d3aa3be189cce3746daeb8550"},
|
||||
{file = "bottleneck-1.6.0-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:1fad24c99e39ad7623fc2a76d37feb26bd32e4dd170885edf4dbf4bfce2199a3"},
|
||||
{file = "bottleneck-1.6.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:643e61e50a6f993debc399b495a1609a55b3bd76b057e433e4089505d9f605c7"},
|
||||
{file = "bottleneck-1.6.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:fa668efbe4c6b200524ea0ebd537212da9b9801287138016fdf64119d6fcf201"},
|
||||
{file = "bottleneck-1.6.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:9f7dd35262e89e28fedd79d45022394b1fa1aceb61d2e747c6d6842e50546daa"},
|
||||
{file = "bottleneck-1.6.0-cp314-cp314-win32.whl", hash = "sha256:bd90bec3c470b7fdfafc2fbdcd7a1c55a4e57b5cdad88d40eea5bc9bab759bf1"},
|
||||
{file = "bottleneck-1.6.0-cp314-cp314-win_amd64.whl", hash = "sha256:b43b6d36a62ffdedc6368cf9a708e4d0a30d98656c2b5f33d88894e1bcfd6857"},
|
||||
{file = "bottleneck-1.6.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:53296707a8e195b5dcaa804b714bd222b5e446bd93cd496008122277eb43fa87"},
|
||||
{file = "bottleneck-1.6.0-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:d6df19cc48a83efd70f6d6874332aa31c3f5ca06a98b782449064abbd564cf0e"},
|
||||
{file = "bottleneck-1.6.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:96bb3a52cb3c0aadfedce3106f93ab940a49c9d35cd4ed612e031f6deb27e80f"},
|
||||
{file = "bottleneck-1.6.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:d1db9e831b69d5595b12e79aeb04cb02873db35576467c8dd26cdc1ee6b74581"},
|
||||
{file = "bottleneck-1.6.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:4dd7ac619570865fcb7a0e8925df418005f076286ad2c702dd0f447231d7a055"},
|
||||
{file = "bottleneck-1.6.0-cp314-cp314t-win32.whl", hash = "sha256:7fb694165df95d428fe00b98b9ea7d126ef786c4a4b7d43ae2530248396cadcb"},
|
||||
{file = "bottleneck-1.6.0-cp314-cp314t-win_amd64.whl", hash = "sha256:174b80930ce82bd8456c67f1abb28a5975c68db49d254783ce2cb6983b4fea40"},
|
||||
{file = "bottleneck-1.6.0.tar.gz", hash = "sha256:028d46ee4b025ad9ab4d79924113816f825f62b17b87c9e1d0d8ce144a4a0e31"},
|
||||
]
|
||||
|
||||
[package.dependencies]
|
||||
numpy = "*"
|
||||
|
||||
[package.extras]
|
||||
doc = ["gitpython", "numpydoc", "sphinx"]
|
||||
|
||||
[[package]]
|
||||
name = "build"
|
||||
version = "1.3.0"
|
||||
@@ -2140,8 +2206,8 @@ grpcio-status = [
|
||||
{version = ">=1.33.2,<2.0.0", optional = true, markers = "extra == \"grpc\""},
|
||||
]
|
||||
proto-plus = [
|
||||
{version = ">=1.25.0,<2.0.0", markers = "python_version >= \"3.13\""},
|
||||
{version = ">=1.22.3,<2.0.0"},
|
||||
{version = ">=1.25.0,<2.0.0", markers = "python_version >= \"3.13\""},
|
||||
]
|
||||
protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<7.0.0"
|
||||
requests = ">=2.18.0,<3.0.0"
|
||||
@@ -2186,6 +2252,7 @@ files = [
|
||||
[package.dependencies]
|
||||
cachetools = ">=2.0.0,<7.0"
|
||||
pyasn1-modules = ">=0.2.1"
|
||||
requests = {version = ">=2.20.0,<3.0.0", optional = true, markers = "extra == \"requests\""}
|
||||
rsa = ">=3.1.4,<5"
|
||||
|
||||
[package.extras]
|
||||
@@ -2234,6 +2301,98 @@ requests-oauthlib = ">=0.7.0"
|
||||
[package.extras]
|
||||
tool = ["click (>=6.0.0)"]
|
||||
|
||||
[[package]]
|
||||
name = "google-cloud-aiplatform"
|
||||
version = "1.132.0"
|
||||
description = "Vertex AI API client library"
|
||||
optional = false
|
||||
python-versions = ">=3.9"
|
||||
groups = ["main"]
|
||||
files = [
|
||||
{file = "google_cloud_aiplatform-1.132.0-py2.py3-none-any.whl", hash = "sha256:4e68673a61f6f5700f607fb35baf38015b06351175706fc25b6bc5f436741bd8"},
|
||||
{file = "google_cloud_aiplatform-1.132.0.tar.gz", hash = "sha256:345d113ffe2b6f705810453418dc75f3e0ad9354e499be75f6dac5f1464d30b4"},
|
||||
]
|
||||
|
||||
[package.dependencies]
|
||||
docstring_parser = "<1"
|
||||
google-api-core = {version = ">=1.34.1,<2.0.dev0 || >=2.8.dev0,<3.0.0", extras = ["grpc"]}
|
||||
google-auth = ">=2.45.0,<3.0.0"
|
||||
google-cloud-bigquery = ">=1.15.0,<3.20.0 || >3.20.0,<4.0.0"
|
||||
google-cloud-resource-manager = ">=1.3.3,<3.0.0"
|
||||
google-cloud-storage = [
|
||||
{version = ">=1.32.0,<4.0.0", markers = "python_version < \"3.13\""},
|
||||
{version = ">=2.10.0,<4.0.0", markers = "python_version >= \"3.13\""},
|
||||
]
|
||||
google-genai = ">=1.37.0,<2.0.0"
|
||||
packaging = ">=14.3"
|
||||
proto-plus = ">=1.22.3,<2.0.0"
|
||||
protobuf = ">=3.20.2,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<7.0.0"
|
||||
pydantic = "<3"
|
||||
shapely = "<3.0.0"
|
||||
typing_extensions = "*"
|
||||
|
||||
[package.extras]
|
||||
adk = ["google-adk (>=1.0.0,<2.0.0)", "opentelemetry-instrumentation-google-genai (>=0.3b0,<1.0.0)"]
|
||||
ag2 = ["ag2[gemini]", "openinference-instrumentation-autogen (>=0.1.6,<0.2)"]
|
||||
ag2-testing = ["absl-py", "ag2[gemini]", "cloudpickle (>=3.0,<4.0)", "google-cloud-trace (<2)", "openinference-instrumentation-autogen (>=0.1.6,<0.2)", "opentelemetry-exporter-gcp-logging (>=1.11.0a0,<2.0.0)", "opentelemetry-exporter-gcp-trace (<2)", "opentelemetry-exporter-otlp-proto-http (<2)", "opentelemetry-sdk (<2)", "pydantic (>=2.11.1,<3)", "pytest-xdist", "typing_extensions"]
|
||||
agent-engines = ["cloudpickle (>=3.0,<4.0)", "google-cloud-logging (<4)", "google-cloud-trace (<2)", "opentelemetry-exporter-gcp-logging (>=1.11.0a0,<2.0.0)", "opentelemetry-exporter-gcp-trace (<2)", "opentelemetry-exporter-otlp-proto-http (<2)", "opentelemetry-sdk (<2)", "packaging (>=24.0)", "pydantic (>=2.11.1,<3)", "typing_extensions"]
|
||||
autologging = ["mlflow (>=1.27.0) ; python_version >= \"3.13\"", "mlflow (>=1.27.0,<=2.16.0) ; python_version < \"3.13\""]
|
||||
cloud-profiler = ["tensorboard-plugin-profile (>=2.4.0,<2.18.0)", "werkzeug (>=2.0.0,<4.0.0)"]
|
||||
datasets = ["pyarrow (>=10.0.1) ; python_version == \"3.11\"", "pyarrow (>=14.0.0) ; python_version >= \"3.12\"", "pyarrow (>=3.0.0,<8.0.0) ; python_version < \"3.11\""]
|
||||
endpoint = ["requests (>=2.28.1)", "requests-toolbelt (<=1.0.0)"]
|
||||
evaluation = ["jsonschema", "litellm (>=1.72.4,!=1.77.2,!=1.77.3,!=1.77.4)", "pandas (>=1.0.0)", "pyyaml", "ruamel.yaml", "scikit-learn (<1.6.0) ; python_version <= \"3.10\"", "scikit-learn ; python_version > \"3.10\"", "tqdm (>=4.23.0)"]
|
||||
full = ["docker (>=5.0.3)", "explainable-ai-sdk (>=1.0.0) ; python_version < \"3.13\"", "fastapi (>=0.71.0,<=0.124.4)", "google-cloud-bigquery", "google-cloud-bigquery-storage", "google-vizier (>=0.1.6)", "httpx (>=0.23.0,<=0.28.1)", "immutabledict", "jsonschema", "lit-nlp (==0.4.0) ; python_version < \"3.14\"", "litellm (>=1.72.4,!=1.77.2,!=1.77.3,!=1.77.4)", "mlflow (>=1.27.0) ; python_version >= \"3.13\"", "mlflow (>=1.27.0,<=2.16.0) ; python_version < \"3.13\"", "numpy (>=1.15.0)", "pandas (>=1.0.0)", "pyarrow (>=10.0.1) ; python_version == \"3.11\"", "pyarrow (>=14.0.0) ; python_version >= \"3.12\"", "pyarrow (>=3.0.0,<8.0.0) ; python_version < \"3.11\"", "pyarrow (>=6.0.1)", "pyyaml", "pyyaml (>=5.3.1,<7)", "ray[default] (>=2.4,<2.5.dev0 || >2.9.0,!=2.9.1,!=2.9.2,<2.10.dev0 || ==2.33.* || >=2.42.dev0,<=2.42.0) ; python_version < \"3.11\"", "ray[default] (>=2.5,<=2.47.1) ; python_version == \"3.11\"", "requests (>=2.28.1)", "requests-toolbelt (<=1.0.0)", "ruamel.yaml", "scikit-learn (<1.6.0) ; python_version <= \"3.10\"", "scikit-learn ; python_version > \"3.10\"", "starlette (>=0.17.1)", "tensorboard-plugin-profile (>=2.4.0,<2.18.0)", "tensorflow (>=2.3.0,<3.0.0) ; python_version < \"3.13\"", "tensorflow (>=2.3.0,<3.0.0) ; python_version < \"3.13\"", "tqdm (>=4.23.0)", "urllib3 (>=1.21.1,<1.27)", "uvicorn[standard] (>=0.16.0)", "werkzeug (>=2.0.0,<4.0.0)"]
|
||||
langchain = ["langchain (>=0.3,<0.4)", "langchain-core (>=0.3,<0.4)", "langchain-google-vertexai (>=2.0.22,<3)", "langgraph (>=0.2.45,<0.4)", "openinference-instrumentation-langchain (>=0.1.19,<0.2)"]
|
||||
langchain-testing = ["absl-py", "cloudpickle (>=3.0,<4.0)", "google-cloud-trace (<2)", "langchain (>=0.3,<0.4)", "langchain-core (>=0.3,<0.4)", "langchain-google-vertexai (>=2.0.22,<3)", "langgraph (>=0.2.45,<0.4)", "openinference-instrumentation-langchain (>=0.1.19,<0.2)", "opentelemetry-exporter-gcp-logging (>=1.11.0a0,<2.0.0)", "opentelemetry-exporter-gcp-trace (<2)", "opentelemetry-exporter-otlp-proto-http (<2)", "opentelemetry-sdk (<2)", "pydantic (>=2.11.1,<3)", "pytest-xdist", "typing_extensions"]
|
||||
lit = ["explainable-ai-sdk (>=1.0.0) ; python_version < \"3.13\"", "lit-nlp (==0.4.0) ; python_version < \"3.14\"", "pandas (>=1.0.0)", "tensorflow (>=2.3.0,<3.0.0) ; python_version < \"3.13\""]
|
||||
llama-index = ["llama-index", "llama-index-llms-google-genai", "openinference-instrumentation-llama-index (>=3.0,<4.0)"]
|
||||
llama-index-testing = ["absl-py", "cloudpickle (>=3.0,<4.0)", "google-cloud-trace (<2)", "llama-index", "llama-index-llms-google-genai", "openinference-instrumentation-llama-index (>=3.0,<4.0)", "opentelemetry-exporter-gcp-logging (>=1.11.0a0,<2.0.0)", "opentelemetry-exporter-gcp-trace (<2)", "opentelemetry-exporter-otlp-proto-http (<2)", "opentelemetry-sdk (<2)", "pydantic (>=2.11.1,<3)", "pytest-xdist", "typing_extensions"]
|
||||
metadata = ["numpy (>=1.15.0)", "pandas (>=1.0.0)"]
|
||||
pipelines = ["pyyaml (>=5.3.1,<7)"]
|
||||
prediction = ["docker (>=5.0.3)", "fastapi (>=0.71.0,<=0.124.4)", "httpx (>=0.23.0,<=0.28.1)", "starlette (>=0.17.1)", "uvicorn[standard] (>=0.16.0)"]
|
||||
private-endpoints = ["requests (>=2.28.1)", "urllib3 (>=1.21.1,<1.27)"]
|
||||
ray = ["google-cloud-bigquery", "google-cloud-bigquery-storage", "immutabledict", "pandas (>=1.0.0)", "pyarrow (>=6.0.1)", "ray[default] (>=2.4,<2.5.dev0 || >2.9.0,!=2.9.1,!=2.9.2,<2.10.dev0 || ==2.33.* || >=2.42.dev0,<=2.42.0) ; python_version < \"3.11\"", "ray[default] (>=2.5,<=2.47.1) ; python_version == \"3.11\""]
|
||||
ray-testing = ["google-cloud-bigquery", "google-cloud-bigquery-storage", "immutabledict", "pandas (>=1.0.0)", "pyarrow (>=6.0.1)", "pytest-xdist", "ray[default] (>=2.4,<2.5.dev0 || >2.9.0,!=2.9.1,!=2.9.2,<2.10.dev0 || ==2.33.* || >=2.42.dev0,<=2.42.0) ; python_version < \"3.11\"", "ray[default] (>=2.5,<=2.47.1) ; python_version == \"3.11\"", "ray[train]", "scikit-learn (<1.6.0)", "tensorflow ; python_version < \"3.13\"", "torch (>=2.0.0,<2.1.0)", "xgboost", "xgboost_ray"]
|
||||
reasoningengine = ["cloudpickle (>=3.0,<4.0)", "google-cloud-trace (<2)", "opentelemetry-exporter-gcp-logging (>=1.11.0a0,<2.0.0)", "opentelemetry-exporter-gcp-trace (<2)", "opentelemetry-exporter-otlp-proto-http (<2)", "opentelemetry-sdk (<2)", "pydantic (>=2.11.1,<3)", "typing_extensions"]
|
||||
tensorboard = ["tensorboard-plugin-profile (>=2.4.0,<2.18.0)", "werkzeug (>=2.0.0,<4.0.0)"]
|
||||
testing = ["Pillow", "aiohttp", "bigframes ; python_version >= \"3.10\" and python_version < \"3.14\"", "docker (>=5.0.3)", "explainable-ai-sdk (>=1.0.0) ; python_version < \"3.13\"", "fastapi (>=0.71.0,<=0.124.4)", "google-api-core (>=2.11,<3.0.0)", "google-cloud-bigquery", "google-cloud-bigquery-storage", "google-vizier (>=0.1.6)", "google-vizier (>=0.1.6)", "grpcio-testing", "grpcio-tools (>=1.63.0) ; python_version >= \"3.13\"", "httpx (>=0.23.0,<=0.28.1)", "immutabledict", "immutabledict", "ipython", "jsonschema", "kfp (>=2.6.0,<3.0.0) ; python_version < \"3.13\"", "lit-nlp (==0.4.0) ; python_version < \"3.14\"", "litellm (>=1.72.4,!=1.77.2,!=1.77.3,!=1.77.4)", "mlflow (>=1.27.0) ; python_version >= \"3.13\"", "mlflow (>=1.27.0,<=2.16.0) ; python_version < \"3.13\"", "mock", "nltk", "numpy (>=1.15.0)", "pandas (>=1.0.0)", "protobuf (<=5.29.4)", "pyarrow (>=10.0.1) ; python_version == \"3.11\"", "pyarrow (>=14.0.0) ; python_version >= \"3.12\"", "pyarrow (>=3.0.0,<8.0.0) ; python_version < \"3.11\"", "pyarrow (>=6.0.1)", "pytest-asyncio", "pytest-cov", "pytest-xdist", "pyyaml", "pyyaml (>=5.3.1,<7)", "ray[default] (>=2.4,<2.5.dev0 || >2.9.0,!=2.9.1,!=2.9.2,<2.10.dev0 || ==2.33.* || >=2.42.dev0,<=2.42.0) ; python_version < \"3.11\"", "ray[default] (>=2.5,<=2.47.1) ; python_version == \"3.11\"", "requests (>=2.28.1)", "requests-toolbelt (<=1.0.0)", "requests-toolbelt (<=1.0.0)", "ruamel.yaml", "scikit-learn (<1.6.0) ; python_version <= \"3.10\"", "scikit-learn (<1.6.0) ; python_version <= \"3.10\"", "scikit-learn ; python_version > \"3.10\"", "scikit-learn ; python_version > \"3.10\"", "sentencepiece (>=0.2.0)", "starlette (>=0.17.1)", "tensorboard-plugin-profile (>=2.4.0,<2.18.0)", "tensorboard-plugin-profile (>=2.4.0,<2.18.0)", "tensorflow (==2.14.1) ; python_version <= \"3.11\"", "tensorflow (==2.19.0) ; python_version > \"3.11\" and python_version < \"3.13\"", "tensorflow (>=2.3.0,<3.0.0) ; python_version < \"3.13\"", "tensorflow (>=2.3.0,<3.0.0) ; python_version < \"3.13\"", "torch (>=2.0.0,<2.1.0) ; python_version <= \"3.11\"", "torch (>=2.2.0) ; python_version > \"3.11\" and python_version < \"3.13\"", "tqdm (>=4.23.0)", "urllib3 (>=1.21.1,<1.27)", "uvicorn[standard] (>=0.16.0)", "werkzeug (>=2.0.0,<4.0.0)", "werkzeug (>=2.0.0,<4.0.0)", "xgboost"]
|
||||
tokenization = ["sentencepiece (>=0.2.0)"]
|
||||
vizier = ["google-vizier (>=0.1.6)"]
|
||||
xai = ["tensorflow (>=2.3.0,<3.0.0) ; python_version < \"3.13\""]
|
||||
|
||||
[[package]]
|
||||
name = "google-cloud-bigquery"
|
||||
version = "3.39.0"
|
||||
description = "Google BigQuery API client library"
|
||||
optional = false
|
||||
python-versions = ">=3.9"
|
||||
groups = ["main"]
|
||||
files = [
|
||||
{file = "google_cloud_bigquery-3.39.0-py3-none-any.whl", hash = "sha256:dc7a64921465859105461b43c42562e38e797d7a73feb72b3cfc4865b7b1c5ef"},
|
||||
{file = "google_cloud_bigquery-3.39.0.tar.gz", hash = "sha256:cb375e1d63dea9bd5bf735e66024338f294159d43afdf63e1d023f5fcbbf55ea"},
|
||||
]
|
||||
|
||||
[package.dependencies]
|
||||
google-api-core = {version = ">=2.11.1,<3.0.0", extras = ["grpc"]}
|
||||
google-auth = ">=2.14.1,<3.0.0"
|
||||
google-cloud-core = ">=2.4.1,<3.0.0"
|
||||
google-resumable-media = ">=2.0.0,<3.0.0"
|
||||
packaging = ">=24.2.0"
|
||||
python-dateutil = ">=2.8.2,<3.0.0"
|
||||
requests = ">=2.21.0,<3.0.0"
|
||||
|
||||
[package.extras]
|
||||
all = ["google-cloud-bigquery[bigquery-v2,bqstorage,geopandas,ipython,ipywidgets,matplotlib,opentelemetry,pandas,tqdm]"]
|
||||
bigquery-v2 = ["proto-plus (>=1.22.3,<2.0.0)", "protobuf (>=3.20.2,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5,<7.0.0)"]
|
||||
bqstorage = ["google-cloud-bigquery-storage (>=2.18.0,<3.0.0)", "grpcio (>=1.47.0,<2.0.0)", "grpcio (>=1.49.1,<2.0.0) ; python_version >= \"3.11\"", "grpcio (>=1.75.1,<2.0.0) ; python_version >= \"3.14\"", "pyarrow (>=4.0.0)"]
|
||||
geopandas = ["Shapely (>=1.8.4,<3.0.0)", "geopandas (>=0.9.0,<2.0.0)"]
|
||||
ipython = ["bigquery-magics (>=0.6.0)", "ipython (>=7.23.1)"]
|
||||
ipywidgets = ["ipykernel (>=6.2.0)", "ipywidgets (>=7.7.1)"]
|
||||
matplotlib = ["matplotlib (>=3.10.3) ; python_version >= \"3.10\"", "matplotlib (>=3.7.1,<=3.9.2) ; python_version == \"3.9\""]
|
||||
opentelemetry = ["opentelemetry-api (>=1.1.0)", "opentelemetry-instrumentation (>=0.20b0)", "opentelemetry-sdk (>=1.1.0)"]
|
||||
pandas = ["db-dtypes (>=1.0.4,<2.0.0)", "grpcio (>=1.47.0,<2.0.0)", "grpcio (>=1.49.1,<2.0.0) ; python_version >= \"3.11\"", "grpcio (>=1.75.1,<2.0.0) ; python_version >= \"3.14\"", "pandas (>=1.3.0)", "pandas-gbq (>=0.26.1)", "pyarrow (>=3.0.0)"]
|
||||
tqdm = ["tqdm (>=4.23.4,<5.0.0)"]
|
||||
|
||||
[[package]]
|
||||
name = "google-cloud-core"
|
||||
version = "2.5.0"
|
||||
@@ -2270,12 +2429,35 @@ google-api-core = {version = ">=1.34.0,<2.0.dev0 || >=2.11.dev0,<3.0.0", extras
|
||||
google-auth = ">=2.14.1,<2.24.0 || >2.24.0,<2.25.0 || >2.25.0,<3.0.0"
|
||||
google-cloud-core = ">=1.4.1,<3.0.0"
|
||||
proto-plus = [
|
||||
{version = ">=1.25.0,<2.0.0", markers = "python_version >= \"3.13\""},
|
||||
{version = ">=1.22.2,<2.0.0", markers = "python_version >= \"3.11\""},
|
||||
{version = ">=1.22.0,<2.0.0"},
|
||||
{version = ">=1.25.0,<2.0.0", markers = "python_version >= \"3.13\""},
|
||||
]
|
||||
protobuf = ">=3.20.2,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<7.0.0dev"
|
||||
|
||||
[[package]]
|
||||
name = "google-cloud-resource-manager"
|
||||
version = "1.15.0"
|
||||
description = "Google Cloud Resource Manager API client library"
|
||||
optional = false
|
||||
python-versions = ">=3.7"
|
||||
groups = ["main"]
|
||||
files = [
|
||||
{file = "google_cloud_resource_manager-1.15.0-py3-none-any.whl", hash = "sha256:0ccde5db644b269ddfdf7b407a2c7b60bdbf459f8e666344a5285601d00c7f6d"},
|
||||
{file = "google_cloud_resource_manager-1.15.0.tar.gz", hash = "sha256:3d0b78c3daa713f956d24e525b35e9e9a76d597c438837171304d431084cedaf"},
|
||||
]
|
||||
|
||||
[package.dependencies]
|
||||
google-api-core = {version = ">=1.34.1,<2.0.dev0 || >=2.11.dev0,<3.0.0", extras = ["grpc"]}
|
||||
google-auth = ">=2.14.1,<2.24.0 || >2.24.0,<2.25.0 || >2.25.0,<3.0.0"
|
||||
grpc-google-iam-v1 = ">=0.14.0,<1.0.0"
|
||||
grpcio = ">=1.33.2,<2.0.0"
|
||||
proto-plus = [
|
||||
{version = ">=1.22.3,<2.0.0"},
|
||||
{version = ">=1.25.0,<2.0.0", markers = "python_version >= \"3.13\""},
|
||||
]
|
||||
protobuf = ">=3.20.2,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<7.0.0"
|
||||
|
||||
[[package]]
|
||||
name = "google-cloud-run"
|
||||
version = "0.13.0"
|
||||
@@ -2294,8 +2476,8 @@ google-auth = ">=2.14.1,<2.24.0 || >2.24.0,<2.25.0 || >2.25.0,<3.0.0"
|
||||
grpc-google-iam-v1 = ">=0.14.0,<1.0.0"
|
||||
grpcio = ">=1.33.2,<2.0.0"
|
||||
proto-plus = [
|
||||
{version = ">=1.22.3,<2.0.0"},
|
||||
{version = ">=1.25.0,<2.0.0", markers = "python_version >= \"3.13\""},
|
||||
{version = ">=1.22.3,<2.0.0", markers = "python_version < \"3.13\""},
|
||||
]
|
||||
protobuf = ">=3.20.2,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<7.0.0"
|
||||
|
||||
@@ -2317,8 +2499,8 @@ google-auth = ">=2.14.1,<2.24.0 || >2.24.0,<2.25.0 || >2.25.0,<3.0.0"
|
||||
grpc-google-iam-v1 = ">=0.14.0,<1.0.0"
|
||||
grpcio = ">=1.33.2,<2.0.0"
|
||||
proto-plus = [
|
||||
{version = ">=1.25.0,<2.0.0", markers = "python_version >= \"3.13\""},
|
||||
{version = ">=1.22.3,<2.0.0"},
|
||||
{version = ">=1.25.0,<2.0.0", markers = "python_version >= \"3.13\""},
|
||||
]
|
||||
protobuf = ">=3.20.2,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<7.0.0"
|
||||
|
||||
@@ -2365,8 +2547,8 @@ google-auth = ">=2.14.1,<2.24.0 || >2.24.0,<2.25.0 || >2.25.0,<3.0.0"
|
||||
grpc-google-iam-v1 = ">=0.14.0,<1.0.0"
|
||||
grpcio = ">=1.33.2,<2.0.0"
|
||||
proto-plus = [
|
||||
{version = ">=1.25.0,<2.0.0", markers = "python_version >= \"3.13\""},
|
||||
{version = ">=1.22.3,<2.0.0"},
|
||||
{version = ">=1.25.0,<2.0.0", markers = "python_version >= \"3.13\""},
|
||||
]
|
||||
protobuf = ">=3.20.2,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<7.0.0"
|
||||
|
||||
@@ -2387,8 +2569,8 @@ google-api-core = {version = ">=1.34.1,<2.0.dev0 || >=2.11.dev0,<3.0.0", extras
|
||||
google-auth = ">=2.14.1,<2.24.0 || >2.24.0,<2.25.0 || >2.25.0,<3.0.0"
|
||||
grpcio = ">=1.33.2,<2.0.0"
|
||||
proto-plus = [
|
||||
{version = ">=1.25.0,<2.0.0", markers = "python_version >= \"3.13\""},
|
||||
{version = ">=1.22.3,<2.0.0"},
|
||||
{version = ">=1.25.0,<2.0.0", markers = "python_version >= \"3.13\""},
|
||||
]
|
||||
protobuf = ">=3.20.2,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<7.0.0"
|
||||
|
||||
@@ -2435,6 +2617,34 @@ files = [
|
||||
{file = "google_crc32c-1.8.0.tar.gz", hash = "sha256:a428e25fb7691024de47fecfbff7ff957214da51eddded0da0ae0e0f03a2cf79"},
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "google-genai"
|
||||
version = "1.56.0"
|
||||
description = "GenAI Python SDK"
|
||||
optional = false
|
||||
python-versions = ">=3.10"
|
||||
groups = ["main"]
|
||||
files = [
|
||||
{file = "google_genai-1.56.0-py3-none-any.whl", hash = "sha256:9e6b11e0c105ead229368cb5849a480e4d0185519f8d9f538d61ecfcf193b052"},
|
||||
{file = "google_genai-1.56.0.tar.gz", hash = "sha256:0491af33c375f099777ae207d9621f044e27091fafad4c50e617eba32165e82f"},
|
||||
]
|
||||
|
||||
[package.dependencies]
|
||||
anyio = ">=4.8.0,<5.0.0"
|
||||
distro = ">=1.7.0,<2"
|
||||
google-auth = {version = ">=2.45.0,<3.0.0", extras = ["requests"]}
|
||||
httpx = ">=0.28.1,<1.0.0"
|
||||
pydantic = ">=2.9.0,<3.0.0"
|
||||
requests = ">=2.28.1,<3.0.0"
|
||||
sniffio = "*"
|
||||
tenacity = ">=8.2.3,<9.2.0"
|
||||
typing-extensions = ">=4.11.0,<5.0.0"
|
||||
websockets = ">=13.0.0,<15.1.0"
|
||||
|
||||
[package.extras]
|
||||
aiohttp = ["aiohttp (<3.13.3)"]
|
||||
local-tokenizer = ["protobuf", "sentencepiece (>=0.2.0)"]
|
||||
|
||||
[[package]]
|
||||
name = "google-resumable-media"
|
||||
version = "2.8.0"
|
||||
@@ -2747,6 +2957,18 @@ http2 = ["h2 (>=3,<5)"]
|
||||
socks = ["socksio (==1.*)"]
|
||||
zstd = ["zstandard (>=0.18.0)"]
|
||||
|
||||
[[package]]
|
||||
name = "httpx-sse"
|
||||
version = "0.4.3"
|
||||
description = "Consume Server-Sent Event (SSE) messages with HTTPX."
|
||||
optional = false
|
||||
python-versions = ">=3.9"
|
||||
groups = ["main"]
|
||||
files = [
|
||||
{file = "httpx_sse-0.4.3-py3-none-any.whl", hash = "sha256:0ac1c9fe3c0afad2e0ebb25a934a59f4c7823b60792691f779fad2c5568830fc"},
|
||||
{file = "httpx_sse-0.4.3.tar.gz", hash = "sha256:9b1ed0127459a66014aec3c56bebd93da3c1bc8bb6618c8082039a44889a755d"},
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "huggingface-hub"
|
||||
version = "0.36.0"
|
||||
@@ -3415,6 +3637,34 @@ tenacity = ">=8.1.0,<8.4.0 || >8.4.0,<10.0.0"
|
||||
typing-extensions = ">=4.7.0,<5.0.0"
|
||||
uuid-utils = ">=0.12.0,<1.0"
|
||||
|
||||
[[package]]
|
||||
name = "langchain-google-vertexai"
|
||||
version = "3.2.0"
|
||||
description = "An integration package connecting Google VertexAI and LangChain"
|
||||
optional = false
|
||||
python-versions = "<4.0.0,>=3.10.0"
|
||||
groups = ["main"]
|
||||
files = [
|
||||
{file = "langchain_google_vertexai-3.2.0-py3-none-any.whl", hash = "sha256:c679c047f16b21030ba8901edac1abb7e6d9826cdab9b82c6f8e7234c9fd1cf6"},
|
||||
{file = "langchain_google_vertexai-3.2.0.tar.gz", hash = "sha256:920253a0e752f103a99a2b5139619fe3cb15f4e49d96c3ac1d638ada9631eba0"},
|
||||
]
|
||||
|
||||
[package.dependencies]
|
||||
bottleneck = ">=1.4.0,<2.0.0"
|
||||
google-cloud-aiplatform = ">=1.97.0,<2.0.0"
|
||||
google-cloud-storage = ">=2.18.0,<4.0.0"
|
||||
httpx = ">=0.28.0,<1.0.0"
|
||||
httpx-sse = ">=0.4.0,<1.0.0"
|
||||
langchain-core = ">=1.1.1,<2.0.0"
|
||||
numexpr = ">=2.8.6,<3.0.0"
|
||||
pyarrow = ">=19.0.1,<23.0.0"
|
||||
pydantic = ">=2.9.0,<3.0.0"
|
||||
validators = ">=0.22.0,<1.0.0"
|
||||
|
||||
[package.extras]
|
||||
anthropic = ["anthropic (>=0.35.0,<1.0.0)"]
|
||||
mistral = ["langchain-mistralai (>=0.2.0,<2.0.0)"]
|
||||
|
||||
[[package]]
|
||||
name = "langchain-ollama"
|
||||
version = "1.0.1"
|
||||
@@ -4254,10 +4504,10 @@ files = [
|
||||
|
||||
[package.dependencies]
|
||||
numpy = [
|
||||
{version = ">=2.1.0", markers = "python_version >= \"3.13\""},
|
||||
{version = ">=1.26.0", markers = "python_version >= \"3.12\""},
|
||||
{version = ">=1.23.3", markers = "python_version >= \"3.11\""},
|
||||
{version = ">=1.21.2", markers = "python_version >= \"3.10\""},
|
||||
{version = ">=2.1.0", markers = "python_version >= \"3.13\""},
|
||||
]
|
||||
|
||||
[package.extras]
|
||||
@@ -4612,6 +4862,76 @@ files = [
|
||||
llvmlite = "==0.46.*"
|
||||
numpy = ">=1.22,<2.4"
|
||||
|
||||
[[package]]
|
||||
name = "numexpr"
|
||||
version = "2.14.1"
|
||||
description = "Fast numerical expression evaluator for NumPy"
|
||||
optional = false
|
||||
python-versions = ">=3.10"
|
||||
groups = ["main"]
|
||||
files = [
|
||||
{file = "numexpr-2.14.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d0fab3fd06a04f6b86102552b26aa5d85e20ac7d8296c15764c726eeabae6cc8"},
|
||||
{file = "numexpr-2.14.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:64ae5dfd62d74a3ef82fe0b37f80527247f3626171ad82025900f46ffca4b39a"},
|
||||
{file = "numexpr-2.14.1-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:955c92b064f9074d2970cf3138f5e3b965be673b82024962ed526f39bc25a920"},
|
||||
{file = "numexpr-2.14.1-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:75440c54fc01e130396650fdf307aa9d41a67dc06ddbfb288971b591c13a395b"},
|
||||
{file = "numexpr-2.14.1-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:dde9fa47ed319e1e1728940a539df3cb78326b7754bc7c6ab3152afc91808f9b"},
|
||||
{file = "numexpr-2.14.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:76db0bc6267e591ab9c4df405ffb533598e4c88239db7338d11ae9e4b368a85a"},
|
||||
{file = "numexpr-2.14.1-cp310-cp310-win32.whl", hash = "sha256:0d1dcbdc4d0374c0d523cee2f94f06b001623cbc1fd163612841017a3495427c"},
|
||||
{file = "numexpr-2.14.1-cp310-cp310-win_amd64.whl", hash = "sha256:823cd82c8e7937981339f634e7a9c6a92cb2d0b9d0a5cf627a5e394fffc05377"},
|
||||
{file = "numexpr-2.14.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:2d03fcb4644a12f70a14d74006f72662824da5b6128bf1bcd10cc3ed80e64c34"},
|
||||
{file = "numexpr-2.14.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:2773ee1133f77009a1fc2f34fe236f3d9823779f5f75450e183137d49f00499f"},
|
||||
{file = "numexpr-2.14.1-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ebe4980f9494b9f94d10d2e526edc29e72516698d3bf95670ba79415492212a4"},
|
||||
{file = "numexpr-2.14.1-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2a381e5e919a745c9503bcefffc1c7f98c972c04ec58fc8e999ed1a929e01ba6"},
|
||||
{file = "numexpr-2.14.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:d08856cfc1b440eb1caaa60515235369654321995dd68eb9377577392020f6cb"},
|
||||
{file = "numexpr-2.14.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:03130afa04edf83a7b590d207444f05a00363c9b9ea5d81c0f53b1ea13fad55a"},
|
||||
{file = "numexpr-2.14.1-cp311-cp311-win32.whl", hash = "sha256:db78fa0c9fcbaded3ae7453faf060bd7a18b0dc10299d7fcd02d9362be1213ed"},
|
||||
{file = "numexpr-2.14.1-cp311-cp311-win_amd64.whl", hash = "sha256:e9b2f957798c67a2428be96b04bce85439bed05efe78eb78e4c2ca43737578e7"},
|
||||
{file = "numexpr-2.14.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:91ebae0ab18c799b0e6b8c5a8d11e1fa3848eb4011271d99848b297468a39430"},
|
||||
{file = "numexpr-2.14.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:47041f2f7b9e69498fb311af672ba914a60e6e6d804011caacb17d66f639e659"},
|
||||
{file = "numexpr-2.14.1-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d686dfb2c1382d9e6e0ee0b7647f943c1886dba3adbf606c625479f35f1956c1"},
|
||||
{file = "numexpr-2.14.1-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:eee6d4fbbbc368e6cdd0772734d6249128d957b3b8ad47a100789009f4de7083"},
|
||||
{file = "numexpr-2.14.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:3a2839efa25f3c8d4133252ea7342d8f81226c7c4dda81f97a57e090b9d87a48"},
|
||||
{file = "numexpr-2.14.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:9f9137f1351b310436662b5dc6f4082a245efa8950c3b0d9008028df92fefb9b"},
|
||||
{file = "numexpr-2.14.1-cp312-cp312-win32.whl", hash = "sha256:36f8d5c1bd1355df93b43d766790f9046cccfc1e32b7c6163f75bcde682cda07"},
|
||||
{file = "numexpr-2.14.1-cp312-cp312-win_amd64.whl", hash = "sha256:fdd886f4b7dbaf167633ee396478f0d0aa58ea2f9e7ccc3c6431019623e8d68f"},
|
||||
{file = "numexpr-2.14.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:09078ba73cffe94745abfbcc2d81ab8b4b4e9d7bfbbde6cac2ee5dbf38eee222"},
|
||||
{file = "numexpr-2.14.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:dce0b5a0447baa7b44bc218ec2d7dcd175b8eee6083605293349c0c1d9b82fb6"},
|
||||
{file = "numexpr-2.14.1-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:06855053de7a3a8425429bd996e8ae3c50b57637ad3e757e0fa0602a7874be30"},
|
||||
{file = "numexpr-2.14.1-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:05f9366d23a2e991fd5a8b5e61a17558f028ba86158a4552f8f239b005cdf83c"},
|
||||
{file = "numexpr-2.14.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:c5f1b1605695778896534dfc6e130d54a65cd52be7ed2cd0cfee3981fd676bf5"},
|
||||
{file = "numexpr-2.14.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:a4ba71db47ea99c659d88ee6233fa77b6dc83392f1d324e0c90ddf617ae3f421"},
|
||||
{file = "numexpr-2.14.1-cp313-cp313-win32.whl", hash = "sha256:638dce8320f4a1483d5ca4fda69f60a70ed7e66be6e68bc23fb9f1a6b78a9e3b"},
|
||||
{file = "numexpr-2.14.1-cp313-cp313-win_amd64.whl", hash = "sha256:9fdcd4735121658a313f878fd31136d1bfc6a5b913219e7274e9fca9f8dac3bb"},
|
||||
{file = "numexpr-2.14.1-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:557887ad7f5d3c2a40fd7310e50597045a68e66b20a77b3f44d7bc7608523b4b"},
|
||||
{file = "numexpr-2.14.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:af111c8fe6fc55d15e4c7cab11920fc50740d913636d486545b080192cd0ad73"},
|
||||
{file = "numexpr-2.14.1-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:33265294376e7e2ae4d264d75b798a915d2acf37b9dd2b9405e8b04f84d05cfc"},
|
||||
{file = "numexpr-2.14.1-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:83647d846d3eeeb9a9255311236135286728b398d0d41d35dedb532dca807fe9"},
|
||||
{file = "numexpr-2.14.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:6e575fd3ad41ddf3355d0c7ef6bd0168619dc1779a98fe46693cad5e95d25e6e"},
|
||||
{file = "numexpr-2.14.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:67ea4771029ce818573b1998f5ca416bd255156feea017841b86176a938f7d19"},
|
||||
{file = "numexpr-2.14.1-cp313-cp313t-win32.whl", hash = "sha256:15015d47d3d1487072d58c0e7682ef2eb608321e14099c39d52e2dd689483611"},
|
||||
{file = "numexpr-2.14.1-cp313-cp313t-win_amd64.whl", hash = "sha256:94c711f6d8f17dfb4606842b403699603aa591ab9f6bf23038b488ea9cfb0f09"},
|
||||
{file = "numexpr-2.14.1-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:ede79f7ff06629f599081de644546ce7324f1581c09b0ac174da88a470d39c21"},
|
||||
{file = "numexpr-2.14.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:2eac7a5a2f70b3768c67056445d1ceb4ecd9b853c8eda9563823b551aeaa5082"},
|
||||
{file = "numexpr-2.14.1-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5aedf38d4c0c19d3cecfe0334c3f4099fb496f54c146223d30fa930084bc8574"},
|
||||
{file = "numexpr-2.14.1-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:439ec4d57b853792ebe5456e3160312281c3a7071ecac5532ded3278ede614de"},
|
||||
{file = "numexpr-2.14.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:e23b87f744e04e302d82ac5e2189ae20a533566aec76a46885376e20b0645bf8"},
|
||||
{file = "numexpr-2.14.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:44f84e0e5af219dbb62a081606156420815890e041b87252fbcea5df55214c4c"},
|
||||
{file = "numexpr-2.14.1-cp314-cp314-win32.whl", hash = "sha256:1f1a5e817c534539351aa75d26088e9e1e0ef1b3a6ab484047618a652ccc4fc3"},
|
||||
{file = "numexpr-2.14.1-cp314-cp314-win_amd64.whl", hash = "sha256:587c41509bc373dfb1fe6086ba55a73147297247bedb6d588cda69169fc412f2"},
|
||||
{file = "numexpr-2.14.1-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:ec368819502b64f190c3f71be14a304780b5935c42aae5bf22c27cc2cbba70b5"},
|
||||
{file = "numexpr-2.14.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:7e87f6d203ac57239de32261c941e9748f9309cbc0da6295eabd0c438b920d3a"},
|
||||
{file = "numexpr-2.14.1-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:dd72d8c2a165fe45ea7650b16eb8cc1792a94a722022006bb97c86fe51fd2091"},
|
||||
{file = "numexpr-2.14.1-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:70d80fcb418a54ca208e9a38e58ddc425c07f66485176b261d9a67c7f2864f73"},
|
||||
{file = "numexpr-2.14.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:edea2f20c2040df8b54ee8ca8ebda63de9545b2112872466118e9df4d0ae99f3"},
|
||||
{file = "numexpr-2.14.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:790447be6879a6c51b9545f79612d24c9ea0a41d537a84e15e6a8ddef0b6268e"},
|
||||
{file = "numexpr-2.14.1-cp314-cp314t-win32.whl", hash = "sha256:538961096c2300ea44240209181e31fae82759d26b51713b589332b9f2a4117e"},
|
||||
{file = "numexpr-2.14.1-cp314-cp314t-win_amd64.whl", hash = "sha256:a40b350cd45b4446076fa11843fa32bbe07024747aeddf6d467290bf9011b392"},
|
||||
{file = "numexpr-2.14.1.tar.gz", hash = "sha256:4be00b1086c7b7a5c32e31558122b7b80243fe098579b170967da83f3152b48b"},
|
||||
]
|
||||
|
||||
[package.dependencies]
|
||||
numpy = ">=1.23.0"
|
||||
|
||||
[[package]]
|
||||
name = "numpy"
|
||||
version = "2.2.6"
|
||||
@@ -4770,7 +5090,7 @@ description = "CUBLAS native runtime libraries"
|
||||
optional = false
|
||||
python-versions = ">=3"
|
||||
groups = ["main"]
|
||||
markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\""
|
||||
markers = "platform_machine == \"x86_64\" and platform_system == \"Linux\""
|
||||
files = [
|
||||
{file = "nvidia_cublas_cu12-12.8.4.1-py3-none-manylinux_2_27_aarch64.whl", hash = "sha256:b86f6dd8935884615a0683b663891d43781b819ac4f2ba2b0c9604676af346d0"},
|
||||
{file = "nvidia_cublas_cu12-12.8.4.1-py3-none-manylinux_2_27_x86_64.whl", hash = "sha256:8ac4e771d5a348c551b2a426eda6193c19aa630236b418086020df5ba9667142"},
|
||||
@@ -4784,7 +5104,7 @@ description = "CUDA profiling tools runtime libs."
|
||||
optional = false
|
||||
python-versions = ">=3"
|
||||
groups = ["main"]
|
||||
markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\""
|
||||
markers = "platform_machine == \"x86_64\" and platform_system == \"Linux\""
|
||||
files = [
|
||||
{file = "nvidia_cuda_cupti_cu12-12.8.90-py3-none-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:4412396548808ddfed3f17a467b104ba7751e6b58678a4b840675c56d21cf7ed"},
|
||||
{file = "nvidia_cuda_cupti_cu12-12.8.90-py3-none-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:ea0cb07ebda26bb9b29ba82cda34849e73c166c18162d3913575b0c9db9a6182"},
|
||||
@@ -4798,7 +5118,7 @@ description = "NVRTC native runtime libraries"
|
||||
optional = false
|
||||
python-versions = ">=3"
|
||||
groups = ["main"]
|
||||
markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\""
|
||||
markers = "platform_machine == \"x86_64\" and platform_system == \"Linux\""
|
||||
files = [
|
||||
{file = "nvidia_cuda_nvrtc_cu12-12.8.93-py3-none-manylinux2010_x86_64.manylinux_2_12_x86_64.whl", hash = "sha256:a7756528852ef889772a84c6cd89d41dfa74667e24cca16bb31f8f061e3e9994"},
|
||||
{file = "nvidia_cuda_nvrtc_cu12-12.8.93-py3-none-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:fc1fec1e1637854b4c0a65fb9a8346b51dd9ee69e61ebaccc82058441f15bce8"},
|
||||
@@ -4812,7 +5132,7 @@ description = "CUDA Runtime native Libraries"
|
||||
optional = false
|
||||
python-versions = ">=3"
|
||||
groups = ["main"]
|
||||
markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\""
|
||||
markers = "platform_machine == \"x86_64\" and platform_system == \"Linux\""
|
||||
files = [
|
||||
{file = "nvidia_cuda_runtime_cu12-12.8.90-py3-none-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:52bf7bbee900262ffefe5e9d5a2a69a30d97e2bc5bb6cc866688caa976966e3d"},
|
||||
{file = "nvidia_cuda_runtime_cu12-12.8.90-py3-none-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:adade8dcbd0edf427b7204d480d6066d33902cab2a4707dcfc48a2d0fd44ab90"},
|
||||
@@ -4826,7 +5146,7 @@ description = "cuDNN runtime libraries"
|
||||
optional = false
|
||||
python-versions = ">=3"
|
||||
groups = ["main"]
|
||||
markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\""
|
||||
markers = "platform_machine == \"x86_64\" and platform_system == \"Linux\""
|
||||
files = [
|
||||
{file = "nvidia_cudnn_cu12-9.10.2.21-py3-none-manylinux_2_27_aarch64.whl", hash = "sha256:c9132cc3f8958447b4910a1720036d9eff5928cc3179b0a51fb6d167c6cc87d8"},
|
||||
{file = "nvidia_cudnn_cu12-9.10.2.21-py3-none-manylinux_2_27_x86_64.whl", hash = "sha256:949452be657fa16687d0930933f032835951ef0892b37d2d53824d1a84dc97a8"},
|
||||
@@ -4843,7 +5163,7 @@ description = "CUFFT native runtime libraries"
|
||||
optional = false
|
||||
python-versions = ">=3"
|
||||
groups = ["main"]
|
||||
markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\""
|
||||
markers = "platform_machine == \"x86_64\" and platform_system == \"Linux\""
|
||||
files = [
|
||||
{file = "nvidia_cufft_cu12-11.3.3.83-py3-none-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:848ef7224d6305cdb2a4df928759dca7b1201874787083b6e7550dd6765ce69a"},
|
||||
{file = "nvidia_cufft_cu12-11.3.3.83-py3-none-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:4d2dd21ec0b88cf61b62e6b43564355e5222e4a3fb394cac0db101f2dd0d4f74"},
|
||||
@@ -4860,7 +5180,7 @@ description = "cuFile GPUDirect libraries"
|
||||
optional = false
|
||||
python-versions = ">=3"
|
||||
groups = ["main"]
|
||||
markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\""
|
||||
markers = "platform_machine == \"x86_64\" and platform_system == \"Linux\""
|
||||
files = [
|
||||
{file = "nvidia_cufile_cu12-1.13.1.3-py3-none-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:1d069003be650e131b21c932ec3d8969c1715379251f8d23a1860554b1cb24fc"},
|
||||
{file = "nvidia_cufile_cu12-1.13.1.3-py3-none-manylinux_2_27_aarch64.whl", hash = "sha256:4beb6d4cce47c1a0f1013d72e02b0994730359e17801d395bdcbf20cfb3bb00a"},
|
||||
@@ -4873,7 +5193,7 @@ description = "CURAND native runtime libraries"
|
||||
optional = false
|
||||
python-versions = ">=3"
|
||||
groups = ["main"]
|
||||
markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\""
|
||||
markers = "platform_machine == \"x86_64\" and platform_system == \"Linux\""
|
||||
files = [
|
||||
{file = "nvidia_curand_cu12-10.3.9.90-py3-none-manylinux_2_27_aarch64.whl", hash = "sha256:dfab99248034673b779bc6decafdc3404a8a6f502462201f2f31f11354204acd"},
|
||||
{file = "nvidia_curand_cu12-10.3.9.90-py3-none-manylinux_2_27_x86_64.whl", hash = "sha256:b32331d4f4df5d6eefa0554c565b626c7216f87a06a4f56fab27c3b68a830ec9"},
|
||||
@@ -4887,7 +5207,7 @@ description = "CUDA solver native runtime libraries"
|
||||
optional = false
|
||||
python-versions = ">=3"
|
||||
groups = ["main"]
|
||||
markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\""
|
||||
markers = "platform_machine == \"x86_64\" and platform_system == \"Linux\""
|
||||
files = [
|
||||
{file = "nvidia_cusolver_cu12-11.7.3.90-py3-none-manylinux_2_27_aarch64.whl", hash = "sha256:db9ed69dbef9715071232caa9b69c52ac7de3a95773c2db65bdba85916e4e5c0"},
|
||||
{file = "nvidia_cusolver_cu12-11.7.3.90-py3-none-manylinux_2_27_x86_64.whl", hash = "sha256:4376c11ad263152bd50ea295c05370360776f8c3427b30991df774f9fb26c450"},
|
||||
@@ -4906,7 +5226,7 @@ description = "CUSPARSE native runtime libraries"
|
||||
optional = false
|
||||
python-versions = ">=3"
|
||||
groups = ["main"]
|
||||
markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\""
|
||||
markers = "platform_machine == \"x86_64\" and platform_system == \"Linux\""
|
||||
files = [
|
||||
{file = "nvidia_cusparse_cu12-12.5.8.93-py3-none-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:9b6c161cb130be1a07a27ea6923df8141f3c295852f4b260c65f18f3e0a091dc"},
|
||||
{file = "nvidia_cusparse_cu12-12.5.8.93-py3-none-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:1ec05d76bbbd8b61b06a80e1eaf8cf4959c3d4ce8e711b65ebd0443bb0ebb13b"},
|
||||
@@ -4923,7 +5243,7 @@ description = "NVIDIA cuSPARSELt"
|
||||
optional = false
|
||||
python-versions = "*"
|
||||
groups = ["main"]
|
||||
markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\""
|
||||
markers = "platform_machine == \"x86_64\" and platform_system == \"Linux\""
|
||||
files = [
|
||||
{file = "nvidia_cusparselt_cu12-0.7.1-py3-none-manylinux2014_aarch64.whl", hash = "sha256:8878dce784d0fac90131b6817b607e803c36e629ba34dc5b433471382196b6a5"},
|
||||
{file = "nvidia_cusparselt_cu12-0.7.1-py3-none-manylinux2014_x86_64.whl", hash = "sha256:f1bb701d6b930d5a7cea44c19ceb973311500847f81b634d802b7b539dc55623"},
|
||||
@@ -4937,7 +5257,7 @@ description = "NVIDIA Collective Communication Library (NCCL) Runtime"
|
||||
optional = false
|
||||
python-versions = ">=3"
|
||||
groups = ["main"]
|
||||
markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\""
|
||||
markers = "platform_machine == \"x86_64\" and platform_system == \"Linux\""
|
||||
files = [
|
||||
{file = "nvidia_nccl_cu12-2.27.5-py3-none-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:31432ad4d1fb1004eb0c56203dc9bc2178a1ba69d1d9e02d64a6938ab5e40e7a"},
|
||||
{file = "nvidia_nccl_cu12-2.27.5-py3-none-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:ad730cf15cb5d25fe849c6e6ca9eb5b76db16a80f13f425ac68d8e2e55624457"},
|
||||
@@ -4950,7 +5270,7 @@ description = "Nvidia JIT LTO Library"
|
||||
optional = false
|
||||
python-versions = ">=3"
|
||||
groups = ["main"]
|
||||
markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\""
|
||||
markers = "platform_machine == \"x86_64\" and platform_system == \"Linux\""
|
||||
files = [
|
||||
{file = "nvidia_nvjitlink_cu12-12.8.93-py3-none-manylinux2010_x86_64.manylinux_2_12_x86_64.whl", hash = "sha256:81ff63371a7ebd6e6451970684f916be2eab07321b73c9d244dc2b4da7f73b88"},
|
||||
{file = "nvidia_nvjitlink_cu12-12.8.93-py3-none-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:adccd7161ace7261e01bb91e44e88da350895c270d23f744f0820c818b7229e7"},
|
||||
@@ -4964,7 +5284,7 @@ description = "NVSHMEM creates a global address space that provides efficient an
|
||||
optional = false
|
||||
python-versions = ">=3"
|
||||
groups = ["main"]
|
||||
markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\""
|
||||
markers = "platform_machine == \"x86_64\" and platform_system == \"Linux\""
|
||||
files = [
|
||||
{file = "nvidia_nvshmem_cu12-3.3.20-py3-none-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:0b0b960da3842212758e4fa4696b94f129090b30e5122fea3c5345916545cff0"},
|
||||
{file = "nvidia_nvshmem_cu12-3.3.20-py3-none-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:d00f26d3f9b2e3c3065be895e3059d6479ea5c638a3f38c9fec49b1b9dd7c1e5"},
|
||||
@@ -4977,7 +5297,7 @@ description = "NVIDIA Tools Extension"
|
||||
optional = false
|
||||
python-versions = ">=3"
|
||||
groups = ["main"]
|
||||
markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\""
|
||||
markers = "platform_machine == \"x86_64\" and platform_system == \"Linux\""
|
||||
files = [
|
||||
{file = "nvidia_nvtx_cu12-12.8.90-py3-none-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:d7ad891da111ebafbf7e015d34879f7112832fc239ff0d7d776b6cb685274615"},
|
||||
{file = "nvidia_nvtx_cu12-12.8.90-py3-none-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:5b17e2001cc0d751a5bc2c6ec6d26ad95913324a4adb86788c944f8ce9ba441f"},
|
||||
@@ -6094,6 +6414,66 @@ files = [
|
||||
dev = ["abi3audit", "black", "check-manifest", "coverage", "packaging", "psleak", "pylint", "pyperf", "pypinfo", "pytest", "pytest-cov", "pytest-instafail", "pytest-xdist", "requests", "rstcheck", "ruff", "setuptools", "sphinx", "sphinx_rtd_theme", "toml-sort", "twine", "validate-pyproject[all]", "virtualenv", "vulture", "wheel"]
|
||||
test = ["psleak", "pytest", "pytest-instafail", "pytest-xdist", "setuptools"]
|
||||
|
||||
[[package]]
|
||||
name = "pyarrow"
|
||||
version = "22.0.0"
|
||||
description = "Python library for Apache Arrow"
|
||||
optional = false
|
||||
python-versions = ">=3.10"
|
||||
groups = ["main"]
|
||||
files = [
|
||||
{file = "pyarrow-22.0.0-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:77718810bd3066158db1e95a63c160ad7ce08c6b0710bc656055033e39cdad88"},
|
||||
{file = "pyarrow-22.0.0-cp310-cp310-macosx_12_0_x86_64.whl", hash = "sha256:44d2d26cda26d18f7af7db71453b7b783788322d756e81730acb98f24eb90ace"},
|
||||
{file = "pyarrow-22.0.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:b9d71701ce97c95480fecb0039ec5bb889e75f110da72005743451339262f4ce"},
|
||||
{file = "pyarrow-22.0.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:710624ab925dc2b05a6229d47f6f0dac1c1155e6ed559be7109f684eba048a48"},
|
||||
{file = "pyarrow-22.0.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:f963ba8c3b0199f9d6b794c90ec77545e05eadc83973897a4523c9e8d84e9340"},
|
||||
{file = "pyarrow-22.0.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:bd0d42297ace400d8febe55f13fdf46e86754842b860c978dfec16f081e5c653"},
|
||||
{file = "pyarrow-22.0.0-cp310-cp310-win_amd64.whl", hash = "sha256:00626d9dc0f5ef3a75fe63fd68b9c7c8302d2b5bbc7f74ecaedba83447a24f84"},
|
||||
{file = "pyarrow-22.0.0-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:3e294c5eadfb93d78b0763e859a0c16d4051fc1c5231ae8956d61cb0b5666f5a"},
|
||||
{file = "pyarrow-22.0.0-cp311-cp311-macosx_12_0_x86_64.whl", hash = "sha256:69763ab2445f632d90b504a815a2a033f74332997052b721002298ed6de40f2e"},
|
||||
{file = "pyarrow-22.0.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:b41f37cabfe2463232684de44bad753d6be08a7a072f6a83447eeaf0e4d2a215"},
|
||||
{file = "pyarrow-22.0.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:35ad0f0378c9359b3f297299c3309778bb03b8612f987399a0333a560b43862d"},
|
||||
{file = "pyarrow-22.0.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:8382ad21458075c2e66a82a29d650f963ce51c7708c7c0ff313a8c206c4fd5e8"},
|
||||
{file = "pyarrow-22.0.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1a812a5b727bc09c3d7ea072c4eebf657c2f7066155506ba31ebf4792f88f016"},
|
||||
{file = "pyarrow-22.0.0-cp311-cp311-win_amd64.whl", hash = "sha256:ec5d40dd494882704fb876c16fa7261a69791e784ae34e6b5992e977bd2e238c"},
|
||||
{file = "pyarrow-22.0.0-cp312-cp312-macosx_12_0_arm64.whl", hash = "sha256:bea79263d55c24a32b0d79c00a1c58bb2ee5f0757ed95656b01c0fb310c5af3d"},
|
||||
{file = "pyarrow-22.0.0-cp312-cp312-macosx_12_0_x86_64.whl", hash = "sha256:12fe549c9b10ac98c91cf791d2945e878875d95508e1a5d14091a7aaa66d9cf8"},
|
||||
{file = "pyarrow-22.0.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:334f900ff08ce0423407af97e6c26ad5d4e3b0763645559ece6fbf3747d6a8f5"},
|
||||
{file = "pyarrow-22.0.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:c6c791b09c57ed76a18b03f2631753a4960eefbbca80f846da8baefc6491fcfe"},
|
||||
{file = "pyarrow-22.0.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:c3200cb41cdbc65156e5f8c908d739b0dfed57e890329413da2748d1a2cd1a4e"},
|
||||
{file = "pyarrow-22.0.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:ac93252226cf288753d8b46280f4edf3433bf9508b6977f8dd8526b521a1bbb9"},
|
||||
{file = "pyarrow-22.0.0-cp312-cp312-win_amd64.whl", hash = "sha256:44729980b6c50a5f2bfcc2668d36c569ce17f8b17bccaf470c4313dcbbf13c9d"},
|
||||
{file = "pyarrow-22.0.0-cp313-cp313-macosx_12_0_arm64.whl", hash = "sha256:e6e95176209257803a8b3d0394f21604e796dadb643d2f7ca21b66c9c0b30c9a"},
|
||||
{file = "pyarrow-22.0.0-cp313-cp313-macosx_12_0_x86_64.whl", hash = "sha256:001ea83a58024818826a9e3f89bf9310a114f7e26dfe404a4c32686f97bd7901"},
|
||||
{file = "pyarrow-22.0.0-cp313-cp313-manylinux_2_28_aarch64.whl", hash = "sha256:ce20fe000754f477c8a9125543f1936ea5b8867c5406757c224d745ed033e691"},
|
||||
{file = "pyarrow-22.0.0-cp313-cp313-manylinux_2_28_x86_64.whl", hash = "sha256:e0a15757fccb38c410947df156f9749ae4a3c89b2393741a50521f39a8cf202a"},
|
||||
{file = "pyarrow-22.0.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:cedb9dd9358e4ea1d9bce3665ce0797f6adf97ff142c8e25b46ba9cdd508e9b6"},
|
||||
{file = "pyarrow-22.0.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:252be4a05f9d9185bb8c18e83764ebcfea7185076c07a7a662253af3a8c07941"},
|
||||
{file = "pyarrow-22.0.0-cp313-cp313-win_amd64.whl", hash = "sha256:a4893d31e5ef780b6edcaf63122df0f8d321088bb0dee4c8c06eccb1ca28d145"},
|
||||
{file = "pyarrow-22.0.0-cp313-cp313t-macosx_12_0_arm64.whl", hash = "sha256:f7fe3dbe871294ba70d789be16b6e7e52b418311e166e0e3cba9522f0f437fb1"},
|
||||
{file = "pyarrow-22.0.0-cp313-cp313t-macosx_12_0_x86_64.whl", hash = "sha256:ba95112d15fd4f1105fb2402c4eab9068f0554435e9b7085924bcfaac2cc306f"},
|
||||
{file = "pyarrow-22.0.0-cp313-cp313t-manylinux_2_28_aarch64.whl", hash = "sha256:c064e28361c05d72eed8e744c9605cbd6d2bb7481a511c74071fd9b24bc65d7d"},
|
||||
{file = "pyarrow-22.0.0-cp313-cp313t-manylinux_2_28_x86_64.whl", hash = "sha256:6f9762274496c244d951c819348afbcf212714902742225f649cf02823a6a10f"},
|
||||
{file = "pyarrow-22.0.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:a9d9ffdc2ab696f6b15b4d1f7cec6658e1d788124418cb30030afbae31c64746"},
|
||||
{file = "pyarrow-22.0.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:ec1a15968a9d80da01e1d30349b2b0d7cc91e96588ee324ce1b5228175043e95"},
|
||||
{file = "pyarrow-22.0.0-cp313-cp313t-win_amd64.whl", hash = "sha256:bba208d9c7decf9961998edf5c65e3ea4355d5818dd6cd0f6809bec1afb951cc"},
|
||||
{file = "pyarrow-22.0.0-cp314-cp314-macosx_12_0_arm64.whl", hash = "sha256:9bddc2cade6561f6820d4cd73f99a0243532ad506bc510a75a5a65a522b2d74d"},
|
||||
{file = "pyarrow-22.0.0-cp314-cp314-macosx_12_0_x86_64.whl", hash = "sha256:e70ff90c64419709d38c8932ea9fe1cc98415c4f87ea8da81719e43f02534bc9"},
|
||||
{file = "pyarrow-22.0.0-cp314-cp314-manylinux_2_28_aarch64.whl", hash = "sha256:92843c305330aa94a36e706c16209cd4df274693e777ca47112617db7d0ef3d7"},
|
||||
{file = "pyarrow-22.0.0-cp314-cp314-manylinux_2_28_x86_64.whl", hash = "sha256:6dda1ddac033d27421c20d7a7943eec60be44e0db4e079f33cc5af3b8280ccde"},
|
||||
{file = "pyarrow-22.0.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:84378110dd9a6c06323b41b56e129c504d157d1a983ce8f5443761eb5256bafc"},
|
||||
{file = "pyarrow-22.0.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:854794239111d2b88b40b6ef92aa478024d1e5074f364033e73e21e3f76b25e0"},
|
||||
{file = "pyarrow-22.0.0-cp314-cp314-win_amd64.whl", hash = "sha256:b883fe6fd85adad7932b3271c38ac289c65b7337c2c132e9569f9d3940620730"},
|
||||
{file = "pyarrow-22.0.0-cp314-cp314t-macosx_12_0_arm64.whl", hash = "sha256:7a820d8ae11facf32585507c11f04e3f38343c1e784c9b5a8b1da5c930547fe2"},
|
||||
{file = "pyarrow-22.0.0-cp314-cp314t-macosx_12_0_x86_64.whl", hash = "sha256:c6ec3675d98915bf1ec8b3c7986422682f7232ea76cad276f4c8abd5b7319b70"},
|
||||
{file = "pyarrow-22.0.0-cp314-cp314t-manylinux_2_28_aarch64.whl", hash = "sha256:3e739edd001b04f654b166204fc7a9de896cf6007eaff33409ee9e50ceaff754"},
|
||||
{file = "pyarrow-22.0.0-cp314-cp314t-manylinux_2_28_x86_64.whl", hash = "sha256:7388ac685cab5b279a41dfe0a6ccd99e4dbf322edfb63e02fc0443bf24134e91"},
|
||||
{file = "pyarrow-22.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:f633074f36dbc33d5c05b5dc75371e5660f1dbf9c8b1d95669def05e5425989c"},
|
||||
{file = "pyarrow-22.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:4c19236ae2402a8663a2c8f21f1870a03cc57f0bef7e4b6eb3238cc82944de80"},
|
||||
{file = "pyarrow-22.0.0-cp314-cp314t-win_amd64.whl", hash = "sha256:0c34fe18094686194f204a3b1787a27456897d8a2d62caf84b61e8dfbc0252ae"},
|
||||
{file = "pyarrow-22.0.0.tar.gz", hash = "sha256:3d600dc583260d845c7d8a6db540339dd883081925da2bd1c5cb808f720b3cd9"},
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pyasn1"
|
||||
version = "0.6.1"
|
||||
@@ -6132,7 +6512,7 @@ files = [
|
||||
{file = "pycparser-2.23-py3-none-any.whl", hash = "sha256:e5c6e8d3fbad53479cab09ac03729e0a9faf2bee3db8208a550daf5af81a5934"},
|
||||
{file = "pycparser-2.23.tar.gz", hash = "sha256:78816d4f24add8f10a06d6f05b4d424ad9e96cfebf68a4ddc99c65c0720d00c2"},
|
||||
]
|
||||
markers = {main = "implementation_name != \"PyPy\"", dev = "implementation_name != \"PyPy\" and (platform_python_implementation != \"PyPy\" or sys_platform == \"darwin\") and (sys_platform == \"linux\" or sys_platform == \"darwin\")"}
|
||||
markers = {main = "implementation_name != \"PyPy\"", dev = "(platform_python_implementation != \"PyPy\" or sys_platform == \"darwin\") and implementation_name != \"PyPy\" and (sys_platform == \"linux\" or sys_platform == \"darwin\")"}
|
||||
|
||||
[[package]]
|
||||
name = "pydantic"
|
||||
@@ -7539,6 +7919,80 @@ enabler = ["pytest-enabler (>=2.2)"]
|
||||
test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21) ; python_version >= \"3.9\" and sys_platform != \"cygwin\"", "jaraco.envs (>=2.2)", "jaraco.path (>=3.7.2)", "jaraco.test (>=5.5)", "packaging (>=24.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf ; sys_platform != \"cygwin\"", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"]
|
||||
type = ["importlib_metadata (>=7.0.2) ; python_version < \"3.10\"", "jaraco.develop (>=7.21) ; sys_platform != \"cygwin\"", "mypy (==1.14.*)", "pytest-mypy"]
|
||||
|
||||
[[package]]
|
||||
name = "shapely"
|
||||
version = "2.1.2"
|
||||
description = "Manipulation and analysis of geometric objects"
|
||||
optional = false
|
||||
python-versions = ">=3.10"
|
||||
groups = ["main"]
|
||||
files = [
|
||||
{file = "shapely-2.1.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7ae48c236c0324b4e139bea88a306a04ca630f49be66741b340729d380d8f52f"},
|
||||
{file = "shapely-2.1.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:eba6710407f1daa8e7602c347dfc94adc02205ec27ed956346190d66579eb9ea"},
|
||||
{file = "shapely-2.1.2-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:ef4a456cc8b7b3d50ccec29642aa4aeda959e9da2fe9540a92754770d5f0cf1f"},
|
||||
{file = "shapely-2.1.2-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:e38a190442aacc67ff9f75ce60aec04893041f16f97d242209106d502486a142"},
|
||||
{file = "shapely-2.1.2-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:40d784101f5d06a1fd30b55fc11ea58a61be23f930d934d86f19a180909908a4"},
|
||||
{file = "shapely-2.1.2-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:f6f6cd5819c50d9bcf921882784586aab34a4bd53e7553e175dece6db513a6f0"},
|
||||
{file = "shapely-2.1.2-cp310-cp310-win32.whl", hash = "sha256:fe9627c39c59e553c90f5bc3128252cb85dc3b3be8189710666d2f8bc3a5503e"},
|
||||
{file = "shapely-2.1.2-cp310-cp310-win_amd64.whl", hash = "sha256:1d0bfb4b8f661b3b4ec3565fa36c340bfb1cda82087199711f86a88647d26b2f"},
|
||||
{file = "shapely-2.1.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:91121757b0a36c9aac3427a651a7e6567110a4a67c97edf04f8d55d4765f6618"},
|
||||
{file = "shapely-2.1.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:16a9c722ba774cf50b5d4541242b4cce05aafd44a015290c82ba8a16931ff63d"},
|
||||
{file = "shapely-2.1.2-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:cc4f7397459b12c0b196c9efe1f9d7e92463cbba142632b4cc6d8bbbbd3e2b09"},
|
||||
{file = "shapely-2.1.2-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:136ab87b17e733e22f0961504d05e77e7be8c9b5a8184f685b4a91a84efe3c26"},
|
||||
{file = "shapely-2.1.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:16c5d0fc45d3aa0a69074979f4f1928ca2734fb2e0dde8af9611e134e46774e7"},
|
||||
{file = "shapely-2.1.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:6ddc759f72b5b2b0f54a7e7cde44acef680a55019eb52ac63a7af2cf17cb9cd2"},
|
||||
{file = "shapely-2.1.2-cp311-cp311-win32.whl", hash = "sha256:2fa78b49485391224755a856ed3b3bd91c8455f6121fee0db0e71cefb07d0ef6"},
|
||||
{file = "shapely-2.1.2-cp311-cp311-win_amd64.whl", hash = "sha256:c64d5c97b2f47e3cd9b712eaced3b061f2b71234b3fc263e0fcf7d889c6559dc"},
|
||||
{file = "shapely-2.1.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:fe2533caae6a91a543dec62e8360fe86ffcdc42a7c55f9dfd0128a977a896b94"},
|
||||
{file = "shapely-2.1.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ba4d1333cc0bc94381d6d4308d2e4e008e0bd128bdcff5573199742ee3634359"},
|
||||
{file = "shapely-2.1.2-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:0bd308103340030feef6c111d3eb98d50dc13feea33affc8a6f9fa549e9458a3"},
|
||||
{file = "shapely-2.1.2-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:1e7d4d7ad262a48bb44277ca12c7c78cb1b0f56b32c10734ec9a1d30c0b0c54b"},
|
||||
{file = "shapely-2.1.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:e9eddfe513096a71896441a7c37db72da0687b34752c4e193577a145c71736fc"},
|
||||
{file = "shapely-2.1.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:980c777c612514c0cf99bc8a9de6d286f5e186dcaf9091252fcd444e5638193d"},
|
||||
{file = "shapely-2.1.2-cp312-cp312-win32.whl", hash = "sha256:9111274b88e4d7b54a95218e243282709b330ef52b7b86bc6aaf4f805306f454"},
|
||||
{file = "shapely-2.1.2-cp312-cp312-win_amd64.whl", hash = "sha256:743044b4cfb34f9a67205cee9279feaf60ba7d02e69febc2afc609047cb49179"},
|
||||
{file = "shapely-2.1.2-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:b510dda1a3672d6879beb319bc7c5fd302c6c354584690973c838f46ec3e0fa8"},
|
||||
{file = "shapely-2.1.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:8cff473e81017594d20ec55d86b54bc635544897e13a7cfc12e36909c5309a2a"},
|
||||
{file = "shapely-2.1.2-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:fe7b77dc63d707c09726b7908f575fc04ff1d1ad0f3fb92aec212396bc6cfe5e"},
|
||||
{file = "shapely-2.1.2-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:7ed1a5bbfb386ee8332713bf7508bc24e32d24b74fc9a7b9f8529a55db9f4ee6"},
|
||||
{file = "shapely-2.1.2-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a84e0582858d841d54355246ddfcbd1fce3179f185da7470f41ce39d001ee1af"},
|
||||
{file = "shapely-2.1.2-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:dc3487447a43d42adcdf52d7ac73804f2312cbfa5d433a7d2c506dcab0033dfd"},
|
||||
{file = "shapely-2.1.2-cp313-cp313-win32.whl", hash = "sha256:9c3a3c648aedc9f99c09263b39f2d8252f199cb3ac154fadc173283d7d111350"},
|
||||
{file = "shapely-2.1.2-cp313-cp313-win_amd64.whl", hash = "sha256:ca2591bff6645c216695bdf1614fca9c82ea1144d4a7591a466fef64f28f0715"},
|
||||
{file = "shapely-2.1.2-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:2d93d23bdd2ed9dc157b46bc2f19b7da143ca8714464249bef6771c679d5ff40"},
|
||||
{file = "shapely-2.1.2-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:01d0d304b25634d60bd7cf291828119ab55a3bab87dc4af1e44b07fb225f188b"},
|
||||
{file = "shapely-2.1.2-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:8d8382dd120d64b03698b7298b89611a6ea6f55ada9d39942838b79c9bc89801"},
|
||||
{file = "shapely-2.1.2-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:19efa3611eef966e776183e338b2d7ea43569ae99ab34f8d17c2c054d3205cc0"},
|
||||
{file = "shapely-2.1.2-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:346ec0c1a0fcd32f57f00e4134d1200e14bf3f5ae12af87ba83ca275c502498c"},
|
||||
{file = "shapely-2.1.2-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:6305993a35989391bd3476ee538a5c9a845861462327efe00dd11a5c8c709a99"},
|
||||
{file = "shapely-2.1.2-cp313-cp313t-win32.whl", hash = "sha256:c8876673449f3401f278c86eb33224c5764582f72b653a415d0e6672fde887bf"},
|
||||
{file = "shapely-2.1.2-cp313-cp313t-win_amd64.whl", hash = "sha256:4a44bc62a10d84c11a7a3d7c1c4fe857f7477c3506e24c9062da0db0ae0c449c"},
|
||||
{file = "shapely-2.1.2-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:9a522f460d28e2bf4e12396240a5fc1518788b2fcd73535166d748399ef0c223"},
|
||||
{file = "shapely-2.1.2-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:1ff629e00818033b8d71139565527ced7d776c269a49bd78c9df84e8f852190c"},
|
||||
{file = "shapely-2.1.2-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f67b34271dedc3c653eba4e3d7111aa421d5be9b4c4c7d38d30907f796cb30df"},
|
||||
{file = "shapely-2.1.2-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:21952dc00df38a2c28375659b07a3979d22641aeb104751e769c3ee825aadecf"},
|
||||
{file = "shapely-2.1.2-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:1f2f33f486777456586948e333a56ae21f35ae273be99255a191f5c1fa302eb4"},
|
||||
{file = "shapely-2.1.2-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:cf831a13e0d5a7eb519e96f58ec26e049b1fad411fc6fc23b162a7ce04d9cffc"},
|
||||
{file = "shapely-2.1.2-cp314-cp314-win32.whl", hash = "sha256:61edcd8d0d17dd99075d320a1dd39c0cb9616f7572f10ef91b4b5b00c4aeb566"},
|
||||
{file = "shapely-2.1.2-cp314-cp314-win_amd64.whl", hash = "sha256:a444e7afccdb0999e203b976adb37ea633725333e5b119ad40b1ca291ecf311c"},
|
||||
{file = "shapely-2.1.2-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:5ebe3f84c6112ad3d4632b1fd2290665aa75d4cef5f6c5d77c4c95b324527c6a"},
|
||||
{file = "shapely-2.1.2-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:5860eb9f00a1d49ebb14e881f5caf6c2cf472c7fd38bd7f253bbd34f934eb076"},
|
||||
{file = "shapely-2.1.2-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:b705c99c76695702656327b819c9660768ec33f5ce01fa32b2af62b56ba400a1"},
|
||||
{file = "shapely-2.1.2-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:a1fd0ea855b2cf7c9cddaf25543e914dd75af9de08785f20ca3085f2c9ca60b0"},
|
||||
{file = "shapely-2.1.2-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:df90e2db118c3671a0754f38e36802db75fe0920d211a27481daf50a711fdf26"},
|
||||
{file = "shapely-2.1.2-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:361b6d45030b4ac64ddd0a26046906c8202eb60d0f9f53085f5179f1d23021a0"},
|
||||
{file = "shapely-2.1.2-cp314-cp314t-win32.whl", hash = "sha256:b54df60f1fbdecc8ebc2c5b11870461a6417b3d617f555e5033f1505d36e5735"},
|
||||
{file = "shapely-2.1.2-cp314-cp314t-win_amd64.whl", hash = "sha256:0036ac886e0923417932c2e6369b6c52e38e0ff5d9120b90eef5cd9a5fc5cae9"},
|
||||
{file = "shapely-2.1.2.tar.gz", hash = "sha256:2ed4ecb28320a433db18a5bf029986aa8afcfd740745e78847e330d5d94922a9"},
|
||||
]
|
||||
|
||||
[package.dependencies]
|
||||
numpy = ">=1.21"
|
||||
|
||||
[package.extras]
|
||||
docs = ["matplotlib", "numpydoc (==1.1.*)", "sphinx", "sphinx-book-theme", "sphinx-remove-toctrees"]
|
||||
test = ["pytest", "pytest-cov", "scipy-doctest"]
|
||||
|
||||
[[package]]
|
||||
name = "shellingham"
|
||||
version = "1.5.4"
|
||||
@@ -8720,7 +9174,7 @@ description = "A language and compiler for custom Deep Learning operations"
|
||||
optional = false
|
||||
python-versions = "<3.15,>=3.10"
|
||||
groups = ["main"]
|
||||
markers = "(platform_machine == \"x86_64\" or sys_platform == \"linux2\") and (platform_system == \"Linux\" or sys_platform == \"linux\" or sys_platform == \"linux2\") and (platform_system == \"Linux\" or extra == \"local-whisper\") and (platform_machine == \"x86_64\" or extra == \"local-whisper\")"
|
||||
markers = "(platform_system == \"Linux\" or sys_platform == \"linux\" or sys_platform == \"linux2\") and (platform_system == \"Linux\" or extra == \"local-whisper\") and (platform_machine == \"x86_64\" or extra == \"local-whisper\") and (platform_machine == \"x86_64\" or sys_platform == \"linux2\")"
|
||||
files = [
|
||||
{file = "triton-3.5.1-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f63e34dcb32d7bd3a1d0195f60f30d2aee8b08a69a0424189b71017e23dfc3d2"},
|
||||
{file = "triton-3.5.1-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5fc53d849f879911ea13f4a877243afc513187bc7ee92d1f2c0f1ba3169e3c94"},
|
||||
@@ -8929,7 +9383,7 @@ description = "Fast implementation of asyncio event loop on top of libuv"
|
||||
optional = false
|
||||
python-versions = ">=3.8.1"
|
||||
groups = ["main"]
|
||||
markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\""
|
||||
markers = "platform_python_implementation != \"PyPy\" and sys_platform != \"win32\" and sys_platform != \"cygwin\""
|
||||
files = [
|
||||
{file = "uvloop-0.22.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:ef6f0d4cc8a9fa1f6a910230cd53545d9a14479311e87e3cb225495952eb672c"},
|
||||
{file = "uvloop-0.22.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7cd375a12b71d33d46af85a3343b35d98e8116134ba404bd657b3b1d15988792"},
|
||||
@@ -8987,6 +9441,21 @@ dev = ["Cython (>=3.0,<4.0)", "setuptools (>=60)"]
|
||||
docs = ["Sphinx (>=4.1.2,<4.2.0)", "sphinx_rtd_theme (>=0.5.2,<0.6.0)", "sphinxcontrib-asyncio (>=0.3.0,<0.4.0)"]
|
||||
test = ["aiohttp (>=3.10.5)", "flake8 (>=6.1,<7.0)", "mypy (>=0.800)", "psutil", "pyOpenSSL (>=25.3.0,<25.4.0)", "pycodestyle (>=2.11.0,<2.12.0)"]
|
||||
|
||||
[[package]]
|
||||
name = "validators"
|
||||
version = "0.35.0"
|
||||
description = "Python Data Validation for Humans™"
|
||||
optional = false
|
||||
python-versions = ">=3.9"
|
||||
groups = ["main"]
|
||||
files = [
|
||||
{file = "validators-0.35.0-py3-none-any.whl", hash = "sha256:e8c947097eae7892cb3d26868d637f79f47b4a0554bc6b80065dfe5aac3705dd"},
|
||||
{file = "validators-0.35.0.tar.gz", hash = "sha256:992d6c48a4e77c81f1b4daba10d16c3a9bb0dbb79b3a19ea847ff0928e70497a"},
|
||||
]
|
||||
|
||||
[package.extras]
|
||||
crypto-eth-addresses = ["eth-hash[pycryptodome] (>=0.7.0)"]
|
||||
|
||||
[[package]]
|
||||
name = "virtualenv"
|
||||
version = "20.35.4"
|
||||
@@ -9297,7 +9766,7 @@ description = "Enable Unicode input and display when running Python from Windows
|
||||
optional = false
|
||||
python-versions = "*"
|
||||
groups = ["main"]
|
||||
markers = "platform_system == \"Windows\" and platform_python_implementation != \"PyPy\""
|
||||
markers = "platform_python_implementation != \"PyPy\" and platform_system == \"Windows\""
|
||||
files = [
|
||||
{file = "win_unicode_console-0.5.zip", hash = "sha256:d4142d4d56d46f449d6f00536a73625a871cba040f0bc1a2e305a04578f07d1e"},
|
||||
]
|
||||
@@ -9795,4 +10264,4 @@ local-whisper = ["whisper-timestamped"]
|
||||
[metadata]
|
||||
lock-version = "2.1"
|
||||
python-versions = ">=3.10,<3.14"
|
||||
content-hash = "d4d1260ae1bf54e937add9ee24c696e85f6dab3692e78e5d270ef87bb3df6a76"
|
||||
content-hash = "8fc2a24adfdbabac044f1e2dcdc0869682ea2b99418e1a3ad3e5e11f30d6f76d"
|
||||
+2
-1
@@ -1,6 +1,6 @@
|
||||
[tool.poetry]
|
||||
name = "karaoke-gen"
|
||||
version = "0.76.30"
|
||||
version = "0.82.0"
|
||||
description = "Generate karaoke videos with synchronized lyrics. Handles the entire process from downloading audio and lyrics to creating the final video with title screens."
|
||||
authors = ["Andrew Beveridge <andrew@beveridge.uk>"]
|
||||
license = "MIT"
|
||||
@@ -66,6 +66,7 @@ langchain-core = ">=0.3.0"
|
||||
langchain-openai = ">=0.2.0"
|
||||
langchain-anthropic = ">=0.2.0"
|
||||
langchain-ollama = ">=0.2.0"
|
||||
langchain-google-vertexai = ">=3.1.1"
|
||||
langfuse = ">=3.0.0"
|
||||
jiwer = ">=3.0.0"
|
||||
kbputils = "^0.0.16"
|
||||
|
||||
+181
-13
@@ -1,18 +1,32 @@
|
||||
#!/bin/bash
|
||||
# Debug a specific karaoke job
|
||||
# Usage: ./scripts/debug-job.sh <job_id>
|
||||
#
|
||||
# Requires KARAOKE_GEN_AUTH_TOKEN env var to be set to a valid admin token.
|
||||
# Get your token from the GCP Secret Manager or .env file.
|
||||
|
||||
set -e
|
||||
|
||||
if [ -z "$1" ]; then
|
||||
echo "Usage: $0 <job_id>"
|
||||
echo "Example: $0 e168cb20"
|
||||
echo ""
|
||||
echo "Requires KARAOKE_GEN_AUTH_TOKEN environment variable (admin token)."
|
||||
echo "Set it with: export KARAOKE_GEN_AUTH_TOKEN=your-admin-token"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
JOB_ID="$1"
|
||||
BACKEND_URL="${BACKEND_URL:-https://karaoke-backend-ipzqd2k4yq-uc.a.run.app}"
|
||||
AUTH_TOKEN="${AUTH_TOKEN:-$(gcloud auth print-identity-token)}"
|
||||
BACKEND_URL="${BACKEND_URL:-https://api.nomadkaraoke.com}"
|
||||
AUTH_TOKEN="${KARAOKE_GEN_AUTH_TOKEN}"
|
||||
|
||||
if [ -z "$AUTH_TOKEN" ]; then
|
||||
echo "Error: KARAOKE_GEN_AUTH_TOKEN environment variable is not set."
|
||||
echo ""
|
||||
echo "Set it with: export KARAOKE_GEN_AUTH_TOKEN=your-admin-token"
|
||||
echo "You can find admin tokens in GCP Secret Manager or your .env file."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Colors
|
||||
RED='\033[0;31m'
|
||||
@@ -29,14 +43,63 @@ echo ""
|
||||
# 1. Get job status
|
||||
echo -e "${BLUE}1. Job Status:${NC}"
|
||||
echo "---"
|
||||
JOB_STATUS=$(curl -s -H "Authorization: Bearer $AUTH_TOKEN" "$BACKEND_URL/api/jobs/$JOB_ID")
|
||||
echo "$JOB_STATUS" | jq '{status, progress, error_message, error_details, timeline: .timeline | length}'
|
||||
|
||||
# Capture both response body and HTTP status code
|
||||
HTTP_RESPONSE=$(curl -s -w "\n%{http_code}" -H "Authorization: Bearer $AUTH_TOKEN" "$BACKEND_URL/api/jobs/$JOB_ID")
|
||||
HTTP_STATUS=$(echo "$HTTP_RESPONSE" | tail -n 1)
|
||||
JOB_STATUS=$(echo "$HTTP_RESPONSE" | sed '$d')
|
||||
|
||||
# Check HTTP status
|
||||
if [ "$HTTP_STATUS" != "200" ]; then
|
||||
echo -e "${RED}API Error (HTTP $HTTP_STATUS):${NC}"
|
||||
echo "$JOB_STATUS" | jq -r '.detail // .' 2>/dev/null || echo "$JOB_STATUS"
|
||||
echo ""
|
||||
echo -e "${YELLOW}Possible causes:${NC}"
|
||||
case "$HTTP_STATUS" in
|
||||
401)
|
||||
echo " - Invalid or expired AUTH_TOKEN"
|
||||
echo " - Token doesn't have access to this job"
|
||||
;;
|
||||
403)
|
||||
echo " - Token lacks permission to view this job"
|
||||
echo " - Job belongs to a different user (need admin token)"
|
||||
;;
|
||||
404)
|
||||
echo " - Job ID '$JOB_ID' not found"
|
||||
echo " - Job may have been deleted"
|
||||
;;
|
||||
*)
|
||||
echo " - Server error or network issue"
|
||||
;;
|
||||
esac
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "$JOB_STATUS" | jq '{status, progress, error_message, error_details, timeline: (.timeline | length)}'
|
||||
echo ""
|
||||
|
||||
# 2. Get full timeline
|
||||
echo -e "${BLUE}2. Timeline (last 10 events):${NC}"
|
||||
echo "---"
|
||||
echo "$JOB_STATUS" | jq -r '.timeline[-10:][] | "\(.timestamp) [\(.status)] \(.message)"'
|
||||
TIMELINE_COUNT=$(echo "$JOB_STATUS" | jq '.timeline | length')
|
||||
if [ "$TIMELINE_COUNT" = "0" ] || [ "$TIMELINE_COUNT" = "null" ]; then
|
||||
echo "(no timeline events)"
|
||||
else
|
||||
echo "$JOB_STATUS" | jq -r '.timeline[-10:][] | "\(.timestamp) [\(.status)] \(.message // "(no message)")"'
|
||||
fi
|
||||
echo ""
|
||||
|
||||
# 2b. Get worker logs (more accurate real-time status)
|
||||
echo -e "${BLUE}2b. Worker Logs (last 10):${NC}"
|
||||
echo "---"
|
||||
LOGS_RESPONSE=$(curl -s -H "Authorization: Bearer $AUTH_TOKEN" "$BACKEND_URL/api/jobs/$JOB_ID/logs?since_index=0")
|
||||
LOGS_STATUS=$(echo "$LOGS_RESPONSE" | jq -r '.total_logs // 0')
|
||||
if [ "$LOGS_STATUS" = "0" ] || [ "$LOGS_STATUS" = "null" ]; then
|
||||
echo "(no worker logs)"
|
||||
else
|
||||
echo "Total logs: $LOGS_STATUS"
|
||||
echo "$LOGS_RESPONSE" | jq -r '.logs[-10:][] | "\(.timestamp) [\(.worker)] \(.level): \(.message)"' 2>/dev/null || echo "(error parsing logs)"
|
||||
fi
|
||||
echo ""
|
||||
|
||||
# 3. Check if files exist in GCS
|
||||
@@ -77,30 +140,135 @@ gcloud logging read "resource.type=cloud_run_revision AND resource.labels.servic
|
||||
done
|
||||
echo ""
|
||||
|
||||
# 5. Check Firestore document
|
||||
echo -e "${BLUE}5. Firestore Document Fields:${NC}"
|
||||
# 5. Job Details
|
||||
echo -e "${BLUE}5. Job Details:${NC}"
|
||||
echo "---"
|
||||
echo "$JOB_STATUS" | jq 'keys | sort'
|
||||
echo "$JOB_STATUS" | jq '{
|
||||
artist,
|
||||
title,
|
||||
user_email,
|
||||
created_at,
|
||||
updated_at,
|
||||
prep_only,
|
||||
finalise_only
|
||||
}'
|
||||
echo ""
|
||||
|
||||
# 6. Summary
|
||||
# 6. File URLs
|
||||
echo -e "${BLUE}6. File URLs:${NC}"
|
||||
echo "---"
|
||||
echo "$JOB_STATUS" | jq '.file_urls // {}' | head -50
|
||||
echo ""
|
||||
|
||||
# 7. Summary
|
||||
echo "========================================"
|
||||
echo -e "${BLUE}Summary:${NC}"
|
||||
ARTIST=$(echo "$JOB_STATUS" | jq -r '.artist // "Unknown"')
|
||||
TITLE=$(echo "$JOB_STATUS" | jq -r '.title // "Unknown"')
|
||||
STATUS=$(echo "$JOB_STATUS" | jq -r '.status')
|
||||
ERROR=$(echo "$JOB_STATUS" | jq -r '.error_message // "None"')
|
||||
PROGRESS=$(echo "$JOB_STATUS" | jq -r '.progress // 0')
|
||||
|
||||
echo "Track: $ARTIST - $TITLE"
|
||||
|
||||
# Compute enhanced status from state_data (like frontend does)
|
||||
# The backend status can be stale during parallel processing
|
||||
AUDIO_STAGE=$(echo "$JOB_STATUS" | jq -r '.state_data.audio_progress.stage // empty')
|
||||
LYRICS_STAGE=$(echo "$JOB_STATUS" | jq -r '.state_data.lyrics_progress.stage // empty')
|
||||
AUDIO_COMPLETE=$(echo "$JOB_STATUS" | jq -r '.state_data.audio_complete // false')
|
||||
LYRICS_COMPLETE=$(echo "$JOB_STATUS" | jq -r '.state_data.lyrics_complete // false')
|
||||
|
||||
# Determine effective status (mirrors frontend job-status.ts logic)
|
||||
EFFECTIVE_STATUS="$STATUS"
|
||||
STEP_INFO=""
|
||||
|
||||
if [ "$STATUS" = "downloading" ]; then
|
||||
# Check if parallel workers are active
|
||||
if [ -n "$AUDIO_STAGE" ] || [ -n "$LYRICS_STAGE" ]; then
|
||||
EFFECTIVE_STATUS="processing"
|
||||
# Build status string
|
||||
PARTS=""
|
||||
if [ "$AUDIO_COMPLETE" != "true" ] && [ -n "$AUDIO_STAGE" ]; then
|
||||
case "$AUDIO_STAGE" in
|
||||
"separating_stage1") PARTS="Audio 1/2" ;;
|
||||
"separating_stage2") PARTS="Audio 2/2" ;;
|
||||
"audio_complete") PARTS="Audio done" ;;
|
||||
*) PARTS="Audio" ;;
|
||||
esac
|
||||
fi
|
||||
if [ "$LYRICS_COMPLETE" != "true" ] && [ -n "$LYRICS_STAGE" ]; then
|
||||
case "$LYRICS_STAGE" in
|
||||
"transcribing") LYRICS_PART="Transcribing" ;;
|
||||
"correcting") LYRICS_PART="Correcting" ;;
|
||||
"lyrics_complete") LYRICS_PART="Lyrics done" ;;
|
||||
*) LYRICS_PART="Lyrics" ;;
|
||||
esac
|
||||
if [ -n "$PARTS" ]; then
|
||||
PARTS="$PARTS + $LYRICS_PART"
|
||||
else
|
||||
PARTS="$LYRICS_PART"
|
||||
fi
|
||||
fi
|
||||
if [ -n "$PARTS" ]; then
|
||||
STEP_INFO="[4/10] $PARTS"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Map status to step (simplified version of frontend logic)
|
||||
if [ -z "$STEP_INFO" ]; then
|
||||
case "$STATUS" in
|
||||
"pending") STEP_INFO="[1/10] Setting up" ;;
|
||||
"searching_audio") STEP_INFO="[2/10] Searching for audio" ;;
|
||||
"awaiting_audio_selection") STEP_INFO="[2/10] Select audio source" ;;
|
||||
"downloading_audio"|"downloading") STEP_INFO="[3/10] Downloading" ;;
|
||||
"separating_stage1") STEP_INFO="[4/10] Separating audio (1/2)" ;;
|
||||
"separating_stage2") STEP_INFO="[4/10] Separating audio (2/2)" ;;
|
||||
"transcribing") STEP_INFO="[4/10] Transcribing lyrics" ;;
|
||||
"correcting") STEP_INFO="[4/10] Correcting lyrics" ;;
|
||||
"generating_screens") STEP_INFO="[5/10] Generating screens" ;;
|
||||
"awaiting_review"|"in_review") STEP_INFO="[6/10] Review lyrics" ;;
|
||||
"rendering_video") STEP_INFO="[7/10] Rendering video" ;;
|
||||
"awaiting_instrumental_selection") STEP_INFO="[8/10] Select instrumental" ;;
|
||||
"generating_video"|"encoding"|"packaging") STEP_INFO="[9/10] Encoding" ;;
|
||||
"complete"|"prep_complete") STEP_INFO="[10/10] Complete" ;;
|
||||
*) STEP_INFO="$STATUS" ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
echo "Status: $STEP_INFO"
|
||||
if [ "$STATUS" != "$EFFECTIVE_STATUS" ] && [ "$EFFECTIVE_STATUS" = "processing" ]; then
|
||||
echo -e "${YELLOW}(Backend status '$STATUS' is stale - workers are actively processing)${NC}"
|
||||
fi
|
||||
|
||||
case "$STATUS" in
|
||||
"completed")
|
||||
"complete")
|
||||
echo -e "${GREEN}✓ Job completed successfully${NC}"
|
||||
;;
|
||||
"prep_complete")
|
||||
echo -e "${GREEN}✓ Prep completed (ready for finalization)${NC}"
|
||||
;;
|
||||
"failed")
|
||||
echo -e "${RED}✗ Job failed: $ERROR${NC}"
|
||||
# Show error details if available
|
||||
ERROR_DETAILS=$(echo "$JOB_STATUS" | jq -r '.error_details // empty')
|
||||
if [ -n "$ERROR_DETAILS" ] && [ "$ERROR_DETAILS" != "null" ]; then
|
||||
echo -e "${RED}Error details:${NC}"
|
||||
echo "$JOB_STATUS" | jq '.error_details'
|
||||
fi
|
||||
;;
|
||||
"pending"|"processing"*)
|
||||
echo -e "${YELLOW}⏳ Job in progress: $STATUS${NC}"
|
||||
"awaiting_review"|"awaiting_instrumental_selection"|"awaiting_audio_selection")
|
||||
echo -e "${YELLOW}⏸️ Waiting for user action${NC}"
|
||||
;;
|
||||
"cancelled")
|
||||
echo -e "${YELLOW}🚫 Job cancelled${NC}"
|
||||
;;
|
||||
*)
|
||||
echo -e "Status: $STATUS"
|
||||
if [ "$EFFECTIVE_STATUS" = "processing" ]; then
|
||||
echo -e "${BLUE}⏳ Workers actively processing${NC}"
|
||||
else
|
||||
echo -e "${YELLOW}⏳ Job in progress${NC}"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
echo "========================================"
|
||||
|
||||
Loaded 100 of 103 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user