diff --git a/.github/workflows/studio-checks.yml b/.github/workflows/studio-checks.yml new file mode 100644 index 0000000..300488f --- /dev/null +++ b/.github/workflows/studio-checks.yml @@ -0,0 +1,37 @@ +name: Studio checks +on: + pull_request: + workflow_dispatch: +jobs: + studio: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 + with: + node-version: 24 + cache: npm + cache-dependency-path: tools/webui/package-lock.json + - run: npm ci + working-directory: tools/webui + - run: npm ci + working-directory: tools/youtube-agent + - run: npm run check + working-directory: tools/webui + - run: node --experimental-strip-types --test tests/*.test.mjs + working-directory: tools/webui + - run: npm test + working-directory: tools/youtube-agent + - run: npm run build + working-directory: tools/webui + - run: npx playwright install --with-deps chromium + working-directory: tools/youtube-agent + - run: node tests/studio-interactions.mjs + - run: node tests/workflow-browser.mjs + - run: node tests/archive-native.mjs + - run: node tools/webui/tests/storage-browser.mjs + - uses: actions/upload-artifact@v4 + if: always() + with: + name: studio-review + path: build/ui-review diff --git a/.gitignore b/.gitignore index 8954277..b7e0df4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,11 +2,24 @@ build/ *.wav tests/*/ +!tests/job-archive/ checkpoints/ models/*.gguf __pycache__/ node_modules/ +saved_presets/ +job_results/ tools/webui/dist/ training/datasets/ training/checkpoints/ + +# Local operational state and user media +/tools/youtube-agent/profile/ +/tools/youtube-agent/runs/ +*.mp4 +/server*.log + +.venv-vocal/ + +/pinokio_agent/ diff --git a/AUDIT_REPAIRS.md b/AUDIT_REPAIRS.md new file mode 100644 index 0000000..94300fb --- /dev/null +++ b/AUDIT_REPAIRS.md @@ -0,0 +1,49 @@ +> Current implementation, acceptance evidence and build/recovery instructions: [Studio release guide]( docs/studio-release.md ). This document records earlier planning or audit findings. + +# Audit repair status + +## Implemented + +- Atomic browser-library job saves; recovery is cleared after commit, retry saves are deduplicated by source job. +- MP3 default 320 kbps; returned job format determines song metadata. +- Installed Ollama model discovery, lyric draft review, cancellation/timeout, unload request after inference. +- Complete YAML lyric engines loaded into prompts; malformed inline YAML fixed. +- Separate music and lyric mixers with angular, keyboard and numeric 0–100 controls. +- Zero influence excludes a style; removal updates the music prompt. Music descriptions are included in that prompt. +- Active blends persist across reloads. Manually edited/imported music prompts invalidate stale music rings. +- Separate saved music/lyric blends: save, load, explicit update, rename, confirmed delete. Legacy music favourites remain intact and are imported when no new-format favourites exist. +- Auto-duration explicitly submits zero; ordinary saved/imported durations are preserved. +- At most four pending native jobs (including the executing job); excess submissions return HTTP 429. +- Generation request cap 1 MiB; steps 1–200, duration 0–600 seconds, CFG -1–30, peak clip 0–999, supported MPEG bitrates only. +- Worker catches C++ exceptions and marks affected jobs failed; queued cancellation avoids model work. This cannot recover from native assertions, access violations or driver failures. +- Localhost server default and launcher binding. Explicit --host remains available for deliberate LAN use; no authentication layer added. + +## Verification + +From tools/webui: `npm run check`, `node --test tests/repair-regression.test.mjs`, `npm run build`. + +Native release candidate: `build/audit-repair/yue-server.exe` plus its sibling DLLs. Build target yue-server with MSBuild OutDir set to that directory. + +From repository root: `node tests/server-smoke.mjs` starts a separate CPU-only server on port 18087, checks defaults and rejected requests, then stops only its own child. The test does not generate music. + +## Deployment and remaining work + +### Track artwork viewer + +Deployed 2026-09-23 with explicit restart approval; previous binaries: build/backup-before-artwork-viewer-20260923-122024. Songs now support an optional artwork Blob in IndexedDB. The track menu offers Add/Replace artwork (PNG/JPEG/WebP, max 20 MB and 64 MP); validation and saving finish before the existing artwork changes. Art displays as a square beside the track with a separate playback button. Clicking it opens a native modal with thumbnail-to-image Web Animations morph, reverse close, keyboard Escape/focus restoration, scroll lock, full-image download and reduced-motion support. Blob URLs are revoked on cleanup. Automatic artwork generation is still not connected; a future generator should attach its resulting image Blob to Song.artwork and save the track. + +Verified: six regression tests, clean frontend checks, production/native builds, isolated desktop/mobile browser upload-and-reload persistence, active morph animation, Escape/close button, focus and scroll restoration, reduced-motion behavior, screenshots and live embedded-UI markers. GPU-backed native server starts with the existing 320 kbps default. No user library data was used in browser tests. + +### Modern studio UI + +Deployed 2026-09-23 after a second explicit restart approval. Previous binaries: build/backup-before-modern-ui-20260923-112727. Modern theme-aware surfaces, decorative waveform animation, responsive header, section shortcuts, record-sleeve empty state, library search and favourite filtering. Motion respects prefers-reduced-motion; the activity indicator now reflects actual log connectivity. No remote assets or new dependencies. + +Verification: Svelte check has no errors/warnings; five existing regression tests pass; production/native builds and temporary-server smoke checks pass. `node tests/studio-browser.mjs` from tools/webui tested all five themes, desktop/mobile overflow, ring add/remove and keyboard controls, render navigation, reduced motion, library search and favourites, with no runtime exceptions. Isolated-profile screenshots: build/ui-review. Live port 8087 serves the new UI with the 320 kbps default and CUDA initialization intact. + +Deployed on 2026-09-23 after the user confirmed tracks were saved and approved restarting. Candidate executable and four GGML DLLs were copied into build/Release. Previous binaries are retained in build/backup-before-audit-20260923-110222. The existing music launcher continues to use build/Release through server.cmd. + +Live verification: health OK on localhost:8087, MP3 default 320 kbps, native 48 kHz, Q8_0 backbone and F32 YuE2 VAE unchanged, CUDA0 initialization successful, updated embedded UI present, all five deployed binary hashes match the tested candidate. No new song was generated during deployment. + +Not yet verified: interactive browser pointer/keyboard/favourite workflows, song-generation quality, actual Ollama lyric generation on installed models, VRAM recovery under load, admission-limit stress or worker-failure injection. + +Still pending: durable server-side song recovery, broader library backup, full pipeline/plugin architecture, mastering, album/artwork/MP4 processing, all end-to-end audio scenarios. The existing album/artwork controls remain placeholders. Browser-only concurrency guards do not coordinate separate tabs or applications. diff --git a/PROJECT_BUILD_PLAN.md b/PROJECT_BUILD_PLAN.md new file mode 100644 index 0000000..74d966b --- /dev/null +++ b/PROJECT_BUILD_PLAN.md @@ -0,0 +1,164 @@ +> Current implementation, acceptance evidence and build/recovery instructions: [Studio release guide]( docs/studio-release.md ). This document records earlier planning or audit findings. + +# YuE2 Studio - project update and resume plan + +Updated: 2026-09-23. Work parked at the user's request; no background upgrade or restart scheduled. + +## Project identity and safety + +- Correct project: `C:\Users\mrmul\yue2.cpp`, NOT Maestro. +- PowerShell `music` launches `server.cmd`, then `build/Release/yue-server.exe`; UI is served on localhost:8087. +- Native C++/GGML generation with embedded Svelte UI. Preserve the working YuE2 Q8_0 model, compatible native F32 VAE, and 48 kHz audio path. +- The worktree contains substantial existing modifications and untracked features. Do not reset, clean, or overwrite them. +- No huge model downloads, security-policy weakening, or unrelated app updates without explicit approval. +- Before a future YuE2 deployment, ask the user to save new tracks and approve restarting: server-only results can be lost. Previous approvals were for previous deployments. + +## Current status: distinguish deployed from draft + +### Previously deployed and tested + +- Modern studio UI and five themes; separate music and lyric blend controls and saved favourites. +- Ollama integration and structured lyric-style engines (real model output quality still needs end-to-end evaluation). +- MP3 default 320 kbps, existing WAV options, request validation and job persistence repairs. +- Uploaded artwork attached to songs: square thumbnail, expanding modal/morph, image download, keyboard and reduced-motion support. +- See `AUDIT_REPAIRS.md` for historical test/deployment evidence and limitations. Those passes do not validate the new album work. + +### Draft source only: not complete, tested, or deployed + +- `tools/webui/src/lib/album-types.ts`: album/track state and persisted job IDs. +- `tools/webui/src/lib/album-db.ts`: separate IndexedDB album storage. +- `tools/webui/src/lib/album-plan.ts`: lyric imports, request snapshots, shared art direction and per-track seeds. +- `tools/webui/src/lib/comfy-art.ts`: proposed Qwen 2.1 graph, readiness, submission, polling and reference upload. +- `tools/comfy-api.h`: restricted loopback ComfyUI API bridge; wired into `tools/yue-server.cpp` with a configurable Comfy port. +- Song type extensions and Vite proxy changes support future album/art/video integration. +- `pinokio_agent/skills/api/inteliweb-comfyui/SKILL.md`: reusable Comfy API notes. +- Album runner, real album UI, MP4 encoding, and end-to-end artwork generation are unfinished. Existing album controls must not be presented as functioning features yet. + +## Immediate blocker: ComfyUI upgrade + +Managed installation: `C:\pinokio\api\inteliweb-comfyui\app` (Pinokio app `inteliweb-comfyui`, last ready endpoint localhost:8188). Rediscover/probe via the Pinokio skill on return rather than assuming it is running. + +User approved installing a compatible GGUF loader through its manager, restarting ComfyUI if necessary, and upgrading its core through the manager with a backup. This does not authorize changing network/security policies or downloading large weights. + +- Installed/running core remained **0.34.0**, revision `f938505952476e48a12687eac696cdc94d48a3fe`. +- Manager snapshot and backup completed successfully. +- Manager update was accepted but then failed: `Failed to fetch ComfyUI` / `ComfyUI update failed`. +- Elevated read-only GitHub Git probe also timed out connecting to `github.com:443` after about 21 seconds. GitHub's API endpoint was reachable; this is not proof Git transport works. +- No restart, DNS/proxy changes, remote changes, or security bypass was performed. YuE2 health remained OK. + +### Backup + +`build/comfy-backup-20260923-130946/` + +- `comfy-core.bundle`: original source revision, NOT a full Python environment backup. +- `manager-snapshot.json`: core/custom-node revisions and installed dependency versions. +- `user/`: user settings/workflows/manager state. +- `requirements.txt` and `RESTORE-NOTES.md`. + +Keep this backup. Prefer manager-supported snapshot recovery if needed; do not blindly reset repositories or overwrite newer user workflows. + +### Resume checklist: GitHub and compatible core + +1. Read this plan, `AUDIT_REPAIRS.md`, and the Pinokio skill. Inspect current changes and confirm both apps' identities/status. +2. Check whether GitHub Git connectivity has recovered. If still failing, diagnose read-only first; ask before network configuration changes or using a different installation method. +3. Confirm ComfyUI's image queue and manager queue are idle. Refresh the backup if user state changed since this snapshot. +4. Retry the core update through the supported manager; inspect worker logs, not just HTTP 200. Select a supported release containing native Qwen Image 2.1 support; recheck current compatibility rather than hard-coding a stale release. +5. Check dependency installation and restart ComfyUI via its supported managed lifecycle. Verify `/system_stats`, `/object_info`, and startup errors. +6. Require `TextEncodeQwenImage21` and the correct 2.1 model implementation. Older Qwen Edit nodes are not substitutes. +7. Install a genuinely compatible GGUF loader through the manager. Prior inspection found the model-recommended leejet fork supports the architecture, while the inspected city96 loader did not. Reverify upstream state. If the required fork is blocked by the manager's custom-URL policy, ask for direction; do not disable that protection or bypass it with a clone. +8. Confirm all installed model dropdowns, validate a minimal graph, and then run an explicitly identified artwork smoke test. Node presence alone is not an inference pass. + +### Installed model files observed (recheck before use) + +- `models/diffusion_models/qwen-image-2.1-Q4_K_M.gguf` +- `models/text_encoders/qwen3vl_8b_int8_convrot.safetensors` +- `models/vae/qwen_image_2.1_vae_bf16.safetensors` + +The requested Heretic GGUF text encoder was NOT found. Do not claim it is in use. The proposed graph uses the installed compatible INT8 encoder, on CPU where supported. The machine has an RTX 4060 Laptop GPU with 8 GB VRAM and approximately 16 GB RAM; actual memory pressure and inference performance need measurement. + +References to recheck: + +- https://github.com/Comfy-Org/ComfyUI +- https://github.com/Comfy-Org/workflow_templates/blob/main/templates/image_qwen_image_2_1_t2i.json +- https://github.com/Comfy-Org/workflow_templates/blob/main/templates/image_qwen_image_2_1_image_edit.json +- https://huggingface.co/abenzerps/Qwen-Image-2.1-Uncensored-GGUF + +## Build milestones after compatibility is restored + +### 1. Resumable album orchestration + +- Upload multiple UTF-8 lyric files; editable titles, order and optional per-song art direction. +- Snapshot music settings; clear reused semantic tokens/score data; generate one song at a time. +- Persist stage and job IDs before polling; commit song data before advancing. Resume without regenerating already saved songs. +- Coordinate album/single-song runs and multiple tabs. Pause after the current item; never cancel another app user's Comfy work. +- Preserve completed music if optional artwork/video fails. Give explicit retry and audio-only choices. + +### 2. Consistent but distinct artwork + +- Generate one master album cover from shared art direction, palette, medium and lyrical themes. +- Reference the master cover for each track, with different lyric-derived subjects and seeds. Do not chain references through preceding tracks, which can drift. +- Store resulting image Blobs on albums/songs and reuse the deployed thumbnail/viewer. +- Stage work to reduce model competition: sequential songs, cover, per-song artwork, then optional video. Check queues before unloading models. +- Validate actual reference conditioning and image quality. Consistency is guidance, not a guarantee; offer preview/retry. +- Investigate current upstream Qwen 2.1 reference-latent issues before choosing canvas/reference settings. + +### 3. Optional MP4 export + +- Resolve FFmpeg through managed tool discovery/configuration (previously found under Pinokio's miniforge), not a hard-coded module path. +- Add a bounded asynchronous video job: track artwork plus audio, 1080p H.264/AAC with broadly compatible pixel format and fast-start metadata. +- Use safe subprocess argument handling, unique temporary paths, input limits, clear errors and deliberate cleanup. +- Preserve the original MP3/WAV and image. MP3 default remains 320 kbps; AAC video audio is a separate encode, not a lossless quality upgrade. +- Expose video availability and per-track download; do not show an enabled option without a functioning encoder. + +### 4. Album UI and usability + +- Replace placeholders with a collapsible Create Album workspace: track queue, shared visual direction, artwork toggle, optional MP4 toggle, readiness and progress. +- Saved albums/resume, cover preview, per-track audio/art/video status and understandable failures. +- Keep music style and lyric construction separate. Preserve existing themes, ring controls, favourites and generation workflows. +- Explain whether the browser must stay open during orchestration. Do not promise background processing until implemented and tested. + +### 5. Verification and deployment gates + +- Unit tests: import validation, request isolation, deterministic prompts/seeds, state transitions, retry/deduplication, persistence failures. +- Integration tests: missing Comfy/model/loader, failed/restarted job, concurrent work, pause/resume, malformed uploads, video failures, all optional features OFF. +- Real end-to-end test: at least two short songs, one master cover, two distinct reference-conditioned images, MP3 metadata and playable MP4s; inspect visual coherence, audio validity and peak memory. +- Re-run frontend checks/regressions, production/native builds, server smoke tests and isolated browser tests. Existing smoke tests do not prove music/image generation quality. +- Inspect mobile layout, keyboard/focus, reduced motion, theme contrast and image persistence after reload. +- Request fresh YuE2 restart approval; back up deployed binaries, deploy only the tested candidate, verify health/UI/model paths, and document exact results and remaining limitations. + +Useful existing commands: + +```text +# From tools/webui +npm run check +node --test tests/repair-regression.test.mjs +npm run build +node tests/studio-browser.mjs + +# From repository root, after rebuilding the candidate +node tests/server-smoke.mjs +``` + +Build native candidate to `build/audit-repair`, leaving the running executable alone. On this Windows setup, normalize duplicate Path/PATH environment keys before invoking MSBuild. Read existing test harnesses before running: browser tests should use isolated profiles/fixtures, not user library data. + +## Later roadmap (not delivered by the album work) + +Re-audit the original enhancement specification before implementing: processor registry, model lifecycle manager, serializable configuration, safe decoder selection, genuine mastering DSP, optional restoration/separation/stem processing/RAVE/detail recovery/style-transfer adapters, A/B playback, and broader recovery/backup. Expose only controls backed by real implementations. Keep all enhancements optional and retain YuE2's compatible native decoder. + +## Suggested resume instruction + +"Resume YuE2 from PROJECT_BUILD_PLAN.md. Check GitHub connectivity, finish the approved manager-based ComfyUI compatibility upgrade with the backup preserved, then continue the tested album/artwork/MP4 milestones. Do not modify Maestro or restart YuE2 without fresh approval." + +## Signal Studio update — 2026-09-24 + +Deployed on 2026-09-24 after explicit approval for this update. Live process at verification: PID 10876 on 127.0.0.1:8087. + +- Canvas visualizer: ribbon, orbit and logarithmic spectrum views; actual playback analysis, bass/body/air meters, native-dialog expanded view, Escape/focus restoration, reduced-motion and offscreen rendering limits. +- Creation desk: numbered navigation, searchable preset chips and existing influence rings, separate lyric section, collapsible local lyric assistant and score editor, compact sampling controls and a production summary. Removed the unfinished album input placeholders from the active form. +- Automatic production uses conservative weighted score-temperature presets (0.65 rhythmic / 0.70 balanced / 0.75 expressive, relative to the model default). Semantic sampling, CFG, flow steps and normalization use the model defaults; MP3 is 320 kbps. Manual mode, explicit imported settings, replay codes, seeds, durations and batches are preserved. These presets are not empirically proven genre optima. +- Validation: Svelte check 0 errors/warnings; 8 regression tests; production build; isolated browser tests covering actual muted PCM playback, mode controls, mobile/themes, automatic/manual submitted request capture and reload persistence; native candidate build; temporary CPU server smoke pass. No song was generated to evaluate preset quality. +- Candidate: `build/audit-repair/yue-server.exe` (matching `Release/yue-server.exe` inside candidate). +- Screenshots: `build/ui-review/studio-mint.png`, `signal-live.png`, `signal-orbit.png`, `production-desk.png`, `studio-mobile.png`. +- Backup: `build/backup-before-signal-studio-20260924-202647/`. Only the executable changed during deployment; all four backend DLL hashes matched the tested candidate. +- Live validation: `/health` OK; compressed production HTML contains the new visualizer, production engine, style search and automatic profiles. Live executable SHA256 matches candidate: `753B810125F7FDFDF38B2A8E5AB8523465E51B8900F1B74524EE3924491366E4`. +- Existing browser tabs need a reload to use the new build. This update does not finish the separate album/artwork/video roadmap above. diff --git a/README.md b/README.md index 4d8e8d5..a6f1b95 100644 --- a/README.md +++ b/README.md @@ -97,6 +97,35 @@ Transcribe score or Transcribe melody from the card menu: the score lands in the score field, pick the matching mode, add your lyrics and a style, and the model covers the song. +## Vocal level adjustment + +The song decoder produces a single stereo mix. The card menu can separate +that mix into vocals and accompaniment, estimate an automatic vocal gain, or +set the gain manually from -6 to +6 dB, then remix the result. Auto compares +400 ms vocal-active sections and is a starting point rather than a style-aware +mixing standard. The original stays in the library for comparison. This uses +the local `python-audio-separator` command and FFmpeg; separation can take time +and may add artifacts. + +On Windows with an NVIDIA GPU, install the helper once from this folder: + +```powershell +.\setup-vocal-separation.ps1 +``` + +The selected BS-RoFormer model is downloaded on the first adjustment. Keep +FFmpeg available on `PATH`; the helper's environment report shows whether its +CUDA provider is available. You can still generate songs without this optional +helper. + +## Library backup + +Use **Backup** above the track list to download a ZIP containing saved tracks, +audio, optional artwork/video, and supported browser preferences. **Restore** +checks the archive contents before showing a confirmation; accepting replaces +the current track library. Keep backups somewhere outside the browser profile +if you want to protect them from browser data cleanup. + ## Pipeline ``` diff --git a/docs/PRODUCER_CONTROLS.md b/docs/PRODUCER_CONTROLS.md new file mode 100644 index 0000000..b07c132 --- /dev/null +++ b/docs/PRODUCER_CONTROLS.md @@ -0,0 +1,17 @@ +# Song planner and voices + +The Create page includes a persistent song planner for new compositions. It compiles musical direction into the existing YuE2 style prompt; no model weights or inference defaults change. + +- Singing amount guides melodic singing versus rap/spoken delivery. Vocal presence separately guides the balance of vocal passages and instrumental space. These are requested proportions, not enforced timing. +- Vocal presence zero submits empty lyrics while preserving the editor text. +- One to four requested voices have editable descriptions. Locking keeps descriptions and cast size fixed in the browser across songs and reloads. This is a profile lock, not a speaker identity embedding, voice clone, or guarantee of the same singer. +- Tempo, arrangement, vocal descriptions, and delivery guide both music and the Ollama lyric assistant. Existing lyrics are never rewritten automatically. The plan is a transparent template or user-written direction, not a validated symbolic score. +- Auto duration uses a rough 4/4 phrase budget from tempo, words per line, singing balance and vocal presence. Explicit durations are preserved. It is not forced alignment and is not language-aware syllable counting; the model/token budget can end earlier. +- Three-take mode snapshots the plan, generates independent seeds, and runs one song at a time with both batch sizes set to one. It saves each result before submitting the next. Cancel stops remaining submissions. Reload recovers only the active take; unsubmitted takes are not resumed. +- The Library's Compare takes selector groups candidates; existing playback and favourite controls support choosing a take. No automatic perceptual ranking is claimed. +- Loaded performances and remixes bypass planner overrides. Switching to Library keeps the generation form mounted so the queue remains owned by one component. +- Confirmed terminal job failures/cancellations clear pending recovery; result-download and library-save failures retain it. + +Validation: 15 Node regression tests; clean Svelte check; Vite and native Release builds; isolated Chrome test of controls, persisted profiles, sequential fresh seeds, grouping, cancellation, instrumental preservation and mobile width; temporary CPU server API/embedded-UI smoke checks. Browser generation uses mocked audio. Audible quality and singer consistency have not been established by these tests. + +Build: `npm run build` in tools/webui, then build yue-server. `build/build-producer.cjs` normalizes duplicate Windows PATH keys and creates the Release-producer candidate. `build/activate-producer.ps1` backs up the current Release-reference executable and GGML DLLs, installs the candidate at the existing launcher path, and rolls back on startup failure. diff --git a/docs/app-audit-2026-09-27.md b/docs/app-audit-2026-09-27.md new file mode 100644 index 0000000..f37663b --- /dev/null +++ b/docs/app-audit-2026-09-27.md @@ -0,0 +1,200 @@ +> Current implementation, acceptance evidence and build/recovery instructions: [Studio release guide]( studio-release.md ). This document records earlier planning or audit findings. + +# YuE2 Studio audit — 27 September 2026 + +## Repair update + +Items 1–6 have since been implemented and regression checked. See [reliability repairs](reliability-repairs-2026-09-27.md) for the changes, evidence and limits. The findings below preserve the original audit baseline; items 7–20 remain outstanding unless explicitly noted in that repair report. + +## Assessment + +The app has functioning music generation, planning/voices, lyric assistance, saved tracks, original/master comparison, artwork integration, MP4 export and substantial UI polish. It is not yet a fully resilient production workflow. The most important remaining work is saving and recovering work safely, coordinating long operations, and completing the partially implemented publishing/album workflows. + +This audit changed no application source or production data and restarted no live service. It added this report and disposable audit fixtures under `build/`. + +## Evidence and limits + +- Live YuE2 health passed on port 8087, PID 24296, `build/Release-reference/yue-server.exe`. +- ComfyUI responded on 8188; queue was empty and required Qwen image nodes were present. This proves readiness, not image quality or successful inference. No recent history entries were returned by the history probe. +- Ollama responded; both Tiger-Gemma names were installed. No model was resident at the time of the audit, which is compatible with the lyric code's `keep_alive: 0` behavior. +- Svelte check: **0 errors, 0 warnings**. +- Existing frontend unit suites: **18 passed**. YouTube draft validation: **3 passed**. +- Separate CPU server smoke checks passed: defaults, six invalid requests, oversized request and embedded UI. No songs generated. +- New isolated browser cases reproduced four failures: empty-library navigation, unavailable local storage, invalid saved request and unsuccessful favourite persistence. Output: `build/ui-review/full-audit-findings.json`. +- Previous interaction review covered 244 visible controls with expanded panels/manual mode; six themes, phone width, keyboard interactions and representative operations passed. That was not proof that every backend operation and failure mode worked. +- No real synthesis, image inference, vocal separation or signed-in YouTube upload was performed in this audit. Large-library stress, simultaneous GPU operations, power-loss recovery and dependency vulnerability scanning remain unverified. Remote PR status was not refreshed. + +## Priority 1 — protect work and prevent broken sessions + +### 1. Storage failure or malformed saved settings can prevent the app from rendering + +**Reproduced.** Making the `yue2` local-storage write throw a quota error left the Create heading absent with an uncaught exception. Saving `request.style: 42` caused `style.trim is not a function` and the same failure. + +Evidence: [state.svelte.ts](../tools/webui/src/lib/state.svelte.ts), particularly the unvalidated `parsed.request` at line 38 and unguarded `setItem` at line 120. + +**Needed:** validate/migrate persisted data, catch storage writes, keep the app usable in a clearly indicated unsaved mode, and provide an in-app settings recovery action. Add regression cases for quota, denied storage and malformed field types. + +### 2. MP4 delivery delays saving successfully generated audio + +**Confirmed from code.** `landJob` downloads the audio, then awaits image generation and video rendering; only afterward does it call `putJobSongs`. Ordinary caught failures eventually keep audio, but a browser close/crash plus server restart during those optional stages can lose the finished result before it reaches the library. + +Evidence: [RequestForm.svelte](../tools/webui/src/components/RequestForm.svelte), lines 232–279. + +**Needed:** commit audio immediately, then save artwork/video as separately recoverable updates to the existing track. Show the track as ready for playback while optional delivery work continues. + +### 3. Server job recovery is temporary, not durable + +**Confirmed from code.** Job results live in the process's `g_jobs` map. Completed jobs can be evicted after the 32-job retention limit; restarting discards the map. Browser recovery stores a job ID, not an independent copy of an unfinished/uncollected result. + +Evidence: [yue-server.cpp](../tools/yue-server.cpp), lines 184–244; [db.ts](../tools/webui/src/lib/db.ts), pending-job functions. + +**Needed:** a disk-backed job/result store, startup recovery, retrieval acknowledgement and retention controls. Make the distinction between a server result and a library-saved track visible. + +### 4. Multiple tabs can overwrite or interfere with pending-job recovery + +**Confirmed design gap; race not stress-tested.** All tabs share the single `yue2-job-synth` local-storage key. The check-before-submit sequence is not an atomic lock. Separate tabs can submit before either saves its job ID; a completion can then clear another tab's recovery record. There is no application-wide operation owner or coordinated library refresh. + +Evidence: [RequestForm.svelte](../tools/webui/src/components/RequestForm.svelte), generation loop; [db.ts](../tools/webui/src/lib/db.ts), `saveJob`/`clearJob`. + +**Needed:** per-job records, submission/ownership locking, cross-tab updates and owner-aware cancellation. Test simultaneous starts and reloads. + +### 5. Some library actions show changes before they are safely saved + +**Favourite failure reproduced.** When IndexedDB writes failed, the heart became selected, no error toast appeared and an uncaught exception was raised. Rename, generated-artwork and vocal processing also mutate live song state before the awaited save. Delete handlers have incomplete failure reporting. A long operation can also save a track after the user deleted it because its completion still calls `putSong`. + +Evidence: [SongCard.svelte](../tools/webui/src/components/SongCard.svelte), `toggleFavorite`, `doRename`, `generateArtwork`, `applyVocalBalance`, deletion and asynchronous completion handlers. The rail's favourite handler already uses a safer save-before-display approach. + +**Needed:** shared transactional song updates, visible failure/retry, rollback or save-before-display, and deletion/operation coordination that prevents deleted tracks from reappearing. + +### 6. Backups omit current disk presets and accept insufficiently validated restored data + +**Confirmed from code.** The ZIP includes songs and a fixed list of old browser keys, but not the new `saved_presets` folder. Restore validates little beyond audio Blob, name and truthy request; missing/wrongly typed format/style/request fields can reach components expecting valid strings and objects. The malformed-settings browser test demonstrates why this matters. + +Evidence: [backup.ts](../tools/webui/src/lib/backup.ts), `LOCAL_STORAGE_KEYS`, `exportLibrary`, `importLibrary`; [SongList.svelte](../tools/webui/src/components/SongList.svelte), settings restore. + +**Needed:** versioned full backup schema covering disk presets and current settings; validate everything before replacing the library; offer a pre-restore backup and explain exactly what is included. The normal disposable backup/restore round-trip already passes. + +## Priority 2 — make long workflows and saved outputs consistent + +### 7. Cancel does not cancel the whole MP4 workflow + +**Confirmed from code.** `cancelPipeline` only calls the music job cancellation endpoint and stops remaining takes. Artwork polling has no abort signal, and the video request has no cancellation mechanism. Cancelling after music completes can leave artwork/video continuing while the UI still looks busy. + +Evidence: [RequestForm.svelte](../tools/webui/src/components/RequestForm.svelte):504; [track-artwork.ts](../tools/webui/src/lib/track-artwork.ts); [api.ts](../tools/webui/src/lib/api.ts), `renderVideo`. + +**Needed:** stage-specific cancellation and explicit “stop waiting” versus “cancel owned work” behavior, preserving completed audio and never cancelling unrelated Comfy jobs. + +### 8. Artwork recovery differs between entry points + +**Confirmed from code.** Automatic MP4 generation saves the Comfy prompt ID. On-demand Export video does not persist its artwork job ID. Generate artwork from the track menu keeps its ID only inside the function; closing the dialog stops polling but leaves the Comfy job running. Reload/navigation can therefore orphan an image result from the app's perspective. Some errors refer to resetting an album stage that the song-card UI does not expose. + +Evidence: [track-artwork.ts](../tools/webui/src/lib/track-artwork.ts); [SongCard.svelte](../tools/webui/src/components/SongCard.svelte), `exportVideo` and `generateArtwork`; [comfy-art.ts](../tools/webui/src/lib/comfy-art.ts). + +**Needed:** one persistent artwork operation model, recover completed results by prompt ID, visible retry/reconnect and consistent errors for the actual screen. + +### 9. Existing MP4s and waveforms can become stale after edits + +**Confirmed from code.** Replacing/generating artwork retains the old `song.video`. Vocal adjustment replaces audio but retains both the old video and cached peaks. The waveform reuses `song.peaks` when present, so it can show the previous audio's waveform. The downloaded MP4 can contain an older cover/mix than the current card. + +Evidence: [SongCard.svelte](../tools/webui/src/components/SongCard.svelte):74, 168, 293; [Waveform.svelte](../tools/webui/src/components/Waveform.svelte):88–110. + +**Needed:** invalidate/recompute peaks on audio replacement; record the audio version and artwork revision used in each MP4; mark video outdated and offer a rebuild when inputs change. + +### 10. Expensive services are not coordinated under one scheduler + +**Confirmed architecture gap; resource exhaustion not reproduced.** Native synthesis/transcription use the bounded worker queue. Video and vocal-balance handlers run synchronously outside it. Artwork and Ollama have separate checks. Per-card busy flags do not coordinate other cards, tabs or services; `freeArtworkMemory` is defined but unused. Subprocess waits lack a timeout/cancellation mechanism. + +Evidence: [yue-server.cpp](../tools/yue-server.cpp):867, 919; [audio-video.h](../src/audio-video.h); [audio-vocal-balance.h](../src/audio-vocal-balance.h); [comfy-art.ts](../tools/webui/src/lib/comfy-art.ts). + +**Needed:** bounded operations for video/vocals, shared GPU ownership where appropriate, server-side operation status, subprocess cancellation/timeouts and measured memory handoff between models. Readiness should also check encoder/separator dependencies before a long action starts. + +### 11. “Save preset” still means two different things + +**Confirmed from code.** Named music/lyric blends save into the folder and sidebar. The top-level Save preset button still downloads JSON/YAML and does not save a named full configuration there. A blend does not represent the whole planner/voices/output setup. Blend editors load their lists on mount and do not subscribe to the same preset-change event as the sidebar, so edits in another tab/editor can leave stale choices. + +Evidence: [RequestForm.svelte](../tools/webui/src/components/RequestForm.svelte):309; [BlendFavourites.svelte](../tools/webui/src/components/BlendFavourites.svelte); [SavedPresets.svelte](../tools/webui/src/components/SavedPresets.svelte). + +**Needed:** distinguish named full presets from style blends and file export, unify refresh behavior, and provide a clear naming/save destination flow. + +### 12. Interrupted preset writes lack automatic recovery + +**Confirmed crash window, not power-loss tested.** Existing preset JSON is renamed to `.bak` before `.tmp` is renamed into place. A crash between those operations leaves the preset absent from listing; subsequent saves reject the remaining backup. Rename of a preset is a multi-request save/delete operation and can partially complete. + +Evidence: [saved-presets.h](../src/saved-presets.h), save handler; [BlendFavourites.svelte](../tools/webui/src/components/BlendFavourites.svelte), `commit`. + +**Needed:** startup reconciliation for temporary/backup files and a transactional server rename/update operation with conflict detection. + +### 13. Progress/ETA is not a complete job tracker + +**Confirmed limitation.** The percentage/ETA measures the current NAR chunk, not the whole song. Status is derived from global log text and local tab state, so unrelated jobs and replayed log history can affect interpretation; another tab can show Ready while the server is working. Artwork and video lack measured progress. Remaining planned takes are not resumed after reload. + +Evidence: [activity.svelte.ts](../tools/webui/src/lib/activity.svelte.ts); [LogCard.svelte](../tools/webui/src/components/LogCard.svelte); RequestForm's take loop. + +**Needed:** job-scoped structured stage events, queue position, stage-specific estimates and a persisted take queue. Continue labelling estimates honestly until enough measurements exist. + +### 14. Navigation has hidden-target and duplicate-panel problems + +**Empty-library link reproduced.** “Shape your first track” changes the hash but leaves Library visible and Create hidden. Create remains mounted with `display:none` while Library adds another StudioRail; this also duplicates the settings target and log subscription. Settings links can target the hidden copy, and preview playback can continue from the hidden Create view. + +Evidence: [SongList.svelte](../tools/webui/src/components/SongList.svelte):77; [App.svelte](../tools/webui/src/App.svelte):126 and library rail; [StudioRail.svelte](../tools/webui/src/components/StudioRail.svelte). + +**Needed:** centralized view navigation, unique section IDs, intentional playback behavior on view changes and one shared activity subscription. + +### 15. Invalid audio fails silently + +**Confirmed from code.** Audio import saves a file based on its extension without first validating decode. Waveform decoding catches and discards errors. A broken/unsupported file can become a nonworking card without a useful explanation; Play can appear selected despite no decoded audio. + +Evidence: RequestForm `openAudio`; [Waveform.svelte](../tools/webui/src/components/Waveform.svelte):110. + +**Needed:** validate imports, show decoding/loading/error states, disable playback when unavailable and provide a retry/remove route. + +### 16. Large-library memory use needs measurement and limits + +**Confirmed eager-loading design; stress impact unmeasured.** The app gets all songs, mounts every visible song waveform and decodes full audio buffers. Library cards and preview can decode the same song separately. Job retention is bounded by count rather than bytes, and results include originals/masters. Video export reads the finished MP4 fully into memory. + +Evidence: [db.ts](../tools/webui/src/lib/db.ts), `getAllSongs`; SongList's full list; Waveform's decoding effect; server job retention; audio-video output loading. + +**Needed:** benchmark realistic libraries, lazy/shared audio decoding, list virtualization or pagination, byte-based retention and streamed/limited media handling where practical. + +## Priority 3 — finish promised workflows and make releases repeatable + +### 17. YouTube remains an assisted first version + +**Confirmed implementation status.** Local draft editing/export and basic browser automation exist. Playlist, end screens, disclosures, scheduling and final save/publish remain manual. The UI requires downloading files and running a terminal command. The runner explicitly says a user-reviewed run is not verified publication; signed-in upload automation has not been exercised in the available evidence. + +Evidence: [agent.mjs](../tools/youtube-agent/agent.mjs), [README](../tools/youtube-agent/README.md), [YouTubeDialog.svelte](../tools/webui/src/components/YouTubeDialog.svelte). + +**Needed:** agree the remaining automation scope, test against a dedicated upload draft, handle changed/localized Studio selectors, resume existing uploads safely, and expose a clearer launch/status path. Keep publishing an explicit user action unless separately authorized. + +### 18. Album creation is scaffolded, not a delivered workflow + +**Confirmed from imports and UI.** Album types, database and planning helpers exist. No connected album runner/workspace completes the roadmap for a resumable track queue, master cover and distinct referenced track artwork. + +Evidence: `album-types.ts`, `album-db.ts`, `album-plan.ts`; current App/RequestForm component tree. + +**Needed:** implement the persisted album state machine, queue/resume controls, per-track retry, shared cover/reference workflow and export. Treat this as a feature project after reliability work, not a small UI addition. + +### 19. Real media quality and adverse-condition tests remain incomplete + +**Verification gap.** Unit/UI checks do not establish actual lyric quality, requested voice behavior, reference-image consistency, vocal separation quality, measured final loudness/true peak, long-track MP4 compatibility or recovery under resource exhaustion. Streaming/Broadcast are real FFmpeg loudness-normalization profiles, not a full creative mastering chain. Original/master pairing has three passing regression cases, so the previously reported duplicate-card issue has a targeted fix and coverage. + +**Needed:** a documented media acceptance matrix with short real generation runs, multi-take runs, original/master measurements, actual generated artwork, reference edit, vocal balance, MP4 playback and interrupted-run recovery. Record which combinations were actually tested and the hardware/memory costs. + +### 20. Current work is not packaged as a reproducible reviewed release + +**Confirmed repository state.** There are 24 modified tracked files plus substantial untracked implementation/documentation. The running build includes work outside the last commit. Current interaction/theme audit scripts are under ignored `build/`; PR CI does not run the Svelte checks or these UI tests. Older audit/resume documents still describe already delivered artwork/MP4 features as unfinished and contain outdated launcher/deployment details. + +Evidence: local Git status; [CI workflow](../.github/workflows/ci-build.yml); `AUDIT_REPAIRS.md`; `PROJECT_BUILD_PLAN.md`; `build/interaction-review.mjs` and related scripts. + +**Needed:** curate persistent tests into the repository, add frontend checks/tests to CI, document one authoritative build/deploy/recovery route, refresh the status documentation, and make a reviewed commit/PR update. Do not include user media, model files, private browser profiles or temporary logs. Commit/push was not performed by this audit. + +## Recommended execution order + +1. **Prevent lost work:** findings 1–6. Pass quota, restart, multi-tab and full backup/restore scenarios before calling recovery reliable. +2. **Make long operations consistent:** findings 7–13. Save audio first; make artwork/video cancellable, resumable and revision-aware. +3. **Complete the everyday UI:** findings 14–16 and the preset workflow in 11. Fix navigation and playback errors, then measure large libraries. +4. **Run real media acceptance checks:** finding 19. Separate measured passes from model-dependent expectations. +5. **Package the release:** finding 20. Keep regression tests and current operations documentation with the source. +6. **Finish feature projects:** YouTube and albums (17–18) after their recovery foundations are in place. + +No fixes were applied as part of this audit; the findings above remain open unless explicitly described as already covered/passing. diff --git a/docs/interaction-plan.md b/docs/interaction-plan.md new file mode 100644 index 0000000..6230f7b --- /dev/null +++ b/docs/interaction-plan.md @@ -0,0 +1,47 @@ +# Studio interaction plan + +Every control receives theme-aware hover, keyboard focus, pressed and disabled states. Hover takes 140 ms; press takes 90 ms. Motion is disabled when reduced motion is requested. Cards emphasize their border without moving their contents. Only actionable controls lift; destructive actions retain a distinct warning color. No click sounds, fake progress or idle pulsing. + +## Component inventory and treatment + +| Area | Cards and controls | Planned response | +| --- | --- | --- | +| App shell | Navigation, theme selector, volume, connection | Active navigation stays selected; keyboard focus remains visible; volume updates immediately; connection reflects actual state. | +| Saved presets | Preset cards, empty state | Hover/focus emphasis, pressed feedback, loaded confirmation; keep names readable. | +| Workflow | Sound, planner, lyrics, generate navigation | Active step uses accent; hover previews action without moving panels. | +| Sound | Style tiles, add/remove, search, category controls | Image emphasis on hover; selected border/check remain visible; search gets focus ring. | +| Blend controls | Influence dials and numeric inputs | Drag state and grabbing cursor; arrows and numeric edits retained; distinct focus. | +| Saved blends | Choose, load, name, save, update, rename, delete | Disable conflicting actions while writing; visible saving status; load confirmation; preserve destructive confirmations. | +| Planner | Voice selectors, layout, length, structure and automatic options | Consistent field focus and pressed states; disabled automatic controls stay visibly unavailable. | +| Lyrics | Styles, assistant, prompt, text editor, generate/cancel | Selection confirmation; text remains stable while editing; real busy text and cancellation retained. | +| Composition | Melody/reference selection, range, upload/reset | Clear action and disabled states; range controls remain available for precise keyboard editing. | +| Engine | Model choices and advanced disclosure | Distinct focus, open disclosure styling and selected states. | +| Sampling | Range/number pairs, reset and automatic settings | Range hover/focus response; paired values unchanged; disabled controls do not animate. | +| Output | Format, mastering, monitor volume | Consistent focus; dropdown choices remain native and accessible. | +| Generation | Generate/queue/cancel and progress | Primary button has stronger emphasis; existing real progress/ETA retained; busy feedback does not imply completion. | +| Library | Search, favourites, backup, restore, empty state | Active filter indication; visible operation name while backup/restore runs; prevent duplicate operations. | +| Track cards | Play/stop, remix, favourite, version comparison | Playing border, pressed playback state, favourite pop, persistent selected version. | +| Track menu | Download, video export, artwork, transcription, vocal balance, rename, delete, YouTube | Keyboard arrow/Home/End navigation; Escape restores trigger; busy operations guarded and labelled; deletion distinct. | +| Artwork | Cover, fullscreen, close, prompt, seed/dice, generate | Cover affordance; existing fullscreen dismissal; visible rendering state and disabled concurrent inputs. | +| Waveform | Seek and range selection | Keyboard seek with arrows/Home/End and Space playback; visible focus; pointer cancellation clears dragging. | +| Preview rail | Cover, transport, recent tracks and favourites | Same control language as library; active playback and selected tracks remain distinct. | +| Activity | Disclosure, progress, log viewport | Open/focus emphasis; existing stage colors and real progress retained; no decorative fake progress. | +| Dialogs | Rename/delete and custom action dialogs | Initial focus, Tab containment, Escape dismissal and return focus; multiline Enter never accidentally confirms. | +| YouTube | Metadata, checkboxes, save/export draft and cancel | Shared button/input feedback; existing saved/busy/error state retained; publishing remains explicit. | +| Toasts | Success and error notices | Distinct icons and colors, theme-readable surface and polite announcement. | +| Visualizer | Playback-driven canvas | Keep existing audio response and reduced-motion behavior; do not add idle animation. | + +## Review boundaries + +Inspect each component and shared controls. Build/typecheck the UI, then exercise navigation, keyboard menus/dialogs, style selection, presets, playback and busy/error states in an isolated browser profile. Review all six themes and reduced motion. Use mocked operations for destructive/server-heavy actions; do not generate songs, delete real tracks or publish uploads as part of interaction review. + +## Execution record — 27 September 2026 + +- Implemented shared hover/press/focus/disabled feedback and component-specific selection, playback, drag, busy, success and error feedback. +- Reviewed 244 visible controls with panels expanded and manual settings enabled; keyboard focus checked for every enabled control in that inventory. +- Browser exercises passed for named preset saving/loading, style selection, manual sampling, menu arrows/Home/End/Escape, dialog initial focus/Tab containment/return focus, favourites, waveform seeking/playback, artwork dismissal, transcription busy/error and YouTube draft saving. +- All six themes passed desktop and 390-pixel phone width checks. Secondary text palette contrast ranged from 5.93:1 to 8.41:1. Screenshot review additionally caught and corrected library title/play-control contrast in Studio Glass. +- Reduced-motion checks passed. UI typecheck: zero errors and zero warnings. Frontend and embedded server builds completed; native build retains an existing numeric-conversion warning in sheetsage.h. +- Review uses a disposable browser library and mocked server mutations. These checks cover interaction behavior, not the quality of newly generated audio/artwork or actual YouTube publication. +- Local review artifacts: `build/ui-review/control-inventory.json`, `interaction-library.png`, `theme-*.png`, and `glass-mobile.png`. +- Additional disposable-library checks passed for renaming, audio download and backup/restore. Active generation was cancelled at the user's request and the rebuilt server activated on port 8087. diff --git a/docs/lyric-style-pack/README.md b/docs/lyric-style-pack/README.md new file mode 100644 index 0000000..71bcbd8 --- /dev/null +++ b/docs/lyric-style-pack/README.md @@ -0,0 +1,78 @@ +# HipHop Lyric Style Pack + +This pack contains 30 lyric-generation style profiles for a HipHop music-generation app. + +Each `.md` file is designed as an instruction module, not just a style description. The files define: +- cadence and speed +- syllable targets +- rhyme density +- internal and multisyllabic rhyme behavior +- punchline frequency +- wordplay and metaphor level +- storytelling intensity +- aggression and emotion +- preferred rhyme structures +- mandatory writing rules +- failure conditions +- self-check rules +- behavior when styles are combined + +## Recommended App Behavior + +1. Load the selected style file into the lyric-generation system prompt or style context. +2. Treat **Mandatory Writing Rules** as hard constraints. +3. Generate a first draft. +4. Run the draft against the **Style Compliance Check**. +5. Rewrite failed sections automatically. +6. Return only the corrected version to the user. + +## Style Mixing + +Recommended UI: +- Primary Style: 60–100% influence +- Secondary Style: 0–50% influence +- Optional Modifier: 0–30% influence + +The primary style should always retain its defining flow and rhyme behavior. + +## Included Styles + +1. Fast Punchy +2. Syllable Dense +3. Machine Gun Flow +4. Battle Rap +5. Street Grit +6. Boom Bap Classic +7. Underground Abstract +8. Chilled Flow +9. Smooth Storyteller +10. Punchline Heavy +11. Wordplay Technician +12. Internal Rhyme Heavy +13. Multisyllabic Master +14. Flow Switcher +15. Staccato Rap +16. Run-On Flow +17. Dark Cinematic +18. Introspective +19. Conscious Rap +20. Braggadocious +21. Minimalist Menace +22. Chaotic Energy +23. Melodic Rap +24. Hook Driven +25. Freestyle Feel +26. Complex Schemes +27. Double-Time Technical +28. Slow Heavy Bars +29. Psychedelic Rap +30. Experimental Flow + +## Implementation Note + +For best results, do not ask the model to merely "write like [style]." +Instead, inject the complete selected `.md` profile and instruct the model to validate the result before returning it. + +Suggested final system directive: + +> Follow the active lyric-style profile as a hard constraint. Generate the requested lyrics, silently evaluate them against every mandatory rule and compliance item, rewrite anything that fails, and return only the final compliant lyrics. diff --git a/docs/lyric-style-pack/_STYLE_SCHEMA.md b/docs/lyric-style-pack/_STYLE_SCHEMA.md new file mode 100644 index 0000000..b6307a0 --- /dev/null +++ b/docs/lyric-style-pack/_STYLE_SCHEMA.md @@ -0,0 +1,54 @@ +# Lyric Style File Schema + +Use this format when adding future styles. + +```md +# Style Name + +## Purpose +One-sentence definition of the intended lyrical behavior. + +## Style Lock +Instruction that the generator must enforce the style structurally. + +## Core Profile +- Energy +- Delivery Speed +- Target Syllables +- Rhyme Density +- Internal Rhyme Density +- Multisyllabic Rhyme Level +- Punchline Frequency +- Wordplay Level +- Metaphor Density +- Vocabulary +- Storytelling Level +- Aggression +- Emotional Intensity +- Repetition +- Flow Variation +- Preferred Rhyme Schemes +- Bar Structure +- Hook Compatibility + +## Mandatory Writing Rules +Concrete rules the model must satisfy. + +## Avoid +Style-breaking behavior. + +## Generation Procedure +Drafting and revision procedure. + +## Style Compliance Check +Binary self-checks. + +## Failure Conditions +Conditions that force regeneration. + +## App Instruction +How the app should enforce the preset. + +## Combination Behavior +How this style behaves when mixed with another. +``` diff --git a/docs/reliability-repairs-2026-09-27.md b/docs/reliability-repairs-2026-09-27.md new file mode 100644 index 0000000..cc9eec8 --- /dev/null +++ b/docs/reliability-repairs-2026-09-27.md @@ -0,0 +1,33 @@ +# Reliability repairs — 27 September 2026 + +Implements audit items 1–6. All previous working-tree changes are preserved; nothing has been committed or pushed. + +## Changes + +1. Settings are validated on load. Storage failures leave the interface usable with a visible warning and a save-again action. +2. Generated audio is committed to the library before optional artwork and MP4 processing. Later results update the existing song. +3. The server archives completed job results in `job_results/`. A restart can retrieve completed results; interrupted inference is explicitly reported and must be restarted. Acknowledged results become eligible for cleanup after 30 days; unacknowledged results are retained. Cleanup runs on acknowledgement. +4. Pending jobs live in IndexedDB, with client-generated submission IDs and a browser-wide operation lock. Retrying the same submission returns the same job. Other tabs receive library-change notifications. +5. Track edits use transactional patches and update the visible state after a successful save. Late processing cannot recreate a deleted song. Replacing audio or artwork invalidates dependent cached media. +6. Backup version 2 includes disk presets and current settings. Restore validates data before changing the library, downloads a before-restore backup, merges presets without overwriting conflicts, and replaces songs atomically. + +## Verification + +- Svelte check: 0 errors and 0 warnings. +- Frontend unit suites: 22 passed, including malformed requests, song/preset validation and backup roundtrip. +- Isolated browser storage checks passed: quota failures, malformed settings, recovery record before submission, two-tab submission, audio saved before artwork, failed favourite save, deletion during optional processing. +- Interaction review passed: 244 visible controls, keyboard navigation, dialogs, presets, playback, artwork preview, error feedback, YouTube draft save, rename, downloads, backup/restore, reduced motion and phone layout. +- Native archive tests passed: binary persistence, metadata-only reads, interrupted state, idempotence, acknowledgement retention and safe IDs. +- Isolated HTTP restart check passed across two server starts. No synthesis was performed by that test. +- UI and native builds completed. Native compilation retains the existing SheetSage numeric-conversion warning. +- Final candidate CPU smoke checks passed, including invalid/oversized requests and embedded UI. +- Activated on port 8087, PID 15944. Live health passed and served UI bytes exactly match the final bundle. Previous binaries are preserved in `build/backup-before-producer-20260927-144608/`. + +## Limits and remaining work + +- These checks use disposable browser libraries and mocked media operations. Fresh real music, image inference and signed-in YouTube publishing were not exercised. +- In-flight model computation cannot resume after a restart. Results already lost by an older server cannot be recovered retroactively. Power-loss durability has not been tested. +- Browser library storage is still local to its browser profile; backups remain necessary. +- Preset files, IndexedDB and browser settings cannot be committed in one transaction. If restore fails partway, successfully imported presets remain; existing presets are preserved and the before-restore backup provides a recovery path. +- Archive retention is currently a fixed policy, not a settings control. +- Audit items 7–20 remain for subsequent work. Dependent media invalidation partially addresses item 9; full operation cancellation, GPU scheduling, publishing, album flows, performance and real media acceptance checks remain outstanding. diff --git a/docs/studio-release.md b/docs/studio-release.md new file mode 100644 index 0000000..c05f0d8 --- /dev/null +++ b/docs/studio-release.md @@ -0,0 +1,86 @@ +# Studio implementation and release — 27 September 2026 + +This is the current operations guide. `app-audit-2026-09-27.md` records the original findings; the older roadmap documents are historical. + +## Implemented + +| Audit items | Delivery | +| --- | --- | +| 1–6 | Validated settings/backups, audio-first saving, durable server results, per-job browser recovery, cross-tab ownership, transactional song updates. | +| 7–9 | Owned video cancellation; artwork stop-waiting/reconnect; persistent job IDs; media revisions reject stale completions and invalidate old MP4s/waveforms. | +| 10 | Bounded native queue for music/transcription/video/vocals; GPU admission gate for native jobs, Comfy submissions and Ollama; cancellable subprocesses with 30-minute deadline; dependency checks. | +| 11–12 | Named full Studio presets plus style blends in `saved_presets`; separate request-file export; atomic rename, interrupted-write recovery and cross-tab refresh. | +| 13 | Server job/stage/queue status, measured stage progress and persisted planned takes. ETA remains unavailable for stages without sufficient measurements. | +| 14–16 | Central navigation; single active rail; visible audio errors; lazy/shared decoding, 96 MiB decode cache and 12-card pages; disk-backed completed results; 256 MiB MP4 output cap. Recovery admission stops above 16 GiB or below 512 MiB free disk without deleting unacknowledged results. | +| 17 | Integrated YouTube launch/status/reconnect and local metadata drafts. **User deferred the upload check. Nothing uploaded or published.** Playlist and publishing remain user actions. Signed-in acceptance is incomplete. | +| 18 | Persisted album queue, reload/resume, stage retry, master/reference artwork, per-track video and album/backup ZIP export. | +| 19 | Real media acceptance recorded below; model quality is reviewed separately from successful execution. | +| 20 | Persistent test scripts, frontend CI, build/deployment wrappers and this guide. Commit/PR status is reported with the release. | + +## Build and deploy on this Windows installation + +Prerequisites: Visual Studio C++ build tools, CMake, CUDA toolkit, Node, FFmpeg on PATH, installed YuE2/VAE/SheetSage model files. Existing configured build directory is reused. + +```powershell +cd tools/webui +npm ci +npm run check +npm run build +cd ../.. +node tools/build-studio.mjs +node tools/activate-studio.mjs +``` + +For a fresh CUDA configuration, initialize the ggml submodule and run `cmake -S . -B build -DGGML_CUDA=ON -DCMAKE_CUDA_ARCHITECTURES=89` before building on the RTX 4060. Use the architecture appropriate to other hardware. + +The build writes `build/Release-producer`. Activation refuses active native jobs, backs up the previous binaries under `build/backup-before-producer-*`, stops the matching server, deploys into `build/Release-reference`, starts hidden on 8087 and checks health. On startup failure it restores the backup. The Node wrapper normalizes Windows environment-key casing before calling PowerShell. + +Use `GET /health`, `/jobs` and `/capabilities` for readiness. Logs are `build/producer-server.err.log` and `.out.log`. A browser refresh loads the embedded UI. The browser library is IndexedDB tied to the browser profile and origin; keep using the same `http://localhost:8087` origin. + +## Optional services + +- ComfyUI: managed Pinokio app `inteliweb-comfyui`, loopback 8188. Qwen Image 2.1 Q4_K_M, Qwen3-VL 8B INT8 and matching VAE are required. Use Pinokio/pterm for its lifecycle. +- Some GGUF loader versions do not recognize metadata-free Qwen 2.1 files. `node tools/repair-comfy-gguf.mjs ` adds a narrowly matched architecture signature and keeps a `.before-yue2-qwen21` backup. Restart Comfy through Pinokio after this repair. It was needed on this installation. +- Ollama: loopback 11434; the browser uses the native `/ollama` bridge for resource coordination. Installed model selection is discovered, not hardcoded. +- Vocal separation: run `./setup-vocal-separation.ps1`. This creates isolated `.venv-vocal`, installs the separator and CUDA PyTorch, and checks the environment. The separation model downloads on first use into the OS temporary model directory. Restart Studio after setup so its PATH includes the environment. +- YouTube: `npm ci` in `tools/youtube-agent`. The integrated bridge opens a separate Chrome profile; it cannot attach to an ordinary signed-in Chrome window. The upload check is deferred at the user's request. Private profiles and run media are ignored by Git. + +## Recovery and backup + +- Completed audio is saved before optional art/video. If either optional stage fails, use the song card's reconnect/retry controls. +- Stopping artwork waiting preserves the Comfy prompt ID; it does not interrupt another application's GPU job. +- On native restart, completed results remain retrievable; in-flight native computation is marked interrupted and must be retried. +- Do not remove `job_results` before confirming library backups. Unacknowledged results are retained. Acknowledged results expire after 30 days. +- Library backup includes songs, current settings, disk presets and album plans/covers. Restore validates before mutation, downloads a before-restore ZIP and merges conflicting preset names safely. Album song IDs are remapped after restore. +- Album Pause finishes and saves the current stage. Resume skips saved stages and reuses persisted server/Comfy IDs. + +## Acceptance evidence + +Persistent commands: + +```powershell +node --experimental-strip-types --test tools/webui/tests/*.test.mjs +node tests/studio-interactions.mjs +node tests/workflow-browser.mjs +node tools/webui/tests/storage-browser.mjs +node tests/media-queue.mjs +node tests/recovery-http.mjs +``` + +The browser suites use disposable contexts and mocked service responses. They do not upload to YouTube or modify the user's browser library. + +- 24 unit tests passed, including original/master pairing, remix identity, input validation and backup validation. +- 245 controls inventoried/focused; keyboard dialogs/menus, save/load, playback, export, failures, mobile layout and reduced motion passed. +- Quota failure, malformed settings, two-tab submission, audio-first saving, failed favourite rollback and no deleted-track resurrection passed. +- Two-track album reload/resume reused the first job ID and created two tracks. A 122-track library mounted 12 cards with zero eager audio decodes when peaks existed. Measured JavaScript used heap was about 10 MB for this short-audio fixture; this does not measure total browser Blob/native audio memory for long tracks. +- Native async MP4, idempotent retry, cancellation, interrupted preset recovery and atomic rename passed. +- RTX 4060 Laptop 8 GiB: two 12-second real takes plus originals completed in about 16.2 seconds. WAV: 48 kHz stereo, 24-bit. Streaming master measured −15.93 LUFS and −1.54 dBTP on the short sample; the profile target is not a promise of an exact measured value for every clip. +- Actual Qwen cover generation passed, about 152 seconds at 1024 square. The first reference result copied the scene too closely. Increasing reference guidance to 4 produced a distinct rooftop/drum-machine scene with the same amber/purple palette; visual review passed (506 seconds). +- Six-minute MP4 acceptance passed: H.264 1920×1080 + AAC, 360-second video/audio duration, idempotent retry and cancellation. The check found and fixed FFmpeg lookahead leaving a silent tail at 1 fps; exports now use the decoded audio duration explicitly. +- Real Tiger-Gemma lyric generation passed through the native Ollama bridge on CPU in 22 seconds. Ollama's CUDA runner failed initialization on this installation; the lyric assistant now retries that failure once on CPU with a visible notice. Existing lyrics remain intact on errors, and models unload after completion. +- Dependency audit fixes stayed within the declared compatible ranges; npm reports zero vulnerabilities after 11 package updates. Svelte checks remained at zero errors/warnings. +- Real generated artwork and music were combined into `build/media-acceptance/hiphop-circuit-test.mp4`. Artifacts, raw measurements and subsequent checks remain under ignored `build/media-acceptance`. +- Real GPU vocal separation and +3 dB remix passed in 12.2 seconds after fixing Windows argv quoting and resampling before sample-accurate trimming. The output retained the source sample count and rate. Model weights are now cached locally. +- Reference and vocal evidence are recorded in `followup.json`; execution success does not establish subjective vocal quality, lyric intelligibility or every requested voice characteristic. + +Do not treat the mocked browser tests as signed-in YouTube acceptance, or the short media fixture as a full-duration quality guarantee. diff --git a/lyric_styles/00_STYLE_INDEX.yaml b/lyric_styles/00_STYLE_INDEX.yaml new file mode 100644 index 0000000..e79fa76 --- /dev/null +++ b/lyric_styles/00_STYLE_INDEX.yaml @@ -0,0 +1,12 @@ +version: "1.0" +styles: + - {id: rapid_fire, name: Rapid-Fire Momentum, filename: 01_rapid_fire.yaml, description: Fast phonetic momentum with clear meaning, primary_strength: velocity, syllable_density: 0.82, complexity: 0.72, energy: 0.92, best_for: [rap, electronic, drum_and_bass], contrast: dense rhythm and short units} + - {id: syllable_dense, name: Technical Rhyme Architecture, filename: 02_syllable_dense.yaml, description: Interlocking multisyllabic rhyme systems, primary_strength: technicality, syllable_density: 0.96, complexity: 0.96, energy: 0.74, best_for: [rap, boom_bap, experimental], contrast: maximum internal structure} + - {id: chilled_conversational, name: Chilled Conversational Flow, filename: 03_chilled_conversational.yaml, description: Natural speech with understated rhyme, primary_strength: effortless authenticity, syllable_density: 0.42, complexity: 0.48, energy: 0.38, best_for: [hip_hop, lo_fi, pop], contrast: breathing room and loose placement} + - {id: punchline, name: Bar-Heavy Punchline Craft, filename: 04_punchline.yaml, description: Compact setups and intelligent payoffs, primary_strength: quotability, syllable_density: 0.68, complexity: 0.78, energy: 0.76, best_for: [rap, boom_bap, grime], contrast: one strong idea per bar pair} + - {id: cinematic_story, name: Cinematic Storytelling, filename: 05_cinematic_story.yaml, description: Scene-led narrative with callbacks and consequence, primary_strength: narrative immersion, syllable_density: 0.54, complexity: 0.82, energy: 0.62, best_for: [soundtrack, rap, folk], contrast: plot progression over display} + - {id: melodic_emotional, name: Melodic Emotional Anchors, filename: 06_melodic_emotional.yaml, description: Singable emotional phrases with meaningful detail, primary_strength: hookability, syllable_density: 0.48, complexity: 0.62, energy: 0.58, best_for: [pop, rnb, melodic_rap], contrast: vowel-friendly anchors and controlled repetition} + - {id: raw_direct, name: Raw Direct Precision, filename: 07_raw_direct.yaml, description: Concrete forceful language without ornament, primary_strength: impact, syllable_density: 0.46, complexity: 0.44, energy: 0.82, best_for: [rap, punk, rock], contrast: literal observation and strong verbs} + - {id: abstract_psychedelic, name: Abstract Dream Logic, filename: 08_abstract_psychedelic.yaml, description: Surreal connected imagery with emotional logic, primary_strength: originality, syllable_density: 0.58, complexity: 0.88, energy: 0.64, best_for: [experimental, electronic, art_pop], contrast: unusual associations with thematic coherence} + - {id: minimalist_space, name: Minimal Space-Driven Writing, filename: 09_minimalist_space.yaml, description: Few high-value words and intentional silence, primary_strength: memorability, syllable_density: 0.22, complexity: 0.38, energy: 0.34, best_for: [ambient, trap, indie], contrast: space is part of the composition} + - {id: progressive_switching, name: Progressive Flow Switching, filename: 10_progressive_switching.yaml, description: "Purposeful changes in cadence, density and perspective", primary_strength: evolution, syllable_density: 0.76, complexity: 0.91, energy: 0.78, best_for: [progressive_rap, fusion, electronic], contrast: structured transformation across sections} diff --git a/lyric_styles/01_rapid_fire.yaml b/lyric_styles/01_rapid_fire.yaml new file mode 100644 index 0000000..1fa1830 --- /dev/null +++ b/lyric_styles/01_rapid_fire.yaml @@ -0,0 +1,13 @@ +style: {id: rapid_fire, name: Rapid-Fire Momentum, version: "1.0", category: rhythm_engine, description: Fast phonetic momentum without sacrificing semantic clarity} +identity: {core_philosophy: Every bar should propel the next, listener_impression: breathless controlled momentum, primary_strengths: [velocity, cadence, internal_rhyme], intentionally_avoids: [empty filler, unreadable speed, identical bar shapes]} +rhythm: {pace: fast, syllable_density: 0.82, average_syllables_per_bar: 15, line_length: short_to_medium, rhythmic_subdivision: frequent eighths_and_sixteenths, cadence_character: clipped_chained, syncopation: 0.78, pause_usage: strategic_breath_points, enjambment: 0.68, flow_variation: 0.62, flow_switch_frequency: 0.35} +rhyme: {overall_density: 0.82, end_rhyme_frequency: 0.62, internal_rhyme_frequency: 0.88, multisyllabic_rhyme_level: 0.68, rhyme_chain_length: 3, slant_rhyme_usage: 0.55, consonance: 0.72, assonance: 0.68, rhyme_resolution: delayed, rhyme_predictability: 0.35} +language: {vocabulary_complexity: 0.62, sentence_complexity: 0.58, conversational_level: 0.42, metaphor_density: 0.48, wordplay_density: 0.62, imagery_density: 0.58, abstraction_level: 0.38, directness: 0.62, profanity_behavior: contextual, filler_tolerance: 0.08} +delivery: {perceived_energy: 0.92, aggression: 0.58, smoothness: 0.48, emotional_intensity: 0.62, vocal_space: 0.2, breath_demand: 0.9, emphasis_behavior: accented_rhythmically} +composition: {verse_behavior: escalating_chained_bars, hook_behavior: simpler_reset, bridge_behavior: brief_breath_or_contrast, opening_behavior: immediate_motion, closing_behavior: clean_final_rhyme, repetition_level: 0.28, callback_usage: 0.42, progression_style: acceleration_then_release} +storytelling: {narrative_priority: 0.42, perspective: flexible, scene_detail: 0.48, continuity: 0.62, character_usage: optional, temporal_progression: linear_or_associative, payoff_behavior: final_bar_resolution} +technical_rules: {hard_rules: ["Keep meaning clear at speed", "Use frequent internal rhyme or rhythmic echo", "Create intentional breath points", "Do not pad lines to hit syllable count"], preferred_rules: ["Chain 2-4 related sounds", "Use consonants that articulate quickly", "Vary line endings"], optional_behaviors: ["Short burst of double-time", "One deliberately sparse reset"]} +anti_patterns: {never_do: ["nonsense filler", "constant perfect couplets", "unreadable tongue-twisters"], avoid_overusing: ["same vowel family", "identical 16-syllable lines"], warning_signs: ["meaning disappears when read aloud"]} +generation_guidance: {planning_method: map_topic_to_three_motifs_then_build_sound_chains, writing_order: meaning_then_rhythm_then_rhyme, revision_method: remove_filler_and_test_breaths, quality_checks: [clarity, breathability, sound_variety, no_recycled_phrases]} +adaptation: {works_best_with: [rap, electronic, drum_and_bass], can_adapt_to: [pop, rock, spoken_word], topic_handling: concrete_motifs, emotional_range: medium_to_high} +metrics: {syllable_density: 0.82, rhyme_density: 0.82, internal_rhyme: 0.88, melodic_bias: 0.2, narrative_bias: 0.42, abstraction: 0.38, aggression: 0.58, repetition: 0.28, flow_variability: 0.62, punchline_bias: 0.45, imagery: 0.58, directness: 0.62, emotional_intensity: 0.62, space: 0.2, breath_demand: 0.9} diff --git a/lyric_styles/02_syllable_dense.yaml b/lyric_styles/02_syllable_dense.yaml new file mode 100644 index 0000000..ef152cd --- /dev/null +++ b/lyric_styles/02_syllable_dense.yaml @@ -0,0 +1,13 @@ +style: {id: syllable_dense, name: Technical Rhyme Architecture, version: "1.0", category: language_engine, description: Interlocking multisyllabic rhyme systems that remain semantically coherent} +identity: {core_philosophy: Build a connected lattice of sound and meaning, listener_impression: intricate and rewarding, primary_strengths: [multisyllabic_rhyme, internal_structure, wordplay], intentionally_avoids: [random_thesaurus_words, empty complexity, forced grammar]} +rhythm: {pace: flexible, syllable_density: 0.96, average_syllables_per_bar: 17, line_length: medium_to_long, rhythmic_subdivision: varied, cadence_character: tightly_interlocked, syncopation: 0.72, pause_usage: deliberate, enjambment: 0.82, flow_variation: 0.66, flow_switch_frequency: 0.42} +rhyme: {overall_density: 0.95, end_rhyme_frequency: 0.58, internal_rhyme_frequency: 0.96, multisyllabic_rhyme_level: 0.96, rhyme_chain_length: 5, slant_rhyme_usage: 0.72, consonance: 0.9, assonance: 0.88, rhyme_resolution: delayed_layered, rhyme_predictability: 0.22} +language: {vocabulary_complexity: 0.84, sentence_complexity: 0.86, conversational_level: 0.38, metaphor_density: 0.62, wordplay_density: 0.9, imagery_density: 0.68, abstraction_level: 0.56, directness: 0.5, profanity_behavior: contextual, filler_tolerance: 0.03} +delivery: {perceived_energy: 0.74, aggression: 0.45, smoothness: 0.42, emotional_intensity: 0.58, vocal_space: 0.24, breath_demand: 0.92, emphasis_behavior: emphasize_rhyme_turns} +composition: {verse_behavior: evolving_rhyme_families, hook_behavior: contrast_and_simplify, bridge_behavior: reveal_new_sound_family, opening_behavior: establish_concept_and_rhyme, closing_behavior: resolve_or_reframe, repetition_level: 0.2, callback_usage: 0.62, progression_style: increasing_interconnection} +storytelling: {narrative_priority: 0.5, perspective: flexible, scene_detail: 0.55, continuity: 0.68, character_usage: optional, temporal_progression: flexible, payoff_behavior: conceptual_reveal} +technical_rules: {hard_rules: ["Every complex phrase must serve meaning", "Use at least two internal sound relationships per bar on average", "Build rhyme chains rather than isolated rhymes", "Preserve grammatical readability"], preferred_rules: ["Use multisyllabic slant rhyme", "Layer consonance under vowel rhyme", "Let sentences cross bar lines"], optional_behaviors: ["Nested double meaning", "Rhyme family mutation in final section"]} +anti_patterns: {never_do: ["random ornate vocabulary", "rhymes that distort the subject", "unbroken rhyme monotony"], avoid_overusing: ["perfect rhyme", "same sentence length"], warning_signs: ["a line sounds impressive but says nothing"]} +generation_guidance: {planning_method: define_subject_thesis_then_three_rhyme_families, writing_order: semantic_map_then_sound_lattice_then_revision, revision_method: delete_any_sound_without_semantic_job, quality_checks: [coherence, rhyme variety, grammar, originality, read_aloud clarity]} +adaptation: {works_best_with: [rap, jazz_rap, experimental], can_adapt_to: [electronic, rock, spoken_word], topic_handling: conceptual_and_concrete_layers, emotional_range: high} +metrics: {syllable_density: 0.96, rhyme_density: 0.95, internal_rhyme: 0.96, melodic_bias: 0.15, narrative_bias: 0.5, abstraction: 0.56, aggression: 0.45, repetition: 0.2, flow_variability: 0.66, punchline_bias: 0.62, imagery: 0.68, directness: 0.5, emotional_intensity: 0.58, space: 0.24, breath_demand: 0.92} diff --git a/lyric_styles/03_chilled_conversational.yaml b/lyric_styles/03_chilled_conversational.yaml new file mode 100644 index 0000000..51c7466 --- /dev/null +++ b/lyric_styles/03_chilled_conversational.yaml @@ -0,0 +1,13 @@ +style: {id: chilled_conversational, name: Chilled Conversational Flow, version: "1.0", category: voice_engine, description: Natural speech with understated rhyme and breathing room} +identity: {core_philosophy: Sound like a person thinking aloud with musical control, listener_impression: effortless and intimate, primary_strengths: [authenticity, smoothness, understatement], intentionally_avoids: [forced rhyme, grandstanding, filler]} +rhythm: {pace: relaxed, syllable_density: 0.42, average_syllables_per_bar: 9, line_length: irregular, rhythmic_subdivision: mostly_even, cadence_character: spoken_smooth, syncopation: 0.42, pause_usage: generous, enjambment: 0.62, flow_variation: 0.5, flow_switch_frequency: 0.18} +rhyme: {overall_density: 0.4, end_rhyme_frequency: 0.3, internal_rhyme_frequency: 0.35, multisyllabic_rhyme_level: 0.2, rhyme_chain_length: 1, slant_rhyme_usage: 0.65, consonance: 0.4, assonance: 0.48, rhyme_resolution: occasional, rhyme_predictability: 0.3} +language: {vocabulary_complexity: 0.4, sentence_complexity: 0.48, conversational_level: 0.9, metaphor_density: 0.3, wordplay_density: 0.2, imagery_density: 0.55, abstraction_level: 0.3, directness: 0.76, profanity_behavior: natural_context_only, filler_tolerance: 0.12} +delivery: {perceived_energy: 0.38, aggression: 0.12, smoothness: 0.82, emotional_intensity: 0.52, vocal_space: 0.72, breath_demand: 0.3, emphasis_behavior: subtle} +composition: {verse_behavior: conversational_observations, hook_behavior: simple_memorable_phrase, bridge_behavior: perspective_shift, opening_behavior: specific_detail, closing_behavior: understated_insight, repetition_level: 0.42, callback_usage: 0.5, progression_style: gradual} +storytelling: {narrative_priority: 0.58, perspective: first_or_second_person, scene_detail: 0.62, continuity: 0.7, character_usage: occasional, temporal_progression: natural, payoff_behavior: emotional_observation} +technical_rules: {hard_rules: ["Use natural sentences", "Leave audible breathing room", "Rhyme only when it sounds unforced"], preferred_rules: ["Use concrete small details", "Allow uneven line lengths", "Prefer slant rhyme"], optional_behaviors: ["Spoken aside", "One repeated anchor"]} +anti_patterns: {never_do: ["constant perfect rhyme", "generic wisdom", "fake casual filler"], avoid_overusing: ["you know", "late night imagery", "same sentence opener"], warning_signs: ["sounds written instead of spoken"]} +generation_guidance: {planning_method: list_real_observations_then_find_emotional_thread, writing_order: speech_draft_then_musical_edit, revision_method: remove_any_line_not_sounding_natural, quality_checks: [speakability, specificity, restraint, emotional honesty]} +adaptation: {works_best_with: [hip_hop, lo_fi, indie, pop], can_adapt_to: [rock, rnb], topic_handling: personal_observation, emotional_range: broad} +metrics: {syllable_density: 0.42, rhyme_density: 0.4, internal_rhyme: 0.35, melodic_bias: 0.45, narrative_bias: 0.58, abstraction: 0.3, aggression: 0.12, repetition: 0.42, flow_variability: 0.5, punchline_bias: 0.18, imagery: 0.55, directness: 0.76, emotional_intensity: 0.52, space: 0.72, breath_demand: 0.3} diff --git a/lyric_styles/04_punchline.yaml b/lyric_styles/04_punchline.yaml new file mode 100644 index 0000000..665dd55 --- /dev/null +++ b/lyric_styles/04_punchline.yaml @@ -0,0 +1,13 @@ +style: {id: punchline, name: Bar-Heavy Punchline Craft, version: "1.0", category: idea_engine, description: "Compact setups, misdirection and intelligent payoffs"} +identity: {core_philosophy: Each bar pair earns attention with a precise turn, listener_impression: quotable and sharp, primary_strengths: [wordplay, compression, payoff], intentionally_avoids: [corny_jokes, empty flexing, obvious setups]} +rhythm: {pace: medium, syllable_density: 0.68, average_syllables_per_bar: 12, line_length: compact, rhythmic_subdivision: varied, cadence_character: setup_then_snap, syncopation: 0.62, pause_usage: before_payoff, enjambment: 0.4, flow_variation: 0.48, flow_switch_frequency: 0.25} +rhyme: {overall_density: 0.65, end_rhyme_frequency: 0.58, internal_rhyme_frequency: 0.62, multisyllabic_rhyme_level: 0.55, rhyme_chain_length: 2, slant_rhyme_usage: 0.55, consonance: 0.62, assonance: 0.58, rhyme_resolution: payoff_aligned, rhyme_predictability: 0.28} +language: {vocabulary_complexity: 0.7, sentence_complexity: 0.62, conversational_level: 0.5, metaphor_density: 0.7, wordplay_density: 0.92, imagery_density: 0.58, abstraction_level: 0.42, directness: 0.62, profanity_behavior: purposeful, filler_tolerance: 0.03} +delivery: {perceived_energy: 0.76, aggression: 0.55, smoothness: 0.5, emotional_intensity: 0.42, vocal_space: 0.35, breath_demand: 0.62, emphasis_behavior: land_the_turn} +composition: {verse_behavior: setup_payoff_pairs, hook_behavior: quotable_refrain, bridge_behavior: change_angle, opening_behavior: establish_premise, closing_behavior: strongest_reframe, repetition_level: 0.28, callback_usage: 0.68, progression_style: escalating_stakes} +storytelling: {narrative_priority: 0.38, perspective: flexible, scene_detail: 0.4, continuity: 0.5, character_usage: optional, temporal_progression: flexible, payoff_behavior: misdirection_then_clarity} +technical_rules: {hard_rules: ["Every bar pair contains a meaningful turn", "Prefer implication over explanation", "Punchlines must serve the subject"], preferred_rules: ["Use double meaning with context", "Keep wording compact", "Vary payoff placement"], optional_behaviors: ["Callback punchline", "Delayed reveal"]} +anti_patterns: {never_do: ["dad jokes", "cliches", "forced double entendres"], avoid_overusing: ["same punchline shape", "bragging", "similes"], warning_signs: ["the line needs explanation to work"]} +generation_guidance: {planning_method: create_claim_obstacle_reversal_pairs, writing_order: idea_then_setup_then_sound_edit, revision_method: cut_explanation_after_payoff, quality_checks: [originality, clarity, relevance, quotability]} +adaptation: {works_best_with: [rap, grime, boom_bap], can_adapt_to: [pop, rock, electronic], topic_handling: premise_and_observation, emotional_range: medium} +metrics: {syllable_density: 0.68, rhyme_density: 0.65, internal_rhyme: 0.62, melodic_bias: 0.22, narrative_bias: 0.38, abstraction: 0.42, aggression: 0.55, repetition: 0.28, flow_variability: 0.48, punchline_bias: 0.92, imagery: 0.58, directness: 0.62, emotional_intensity: 0.42, space: 0.35, breath_demand: 0.62} diff --git a/lyric_styles/05_cinematic_story.yaml b/lyric_styles/05_cinematic_story.yaml new file mode 100644 index 0000000..444f482 --- /dev/null +++ b/lyric_styles/05_cinematic_story.yaml @@ -0,0 +1,13 @@ +style: {id: cinematic_story, name: Cinematic Storytelling, version: "1.0", category: narrative_engine, description: "Scene-led narrative with characters, consequence and callbacks"} +identity: {core_philosophy: Show a film through specific actions and sensory detail, listener_impression: immersive and consequential, primary_strengths: [scenes, continuity, payoff], intentionally_avoids: [generic narration, exposition dumps, disconnected images]} +rhythm: {pace: variable, syllable_density: 0.54, average_syllables_per_bar: 10, line_length: varied, rhythmic_subdivision: scene_dependent, cadence_character: visual_and_natural, syncopation: 0.44, pause_usage: dramatic, enjambment: 0.7, flow_variation: 0.55, flow_switch_frequency: 0.3} +rhyme: {overall_density: 0.48, end_rhyme_frequency: 0.38, internal_rhyme_frequency: 0.4, multisyllabic_rhyme_level: 0.3, rhyme_chain_length: 2, slant_rhyme_usage: 0.62, consonance: 0.45, assonance: 0.52, rhyme_resolution: scene_end, rhyme_predictability: 0.4} +language: {vocabulary_complexity: 0.62, sentence_complexity: 0.72, conversational_level: 0.52, metaphor_density: 0.42, wordplay_density: 0.22, imagery_density: 0.9, abstraction_level: 0.34, directness: 0.62, profanity_behavior: character_based, filler_tolerance: 0.04} +delivery: {perceived_energy: 0.62, aggression: 0.3, smoothness: 0.58, emotional_intensity: 0.76, vocal_space: 0.48, breath_demand: 0.45, emphasis_behavior: action_and_reveal} +composition: {verse_behavior: sequential_scenes, hook_behavior: thematic_refrain, bridge_behavior: time_or_perspective_shift, opening_behavior: in_media_res, closing_behavior: consequence_or_image, repetition_level: 0.38, callback_usage: 0.88, progression_style: rising_tension} +storytelling: {narrative_priority: 0.96, perspective: chosen_and_consistent, scene_detail: 0.92, continuity: 0.94, character_usage: central, temporal_progression: clear, payoff_behavior: earned_consequence} +technical_rules: {hard_rules: ["Use locations, actions and sensory details", "Maintain continuity of people and objects", "Show events rather than summarize them", "End with consequence or changed understanding"], preferred_rules: ["Seed a detail that returns later", "Use dialogue sparingly", "Let imagery carry emotion"], optional_behaviors: ["Unreliable perspective", "Nonlinear reveal"]} +anti_patterns: {never_do: ["generic life-story summary", "unearned twist", "nameless characters doing vague things"], avoid_overusing: ["weather metaphors", "explaining emotion", "random flashbacks"], warning_signs: ["removing the rhyme leaves no scene"]} +generation_guidance: {planning_method: define protagonist_want_obstacle_change_and_three_scenes, writing_order: beat_sheet_then_scene_draft_then_sound_edit, revision_method: replace abstractions_with_observable_actions, quality_checks: [continuity, sensory specificity, stakes, ending]} +adaptation: {works_best_with: [soundtrack, rap, folk, rock], can_adapt_to: [pop, electronic], topic_handling: character_and_event_based, emotional_range: very_high} +metrics: {syllable_density: 0.54, rhyme_density: 0.48, internal_rhyme: 0.4, melodic_bias: 0.3, narrative_bias: 0.96, abstraction: 0.34, aggression: 0.3, repetition: 0.38, flow_variability: 0.55, punchline_bias: 0.2, imagery: 0.9, directness: 0.62, emotional_intensity: 0.76, space: 0.48, breath_demand: 0.45} diff --git a/lyric_styles/06_melodic_emotional.yaml b/lyric_styles/06_melodic_emotional.yaml new file mode 100644 index 0000000..a062864 --- /dev/null +++ b/lyric_styles/06_melodic_emotional.yaml @@ -0,0 +1,13 @@ +style: {id: melodic_emotional, name: Melodic Emotional Anchors, version: "1.0", category: melodic_engine, description: Singable emotional phrases with meaningful detail} +identity: {core_philosophy: Make feeling memorable through sound and specific truth, listener_impression: vulnerable and hookable, primary_strengths: [emotion, vowels, anchors], intentionally_avoids: [generic pop cliches, empty repetition, melodrama]} +rhythm: {pace: medium, syllable_density: 0.48, average_syllables_per_bar: 9, line_length: clean_phrase_shapes, rhythmic_subdivision: mostly_even, cadence_character: singable, syncopation: 0.3, pause_usage: phrase_breaths, enjambment: 0.38, flow_variation: 0.32, flow_switch_frequency: 0.18} +rhyme: {overall_density: 0.5, end_rhyme_frequency: 0.48, internal_rhyme_frequency: 0.3, multisyllabic_rhyme_level: 0.24, rhyme_chain_length: 2, slant_rhyme_usage: 0.58, consonance: 0.28, assonance: 0.72, rhyme_resolution: hook_aligned, rhyme_predictability: 0.45} +language: {vocabulary_complexity: 0.46, sentence_complexity: 0.42, conversational_level: 0.6, metaphor_density: 0.5, wordplay_density: 0.18, imagery_density: 0.62, abstraction_level: 0.38, directness: 0.58, profanity_behavior: contextual, filler_tolerance: 0.05} +delivery: {perceived_energy: 0.58, aggression: 0.12, smoothness: 0.84, emotional_intensity: 0.92, vocal_space: 0.5, breath_demand: 0.38, emphasis_behavior: vowel_and_anchor_emphasis} +composition: {verse_behavior: detail_to_feeling, hook_behavior: repeated_emotional_anchor, bridge_behavior: emotional_reframe, opening_behavior: intimate_image, closing_behavior: unresolved_or_resolved_echo, repetition_level: 0.7, callback_usage: 0.62, progression_style: emotional_rise} +storytelling: {narrative_priority: 0.54, perspective: first_person_preferred, scene_detail: 0.62, continuity: 0.6, character_usage: optional, temporal_progression: emotional, payoff_behavior: emotional_truth} +technical_rules: {hard_rules: ["Build one memorable anchor phrase", "Use vowel-friendly words in hooks", "Repeat with purposeful variation"], preferred_rules: ["Use concrete detail before abstraction", "Keep melodic phrases concise", "Let verses deepen the hook"], optional_behaviors: ["Melodic rap pre-hook", "Wordless space between phrases"]} +anti_patterns: {never_do: ["generic heartbreak slogans", "repetition without changed meaning", "overstuffed hooks"], avoid_overusing: ["love, pain, night", "perfect rhymes"], warning_signs: ["emotion is announced rather than felt"]} +generation_guidance: {planning_method: name_emotion_image_and_anchor, writing_order: hook_core_then_verses_then_bridge, revision_method: sing_aloud_and_replace_awkward_consonants, quality_checks: [hook_memory, emotional_specificity, vowel_flow, progression]} +adaptation: {works_best_with: [pop, rnb, melodic_rap], can_adapt_to: [rock, electronic, folk], topic_handling: emotional_anchor_and_detail, emotional_range: very_high} +metrics: {syllable_density: 0.48, rhyme_density: 0.5, internal_rhyme: 0.3, melodic_bias: 0.9, narrative_bias: 0.54, abstraction: 0.38, aggression: 0.12, repetition: 0.7, flow_variability: 0.32, punchline_bias: 0.15, imagery: 0.62, directness: 0.58, emotional_intensity: 0.92, space: 0.5, breath_demand: 0.38} diff --git a/lyric_styles/07_raw_direct.yaml b/lyric_styles/07_raw_direct.yaml new file mode 100644 index 0000000..7434468 --- /dev/null +++ b/lyric_styles/07_raw_direct.yaml @@ -0,0 +1,13 @@ +style: {id: raw_direct, name: Raw Direct Precision, version: "1.0", category: impact_engine, description: Concrete forceful language without ornament} +identity: {core_philosophy: Say the hard thing plainly and make details carry weight, listener_impression: believable and immediate, primary_strengths: [impact, honesty, concrete imagery], intentionally_avoids: [intellectual decoration, vague metaphor, fake bravado]} +rhythm: {pace: medium, syllable_density: 0.46, average_syllables_per_bar: 8, line_length: short, rhythmic_subdivision: blunt, cadence_character: forceful, syncopation: 0.35, pause_usage: emphatic, enjambment: 0.3, flow_variation: 0.28, flow_switch_frequency: 0.12} +rhyme: {overall_density: 0.35, end_rhyme_frequency: 0.32, internal_rhyme_frequency: 0.24, multisyllabic_rhyme_level: 0.12, rhyme_chain_length: 1, slant_rhyme_usage: 0.48, consonance: 0.56, assonance: 0.35, rhyme_resolution: occasional, rhyme_predictability: 0.5} +language: {vocabulary_complexity: 0.3, sentence_complexity: 0.3, conversational_level: 0.72, metaphor_density: 0.18, wordplay_density: 0.12, imagery_density: 0.68, abstraction_level: 0.16, directness: 0.96, profanity_behavior: only_if_authentic, filler_tolerance: 0.02} +delivery: {perceived_energy: 0.82, aggression: 0.76, smoothness: 0.38, emotional_intensity: 0.72, vocal_space: 0.34, breath_demand: 0.45, emphasis_behavior: strong_verbs_and_nouns} +composition: {verse_behavior: accumulating_facts, hook_behavior: blunt_statement, bridge_behavior: confrontation_or_release, opening_behavior: immediate_fact, closing_behavior: final_plain_truth, repetition_level: 0.4, callback_usage: 0.5, progression_style: pressure} +storytelling: {narrative_priority: 0.62, perspective: first_person_or_witness, scene_detail: 0.74, continuity: 0.7, character_usage: grounded, temporal_progression: linear, payoff_behavior: consequence} +technical_rules: {hard_rules: ["Prefer strong verbs", "Use concrete nouns and observable details", "Make simple language precise"], preferred_rules: ["Use dialogue fragments", "Keep lines forceful", "Let silence create threat or weight"], optional_behaviors: ["One plain refrain", "Documentary detail"]} +anti_patterns: {never_do: ["generic gangster cliches", "luxury flexing without story", "excessive metaphor"], avoid_overusing: ["blood, streets, demons", "short lines with no information"], warning_signs: ["simple words but no concrete event"]} +generation_guidance: {planning_method: collect_five_specific_facts_and_one_stakes_statement, writing_order: facts_then_pressure_then_refrain, revision_method: replace_abstract_nouns_with_actions, quality_checks: [believability, specificity, force, restraint]} +adaptation: {works_best_with: [rap, punk, rock], can_adapt_to: [electronic, folk], topic_handling: direct_observation, emotional_range: high} +metrics: {syllable_density: 0.46, rhyme_density: 0.35, internal_rhyme: 0.24, melodic_bias: 0.18, narrative_bias: 0.62, abstraction: 0.16, aggression: 0.76, repetition: 0.4, flow_variability: 0.28, punchline_bias: 0.3, imagery: 0.68, directness: 0.96, emotional_intensity: 0.72, space: 0.34, breath_demand: 0.45} diff --git a/lyric_styles/08_abstract_psychedelic.yaml b/lyric_styles/08_abstract_psychedelic.yaml new file mode 100644 index 0000000..95c6211 --- /dev/null +++ b/lyric_styles/08_abstract_psychedelic.yaml @@ -0,0 +1,13 @@ +style: {id: abstract_psychedelic, name: Abstract Dream Logic, version: "1.0", category: imagery_engine, description: Surreal connected imagery with emotional or conceptual logic} +identity: {core_philosophy: Make unexpected images answer the same hidden question, listener_impression: strange but meaningful, primary_strengths: [originality, symbolism, sensory crossover], intentionally_avoids: [random nonsense, decorative weirdness, empty obscurity]} +rhythm: {pace: variable, syllable_density: 0.58, average_syllables_per_bar: 11, line_length: irregular, rhythmic_subdivision: exploratory, cadence_character: drifting_then_locked, syncopation: 0.7, pause_usage: dramatic, enjambment: 0.78, flow_variation: 0.72, flow_switch_frequency: 0.45} +rhyme: {overall_density: 0.52, end_rhyme_frequency: 0.3, internal_rhyme_frequency: 0.48, multisyllabic_rhyme_level: 0.42, rhyme_chain_length: 2, slant_rhyme_usage: 0.8, consonance: 0.62, assonance: 0.72, rhyme_resolution: associative, rhyme_predictability: 0.12} +language: {vocabulary_complexity: 0.72, sentence_complexity: 0.76, conversational_level: 0.28, metaphor_density: 0.9, wordplay_density: 0.55, imagery_density: 0.96, abstraction_level: 0.9, directness: 0.28, profanity_behavior: contextual, filler_tolerance: 0.02} +delivery: {perceived_energy: 0.64, aggression: 0.2, smoothness: 0.45, emotional_intensity: 0.78, vocal_space: 0.5, breath_demand: 0.42, emphasis_behavior: image_and_texture} +composition: {verse_behavior: linked_fragments, hook_behavior: symbolic_anchor, bridge_behavior: reality_shift, opening_behavior: arresting_image, closing_behavior: image_recontextualization, repetition_level: 0.46, callback_usage: 0.82, progression_style: dream_logic_with_emotional_direction} +storytelling: {narrative_priority: 0.34, perspective: shifting_but_intentional, scene_detail: 0.74, continuity: 0.55, character_usage: symbolic, temporal_progression: nonlinear, payoff_behavior: thematic_recognition} +technical_rules: {hard_rules: ["Every strange image must connect to a subject emotion or theme", "Repeat symbols with changed meaning", "Preserve an emotional through-line"], preferred_rules: ["Use synesthesia", "Mix concrete sensory objects with abstraction", "Let grammar bend only for effect"], optional_behaviors: ["Fragmented perspective", "Invented compound image"]} +anti_patterns: {never_do: ["random noun lists", "unexplained surrealism", "cliche dream imagery"], avoid_overusing: ["mirrors, galaxies, oceans, neon", "every line as a metaphor"], warning_signs: ["cannot state what the song feels about"]} +generation_guidance: {planning_method: choose_theme_then_symbol_set_then_association_map, writing_order: sensory_images_then_connections_then_refrain, revision_method: remove_any_image_without_emotional_job, quality_checks: [coherence, originality, symbol return, emotional legibility]} +adaptation: {works_best_with: [experimental, electronic, art_pop], can_adapt_to: [rap, rock, ambient], topic_handling: symbolic_translation, emotional_range: high} +metrics: {syllable_density: 0.58, rhyme_density: 0.52, internal_rhyme: 0.48, melodic_bias: 0.38, narrative_bias: 0.34, abstraction: 0.9, aggression: 0.2, repetition: 0.46, flow_variability: 0.72, punchline_bias: 0.18, imagery: 0.96, directness: 0.28, emotional_intensity: 0.78, space: 0.5, breath_demand: 0.42} diff --git a/lyric_styles/09_minimalist_space.yaml b/lyric_styles/09_minimalist_space.yaml new file mode 100644 index 0000000..36d39be --- /dev/null +++ b/lyric_styles/09_minimalist_space.yaml @@ -0,0 +1,13 @@ +style: {id: minimalist_space, name: Minimal Space-Driven Writing, version: "1.0", category: economy_engine, description: Few high-value words with intentional silence} +identity: {core_philosophy: Every word must earn its sonic and emotional place, listener_impression: stark and memorable, primary_strengths: [economy, anchors, space], intentionally_avoids: [filler, explanation, over-writing]} +rhythm: {pace: slow_to_medium, syllable_density: 0.22, average_syllables_per_bar: 4, line_length: very_short, rhythmic_subdivision: sparse, cadence_character: spacious, syncopation: 0.52, pause_usage: structural, enjambment: 0.2, flow_variation: 0.35, flow_switch_frequency: 0.12} +rhyme: {overall_density: 0.28, end_rhyme_frequency: 0.25, internal_rhyme_frequency: 0.18, multisyllabic_rhyme_level: 0.08, rhyme_chain_length: 1, slant_rhyme_usage: 0.52, consonance: 0.32, assonance: 0.48, rhyme_resolution: occasional, rhyme_predictability: 0.42} +language: {vocabulary_complexity: 0.36, sentence_complexity: 0.2, conversational_level: 0.52, metaphor_density: 0.5, wordplay_density: 0.08, imagery_density: 0.62, abstraction_level: 0.42, directness: 0.7, profanity_behavior: rare, filler_tolerance: 0.0} +delivery: {perceived_energy: 0.34, aggression: 0.1, smoothness: 0.72, emotional_intensity: 0.68, vocal_space: 0.96, breath_demand: 0.12, emphasis_behavior: isolated_words} +composition: {verse_behavior: image_fragments, hook_behavior: mantra_anchor, bridge_behavior: silence_or_single_new_image, opening_behavior: one_precise_image, closing_behavior: leave_resonance, repetition_level: 0.78, callback_usage: 0.72, progression_style: accumulation_by_repetition} +storytelling: {narrative_priority: 0.3, perspective: flexible, scene_detail: 0.55, continuity: 0.5, character_usage: optional, temporal_progression: implied, payoff_behavior: listener_inference} +technical_rules: {hard_rules: ["Remove any unnecessary word", "Use silence as a compositional unit", "Repeat only phrases that gain meaning"], preferred_rules: ["Use strong nouns", "Leave lines unfinished when intentional", "Make the hook instantly memorable"], optional_behaviors: ["One-word response", "Long instrumental gap"]} +anti_patterns: {never_do: ["generic filler", "explaining the image", "padding short lines"], avoid_overusing: ["baby, fire, night", "three-line fragments everywhere"], warning_signs: ["low word count but low information"]} +generation_guidance: {planning_method: choose_three_images_and_one_anchor, writing_order: anchor_then_supporting_fragments_then_silence, revision_method: cut_thirty_percent_without_losing meaning, quality_checks: [value_per_word, memory, space, sonic_shape]} +adaptation: {works_best_with: [ambient, trap, indie], can_adapt_to: [pop, electronic, spoken_word], topic_handling: emblematic_images, emotional_range: high} +metrics: {syllable_density: 0.22, rhyme_density: 0.28, internal_rhyme: 0.18, melodic_bias: 0.62, narrative_bias: 0.3, abstraction: 0.42, aggression: 0.1, repetition: 0.78, flow_variability: 0.35, punchline_bias: 0.12, imagery: 0.62, directness: 0.7, emotional_intensity: 0.68, space: 0.96, breath_demand: 0.12} diff --git a/lyric_styles/10_progressive_switching.yaml b/lyric_styles/10_progressive_switching.yaml new file mode 100644 index 0000000..f5a1c19 --- /dev/null +++ b/lyric_styles/10_progressive_switching.yaml @@ -0,0 +1,13 @@ +style: {id: progressive_switching, name: Progressive Flow Switching, version: "1.0", category: evolution_engine, description: "Purposeful changes in cadence, density and perspective"} +identity: {core_philosophy: Let form evolve because the subject evolves, listener_impression: dynamic and intentional, primary_strengths: [contrast, progression, controlled surprise], intentionally_avoids: [random switches, complexity for display, sectionless chaos]} +rhythm: {pace: changing, syllable_density: 0.76, average_syllables_per_bar: 13, line_length: changing, rhythmic_subdivision: staged, cadence_character: evolving, syncopation: 0.78, pause_usage: resets, enjambment: 0.7, flow_variation: 0.94, flow_switch_frequency: 0.82} +rhyme: {overall_density: 0.7, end_rhyme_frequency: 0.48, internal_rhyme_frequency: 0.72, multisyllabic_rhyme_level: 0.68, rhyme_chain_length: 3, slant_rhyme_usage: 0.68, consonance: 0.72, assonance: 0.7, rhyme_resolution: section_dependent, rhyme_predictability: 0.18} +language: {vocabulary_complexity: 0.72, sentence_complexity: 0.74, conversational_level: 0.4, metaphor_density: 0.58, wordplay_density: 0.58, imagery_density: 0.62, abstraction_level: 0.52, directness: 0.5, profanity_behavior: contextual, filler_tolerance: 0.03} +delivery: {perceived_energy: 0.78, aggression: 0.5, smoothness: 0.46, emotional_intensity: 0.72, vocal_space: 0.32, breath_demand: 0.78, emphasis_behavior: transition_markers} +composition: {verse_behavior: sections_with_distinct_rules, hook_behavior: stabilizing_return, bridge_behavior: major_reset, opening_behavior: establish_baseline_then_change, closing_behavior: synthesize_modes, repetition_level: 0.32, callback_usage: 0.7, progression_style: escalation_and_reframe} +storytelling: {narrative_priority: 0.62, perspective: shifts_with_purpose, scene_detail: 0.58, continuity: 0.72, character_usage: optional, temporal_progression: progressive, payoff_behavior: form_and_meaning_converge} +technical_rules: {hard_rules: ["Every switch must mark a change in meaning, stakes or perspective", "Signal transitions through sound or image", "Return or resolve the opening idea"], preferred_rules: ["Contrast dense and sparse sections", "Change rhyme architecture at a section boundary", "Use a rhythmic reset before the final section"], optional_behaviors: ["Perspective switch", "Sentence-length inversion"]} +anti_patterns: {never_do: ["random cadence changes", "switches with no purpose", "constant maximal density"], avoid_overusing: ["same switch location", "technical jargon", "false complexity"], warning_signs: ["sections could be reordered with no effect"]} +generation_guidance: {planning_method: map_emotional_or_narrative_arc_to_three_formal_modes, writing_order: section_plan_then_distinct_drafts_then_transition_edit, revision_method: justify_each_switch_in_plain_language, quality_checks: [purpose, contrast, continuity, final synthesis]} +adaptation: {works_best_with: [progressive_rap, fusion, electronic], can_adapt_to: [rock, pop, jazz], topic_handling: evolving_argument_or_story, emotional_range: very_high} +metrics: {syllable_density: 0.76, rhyme_density: 0.7, internal_rhyme: 0.72, melodic_bias: 0.3, narrative_bias: 0.62, abstraction: 0.52, aggression: 0.5, repetition: 0.32, flow_variability: 0.94, punchline_bias: 0.42, imagery: 0.62, directness: 0.5, emotional_intensity: 0.72, space: 0.32, breath_demand: 0.78} diff --git a/lyric_styles/hiphop_30/01_fast_punchy.md b/lyric_styles/hiphop_30/01_fast_punchy.md new file mode 100644 index 0000000..3603fd5 --- /dev/null +++ b/lyric_styles/hiphop_30/01_fast_punchy.md @@ -0,0 +1,73 @@ +# Fast Punchy + +## Purpose +Create rapid, hard-hitting rap verses built from compact bars, immediate impact, and frequent memorable punchlines. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** Very high +- **Delivery Speed:** Fast / double-time capable +- **Target Syllables:** 8–13 syllables per bar, with occasional shorter impact bars +- **Rhyme Density:** High +- **Internal Rhyme Density:** Medium-high +- **Multisyllabic Rhyme Level:** Medium +- **Punchline Frequency:** At least 1 strong punchline or payoff every 2 bars +- **Wordplay Level:** High +- **Metaphor Density:** Medium-high +- **Vocabulary:** Direct, vivid, compact +- **Storytelling Level:** Low-medium +- **Aggression:** High +- **Emotional Intensity:** Medium-high +- **Repetition:** Low outside hooks +- **Flow Variation:** Frequent micro-switches without losing momentum +- **Preferred Rhyme Schemes:** AA/BB, AAAA bursts, internal chains +- **Bar Structure:** Short clauses, hard stops, minimal setup time +- **Hook Compatibility:** High + +## Mandatory Writing Rules +- Open with impact within the first 2 bars. +- Keep most bars compact enough for fast delivery. +- Use strong stressed rhyme words at line endings. +- Include internal rhymes in at least half the bars. +- Deliver a payoff, flip, boast, image, or punchline at least every 2 bars. +- Use verbs and concrete nouns more than vague adjectives. +- Keep transitions fast; avoid long narrative detours. + +## Avoid +Long explanations, filler bars, soft openings, overly complex sentence structures that slow delivery + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Does the verse feel fast even when read silently? +- [ ] Are at least 50% of bars carrying internal rhyme or rhythmic echo? +- [ ] Is there a memorable impact line at least every 2 bars? +- [ ] Could any bar be shortened without losing meaning? If yes, tighten it. +- [ ] Are filler connectors removed? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/02_syllable_dense.md b/lyric_styles/hiphop_30/02_syllable_dense.md new file mode 100644 index 0000000..7a30b17 --- /dev/null +++ b/lyric_styles/hiphop_30/02_syllable_dense.md @@ -0,0 +1,72 @@ +# Syllable Dense + +## Purpose +Maximize technical density while keeping the verse understandable and performable. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** High +- **Delivery Speed:** Medium-fast to fast +- **Target Syllables:** 12–18 syllables per bar +- **Rhyme Density:** Very high +- **Internal Rhyme Density:** Very high +- **Multisyllabic Rhyme Level:** Very high +- **Punchline Frequency:** 1 payoff every 3–4 bars +- **Wordplay Level:** High +- **Metaphor Density:** High +- **Vocabulary:** Advanced but natural +- **Storytelling Level:** Medium +- **Aggression:** Variable +- **Emotional Intensity:** Medium +- **Repetition:** Low +- **Flow Variation:** Dense but controlled pockets +- **Preferred Rhyme Schemes:** Multisyllabic chains, nested internal schemes, extended rhyme families +- **Bar Structure:** Layered clauses with consistent rhythm +- **Hook Compatibility:** Medium + +## Mandatory Writing Rules +- Use multisyllabic rhyme families across groups of 2–4 bars. +- Place at least two rhyme events in most bars. +- Maintain semantic coherence despite density. +- Prefer natural phrases over forced rhyme words. +- Vary rhyme placement between internal, medial, and end rhyme. +- Keep a discernible central idea in each 4-bar block. + +## Avoid +Word salad, forced rhymes, unnatural grammar, technicality without meaning + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Do most bars contain two or more rhyme events? +- [ ] Are rhyme chains sustained beyond a single couplet? +- [ ] Does every dense phrase still make sense? +- [ ] Would a skilled rapper be able to perform the wording naturally? +- [ ] Remove any line that exists only to satisfy a rhyme. + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/03_machine_gun_flow.md b/lyric_styles/hiphop_30/03_machine_gun_flow.md new file mode 100644 index 0000000..1778615 --- /dev/null +++ b/lyric_styles/hiphop_30/03_machine_gun_flow.md @@ -0,0 +1,70 @@ +# Machine Gun Flow + +## Purpose +Create relentless rapid-fire delivery using short rhythmic syllable clusters and tightly repeated cadence patterns. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** Extreme +- **Delivery Speed:** Very fast +- **Target Syllables:** 10–16 syllables per bar in compact clusters +- **Rhyme Density:** High +- **Internal Rhyme Density:** Very high +- **Multisyllabic Rhyme Level:** Medium-high +- **Punchline Frequency:** Medium +- **Wordplay Level:** Medium-high +- **Metaphor Density:** Medium +- **Vocabulary:** Compact and percussive +- **Storytelling Level:** Low-medium +- **Aggression:** High +- **Emotional Intensity:** High +- **Repetition:** Medium rhythmic repetition +- **Flow Variation:** Rapid repeating pockets with controlled resets +- **Preferred Rhyme Schemes:** Internal triplets, repeated consonant patterns, chained rhymes +- **Bar Structure:** Short bursts separated by tiny pauses +- **Hook Compatibility:** Medium + +## Mandatory Writing Rules +- Favor short words and consonant-heavy phrasing. +- Build bars from 2–4 rapid rhythmic clusters. +- Use repeated cadence patterns for 2–4 bars before switching. +- Insert occasional shorter reset bars for breath and contrast. +- Keep rhyme hits close together. + +## Avoid +Long vowels, slow phrases, long setup bars, excessive punctuation + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Does the verse support fast articulation? +- [ ] Are there clear recurring rhythmic pockets? +- [ ] Are long, sluggish phrases minimized? +- [ ] Does the flow reset before becoming monotonous? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/04_battle_rap.md b/lyric_styles/hiphop_30/04_battle_rap.md new file mode 100644 index 0000000..703ec4c --- /dev/null +++ b/lyric_styles/hiphop_30/04_battle_rap.md @@ -0,0 +1,70 @@ +# Battle Rap + +## Purpose +Create competitive rap built around setups, flips, layered punchlines, and rhetorical dominance. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** High +- **Delivery Speed:** Medium-fast +- **Target Syllables:** 9–15 syllables per bar +- **Rhyme Density:** High +- **Internal Rhyme Density:** High +- **Multisyllabic Rhyme Level:** High +- **Punchline Frequency:** At least 1 major punch every 2 bars +- **Wordplay Level:** Very high +- **Metaphor Density:** Very high +- **Vocabulary:** Sharp, specific, witty +- **Storytelling Level:** Low +- **Aggression:** Very high +- **Emotional Intensity:** High +- **Repetition:** Low +- **Flow Variation:** Varied to support setups and payoffs +- **Preferred Rhyme Schemes:** Couplets, extended schemes, setup/payoff pairs +- **Bar Structure:** Setup → tension → flip/punch +- **Hook Compatibility:** Low-medium + +## Mandatory Writing Rules +- Build clear setup/payoff relationships. +- Use double meanings, reversals, comparisons, or angle-based attacks. +- Make punchlines understandable on first listen but deeper on replay. +- Avoid generic insult filler. +- Use callbacks when possible. + +## Avoid +Generic threats, empty insults, random violence, weak comparisons, predictable punchlines + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Does every 2-bar unit contain tension or payoff? +- [ ] Are punches specific rather than generic? +- [ ] Is the wordplay understandable? +- [ ] Are there at least two layered lines per 8 bars? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/05_street_grit.md b/lyric_styles/hiphop_30/05_street_grit.md new file mode 100644 index 0000000..7cee711 --- /dev/null +++ b/lyric_styles/hiphop_30/05_street_grit.md @@ -0,0 +1,70 @@ +# Street Grit + +## Purpose +Create grounded, serious street-centered rap with believable details, restraint, and lived-in atmosphere. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** Medium-high +- **Delivery Speed:** Medium +- **Target Syllables:** 8–14 syllables per bar +- **Rhyme Density:** Medium-high +- **Internal Rhyme Density:** Medium +- **Multisyllabic Rhyme Level:** Medium +- **Punchline Frequency:** Low-medium +- **Wordplay Level:** Medium +- **Metaphor Density:** Medium +- **Vocabulary:** Direct, concrete, realistic +- **Storytelling Level:** High +- **Aggression:** Medium-high +- **Emotional Intensity:** High +- **Repetition:** Low +- **Flow Variation:** Steady and grounded +- **Preferred Rhyme Schemes:** ABAB, AABB, loose narrative rhyme +- **Bar Structure:** Scene/detail/consequence +- **Hook Compatibility:** High + +## Mandatory Writing Rules +- Use concrete environments, objects, sounds, and consequences. +- Prioritize believable details over exaggerated claims. +- Maintain a serious grounded voice. +- Include tension between ambition, pressure, loyalty, or consequence. +- Keep metaphors secondary to realism. + +## Avoid +Cartoonish criminal clichés, excessive glamorization, vague tough talk, melodrama + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Could the scene be visualized? +- [ ] Do details feel specific rather than generic? +- [ ] Is the tone serious and restrained? +- [ ] Does each section communicate consequence or pressure? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/06_boom_bap_classic.md b/lyric_styles/hiphop_30/06_boom_bap_classic.md new file mode 100644 index 0000000..7523d98 --- /dev/null +++ b/lyric_styles/hiphop_30/06_boom_bap_classic.md @@ -0,0 +1,70 @@ +# Boom Bap Classic + +## Purpose +Create classic head-nod rap with balanced bars, clear rhyme endings, strong cadence, and traditional verse craft. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** Medium-high +- **Delivery Speed:** Medium +- **Target Syllables:** 9–14 syllables per bar +- **Rhyme Density:** Medium-high +- **Internal Rhyme Density:** Medium-high +- **Multisyllabic Rhyme Level:** Medium +- **Punchline Frequency:** Medium +- **Wordplay Level:** High +- **Metaphor Density:** Medium-high +- **Vocabulary:** Classic lyrical, concrete +- **Storytelling Level:** Medium +- **Aggression:** Medium +- **Emotional Intensity:** Medium +- **Repetition:** Low-medium +- **Flow Variation:** Steady 4/4 pocket +- **Preferred Rhyme Schemes:** AABB, ABAB, AAAA sections +- **Bar Structure:** Balanced 4-bar phrases +- **Hook Compatibility:** High + +## Mandatory Writing Rules +- Use strong end-rhyme anchors. +- Structure ideas in 4-bar blocks. +- Include internal rhymes without overcrowding. +- Keep cadence suitable for a head-nod beat. +- Prioritize quotable bars and rhythmic clarity. + +## Avoid +Trap-style repetitive filler, overlong run-ons, excessive melodic phrasing + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Does each 4-bar block feel complete? +- [ ] Are end rhymes clearly audible? +- [ ] Would the bars sit naturally over a classic drum break? +- [ ] Is technicality balanced with clarity? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/07_underground_abstract.md b/lyric_styles/hiphop_30/07_underground_abstract.md new file mode 100644 index 0000000..fc2d11f --- /dev/null +++ b/lyric_styles/hiphop_30/07_underground_abstract.md @@ -0,0 +1,70 @@ +# Underground Abstract + +## Purpose +Create unconventional, cerebral rap using surreal imagery, layered symbolism, and unpredictable associative writing. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** Medium +- **Delivery Speed:** Variable +- **Target Syllables:** 8–16 syllables per bar +- **Rhyme Density:** High +- **Internal Rhyme Density:** High +- **Multisyllabic Rhyme Level:** High +- **Punchline Frequency:** Low-medium +- **Wordplay Level:** Very high +- **Metaphor Density:** Very high +- **Vocabulary:** Unusual, vivid, intelligent +- **Storytelling Level:** Low-medium +- **Aggression:** Variable +- **Emotional Intensity:** Medium-high +- **Repetition:** Very low +- **Flow Variation:** Unpredictable but deliberate +- **Preferred Rhyme Schemes:** Slant rhyme, internal webs, non-obvious extended schemes +- **Bar Structure:** Associative images linked by theme +- **Hook Compatibility:** Low-medium + +## Mandatory Writing Rules +- Use unusual but interpretable imagery. +- Link abstract lines through a shared emotional or conceptual thread. +- Favor slant rhyme and internal rhyme over obvious couplets. +- Allow ambiguity without losing coherence. +- Use surprising nouns, verbs, and image combinations. + +## Avoid +Random nonsense, fake profundity, thesaurus dumping, incoherent symbolism + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Is there a hidden thematic thread? +- [ ] Are images surprising but meaningful? +- [ ] Does abstraction feel intentional rather than random? +- [ ] Are obvious clichés minimized? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/08_chilled_flow.md b/lyric_styles/hiphop_30/08_chilled_flow.md new file mode 100644 index 0000000..3a03255 --- /dev/null +++ b/lyric_styles/hiphop_30/08_chilled_flow.md @@ -0,0 +1,70 @@ +# Chilled Flow + +## Purpose +Create relaxed, effortless rap with conversational phrasing, space, and smooth rhythmic movement. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** Low-medium +- **Delivery Speed:** Slow-medium +- **Target Syllables:** 7–12 syllables per bar +- **Rhyme Density:** Medium +- **Internal Rhyme Density:** Medium +- **Multisyllabic Rhyme Level:** Low-medium +- **Punchline Frequency:** Low +- **Wordplay Level:** Medium +- **Metaphor Density:** Medium +- **Vocabulary:** Natural, conversational +- **Storytelling Level:** Medium +- **Aggression:** Low +- **Emotional Intensity:** Medium-high +- **Repetition:** Medium +- **Flow Variation:** Laid-back with delayed entrances and space +- **Preferred Rhyme Schemes:** Loose AABB/ABAB, slant rhyme +- **Bar Structure:** Longer phrasing with breathing room +- **Hook Compatibility:** Very high + +## Mandatory Writing Rules +- Leave rhythmic space between ideas. +- Use conversational syntax. +- Keep rhyme placement smooth rather than obvious. +- Favor atmosphere and feeling over density. +- Allow a few simple repeated phrases. + +## Avoid +Overstuffed bars, constant punchlines, hyperactive rhyme chains, aggressive delivery + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Does the verse feel effortless rather than technically crowded? +- [ ] Are there enough pauses and open spaces? +- [ ] Does the language sound natural when spoken? +- [ ] Is the mood consistent? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/09_smooth_storyteller.md b/lyric_styles/hiphop_30/09_smooth_storyteller.md new file mode 100644 index 0000000..c12ec76 --- /dev/null +++ b/lyric_styles/hiphop_30/09_smooth_storyteller.md @@ -0,0 +1,70 @@ +# Smooth Storyteller + +## Purpose +Tell a vivid narrative with clear characters, settings, progression, and an emotionally satisfying arc. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** Medium +- **Delivery Speed:** Medium +- **Target Syllables:** 9–15 syllables per bar +- **Rhyme Density:** Medium +- **Internal Rhyme Density:** Medium +- **Multisyllabic Rhyme Level:** Medium +- **Punchline Frequency:** Low +- **Wordplay Level:** Medium +- **Metaphor Density:** Medium +- **Vocabulary:** Visual and natural +- **Storytelling Level:** Very high +- **Aggression:** Variable +- **Emotional Intensity:** High +- **Repetition:** Low +- **Flow Variation:** Smooth and consistent +- **Preferred Rhyme Schemes:** Loose narrative rhyme, ABAB, slant rhyme +- **Bar Structure:** Scene → action → consequence → reflection +- **Hook Compatibility:** High + +## Mandatory Writing Rules +- Establish who, where, and what early. +- Advance the narrative every 2–4 bars. +- Use sensory details. +- Maintain point of view. +- End sections with consequences, realizations, or turning points. + +## Avoid +Plot jumps, unexplained characters, excessive technical rhyming, unrelated flex bars + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Can the listener follow the story without explanation? +- [ ] Does every 4-bar section move the plot forward? +- [ ] Are characters and locations clear? +- [ ] Does the ending connect to the opening? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/10_punchline_heavy.md b/lyric_styles/hiphop_30/10_punchline_heavy.md new file mode 100644 index 0000000..ff231de --- /dev/null +++ b/lyric_styles/hiphop_30/10_punchline_heavy.md @@ -0,0 +1,70 @@ +# Punchline Heavy + +## Purpose +Produce a high concentration of quotable lines, flips, comparisons, jokes, and clever payoffs. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** High +- **Delivery Speed:** Medium-fast +- **Target Syllables:** 8–14 syllables per bar +- **Rhyme Density:** High +- **Internal Rhyme Density:** High +- **Multisyllabic Rhyme Level:** Medium-high +- **Punchline Frequency:** At least 1 notable punch every 1–2 bars +- **Wordplay Level:** Very high +- **Metaphor Density:** Very high +- **Vocabulary:** Compact and precise +- **Storytelling Level:** Low +- **Aggression:** Medium-high +- **Emotional Intensity:** Medium +- **Repetition:** Very low +- **Flow Variation:** Built to emphasize payoffs +- **Preferred Rhyme Schemes:** Couplets and setup/payoff chains +- **Bar Structure:** Setup → punch, or standalone quotable bar +- **Hook Compatibility:** Medium + +## Mandatory Writing Rules +- Deliver frequent standalone quotables. +- Use comparisons, reversals, double meanings, or unexpected endings. +- Keep setups short. +- Make payoffs land on strong rhythmic positions. +- Avoid repeating the same wordplay mechanism too often. + +## Avoid +Long narratives, filler setup, predictable similes, recycled clichés + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Is there a quotable line at least every 2 bars? +- [ ] Are punches varied in mechanism? +- [ ] Can weak setup bars be shortened? +- [ ] Do punchlines land clearly? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/11_wordplay_technician.md b/lyric_styles/hiphop_30/11_wordplay_technician.md new file mode 100644 index 0000000..a8bc163 --- /dev/null +++ b/lyric_styles/hiphop_30/11_wordplay_technician.md @@ -0,0 +1,70 @@ +# Wordplay Technician + +## Purpose +Center the verse on linguistic manipulation: homophones, doubles, semantic flips, compound meanings, and layered phrasing. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** Medium-high +- **Delivery Speed:** Medium-fast +- **Target Syllables:** 9–15 syllables per bar +- **Rhyme Density:** High +- **Internal Rhyme Density:** High +- **Multisyllabic Rhyme Level:** High +- **Punchline Frequency:** High +- **Wordplay Level:** Extreme +- **Metaphor Density:** High +- **Vocabulary:** Precise and flexible +- **Storytelling Level:** Low-medium +- **Aggression:** Variable +- **Emotional Intensity:** Medium +- **Repetition:** Low +- **Flow Variation:** Clear enough to preserve entendres +- **Preferred Rhyme Schemes:** Extended rhyme families, homophone chains +- **Bar Structure:** Setup → linguistic pivot → payoff +- **Hook Compatibility:** Medium + +## Mandatory Writing Rules +- Use at least one meaningful wordplay device every 2 bars. +- Prefer double meanings that work grammatically in both interpretations. +- Combine rhyme and semantic play where possible. +- Use callbacks to earlier word choices. +- Keep the surface meaning coherent. + +## Avoid +Unclear puns, forced homophones, random dictionary words, wordplay that breaks syntax + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Does each key wordplay line have a clear surface meaning? +- [ ] Is the second meaning discoverable? +- [ ] Are homophones natural? +- [ ] Are devices varied rather than repeated mechanically? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/12_internal_rhyme_heavy.md b/lyric_styles/hiphop_30/12_internal_rhyme_heavy.md new file mode 100644 index 0000000..83286f8 --- /dev/null +++ b/lyric_styles/hiphop_30/12_internal_rhyme_heavy.md @@ -0,0 +1,70 @@ +# Internal Rhyme Heavy + +## Purpose +Create verses where rhyme movement happens continuously inside the bar, not only at the line endings. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** Medium-high +- **Delivery Speed:** Medium-fast +- **Target Syllables:** 11–17 syllables per bar +- **Rhyme Density:** Very high +- **Internal Rhyme Density:** Extreme +- **Multisyllabic Rhyme Level:** High +- **Punchline Frequency:** Medium +- **Wordplay Level:** High +- **Metaphor Density:** Medium-high +- **Vocabulary:** Flexible +- **Storytelling Level:** Medium +- **Aggression:** Variable +- **Emotional Intensity:** Medium +- **Repetition:** Low +- **Flow Variation:** Rolling and continuous +- **Preferred Rhyme Schemes:** Internal chains, mirrored rhyme placement, multi-rhyme bars +- **Bar Structure:** At least 2 internal rhyme events plus optional end rhyme +- **Hook Compatibility:** Medium + +## Mandatory Writing Rules +- Place at least two rhyme events inside most bars. +- Continue at least one internal rhyme family across adjacent bars. +- Vary rhyme position. +- Use slant rhyme where exact rhyme would sound forced. +- Keep syntax natural. + +## Avoid +End-rhyme-only writing, forced alliteration, meaningless rhyme stuffing + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Do most bars rhyme internally before the final word? +- [ ] Do internal patterns continue across bars? +- [ ] Are rhymes natural enough to speak smoothly? +- [ ] Is meaning preserved? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/13_multisyllabic_master.md b/lyric_styles/hiphop_30/13_multisyllabic_master.md new file mode 100644 index 0000000..0b81a5c --- /dev/null +++ b/lyric_styles/hiphop_30/13_multisyllabic_master.md @@ -0,0 +1,70 @@ +# Multisyllabic Master + +## Purpose +Build sophisticated extended rhyme families using multiple syllables while maintaining natural phrasing and meaning. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** Medium-high +- **Delivery Speed:** Medium-fast +- **Target Syllables:** 10–17 syllables per bar +- **Rhyme Density:** High +- **Internal Rhyme Density:** High +- **Multisyllabic Rhyme Level:** Extreme +- **Punchline Frequency:** Medium +- **Wordplay Level:** High +- **Metaphor Density:** High +- **Vocabulary:** Advanced but fluent +- **Storytelling Level:** Medium +- **Aggression:** Variable +- **Emotional Intensity:** Medium +- **Repetition:** Low +- **Flow Variation:** Controlled and technical +- **Preferred Rhyme Schemes:** 3–6 syllable rhyme families sustained over 2–6 bars +- **Bar Structure:** Extended rhyme families with natural sentence flow +- **Hook Compatibility:** Medium + +## Mandatory Writing Rules +- Use multi-syllable rhyme families as primary anchors. +- Sustain key rhyme families for multiple bars. +- Allow near-rhyme when it improves naturalness. +- Match stress patterns, not spelling. +- Keep content coherent. + +## Avoid +Single-syllable rhyme dependence, forced pronunciation, nonsense rhyme phrases + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Are core rhyme anchors at least 2–3 syllables? +- [ ] Do rhyme families continue across several bars? +- [ ] Would pronunciation remain natural? +- [ ] Does meaning stay stronger than rhyme gimmicks? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/14_flow_switcher.md b/lyric_styles/hiphop_30/14_flow_switcher.md new file mode 100644 index 0000000..d485bcd --- /dev/null +++ b/lyric_styles/hiphop_30/14_flow_switcher.md @@ -0,0 +1,69 @@ +# Flow Switcher + +## Purpose +Create verses that deliberately change cadence, syllable count, rhyme placement, and rhythmic pocket several times. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** High +- **Delivery Speed:** Variable +- **Target Syllables:** 6–18 syllables depending on section +- **Rhyme Density:** High +- **Internal Rhyme Density:** High +- **Multisyllabic Rhyme Level:** Medium-high +- **Punchline Frequency:** Medium-high +- **Wordplay Level:** High +- **Metaphor Density:** Medium +- **Vocabulary:** Adaptive +- **Storytelling Level:** Medium +- **Aggression:** Medium-high +- **Emotional Intensity:** High +- **Repetition:** Low-medium +- **Flow Variation:** Core defining feature: switch every 2–8 bars +- **Preferred Rhyme Schemes:** Changes with each pocket +- **Bar Structure:** Distinct rhythmic sections with deliberate transitions +- **Hook Compatibility:** High + +## Mandatory Writing Rules +- Use at least 3 distinct flow pockets in a 16-bar verse. +- Change at least two variables per switch: syllable count, pause placement, rhyme density, or sentence length. +- Signal transitions with a punch, pause, pickup, or repeated phrase. +- Let each pocket establish itself before switching again. + +## Avoid +Random switching without contrast, switching every single bar, losing musical coherence + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Can at least 3 different rhythmic pockets be identified? +- [ ] Do switches feel intentional? +- [ ] Does each new pocket contrast with the last? +- [ ] Does the verse remain musically coherent? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/15_staccato_rap.md b/lyric_styles/hiphop_30/15_staccato_rap.md new file mode 100644 index 0000000..812a16f --- /dev/null +++ b/lyric_styles/hiphop_30/15_staccato_rap.md @@ -0,0 +1,70 @@ +# Staccato Rap + +## Purpose +Create clipped, percussive rap using short phrases, hard stops, and rhythmic negative space. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** High +- **Delivery Speed:** Medium-fast +- **Target Syllables:** 4–10 syllables per phrase/bar +- **Rhyme Density:** Medium-high +- **Internal Rhyme Density:** Medium +- **Multisyllabic Rhyme Level:** Low-medium +- **Punchline Frequency:** High +- **Wordplay Level:** Medium-high +- **Metaphor Density:** Medium +- **Vocabulary:** Short, hard, concrete +- **Storytelling Level:** Low +- **Aggression:** High +- **Emotional Intensity:** High +- **Repetition:** Medium +- **Flow Variation:** Clipped and syncopated +- **Preferred Rhyme Schemes:** Short couplets, repeated end sounds +- **Bar Structure:** Fragment / stop / fragment / stop +- **Hook Compatibility:** High + +## Mandatory Writing Rules +- Use short clauses and deliberate stops. +- Favor one- and two-syllable impact words. +- Leave visible rhythmic space. +- Use repetition as percussion. +- Keep each phrase easy to accent. + +## Avoid +Long run-on sentences, soft phrasing, excessive descriptive clauses + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Can the verse be performed with hard stops? +- [ ] Are phrases short enough to hit like percussion? +- [ ] Is negative space preserved? +- [ ] Are repeated words rhythmic rather than redundant? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/16_run_on_flow.md b/lyric_styles/hiphop_30/16_run_on_flow.md new file mode 100644 index 0000000..1bec75b --- /dev/null +++ b/lyric_styles/hiphop_30/16_run_on_flow.md @@ -0,0 +1,70 @@ +# Run-On Flow + +## Purpose +Create continuous thought streams that spill across bar lines while maintaining internal rhyme and momentum. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** Medium-high +- **Delivery Speed:** Medium-fast +- **Target Syllables:** 12–18 syllables per bar +- **Rhyme Density:** High +- **Internal Rhyme Density:** High +- **Multisyllabic Rhyme Level:** High +- **Punchline Frequency:** Medium +- **Wordplay Level:** High +- **Metaphor Density:** High +- **Vocabulary:** Fluid, conversational +- **Storytelling Level:** Medium-high +- **Aggression:** Variable +- **Emotional Intensity:** High +- **Repetition:** Low +- **Flow Variation:** Continuous enjambment +- **Preferred Rhyme Schemes:** Internal rhyme chains crossing line boundaries +- **Bar Structure:** Sentences span 2–6 bars +- **Hook Compatibility:** Medium + +## Mandatory Writing Rules +- Carry syntax across bar boundaries. +- Use internal rhymes to maintain musical structure. +- Delay sentence resolution for tension. +- End longer thought chains with a strong payoff. +- Keep each run-on sequence coherent. + +## Avoid +Every bar ending as a complete sentence, choppy punctuation, meaningless rambling + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Do sentences regularly cross bar lines? +- [ ] Does momentum remain clear? +- [ ] Are rhyme cues present even without end-stops? +- [ ] Does each long thought eventually resolve? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/17_dark_cinematic.md b/lyric_styles/hiphop_30/17_dark_cinematic.md new file mode 100644 index 0000000..81db9c9 --- /dev/null +++ b/lyric_styles/hiphop_30/17_dark_cinematic.md @@ -0,0 +1,70 @@ +# Dark Cinematic + +## Purpose +Create ominous, visual rap with dramatic tension, environmental detail, and a film-like sense of progression. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** Medium +- **Delivery Speed:** Slow-medium +- **Target Syllables:** 8–14 syllables per bar +- **Rhyme Density:** Medium-high +- **Internal Rhyme Density:** Medium +- **Multisyllabic Rhyme Level:** Medium +- **Punchline Frequency:** Low-medium +- **Wordplay Level:** Medium-high +- **Metaphor Density:** High +- **Vocabulary:** Visual, cold, atmospheric +- **Storytelling Level:** High +- **Aggression:** Medium-high +- **Emotional Intensity:** High +- **Repetition:** Low +- **Flow Variation:** Measured and dramatic +- **Preferred Rhyme Schemes:** Dark slant rhymes, slow couplets, internal echoes +- **Bar Structure:** Image → tension → escalation → consequence +- **Hook Compatibility:** High + +## Mandatory Writing Rules +- Use sensory environmental details. +- Build tension gradually. +- Maintain a consistent visual palette. +- Use metaphor to deepen atmosphere rather than replace it. +- End sections with a reveal, consequence, or ominous image. + +## Avoid +Cheap horror clichés, random gore, overexplaining the mood, generic darkness + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Can each section be pictured like a scene? +- [ ] Does tension increase? +- [ ] Is the mood consistent? +- [ ] Are dark elements specific rather than generic? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/18_introspective.md b/lyric_styles/hiphop_30/18_introspective.md new file mode 100644 index 0000000..bfa663f --- /dev/null +++ b/lyric_styles/hiphop_30/18_introspective.md @@ -0,0 +1,70 @@ +# Introspective + +## Purpose +Create emotionally detailed rap centered on reflection, contradiction, memory, ambition, regret, and self-examination. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** Low-medium +- **Delivery Speed:** Slow-medium +- **Target Syllables:** 8–15 syllables per bar +- **Rhyme Density:** Medium +- **Internal Rhyme Density:** Medium +- **Multisyllabic Rhyme Level:** Medium +- **Punchline Frequency:** Low +- **Wordplay Level:** Medium +- **Metaphor Density:** High +- **Vocabulary:** Personal and precise +- **Storytelling Level:** High +- **Aggression:** Low-medium +- **Emotional Intensity:** Very high +- **Repetition:** Low-medium +- **Flow Variation:** Natural and reflective +- **Preferred Rhyme Schemes:** Loose rhyme, slant rhyme, occasional multis +- **Bar Structure:** Memory → feeling → contradiction → insight +- **Hook Compatibility:** Very high + +## Mandatory Writing Rules +- Use specific memories or details. +- Show internal contradiction. +- Allow vulnerability without overexplaining. +- Turn observations into insight. +- Use emotional callbacks. + +## Avoid +Generic motivational clichés, empty sadness, melodrama, vague self-help language + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Are emotions grounded in concrete details? +- [ ] Is there an internal conflict? +- [ ] Does the verse reveal something rather than merely state a feeling? +- [ ] Are clichés minimized? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/19_conscious_rap.md b/lyric_styles/hiphop_30/19_conscious_rap.md new file mode 100644 index 0000000..e3beb54 --- /dev/null +++ b/lyric_styles/hiphop_30/19_conscious_rap.md @@ -0,0 +1,70 @@ +# Conscious Rap + +## Purpose +Explore social, cultural, economic, or philosophical ideas through strong arguments, vivid examples, and human-centered writing. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** Medium +- **Delivery Speed:** Medium +- **Target Syllables:** 9–16 syllables per bar +- **Rhyme Density:** Medium-high +- **Internal Rhyme Density:** Medium +- **Multisyllabic Rhyme Level:** Medium-high +- **Punchline Frequency:** Medium +- **Wordplay Level:** High +- **Metaphor Density:** High +- **Vocabulary:** Clear, intelligent +- **Storytelling Level:** High +- **Aggression:** Variable +- **Emotional Intensity:** High +- **Repetition:** Low +- **Flow Variation:** Measured and articulate +- **Preferred Rhyme Schemes:** Narrative rhyme, argument-based couplets +- **Bar Structure:** Claim → image/example → tension → reflection +- **Hook Compatibility:** High + +## Mandatory Writing Rules +- Ground larger ideas in specific human examples. +- Present tension or complexity instead of simple slogans. +- Use imagery and narrative to carry arguments. +- Keep claims internally consistent. +- Favor questions and observations over sermons. + +## Avoid +Lecturing, slogan-only writing, fake statistics, oversimplified morality, preachiness + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Does each major idea have an example or image? +- [ ] Is the writing nuanced rather than preachy? +- [ ] Are unsupported factual claims avoided? +- [ ] Does the song remain musical? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/20_braggadocious.md b/lyric_styles/hiphop_30/20_braggadocious.md new file mode 100644 index 0000000..53e13d4 --- /dev/null +++ b/lyric_styles/hiphop_30/20_braggadocious.md @@ -0,0 +1,70 @@ +# Braggadocious + +## Purpose +Create confident, competitive rap built around dominance, status, skill, exaggeration, and quotable flexes. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** High +- **Delivery Speed:** Medium-fast +- **Target Syllables:** 8–14 syllables per bar +- **Rhyme Density:** High +- **Internal Rhyme Density:** High +- **Multisyllabic Rhyme Level:** Medium-high +- **Punchline Frequency:** High +- **Wordplay Level:** High +- **Metaphor Density:** Very high +- **Vocabulary:** Bold, vivid +- **Storytelling Level:** Low +- **Aggression:** High +- **Emotional Intensity:** Medium-high +- **Repetition:** Low-medium +- **Flow Variation:** Confident and commanding +- **Preferred Rhyme Schemes:** Couplets, extended flex rhyme chains +- **Bar Structure:** Claim → image/comparison → escalation +- **Hook Compatibility:** High + +## Mandatory Writing Rules +- Support boasts with vivid comparisons. +- Escalate imagery rather than repeat the same flex. +- Use technical skill as part of the confidence. +- Make at least one quotable claim every 2 bars. +- Vary status, skill, resilience, and presence as flex categories. + +## Avoid +Generic money/car/jewelry lists, empty boasting, repeated status claims + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Are boasts specific and memorable? +- [ ] Is imagery varied? +- [ ] Does confidence come through rhythm as well as words? +- [ ] Are generic flex clichés minimized? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/21_minimalist_menace.md b/lyric_styles/hiphop_30/21_minimalist_menace.md new file mode 100644 index 0000000..af410b8 --- /dev/null +++ b/lyric_styles/hiphop_30/21_minimalist_menace.md @@ -0,0 +1,70 @@ +# Minimalist Menace + +## Purpose +Create sparse, intimidating rap where short lines, silence, repetition, and understatement carry the weight. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** Medium-high +- **Delivery Speed:** Slow-medium +- **Target Syllables:** 3–9 syllables per bar +- **Rhyme Density:** Low-medium +- **Internal Rhyme Density:** Low-medium +- **Multisyllabic Rhyme Level:** Low +- **Punchline Frequency:** High +- **Wordplay Level:** Medium +- **Metaphor Density:** Low-medium +- **Vocabulary:** Simple, hard, restrained +- **Storytelling Level:** Low +- **Aggression:** High +- **Emotional Intensity:** Cold +- **Repetition:** High but controlled +- **Flow Variation:** Sparse and deliberate +- **Preferred Rhyme Schemes:** Simple rhyme anchors, repetition, sonic motifs +- **Bar Structure:** Short statement → silence → short statement +- **Hook Compatibility:** Very high + +## Mandatory Writing Rules +- Keep most lines short. +- Use repetition strategically. +- Let implication carry more than explanation. +- Prioritize rhythm and silence. +- Use one strong image instead of several weak ones. + +## Avoid +Dense rhyme webs, long explanations, over-describing threats, constant metaphors + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Can words be removed without weakening impact? +- [ ] Does silence feel intentional? +- [ ] Is repetition memorable rather than lazy? +- [ ] Does the tone remain controlled? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/22_chaotic_energy.md b/lyric_styles/hiphop_30/22_chaotic_energy.md new file mode 100644 index 0000000..82b61f2 --- /dev/null +++ b/lyric_styles/hiphop_30/22_chaotic_energy.md @@ -0,0 +1,70 @@ +# Chaotic Energy + +## Purpose +Create high-volatility rap with abrupt pivots, wild imagery, ad-libs, and rapid rhythmic changes while preserving intentional structure. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** Extreme +- **Delivery Speed:** Variable-fast +- **Target Syllables:** 5–18 syllables per bar +- **Rhyme Density:** High +- **Internal Rhyme Density:** High +- **Multisyllabic Rhyme Level:** Medium +- **Punchline Frequency:** High +- **Wordplay Level:** High +- **Metaphor Density:** Very high +- **Vocabulary:** Unpredictable and vivid +- **Storytelling Level:** Low +- **Aggression:** High +- **Emotional Intensity:** Extreme +- **Repetition:** Medium +- **Flow Variation:** Rapid switches and interruptions +- **Preferred Rhyme Schemes:** Broken schemes, sudden rhyme bursts, repeated sonic motifs +- **Bar Structure:** Burst → pivot → ad-lib → punch +- **Hook Compatibility:** High + +## Mandatory Writing Rules +- Change cadence or image direction every 2–4 bars. +- Maintain one recurring sonic or thematic anchor. +- Use controlled interruptions and ad-libs. +- Include sudden short bars after dense bars. +- Keep each pivot connected by sound, emotion, or theme. + +## Avoid +Pure randomness, incoherent nonsense, identical energy throughout, endless ad-libs + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Is chaos structured by a recurring anchor? +- [ ] Do flow changes feel exciting rather than accidental? +- [ ] Are there contrast points? +- [ ] Can the listener still identify the song's identity? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/23_melodic_rap.md b/lyric_styles/hiphop_30/23_melodic_rap.md new file mode 100644 index 0000000..70923fe --- /dev/null +++ b/lyric_styles/hiphop_30/23_melodic_rap.md @@ -0,0 +1,70 @@ +# Melodic Rap + +## Purpose +Create rap lyrics that naturally support melodic phrasing, emotional repetition, and smooth transitions into sung hooks. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** Medium +- **Delivery Speed:** Slow-medium +- **Target Syllables:** 6–12 syllables per bar +- **Rhyme Density:** Medium +- **Internal Rhyme Density:** Low-medium +- **Multisyllabic Rhyme Level:** Low-medium +- **Punchline Frequency:** Low +- **Wordplay Level:** Medium +- **Metaphor Density:** Medium-high +- **Vocabulary:** Simple, emotive +- **Storytelling Level:** Medium +- **Aggression:** Low-medium +- **Emotional Intensity:** Very high +- **Repetition:** High +- **Flow Variation:** Smooth and vowel-friendly +- **Preferred Rhyme Schemes:** Simple couplets, repeated rhyme anchors +- **Bar Structure:** Short melodic phrases with open vowels +- **Hook Compatibility:** Extreme + +## Mandatory Writing Rules +- Favor vowel-rich phrases. +- Use repeated emotional anchor lines. +- Keep syntax singable. +- Build verses toward the hook concept. +- Use simple but specific images. + +## Avoid +Overly dense rhyme chains, difficult consonant clusters, overly technical vocabulary + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Can key lines be easily sung? +- [ ] Are hooks memorable after one read? +- [ ] Are vowel sounds smooth? +- [ ] Does repetition reinforce emotion? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/24_hook_driven.md b/lyric_styles/hiphop_30/24_hook_driven.md new file mode 100644 index 0000000..f774ed2 --- /dev/null +++ b/lyric_styles/hiphop_30/24_hook_driven.md @@ -0,0 +1,70 @@ +# Hook Driven + +## Purpose +Build the song around a highly memorable central phrase, with verses designed to reinforce and set up the hook. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** Variable +- **Delivery Speed:** Variable +- **Target Syllables:** 6–13 syllables per bar +- **Rhyme Density:** Medium +- **Internal Rhyme Density:** Medium +- **Multisyllabic Rhyme Level:** Low-medium +- **Punchline Frequency:** Medium +- **Wordplay Level:** Medium +- **Metaphor Density:** Medium +- **Vocabulary:** Simple and memorable +- **Storytelling Level:** Medium +- **Aggression:** Variable +- **Emotional Intensity:** High +- **Repetition:** Very high in hook, low-medium in verses +- **Flow Variation:** Designed around hook payoff +- **Preferred Rhyme Schemes:** Simple repeatable patterns +- **Bar Structure:** Verse setup → pre-hook lift → repeated hook +- **Hook Compatibility:** Extreme + +## Mandatory Writing Rules +- Define one central hook phrase. +- Repeat or vary that phrase strategically. +- Make verses point toward the hook's idea. +- Use simple rhythmic wording in the chorus. +- Keep hook language easy to remember. + +## Avoid +Complex hooks, too many hook concepts, verses unrelated to refrain + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Can the hook be remembered after one reading? +- [ ] Is there only one main hook concept? +- [ ] Do verses reinforce the hook? +- [ ] Is chorus wording simpler than verse wording? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/25_freestyle_feel.md b/lyric_styles/hiphop_30/25_freestyle_feel.md new file mode 100644 index 0000000..eb169c9 --- /dev/null +++ b/lyric_styles/hiphop_30/25_freestyle_feel.md @@ -0,0 +1,70 @@ +# Freestyle Feel + +## Purpose +Create writing that sounds spontaneous, conversational, associative, and alive without becoming sloppy or directionless. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** Medium-high +- **Delivery Speed:** Variable +- **Target Syllables:** 7–15 syllables per bar +- **Rhyme Density:** Medium-high +- **Internal Rhyme Density:** Medium-high +- **Multisyllabic Rhyme Level:** Medium +- **Punchline Frequency:** Medium-high +- **Wordplay Level:** High +- **Metaphor Density:** Medium +- **Vocabulary:** Conversational +- **Storytelling Level:** Low-medium +- **Aggression:** Variable +- **Emotional Intensity:** Medium +- **Repetition:** Low-medium +- **Flow Variation:** Loose but rhythmic +- **Preferred Rhyme Schemes:** Flexible and changing +- **Bar Structure:** Thought → association → pivot → punch +- **Hook Compatibility:** Low-medium + +## Mandatory Writing Rules +- Use natural speech rhythms. +- Allow topic pivots through word association. +- Keep some imperfect or near rhymes. +- Include spontaneous-feeling asides. +- Maintain an underlying rhythmic pocket. + +## Avoid +Perfectly symmetrical writing, overly polished transitions, incoherent rambling + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Does the verse sound like it could be improvised? +- [ ] Are pivots natural? +- [ ] Is polish low enough to feel spontaneous but high enough to remain coherent? +- [ ] Does rhythm survive loose structure? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/26_complex_schemes.md b/lyric_styles/hiphop_30/26_complex_schemes.md new file mode 100644 index 0000000..2108758 --- /dev/null +++ b/lyric_styles/hiphop_30/26_complex_schemes.md @@ -0,0 +1,70 @@ +# Complex Schemes + +## Purpose +Create intentionally engineered rhyme architecture using extended, nested, mirrored, and changing schemes. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** Medium-high +- **Delivery Speed:** Medium-fast +- **Target Syllables:** 10–17 syllables per bar +- **Rhyme Density:** Very high +- **Internal Rhyme Density:** Very high +- **Multisyllabic Rhyme Level:** Very high +- **Punchline Frequency:** Medium +- **Wordplay Level:** High +- **Metaphor Density:** Medium-high +- **Vocabulary:** Advanced but natural +- **Storytelling Level:** Medium +- **Aggression:** Variable +- **Emotional Intensity:** Medium +- **Repetition:** Low +- **Flow Variation:** Technical but musical +- **Preferred Rhyme Schemes:** ABAB, AAAA, AABB, nested A1/A2 internals, alternating families +- **Bar Structure:** Designed rhyme map across 4–8 bars +- **Hook Compatibility:** Low-medium + +## Mandatory Writing Rules +- Plan a rhyme architecture before generating each section. +- Use at least two active rhyme families in an 8-bar block. +- Include internal and end-rhyme interplay. +- Change scheme deliberately at section boundaries. +- Preserve sentence clarity. + +## Avoid +Random rhyme accumulation, schemes that obscure meaning, forced syntax + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Can the rhyme scheme be mapped clearly? +- [ ] Does the architecture continue beyond 2 bars? +- [ ] Are transitions between schemes intentional? +- [ ] Does meaning remain natural? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/27_double_time_technical.md b/lyric_styles/hiphop_30/27_double_time_technical.md new file mode 100644 index 0000000..2322af1 --- /dev/null +++ b/lyric_styles/hiphop_30/27_double_time_technical.md @@ -0,0 +1,70 @@ +# Double-Time Technical + +## Purpose +Create very fast but highly controlled rap with consistent syllable counts, dense internal rhyme, and disciplined rhythmic pockets. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** Very high +- **Delivery Speed:** Double-time +- **Target Syllables:** 13–19 syllables per bar +- **Rhyme Density:** Very high +- **Internal Rhyme Density:** Very high +- **Multisyllabic Rhyme Level:** High +- **Punchline Frequency:** Medium-high +- **Wordplay Level:** High +- **Metaphor Density:** Medium +- **Vocabulary:** Compact and technical +- **Storytelling Level:** Low-medium +- **Aggression:** High +- **Emotional Intensity:** High +- **Repetition:** Low +- **Flow Variation:** Tightly metered double-time +- **Preferred Rhyme Schemes:** Internal multis, repeated triplet or 16th-note pockets +- **Bar Structure:** Consistent syllable grids with controlled variation +- **Hook Compatibility:** Medium + +## Mandatory Writing Rules +- Keep adjacent bars within a narrow syllable range. +- Use internal rhymes as timing anchors. +- Break long words across natural stress groups. +- Insert occasional breath/reset bars. +- Maintain semantic clarity at speed. + +## Avoid +Unperformable tongue-twisters, huge syllable swings, filler words used for meter + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Are syllable counts reasonably consistent? +- [ ] Can the bars be delivered quickly without unnatural stress? +- [ ] Do internal rhymes support timing? +- [ ] Are breath points available? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/28_slow_heavy_bars.md b/lyric_styles/hiphop_30/28_slow_heavy_bars.md new file mode 100644 index 0000000..4941fa5 --- /dev/null +++ b/lyric_styles/hiphop_30/28_slow_heavy_bars.md @@ -0,0 +1,70 @@ +# Slow Heavy Bars + +## Purpose +Create deliberate, weighty rap where fewer words carry more meaning and each line is designed to linger. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** Medium +- **Delivery Speed:** Slow +- **Target Syllables:** 5–11 syllables per bar +- **Rhyme Density:** Low-medium +- **Internal Rhyme Density:** Low-medium +- **Multisyllabic Rhyme Level:** Low-medium +- **Punchline Frequency:** High +- **Wordplay Level:** High +- **Metaphor Density:** High +- **Vocabulary:** Sparse, precise +- **Storytelling Level:** Medium +- **Aggression:** Medium-high +- **Emotional Intensity:** High +- **Repetition:** Low +- **Flow Variation:** Slow, deliberate, spacious +- **Preferred Rhyme Schemes:** Simple powerful rhyme anchors +- **Bar Structure:** Statement → pause → consequence +- **Hook Compatibility:** High + +## Mandatory Writing Rules +- Keep bars concise. +- Make each line carry a clear image, claim, or consequence. +- Use silence and space as part of the rhythm. +- Favor strong nouns and verbs. +- End sections with quotable lines. + +## Avoid +Overwriting, filler adjectives, dense internal rhymes, rushed ideas + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Does every bar earn its place? +- [ ] Can any unnecessary word be removed? +- [ ] Are impact lines given room? +- [ ] Does the verse feel heavy rather than empty? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/29_psychedelic_rap.md b/lyric_styles/hiphop_30/29_psychedelic_rap.md new file mode 100644 index 0000000..eba7259 --- /dev/null +++ b/lyric_styles/hiphop_30/29_psychedelic_rap.md @@ -0,0 +1,70 @@ +# Psychedelic Rap + +## Purpose +Create dreamlike, surreal rap using altered perception, sensory fusion, impossible imagery, and fluid associative transitions. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** Medium +- **Delivery Speed:** Variable +- **Target Syllables:** 8–16 syllables per bar +- **Rhyme Density:** Medium-high +- **Internal Rhyme Density:** High +- **Multisyllabic Rhyme Level:** Medium-high +- **Punchline Frequency:** Low-medium +- **Wordplay Level:** Very high +- **Metaphor Density:** Extreme +- **Vocabulary:** Surreal, colorful, sensory +- **Storytelling Level:** Low-medium +- **Aggression:** Low-medium +- **Emotional Intensity:** High +- **Repetition:** Medium +- **Flow Variation:** Fluid and shape-shifting +- **Preferred Rhyme Schemes:** Slant rhymes, echo rhymes, internal waves +- **Bar Structure:** Image → mutation → association → return +- **Hook Compatibility:** High + +## Mandatory Writing Rules +- Blend senses and categories in imagery. +- Transform one image into another rather than jumping randomly. +- Use recurring motifs to create coherence. +- Favor dream logic over literal explanation. +- Use sonic texture in word choice. + +## Avoid +Random nonsense, drug clichés as the only concept, disconnected surreal images + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Do surreal images connect through transformation or motif? +- [ ] Is the language sensory? +- [ ] Does the verse have an identifiable emotional center? +- [ ] Are clichés minimized? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/lyric_styles/hiphop_30/30_experimental_flow.md b/lyric_styles/hiphop_30/30_experimental_flow.md new file mode 100644 index 0000000..f5f2cd5 --- /dev/null +++ b/lyric_styles/hiphop_30/30_experimental_flow.md @@ -0,0 +1,70 @@ +# Experimental Flow + +## Purpose +Break normal rap conventions deliberately through irregular bar lengths, unusual pauses, asymmetrical rhyme placement, and unconventional phrasing. + +## Style Lock +When this style is selected, **do not merely imitate the mood**. The generated lyrics must visibly satisfy the structural and linguistic rules below. If the draft fails the self-check, rewrite it before returning the final lyrics. + +## Core Profile +- **Energy:** Variable +- **Delivery Speed:** Variable +- **Target Syllables:** 3–20 syllables depending on section +- **Rhyme Density:** Variable-high +- **Internal Rhyme Density:** High +- **Multisyllabic Rhyme Level:** Variable +- **Punchline Frequency:** Medium +- **Wordplay Level:** High +- **Metaphor Density:** High +- **Vocabulary:** Unrestricted but intentional +- **Storytelling Level:** Variable +- **Aggression:** Variable +- **Emotional Intensity:** High +- **Repetition:** Variable +- **Flow Variation:** Irregular by design +- **Preferred Rhyme Schemes:** Broken rhyme maps, delayed rhyme resolution, nonstandard repetition +- **Bar Structure:** Asymmetrical; contrast is essential +- **Hook Compatibility:** Medium + +## Mandatory Writing Rules +- Break at least two conventional expectations per section. +- Use contrast between dense and sparse lines. +- Delay or displace rhyme resolution. +- Use punctuation and spacing to imply unusual timing. +- Maintain one unifying concept or sonic device. + +## Avoid +Randomness without rationale, unreadable structure, unconventional choices that do not change the listening experience + +## Generation Procedure +1. Decide the section purpose before writing: verse, hook, bridge, intro, or outro. +2. Establish a rhythmic pocket that matches this style. +3. Draft the lyrics using the target syllable range and rhyme behavior above. +4. Strengthen weak end words, internal rhyme positions, and rhythmic accents. +5. Remove filler and any line that does not support the style objective. +6. Run the **Style Compliance Check** below. +7. Rewrite failed lines before producing the final result. + +## Style Compliance Check +- [ ] Can the experimental choices be identified? +- [ ] Do they change cadence or musical feel? +- [ ] Is there still a unifying identity? +- [ ] Does unconventional structure remain performable? + +## Failure Conditions +The output should be considered **off-style** and regenerated if: +- The defining cadence or rhyme behavior is missing. +- More than roughly 25% of the bars ignore the target structure. +- Filler lines are used to reach length. +- The vocabulary, emotional tone, or rhyme density drifts into a different preset. +- The generator describes the style instead of actually writing in it. + +## App Instruction +When this preset is active, treat these rules as a **hard style constraint**. Content prompts may change the subject, setting, story, mood, or perspective, but they should not override the core rhythmic and lyrical behavior unless the user explicitly disables this style. + +## Combination Behavior +If combined with another preset: +- Preserve this style's strongest defining traits. +- Merge compatible attributes rather than averaging everything into a generic midpoint. +- If two rules conflict, prioritize the user's explicitly selected primary style. +- Never allow combination mode to remove all defining features of this preset. diff --git a/music_styles/001_boom_bap.md b/music_styles/001_boom_bap.md new file mode 100644 index 0000000..1d38fd2 --- /dev/null +++ b/music_styles/001_boom_bap.md @@ -0,0 +1,36 @@ +# Boom Bap + +**Family:** Classic / Sample-Based +**Typical tempo:** 82–96 BPM + +## Core Identity + +Classic sample-driven hip-hop built around hard kick/snare interplay, swung groove, chopped musical fragments, and a strong pocket for rapping. + +## Rhythm & Drums + +Punchy kick, cracking snare, dusty hats, light swing; drums should feel human rather than grid-perfect. + +## Bass & Low End + +Warm sampled bass, upright/electric bass fragments, or simple sub reinforcement. + +## Harmony, Melody & Sound Palette + +Chopped soul, jazz, funk, or soundtrack material; filtered loops, stabs, scratches, vinyl texture. + +## Vocal / Rap Approach + +Bar-focused MC delivery; clear pocket, internal rhyme space, minimal melodic dependence. + +## Arrangement + +Loop-centered verses with subtle sample variation, drops, fills, and a stronger hook section. + +## Mood & Energy + +Head-nod, grounded, confident, raw. + +## Performance Detail + +Keep the groove human: slight swing and imperfect sample timing are usually more convincing than rigid quantization. diff --git a/music_styles/002_golden_era_hip_hop.md b/music_styles/002_golden_era_hip_hop.md new file mode 100644 index 0000000..5760734 --- /dev/null +++ b/music_styles/002_golden_era_hip_hop.md @@ -0,0 +1,32 @@ +# Golden Era Hip-Hop + +**Family:** Classic / Sample-Based +**Typical tempo:** 88–108 BPM + +## Core Identity + +Late-1980s to early-1990s hip-hop language: breakbeats, funk-derived samples, direct MC performance, DJ culture, and memorable rhythmic hooks. + +## Rhythm & Drums + +Breakbeat-led, lively hats, snare-forward backbeat, occasional percussion loops and cuts. + +## Bass & Low End + +Funk or sampled basslines with clear movement. + +## Harmony, Melody & Sound Palette + +Funk, soul, jazz, horn hits, scratches, vocal snippets, simple melodic loops. + +## Vocal / Rap Approach + +Direct, rhythmic, charismatic; call-and-response and crew energy work well. + +## Arrangement + +Clear intro/verse/hook structure with DJ breaks and short transitions. + +## Mood & Energy + +Energetic, streetwise, celebratory, foundational. diff --git a/music_styles/003_underground_hip_hop.md b/music_styles/003_underground_hip_hop.md new file mode 100644 index 0000000..03039d0 --- /dev/null +++ b/music_styles/003_underground_hip_hop.md @@ -0,0 +1,32 @@ +# Underground Hip-Hop + +**Family:** Underground / Alternative +**Typical tempo:** 75–96 BPM + +## Core Identity + +Independent-minded hip-hop prioritizing character, lyrical depth, unusual samples, and less-polished textures over mainstream formulas. + +## Rhythm & Drums + +Dry, gritty, sometimes deliberately uneven; drums can be sparse or unusually layered. + +## Bass & Low End + +Muted sub, sampled bass, or dirty low-end loop. + +## Harmony, Melody & Sound Palette + +Obscure samples, degraded textures, eerie keys, dusty jazz, field recordings, unconventional chops. + +## Vocal / Rap Approach + +Dense writing, abstract imagery, technical or introspective delivery. + +## Arrangement + +Longer verses, less predictable hooks, beat switches or sample evolutions. + +## Mood & Energy + +Raw, cerebral, personal, uncompromising. diff --git a/music_styles/004_lo_fi_hip_hop.md b/music_styles/004_lo_fi_hip_hop.md new file mode 100644 index 0000000..0b22890 --- /dev/null +++ b/music_styles/004_lo_fi_hip_hop.md @@ -0,0 +1,36 @@ +# Lo-Fi Hip-Hop + +**Family:** Lo-Fi / Chill +**Typical tempo:** 65–90 BPM + +## Core Identity + +Dusty, intimate hip-hop with softened transients, tape/vinyl wear, mellow harmony, and relaxed repetition. + +## Rhythm & Drums + +Soft kicks, brushed or muted snares, lazy hats, noticeable swing. + +## Bass & Low End + +Rounded bass with limited sub aggression. + +## Harmony, Melody & Sound Palette + +Jazz chords, Rhodes, guitar, piano, vinyl noise, wow/flutter, filtered samples. + +## Vocal / Rap Approach + +Usually restrained rap, spoken phrases, or instrumental focus. + +## Arrangement + +Short loop cycles with gentle variation; avoid dramatic drops. + +## Mood & Energy + +Warm, nostalgic, calm, late-night. + +## Performance Detail + +Use degradation selectively. The mix can sound worn without becoming muddy; preserve a readable kick, snare, and vocal range. diff --git a/music_styles/005_jazz_rap.md b/music_styles/005_jazz_rap.md new file mode 100644 index 0000000..c7a702c --- /dev/null +++ b/music_styles/005_jazz_rap.md @@ -0,0 +1,32 @@ +# Jazz Rap + +**Family:** Jazz / Soul +**Typical tempo:** 78–100 BPM + +## Core Identity + +Hip-hop built around jazz harmony, improvisational textures, upright or electric bass, and articulate rhythmic rapping. + +## Rhythm & Drums + +Boom-bap or brushed grooves; syncopated percussion can add live feel. + +## Bass & Low End + +Walking or melodic basslines, often more active than standard hip-hop. + +## Harmony, Melody & Sound Palette + +Extended chords, sax, trumpet, Rhodes, vibraphone, piano, jazz guitar. + +## Vocal / Rap Approach + +Conversational, intelligent, elastic flow; leave space for instrumentation. + +## Arrangement + +Verse/hook form with instrumental interludes, solos, or evolving comping. + +## Mood & Energy + +Sophisticated, cool, reflective, urban. diff --git a/music_styles/006_conscious_hip_hop.md b/music_styles/006_conscious_hip_hop.md new file mode 100644 index 0000000..34e942d --- /dev/null +++ b/music_styles/006_conscious_hip_hop.md @@ -0,0 +1,36 @@ +# Conscious Hip-Hop + +**Family:** Lyrical / Message +**Typical tempo:** 72–98 BPM + +## Core Identity + +Message-centered rap where production supports clarity, reflection, social commentary, personal growth, or philosophical themes. + +## Rhythm & Drums + +Supportive rather than overpowering; clean boom-bap, soul, or modern drums. + +## Bass & Low End + +Stable, musical low end that leaves vocal room. + +## Harmony, Melody & Sound Palette + +Soul, piano, strings, restrained samples, atmospheric pads. + +## Vocal / Rap Approach + +Highly intelligible, emotionally controlled, lyric-forward delivery. + +## Arrangement + +Verses carry narrative/argument; hooks summarize emotional or thematic center. + +## Mood & Energy + +Reflective, purposeful, humane, serious. + +## Performance Detail + +Protect vocal intelligibility: avoid busy midrange layers during dense verses and use instrumental accents at phrase endings. diff --git a/music_styles/007_abstract_hip_hop.md b/music_styles/007_abstract_hip_hop.md new file mode 100644 index 0000000..0936849 --- /dev/null +++ b/music_styles/007_abstract_hip_hop.md @@ -0,0 +1,36 @@ +# Abstract Hip-Hop + +**Family:** Experimental / Alternative +**Typical tempo:** 65–100 BPM + +## Core Identity + +Non-literal, fragmented, or surreal hip-hop using unconventional rhythm, sound selection, and lyrical structure. + +## Rhythm & Drums + +Off-kilter placement, unusual percussion, abrupt silence, asymmetrical patterns. + +## Bass & Low End + +Can be minimal, distorted, unstable, or textural rather than melodic. + +## Harmony, Melody & Sound Palette + +Micro-samples, noise, detuned keys, strange synths, collage techniques. + +## Vocal / Rap Approach + +Associative imagery, unusual cadence, broken phrasing, spoken or deadpan delivery. + +## Arrangement + +Nonstandard sections, abrupt transitions, short loops, deliberate discontinuity. + +## Mood & Energy + +Surreal, cerebral, uneasy, inventive. + +## Performance Detail + +Maintain one recognizable anchor—groove, motif, bass figure, or vocal rhythm—while other elements mutate around it. diff --git a/music_styles/008_alternative_hip_hop.md b/music_styles/008_alternative_hip_hop.md new file mode 100644 index 0000000..5c23b5a --- /dev/null +++ b/music_styles/008_alternative_hip_hop.md @@ -0,0 +1,36 @@ +# Alternative Hip-Hop + +**Family:** Experimental / Alternative +**Typical tempo:** 70–110 BPM + +## Core Identity + +Broad genre-crossing hip-hop that avoids one fixed formula, combining rap with indie, electronic, rock, soul, jazz, or art-pop ideas. + +## Rhythm & Drums + +Can range from organic breakbeats to electronic kits; prioritize distinctive groove. + +## Bass & Low End + +Bass should fit the hybrid palette rather than default to 808s. + +## Harmony, Melody & Sound Palette + +Unusual instruments, genre hybrids, left-field harmony, creative processing. + +## Vocal / Rap Approach + +Flexible: melodic rap, spoken delivery, technical bars, or mixed vocal forms. + +## Arrangement + +More songlike or experimental structures; bridges and contrast sections encouraged. + +## Mood & Energy + +Individualistic, adventurous, expressive. + +## Performance Detail + +Maintain one recognizable anchor—groove, motif, bass figure, or vocal rhythm—while other elements mutate around it. diff --git a/music_styles/009_backpack_rap.md b/music_styles/009_backpack_rap.md new file mode 100644 index 0000000..d156d94 --- /dev/null +++ b/music_styles/009_backpack_rap.md @@ -0,0 +1,36 @@ +# Backpack Rap + +**Family:** Underground / Lyrical +**Typical tempo:** 80–96 BPM + +## Core Identity + +Lyric-centered underground rap associated with crate-digging production, clever writing, and a deliberately non-commercial feel. + +## Rhythm & Drums + +Dusty boom-bap, crisp snare, swung hats. + +## Bass & Low End + +Sampled or warm electric bass. + +## Harmony, Melody & Sound Palette + +Soul/jazz chops, obscure loops, scratches, simple melodic fragments. + +## Vocal / Rap Approach + +Dense bars, wordplay, storytelling, technical rhyme schemes. + +## Arrangement + +Long verses, modest hooks, DJ-style transitions. + +## Mood & Energy + +Thoughtful, witty, grounded, underground. + +## Performance Detail + +Protect vocal intelligibility: avoid busy midrange layers during dense verses and use instrumental accents at phrase endings. diff --git a/music_styles/010_hardcore_hip_hop.md b/music_styles/010_hardcore_hip_hop.md new file mode 100644 index 0000000..daaf5fb --- /dev/null +++ b/music_styles/010_hardcore_hip_hop.md @@ -0,0 +1,32 @@ +# Hardcore Hip-Hop + +**Family:** Hard / Street +**Typical tempo:** 78–102 BPM + +## Core Identity + +Aggressive hip-hop emphasizing forceful drums, confrontational energy, dense low end, and commanding vocal presence. + +## Rhythm & Drums + +Hard kicks, sharp snares, heavy percussion, minimal softness. + +## Bass & Low End + +Thick bass or sub with aggressive envelope. + +## Harmony, Melody & Sound Palette + +Dark samples, minor keys, stabs, sirens, tense strings, distorted layers. + +## Vocal / Rap Approach + +Forceful projection, clipped phrasing, high conviction. + +## Arrangement + +Strong verse/hook contrast, breakdowns, dramatic stops. + +## Mood & Energy + +Intense, confrontational, muscular. diff --git a/music_styles/011_gangsta_rap.md b/music_styles/011_gangsta_rap.md new file mode 100644 index 0000000..74b8323 --- /dev/null +++ b/music_styles/011_gangsta_rap.md @@ -0,0 +1,32 @@ +# Gangsta Rap + +**Family:** Hard / Street +**Typical tempo:** 75–100 BPM + +## Core Identity + +Street-narrative hip-hop focused on realism, tension, power, consequence, and cinematic urban storytelling. + +## Rhythm & Drums + +Heavy but spacious; snare and kick should support narrative cadence. + +## Bass & Low End + +Deep bass, funk bass, or restrained 808 depending era. + +## Harmony, Melody & Sound Palette + +Funk, soul, ominous keys, strings, synths, ambient street textures. + +## Vocal / Rap Approach + +Calm menace, detailed storytelling, direct speech, controlled intensity. + +## Arrangement + +Narrative verses, memorable hooks, instrumental breathing room. + +## Mood & Energy + +Serious, cinematic, tense, streetwise. diff --git a/music_styles/012_g_funk.md b/music_styles/012_g_funk.md new file mode 100644 index 0000000..925b103 --- /dev/null +++ b/music_styles/012_g_funk.md @@ -0,0 +1,32 @@ +# G-Funk + +**Family:** West Coast +**Typical tempo:** 82–100 BPM + +## Core Identity + +West Coast funk-derived hip-hop with elastic bass, bright synth leads, relaxed drums, and spacious melodic grooves. + +## Rhythm & Drums + +Laid-back swing, clap/snare backbeat, crisp hats, funk percussion. + +## Bass & Low End + +Prominent rubbery synth or electric bassline. + +## Harmony, Melody & Sound Palette + +Whining synth leads, Parliament-style funk colors, electric piano, talkbox-like textures. + +## Vocal / Rap Approach + +Smooth, relaxed, charismatic delivery; melodic hooks fit naturally. + +## Arrangement + +Extended grooves, instrumental intros/outros, hook-heavy structure. + +## Mood & Energy + +Sunny, cruising, confident, smooth. diff --git a/music_styles/013_west_coast_hip_hop.md b/music_styles/013_west_coast_hip_hop.md new file mode 100644 index 0000000..802df4e --- /dev/null +++ b/music_styles/013_west_coast_hip_hop.md @@ -0,0 +1,32 @@ +# West Coast Hip-Hop + +**Family:** Regional +**Typical tempo:** 80–102 BPM + +## Core Identity + +Broad West Coast sound emphasizing funk influence, spacious mixes, clear basslines, relaxed-to-hard drum grooves, and cinematic polish. + +## Rhythm & Drums + +Clean, open drums with strong backbeat and bounce. + +## Bass & Low End + +Defined bassline or sub; often more melodic than East Coast approaches. + +## Harmony, Melody & Sound Palette + +Funk synths, pianos, strings, guitars, bells, atmospheric pads. + +## Vocal / Rap Approach + +Rhythmic, confident, often conversational delivery. + +## Arrangement + +Strong hooks, roomy verses, occasional instrumental breaks. + +## Mood & Energy + +Cruising, confident, polished, streetwise. diff --git a/music_styles/014_east_coast_hip_hop.md b/music_styles/014_east_coast_hip_hop.md new file mode 100644 index 0000000..64b724b --- /dev/null +++ b/music_styles/014_east_coast_hip_hop.md @@ -0,0 +1,36 @@ +# East Coast Hip-Hop + +**Family:** Regional +**Typical tempo:** 78–98 BPM + +## Core Identity + +Dense, rhythm-first hip-hop associated with chopped samples, hard drums, lyrical emphasis, and gritty urban atmosphere. + +## Rhythm & Drums + +Punchy boom-bap, sharp snares, compact swing, layered breaks. + +## Bass & Low End + +Sampled bass, dark low-end loops, controlled sub. + +## Harmony, Melody & Sound Palette + +Soul/jazz chops, piano stabs, horns, strings, eerie samples. + +## Vocal / Rap Approach + +Bar-heavy delivery with tight rhyme placement. + +## Arrangement + +Loop-focused verses, concise hooks, DJ cuts or sample drops. + +## Mood & Energy + +Gritty, focused, nocturnal, lyrical. + +## Performance Detail + +Keep the groove human: slight swing and imperfect sample timing are usually more convincing than rigid quantization. diff --git a/music_styles/015_southern_hip_hop.md b/music_styles/015_southern_hip_hop.md new file mode 100644 index 0000000..03fffd5 --- /dev/null +++ b/music_styles/015_southern_hip_hop.md @@ -0,0 +1,32 @@ +# Southern Hip-Hop + +**Family:** Regional +**Typical tempo:** 65–95 BPM or double-time feel + +## Core Identity + +Broad Southern rap language built on heavy low end, strong rhythmic identity, regional bounce, and flexible tempos. + +## Rhythm & Drums + +808-forward, rolling hats, claps, syncopated percussion, bounce variations. + +## Bass & Low End + +Deep sub and long 808 notes; bass can carry melodic movement. + +## Harmony, Melody & Sound Palette + +Sparse synths, bells, pianos, soul elements, atmospheric motifs. + +## Vocal / Rap Approach + +Flexible cadence, drawl-friendly pocket, rhythmic repetition, melodic hooks. + +## Arrangement + +Hook-forward with clear drops and energetic transitions. + +## Mood & Energy + +Heavy, confident, hypnotic, regional. diff --git a/music_styles/016_dirty_south.md b/music_styles/016_dirty_south.md new file mode 100644 index 0000000..889f4a7 --- /dev/null +++ b/music_styles/016_dirty_south.md @@ -0,0 +1,32 @@ +# Dirty South + +**Family:** Southern / Street +**Typical tempo:** 70–100 BPM + +## Core Identity + +Raw Southern hip-hop emphasizing booming bass, chant energy, aggressive percussion, and club/street impact. + +## Rhythm & Drums + +Hard claps/snares, rolling hats, stomping kicks, syncopated percussion. + +## Bass & Low End + +Large sub or 808 with simple commanding movement. + +## Harmony, Melody & Sound Palette + +Dark synths, brass stabs, bells, minimal loops. + +## Vocal / Rap Approach + +Bold, repetitive, chant-ready delivery with strong rhythmic phrasing. + +## Arrangement + +Big hooks, call-and-response, breaks for crowd energy. + +## Mood & Energy + +Rowdy, forceful, bass-heavy. diff --git a/music_styles/017_memphis_rap.md b/music_styles/017_memphis_rap.md new file mode 100644 index 0000000..6d4c89f --- /dev/null +++ b/music_styles/017_memphis_rap.md @@ -0,0 +1,32 @@ +# Memphis Rap + +**Family:** Southern / Dark +**Typical tempo:** 70–95 BPM + +## Core Identity + +Dark, hypnotic Southern rap rooted in raw drum-machine patterns, eerie samples, repetitive motifs, and lo-fi menace. + +## Rhythm & Drums + +Dry drum-machine hits, sharp snares, rapid hats, repetitive patterns. + +## Bass & Low End + +Distorted or simple sub-bass; low end can feel rough and narrow. + +## Harmony, Melody & Sound Palette + +Horror-film samples, minor piano, cowbells, vocal chops, tape degradation. + +## Vocal / Rap Approach + +Repetitive, incantatory, laid-back or menacing flows. + +## Arrangement + +Short loops, sparse arrangement, recurring vocal/sample motifs. + +## Mood & Energy + +Sinister, hypnotic, nocturnal, raw. diff --git a/music_styles/018_houston_rap.md b/music_styles/018_houston_rap.md new file mode 100644 index 0000000..8b95083 --- /dev/null +++ b/music_styles/018_houston_rap.md @@ -0,0 +1,32 @@ +# Houston Rap + +**Family:** Southern / Regional +**Typical tempo:** 60–85 BPM + +## Core Identity + +Slow, spacious Southern hip-hop with deep bass, relaxed cadence, soulful atmosphere, and room for chopped-and-screwed influence. + +## Rhythm & Drums + +Slow rolling drums, crisp claps, loose hats. + +## Bass & Low End + +Deep sustained sub, warm bass, occasionally melodic slides. + +## Harmony, Melody & Sound Palette + +Soulful samples, synth pads, piano, syrupy textures. + +## Vocal / Rap Approach + +Drawn-out cadence, conversational flow, melodic phrases. + +## Arrangement + +Long grooves and spacious sections; hooks can stretch. + +## Mood & Energy + +Heavy, smooth, late-night, luxurious. diff --git a/music_styles/019_chopped_and_screwed.md b/music_styles/019_chopped_and_screwed.md new file mode 100644 index 0000000..d525b8c --- /dev/null +++ b/music_styles/019_chopped_and_screwed.md @@ -0,0 +1,36 @@ +# Chopped & Screwed + +**Family:** Southern / Experimental +**Typical tempo:** 45–70 BPM perceived + +## Core Identity + +A slow, psychedelic remix aesthetic built from dramatically reduced tempo, repeated fragments, pitch shifts, and stuttered edits. + +## Rhythm & Drums + +Original groove slowed; edits and retriggers become part of rhythm. + +## Bass & Low End + +Pitch-lowered low end, long sub tails, thickened bass texture. + +## Harmony, Melody & Sound Palette + +Stretched samples, tape-like drag, repeated words, abrupt rewind effects. + +## Vocal / Rap Approach + +Vocals pitched down and extended; phrases can repeat rhythmically. + +## Arrangement + +Nonlinear remix structure with cuts, repeats, drops, and slowed transitions. + +## Mood & Energy + +Dazed, heavy, hypnotic, dreamlike. + +## Performance Detail + +Maintain one recognizable anchor—groove, motif, bass figure, or vocal rhythm—while other elements mutate around it. diff --git a/music_styles/020_crunk.md b/music_styles/020_crunk.md new file mode 100644 index 0000000..0fbe2c7 --- /dev/null +++ b/music_styles/020_crunk.md @@ -0,0 +1,36 @@ +# Crunk + +**Family:** Southern / Club +**Typical tempo:** 70–90 BPM or double-time + +## Core Identity + +High-energy Southern club rap driven by shouted hooks, aggressive drums, repetitive synth motifs, and crowd-response dynamics. + +## Rhythm & Drums + +Huge kicks, claps, rapid hats, energetic percussion. + +## Bass & Low End + +Large 808/sub hits with simple patterns. + +## Harmony, Melody & Sound Palette + +Aggressive synth stabs, sirens, brass-like patches, minimal harmony. + +## Vocal / Rap Approach + +Shouted, chant-heavy, call-and-response vocals. + +## Arrangement + +Short verses, huge repeated hooks, breakdowns and drops. + +## Mood & Energy + +Explosive, rowdy, physical, communal. + +## Performance Detail + +Prioritize physical rhythm and fast recognition. Hooks should arrive quickly and low-end transients should remain uncluttered. diff --git a/music_styles/021_bounce.md b/music_styles/021_bounce.md new file mode 100644 index 0000000..093e87a --- /dev/null +++ b/music_styles/021_bounce.md @@ -0,0 +1,36 @@ +# Bounce + +**Family:** Southern / Club +**Typical tempo:** 95–115 BPM + +## Core Identity + +New Orleans-rooted dance rap with fast, repetitive rhythms, call-and-response vocals, and syncopated party energy. + +## Rhythm & Drums + +Rapid kick patterns, claps, repetitive percussion loops. + +## Bass & Low End + +Simple sub or bass pulse supporting the rhythm. + +## Harmony, Melody & Sound Palette + +Minimal melodic loops, vocal samples, whistles, bright stabs. + +## Vocal / Rap Approach + +Call-and-response, chants, repeated phrases, energetic MCing. + +## Arrangement + +Loop-driven, repetitive, built for continuous movement. + +## Mood & Energy + +Celebratory, kinetic, playful, high-energy. + +## Performance Detail + +Prioritize physical rhythm and fast recognition. Hooks should arrive quickly and low-end transients should remain uncluttered. diff --git a/music_styles/022_trap.md b/music_styles/022_trap.md new file mode 100644 index 0000000..59f1e50 --- /dev/null +++ b/music_styles/022_trap.md @@ -0,0 +1,36 @@ +# Trap + +**Family:** Trap +**Typical tempo:** 120–160 BPM with half-time feel + +## Core Identity + +Modern hip-hop centered on 808 bass, rolling hi-hats, sparse melodic loops, and strong rhythmic negative space. + +## Rhythm & Drums + +Punchy kick, clap/snare on half-time backbeat, hat rolls, triplets, open-hat accents. + +## Bass & Low End + +Long 808s with slides, pitch movement, and strong sub presence. + +## Harmony, Melody & Sound Palette + +Bells, plucks, pianos, pads, short minor-key motifs. + +## Vocal / Rap Approach + +Rhythmic pocketing, triplet flows, melodic phrases or clipped delivery. + +## Arrangement + +Intro, hook, verse, hook with drops, mutes, risers, beat changes. + +## Mood & Energy + +Dark-to-polished, spacious, hard-hitting. + +## Performance Detail + +Treat the 808 as both bass and rhythmic counterpoint; leave intentional gaps so slides and drum accents remain clear. diff --git a/music_styles/023_dark_trap.md b/music_styles/023_dark_trap.md new file mode 100644 index 0000000..931993a --- /dev/null +++ b/music_styles/023_dark_trap.md @@ -0,0 +1,36 @@ +# Dark Trap + +**Family:** Trap / Dark +**Typical tempo:** 120–155 BPM + +## Core Identity + +Trap with ominous harmony, cinematic tension, distorted low end, and sparse threatening sound design. + +## Rhythm & Drums + +Hard transient drums, controlled hat rolls, dramatic pauses. + +## Bass & Low End + +Heavy distorted 808s, slides, sustained sub pressure. + +## Harmony, Melody & Sound Palette + +Minor/Phrygian colors, bells, choirs, reversed textures, dark pads. + +## Vocal / Rap Approach + +Low-register, restrained, threatening or emotionally cold delivery. + +## Arrangement + +Tension-building intros, hard drops, sparse verses, dramatic transitions. + +## Mood & Energy + +Menacing, nocturnal, cinematic, severe. + +## Performance Detail + +Treat the 808 as both bass and rhythmic counterpoint; leave intentional gaps so slides and drum accents remain clear. diff --git a/music_styles/024_melodic_trap.md b/music_styles/024_melodic_trap.md new file mode 100644 index 0000000..3fc646d --- /dev/null +++ b/music_styles/024_melodic_trap.md @@ -0,0 +1,36 @@ +# Melodic Trap + +**Family:** Trap / Melodic +**Typical tempo:** 120–155 BPM + +## Core Identity + +Trap production shaped around memorable melodies, emotional chord progressions, sung-rap phrasing, and smooth 808 movement. + +## Rhythm & Drums + +Cleaner trap drums with less abrasive attack. + +## Bass & Low End + +Warm or gliding 808 that follows harmonic movement. + +## Harmony, Melody & Sound Palette + +Guitar, piano, plucks, pads, airy synths, emotional motifs. + +## Vocal / Rap Approach + +Sung-rap, harmonized hooks, flexible pitch, intimate delivery. + +## Arrangement + +Hook-centric songwriting, bridges, vocal layers, instrumental lifts. + +## Mood & Energy + +Emotional, atmospheric, polished, bittersweet. + +## Performance Detail + +Treat the 808 as both bass and rhythmic counterpoint; leave intentional gaps so slides and drum accents remain clear. diff --git a/music_styles/025_street_trap.md b/music_styles/025_street_trap.md new file mode 100644 index 0000000..f3d9f82 --- /dev/null +++ b/music_styles/025_street_trap.md @@ -0,0 +1,36 @@ +# Street Trap + +**Family:** Trap / Street +**Typical tempo:** 125–155 BPM + +## Core Identity + +Hard, minimal trap focused on immediacy, street narrative, aggressive low end, and direct vocal presence. + +## Rhythm & Drums + +Dry punchy drums, sharp hats, sparse fills. + +## Bass & Low End + +Dominant 808, often short and punchy with occasional slides. + +## Harmony, Melody & Sound Palette + +Minimal piano, bells, dark pads, simple repeating motifs. + +## Vocal / Rap Approach + +Direct, rhythmically assertive, less melodic than melodic trap. + +## Arrangement + +Strong hooks, stripped verses, occasional beat cuts for emphasis. + +## Mood & Energy + +Cold, hard, direct, tense. + +## Performance Detail + +Treat the 808 as both bass and rhythmic counterpoint; leave intentional gaps so slides and drum accents remain clear. diff --git a/music_styles/026_cloud_rap.md b/music_styles/026_cloud_rap.md new file mode 100644 index 0000000..9cbb890 --- /dev/null +++ b/music_styles/026_cloud_rap.md @@ -0,0 +1,32 @@ +# Cloud Rap + +**Family:** Atmospheric +**Typical tempo:** 70–140 BPM depending drum feel + +## Core Identity + +Dreamlike hip-hop using washed textures, airy pads, soft drums, and impressionistic vocals. + +## Rhythm & Drums + +Soft trap or lo-fi drums, smeared transients, airy hats. + +## Bass & Low End + +Rounded sub or floating 808, usually not overly aggressive. + +## Harmony, Melody & Sound Palette + +Reverb-heavy pads, dream synths, vocal textures, shimmering samples. + +## Vocal / Rap Approach + +Mumbled, melodic, detached, or softly layered delivery. + +## Arrangement + +Long atmospheric intros/outros, simple repeated sections. + +## Mood & Energy + +Ethereal, hazy, introspective, weightless. diff --git a/music_styles/027_plugg.md b/music_styles/027_plugg.md new file mode 100644 index 0000000..9c331c0 --- /dev/null +++ b/music_styles/027_plugg.md @@ -0,0 +1,36 @@ +# Plugg + +**Family:** Trap / Internet +**Typical tempo:** 125–155 BPM + +## Core Identity + +Bright, minimal internet-era rap production with playful synths, light drum bounce, and simple catchy motifs. + +## Rhythm & Drums + +Light trap drums, crisp claps, airy hats, bouncing percussion. + +## Bass & Low End + +Clean 808s, usually less distorted and more buoyant. + +## Harmony, Melody & Sound Palette + +Bell-like leads, digital plucks, bright synths, simple arpeggios. + +## Vocal / Rap Approach + +Relaxed, playful, melodic or conversational delivery. + +## Arrangement + +Short sections, repetitive hooks, minimal layering. + +## Mood & Energy + +Playful, airy, digital, effortless. + +## Performance Detail + +Treat the 808 as both bass and rhythmic counterpoint; leave intentional gaps so slides and drum accents remain clear. diff --git a/music_styles/028_pluggnb.md b/music_styles/028_pluggnb.md new file mode 100644 index 0000000..b170517 --- /dev/null +++ b/music_styles/028_pluggnb.md @@ -0,0 +1,36 @@ +# PluggnB + +**Family:** Trap / R&B +**Typical tempo:** 125–160 BPM + +## Core Identity + +Plugg-derived drums blended with lush R&B harmony, sparkling synths, and melodic vocal writing. + +## Rhythm & Drums + +Light trap percussion with soft attack and syncopated hats. + +## Bass & Low End + +Smooth 808 or sub that follows chord roots. + +## Harmony, Melody & Sound Palette + +Rich seventh/ninth chords, glossy keys, bright leads, pads. + +## Vocal / Rap Approach + +Melodic rap, stacked harmonies, soft falsetto or intimate delivery. + +## Arrangement + +Hook-heavy, fluid sections, layered vocal moments. + +## Mood & Energy + +Romantic, glossy, dreamy, emotional. + +## Performance Detail + +Treat the 808 as both bass and rhythmic counterpoint; leave intentional gaps so slides and drum accents remain clear. diff --git a/music_styles/029_rage.md b/music_styles/029_rage.md new file mode 100644 index 0000000..d507a48 --- /dev/null +++ b/music_styles/029_rage.md @@ -0,0 +1,36 @@ +# Rage + +**Family:** Trap / Electronic +**Typical tempo:** 130–165 BPM + +## Core Identity + +Hyper-energetic rap built on distorted synth leads, huge 808s, bright digital textures, and repetitive festival-like momentum. + +## Rhythm & Drums + +Fast hats, hard claps, aggressive kicks, sparse but forceful patterns. + +## Bass & Low End + +Large clipped or distorted 808s with simple movement. + +## Harmony, Melody & Sound Palette + +Saw leads, arpeggios, video-game-like synths, supersaws, bright distortion. + +## Vocal / Rap Approach + +Repetitive, shouted, melodic or chant-based delivery. + +## Arrangement + +Short build, explosive drop, repeated hook, minimal breakdown. + +## Mood & Energy + +Chaotic, euphoric, aggressive, futuristic. + +## Performance Detail + +Treat the 808 as both bass and rhythmic counterpoint; leave intentional gaps so slides and drum accents remain clear. diff --git a/music_styles/030_drill.md b/music_styles/030_drill.md new file mode 100644 index 0000000..74d24c1 --- /dev/null +++ b/music_styles/030_drill.md @@ -0,0 +1,36 @@ +# Drill + +**Family:** Drill +**Typical tempo:** 135–150 BPM + +## Core Identity + +Dark street rap defined by sliding bass, syncopated kick patterns, sparse minor-key melodies, and tense vocal cadence. + +## Rhythm & Drums + +Off-grid-feeling kicks, sharp snares, rapid hats, percussive syncopation. + +## Bass & Low End + +Gliding 808s with pitch bends and long slides. + +## Harmony, Melody & Sound Palette + +Dark piano, bells, strings, choirs, sparse ambience. + +## Vocal / Rap Approach + +Clipped, rhythmically precise, confrontational delivery. + +## Arrangement + +Short intros, verse-heavy structure, hooks with strong rhythmic repetition. + +## Mood & Energy + +Tense, cold, menacing, urgent. + +## Performance Detail + +The kick and 808 should interlock rather than constantly hit together; bass slides need deliberate pitch targets. diff --git a/music_styles/031_chicago_drill.md b/music_styles/031_chicago_drill.md new file mode 100644 index 0000000..3aea027 --- /dev/null +++ b/music_styles/031_chicago_drill.md @@ -0,0 +1,36 @@ +# Chicago Drill + +**Family:** Drill / Regional +**Typical tempo:** 130–150 BPM + +## Core Identity + +Early drill aesthetic with raw minimalism, stark street energy, repetitive melodic loops, and blunt rhythmic force. + +## Rhythm & Drums + +Simple hard drums, rolling hats, direct clap/snare patterns. + +## Bass & Low End + +Heavy 808s, less ornate than later UK-style sliding bass. + +## Harmony, Melody & Sound Palette + +Dark synths, bells, simple minor motifs. + +## Vocal / Rap Approach + +Direct, repetitive, forceful, often less technically busy. + +## Arrangement + +Long verses, repeated hooks, deliberately minimal development. + +## Mood & Energy + +Raw, stark, aggressive, bleak. + +## Performance Detail + +The kick and 808 should interlock rather than constantly hit together; bass slides need deliberate pitch targets. diff --git a/music_styles/032_uk_drill.md b/music_styles/032_uk_drill.md new file mode 100644 index 0000000..abdfd6c --- /dev/null +++ b/music_styles/032_uk_drill.md @@ -0,0 +1,36 @@ +# UK Drill + +**Family:** Drill / Regional +**Typical tempo:** 138–145 BPM + +## Core Identity + +Polished, rhythmically intricate drill with sliding bass, syncopated kicks, eerie melodies, and sharply articulated flows. + +## Rhythm & Drums + +Complex kick placement, tight snare, fast hat patterns, percussion accents. + +## Bass & Low End + +Highly mobile sliding 808s with deliberate pitch choreography. + +## Harmony, Melody & Sound Palette + +Dark piano, bells, strings, choir, sparse atmospheric samples. + +## Vocal / Rap Approach + +Precise, clipped, percussive cadence with frequent rhythmic switches. + +## Arrangement + +Tension intro, verse-led arrangement, hook sections with strong bass movement. + +## Mood & Energy + +Cold, technical, threatening, cinematic. + +## Performance Detail + +The kick and 808 should interlock rather than constantly hit together; bass slides need deliberate pitch targets. diff --git a/music_styles/033_brooklyn_drill.md b/music_styles/033_brooklyn_drill.md new file mode 100644 index 0000000..66ff183 --- /dev/null +++ b/music_styles/033_brooklyn_drill.md @@ -0,0 +1,36 @@ +# Brooklyn Drill + +**Family:** Drill / Regional +**Typical tempo:** 138–150 BPM + +## Core Identity + +New York drill blending UK-influenced production with more forceful American vocal phrasing and energetic hooks. + +## Rhythm & Drums + +UK-drill-style kicks and hats with harder punch. + +## Bass & Low End + +Sliding 808s, often louder and more aggressive. + +## Harmony, Melody & Sound Palette + +Dark pianos, brass, strings, vocal chops, ominous synths. + +## Vocal / Rap Approach + +Commanding, energetic, punchline-heavy delivery. + +## Arrangement + +Hook-driven, compact sections, frequent drops and vocal callouts. + +## Mood & Energy + +Aggressive, energetic, urban, imposing. + +## Performance Detail + +The kick and 808 should interlock rather than constantly hit together; bass slides need deliberate pitch targets. diff --git a/music_styles/034_jersey_club_rap.md b/music_styles/034_jersey_club_rap.md new file mode 100644 index 0000000..1eff8c0 --- /dev/null +++ b/music_styles/034_jersey_club_rap.md @@ -0,0 +1,36 @@ +# Jersey Club Rap + +**Family:** Club / Rap +**Typical tempo:** 135–155 BPM + +## Core Identity + +Rap over fast Jersey club rhythms, characterized by chopped kick patterns, repeated vocal edits, and dance-floor momentum. + +## Rhythm & Drums + +Rapid triplet/bounce kicks, claps, chopped percussion, rhythmic stop-starts. + +## Bass & Low End + +Short sub hits or bass pulses; rhythm takes priority over sustain. + +## Harmony, Melody & Sound Palette + +Vocal chops, simple synth hooks, club samples. + +## Vocal / Rap Approach + +Short, catchy, rhythmic phrases; delivery often mirrors kick pattern. + +## Arrangement + +Compact sections, quick transitions, repeated dance breaks. + +## Mood & Energy + +Kinetic, playful, club-focused, high-energy. + +## Performance Detail + +Prioritize physical rhythm and fast recognition. Hooks should arrive quickly and low-end transients should remain uncluttered. diff --git a/music_styles/035_phonk.md b/music_styles/035_phonk.md new file mode 100644 index 0000000..747eea1 --- /dev/null +++ b/music_styles/035_phonk.md @@ -0,0 +1,32 @@ +# Phonk + +**Family:** Memphis-Derived / Electronic +**Typical tempo:** 80–130 BPM + +## Core Identity + +Modernized Memphis-inspired hip-hop using lo-fi vocal samples, cowbells, distorted bass, and dark retro texture. + +## Rhythm & Drums + +Dry drums, cowbell rhythm, crunchy snares, trap-influenced hats. + +## Bass & Low End + +Distorted sub/808 with saturated mids. + +## Harmony, Melody & Sound Palette + +Cowbells, Memphis vocal cuts, horror textures, vinyl/tape effects. + +## Vocal / Rap Approach + +Often sample-led; if original vocals are used, keep them sparse and gritty. + +## Arrangement + +Loop-driven, short sections, heavy repetition. + +## Mood & Energy + +Dark, retro, hypnotic, gritty. diff --git a/music_styles/036_drift_phonk.md b/music_styles/036_drift_phonk.md new file mode 100644 index 0000000..b9b56af --- /dev/null +++ b/music_styles/036_drift_phonk.md @@ -0,0 +1,32 @@ +# Drift Phonk + +**Family:** Electronic / Aggressive +**Typical tempo:** 120–170 BPM + +## Core Identity + +High-energy phonk derivative built for driving momentum, distorted low end, repetitive cowbell leads, and hard compression. + +## Rhythm & Drums + +Fast hard kicks, sharp snares, driving hats. + +## Bass & Low End + +Heavily distorted bass/808, often clipped for aggression. + +## Harmony, Melody & Sound Palette + +Prominent cowbell melody, dark synth layers, impact FX. + +## Vocal / Rap Approach + +Vocals are usually chopped or secondary to the instrumental. + +## Arrangement + +Build/drop structure, strong repeated lead motif. + +## Mood & Energy + +Aggressive, mechanical, adrenaline-heavy. diff --git a/music_styles/037_horrorcore.md b/music_styles/037_horrorcore.md new file mode 100644 index 0000000..49a3044 --- /dev/null +++ b/music_styles/037_horrorcore.md @@ -0,0 +1,32 @@ +# Horrorcore + +**Family:** Dark / Theatrical +**Typical tempo:** 65–100 BPM + +## Core Identity + +Hip-hop framed with horror imagery, ominous cinematic sound design, unsettling harmony, and theatrical vocal character. + +## Rhythm & Drums + +Heavy, sparse, often boom-bap or trap-derived. + +## Bass & Low End + +Dark sub, low drones, sampled bass. + +## Harmony, Melody & Sound Palette + +Horror-score strings, detuned piano, choirs, bells, sound effects. + +## Vocal / Rap Approach + +Narrative, theatrical, whispered-to-aggressive dynamics. + +## Arrangement + +Cinematic intros, story verses, dramatic hooks, tension breaks. + +## Mood & Energy + +Macabre, theatrical, suspenseful, sinister. diff --git a/music_styles/038_industrial_hip_hop.md b/music_styles/038_industrial_hip_hop.md new file mode 100644 index 0000000..41d5ea4 --- /dev/null +++ b/music_styles/038_industrial_hip_hop.md @@ -0,0 +1,36 @@ +# Industrial Hip-Hop + +**Family:** Experimental / Heavy +**Typical tempo:** 70–130 BPM + +## Core Identity + +Abrasive hip-hop using distorted percussion, metallic textures, machine noise, and dense sound design. + +## Rhythm & Drums + +Clanging hits, distorted kicks, clipped snares, mechanical loops. + +## Bass & Low End + +Distorted bass, drones, sub pressure, noise-layered low end. + +## Harmony, Melody & Sound Palette + +Metallic samples, feedback, synth noise, machinery, harsh processing. + +## Vocal / Rap Approach + +Aggressive, detached, spoken, shouted, or heavily processed. + +## Arrangement + +Abrupt transitions, breakdowns, texture changes, unconventional song form. + +## Mood & Energy + +Harsh, dystopian, confrontational, mechanical. + +## Performance Detail + +Maintain one recognizable anchor—groove, motif, bass figure, or vocal rhythm—while other elements mutate around it. diff --git a/music_styles/039_experimental_hip_hop.md b/music_styles/039_experimental_hip_hop.md new file mode 100644 index 0000000..1da1a11 --- /dev/null +++ b/music_styles/039_experimental_hip_hop.md @@ -0,0 +1,36 @@ +# Experimental Hip-Hop + +**Family:** Experimental +**Typical tempo:** Variable 60–160 BPM + +## Core Identity + +Hip-hop that intentionally breaks conventions in rhythm, timbre, structure, or vocal design while preserving a rap-centered identity. + +## Rhythm & Drums + +Unusual meters, polymetric feel, broken grooves, unconventional samples. + +## Bass & Low End + +May be sub-heavy, absent, distorted, or rhythmically fragmented. + +## Harmony, Melody & Sound Palette + +Any palette: synthesis, found sound, granular texture, live instruments, noise. + +## Vocal / Rap Approach + +Nonstandard flow, spoken passages, pitch processing, abrupt cadence shifts. + +## Arrangement + +Unpredictable sections, asymmetry, beat switches, silence as arrangement. + +## Mood & Energy + +Inventive, challenging, surprising, boundary-pushing. + +## Performance Detail + +Maintain one recognizable anchor—groove, motif, bass figure, or vocal rhythm—while other elements mutate around it. diff --git a/music_styles/040_glitch_hop.md b/music_styles/040_glitch_hop.md new file mode 100644 index 0000000..fbff876 --- /dev/null +++ b/music_styles/040_glitch_hop.md @@ -0,0 +1,36 @@ +# Glitch Hop + +**Family:** Electronic / Experimental +**Typical tempo:** 85–115 BPM + +## Core Identity + +Hip-hop/electronic hybrid using digital stutters, chopped edits, syncopated bass, and highly processed rhythmic detail. + +## Rhythm & Drums + +Punchy electronic drums with micro-edits, fills, retriggers, syncopation. + +## Bass & Low End + +Elastic synth bass, wobble, or glitchy low-end movement. + +## Harmony, Melody & Sound Palette + +Digital clicks, resampling, stutter edits, chopped synths. + +## Vocal / Rap Approach + +Rhythmic rap or sampled vocals; vocals may be heavily edited. + +## Arrangement + +Drop-oriented but groove-centered, with frequent micro-variation. + +## Mood & Energy + +Futuristic, playful, technical, kinetic. + +## Performance Detail + +Maintain one recognizable anchor—groove, motif, bass figure, or vocal rhythm—while other elements mutate around it. diff --git a/music_styles/041_electronic_hip_hop.md b/music_styles/041_electronic_hip_hop.md new file mode 100644 index 0000000..3479492 --- /dev/null +++ b/music_styles/041_electronic_hip_hop.md @@ -0,0 +1,32 @@ +# Electronic Hip-Hop + +**Family:** Electronic +**Typical tempo:** 75–150 BPM + +## Core Identity + +Hip-hop built primarily from synthesis, drum machines, and electronic sound design rather than sample-based production. + +## Rhythm & Drums + +Programmed drums, synthetic percussion, precise transients. + +## Bass & Low End + +Sub bass, synth bass, or 808 depending substyle. + +## Harmony, Melody & Sound Palette + +Synth leads, pads, arps, electronic effects, digital texture. + +## Vocal / Rap Approach + +Any rap approach; often clean and rhythmically tight. + +## Arrangement + +Song structure can borrow from hip-hop or electronic music. + +## Mood & Energy + +Modern, synthetic, polished, flexible. diff --git a/music_styles/042_psychedelic_hip_hop.md b/music_styles/042_psychedelic_hip_hop.md new file mode 100644 index 0000000..7b0fc57 --- /dev/null +++ b/music_styles/042_psychedelic_hip_hop.md @@ -0,0 +1,36 @@ +# Psychedelic Hip-Hop + +**Family:** Psychedelic / Experimental +**Typical tempo:** 65–110 BPM + +## Core Identity + +Hip-hop with altered, dreamlike sound design: warped samples, phase movement, unusual stereo space, surreal harmony, and evolving textures. + +## Rhythm & Drums + +Groove can be laid-back or broken; use filtered and shifting percussion. + +## Bass & Low End + +Warm bass or sub with modulation and occasional pitch movement. + +## Harmony, Melody & Sound Palette + +Reversed samples, phaser/flanger, tape warble, synth drones, exotic timbres. + +## Vocal / Rap Approach + +Elastic, hypnotic, melodic, abstract, or heavily layered vocals. + +## Arrangement + +Evolving loops, transitions that morph rather than simply cut. + +## Mood & Energy + +Surreal, immersive, colorful, disorienting. + +## Performance Detail + +Maintain one recognizable anchor—groove, motif, bass figure, or vocal rhythm—while other elements mutate around it. diff --git a/music_styles/043_neo_psychedelic_rap.md b/music_styles/043_neo_psychedelic_rap.md new file mode 100644 index 0000000..7f0fd2e --- /dev/null +++ b/music_styles/043_neo_psychedelic_rap.md @@ -0,0 +1,36 @@ +# Neo-Psychedelic Rap + +**Family:** Psychedelic / Modern +**Typical tempo:** 110–155 BPM + +## Core Identity + +Modern psychedelic rap combining trap or alternative drums with lush synth worlds, modulation, reverbs, and cinematic movement. + +## Rhythm & Drums + +Trap-informed drums with spacious gaps and textural effects. + +## Bass & Low End + +Gliding 808 or warm sub integrated into atmospheric mix. + +## Harmony, Melody & Sound Palette + +Wide pads, detuned synths, reversed guitars, granular vocal textures. + +## Vocal / Rap Approach + +Melodic rap, layered harmonies, ad-libs, processed vocal space. + +## Arrangement + +Hook-centered but with evolving sonic transitions. + +## Mood & Energy + +Dreamlike, futuristic, emotionally charged. + +## Performance Detail + +Maintain one recognizable anchor—groove, motif, bass figure, or vocal rhythm—while other elements mutate around it. diff --git a/music_styles/044_trip_hop.md b/music_styles/044_trip_hop.md new file mode 100644 index 0000000..06eb981 --- /dev/null +++ b/music_styles/044_trip_hop.md @@ -0,0 +1,32 @@ +# Trip-Hop + +**Family:** Downtempo / Atmospheric +**Typical tempo:** 60–95 BPM + +## Core Identity + +Slow, moody breakbeat music blending hip-hop rhythm with cinematic ambience, dub space, and dark melodic texture. + +## Rhythm & Drums + +Slow breakbeats, dusty snares, deep pocket, occasional live percussion. + +## Bass & Low End + +Warm sub, dub bass, or melodic low-end loop. + +## Harmony, Melody & Sound Palette + +Moody strings, Rhodes, guitar, vinyl texture, atmospheric samples. + +## Vocal / Rap Approach + +Low-key rap, spoken word, breathy singing, or instrumental focus. + +## Arrangement + +Long intros/outros, cinematic builds, restrained hooks. + +## Mood & Energy + +Smoky, nocturnal, cinematic, introspective. diff --git a/music_styles/045_downtempo_hip_hop.md b/music_styles/045_downtempo_hip_hop.md new file mode 100644 index 0000000..34fe9d2 --- /dev/null +++ b/music_styles/045_downtempo_hip_hop.md @@ -0,0 +1,32 @@ +# Downtempo Hip-Hop + +**Family:** Downtempo / Chill +**Typical tempo:** 60–85 BPM + +## Core Identity + +Slow, spacious hip-hop designed around relaxed grooves, warm texture, and understated melodic movement. + +## Rhythm & Drums + +Soft drums, delayed percussion, loose swing. + +## Bass & Low End + +Rounded bass, low dynamic aggression. + +## Harmony, Melody & Sound Palette + +Pads, keys, guitar, mellow samples, ambient layers. + +## Vocal / Rap Approach + +Relaxed rap or sparse vocal presence. + +## Arrangement + +Gradual development, long loops, smooth transitions. + +## Mood & Energy + +Calm, reflective, spacious, late-night. diff --git a/music_styles/046_instrumental_hip_hop.md b/music_styles/046_instrumental_hip_hop.md new file mode 100644 index 0000000..b5902ec --- /dev/null +++ b/music_styles/046_instrumental_hip_hop.md @@ -0,0 +1,32 @@ +# Instrumental Hip-Hop + +**Family:** Beat / Instrumental +**Typical tempo:** 65–105 BPM + +## Core Identity + +Hip-hop where the beat itself carries the narrative through sample development, groove, texture, and arrangement rather than vocals. + +## Rhythm & Drums + +Any hip-hop drum language; groove must remain compelling without an MC. + +## Bass & Low End + +Bass should provide melodic/rhythmic identity. + +## Harmony, Melody & Sound Palette + +Samples, live instruments, synths, chops, turntablism, textures. + +## Vocal / Rap Approach + +No lead vocal required; vocal chops can function as instruments. + +## Arrangement + +More frequent variation, beat changes, breakdowns, and instrumental motifs. + +## Mood & Energy + +Depends on substyle; prioritize musical storytelling. diff --git a/music_styles/047_sampledelic_hip_hop.md b/music_styles/047_sampledelic_hip_hop.md new file mode 100644 index 0000000..0395863 --- /dev/null +++ b/music_styles/047_sampledelic_hip_hop.md @@ -0,0 +1,36 @@ +# Sampledelic Hip-Hop + +**Family:** Sample-Based / Experimental +**Typical tempo:** 75–110 BPM + +## Core Identity + +Dense collage-style hip-hop built from many manipulated samples, layered references, unusual juxtapositions, and evolving edits. + +## Rhythm & Drums + +Breakbeats layered with chopped percussion and found rhythms. + +## Bass & Low End + +Sample-derived bass or resampled low-end fragments. + +## Harmony, Melody & Sound Palette + +Multiple micro-samples, vocal snippets, records, film fragments, resampling. + +## Vocal / Rap Approach + +Rap can be sparse or rhythmically integrated into the collage. + +## Arrangement + +Constant detail changes while preserving a central groove. + +## Mood & Energy + +Playful, surreal, dense, crate-digger-oriented. + +## Performance Detail + +Maintain one recognizable anchor—groove, motif, bass figure, or vocal rhythm—while other elements mutate around it. diff --git a/music_styles/048_soul_hip_hop.md b/music_styles/048_soul_hip_hop.md new file mode 100644 index 0000000..f5ce660 --- /dev/null +++ b/music_styles/048_soul_hip_hop.md @@ -0,0 +1,32 @@ +# Soul Hip-Hop + +**Family:** Soul / Sample-Based +**Typical tempo:** 72–96 BPM + +## Core Identity + +Warm hip-hop drawing from soul records, gospel harmony, expressive vocals, and emotionally rich chord movement. + +## Rhythm & Drums + +Classic boom-bap or relaxed modern drums. + +## Bass & Low End + +Warm sampled/electric bass; melodic root movement. + +## Harmony, Melody & Sound Palette + +Soul vocals, Rhodes, strings, guitar, organ, warm chord progressions. + +## Vocal / Rap Approach + +Expressive, personal, reflective, confident; melodic hooks welcome. + +## Arrangement + +Verses supported by rich sample loops; hooks can open up harmonically. + +## Mood & Energy + +Warm, heartfelt, nostalgic, uplifting or bittersweet. diff --git a/music_styles/049_chipmunk_soul.md b/music_styles/049_chipmunk_soul.md new file mode 100644 index 0000000..efa603c --- /dev/null +++ b/music_styles/049_chipmunk_soul.md @@ -0,0 +1,32 @@ +# Chipmunk Soul + +**Family:** Soul / Sample-Based +**Typical tempo:** 80–100 BPM + +## Core Identity + +Soul-sampling style built around noticeably pitch-raised vocal samples, energetic chops, and bright emotional contrast against hard drums. + +## Rhythm & Drums + +Punchy boom-bap or early-2000s-style drums. + +## Bass & Low End + +Simple bass supporting sample roots. + +## Harmony, Melody & Sound Palette + +High-pitched soul vocal phrases, chopped hooks, strings, piano, gospel fragments. + +## Vocal / Rap Approach + +Confident rap with room for sample call-and-response. + +## Arrangement + +Strong sampled hook, verses with reduced sample density, dramatic chops. + +## Mood & Energy + +Triumphant, nostalgic, emotional, energetic. diff --git a/music_styles/050_gospel_rap.md b/music_styles/050_gospel_rap.md new file mode 100644 index 0000000..e10bda1 --- /dev/null +++ b/music_styles/050_gospel_rap.md @@ -0,0 +1,32 @@ +# Gospel Rap + +**Family:** Soul / Spiritual +**Typical tempo:** 70–105 BPM + +## Core Identity + +Hip-hop that uses gospel musical language—choirs, organ, uplifting harmony, communal dynamics—within a rap song framework. + +## Rhythm & Drums + +Can be boom-bap, trap, live drums, or handclap-driven. + +## Bass & Low End + +Warm bass, organ-supported low end, or 808 depending modernity. + +## Harmony, Melody & Sound Palette + +Choir, Hammond organ, piano, handclaps, strings, major/extended harmony. + +## Vocal / Rap Approach + +Earnest, declarative, inspirational; sung choir hooks fit strongly. + +## Arrangement + +Builds toward larger choruses, call-and-response, dynamic lifts. + +## Mood & Energy + +Uplifting, reverent, triumphant, communal. diff --git a/music_styles/051_funk_rap.md b/music_styles/051_funk_rap.md new file mode 100644 index 0000000..324b2c8 --- /dev/null +++ b/music_styles/051_funk_rap.md @@ -0,0 +1,32 @@ +# Funk Rap + +**Family:** Funk / Groove +**Typical tempo:** 85–110 BPM + +## Core Identity + +Hip-hop centered on syncopated basslines, funk guitar, punchy drums, and danceable rhythmic interplay. + +## Rhythm & Drums + +Tight kick/snare groove, ghost notes, claps, percussion. + +## Bass & Low End + +Highly active electric or synth bassline. + +## Harmony, Melody & Sound Palette + +Wah guitar, clavinet, brass, synth stabs, talkbox-style textures. + +## Vocal / Rap Approach + +Rhythmic, charismatic, playful or boastful delivery. + +## Arrangement + +Groove-driven sections, breakdowns, instrumental fills. + +## Mood & Energy + +Bouncy, confident, playful, physical. diff --git a/music_styles/052_disco_rap.md b/music_styles/052_disco_rap.md new file mode 100644 index 0000000..4b64f45 --- /dev/null +++ b/music_styles/052_disco_rap.md @@ -0,0 +1,36 @@ +# Disco Rap + +**Family:** Funk / Dance +**Typical tempo:** 100–125 BPM + +## Core Identity + +Hip-hop blended with disco grooves, four-on-the-floor influence, bright strings, rhythm guitar, and dancefloor bass. + +## Rhythm & Drums + +Four-on-the-floor or disco-inflected kick with claps and open hats. + +## Bass & Low End + +Moving octave bassline or disco-funk bass. + +## Harmony, Melody & Sound Palette + +Strings, piano, rhythm guitar, bright synths, handclaps. + +## Vocal / Rap Approach + +Party-oriented rhythmic rap, chant hooks, crowd interaction. + +## Arrangement + +Verse/hook with dance breaks and extended groove sections. + +## Mood & Energy + +Celebratory, bright, glamorous, danceable. + +## Performance Detail + +Prioritize physical rhythm and fast recognition. Hooks should arrive quickly and low-end transients should remain uncluttered. diff --git a/music_styles/053_randb_rap.md b/music_styles/053_randb_rap.md new file mode 100644 index 0000000..eaac8bc --- /dev/null +++ b/music_styles/053_randb_rap.md @@ -0,0 +1,32 @@ +# R&B Rap + +**Family:** R&B / Melodic +**Typical tempo:** 70–100 BPM or 130–160 half-time + +## Core Identity + +Hip-hop blended with smooth contemporary R&B harmony, polished drums, melodic hooks, and intimate vocal production. + +## Rhythm & Drums + +Soft punchy drums, trap/R&B hats, clean snaps. + +## Bass & Low End + +Smooth sub or 808 kept controlled. + +## Harmony, Melody & Sound Palette + +Electric piano, pads, guitar, lush chords, vocal textures. + +## Vocal / Rap Approach + +Rap verses with sung hooks, melodic phrasing, close-mic intimacy. + +## Arrangement + +Strong verse/pre-hook/hook structure, bridges common. + +## Mood & Energy + +Smooth, romantic, polished, emotional. diff --git a/music_styles/054_neo_soul_hip_hop.md b/music_styles/054_neo_soul_hip_hop.md new file mode 100644 index 0000000..e3e7db9 --- /dev/null +++ b/music_styles/054_neo_soul_hip_hop.md @@ -0,0 +1,32 @@ +# Neo-Soul Hip-Hop + +**Family:** Soul / Jazz +**Typical tempo:** 68–95 BPM + +## Core Identity + +Hip-hop with neo-soul harmony, live-feeling instrumentation, deep pocket, and sophisticated chord voicings. + +## Rhythm & Drums + +Loose pocket, ghost notes, rimshots, brushed textures. + +## Bass & Low End + +Warm electric/upright bass with melodic movement. + +## Harmony, Melody & Sound Palette + +Rhodes, guitar, organ, jazz extensions, live keys, subtle strings. + +## Vocal / Rap Approach + +Conversational rap, soulful singing, understated dynamics. + +## Arrangement + +Organic evolution, instrumental bridges, layered harmonies. + +## Mood & Energy + +Warm, intimate, sophisticated, reflective. diff --git a/music_styles/055_pop_rap.md b/music_styles/055_pop_rap.md new file mode 100644 index 0000000..bc2b2db --- /dev/null +++ b/music_styles/055_pop_rap.md @@ -0,0 +1,32 @@ +# Pop Rap + +**Family:** Commercial / Pop +**Typical tempo:** 85–115 BPM or 120–160 half-time + +## Core Identity + +Accessible hip-hop with concise songwriting, polished production, strong hooks, and broad melodic appeal. + +## Rhythm & Drums + +Clean, punchy, radio-ready drums. + +## Bass & Low End + +Controlled bass/808, clear translation on small speakers. + +## Harmony, Melody & Sound Palette + +Simple memorable chords, synths, guitar, bright motifs. + +## Vocal / Rap Approach + +Clear rap verses and highly memorable melodic hooks. + +## Arrangement + +Short intro, hook early, compact verses, bridge, final hook. + +## Mood & Energy + +Catchy, polished, energetic, emotionally direct. diff --git a/music_styles/056_party_rap.md b/music_styles/056_party_rap.md new file mode 100644 index 0000000..f2c7f29 --- /dev/null +++ b/music_styles/056_party_rap.md @@ -0,0 +1,36 @@ +# Party Rap + +**Family:** Club / Commercial +**Typical tempo:** 90–120 BPM + +## Core Identity + +Upbeat hip-hop designed for group energy, memorable slogans, simple rhythmic hooks, and immediate dancefloor response. + +## Rhythm & Drums + +Hard kicks, claps, bright percussion, danceable swing. + +## Bass & Low End + +Strong bass pulse without overcomplication. + +## Harmony, Melody & Sound Palette + +Bright synths, brass stabs, vocal chops, simple riffs. + +## Vocal / Rap Approach + +Chants, call-and-response, short memorable phrases. + +## Arrangement + +Frequent hooks, drops, breakdowns, crowd-response sections. + +## Mood & Energy + +Fun, social, energetic, uncomplicated. + +## Performance Detail + +Prioritize physical rhythm and fast recognition. Hooks should arrive quickly and low-end transients should remain uncluttered. diff --git a/music_styles/057_club_rap.md b/music_styles/057_club_rap.md new file mode 100644 index 0000000..bddc6ef --- /dev/null +++ b/music_styles/057_club_rap.md @@ -0,0 +1,36 @@ +# Club Rap + +**Family:** Club / Commercial +**Typical tempo:** 95–135 BPM + +## Core Identity + +Bass-forward rap optimized for loud playback, rhythmic impact, clear hooks, and repetitive movement. + +## Rhythm & Drums + +Large kicks, claps, syncopated percussion, clean transients. + +## Bass & Low End + +Sub-heavy, simple, powerful bass or 808. + +## Harmony, Melody & Sound Palette + +Minimal synth hooks, stabs, vocal chops, risers. + +## Vocal / Rap Approach + +Direct, rhythmic, hook-focused, chant-ready. + +## Arrangement + +Fast access to hook, drops, short verses, instrumental breaks. + +## Mood & Energy + +Physical, confident, high-impact, nightlife-focused. + +## Performance Detail + +Prioritize physical rhythm and fast recognition. Hooks should arrive quickly and low-end transients should remain uncluttered. diff --git a/music_styles/058_miami_bass.md b/music_styles/058_miami_bass.md new file mode 100644 index 0000000..1284356 --- /dev/null +++ b/music_styles/058_miami_bass.md @@ -0,0 +1,36 @@ +# Miami Bass + +**Family:** Bass / Regional +**Typical tempo:** 110–135 BPM + +## Core Identity + +Fast Southern dance rap built around booming sub-bass, drum-machine patterns, syncopated rhythms, and party energy. + +## Rhythm & Drums + +808 drum machine, rapid kicks, claps, cowbell/percussion accents. + +## Bass & Low End + +Very deep sustained or pulsing sub-bass. + +## Harmony, Melody & Sound Palette + +Sparse synth stabs, electro textures, vocal chants. + +## Vocal / Rap Approach + +Rhythmic, energetic, repetitive, party-focused. + +## Arrangement + +Loop-driven with breakdowns designed for dancers. + +## Mood & Energy + +Loud, playful, bass-dominant, energetic. + +## Performance Detail + +Prioritize physical rhythm and fast recognition. Hooks should arrive quickly and low-end transients should remain uncluttered. diff --git a/music_styles/059_electro_hip_hop.md b/music_styles/059_electro_hip_hop.md new file mode 100644 index 0000000..efabe83 --- /dev/null +++ b/music_styles/059_electro_hip_hop.md @@ -0,0 +1,32 @@ +# Electro Hip-Hop + +**Family:** Electronic / Old School +**Typical tempo:** 105–130 BPM + +## Core Identity + +Early electronic hip-hop language featuring drum machines, robotic synths, vocoder textures, and breakdance-oriented grooves. + +## Rhythm & Drums + +TR-style electronic drums, syncopated kicks, handclaps. + +## Bass & Low End + +Synth bass, sequenced low-end patterns. + +## Harmony, Melody & Sound Palette + +Arpeggiators, vocoder, futuristic leads, electro bleeps. + +## Vocal / Rap Approach + +Rhythmic MCing, robotic processed phrases, call-and-response. + +## Arrangement + +Extended groove sections and instrumental breaks. + +## Mood & Energy + +Futuristic-retro, playful, mechanical, dance-oriented. diff --git a/music_styles/060_old_school_hip_hop.md b/music_styles/060_old_school_hip_hop.md new file mode 100644 index 0000000..d52bba0 --- /dev/null +++ b/music_styles/060_old_school_hip_hop.md @@ -0,0 +1,32 @@ +# Old-School Hip-Hop + +**Family:** Classic / Early +**Typical tempo:** 95–115 BPM + +## Core Identity + +Foundational late-1970s/early-1980s hip-hop with break-driven grooves, party MCing, simple rhyme patterns, and DJ-centered structure. + +## Rhythm & Drums + +Funk/disco breaks, handclaps, simple drum-machine support. + +## Bass & Low End + +Funk/disco bassline, often continuous and danceable. + +## Harmony, Melody & Sound Palette + +Breaks, rhythm guitar, horns, disco/funk loops, DJ cuts. + +## Vocal / Rap Approach + +Call-and-response, rhythmic boasting, crowd interaction. + +## Arrangement + +Long groove-based sections with alternating MC passages. + +## Mood & Energy + +Joyful, communal, rhythmic, foundational. diff --git a/music_styles/061_breakbeat_hip_hop.md b/music_styles/061_breakbeat_hip_hop.md new file mode 100644 index 0000000..0964ef0 --- /dev/null +++ b/music_styles/061_breakbeat_hip_hop.md @@ -0,0 +1,32 @@ +# Breakbeat Hip-Hop + +**Family:** Classic / Breaks +**Typical tempo:** 85–115 BPM + +## Core Identity + +Hip-hop emphasizing chopped or looped drum breaks, syncopated funk percussion, and rhythmic sample manipulation. + +## Rhythm & Drums + +Breaks are the centerpiece; preserve ghost notes and human swing. + +## Bass & Low End + +Bass should lock tightly to break accents. + +## Harmony, Melody & Sound Palette + +Funk/soul samples, percussion loops, short stabs. + +## Vocal / Rap Approach + +Rhythmic rap that rides changing drum accents. + +## Arrangement + +Break variations, fills, cuts, drum-only sections. + +## Mood & Energy + +Groovy, kinetic, sample-driven. diff --git a/music_styles/062_freestyle_rap.md b/music_styles/062_freestyle_rap.md new file mode 100644 index 0000000..755daa9 --- /dev/null +++ b/music_styles/062_freestyle_rap.md @@ -0,0 +1,36 @@ +# Freestyle Rap + +**Family:** Performance / Lyrical +**Typical tempo:** 80–100 BPM + +## Core Identity + +Beat design optimized for spontaneous MCing: clear pocket, predictable phrase lengths, restrained arrangement, and strong loop continuity. + +## Rhythm & Drums + +Steady, legible groove without excessive fills. + +## Bass & Low End + +Simple bass pattern that does not compete with cadence. + +## Harmony, Melody & Sound Palette + +One or two strong motifs, minimal harmonic changes. + +## Vocal / Rap Approach + +Open vocal space; adaptable to many flows and rhyme densities. + +## Arrangement + +Long 8/16-bar cycles, subtle transitions, few disruptive drops. + +## Mood & Energy + +Focused, flexible, cypher-ready. + +## Performance Detail + +Protect vocal intelligibility: avoid busy midrange layers during dense verses and use instrumental accents at phrase endings. diff --git a/music_styles/063_battle_rap.md b/music_styles/063_battle_rap.md new file mode 100644 index 0000000..ff01054 --- /dev/null +++ b/music_styles/063_battle_rap.md @@ -0,0 +1,36 @@ +# Battle Rap + +**Family:** Performance / Lyrical +**Typical tempo:** 78–98 BPM + +## Core Identity + +Sparse, aggressive hip-hop designed to foreground punchlines, cadence changes, and verbal impact. + +## Rhythm & Drums + +Hard snare, simple kick pattern, minimal rhythmic clutter. + +## Bass & Low End + +Controlled low end; avoid bass masking the voice. + +## Harmony, Melody & Sound Palette + +Dark stabs, tense strings/piano, minimal loops. + +## Vocal / Rap Approach + +Highly articulate, confrontational, punchline-heavy, stop-start delivery. + +## Arrangement + +Long verses, strategic pauses, limited hook dependence. + +## Mood & Energy + +Competitive, tense, direct, forceful. + +## Performance Detail + +Protect vocal intelligibility: avoid busy midrange layers during dense verses and use instrumental accents at phrase endings. diff --git a/music_styles/064_cypher_hip_hop.md b/music_styles/064_cypher_hip_hop.md new file mode 100644 index 0000000..3c3aa79 --- /dev/null +++ b/music_styles/064_cypher_hip_hop.md @@ -0,0 +1,36 @@ +# Cypher Hip-Hop + +**Family:** Performance / Lyrical +**Typical tempo:** 80–96 BPM + +## Core Identity + +Loop-centered hip-hop designed for multiple MCs to trade verses while maintaining a stable groove and neutral vocal space. + +## Rhythm & Drums + +Consistent boom-bap or stripped groove; modest fills. + +## Bass & Low End + +Simple looped bass that stays out of the midrange. + +## Harmony, Melody & Sound Palette + +Sample loop, keys, horns, or restrained atmosphere. + +## Vocal / Rap Approach + +Multiple distinct flows; beat should support handoffs between rappers. + +## Arrangement + +Extended verse blocks, short reset transitions, optional refrain. + +## Mood & Energy + +Communal, focused, energetic, lyrical. + +## Performance Detail + +Protect vocal intelligibility: avoid busy midrange layers during dense verses and use instrumental accents at phrase endings. diff --git a/music_styles/065_storytelling_rap.md b/music_styles/065_storytelling_rap.md new file mode 100644 index 0000000..77ee6c7 --- /dev/null +++ b/music_styles/065_storytelling_rap.md @@ -0,0 +1,36 @@ +# Storytelling Rap + +**Family:** Lyrical / Narrative +**Typical tempo:** 70–98 BPM + +## Core Identity + +Narrative-first hip-hop where musical choices support scene changes, pacing, tension, character, and emotional resolution. + +## Rhythm & Drums + +Steady drums with dynamic changes tied to narrative moments. + +## Bass & Low End + +Bass follows emotional arc rather than dominating. + +## Harmony, Melody & Sound Palette + +Cinematic samples, piano, strings, atmosphere, location-like sound design. + +## Vocal / Rap Approach + +Clear diction, varied tone, character voices, controlled pacing. + +## Arrangement + +Verses behave like scenes; transitions may mark time/place changes. + +## Mood & Energy + +Cinematic, immersive, reflective, dramatic. + +## Performance Detail + +Protect vocal intelligibility: avoid busy midrange layers during dense verses and use instrumental accents at phrase endings. diff --git a/music_styles/066_lyrical_hip_hop.md b/music_styles/066_lyrical_hip_hop.md new file mode 100644 index 0000000..7bc1b21 --- /dev/null +++ b/music_styles/066_lyrical_hip_hop.md @@ -0,0 +1,36 @@ +# Lyrical Hip-Hop + +**Family:** Lyrical +**Typical tempo:** 75–100 BPM + +## Core Identity + +Rap-centered production deliberately leaves space for complex writing, rhyme schemes, and nuanced vocal rhythm. + +## Rhythm & Drums + +Clear pocket, moderate density, strong snare reference. + +## Bass & Low End + +Simple supportive bass. + +## Harmony, Melody & Sound Palette + +Restrained sample or melodic loop with limited frequency clutter. + +## Vocal / Rap Approach + +Dense bars, internal rhymes, multi-syllabic patterns, dynamic cadence. + +## Arrangement + +Verse-dominant, hooks simple enough not to distract. + +## Mood & Energy + +Focused, intelligent, expressive, performance-first. + +## Performance Detail + +Protect vocal intelligibility: avoid busy midrange layers during dense verses and use instrumental accents at phrase endings. diff --git a/music_styles/067_technical_rap.md b/music_styles/067_technical_rap.md new file mode 100644 index 0000000..a101da4 --- /dev/null +++ b/music_styles/067_technical_rap.md @@ -0,0 +1,36 @@ +# Technical Rap + +**Family:** Lyrical / Technical +**Typical tempo:** 75–105 BPM or double-time + +## Core Identity + +Production tailored to intricate rhyme density, cadence shifts, breath control, and rhythmic precision. + +## Rhythm & Drums + +Very clear subdivision; crisp hats and snare provide timing landmarks. + +## Bass & Low End + +Tight low end with short decay. + +## Harmony, Melody & Sound Palette + +Minimal motifs, dark keys, simple loops, occasional accent stabs. + +## Vocal / Rap Approach + +Rapid internal rhyme, multi-syllabic patterns, tempo switches, precise articulation. + +## Arrangement + +Long verses with purposeful beat drops for emphasis. + +## Mood & Energy + +Controlled, intense, intricate, athletic. + +## Performance Detail + +Protect vocal intelligibility: avoid busy midrange layers during dense verses and use instrumental accents at phrase endings. diff --git a/music_styles/068_fast_rap_chopper.md b/music_styles/068_fast_rap_chopper.md new file mode 100644 index 0000000..7222bcc --- /dev/null +++ b/music_styles/068_fast_rap_chopper.md @@ -0,0 +1,36 @@ +# Fast Rap / Chopper + +**Family:** Lyrical / Technical +**Typical tempo:** 85–110 BPM with double-time vocal feel + +## Core Identity + +High-speed rap format designed for double-time or extremely dense syllabic delivery while preserving intelligibility. + +## Rhythm & Drums + +Simple, crisp, highly legible drums; avoid clutter at fast subdivisions. + +## Bass & Low End + +Short controlled bass notes or 808s. + +## Harmony, Melody & Sound Palette + +Minimal harmonic material; rhythmic stabs can mark phrase boundaries. + +## Vocal / Rap Approach + +Very fast articulation, repeated rhythmic cells, breath-aware phrase design. + +## Arrangement + +Sections should include brief rests, drops, or half-time resets. + +## Mood & Energy + +Energetic, technical, urgent, precision-focused. + +## Performance Detail + +Protect vocal intelligibility: avoid busy midrange layers during dense verses and use instrumental accents at phrase endings. diff --git a/music_styles/069_syllable_dense_rap.md b/music_styles/069_syllable_dense_rap.md new file mode 100644 index 0000000..80a597d --- /dev/null +++ b/music_styles/069_syllable_dense_rap.md @@ -0,0 +1,36 @@ +# Syllable-Dense Rap + +**Family:** Lyrical / Technical +**Typical tempo:** 72–100 BPM + +## Core Identity + +Hip-hop optimized for unusually dense lyric writing, internal rhymes, consonant detail, and constantly changing cadence. + +## Rhythm & Drums + +Stable groove, modest fills, strong timing anchors. + +## Bass & Low End + +Low-end kept simple and uncluttered. + +## Harmony, Melody & Sound Palette + +Sparse samples/keys with holes in the midrange. + +## Vocal / Rap Approach + +Dense multisyllabic rhyme chains, internal patterns, controlled rhythmic variation. + +## Arrangement + +Long verses, short hooks, occasional drum dropouts for verbal emphasis. + +## Mood & Energy + +Cerebral, intense, intricate, focused. + +## Performance Detail + +Protect vocal intelligibility: avoid busy midrange layers during dense verses and use instrumental accents at phrase endings. diff --git a/music_styles/070_spoken_word_hip_hop.md b/music_styles/070_spoken_word_hip_hop.md new file mode 100644 index 0000000..376684e --- /dev/null +++ b/music_styles/070_spoken_word_hip_hop.md @@ -0,0 +1,36 @@ +# Spoken-Word Hip-Hop + +**Family:** Lyrical / Poetic +**Typical tempo:** 55–90 BPM + +## Core Identity + +Minimal hip-hop supporting poetry-like delivery, dynamic speech rhythm, and emotional language rather than conventional rap cadence. + +## Rhythm & Drums + +Sparse percussion, brushes, rimshots, soft kicks, or no drums in sections. + +## Bass & Low End + +Subtle bass or drone. + +## Harmony, Melody & Sound Palette + +Piano, strings, ambient textures, jazz harmony, field recordings. + +## Vocal / Rap Approach + +Natural speech cadence, pauses, dynamic emphasis, intimate tone. + +## Arrangement + +Free-form sections, gradual builds, instrumental breathing room. + +## Mood & Energy + +Intimate, reflective, literary, emotionally exposed. + +## Performance Detail + +Protect vocal intelligibility: avoid busy midrange layers during dense verses and use instrumental accents at phrase endings. diff --git a/music_styles/071_emo_rap.md b/music_styles/071_emo_rap.md new file mode 100644 index 0000000..fd2a494 --- /dev/null +++ b/music_styles/071_emo_rap.md @@ -0,0 +1,32 @@ +# Emo Rap + +**Family:** Melodic / Emotional +**Typical tempo:** 115–155 BPM or slow half-time + +## Core Identity + +Emotionally vulnerable rap combining trap/lo-fi production with melodic vocals, guitar or piano motifs, and confessional writing. + +## Rhythm & Drums + +Soft trap drums, restrained hats, emotional pauses. + +## Bass & Low End + +Warm 808, often following chord roots. + +## Harmony, Melody & Sound Palette + +Guitar loops, piano, pads, vocal texture, minor/relative-major harmony. + +## Vocal / Rap Approach + +Melodic rap, fragile singing, layered doubles, intimate delivery. + +## Arrangement + +Hook-heavy, compact verses, bridge or breakdown for emotional peak. + +## Mood & Energy + +Vulnerable, melancholic, intimate, cathartic. diff --git a/music_styles/072_sad_rap.md b/music_styles/072_sad_rap.md new file mode 100644 index 0000000..16be841 --- /dev/null +++ b/music_styles/072_sad_rap.md @@ -0,0 +1,32 @@ +# Sad Rap + +**Family:** Melodic / Emotional +**Typical tempo:** 60–90 BPM or 120–150 half-time + +## Core Identity + +Melancholic rap built around sparse harmony, slow pacing, introspection, and subdued production. + +## Rhythm & Drums + +Soft, simple, low-impact drums. + +## Bass & Low End + +Rounded sub or quiet 808. + +## Harmony, Melody & Sound Palette + +Piano, guitar, ambient pads, rain/room textures, minimal motifs. + +## Vocal / Rap Approach + +Low-energy, reflective, melodic or spoken delivery. + +## Arrangement + +Long verses, restrained hooks, gradual dynamic movement. + +## Mood & Energy + +Somber, introspective, lonely, bittersweet. diff --git a/music_styles/073_bedroom_rap.md b/music_styles/073_bedroom_rap.md new file mode 100644 index 0000000..6aed5e5 --- /dev/null +++ b/music_styles/073_bedroom_rap.md @@ -0,0 +1,36 @@ +# Bedroom Rap + +**Family:** Lo-Fi / Indie +**Typical tempo:** 65–100 BPM + +## Core Identity + +DIY, intimate hip-hop that embraces imperfect recording texture, simple arrangements, and personal songwriting. + +## Rhythm & Drums + +Loose programmed drums, room-like texture, low-fi transients. + +## Bass & Low End + +Simple bass or sub; not overly polished. + +## Harmony, Melody & Sound Palette + +Home-recorded guitar/keys, cheap synths, room noise, tape saturation. + +## Vocal / Rap Approach + +Close, conversational, understated, sometimes imperfect by design. + +## Arrangement + +Compact, songlike forms with handmade transitions. + +## Mood & Energy + +Personal, warm, awkward-in-a-good-way, intimate. + +## Performance Detail + +Use degradation selectively. The mix can sound worn without becoming muddy; preserve a readable kick, snare, and vocal range. diff --git a/music_styles/074_indie_hip_hop.md b/music_styles/074_indie_hip_hop.md new file mode 100644 index 0000000..1ff5689 --- /dev/null +++ b/music_styles/074_indie_hip_hop.md @@ -0,0 +1,32 @@ +# Indie Hip-Hop + +**Family:** Underground / Alternative +**Typical tempo:** 65–115 BPM + +## Core Identity + +Artist-driven hip-hop with idiosyncratic production, unconventional influences, and less concern for mainstream structure. + +## Rhythm & Drums + +Varies widely; should feel intentional and characterful. + +## Bass & Low End + +Bass chosen for song identity, not genre convention. + +## Harmony, Melody & Sound Palette + +Indie rock, jazz, electronics, folk, soul, or experimental elements. + +## Vocal / Rap Approach + +Distinctive personal voice; can mix rap and singing. + +## Arrangement + +Flexible structures, unexpected bridges, instrumental passages. + +## Mood & Energy + +Individualistic, creative, authentic, exploratory. diff --git a/music_styles/075_lo_fi_underground.md b/music_styles/075_lo_fi_underground.md new file mode 100644 index 0000000..213d011 --- /dev/null +++ b/music_styles/075_lo_fi_underground.md @@ -0,0 +1,36 @@ +# Lo-Fi Underground + +**Family:** Underground / Lo-Fi +**Typical tempo:** 70–92 BPM + +## Core Identity + +Raw underground rap with degraded sample texture, dusty drums, narrow bandwidth, and deliberately unpolished sonics. + +## Rhythm & Drums + +Crunchy, clipped, dusty, slightly loose. + +## Bass & Low End + +Sampled bass or muted sub. + +## Harmony, Melody & Sound Palette + +Obscure chops, tape hiss, vinyl crackle, filtered loops. + +## Vocal / Rap Approach + +Low-key, dense, conversational, often dry and close. + +## Arrangement + +Loop-heavy, subtle changes, short hooks or none. + +## Mood & Energy + +Gritty, intimate, obscure, late-night. + +## Performance Detail + +Use degradation selectively. The mix can sound worn without becoming muddy; preserve a readable kick, snare, and vocal range. diff --git a/music_styles/076_grimy_boom_bap.md b/music_styles/076_grimy_boom_bap.md new file mode 100644 index 0000000..6176896 --- /dev/null +++ b/music_styles/076_grimy_boom_bap.md @@ -0,0 +1,36 @@ +# Grimy Boom Bap + +**Family:** Boom Bap / Dark +**Typical tempo:** 78–94 BPM + +## Core Identity + +A dirtier, more abrasive boom-bap variant with rough sampling, hard drums, low-mid weight, and street-level atmosphere. + +## Rhythm & Drums + +Crushed kicks, snapping snares, gritty hats, hard swing. + +## Bass & Low End + +Dirty sampled bass or saturated low-end loop. + +## Harmony, Melody & Sound Palette + +Dark soul/jazz chops, detuned piano, brass, vinyl grit. + +## Vocal / Rap Approach + +Forceful, bar-heavy, dry vocal presence. + +## Arrangement + +Long verse loops, abrupt mutes, sample drops, DJ cuts. + +## Mood & Energy + +Dirty, hard, urban, uncompromising. + +## Performance Detail + +Keep the groove human: slight swing and imperfect sample timing are usually more convincing than rigid quantization. diff --git a/music_styles/077_dark_boom_bap.md b/music_styles/077_dark_boom_bap.md new file mode 100644 index 0000000..06534e5 --- /dev/null +++ b/music_styles/077_dark_boom_bap.md @@ -0,0 +1,36 @@ +# Dark Boom Bap + +**Family:** Boom Bap / Dark +**Typical tempo:** 76–94 BPM + +## Core Identity + +Boom-bap built around ominous samples, minor harmony, sparse melodic motion, and cinematic tension. + +## Rhythm & Drums + +Hard but controlled; snare-forward groove. + +## Bass & Low End + +Deep sampled bass or sub reinforcement. + +## Harmony, Melody & Sound Palette + +Minor piano, horror/suspense strings, low brass, eerie vocal chops. + +## Vocal / Rap Approach + +Measured, serious, technically precise rap. + +## Arrangement + +Loop-focused with tension variations and dramatic drops. + +## Mood & Energy + +Nocturnal, sinister, focused, cinematic. + +## Performance Detail + +Keep the groove human: slight swing and imperfect sample timing are usually more convincing than rigid quantization. diff --git a/music_styles/078_jazz_boom_bap.md b/music_styles/078_jazz_boom_bap.md new file mode 100644 index 0000000..4415d55 --- /dev/null +++ b/music_styles/078_jazz_boom_bap.md @@ -0,0 +1,36 @@ +# Jazz Boom Bap + +**Family:** Boom Bap / Jazz +**Typical tempo:** 78–96 BPM + +## Core Identity + +Classic boom-bap drums paired with jazz samples, extended harmony, horn fragments, and swinging musical phrasing. + +## Rhythm & Drums + +Dusty kick/snare, swing, occasional brushed percussion. + +## Bass & Low End + +Upright/electric bass loops, walking fragments. + +## Harmony, Melody & Sound Palette + +Sax, trumpet, piano, vibraphone, Rhodes, jazz guitar. + +## Vocal / Rap Approach + +Relaxed but articulate, pocket-aware lyrical flow. + +## Arrangement + +Sample loop evolves through horn/piano variations and cutaways. + +## Mood & Energy + +Cool, sophisticated, smoky, head-nod. + +## Performance Detail + +Keep the groove human: slight swing and imperfect sample timing are usually more convincing than rigid quantization. diff --git a/music_styles/079_soulful_boom_bap.md b/music_styles/079_soulful_boom_bap.md new file mode 100644 index 0000000..9485377 --- /dev/null +++ b/music_styles/079_soulful_boom_bap.md @@ -0,0 +1,36 @@ +# Soulful Boom Bap + +**Family:** Boom Bap / Soul +**Typical tempo:** 78–96 BPM + +## Core Identity + +Boom-bap with warm soul samples, expressive chord movement, vocal chops, and emotionally resonant grooves. + +## Rhythm & Drums + +Punchy but warm, modest swing. + +## Bass & Low End + +Warm bass sample or electric bass. + +## Harmony, Melody & Sound Palette + +Soul vocals, strings, Rhodes, guitar, organ. + +## Vocal / Rap Approach + +Reflective, confident, heartfelt delivery. + +## Arrangement + +Verses use chopped loop; hooks open up with fuller sample phrase. + +## Mood & Energy + +Warm, nostalgic, triumphant or bittersweet. + +## Performance Detail + +Keep the groove human: slight swing and imperfect sample timing are usually more convincing than rigid quantization. diff --git a/music_styles/080_cinematic_hip_hop.md b/music_styles/080_cinematic_hip_hop.md new file mode 100644 index 0000000..cc4c649 --- /dev/null +++ b/music_styles/080_cinematic_hip_hop.md @@ -0,0 +1,36 @@ +# Cinematic Hip-Hop + +**Family:** Cinematic +**Typical tempo:** 60–110 BPM + +## Core Identity + +Hip-hop arranged like a film score, using dynamic builds, orchestral or ambient layers, scene-setting textures, and dramatic pacing. + +## Rhythm & Drums + +Can move from minimal percussion to large impact drums. + +## Bass & Low End + +Sub/bass follows dramatic arc, sometimes absent in intros. + +## Harmony, Melody & Sound Palette + +Strings, brass, piano, sound design, drones, impacts, ambience. + +## Vocal / Rap Approach + +Narrative or emotionally dramatic delivery; space for spoken sections. + +## Arrangement + +Multi-stage builds, breakdowns, climaxes, transitions, motif reprises. + +## Mood & Energy + +Epic, dramatic, immersive, visual. + +## Performance Detail + +Use motifs and dynamic range. Avoid stacking every large sound at once; save the widest orchestration for structural peaks. diff --git a/music_styles/081_orchestral_hip_hop.md b/music_styles/081_orchestral_hip_hop.md new file mode 100644 index 0000000..51c8b3c --- /dev/null +++ b/music_styles/081_orchestral_hip_hop.md @@ -0,0 +1,36 @@ +# Orchestral Hip-Hop + +**Family:** Cinematic +**Typical tempo:** 70–105 BPM + +## Core Identity + +Hip-hop built around orchestral instrumentation and arrangement while retaining a strong rap pocket. + +## Rhythm & Drums + +Hip-hop drums layered with timpani, orchestral percussion, cymbal swells. + +## Bass & Low End + +Deep bass plus low strings/brass support. + +## Harmony, Melody & Sound Palette + +Strings, brass, woodwinds, choir, piano, orchestral ostinatos. + +## Vocal / Rap Approach + +Commanding, cinematic, lyrical or narrative delivery. + +## Arrangement + +Clear builds, thematic reprises, orchestral interludes. + +## Mood & Energy + +Grand, serious, dramatic, stately. + +## Performance Detail + +Use motifs and dynamic range. Avoid stacking every large sound at once; save the widest orchestration for structural peaks. diff --git a/music_styles/082_epic_hip_hop.md b/music_styles/082_epic_hip_hop.md new file mode 100644 index 0000000..4e99e9c --- /dev/null +++ b/music_styles/082_epic_hip_hop.md @@ -0,0 +1,36 @@ +# Epic Hip-Hop + +**Family:** Cinematic / Anthemic +**Typical tempo:** 70–110 BPM or 140–160 half-time + +## Core Identity + +Large-scale hip-hop emphasizing huge drums, dramatic harmonic movement, broad synth/orchestral layers, and climactic hooks. + +## Rhythm & Drums + +Massive kicks/snares, impact drums, percussion builds. + +## Bass & Low End + +Powerful sub/808, often reinforced with orchestral lows. + +## Harmony, Melody & Sound Palette + +Brass, strings, choir, synth stacks, risers, impacts. + +## Vocal / Rap Approach + +Commanding, motivational, anthem-ready delivery. + +## Arrangement + +Build/drop/climax structure with repeated peak hook. + +## Mood & Energy + +Triumphant, intense, monumental, motivational. + +## Performance Detail + +Use motifs and dynamic range. Avoid stacking every large sound at once; save the widest orchestration for structural peaks. diff --git a/music_styles/083_minimal_hip_hop.md b/music_styles/083_minimal_hip_hop.md new file mode 100644 index 0000000..8a3ded9 --- /dev/null +++ b/music_styles/083_minimal_hip_hop.md @@ -0,0 +1,32 @@ +# Minimal Hip-Hop + +**Family:** Minimal +**Typical tempo:** 65–105 BPM + +## Core Identity + +Hip-hop reduced to a few essential elements so rhythm, vocal character, and negative space carry the track. + +## Rhythm & Drums + +Sparse kick/snare/hat pattern; every hit matters. + +## Bass & Low End + +One simple bass or 808 figure. + +## Harmony, Melody & Sound Palette + +Single motif, texture, stab, or small chord loop. + +## Vocal / Rap Approach + +Vocal is foregrounded; pauses and rhythmic nuance become important. + +## Arrangement + +Few layers, strong muting, subtle section changes. + +## Mood & Energy + +Focused, cool, dry, modern. diff --git a/music_styles/084_bass_heavy_hip_hop.md b/music_styles/084_bass_heavy_hip_hop.md new file mode 100644 index 0000000..8131b73 --- /dev/null +++ b/music_styles/084_bass_heavy_hip_hop.md @@ -0,0 +1,32 @@ +# Bass-Heavy Hip-Hop + +**Family:** Bass / Modern +**Typical tempo:** 65–150 BPM + +## Core Identity + +Hip-hop designed around dominant low-frequency impact while retaining enough headroom and midrange space for drums and vocals. + +## Rhythm & Drums + +Hard, simple drums with clear transient separation. + +## Bass & Low End + +Primary feature: large sub, 808, synth bass, slides or sustained notes. + +## Harmony, Melody & Sound Palette + +Minimal mids; sparse motifs prevent masking. + +## Vocal / Rap Approach + +Direct, rhythmically strong delivery that can cut through dense low end. + +## Arrangement + +Drops and mutes emphasize bass arrival; hooks maximize low-end impact. + +## Mood & Energy + +Physical, powerful, dark or club-ready. diff --git a/music_styles/085_atmospheric_hip_hop.md b/music_styles/085_atmospheric_hip_hop.md new file mode 100644 index 0000000..84bf685 --- /dev/null +++ b/music_styles/085_atmospheric_hip_hop.md @@ -0,0 +1,32 @@ +# Atmospheric Hip-Hop + +**Family:** Atmospheric +**Typical tempo:** 60–100 BPM + +## Core Identity + +Spacious hip-hop where ambience, reverb, texture, and slow-moving harmony are as important as the drums. + +## Rhythm & Drums + +Soft or restrained drums; long tails and spacious placement. + +## Bass & Low End + +Warm sub, low drone, or minimal bass. + +## Harmony, Melody & Sound Palette + +Pads, reversed textures, field ambience, distant keys, vocal clouds. + +## Vocal / Rap Approach + +Intimate, melodic, reflective, or detached delivery. + +## Arrangement + +Long intros/outros, gradual layer changes, restrained transitions. + +## Mood & Energy + +Immersive, reflective, nocturnal, spacious. diff --git a/music_styles/086_dream_rap.md b/music_styles/086_dream_rap.md new file mode 100644 index 0000000..24c956f --- /dev/null +++ b/music_styles/086_dream_rap.md @@ -0,0 +1,32 @@ +# Dream Rap + +**Family:** Atmospheric / Dreamy +**Typical tempo:** 65–145 BPM + +## Core Identity + +Ethereal rap using soft percussion, shimmering harmony, blurred textures, and emotionally distant or surreal vocal presentation. + +## Rhythm & Drums + +Soft trap/lo-fi drums, airy hats, gentle transients. + +## Bass & Low End + +Smooth sub/808 with little distortion. + +## Harmony, Melody & Sound Palette + +Dream pads, chorus guitar, bells, reversed textures, reverb clouds. + +## Vocal / Rap Approach + +Breathy, melodic, detached, layered, occasionally whispered. + +## Arrangement + +Simple hooks, floating verse sections, long ambience tails. + +## Mood & Energy + +Dreamlike, wistful, weightless, surreal. diff --git a/music_styles/087_space_rap.md b/music_styles/087_space_rap.md new file mode 100644 index 0000000..b85dab4 --- /dev/null +++ b/music_styles/087_space_rap.md @@ -0,0 +1,32 @@ +# Space Rap + +**Family:** Futuristic / Atmospheric +**Typical tempo:** 70–150 BPM + +## Core Identity + +Futuristic hip-hop built around cosmic synth design, spacious stereo imaging, sci-fi ambience, and floating low end. + +## Rhythm & Drums + +Electronic drums with clean transients and wide spatial effects. + +## Bass & Low End + +Deep sub or gliding 808, sometimes modulated. + +## Harmony, Melody & Sound Palette + +Arps, sci-fi pads, FM tones, granular effects, orbital ambience. + +## Vocal / Rap Approach + +Cool, detached, melodic or technically precise rap. + +## Arrangement + +Expansive intros, drop-based verses, atmospheric bridges. + +## Mood & Energy + +Cosmic, futuristic, isolated, expansive. diff --git a/music_styles/088_futuristic_hip_hop.md b/music_styles/088_futuristic_hip_hop.md new file mode 100644 index 0000000..ed53d84 --- /dev/null +++ b/music_styles/088_futuristic_hip_hop.md @@ -0,0 +1,32 @@ +# Futuristic Hip-Hop + +**Family:** Futuristic +**Typical tempo:** 70–160 BPM + +## Core Identity + +Forward-looking hip-hop using novel synthesis, advanced sound design, unexpected rhythms, and polished digital production. + +## Rhythm & Drums + +Hybrid acoustic/electronic hits, unusual percussion, precise programming. + +## Bass & Low End + +Synthetic bass, resampled 808s, modulated sub. + +## Harmony, Melody & Sound Palette + +Granular synths, spectral textures, digital leads, unusual processing. + +## Vocal / Rap Approach + +Flexible: robotic, melodic, rapid, processed, or clean. + +## Arrangement + +Nonstandard transitions, evolving sound design, beat switches. + +## Mood & Energy + +Innovative, digital, sleek, unpredictable. diff --git a/music_styles/089_cyberpunk_hip_hop.md b/music_styles/089_cyberpunk_hip_hop.md new file mode 100644 index 0000000..aec9d1e --- /dev/null +++ b/music_styles/089_cyberpunk_hip_hop.md @@ -0,0 +1,32 @@ +# Cyberpunk Hip-Hop + +**Family:** Futuristic / Dark +**Typical tempo:** 75–150 BPM + +## Core Identity + +Dark futuristic rap combining industrial textures, neon synths, distorted bass, machine rhythms, and dystopian atmosphere. + +## Rhythm & Drums + +Mechanical drums, hard transients, glitch details. + +## Bass & Low End + +Distorted synth bass/808, sub drones. + +## Harmony, Melody & Sound Palette + +Dark synthwave leads, noise, alarms, granular effects, metallic ambience. + +## Vocal / Rap Approach + +Cold, processed, aggressive, spoken or melodic delivery. + +## Arrangement + +Cinematic intro, heavy drop, breakdowns with machine ambience. + +## Mood & Energy + +Dystopian, neon-lit, tense, technological. diff --git a/music_styles/090_retro_futuristic_hip_hop.md b/music_styles/090_retro_futuristic_hip_hop.md new file mode 100644 index 0000000..868ef17 --- /dev/null +++ b/music_styles/090_retro_futuristic_hip_hop.md @@ -0,0 +1,32 @@ +# Retro-Futuristic Hip-Hop + +**Family:** Futuristic / Retro +**Typical tempo:** 80–130 BPM + +## Core Identity + +Hip-hop imagining the future through vintage synth technology, analog textures, early digital sounds, and modern drum weight. + +## Rhythm & Drums + +Modern punch with retro drum-machine accents. + +## Bass & Low End + +Synth bass combining analog warmth with modern sub. + +## Harmony, Melody & Sound Palette + +Analog polysynths, FM keys, vintage arps, tape effects. + +## Vocal / Rap Approach + +Smooth, stylish, rhythmic delivery; melodic hooks fit well. + +## Arrangement + +Verse/hook with synth interludes and retro transitions. + +## Mood & Energy + +Nostalgic-futurist, stylish, cinematic, playful. diff --git a/music_styles/091_synthwave_hip_hop.md b/music_styles/091_synthwave_hip_hop.md new file mode 100644 index 0000000..482f25c --- /dev/null +++ b/music_styles/091_synthwave_hip_hop.md @@ -0,0 +1,32 @@ +# Synthwave Hip-Hop + +**Family:** Futuristic / Retro +**Typical tempo:** 85–120 BPM + +## Core Identity + +Hip-hop layered over 1980s-inspired synthwave harmony, gated drums, analog bass, arpeggios, and neon cinematic textures. + +## Rhythm & Drums + +Hip-hop groove blended with gated/snappy retro drums. + +## Bass & Low End + +Analog synth bass plus controlled sub. + +## Harmony, Melody & Sound Palette + +Juno-style pads, arps, bright leads, gated reverb, retro keys. + +## Vocal / Rap Approach + +Cool, melodic, cinematic, sometimes deadpan. + +## Arrangement + +Strong intro atmosphere, hook-driven sections, synth breakdown. + +## Mood & Energy + +Neon, nocturnal, nostalgic, cinematic. diff --git a/music_styles/092_latin_hip_hop.md b/music_styles/092_latin_hip_hop.md new file mode 100644 index 0000000..661aa30 --- /dev/null +++ b/music_styles/092_latin_hip_hop.md @@ -0,0 +1,32 @@ +# Latin Hip-Hop + +**Family:** Latin / Regional +**Typical tempo:** 80–110 BPM + +## Core Identity + +Hip-hop integrating Latin rhythmic language, percussion, melodic instruments, and regional musical references. + +## Rhythm & Drums + +Hip-hop drums blended with congas, timbales, claves, shakers, or dembow-adjacent accents. + +## Bass & Low End + +Warm bass or sub with syncopation. + +## Harmony, Melody & Sound Palette + +Guitar, brass, piano, regional percussion, sampled vocals. + +## Vocal / Rap Approach + +Rhythmic rap, bilingual phrasing where relevant, melodic hooks. + +## Arrangement + +Danceable verse/hook structure with percussion breaks. + +## Mood & Energy + +Rhythmic, warm, social, culturally textured. diff --git a/music_styles/093_reggae_hip_hop.md b/music_styles/093_reggae_hip_hop.md new file mode 100644 index 0000000..5f4eef7 --- /dev/null +++ b/music_styles/093_reggae_hip_hop.md @@ -0,0 +1,32 @@ +# Reggae Hip-Hop + +**Family:** Caribbean / Fusion +**Typical tempo:** 72–95 BPM + +## Core Identity + +Hip-hop fused with reggae’s offbeat rhythm, dub bass, spacious effects, and relaxed vocal pocket. + +## Rhythm & Drums + +Hip-hop drums with one-drop/steppers influence, rimshots, offbeat accents. + +## Bass & Low End + +Deep dub-style bassline is central. + +## Harmony, Melody & Sound Palette + +Skank guitar/keys, organ bubble, dub delay, horns. + +## Vocal / Rap Approach + +Relaxed rap, singjay-style melody, call-and-response. + +## Arrangement + +Verse/hook with dub breakdowns and delay throws. + +## Mood & Energy + +Laid-back, warm, conscious or celebratory. diff --git a/music_styles/094_dancehall_rap.md b/music_styles/094_dancehall_rap.md new file mode 100644 index 0000000..b4a29f2 --- /dev/null +++ b/music_styles/094_dancehall_rap.md @@ -0,0 +1,32 @@ +# Dancehall Rap + +**Family:** Caribbean / Fusion +**Typical tempo:** 90–110 BPM + +## Core Identity + +Rap over dancehall-influenced rhythms with syncopated drums, heavy bass, percussive vocal cadence, and energetic hooks. + +## Rhythm & Drums + +Dembow/dancehall-informed kick-snare patterns, percussion, shakers. + +## Bass & Low End + +Heavy but rhythmic bass, often short and punchy. + +## Harmony, Melody & Sound Palette + +Sparse synth stabs, plucks, vocal chops, tropical percussion. + +## Vocal / Rap Approach + +Highly rhythmic, melodic or chant-like delivery. + +## Arrangement + +Hook-heavy, dance-focused, quick transitions. + +## Mood & Energy + +Energetic, confident, warm, club-ready. diff --git a/music_styles/095_afro_hip_hop.md b/music_styles/095_afro_hip_hop.md new file mode 100644 index 0000000..667a262 --- /dev/null +++ b/music_styles/095_afro_hip_hop.md @@ -0,0 +1,32 @@ +# Afro Hip-Hop + +**Family:** African / Fusion +**Typical tempo:** 85–115 BPM + +## Core Identity + +Hip-hop blended with African rhythmic traditions, guitar/keyboard patterns, layered percussion, and regional groove concepts. + +## Rhythm & Drums + +Polyrhythmic percussion, shakers, claps, syncopated kick patterns. + +## Bass & Low End + +Warm melodic bass, sometimes less sub-heavy than trap. + +## Harmony, Melody & Sound Palette + +Guitars, marimba-like plucks, keys, horns, regional textures. + +## Vocal / Rap Approach + +Rhythmic rap, melodic refrains, call-and-response. + +## Arrangement + +Groove-led structure with instrumental movement. + +## Mood & Energy + +Warm, rhythmic, communal, vibrant. diff --git a/music_styles/096_afrobeats_rap.md b/music_styles/096_afrobeats_rap.md new file mode 100644 index 0000000..42aae02 --- /dev/null +++ b/music_styles/096_afrobeats_rap.md @@ -0,0 +1,32 @@ +# Afrobeats Rap + +**Family:** African / Fusion +**Typical tempo:** 95–115 BPM + +## Core Identity + +Rap integrated with Afrobeats production: syncopated percussion, melodic guitar/keys, smooth bass, and hook-led songwriting. + +## Rhythm & Drums + +Layered shakers, rimshots, kick syncopation, percussion loops. + +## Bass & Low End + +Warm rounded bass with melodic movement. + +## Harmony, Melody & Sound Palette + +Clean guitars, plucks, keys, bright pads, vocal textures. + +## Vocal / Rap Approach + +Melodic rap, sing-rap, smooth phrasing, catchy hooks. + +## Arrangement + +Short verses, recurring hook, danceable instrumental sections. + +## Mood & Energy + +Smooth, warm, infectious, uplifting. diff --git a/music_styles/097_grime.md b/music_styles/097_grime.md new file mode 100644 index 0000000..39f1fa9 --- /dev/null +++ b/music_styles/097_grime.md @@ -0,0 +1,32 @@ +# Grime + +**Family:** UK / Electronic +**Typical tempo:** 138–142 BPM + +## Core Identity + +Fast UK MC music built around sparse 140-BPM electronic production, aggressive square-wave bass, and sharply rhythmic delivery. + +## Rhythm & Drums + +Sparse punchy drums, syncopated snares, electronic percussion. + +## Bass & Low End + +Square-wave/sub bass, often simple and aggressive. + +## Harmony, Melody & Sound Palette + +Cold synths, eski-style bleeps, strings, metallic textures. + +## Vocal / Rap Approach + +Rapid, percussive, confrontational MC flow with strong cadence. + +## Arrangement + +8/16-bar loops, quick switches, minimal hook dependence. + +## Mood & Energy + +Cold, urgent, raw, competitive. diff --git a/music_styles/098_uk_hip_hop.md b/music_styles/098_uk_hip_hop.md new file mode 100644 index 0000000..603482b --- /dev/null +++ b/music_styles/098_uk_hip_hop.md @@ -0,0 +1,32 @@ +# UK Hip-Hop + +**Family:** UK / Regional +**Typical tempo:** 75–100 BPM + +## Core Identity + +British hip-hop outside grime/drill, often combining boom-bap, jazz, soul, spoken delivery, and distinctly UK vocal rhythm. + +## Rhythm & Drums + +Boom-bap or live-influenced drums; restrained swing. + +## Bass & Low End + +Warm bass or sample bass. + +## Harmony, Melody & Sound Palette + +Soul/jazz samples, piano, strings, understated modern textures. + +## Vocal / Rap Approach + +Clear UK cadence, storytelling, social observation, technical bars. + +## Arrangement + +Verse-forward with understated hooks and instrumental breathing room. + +## Mood & Energy + +Grounded, reflective, urban, lyrical. diff --git a/music_styles/099_french_hip_hop.md b/music_styles/099_french_hip_hop.md new file mode 100644 index 0000000..9a73cfd --- /dev/null +++ b/music_styles/099_french_hip_hop.md @@ -0,0 +1,32 @@ +# French Hip-Hop + +**Family:** Regional / European +**Typical tempo:** 75–155 BPM + +## Core Identity + +Broad French rap aesthetic spanning sample-heavy boom-bap, cinematic orchestration, dark street rap, and polished modern trap. + +## Rhythm & Drums + +Depends era: boom-bap, trap, or cinematic drums. + +## Bass & Low End + +Sample bass, sub, or 808 according to substyle. + +## Harmony, Melody & Sound Palette + +Piano, strings, chanson/soul samples, dark synths, orchestral elements. + +## Vocal / Rap Approach + +Highly rhythmic syllabic delivery; strong emphasis on phrasing and internal rhyme. + +## Arrangement + +Verse-led with memorable refrain; cinematic transitions common. + +## Mood & Energy + +Serious, lyrical, cinematic, streetwise. diff --git a/music_styles/100_japanese_hip_hop.md b/music_styles/100_japanese_hip_hop.md new file mode 100644 index 0000000..f49f8be --- /dev/null +++ b/music_styles/100_japanese_hip_hop.md @@ -0,0 +1,32 @@ +# Japanese Hip-Hop + +**Family:** Regional / Asian +**Typical tempo:** 70–155 BPM + +## Core Identity + +Broad Japanese hip-hop palette ranging from jazz-rich sample production to minimal modern trap and experimental electronic rap. + +## Rhythm & Drums + +Boom-bap, jazzy breaks, or clean trap drums depending direction. + +## Bass & Low End + +Warm sampled bass or modern 808. + +## Harmony, Melody & Sound Palette + +Jazz chords, city-pop fragments, keys, synths, atmospheric textures. + +## Vocal / Rap Approach + +Precise rhythmic phrasing; can be conversational, melodic, or technical. + +## Arrangement + +Clean, deliberate sections with strong production detail. + +## Mood & Energy + +Refined, rhythmic, atmospheric, stylistically flexible. diff --git a/music_styles/101_korean_hip_hop.md b/music_styles/101_korean_hip_hop.md new file mode 100644 index 0000000..2efd558 --- /dev/null +++ b/music_styles/101_korean_hip_hop.md @@ -0,0 +1,32 @@ +# Korean Hip-Hop + +**Family:** Regional / Asian +**Typical tempo:** 70–160 BPM + +## Core Identity + +Modern Korean hip-hop spanning boom-bap, trap, R&B hybrids, glossy electronic production, and technical rap performance. + +## Rhythm & Drums + +Clean, punchy modern drums; style-dependent. + +## Bass & Low End + +Controlled 808/sub, often polished and balanced. + +## Harmony, Melody & Sound Palette + +Trap synths, R&B chords, boom-bap samples, electronic textures. + +## Vocal / Rap Approach + +Technically precise rap, melodic hooks, rapid switches between rap and singing. + +## Arrangement + +Polished song structure with contrast sections and strong hooks. + +## Mood & Energy + +Polished, energetic, stylish, versatile. diff --git a/music_styles/102_latin_trap.md b/music_styles/102_latin_trap.md new file mode 100644 index 0000000..c8d386c --- /dev/null +++ b/music_styles/102_latin_trap.md @@ -0,0 +1,36 @@ +# Latin Trap + +**Family:** Latin / Trap +**Typical tempo:** 120–155 BPM + +## Core Identity + +Trap production with Latin melodic, rhythmic, and vocal sensibilities, combining 808 weight with regional harmonic and percussion colors. + +## Rhythm & Drums + +Trap hats/claps with Latin percussion accents. + +## Bass & Low End + +Sliding 808s and deep sub. + +## Harmony, Melody & Sound Palette + +Guitar, piano, plucks, atmospheric synths, Latin rhythmic motifs. + +## Vocal / Rap Approach + +Melodic rap, rhythmic phrasing, sung hooks. + +## Arrangement + +Hook-forward with sparse verses and rhythmic breakdowns. + +## Mood & Energy + +Dark-to-romantic, smooth, rhythmic, modern. + +## Performance Detail + +Treat the 808 as both bass and rhythmic counterpoint; leave intentional gaps so slides and drum accents remain clear. diff --git a/music_styles/103_trap_soul.md b/music_styles/103_trap_soul.md new file mode 100644 index 0000000..f5337d2 --- /dev/null +++ b/music_styles/103_trap_soul.md @@ -0,0 +1,36 @@ +# Trap Soul + +**Family:** Trap / R&B +**Typical tempo:** 120–155 BPM half-time feel + +## Core Identity + +Emotional hybrid of trap drums and R&B songwriting, with lush harmony, intimate vocals, and restrained low-end power. + +## Rhythm & Drums + +Soft trap hats, snaps/claps, restrained kick patterns. + +## Bass & Low End + +Smooth 808/sub, usually warm rather than abrasive. + +## Harmony, Melody & Sound Palette + +Rhodes, guitar, pads, extended chords, ambient vocal textures. + +## Vocal / Rap Approach + +Sung-rap, layered harmonies, intimate lead, emotionally nuanced phrasing. + +## Arrangement + +Verse/pre-hook/hook, bridges, vocal breakdowns. + +## Mood & Energy + +Moody, sensual, introspective, polished. + +## Performance Detail + +Treat the 808 as both bass and rhythmic counterpoint; leave intentional gaps so slides and drum accents remain clear. diff --git a/server.cmd b/server.cmd index 20d35fa..2674842 100644 --- a/server.cmd +++ b/server.cmd @@ -1,6 +1,6 @@ @echo off -set PATH=%~dp0build\Release;%PATH% +set PATH=%~dp0.venv-vocal\Scripts;%~dp0build\Release;%PATH% rem Multi-GPU: set GGML_BACKEND to pick a device (CUDA0, CUDA1, Vulkan0...) rem set GGML_BACKEND=CUDA0 @@ -8,8 +8,8 @@ rem set GGML_BACKEND=Vulkan0 rem Q8_0 is near lossless. The quant is a straight swap: quantize.sh also rem builds Q6_K and Q5_K_M, and the native BF16 stays available. -yue-server.exe ^ - --host 0.0.0.0 ^ +build\Release-reference\yue-server.exe ^ + --host 127.0.0.1 ^ --port 8087 ^ --model models\YuE2-3B-Q8_0.gguf ^ --vae models\YuE2-Vae-F32.gguf ^ diff --git a/setup-vocal-separation.ps1 b/setup-vocal-separation.ps1 new file mode 100644 index 0000000..358c466 --- /dev/null +++ b/setup-vocal-separation.ps1 @@ -0,0 +1,28 @@ +$ErrorActionPreference = 'Stop' + +Write-Host 'Installing local vocal separation for YuE2...' +$python = Join-Path $PSScriptRoot '.venv-vocal\Scripts\python.exe' +if (-not (Test-Path -LiteralPath $python)) { + python -m venv (Join-Path $PSScriptRoot '.venv-vocal') + if ($LASTEXITCODE -ne 0) { + throw 'Could not create the vocal-separation environment. Confirm Python 3 is installed.' + } +} +& $python -m pip install 'audio-separator[gpu]==0.47.0' 'audioread>=3,<4' +if ($LASTEXITCODE -ne 0) { + throw 'Could not install audio-separator. Confirm Python and pip are available.' +} + +Write-Host '' +& $python -m pip install 'torch==2.11.0+cu128' 'torchvision==0.26.0+cu128' --index-url https://download.pytorch.org/whl/cu128 +if ($LASTEXITCODE -ne 0) { throw 'Could not install the CUDA PyTorch wheels.' } +$env:AUDIO_SEPARATOR_MODEL_DIR = Join-Path $env:TEMP 'yue2-audio-separator-models' +New-Item -ItemType Directory -Force -Path $env:AUDIO_SEPARATOR_MODEL_DIR | Out-Null +Write-Host 'Checking the audio-separator command and GPU provider...' +& (Join-Path $PSScriptRoot '.venv-vocal\Scripts\audio-separator.exe') --env_info +if ($LASTEXITCODE -ne 0) { + throw 'audio-separator did not start. See the output above for its CUDA or PATH issue.' +} + +Write-Host '' +Write-Host 'Setup complete. Restart YuE2, open a generated song menu, and choose Adjust vocal level.' diff --git a/src/audio-master.h b/src/audio-master.h new file mode 100644 index 0000000..d9f361a --- /dev/null +++ b/src/audio-master.h @@ -0,0 +1,129 @@ +#pragma once + +// Optional final-stage EBU R128 loudness normalization through FFmpeg. +// The input is kept in memory as float until mastering is requested. + +#include "audio-io.h" + +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef _WIN32 +# include +#else +# include +# include +# include +# include +extern char ** environ; +#endif + +static bool audio_master_ffmpeg(const float * audio, + int samples, + int sample_rate, + const std::string & profile, + std::vector * mastered, + std::string * error) { + if (!audio || samples <= 0 || !mastered) { + if (error) *error = "no audio to master"; + return false; + } + + const char * target = nullptr; + if (profile == "streaming") { + target = "-14"; + } else if (profile == "broadcast") { + target = "-23"; + } else { + if (error) *error = "unknown mastering profile"; + return false; + } + + namespace fs = std::filesystem; + static std::atomic serial{0}; + const uint64_t stamp = (uint64_t) std::chrono::steady_clock::now().time_since_epoch().count(); + const std::string stem = "yue2-master-" + std::to_string(stamp) + "-" + std::to_string(serial.fetch_add(1)); + + fs::path input_path; + fs::path output_path; + try { + const fs::path temp = fs::temp_directory_path(); + input_path = temp / (stem + "-in.wav"); + output_path = temp / (stem + "-out.wav"); + } catch (const std::exception & e) { + if (error) *error = std::string("cannot create temporary paths: ") + e.what(); + return false; + } + + struct Cleanup { + fs::path a, b; + ~Cleanup() { + std::error_code ec; + if (!a.empty()) fs::remove(a, ec); + if (!b.empty()) fs::remove(b, ec); + } + } cleanup{input_path, output_path}; + + const std::string input_wav = audio_encode_wav_f32(audio, samples, sample_rate); + if (input_wav.empty()) { + if (error) *error = "could not encode float audio for mastering"; + return false; + } + { + std::ofstream file(input_path, std::ios::binary); + file.write(input_wav.data(), (std::streamsize) input_wav.size()); + if (!file) { + if (error) *error = "could not write temporary audio for mastering"; + return false; + } + } + + const std::string filter = std::string("loudnorm=I=") + target + ":LRA=11:TP=-1:print_format=summary"; + std::string input = input_path.string(); + std::string output = output_path.string(); + std::string rate = std::to_string(sample_rate); + std::vector args = {"ffmpeg", "-hide_banner", "-nostdin", "-y", "-loglevel", "error", + "-i", input, "-af", filter, "-ar", rate, "-c:a", "pcm_f32le", output}; + std::vector argv; + argv.reserve(args.size() + 1); + for (std::string & arg : args) argv.push_back(arg.data()); + argv.push_back(nullptr); + + int exit_code = -1; +#ifdef _WIN32 + const intptr_t rc = _spawnvp(_P_WAIT, "ffmpeg", argv.data()); + if (rc != -1) exit_code = (int) rc; +#else + pid_t pid = -1; + if (posix_spawnp(&pid, "ffmpeg", nullptr, nullptr, argv.data(), environ) == 0) { + int status = 0; + if (waitpid(pid, &status, 0) >= 0 && WIFEXITED(status)) exit_code = WEXITSTATUS(status); + } +#endif + if (exit_code != 0) { + if (error) *error = "FFmpeg mastering failed; confirm ffmpeg is installed and supports the loudnorm filter"; + return false; + } + + int mastered_samples = 0; + int mastered_rate = 0; + float * decoded = audio_io_read_wav(output.c_str(), &mastered_samples, &mastered_rate); + if (!decoded) { + if (error) *error = "FFmpeg did not produce readable mastered audio"; + return false; + } + if (mastered_samples != samples || mastered_rate != sample_rate) { + free(decoded); + if (error) *error = "mastered audio format changed unexpectedly"; + return false; + } + mastered->assign(decoded, decoded + (size_t) mastered_samples * 2); + free(decoded); + return true; +} diff --git a/src/audio-video.h b/src/audio-video.h new file mode 100644 index 0000000..f6b314b --- /dev/null +++ b/src/audio-video.h @@ -0,0 +1,124 @@ +#pragma once + +// 16:9 video render for YouTube delivery: a still cover image plus the full +// length finished track becomes an MP4 (H.264 + AAC) via the local FFmpeg +// binary. Used by POST /render-video. The uploads are never modified. + +#include "audio-vocal-balance.h" // process runner, temp dir and error conventions + +#include +#include +#include + +// extension of an upload filename, lowercased, with a leading dot. Falls +// back when the client sends no filename. +static std::string video_ext_of(const std::string & filename, const char * fallback) { + const size_t dot = filename.find_last_of('.'); + std::string ext = dot == std::string::npos ? fallback : filename.substr(dot); + for (char & c : ext) c = (char) tolower((unsigned char) c); + return ext; +} + +static bool audio_render_video_ffmpeg(const std::string & cover_bytes, + const std::string & cover_ext, + const std::string & audio_bytes, + const std::string & audio_ext, + std::string * mp4, + std::string * error) { + if (cover_bytes.empty() || audio_bytes.empty() || !mp4) { + if (error) *error = "cover image and audio are both required"; + return false; + } + + // Bound the video timeline explicitly. At 1 fps, encoder lookahead can + // otherwise leave a long silent tail even with -shortest. + int samples=0,sample_rate=0; + float *decoded=audio_read_buf(reinterpret_cast(audio_bytes.data()),audio_bytes.size(),&samples,&sample_rate); + if(!decoded || samples<=0 || sample_rate<=0){free(decoded);if(error)*error="Audio could not be decoded for video export";return false;} + free(decoded); + const std::string duration=std::to_string(std::ceil((double)samples/sample_rate)); + namespace fs = std::filesystem; + static std::atomic serial{0}; + const uint64_t stamp = (uint64_t) std::chrono::steady_clock::now().time_since_epoch().count(); + const std::string stem = "yue2-video-" + std::to_string(stamp) + "-" + std::to_string(serial.fetch_add(1)); + fs::path dir; + try { + dir = fs::temp_directory_path() / stem; + fs::create_directories(dir); + } catch (const std::exception & e) { + if (error) *error = std::string("cannot create temporary paths: ") + e.what(); + return false; + } + struct Cleanup { + fs::path path; + ~Cleanup() { std::error_code ec; fs::remove_all(path, ec); } + } cleanup{dir}; + + const fs::path cover = dir / ("cover" + cover_ext); + const fs::path audio = dir / ("audio" + audio_ext); + const fs::path output = dir / "song.mp4"; + auto write = [&](const fs::path & path, const std::string & bytes, const char * what) { + std::ofstream file(path, std::ios::binary); + file.write(bytes.data(), (std::streamsize) bytes.size()); + if (!file && error) *error = std::string("could not write temporary ") + what; + return (bool) file; + }; + if (!write(cover, cover_bytes, "cover image") || !write(audio, audio_bytes, "audio")) { + return false; + } + + // Still image at 1 fps, cover-cropped to 1920x1080, broadcast-safe + // pixel format, faststart so YouTube can process while uploading. + std::vector render = {"ffmpeg", + "-hide_banner", + "-nostdin", + "-y", + "-loglevel", + "error", + "-loop", + "1", + "-framerate", + "1", + "-i", + cover.string(), + "-i", + audio.string(), + "-vf", + "scale=1920:1080:force_original_aspect_ratio=increase,crop=1920:1080,format=yuv420p", + "-c:v", + "libx264", + "-preset", + "medium", + "-crf", + "20", + "-c:a", + "aac", + "-b:a", + "192k", + "-t", + duration, + "-movflags", + "+faststart", + output.string()}; + const int status = audio_vocal_run("ffmpeg", render); + if (status != 0) { + if (error) { + *error = status == -1 ? "FFmpeg was not found. Install FFmpeg and add it to PATH, then restart YuE2." + : "FFmpeg could not render the video. Check that FFmpeg includes libx264."; + } + return false; + } + if (fs::file_size(output) > 256ULL * 1024 * 1024) { if (error) *error = "Video exceeds the 256 MiB delivery limit. Use a shorter track."; return false; } + std::ifstream file(output, std::ios::binary); + if (!file) { + if (error) *error = "FFmpeg did not produce a video file"; + return false; + } + mp4->assign(std::istreambuf_iterator(file), std::istreambuf_iterator()); + if (mp4->size() < 1024) { + if (error) *error = "FFmpeg produced an empty video file"; + mp4->clear(); + return false; + } + return true; +} diff --git a/src/audio-vocal-balance.h b/src/audio-vocal-balance.h new file mode 100644 index 0000000..e96576d --- /dev/null +++ b/src/audio-vocal-balance.h @@ -0,0 +1,278 @@ +#pragma once + +// Optional vocal balance correction using the local python-audio-separator +// command. The source mix is separated into vocal and accompaniment stems, +// the requested or estimated vocal gain is applied, then both stems are remixed. + +#include "audio-io.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef _WIN32 +# include +# ifndef NOMINMAX +# define NOMINMAX +# endif +# ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +# endif +# include +#else +# include +# include +# include +# include +# include +extern char ** environ; +#endif + +static std::string audio_tool_path(const std::string & name) { + if(name=="audio-separator"){ +#ifdef _WIN32 + const auto local=std::filesystem::absolute(".venv-vocal/Scripts/audio-separator.exe"); +#else + const auto local=std::filesystem::absolute(".venv-vocal/bin/audio-separator"); +#endif + if(std::filesystem::exists(local))return local.string(); + } + return name; +} +static bool audio_tool_available(const std::string & name) { + const auto resolved=audio_tool_path(name); + if(resolved!=name)return true; +#ifdef _WIN32 + char path[32768]; return SearchPathA(nullptr,name.c_str(),".exe",sizeof(path),path,nullptr)>0; +#else + const char * env=getenv("PATH");if(!env)return false;std::string paths(env);size_t start=0; + do {size_t end=paths.find(':',start);auto path=paths.substr(start,end-start)+"/"+name;if(access(path.c_str(),X_OK)==0)return true;if(end==std::string::npos)break;start=end+1;}while(true);return false; +#endif +} +static thread_local std::atomic * audio_process_cancel = nullptr; + +static int audio_vocal_run(const char * executable, std::vector & args) { + const auto resolved_executable=audio_tool_path(executable); + executable=resolved_executable.c_str(); + std::vector argv; + argv.reserve(args.size() + 1); + for (std::string & arg : args) argv.push_back(arg.data()); + argv.push_back(nullptr); +#ifdef _WIN32 + // Preserve embedded quotes and paths when _spawnvp joins argv on Windows. + std::vector quoted;quoted.reserve(args.size()); + for(const auto &arg:args){ + std::string q="\"";size_t slashes=0; + for(char c:arg){if(c=='\\'){slashes++;continue;} + if(c=='"'){q.append(slashes*2+1,'\\');q+='"';} + else{q.append(slashes,'\\');q+=c;}slashes=0; + } + q.append(slashes*2,'\\');q+='"';quoted.push_back(std::move(q)); + } + argv.clear();for(auto &arg:quoted)argv.push_back(arg.data());argv.push_back(nullptr); + const intptr_t rc = _spawnvp(_P_NOWAIT, executable, argv.data()); + if (rc == -1) return errno == ENOENT ? -1 : 1; + HANDLE process = (HANDLE)rc; + HANDLE group = CreateJobObjectW(nullptr, nullptr); + JOBOBJECT_EXTENDED_LIMIT_INFORMATION limits{}; + limits.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE; + if (group) { SetInformationJobObject(group, JobObjectExtendedLimitInformation, &limits, sizeof(limits)); AssignProcessToJobObject(group, process); } + const auto deadline = std::chrono::steady_clock::now() + std::chrono::minutes(30); + while (WaitForSingleObject(process, 200) == WAIT_TIMEOUT) { + if ((audio_process_cancel && audio_process_cancel->load()) || std::chrono::steady_clock::now() >= deadline) { + if (group) TerminateJobObject(group, 1); + TerminateProcess(process, 1); WaitForSingleObject(process, 5000); + if (group) CloseHandle(group); CloseHandle(process); return 2; + } + } + DWORD status = 1; GetExitCodeProcess(process, &status); + if (group) CloseHandle(group); CloseHandle(process); + return (int)status; +#else + pid_t pid = -1; + posix_spawnattr_t attr; posix_spawnattr_init(&attr); + posix_spawnattr_setflags(&attr,POSIX_SPAWN_SETPGROUP); + posix_spawnattr_setpgroup(&attr,0); + const int spawn_error = posix_spawnp(&pid, executable, nullptr, &attr, argv.data(), environ); + posix_spawnattr_destroy(&attr); + if (spawn_error != 0) return spawn_error == ENOENT ? -1 : 1; + int status = 0; + const auto deadline = std::chrono::steady_clock::now() + std::chrono::minutes(30); + while (waitpid(pid, &status, WNOHANG) == 0) { + if ((audio_process_cancel && audio_process_cancel->load()) || std::chrono::steady_clock::now() >= deadline) { kill(-pid,SIGKILL); waitpid(pid,&status,0); return 2; } + usleep(200000); + } + if (!WIFEXITED(status)) return -1; + return WEXITSTATUS(status); +#endif +} + +static bool audio_vocal_balance_ffmpeg(const float * audio, + int samples, + int sample_rate, + float requested_gain_db, + bool auto_gain, + std::vector * balanced, + float * applied_gain_db, + std::string * error) { + if (!audio || samples <= 0 || !balanced || (!auto_gain && (!std::isfinite(requested_gain_db) || requested_gain_db < -12.0f || + requested_gain_db > 12.0f))) { + if (error) *error = "vocal gain must be between -12 and +12 dB"; + return false; + } + + namespace fs = std::filesystem; + static std::atomic serial{0}; + const uint64_t stamp = (uint64_t) std::chrono::steady_clock::now().time_since_epoch().count(); + const std::string stem = "yue2-vocal-" + std::to_string(stamp) + "-" + std::to_string(serial.fetch_add(1)); + fs::path dir; + try { + dir = fs::temp_directory_path() / stem; + fs::create_directories(dir); + } catch (const std::exception & e) { + if (error) *error = std::string("cannot create temporary paths: ") + e.what(); + return false; + } + struct Cleanup { + fs::path path; + ~Cleanup() { std::error_code ec; fs::remove_all(path, ec); } + } cleanup{dir}; + + const fs::path input = dir / "mix.wav"; + const fs::path output = dir / "balanced.wav"; + const std::string wav = audio_encode_wav_f32(audio, samples, sample_rate); + if (wav.empty()) { + if (error) *error = "could not encode audio for vocal balancing"; + return false; + } + { + std::ofstream file(input, std::ios::binary); + file.write(wav.data(), (std::streamsize) wav.size()); + if (!file) { + if (error) *error = "could not write temporary audio for vocal balancing"; + return false; + } + } + + const fs::path model_dir = dir / "stems"; + std::error_code ec; + fs::create_directories(model_dir, ec); + std::string input_arg = input.string(); + std::string out_arg = model_dir.string(); + std::string model_dir_arg = (fs::temp_directory_path() / "yue2-audio-separator-models").string(); + std::vector separate = {"audio-separator", input_arg, "--model_filename", + "model_bs_roformer_ep_317_sdr_12.9755.ckpt", "--output_format", "WAV", "--output_dir", out_arg, + "--model_file_dir", model_dir_arg, "--custom_output_names", + "{\"Vocals\":\"vocals\",\"Instrumental\":\"instrumental\"}", "--normalization", "1.0", + "--use_soundfile"}; + const int separation_status = audio_vocal_run("audio-separator", separate); + if (separation_status != 0) { + if (error) { + *error = separation_status == -1 + ? "audio-separator was not found. Run .\\setup-vocal-separation.ps1 from the YuE2 folder, then restart YuE2." + : "audio-separator failed. Check its CUDA provider with 'audio-separator --env_info'; the BS-RoFormer model downloads on first use, so check network access too."; + } + return false; + } + + const fs::path vocals = model_dir / "vocals.wav"; + const fs::path backing = model_dir / "instrumental.wav"; + if (!fs::exists(vocals) || !fs::exists(backing)) { + if (error) *error = "separator did not create the expected vocals and instrumental stems"; + return false; + } + float vocal_gain_db = requested_gain_db; + if (auto_gain) { + int vocal_samples = 0, vocal_rate = 0, backing_samples = 0, backing_rate = 0; + float * vocal = audio_io_read_wav(vocals.string().c_str(), &vocal_samples, &vocal_rate); + float * instrumental = audio_io_read_wav(backing.string().c_str(), &backing_samples, &backing_rate); + if (!vocal || !instrumental || vocal_samples <= 0 || backing_samples <= 0 || vocal_rate != backing_rate) { + free(vocal); + free(instrumental); + if (error) *error = "could not analyze separated stems for automatic vocal balance"; + return false; + } + const int length = std::min(vocal_samples, backing_samples); + const int window = std::max(1, vocal_rate * 2 / 5); // 400 ms level-analysis windows + float peak_vocal_rms = 0.0f; + for (int start = 0; start < length; start += window) { + const int count = std::min(window, length - start); + double energy = 0.0; + for (int i = 0; i < count; i++) { + const double l = vocal[(size_t) start + i]; + const double r = vocal[(size_t) vocal_samples + start + i]; + energy += l * l + r * r; + } + peak_vocal_rms = std::max(peak_vocal_rms, (float) std::sqrt(energy / (2.0 * count))); + } + const float vocal_gate = std::max(0.0005f, peak_vocal_rms * 0.08f); + std::vector ratios; + for (int start = 0; start < length; start += window) { + const int count = std::min(window, length - start); + double vocal_energy = 0.0, backing_energy = 0.0; + for (int i = 0; i < count; i++) { + const size_t left = (size_t) start + i; + const size_t right_v = (size_t) vocal_samples + left; + const size_t right_b = (size_t) backing_samples + left; + const double vl = vocal[left], vr = vocal[right_v]; + const double bl = instrumental[left], br = instrumental[right_b]; + vocal_energy += vl * vl + vr * vr; + backing_energy += bl * bl + br * br; + } + const float vrms = (float) std::sqrt(vocal_energy / (2.0 * count)); + const float brms = (float) std::sqrt(backing_energy / (2.0 * count)); + if (vrms >= vocal_gate && brms > 0.0001f) ratios.push_back(20.0f * std::log10(vrms / brms)); + } + free(vocal); + free(instrumental); + if (ratios.empty()) { + if (error) *error = "could not find active vocal passages for automatic balance; try the manual gain"; + return false; + } + const size_t mid = ratios.size() / 2; + std::nth_element(ratios.begin(), ratios.begin() + mid, ratios.end()); + const float median_ratio_db = ratios[mid]; + // A conservative starting point: vocals slightly ahead of the backing + // in sections where the vocal stem is active. This is a heuristic, not + // a universal mix standard; the user can still fine-tune the result. + vocal_gain_db = std::clamp(1.0f - median_ratio_db, -6.0f, 6.0f); + } + char gain[64]; + snprintf(gain, sizeof(gain), "volume=%.6fdB", (double) vocal_gain_db); + std::string vocal_arg = vocals.string(); + std::string backing_arg = backing.string(); + std::string output_arg = output.string(); + std::string rate = std::to_string(sample_rate); + std::vector remix = {"ffmpeg", "-hide_banner", "-nostdin", "-y", "-loglevel", "error", + "-i", backing_arg, "-i", vocal_arg, "-filter_complex", + std::string("[1:a]") + gain + "[v];[0:a][v]amix=inputs=2:duration=longest:normalize=0,alimiter=limit=0.98:latency=1,aresample=" + rate + ",apad=whole_len=" + std::to_string(samples) + ",atrim=end_sample=" + std::to_string(samples) + ",asetpts=PTS-STARTPTS[out]", + "-map", "[out]", "-ar", rate, "-c:a", "pcm_f32le", output_arg}; + const int ffmpeg_status = audio_vocal_run("ffmpeg", remix); + if (ffmpeg_status != 0) { + if (error) *error = ffmpeg_status == -1 + ? "FFmpeg was not found. Install FFmpeg and add it to PATH, then restart YuE2." + : "FFmpeg could not remix the stems. Check that FFmpeg is available on PATH and the separated WAV files are readable."; + return false; + } + int result_samples = 0, result_rate = 0; + float * decoded = audio_io_read_wav(output.string().c_str(), &result_samples, &result_rate); + if (!decoded) { + if (error) *error = "FFmpeg did not produce readable remixed audio"; + return false; + } + if (result_samples != samples || result_rate != sample_rate) { + free(decoded); + if (error) *error = "remixed audio format changed unexpectedly"; + return false; + } + balanced->assign(decoded, decoded + (size_t) result_samples * 2); + free(decoded); + if (applied_gain_db) *applied_gain_db = vocal_gain_db; + return true; +} diff --git a/src/job-archive.h b/src/job-archive.h new file mode 100644 index 0000000..1afd7cb --- /dev/null +++ b/src/job-archive.h @@ -0,0 +1,77 @@ +#pragma once +#include +#include +#include +#include +#include + +// Immutable terminal records: atomic rename publishes metadata and audio together. +// Unacknowledged results are never automatically removed. Acknowledged results +// remain recoverable for 30 days. In-flight native computation cannot resume; +// its pending marker becomes an explicit interrupted status after restart. +namespace job_archive { +namespace fs = std::filesystem; +inline bool valid_id(const std::string & id) { + if (id.size() != 16 && id.size() != 32) return false; + return id.find_first_not_of("0123456789abcdef") == std::string::npos; +} +inline fs::path root() { return fs::absolute("job_results"); } +inline fs::path path(const std::string & id, const char * suffix) { + if (!valid_id(id)) throw std::runtime_error("Invalid job ID"); + return root() / (id + suffix); +} +inline void start(const std::string & id) { + fs::create_directories(root()); + uintmax_t bytes=0; + for(const auto &entry:fs::directory_iterator(root()))if(entry.is_regular_file())bytes+=entry.file_size(); + if(bytes>16ULL*1024*1024*1024)throw std::runtime_error("Job recovery storage exceeds 16 GiB. Back up saved tracks and review job_results before starting more work."); + if(fs::space(root()).available<512ULL*1024*1024)throw std::runtime_error("Less than 512 MiB disk space remains. Free space before generating more media."); + std::ofstream out(path(id,".pending"), std::ios::binary); + out << "interrupted\n"; out.flush(); + if (!out) throw std::runtime_error("Cannot save job recovery record; check disk space and permissions"); +} +inline void finish(const std::string & id, int status, const std::string & mime, const std::string & body) { + fs::create_directories(root()); + const auto temp = path(id,".tmp"), result = path(id,".result"); + if (fs::exists(result)) return; + { + std::ofstream out(temp,std::ios::binary | std::ios::trunc); + out << "YUE2JOB1\n" << status << '\n' << mime.size() << '\n' << body.size() << '\n'; + out.write(mime.data(), (std::streamsize)mime.size()); + out.write(body.data(), (std::streamsize)body.size()); out.flush(); + if (!out) throw std::runtime_error("Cannot save completed job; disk full or unavailable"); + } + fs::rename(temp,result); + std::error_code error; fs::remove(path(id,".pending"),error); +} +inline bool read(const std::string & id, int & status, std::string & mime, std::string & body, bool include_body) { + if (!valid_id(id)) return false; + std::ifstream in(path(id,".result"),std::ios::binary); + if (!in) { if (fs::exists(path(id,".pending"))) { status = 4; return true; } return false; } + std::string magic; std::getline(in,magic); + uint64_t mime_size = 0, body_size = 0; + in >> status >> mime_size >> body_size; in.get(); + if (!in || magic != "YUE2JOB1" || status < 1 || status > 3 || mime_size > 4096) throw std::runtime_error("Corrupt archived job metadata"); + const auto offset = in.tellg(); + const uint64_t size = fs::file_size(path(id,".result")); + if (offset < 0 || (uint64_t)offset > size || mime_size > size - (uint64_t)offset || body_size != size - (uint64_t)offset - mime_size) throw std::runtime_error("Incomplete archived job"); + mime.resize((size_t)mime_size); in.read(mime.data(), (std::streamsize)mime_size); + if (include_body) { body.resize((size_t)body_size); in.read(body.data(), (std::streamsize)body_size); } + if (!in) throw std::runtime_error("Cannot read archived job"); + return true; +} +inline void acknowledge(const std::string & id) { + if (!fs::exists(path(id,".result"))) return; + std::ofstream out(path(id,".ack")); out << "saved to library\n"; out.flush(); + if (!out) throw std::runtime_error("Cannot record result acknowledgement"); +} +inline void cleanup() { + if (!fs::exists(root())) return; + for (const auto & entry : fs::directory_iterator(root())) { + if (entry.path().extension() != ".ack" || !valid_id(entry.path().stem().string())) continue; + if (fs::file_time_type::clock::now() - entry.last_write_time() < std::chrono::hours(24 * 30)) continue; + const auto id = entry.path().stem().string(); + for (const char * suffix : {".result", ".pending", ".tmp", ".ack"}) { std::error_code error; fs::remove(path(id,suffix),error); } + } +} +} diff --git a/src/pipeline.h b/src/pipeline.h index 76b0f3f..b0e4c1d 100644 --- a/src/pipeline.h +++ b/src/pipeline.h @@ -1,4 +1,5 @@ #pragma once +#include // pipeline.h: YuE2 generation pipeline // // Turns one request into tracks: a symbolic plan, a semantic token stream, @@ -49,6 +50,7 @@ struct Yue2PipelineParams { }; struct Yue2Pipeline { + std::function progress; ModelStore * store = nullptr; // borrowed, owned by the tool std::string model_path; // the backbone GGUF, both halves and the tokenizer std::string vae_path; @@ -277,6 +279,7 @@ static bool pipeline_generate(Yue2Pipeline * p, abc_ids.assign(B, encode(r.abc)); scores.assign(B, r.abc); } else if (has_score) { + if(p->progress) p->progress("Composing score",0,0); std::vector open = yue2_build_prompt_ids(encode, cot, r.style, r.lyrics, nullptr); std::vector plans; if (!yue2_generate(lm, &p->kv, std::vector>(B, open), {}, 1.0f, r.abc_sampling, r.lm_seed, @@ -318,12 +321,23 @@ static bool pipeline_generate(Yue2Pipeline * p, codes[0].truncated = false; fprintf(stderr, "[Pipeline] Replay: %zu frames supplied\n", codes[0].tokens.size()); } else { + if(p->progress) p->progress("Composing performance",0,0); + float duration = r.duration; + if (duration <= 0.0f) { + duration = yue2_estimate_duration_from_lyrics(r.lyrics); + if (duration > 0.0f) { + fprintf(stderr, "[Pipeline] Auto duration from lyrics: %.1f s\n", (double) duration); + } else { + duration = 360.0f; + fprintf(stderr, "[Pipeline] No lyrics, using default duration: %.1f s\n", (double) duration); + } + } // The requested length caps the budget of the stage, never raises it Yue2Sampling semantic = r.semantic_sampling; - int budget = (int) (r.duration * (float) YUE2_FRAME_RATE); + int budget = (int) (duration * (float) YUE2_FRAME_RATE); if (budget > 0 && budget < semantic.max_tokens) { - fprintf(stderr, "[AR] Frame budget clamped to %d by the requested duration (%.1f s)\n", budget, - (double) r.duration); + fprintf(stderr, "[AR] Frame budget clamped to %d by the %s duration (%.1f s)\n", budget, + r.duration <= 0.0f ? "auto" : "requested", (double) duration); semantic.max_tokens = budget; if (semantic.min_tokens > semantic.max_tokens) { semantic.min_tokens = semantic.max_tokens; @@ -402,10 +416,12 @@ static bool pipeline_generate(Yue2Pipeline * p, const int chunk_size = chunk_sizes[i]; const int T_lat = (int) codes[i].tokens.size(); int chunks = (T_lat + chunk_size - 1) / chunk_size; + if(p->progress) p->progress("Rendering audio",i,B); fprintf(stderr, "[NAR] Song %d: %d frames (%.1f s), prefix %d, %d chunk%s of %d, %d variation%s\n", i, T_lat, (float) T_lat / (float) YUE2_FRAME_RATE, prefix_len, chunks, chunks > 1 ? "s" : "", chunk_size, M, M > 1 ? "s" : ""); for (int start = 0; start < T_lat; start += chunk_size) { + if(p->progress) p->progress("Rendering audio chunks",start/chunk_size,chunks); Timer chunk_timer; int frames = T_lat - start < chunk_size ? T_lat - start : chunk_size; int ar_len = prefix_len + frames + 1; @@ -467,6 +483,7 @@ static bool pipeline_generate(Yue2Pipeline * p, } nar_hold.reset(); + if(p->progress) p->progress("Decoding audio",0,0); VAEGGML * vae = require_vae(p); if (!vae) { return false; diff --git a/src/prompt.h b/src/prompt.h index 6f11f42..79f7ee5 100644 --- a/src/prompt.h +++ b/src/prompt.h @@ -135,3 +135,30 @@ static std::vector yue2_build_negative_ids(Tokenize bpe_encode, Yue2Cot cot static float yue2_default_guidance(Yue2Cot cot) { return cot == YUE2_COT_OFF ? 1.01f : 1.0f; } + +// Estimate song duration in seconds from lyrics text. +// Heuristic: ~140 words/minute singing rate + 30s for intro/outro/instrumentals. +// Returns 0 if lyrics are empty (caller should use default). +static float yue2_estimate_duration_from_lyrics(const std::string & lyrics) { + if (lyrics.empty()) { + return 0.0f; + } + int words = 0; + bool in_word = false; + for (char c : lyrics) { + if (c == ' ' || c == '\n' || c == '\r' || c == '\t') { + in_word = false; + } else if (!in_word) { + in_word = true; + words++; + } + } + if (words == 0) { + return 0.0f; + } + float minutes = (float) words / 140.0f; + float seconds = minutes * 60.0f + 30.0f; + if (seconds < 30.0f) seconds = 30.0f; + if (seconds > 600.0f) seconds = 600.0f; + return seconds; +} diff --git a/src/request.cpp b/src/request.cpp index 3f97ab0..4e50680 100644 --- a/src/request.cpp +++ b/src/request.cpp @@ -35,7 +35,8 @@ void request_init(Yue2Request * r) { r->semantic_sampling = YUE2_SEMANTIC_SAMPLING; r->output_format = OUTPUT_FORMAT_MP3; - r->mp3_bitrate = 128; + r->mp3_bitrate = 320; + r->mastering_profile = "off"; } static inline std::string yy_str(yyjson_val * v) { @@ -162,6 +163,9 @@ static void request_parse_obj(yyjson_val * obj, Yue2Request * r) { if ((v = yyjson_obj_get(obj, "mp3_bitrate")) && yyjson_is_int(v)) { r->mp3_bitrate = yyjson_get_int(v); } + if ((v = yyjson_obj_get(obj, "mastering_profile")) && yyjson_is_str(v)) { + r->mastering_profile = yy_str(v); + } } bool request_parse_json(Yue2Request * r, const char * json) { @@ -256,6 +260,9 @@ std::string request_to_json(const Yue2Request * r, bool sparse) { if (!sparse || r->mp3_bitrate != d.mp3_bitrate) { yyjson_mut_obj_add_int(doc, root, "mp3_bitrate", r->mp3_bitrate); } + if (!sparse || r->mastering_profile != d.mastering_profile) { + yyjson_mut_obj_add_strncpy(doc, root, "mastering_profile", r->mastering_profile.c_str(), r->mastering_profile.size()); + } char * json = yyjson_mut_write(doc, WRITE_FLAGS, NULL); std::string out = json ? json : "{}"; diff --git a/src/request.h b/src/request.h index 213e5b9..1ffb0bc 100644 --- a/src/request.h +++ b/src/request.h @@ -69,6 +69,7 @@ struct Yue2Request { // MP3 encoder bitrate in kbps, used when output_format is "mp3". // WAV outputs ignore this field. int mp3_bitrate; // 128 + std::string mastering_profile; // "off", "streaming" or "broadcast" }; // fills every field with its default diff --git a/src/saved-presets.h b/src/saved-presets.h new file mode 100644 index 0000000..6696709 --- /dev/null +++ b/src/saved-presets.h @@ -0,0 +1,98 @@ +#pragma once +#include "httplib.h" +#include "yyjson.h" +#include +#include +#include +#include + +inline void register_saved_presets(httplib::Server & server) { + namespace fs = std::filesystem; + const auto folder = fs::absolute("saved_presets"); + // Reconcile an interrupted replacement before listing or accepting writes. + fs::create_directories(folder); + for (const auto & entry : fs::directory_iterator(folder)) { + if (fs::is_symlink(entry.path())) continue; + const auto ext=entry.path().extension(); + if (ext != ".bak" && ext != ".tmp") continue; + auto final=entry.path(); final.replace_extension(".json"); + if (ext == ".bak" && !fs::exists(final)) fs::rename(entry.path(),final); + else fs::remove(entry.path()); + } + auto mutex = std::make_shared(); + server.Get("/presets", [folder, mutex](const httplib::Request &, httplib::Response & res) { + std::lock_guard lock(*mutex); + try { + fs::create_directories(folder); + std::string body = "["; + for (const auto & file : fs::directory_iterator(folder)) { + if (!file.is_regular_file() || file.path().extension() != ".json" || fs::is_symlink(file.path())) continue; + std::ifstream input(file.path(), std::ios::binary); + std::string value((std::istreambuf_iterator(input)), {}); + auto * doc = yyjson_read(value.data(), value.size(), 0); + if (!doc) continue; + auto * root = yyjson_doc_get_root(doc); + const bool valid = yyjson_is_obj(root) && yyjson_is_str(yyjson_obj_get(root,"name")) && yyjson_is_str(yyjson_obj_get(root,"kind")) && yyjson_is_obj(yyjson_obj_get(root,"data")); + if (valid) { + // Filename is authoritative after atomic rename. + auto mutable_doc=yyjson_doc_mut_copy(doc,nullptr); + auto mutable_root=yyjson_mut_doc_get_root(mutable_doc); + const auto stem=file.path().stem().u8string(); + const auto dash=stem.find('-'); + const auto name=stem.substr(dash+1); + yyjson_mut_obj_put(mutable_root,yyjson_mut_strcpy(mutable_doc,"name"),yyjson_mut_strcpy(mutable_doc,name.c_str())); + char * encoded=yyjson_mut_write(mutable_doc,0,nullptr); + if(encoded) { value=encoded; free(encoded); } + yyjson_mut_doc_free(mutable_doc); + } + yyjson_doc_free(doc); + if (valid) { if (body.size() > 1) body += ','; body += value; } + } + res.set_content(body + "]", "application/json"); + } catch (...) { res.status = 500; res.set_content("Could not read saved_presets folder", "text/plain"); } + }); + server.Post("/presets", [folder, mutex](const httplib::Request & req, httplib::Response & res) { + std::lock_guard lock(*mutex); + if (req.get_header_value("Content-Type").find("application/json") != 0 || req.body.size() > 262144) { res.status = 400; return; } + auto * doc = yyjson_read(req.body.data(), req.body.size(), 0); + if (!doc) { res.status = 400; return; } + auto * root = yyjson_doc_get_root(doc); + auto str = [&](const char * key) { const char * s = yyjson_get_str(yyjson_obj_get(root,key)); return std::string(s ? s : ""); }; + const auto name = str("name"), kind = str("kind"), operation = str("operation"); + auto * data = yyjson_obj_get(root,"data"); + const bool overwrite = yyjson_get_bool(yyjson_obj_get(root,"overwrite")); + bool valid = !name.empty() && name.size() <= 200 && name.back() != '.' && name.back() != ' ' && (kind == "music" || kind == "lyric" || kind == "studio") && (operation == "save" || operation == "delete" || operation == "rename"); + for (unsigned char c : name) if (c < 32 || std::string("<>:\"/\\|?*").find(c) != std::string::npos) valid = false; + if (operation == "save" && (!yyjson_is_obj(data) || !yyjson_is_arr(yyjson_obj_get(data,"ids")) || !yyjson_is_obj(yyjson_obj_get(data,"weights")))) valid = false; + if (!valid) { yyjson_doc_free(doc); res.status = 400; res.set_content("Use a preset name without filename characters or trailing dots/spaces.","text/plain"); return; } + try { + fs::create_directories(folder); + const auto file = folder / fs::u8path(kind + "-" + name + ".json"); + if (fs::is_symlink(file)) throw std::runtime_error("Invalid preset file"); + if (operation == "rename") { + const auto old_name=str("oldName"); + bool safe=!old_name.empty() && old_name.size()<=200 && old_name.back()!='.' && old_name.back()!=' '; + for(unsigned char c:old_name) if(c<32 || std::string("<>:\\\"/\\\\|?*").find(c)!=std::string::npos) safe=false; + if(!safe) throw std::runtime_error("Invalid original preset name"); + const auto source=folder / fs::u8path(kind+"-"+old_name+".json"); + if(fs::is_symlink(source) || !fs::exists(source)) throw std::runtime_error("Original preset no longer exists"); + if(fs::exists(file)) { res.status=409; res.set_content("Preset name already exists","text/plain"); yyjson_doc_free(doc); return; } + fs::rename(source,file); + } + else if (operation == "delete") fs::remove(file); + else if (fs::exists(file) && !overwrite) { res.status = 409; res.set_content("A preset with that name already exists.","text/plain"); yyjson_doc_free(doc); return; } + else { + const auto temp = folder / fs::u8path(kind + "-" + name + ".tmp"); + const auto backup = folder / fs::u8path(kind + "-" + name + ".bak"); + if (fs::is_symlink(temp) || fs::exists(backup)) throw std::runtime_error("Preset has a pending recovery file"); + { std::ofstream out(temp, std::ios::binary | std::ios::trunc); out << req.body; out.flush(); if (!out) throw std::runtime_error("Could not write preset"); } + const bool existed = fs::exists(file); + if (existed) fs::rename(file, backup); + try { fs::rename(temp, file); } catch (...) { if (existed) fs::rename(backup,file); throw; } + if (existed) fs::remove(backup); + } + res.set_content("{\"ok\":true}","application/json"); + } catch (const std::exception & e) { res.status = 500; res.set_content(e.what(),"text/plain"); } + yyjson_doc_free(doc); + }); +} diff --git a/tests/archive-native.mjs b/tests/archive-native.mjs new file mode 100644 index 0000000..e420691 --- /dev/null +++ b/tests/archive-native.mjs @@ -0,0 +1,6 @@ +import {spawnSync} from 'node:child_process'; +import {join} from 'node:path'; +import {fileURLToPath} from 'node:url'; +const root=fileURLToPath(new URL('../',import.meta.url)); +const env=process.platform==='win32'?Object.fromEntries(Object.entries(process.env).map(([k,v])=>[k.toUpperCase(),v])):process.env; +for(const [cmd,args] of [['cmake',['-S','tests/job-archive','-B','build/job-archive-tests']],['cmake',['--build','build/job-archive-tests','--config','Release']],[join(root,'build/job-archive-tests',process.platform==='win32'?'Release/job-archive-test.exe':'job-archive-test'),[]]]){const r=spawnSync(cmd,args,{cwd:root,env,stdio:'inherit',windowsHide:true});if(r.status!==0)process.exit(r.status??1);} diff --git a/tests/job-archive/CMakeLists.txt b/tests/job-archive/CMakeLists.txt new file mode 100644 index 0000000..7b15d8b --- /dev/null +++ b/tests/job-archive/CMakeLists.txt @@ -0,0 +1,8 @@ +cmake_minimum_required(VERSION 3.16) +project(job_archive_test LANGUAGES CXX) +add_executable(job-archive-test main.cpp) +target_compile_features(job-archive-test PRIVATE cxx_std_17) +target_include_directories(job-archive-test PRIVATE ../../src) +if(MSVC) + target_compile_options(job-archive-test PRIVATE /EHsc) +endif() diff --git a/tests/job-archive/main.cpp b/tests/job-archive/main.cpp new file mode 100644 index 0000000..b99e455 --- /dev/null +++ b/tests/job-archive/main.cpp @@ -0,0 +1,25 @@ +#include "job-archive.h" +#include + +static void check(bool value, const char * message) { if (!value) throw std::runtime_error(message); } +int main() { + namespace fs = std::filesystem; + const auto sandbox = fs::absolute("build/job-archive-tests/work-" + std::to_string(std::chrono::steady_clock::now().time_since_epoch().count())); + fs::create_directories(sandbox); fs::current_path(sandbox); + const std::string id = "0123456789abcdef0123456789abcdef"; + check(!job_archive::valid_id("../invalid"),"invalid IDs accepted"); + job_archive::start(id); + int status = 0; std::string mime,body; + check(job_archive::read(id,status,mime,body,false) && status == 4,"pending jobs must recover as interrupted"); + const std::string original("binary\0audio",12); + job_archive::finish(id,1,"audio/wav",original); + check(job_archive::read(id,status,mime,body,false) && status == 1 && body.empty(),"metadata polling must not load audio"); + check(job_archive::read(id,status,mime,body,true) && body == original && mime == "audio/wav","archived binary mismatch"); + job_archive::finish(id,2,"", "different"); + check(job_archive::read(id,status,mime,body,true) && status == 1 && body == original,"terminal records must be immutable"); + job_archive::cleanup(); check(fs::exists(job_archive::path(id,".result")),"unacknowledged result removed"); + job_archive::acknowledge(id); + fs::last_write_time(job_archive::path(id,".ack"),fs::file_time_type::clock::now()-std::chrono::hours(24*31)); + job_archive::cleanup(); check(!fs::exists(job_archive::path(id,".result")),"expired acknowledged result retained"); + std::cout << "PASS: pending restart, binary persistence, metadata-only polling, idempotence, acknowledgement retention, safe IDs\n"; +} diff --git a/tests/media-followup.mjs b/tests/media-followup.mjs new file mode 100644 index 0000000..52c9699 --- /dev/null +++ b/tests/media-followup.mjs @@ -0,0 +1,25 @@ +// Manual real-media check; requires an idle Studio and existing real-media artifacts. +import {readFile,writeFile} from 'node:fs/promises'; +import {execFileSync} from 'node:child_process'; +import {availableArtModels,artworkGraph} from '../tools/webui/src/lib/comfy-art.ts'; +const base='http://127.0.0.1:8087',folder='build/media-acceptance/',report=JSON.parse(await readFile('build/media-acceptance/followup.json','utf8').catch(()=>'[]')); +async function json(path,init){const r=await fetch(base+path,init);if(!r.ok)throw Error(path+': '+await r.text());return r.json();} +async function record(name,data){report.push({name,data,at:new Date().toISOString()});console.log(name,JSON.stringify(data));await writeFile(folder+'followup.json',JSON.stringify(report,null,2));} +async function poll(id){for(let n=0;n<900;n++){const s=await json('/job?id='+id);if(s.status==='done')return;if(s.status!=='running')throw Error(JSON.stringify(s));if(n%15===0)console.log(await json('/jobs'));await new Promise(r=>setTimeout(r,2000));}throw Error('Job timeout');} +try{ + const cover=await readFile(folder+'cover.png'); + if(!process.argv.includes('--skip-reference')){ + const form=new FormData();form.append('image',new Blob([cover],{type:'image/png'}),'reference-check.png');form.append('type','input'); + const image=await json('/comfy/upload/image',{method:'POST',body:form}); + const models=availableArtModels(await json('/comfy/object_info')); + const graph=artworkGraph(models,'Create an entirely NEW scene using only the illustration medium, amber lighting and purple color palette from . Replace the man, street and bridge completely. Show a close-up vintage drum machine and vinyl records on a rooftop table at sunset, distant city skyline. No people. No bridge. No lettering.',112346,'yue2-reference-check',(image.subfolder?image.subfolder+'/':'')+image.name+' [input]'); + const started=Date.now(),{prompt_id}=await json('/comfy/prompt',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({prompt:graph})});await record('Reference retry submitted',{prompt_id,cfg:4}); + for(let n=0;n<900;n++){const h=(await json('/comfy/history/'+prompt_id))[prompt_id];if(h?.status?.status_str==='error')throw Error(JSON.stringify(h.status));const img=h?.outputs?.['8']?.images?.[0];if(img){const r=await fetch(base+'/comfy/view?'+new URLSearchParams(img));await writeFile(folder+'reference-cover-guided.png',Buffer.from(await r.arrayBuffer()));await record('Reference retry completed',{seconds:(Date.now()-started)/1000});break;}if(n%15===0)console.log('Reference artwork processing');await new Promise(r=>setTimeout(r,2000));} + } + const form=new FormData();form.append('audio',new Blob([await readFile(folder+'take-0.wav')],{type:'audio/wav'}),'original.wav');form.append('vocal_gain_db','3'); + const start=Date.now(),{id}=await json('/vocal-balance',{method:'POST',body:form});await record('Vocal separation submitted',{id});await poll(id);const r=await fetch(base+'/job?id='+id+'&result=1');await writeFile(folder+'vocal-plus3.wav',Buffer.from(await r.arrayBuffer()));await record('Vocal separation completed',{seconds:(Date.now()-start)/1000,contentType:r.headers.get('Content-Type')}); + await fetch(base+'/job?id='+id+'&ack=1',{method:'POST'}); + const delivery=new FormData();delivery.append('audio',new Blob([await readFile(folder+'take-1.wav')],{type:'audio/wav'}),'master.wav');delivery.append('cover',new Blob([cover],{type:'image/png'}),'cover.png'); + const video=await json('/render-video',{method:'POST',body:delivery});await poll(video.id);await writeFile(folder+'hiphop-circuit-test.mp4',Buffer.from(await(await fetch(base+'/job?id='+video.id+'&result=1')).arrayBuffer()));await fetch(base+'/job?id='+video.id+'&ack=1',{method:'POST'}); + const probe=JSON.parse(execFileSync('ffprobe',['-v','error','-show_streams','-of','json',folder+'hiphop-circuit-test.mp4'],{encoding:'utf8',windowsHide:true}));await record('MP4 codecs',probe.streams.map(s=>({codec:s.codec_name,width:s.width,height:s.height,duration:s.duration}))); +}catch(e){await record('Needs attention',{error:String(e)});process.exitCode=1;} diff --git a/tests/media-playback-browser.mjs b/tests/media-playback-browser.mjs new file mode 100644 index 0000000..79b7667 --- /dev/null +++ b/tests/media-playback-browser.mjs @@ -0,0 +1,10 @@ +// Manual: pass the path of a generated MP4, optionally its expected duration. +import {chromium} from '../tools/youtube-agent/node_modules/playwright/index.mjs'; +import {readFile} from 'node:fs/promises'; +import http from 'node:http'; +import {once} from 'node:events'; +import assert from 'node:assert/strict'; +const bytes=await readFile(process.argv[2]),expected=Number(process.argv[3]); +const server=http.createServer((req,res)=>{const range=req.headers.range?.match(/bytes=(\d+)-(\d*)/);const start=range?Number(range[1]):0,end=range&&range[2]?Math.min(Number(range[2]),bytes.length-1):bytes.length-1;res.writeHead(range?206:200,{'Content-Type':'video/mp4','Accept-Ranges':'bytes','Content-Length':end-start+1,...(range?{'Content-Range':`bytes ${start}-${end}/${bytes.length}`}:{})});res.end(bytes.subarray(start,end+1));});server.listen(0,'127.0.0.1');await once(server,'listening'); +const browser=await chromium.launch({...(process.env.CI?{}:{channel:'msedge'}),headless:true}); +try{const page=await browser.newPage();await page.setContent(``);await page.waitForFunction(()=>document.querySelector('video').readyState>=2);const duration=await page.locator('video').evaluate(v=>v.duration);if(expected)assert.ok(Math.abs(duration-expected)<1);await page.locator('video').evaluate(v=>v.play());await page.waitForFunction(()=>document.querySelector('video').currentTime>.1);await page.locator('video').evaluate(v=>{v.currentTime=v.duration-1;});await page.waitForFunction(()=>document.querySelector('video').ended,{},{timeout:10000});assert.equal(await page.locator('video').evaluate(v=>v.error),null);console.log('PASS: MP4 browser metadata, playback, end seek and completion.',{duration});}finally{await browser.close();server.close();} diff --git a/tests/media-queue.mjs b/tests/media-queue.mjs new file mode 100644 index 0000000..32d2865 --- /dev/null +++ b/tests/media-queue.mjs @@ -0,0 +1,38 @@ +import {spawn,execFileSync} from 'node:child_process'; +import {once} from 'node:events'; +import {mkdtemp,mkdir,writeFile,readFile} from 'node:fs/promises'; +import {fileURLToPath} from 'node:url'; +import {join} from 'node:path'; +import assert from 'node:assert/strict'; +const duration=process.argv.includes('--long')?360:3; +const root=fileURLToPath(new URL('../',import.meta.url)),work=await mkdtemp(join(root,'build/media-queue-')); +const env=Object.fromEntries(Object.entries(process.env).map(([k,v])=>[k.toUpperCase(),v]));env.GGML_BACKEND='CPU'; +const run=(cmd,args)=>execFileSync(cmd,args,{cwd:work,env,windowsHide:true,encoding:'utf8',stdio:['ignore','pipe','pipe']}); +run('ffmpeg',['-y','-f','lavfi','-i',`sine=frequency=440:duration=${duration}`,'-ar','48000',join(work,'tone.wav')]); +run('ffmpeg',['-y','-f','lavfi','-i','color=c=purple:s=128x128','-frames:v','1',join(work,'cover.png')]); +await mkdir(join(work,'saved_presets')); +const preset={name:'Recovered',kind:'music',data:{ids:[],weights:{},prompt:'Jazz'}}; +await writeFile(join(work,'saved_presets/music-Recovered.bak'),JSON.stringify(preset)); +await writeFile(join(work,'saved_presets/music-Recovered.tmp'),'incomplete'); +const child=spawn(join(root,'build/Release-producer/yue-server.exe'),['--host','127.0.0.1','--port','18088','--comfy-port','18188','--max-seq','512','--model',join(root,'models/YuE2-3B-Q8_0.gguf'),'--vae',join(root,'models/YuE2-Vae-F32.gguf')],{cwd:work,env,windowsHide:true,stdio:['ignore','pipe','pipe']}); +let logs='';child.stderr.on('data',b=>logs+=b);child.stdout.on('data',()=>{}); +const base='http://127.0.0.1:18088'; +async function done(id){for(let i=0;i<2400;i++){const s=await(await fetch(base+`/job?id=${id}`)).json();if(s.status==='done'||s.status==='cancelled'||s.status==='failed')return s.status;await new Promise(r=>setTimeout(r,250));}throw Error('Media timeout '+logs);} +function form(audio,cover){const f=new FormData();f.append('audio',new Blob([audio],{type:'audio/wav'}),'tone.wav');f.append('cover',new Blob([cover],{type:'image/png'}),'cover.png');return f;} +try{ + for(let i=0;i<100;i++){try{if((await fetch(base+'/health')).ok)break;}catch{}await new Promise(r=>setTimeout(r,100));} + assert.equal((await(await fetch(base+'/presets')).json())[0].name,'Recovered'); + assert.equal((await fetch(base+'/presets',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({...preset,name:'Renamed',oldName:'Recovered',operation:'rename'})})).status,200); + assert.equal((await(await fetch(base+'/presets')).json())[0].name,'Renamed'); + const audio=await readFile(join(work,'tone.wav')),cover=await readFile(join(work,'cover.png')); + const id='22222222222222222222222222222222'; + const response=await fetch(base+'/render-video',{method:'POST',headers:{'X-Yue2-Job-Id':id},body:form(audio,cover)}); + assert.equal(response.status,200);assert.equal((await response.json()).id,id);assert.equal(await done(id),'done',logs); + const video=Buffer.from(await(await fetch(base+`/job?id=${id}&result=1`)).arrayBuffer());await writeFile(join(work,'video.mp4'),video); + const probe=JSON.parse(run('ffprobe',['-v','error','-show_streams','-of','json',join(work,'video.mp4')])); + assert.ok(probe.streams.some(s=>s.codec_name==='h264'&&s.width===1920&&s.height===1080));assert.ok(probe.streams.some(s=>s.codec_name==='aac'));assert.ok(Math.abs(Number(probe.streams[0].duration)-duration)<1); + const retry=await fetch(base+'/render-video',{method:'POST',headers:{'X-Yue2-Job-Id':id},body:form(audio,cover)});assert.equal((await retry.json()).id,id);assert.equal(await done(id),'done'); + const cancelId='33333333333333333333333333333333';await fetch(base+'/render-video',{method:'POST',headers:{'X-Yue2-Job-Id':cancelId},body:form(audio,cover)});await fetch(base+`/job?id=${cancelId}&cancel=1`,{method:'POST'});assert.equal(await done(cancelId),'cancelled'); + assert.deepEqual(await(await fetch(base+'/jobs')).json(),[]); + console.log('PASS: interrupted preset recovery; atomic rename; bounded asynchronous video, idempotent retry, H.264 1920x1080 + AAC, owned cancellation; '+duration+' seconds. '+work); +}finally{if(child.exitCode===null&&child.signalCode===null){const exit=once(child,'exit');child.kill();await exit;}} diff --git a/tests/real-media.mjs b/tests/real-media.mjs new file mode 100644 index 0000000..f1a5d13 --- /dev/null +++ b/tests/real-media.mjs @@ -0,0 +1,39 @@ +// Explicit manual acceptance run: uses the local GPU and ComfyUI, saves artifacts. +import {spawn,execFileSync} from 'node:child_process'; +import {once} from 'node:events'; +import {mkdir,readFile,writeFile,copyFile} from 'node:fs/promises'; +import {fileURLToPath} from 'node:url'; +import {join} from 'node:path'; +import assert from 'node:assert/strict'; +const root=fileURLToPath(new URL('../',import.meta.url)),work=join(root,'build/media-acceptance');await mkdir(work,{recursive:true}); +const bin=join(root,'build/Release-acceptance');await mkdir(bin,{recursive:true});for(const f of ['yue-server.exe','ggml.dll','ggml-base.dll','ggml-cpu.dll','ggml-cuda.dll'])await copyFile(join(root,'build/Release-producer',f),join(bin,f)); +const env=Object.fromEntries(Object.entries(process.env).map(([k,v])=>[k.toUpperCase(),v]));env.PATH=join(root,'.venv-vocal/Scripts')+';'+bin+';'+env.PATH;delete env.GGML_BACKEND; +const server=spawn(join(bin,'yue-server.exe'),['--host','127.0.0.1','--port','18089','--max-seq','4096','--model',join(root,'models/YuE2-3B-Q8_0.gguf'),'--vae',join(root,'models/YuE2-Vae-F32.gguf')],{cwd:work,env,windowsHide:true,stdio:['ignore','pipe','pipe']}); +let logs='';server.stderr.on('data',b=>{logs+=b;});server.stdout.on('data',()=>{}); +const base='http://127.0.0.1:18089',report={started:new Date().toISOString(),checks:[],artifacts:work}; +async function checkpoint(name,details){report.checks.push({name,details,at:new Date().toISOString()});await writeFile(join(work,'report.json'),JSON.stringify(report,null,2));await writeFile(join(work,'server.log'),logs);console.log(name,JSON.stringify(details));} +async function poll(id){for(let i=0;i<1800;i++){const data=await(await fetch(base+`/job?id=${id}`)).json();if(data.status==='done')return;if(data.status!=='running')throw Error(JSON.stringify(data)+' '+logs.slice(-3000));if(i%15===0)console.log('Working',JSON.stringify(await(await fetch(base+'/jobs')).json()));await new Promise(r=>setTimeout(r,2000));}throw Error('Job timed out');} +const ff=(cmd,args)=>execFileSync(cmd,args,{env,windowsHide:true,encoding:'utf8',maxBuffer:16*1024*1024}); +function multipart(bytes,boundary){const marker=Buffer.from('--'+boundary),parts=[];let pos=bytes.indexOf(marker);for(;;){const next=bytes.indexOf(marker,pos+marker.length);if(next<0)break;const headerEnd=bytes.indexOf('\r\n\r\n',pos),header=bytes.subarray(pos,headerEnd).toString();parts.push({header,body:bytes.subarray(headerEnd+4,next-2)});pos=next;}return parts;} +async function imageJob(reference){const info=await(await fetch(base+'/comfy/object_info')).json();const {availableArtModels,artworkGraph}=await import('../tools/webui/src/lib/comfy-art.ts');const models=availableArtModels(info);let ref; + if(reference){const f=new FormData();f.append('image',new Blob([reference],{type:'image/png'}),'acceptance-reference.png');f.append('overwrite','false');const r=await(await fetch(base+'/comfy/upload/image',{method:'POST',body:f})).json();ref=(r.subfolder?r.subfolder+'/':'')+r.name+' [input]';} + const prompt=reference?'Use as a palette and illustration style reference. A different scene: a vintage drum machine on a rooftop at violet sunset, cinematic hip hop album cover, no text.':'Cinematic illustrated hip hop album cover: a lone adult rapper in a yellow jacket beneath a rain-soaked city overpass, warm amber streetlights and violet shadows, richly detailed, no text or logos.'; + const start=Date.now(),response=await fetch(base+'/comfy/prompt',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({prompt:artworkGraph(models,prompt,7217,reference?'yue2-acceptance-reference':'yue2-acceptance-cover',ref),client_id:'yue2-acceptance'})});if(!response.ok)throw Error(await response.text());const {prompt_id}=await response.json();await checkpoint('Artwork submitted',{prompt_id,reference:!!reference}); + for(let i=0;i<900;i++){const history=await(await fetch(base+'/comfy/history/'+prompt_id)).json(),item=history[prompt_id];if(item?.status?.status_str==='error')throw Error(JSON.stringify(item.status));const image=item?.outputs?.['8']?.images?.[0];if(image){const bytes=Buffer.from(await(await fetch(base+'/comfy/view?'+new URLSearchParams(image))).arrayBuffer());await checkpoint(reference?'Reference artwork completed':'Artwork completed',{seconds:(Date.now()-start)/1000,bytes:bytes.length});return bytes;}if(i%15===0)console.log('Artwork still processing',prompt_id);await new Promise(r=>setTimeout(r,2000));}throw Error('Artwork timeout');} +try{ + for(let i=0;i<100;i++){try{if((await fetch(base+'/health')).ok)break;}catch{}await new Promise(r=>setTimeout(r,200));} + const request={style:'Boom bap hip hop, 90 BPM, warm clear male mid-range rhythmic rap, dusty drums, jazz piano, deep bass, articulate delivery.',lyrics:'[Verse]\nCity lights are shining through the rain\nBuild a little rhythm from the train\nStep by step we find a brighter way\nTurn another midnight into day',cot:'off',duration:12,lm_seed:7217,seed:7217,lm_batch_size:1,synth_batch_size:2,steps:32,output_format:'wav24',mastering_profile:'streaming'}; + const start=Date.now(),id=crypto.randomUUID().replaceAll('-','');const response=await fetch(base+'/synth',{method:'POST',headers:{'Content-Type':'application/json','X-Yue2-Job-Id':id},body:JSON.stringify(request)});if(!response.ok)throw Error(await response.text());await checkpoint('Music submitted',{id,request});await poll(id); + const result=await fetch(base+`/job?id=${id}&result=1`),boundary=result.headers.get('Content-Type').match(/boundary=([^\s;]+)/)[1];const parts=multipart(Buffer.from(await result.arrayBuffer()),boundary);let audio,original,index=0; + for(const part of parts){if(part.header.includes('application/json')){await writeFile(join(work,`request-${index}.json`),part.body);continue;}await writeFile(join(work,`take-${index}.wav`),part.body);if(index===1)audio=part.body;if(index===0)original=part.body;index++;} + assert.equal(index,4,'two mastered takes paired with originals');await checkpoint('Real music completed',{seconds:(Date.now()-start)/1000,audioParts:index}); + const probe=JSON.parse(ff('ffprobe',['-v','error','-show_streams','-of','json',join(work,'take-0.wav')]));assert.equal(probe.streams[0].sample_rate,'48000');await checkpoint('Audio format',probe.streams[0]); + // Measure actual input loudness and peak without changing the saved audio. + for(const n of [0,1]){const proc=spawn('ffmpeg',['-hide_banner','-i',join(work,`take-${n}.wav`),'-af','loudnorm=I=-14:TP=-1:print_format=json','-f','null','-'],{env,windowsHide:true,stdio:['ignore','ignore','pipe']});let output='';proc.stderr.on('data',b=>output+=b);await once(proc,'exit');await writeFile(join(work,`loudness-${n}.txt`),output);await checkpoint('Loudness measured',{take:n,version:n===0?'original':'streaming master',measurement:output.slice(output.lastIndexOf('{'))});} + const cover=await imageJob();await writeFile(join(work,'cover.png'),cover); + const referenced=await imageJob(cover);await writeFile(join(work,'reference-cover.png'),referenced); + const form=new FormData();form.append('audio',new Blob([audio],{type:'audio/wav'}),'track.wav');form.append('cover',new Blob([cover],{type:'image/png'}),'cover.png');const videoId=(await(await fetch(base+'/render-video',{method:'POST',body:form})).json()).id;assert.ok(videoId);await poll(videoId);await writeFile(join(work,'hiphop-circuit-test.mp4'),Buffer.from(await(await fetch(base+`/job?id=${videoId}&result=1`)).arrayBuffer()));await checkpoint('Generated artwork MP4 ready',{videoId}); + const vocalForm=new FormData();vocalForm.append('audio',new Blob([original],{type:'audio/wav'}),'original.wav');vocalForm.append('vocal_gain_db','3');const vocalResponse=await fetch(base+'/vocal-balance',{method:'POST',body:vocalForm});if(!vocalResponse.ok)throw Error(await vocalResponse.text());const vocalId=(await vocalResponse.json()).id;await poll(vocalId);await writeFile(join(work,'vocal-plus3.wav'),Buffer.from(await(await fetch(base+`/job?id=${vocalId}&result=1`)).arrayBuffer()));await checkpoint('Real vocal separation completed',{vocalId}); + await checkpoint('Acceptance run finished',{ }); +}catch(error){await checkpoint('Acceptance needs attention',{error:String(error),log:logs.slice(-4000)});process.exitCode=1;} +finally{await writeFile(join(work,'server.log'),logs);if(server.exitCode===null&&server.signalCode===null){const ended=once(server,'exit');server.kill();await ended;}} diff --git a/tests/recovery-http.mjs b/tests/recovery-http.mjs new file mode 100644 index 0000000..1d1ce99 --- /dev/null +++ b/tests/recovery-http.mjs @@ -0,0 +1,35 @@ +import {spawn} from 'node:child_process'; +import {once} from 'node:events'; +import {mkdtemp,mkdir,writeFile} from 'node:fs/promises'; +import {fileURLToPath} from 'node:url'; +import {join} from 'node:path'; +import assert from 'node:assert/strict'; +const root=fileURLToPath(new URL('../',import.meta.url)); +const work=await mkdtemp(join(root,'build/recovery-http-')); +await mkdir(join(work,'job_results')); +const id='0123456789abcdef0123456789abcdef', interrupted='1111111111111111'; +const body=Buffer.from('archived\0audio'),mime='audio/wav'; +await writeFile(join(work,'job_results',id+'.result'),Buffer.concat([Buffer.from(`YUE2JOB1\n1\n${mime.length}\n${body.length}\n${mime}`),body])); +await writeFile(join(work,'job_results',interrupted+'.pending'),'interrupted\n'); +const env=Object.fromEntries(Object.entries(process.env).map(([k,v])=>[k.toUpperCase(),v]));env.GGML_BACKEND='CPU'; +const base='http://127.0.0.1:18088';let child; +async function start(){ + child=spawn(join(root,'build/Release-producer/yue-server.exe'),['--host','127.0.0.1','--port','18088','--comfy-port','18188','--max-seq','512','--model',join(root,'models/YuE2-3B-Q8_0.gguf'),'--vae',join(root,'models/YuE2-Vae-F32.gguf')],{cwd:work,env,windowsHide:true,stdio:['ignore','pipe','pipe']}); + let logs='';child.stderr.on('data',b=>logs=(logs+b).slice(-8000)); + for(let i=0;i<100;i++){if(child.exitCode!==null)throw Error(logs);try{if((await fetch(base+'/health')).ok)return;}catch{}await new Promise(r=>setTimeout(r,200));}throw Error('Server startup timeout '+logs); +} +async function stop(){const stopping=child;child=undefined;if(stopping&&stopping.exitCode===null&&stopping.signalCode===null){const ended=once(stopping,'exit');stopping.kill();await ended;}} +try{ + for(let pass=0;pass<2;pass++){ + await start(); + assert.deepEqual(await(await fetch(base+`/job?id=${id}`)).json(),{status:'done',durable:true}); + assert.equal(Buffer.compare(Buffer.from(await(await fetch(base+`/job?id=${id}&result=1`)).arrayBuffer()),body),0); + assert.equal((await(await fetch(base+`/job?id=${interrupted}`)).json()).status,'interrupted'); + const retry=await fetch(base+'/synth',{method:'POST',headers:{'Content-Type':'application/json','X-Yue2-Job-Id':id},body:JSON.stringify({style:'Audit replay'})}); + assert.equal(retry.status,200);assert.equal((await retry.json()).id,id); + assert.equal((await(await fetch(base+`/job?id=${id}`)).json()).status,'done'); + assert.equal((await fetch(base+`/job?id=${id}&ack=1`,{method:'POST'})).status,200); + await stop(); + } + console.log('PASS: archived binary results survive server restart; retries return the same completed job; interrupted status and acknowledgement work. No synthesis performed.'); +}finally{await stop();} diff --git a/tests/server-smoke.mjs b/tests/server-smoke.mjs new file mode 100644 index 0000000..f1e7587 --- /dev/null +++ b/tests/server-smoke.mjs @@ -0,0 +1,51 @@ +// Read-only API checks against a temporary CPU server, never the user's live port. +import { spawn } from 'node:child_process'; +import { once } from 'node:events'; +import assert from 'node:assert/strict'; +import { fileURLToPath } from 'node:url'; + +const root = fileURLToPath(new URL('../', import.meta.url)); +const env = Object.fromEntries(Object.entries(process.env).map(([key, value]) => [key.toUpperCase(), value])); +env.GGML_BACKEND = 'CPU'; +const child = spawn(process.argv[2] || `${root}build/audit-repair/yue-server.exe`, [ + '--host', '127.0.0.1', '--port', '18087', '--max-seq', '512', + '--model', 'models/YuE2-3B-Q8_0.gguf', '--vae', 'models/YuE2-Vae-F32.gguf' +], { cwd: root, env, windowsHide: true, stdio: ['ignore', 'pipe', 'pipe'] }); +let logs = ''; +child.stdout.on('data', chunk => { logs = (logs + chunk).slice(-12000); }); +child.stderr.on('data', chunk => { logs = (logs + chunk).slice(-12000); }); +let startupError; +child.on('error', error => { startupError = error; }); +const base = 'http://127.0.0.1:18087'; +try { + let ready = false; + for (let n = 0; n < 100; n++) { + if (startupError) throw startupError; + if (child.exitCode !== null) throw new Error(`Server exited: ${logs}`); + try { ready = (await fetch(`${base}/health`, { signal: AbortSignal.timeout(500) })).ok; } catch {} + if (ready) break; + await new Promise(resolve => setTimeout(resolve, 200)); + } + assert.ok(ready, `Temporary server failed to start: ${logs}`); + const props = await (await fetch(`${base}/props`)).json(); + assert.equal(props.defaults.mp3_bitrate, 320); + assert.equal(props.sample_rate, 48000); + for (const request of [{ steps: 201 }, { duration: 601 }, { duration: -2 }, { cfg_scale: 31 }, { peak_clip: 1000 }, { output_format: 'mp3', mp3_bitrate: 321 }]) { + const response = await fetch(`${base}/synth`, { method: 'POST', body: JSON.stringify(request) }); + assert.equal(response.status, 400, JSON.stringify(request)); + assert.ok((await response.json()).error); + } + const oversized = await fetch(`${base}/synth`, { method: 'POST', body: JSON.stringify({ lyrics: 'a'.repeat(1024 * 1024) }) }); + assert.equal(oversized.status, 413); + const ui = await (await fetch(`${base}/`, { headers: { 'Accept-Encoding': 'gzip' } })).text(); + assert.ok(ui.includes('Relative') || ui.includes('relative influence')); + assert.ok(ui.includes('Ollama model')); + if (process.argv[2]) assert.ok(ui.includes('Lock voice profiles across songs')); + console.log('PASS: temporary CPU server; 320 kbps/48 kHz defaults; six invalid requests; oversized request; embedded updated UI. No songs generated.'); +} finally { + if (child.exitCode === null) { + const exited = once(child, 'exit'); + child.kill(); + await exited; + } +} diff --git a/tests/studio-interactions.mjs b/tests/studio-interactions.mjs new file mode 100644 index 0000000..1e9bbb3 --- /dev/null +++ b/tests/studio-interactions.mjs @@ -0,0 +1,116 @@ +import { chromium } from '../tools/youtube-agent/node_modules/playwright/index.mjs'; +import { readFile, writeFile, mkdir } from 'node:fs/promises'; +import assert from 'node:assert/strict'; +await mkdir('build/ui-review',{recursive:true}); +const browser = await chromium.launch({...(process.env.CI ? {} : {channel:'msedge'}),headless:true}); +try { + const page = await browser.newPage({viewport:{width:1536,height:1024}}); + const errors=[]; page.on('pageerror',error=>errors.push(error.message)); + let presets=[], rejected=0; + await page.route('**/*',async route=>{ + const request=route.request(), url=new URL(request.url()); + if(url.origin==='http://localhost:8087' && url.pathname==='/') return route.fulfill({contentType:'text/html',body:await readFile('tools/webui/dist/index.html')}); + if(url.pathname==='/presets') { + if(request.method()==='POST') { + const p=request.postDataJSON(); await new Promise(resolve=>setTimeout(resolve,250)); + presets=presets.filter(x=>!(x.name===p.name && x.kind===p.kind)); + if(p.operation!=='delete') presets.push({name:p.name,kind:p.kind,data:p.data}); + } + return route.fulfill({json:presets}); + } + if(request.method()==='POST') { rejected++; await new Promise(resolve=>setTimeout(resolve,600)); return route.fulfill({status:503,json:{error:'Interaction review: simulated unavailable service'}}); } + if(url.pathname==='/jobs')return route.fulfill({json:[]}); + if(url.pathname==='/api/tags')return route.fulfill({json:{models:[]}}); + return route.fulfill({json:{status:'ok',defaults:{},sample_rate:48000,context:24576}}); + }); + await page.goto('http://localhost:8087'); + await page.getByRole('heading',{name:'Create your song'}).waitFor(); + // Seed only the disposable browser's library with a silent, valid WAV and cover. + await page.evaluate(async()=>{ + const buffer=new ArrayBuffer(44+16000*2*12), view=new DataView(buffer); + const str=(offset,s)=>[...s].forEach((c,i)=>view.setUint8(offset+i,c.charCodeAt(0))); + str(0,'RIFF');view.setUint32(4,buffer.byteLength-8,true);str(8,'WAVE');str(12,'fmt ');view.setUint32(16,16,true);view.setUint16(20,1,true);view.setUint16(22,1,true);view.setUint32(24,16000,true);view.setUint32(28,32000,true);view.setUint16(32,2,true);view.setUint16(34,16,true);str(36,'data');view.setUint32(40,buffer.byteLength-44,true); + const canvas=document.createElement('canvas');canvas.width=canvas.height=64;const ctx=canvas.getContext('2d');ctx.fillStyle='#7744cc';ctx.fillRect(0,0,64,64); + const artwork=await new Promise(resolve=>canvas.toBlob(resolve)); + const db=await new Promise((resolve,reject)=>{const r=indexedDB.open('yue2-songs');r.onupgradeneeded=()=>r.result.createObjectStore('songs',{keyPath:'id',autoIncrement:true});r.onsuccess=()=>resolve(r.result);r.onerror=()=>reject(r.error);}); + await new Promise((resolve,reject)=>{const tx=db.transaction('songs','readwrite');tx.objectStore('songs').put({id:1,name:'Interaction review track',created:1,duration:12,format:'wav',style:'Jazz Rap',seed:1,score:'',artwork,audio:new Blob([buffer],{type:'audio/wav'}),request:{style:'Jazz Rap',abc_sampling:{},semantic_sampling:{}}});tx.oncomplete=resolve;tx.onerror=()=>reject(tx.error);});db.close(); + }); + await page.reload(); + await page.getByRole('heading',{name:'Create your song'}).waitFor(); + await page.getByRole('button',{name:'Manage saved presets'}).click(); + await page.getByRole('button',{name:'Edit style blends'}).click(); + const blends=page.locator('#music-workbench .favourites'); + await blends.getByPlaceholder('Name your preset').fill('Review preset'); + await blends.getByRole('button',{name:'Save new',exact:true}).click(); + await blends.getByRole('status').waitFor(); + assert.ok(await blends.getByRole('button',{name:'Load',exact:true}).isDisabled()); + await page.getByRole('button',{name:'Load music preset Review preset'}).waitFor(); + await blends.getByRole('button',{name:'Load',exact:true}).click(); + await page.getByRole('status').filter({hasText:'Loaded preset:'}).waitFor(); + await page.getByRole('button',{name:/^Library/}).click(); + const card=page.locator('.song-list > .card').first(), trigger=card.getByRole('button',{name:'Track actions'}); + await trigger.focus(); await page.keyboard.press('ArrowDown'); + assert.equal(await page.locator(':focus').innerText(),'Edit prompt'); + await page.keyboard.press('End'); assert.equal(await page.locator(':focus').innerText(),'Delete non-favorites'); + await page.keyboard.press('Home'); assert.equal(await page.locator(':focus').innerText(),'Edit prompt'); + await page.keyboard.press('Escape'); assert.ok(await trigger.evaluate(el=>el===document.activeElement)); + await page.screenshot({path:'build/ui-review/interaction-library.png'}); + await trigger.click();await page.getByRole('menuitem',{name:'Rename song',exact:true}).click(); + const dialog=page.getByRole('dialog',{name:'Rename song'}); + await dialog.waitFor(); assert.ok(await dialog.getByLabel('Song name').evaluate(el=>el===document.activeElement)); + await page.keyboard.press('Shift+Tab'); assert.equal(await page.locator(':focus').innerText(),'OK'); + await page.keyboard.press('Tab'); assert.ok(await dialog.getByLabel('Song name').evaluate(el=>el===document.activeElement)); + await page.keyboard.press('Escape'); assert.ok(await trigger.evaluate(el=>el===document.activeElement)); + await card.getByRole('button',{name:'Favourite Interaction review track'}).click(); + await page.waitForFunction(()=>document.querySelector('button[aria-label="Favourite Interaction review track"]')?.getAttribute('aria-pressed')==='true'); + const wave=card.getByRole('slider',{name:'Seek in Interaction review track'}); + await wave.focus();await page.keyboard.press('ArrowRight');assert.equal(await wave.getAttribute('aria-valuenow'),'5'); + await page.keyboard.press('Home');assert.equal(await wave.getAttribute('aria-valuenow'),'0'); + await page.keyboard.press('Space');await page.waitForTimeout(100);assert.equal(await card.locator('.play-btn').getAttribute('aria-pressed'),'true');await page.keyboard.press('Space'); + await card.getByRole('button',{name:'Expand artwork for Interaction review track'}).click(); + await page.getByRole('dialog',{name:'Artwork for Interaction review track'}).waitFor(); + await page.keyboard.press('Escape');await page.waitForTimeout(350); + await trigger.click();await page.getByRole('menuitem',{name:'Transcribe score',exact:true}).click(); + await card.getByRole('status').filter({hasText:'Transcribing audio'}).waitFor(); + await trigger.click();assert.ok(await page.getByRole('menuitem',{name:'Transcribe melody'}).isDisabled());await page.keyboard.press('Escape'); + await page.getByRole('status').filter({hasText:'Transcription failed'}).waitFor(); + await trigger.click();await page.getByRole('menuitem',{name:'Prepare for YouTube'}).click(); + await page.getByLabel('Description',{exact:true}).fill('Line one');await page.keyboard.press('Enter');assert.equal(await page.getByRole('dialog',{name:'Prepare for YouTube'}).count(),1); + await page.getByRole('button',{name:'Save draft',exact:true}).click();await page.getByRole('status').filter({hasText:'Draft saved.'}).waitFor();await page.getByRole('button',{name:'Close',exact:true}).click(); + // Exercise library operations against the disposable fixture. + await trigger.click();await page.getByRole('menuitem',{name:'Rename song',exact:true}).click(); + await page.getByLabel('Song name').fill('Renamed review track');await page.getByRole('button',{name:'OK',exact:true}).click(); + await page.waitForFunction(()=>document.querySelector('.card-name')?.textContent==='Renamed review track'); + await trigger.click(); + const audioDownload=page.waitForEvent('download');await page.getByRole('menuitem',{name:'Download audio',exact:true}).click();await audioDownload; + const backupDownload=page.waitForEvent('download');await page.getByRole('button',{name:'Backup',exact:true}).click();const backup=await backupDownload; + page.on('dialog',dialog=>dialog.accept());await page.getByLabel('Choose a YuE2 library backup').setInputFiles(await backup.path()); + await page.waitForTimeout(1200);await page.getByRole('heading',{name:'Create your song'}).waitFor(); + const audit=[]; + // Hover and keyboard focus every visible control, including all expanded panels. + await page.getByRole('button',{name:'Create',exact:true}).click(); + await page.locator('.style-tile').first().click(); + assert.equal(await page.locator('.style-tile').first().getAttribute('aria-pressed'),'true'); + await page.getByRole('button',{name:'Manual control',exact:true}).click(); + await page.evaluate(()=>document.querySelectorAll('details').forEach(d=>d.open=true)); + const temperature=page.locator('#score-sampling').getByRole('slider',{name:'Temperature slider'}); + await temperature.focus(); await page.keyboard.press('ArrowRight'); + assert.ok(await page.locator('#score-sampling').getByRole('spinbutton',{name:'Temperature',exact:true}).inputValue()); + await page.keyboard.press('Tab'); + const controls=page.locator('button:visible, a:visible, summary:visible, input:visible, select:visible, textarea:visible, [role="slider"]:visible'); + const count=await controls.count(); + for(let i=0;i({tag:el.tagName,name:el.getAttribute('aria-label')||el.getAttribute('title')||el.textContent?.trim().slice(0,80)||el.closest('label')?.textContent?.trim().slice(0,80),disabled:el.matches(':disabled')})); + if(!item.disabled) { await c.focus(); item.focus=await c.evaluate(el=>getComputedStyle(el).outlineStyle); assert.notEqual(item.focus,'none',`Missing keyboard focus: ${item.name}`); } + audit.push(item); + } + await writeFile('build/ui-review/control-inventory.json',JSON.stringify(audit,null,2)); + await page.emulateMedia({reducedMotion:'reduce'}); + assert.equal(await page.locator('.generate-btn').evaluate(el=>getComputedStyle(el).transitionDuration),'0s'); + await page.locator('.generate-btn').hover();assert.equal(await page.locator('.generate-btn').evaluate(el=>getComputedStyle(el).transform),'none'); + await page.setViewportSize({width:390,height:844}); + assert.ok(await page.evaluate(()=>document.documentElement.scrollWidth<=innerWidth),'Phone overflow'); + assert.deepEqual(errors,[]); + console.log(`PASS: ${audit.length} controls inventoried/focused; preset busy/load, menu arrows/Home/End/Escape, dialog focus/trap/restore, favourite, waveform seek/play, artwork, transcription busy/error, YouTube save, rename, audio download, backup/restore, reduced motion, phone width. ${rejected} server mutation mocked.`); +} finally {await browser.close();} diff --git a/tests/workflow-browser.mjs b/tests/workflow-browser.mjs new file mode 100644 index 0000000..fa1d96f --- /dev/null +++ b/tests/workflow-browser.mjs @@ -0,0 +1,50 @@ +import {chromium} from '../tools/youtube-agent/node_modules/playwright/index.mjs'; +import {readFile,writeFile,mkdir} from 'node:fs/promises'; +import assert from 'node:assert/strict'; +const browser=await chromium.launch({...(process.env.CI?{}:{channel:'msedge'}),headless:true}); +const html=await readFile('tools/webui/dist/index.html'); +const wav=Buffer.alloc(32044);wav.write('RIFF');wav.writeUInt32LE(wav.length-8,4);wav.write('WAVEfmt ',8);wav.writeUInt32LE(16,16);wav.writeUInt16LE(1,20);wav.writeUInt16LE(1,22);wav.writeUInt32LE(16000,24);wav.writeUInt32LE(32000,28);wav.writeUInt16LE(2,32);wav.writeUInt16LE(16,34);wav.write('data',36);wav.writeUInt32LE(32000,40); +const result=Buffer.concat([Buffer.from('--fixture\r\nContent-Type: application/json\r\n\r\n'+JSON.stringify({style:'Jazz Rap',abc_sampling:{},semantic_sampling:{}})+'\r\n--fixture\r\nContent-Type: audio/wav\r\n\r\n'),wav,Buffer.from('\r\n--fixture--\r\n')]); +try{ + const page=await browser.newPage(),errors=[],submitted=new Set();let done=false,presets=[]; + page.on('pageerror',e=>errors.push(e.message)); + await page.addInitScript(()=>{window.decodeCalls=0;const old=AudioContext.prototype.decodeAudioData;AudioContext.prototype.decodeAudioData=function(...args){window.decodeCalls++;return old.apply(this,args);};}); + await page.route('**/*',route=>{const r=route.request(),u=new URL(r.url()); + if(u.pathname==='/')return route.fulfill({contentType:'text/html',body:html}); + if(u.pathname==='/presets'){if(r.method()==='POST'){const p=r.postDataJSON();if(p.operation==='rename')presets=presets.filter(x=>x.name!==p.oldName);else presets=presets.filter(x=>x.name!==p.name);if(p.operation!=='delete')presets.push(p);}return route.fulfill({json:presets});} + if(u.pathname==='/synth'){const id=r.headers()['x-yue2-job-id'];submitted.add(id);return route.fulfill({json:{id}});} + if(u.pathname==='/job')return u.searchParams.has('result')?route.fulfill({contentType:'multipart/mixed; boundary=fixture',body:result}):route.fulfill({json:{status:done?'done':'running',durable:true}}); + if(u.pathname==='/jobs')return route.fulfill({json:[]}); + return route.fulfill({json:{status:'ok',models:[],defaults:{}}}); + }); + await page.goto('http://localhost:8087');await page.getByRole('heading',{name:'Create your song'}).waitFor(); + await page.getByRole('button',{name:'Save preset',exact:true}).click(); + await page.getByRole('dialog').getByLabel('Preset name').fill('Full setup check'); + await page.getByRole('dialog').getByRole('button',{name:'Save full preset',exact:true}).click(); + await page.getByRole('button',{name:'Load studio preset Full setup check'}).waitFor(); + assert.equal(presets[0].kind,'studio');assert.ok(presets[0].data.configuration.producer); + await page.getByRole('button',{name:'Manage saved presets'}).click(); + await page.getByRole('dialog').getByRole('button',{name:'Full setup check · Full Studio setup'}).click(); + await page.getByRole('dialog').getByLabel('Preset name').fill('Renamed full setup'); + await page.getByRole('dialog').getByRole('button',{name:'Save name'}).click(); + await page.getByRole('button',{name:'Load studio preset Renamed full setup'}).waitFor(); + await page.getByRole('dialog').getByRole('button',{name:'Close',exact:true}).click(); + await page.getByRole('button',{name:/^Library/}).click(); + await page.getByRole('link',{name:'Shape your first track'}).click();await page.getByRole('heading',{name:'Create your song'}).waitFor(); + await page.getByRole('button',{name:/^Library/}).click(); + const albums=page.locator('#albums');await albums.getByLabel('Album title').fill('Recovery test'); + await albums.getByLabel('Generate master cover').uncheck();await albums.getByLabel('Export MP4').uncheck(); + await albums.locator('input[type=file]').setInputFiles([{name:'One.txt',mimeType:'text/plain',buffer:Buffer.from('[Verse]\nOne bright morning')},{name:'Two.txt',mimeType:'text/plain',buffer:Buffer.from('[Verse]\nTwo steps forward')}]); + await albums.getByRole('button',{name:'Generate album',exact:true}).click(); + await page.waitForFunction(()=>document.querySelector('#albums')?.textContent.includes('generating audio')); + await page.waitForTimeout(500);assert.equal(submitted.size,1); + await page.reload();await page.getByRole('button',{name:/^Library/}).click();done=true; + await albums.getByRole('button',{name:'Resume album',exact:true}).click(); + await albums.getByRole('status').filter({hasText:'Album complete'}).waitFor({timeout:20000});assert.equal(submitted.size,2,'resume reuses first ID');assert.equal(await page.locator('.song-list .card').count(),2); + await page.evaluate(async bytes=>{const db=await new Promise((resolve,reject)=>{const q=indexedDB.open('yue2-songs');q.onsuccess=()=>resolve(q.result);q.onerror=()=>reject(q.error);});await new Promise((resolve,reject)=>{const tx=db.transaction('songs','readwrite');for(let i=0;i<120;i++)tx.objectStore('songs').add({name:'Stress '+i,created:i+100,format:'wav',duration:1,style:'Jazz Rap',seed:1,score:'',audio:new Blob([new Uint8Array(bytes)],{type:'audio/wav'}),peaks:[.2,.5,.3],request:{style:'Jazz Rap',abc_sampling:{},semantic_sampling:{}}});tx.oncomplete=resolve;tx.onerror=()=>reject(tx.error);});db.close();},[...wav]); + await page.reload();await page.getByRole('button',{name:/^Library/}).click();await page.waitForTimeout(1500); + assert.equal(await page.locator('.song-list .card').count(),12,'pagination bounds mounted cards');assert.equal(await page.evaluate(()=>window.decodeCalls),0,'cached peaks avoid eager audio decoding'); + const metrics=await (await page.context().newCDPSession(page)).send('Runtime.getHeapUsage');assert.deepEqual(errors,[]); + await mkdir('build/ui-review',{recursive:true});await writeFile('build/ui-review/workflows.json',JSON.stringify({tracks:122,mountedCards:12,decodeCalls:0,heap:metrics,albumResume:'passed',pageErrors:errors},null,2)); + console.log('PASS: empty-library navigation, two-track album reload/resume without duplicate submission, 122-track pagination, zero eager decoding for cached peaks.',metrics); +}finally{await browser.close();} diff --git a/tools/activate-studio.mjs b/tools/activate-studio.mjs new file mode 100644 index 0000000..b508c14 --- /dev/null +++ b/tools/activate-studio.mjs @@ -0,0 +1,8 @@ +import {spawnSync} from 'node:child_process'; +import {fileURLToPath} from 'node:url'; +if(process.platform!=='win32')throw Error('This deployment wrapper is for the Windows music launcher.'); +const root=fileURLToPath(new URL('../',import.meta.url)); +// Windows environment keys are case insensitive; inherited Path/PATH duplicates +// break PowerShell Start-Process unless normalized before starting the shell. +const env=Object.fromEntries(Object.entries(process.env).map(([k,v])=>[k.toUpperCase(),v])); +const r=spawnSync('powershell.exe',['-NoProfile','-ExecutionPolicy','Bypass','-File','tools/activate-studio.ps1'],{cwd:root,env,stdio:'inherit',windowsHide:true});process.exit(r.status??1); diff --git a/tools/activate-studio.ps1 b/tools/activate-studio.ps1 new file mode 100644 index 0000000..0a4b0ce --- /dev/null +++ b/tools/activate-studio.ps1 @@ -0,0 +1,47 @@ +$ErrorActionPreference = 'Stop' +$studioRoot = Split-Path -Parent $PSScriptRoot +$candidate = Join-Path $studioRoot 'build\Release-producer' +$target = Join-Path $studioRoot 'build\Release-reference' +$executable = Join-Path $target 'yue-server.exe' +$files = @('yue-server.exe','ggml.dll','ggml-base.dll','ggml-cpu.dll','ggml-cuda.dll') +foreach ($file in $files) { + if (-not (Test-Path -LiteralPath (Join-Path $candidate $file))) { throw "Candidate missing $file" } +} +$currentServer = Get-Process yue-server -ErrorAction SilentlyContinue | Where-Object { $_.Path -eq $executable } | Select-Object -First 1 +if ($currentServer) { + Write-Output "Preparing to replace server PID $($currentServer.Id)." + try { $jobs = Invoke-RestMethod 'http://127.0.0.1:8087/jobs' -TimeoutSec 3; if ($jobs.Count -gt 0) { throw 'Wait for active jobs to finish before activation.' } } + catch { if ($_.Exception.Message -notmatch '404') { throw } } +} +$backup = Join-Path $studioRoot ('build\backup-before-producer-' + (Get-Date -Format 'yyyyMMdd-HHmmss')) +New-Item -ItemType Directory -Path $backup | Out-Null +foreach ($file in $files) { Copy-Item -LiteralPath (Join-Path $target $file) -Destination (Join-Path $backup $file) } +$env:PATH = "$studioRoot\.venv-vocal\Scripts;$target;$studioRoot\build\Release;$env:PATH" +$serverArguments = @('--host','127.0.0.1','--port','8087','--model','models\YuE2-3B-Q8_0.gguf','--vae','models\YuE2-Vae-F32.gguf','--transcriber','models\SheetSage2-Q8_0.gguf') +$nextServer = $null +try { + if ($currentServer) { $currentServer.Kill(); if (-not $currentServer.WaitForExit(10000)) { throw 'Server did not stop within 10 seconds.' } } + foreach ($file in $files) { + for ($attempt=0; $attempt -lt 20; $attempt++) { + try { Copy-Item -LiteralPath (Join-Path $candidate $file) -Destination (Join-Path $target $file) -Force; break } + catch { if ($attempt -eq 19) { throw }; Start-Sleep -Milliseconds 250 } + } + } + $nextServer = Start-Process -FilePath $executable -ArgumentList $serverArguments -WorkingDirectory $studioRoot -WindowStyle Hidden -RedirectStandardOutput "$studioRoot\build\producer-server.out.log" -RedirectStandardError "$studioRoot\build\producer-server.err.log" -PassThru + $healthy = $false + for ($attempt = 0; $attempt -lt 40; $attempt++) { + Start-Sleep -Milliseconds 500 + $nextServer.Refresh() + if ($nextServer.HasExited) { throw 'Updated server exited during startup.' } + try { if ((Invoke-RestMethod 'http://127.0.0.1:8087/health' -TimeoutSec 2).status -eq 'ok') { $healthy = $true; break } } catch {} + } + if (-not $healthy) { throw 'Updated server did not become ready.' } + Write-Output "Producer controls active on http://localhost:8087. PID $($nextServer.Id). Previous build: $backup" +} catch { + $activationError = $_ + Write-Output "Activation failed: $activationError at $($_.ScriptStackTrace)" + if ($nextServer -and -not $nextServer.HasExited) { $nextServer.Kill(); $null = $nextServer.WaitForExit(10000) } + foreach ($file in $files) { Copy-Item -LiteralPath (Join-Path $backup $file) -Destination (Join-Path $target $file) -Force } + Start-Process -FilePath $executable -ArgumentList $serverArguments -WorkingDirectory $studioRoot -WindowStyle Hidden + throw +} diff --git a/tools/build-studio.mjs b/tools/build-studio.mjs new file mode 100644 index 0000000..7f4a9bc --- /dev/null +++ b/tools/build-studio.mjs @@ -0,0 +1,8 @@ +import {spawnSync} from 'node:child_process'; +import {fileURLToPath} from 'node:url'; +import {join} from 'node:path'; +const root=fileURLToPath(new URL('../',import.meta.url)); +const env=process.platform==='win32'?Object.fromEntries(Object.entries(process.env).map(([k,v])=>[k.toUpperCase(),v])):process.env; +const args=['--build','build','--config','Release','--target','yue-server']; +if(process.platform==='win32')args.push('--',`/p:OutDir=${join(root,'build/Release-producer/').replaceAll('\\','/')}`); +const r=spawnSync('cmake',args,{cwd:root,env,stdio:'inherit',windowsHide:true});if(r.error)console.error(r.error);process.exit(r.status??1); diff --git a/tools/comfy-api.h b/tools/comfy-api.h new file mode 100644 index 0000000..86a499b --- /dev/null +++ b/tools/comfy-api.h @@ -0,0 +1,30 @@ +#pragma once +#include "httplib.h" +#include +#include + +// Narrow loopback-only bridge: no arbitrary destinations or manager endpoints. +static void register_comfy_api(httplib::Server & server, int port, std::function busy = {}, std::timed_mutex * gate = nullptr) { + auto forward = [port,busy,gate](const httplib::Request & req, httplib::Response & res) { + std::unique_lock ownership; + if(req.target=="/comfy/prompt" && gate) {ownership=std::unique_lock(*gate,std::try_to_lock);if(!ownership.owns_lock()){res.status=409;res.set_content("Studio is using the GPU; retry when it finishes.","text/plain");return;}} + if(req.target=="/comfy/prompt" && busy && busy()) {res.status=409;res.set_content("Studio is using the GPU. Wait for the current operation to finish.","text/plain");return;} + if (req.body.size() > 24 * 1024 * 1024) { res.status = 413; res.set_content("Artwork request too large", "text/plain"); return; } + httplib::Client client("127.0.0.1", port); + client.set_connection_timeout(3); + client.set_read_timeout(30); + client.set_write_timeout(30); + const std::string target = req.target.substr(6); + httplib::UploadFormDataItems items; + size_t size=req.body.size(); + for(const auto &entry:req.form.fields){const auto &v=entry.second;items.push_back({v.name,v.content,"",""});size+=v.content.size();} + for(const auto &entry:req.form.files){const auto &v=entry.second;items.push_back({v.name,v.content,v.filename,v.content_type});size+=v.content.size();} + if(size>24*1024*1024){res.status=413;return;} + auto result = req.method == "GET" ? client.Get(target) : req.is_multipart_form_data() ? client.Post(target,items) : client.Post(target, req.body, req.get_header_value("Content-Type")); + if (!result) { res.status = 503; res.set_content("ComfyUI is unavailable. Start the configured ComfyUI app and check artwork readiness.", "text/plain"); return; } + res.status = result->status; + res.set_content(result->body, result->get_header_value("Content-Type")); + }; + server.Get(R"(/comfy/(object_info|queue|history/[a-zA-Z0-9-]+|view))", forward); + server.Post(R"(/comfy/(prompt|upload/image|free))", forward); +} diff --git a/tools/mp3-codec.cpp b/tools/mp3-codec.cpp index 2d2d709..f8a6fe9 100644 --- a/tools/mp3-codec.cpp +++ b/tools/mp3-codec.cpp @@ -63,7 +63,7 @@ int main(int argc, char ** argv) { const char * input = NULL; const char * output = NULL; - int bitrate = 128; + int bitrate = 320; WavFormat wav_fmt = WAV_S16; for (int i = 1; i < argc; i++) { diff --git a/tools/public/index.html.gz b/tools/public/index.html.gz index 4ce34e4..62d7f1d 100644 Binary files a/tools/public/index.html.gz and b/tools/public/index.html.gz differ diff --git a/tools/repair-comfy-gguf.mjs b/tools/repair-comfy-gguf.mjs new file mode 100644 index 0000000..4f14107 --- /dev/null +++ b/tools/repair-comfy-gguf.mjs @@ -0,0 +1,21 @@ +// Narrow compatibility repair for metadata-free Qwen Image 2.1 GGUF exports. +// Supply the installed GGUF node directory; no model download or launcher edits. +import {readFile,writeFile,copyFile,access} from 'node:fs/promises'; +import {resolve,join} from 'node:path'; +const folder=resolve(process.argv[2]??''),file=join(folder,'tools/convert.py'); +const source=await readFile(file,'utf8'); +if(source.includes('class ModelQwenImage21')){console.log('Qwen Image 2.1 detector already present.');process.exit(0);} +if(!source.includes('ModelKrea2, ModelIdeogram, ModelMinimaxH3]')||!source.includes('arch_list = ['))throw Error('Loader changed; review the patch before applying.'); +const block=`class ModelQwenImage21(ModelTemplate): + arch = "qwen_image" + keys_detect = [( + "txt_in.text_norm.weight", "modulation.1.weight", + "transformer_blocks.0.attn.norm_q.weight", "img_in.weight", + "proj_out.weight", "transformer_blocks.0.img_mlp.proj.weight", + )] + + +`; +const target=source.replace('arch_list = [',block+'arch_list = [').replace('ModelKrea2, ModelIdeogram, ModelMinimaxH3]','ModelKrea2, ModelIdeogram, ModelMinimaxH3, ModelQwenImage21]'); +const backup=file+'.before-yue2-qwen21';try{await access(backup);throw Error('Repair backup already exists; inspect it before replacing anything.');}catch(error){if(error.code!=='ENOENT')throw error;} +await copyFile(file,backup);await writeFile(file,target,'utf8');console.log('Added Qwen Image 2.1 tensor signature; original saved at '+backup); diff --git a/tools/webui/index.html b/tools/webui/index.html index f4ecfa9..a70fe35 100644 --- a/tools/webui/index.html +++ b/tools/webui/index.html @@ -3,7 +3,8 @@ - yue2.cpp - AI Music Generator + YuE2 Studio - AI Music Generator +
diff --git a/tools/webui/package-lock.json b/tools/webui/package-lock.json index fd8dc4c..8ad905e 100644 --- a/tools/webui/package-lock.json +++ b/tools/webui/package-lock.json @@ -23,9 +23,9 @@ } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.7.tgz", - "integrity": "sha512-EKX3Qwmhz1eMdEJokhALr0YiD0lhQNwDqkPYyPhiSwKrh7/4KRjQc04sZ8db+5DVVnZ1LmbNDI1uAMPEUBnQPg==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.2.tgz", + "integrity": "sha512-XExcO+dvLKvVtNTibSTBej1NCAbaGhWn9Ww1ZPx80qsahhPFe/8jgWP0IchNe0F3HwkU7n8ejhH8bjonqht8mQ==", "cpu": [ "ppc64" ], @@ -39,9 +39,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.7.tgz", - "integrity": "sha512-jbPXvB4Yj2yBV7HUfE2KHe4GJX51QplCN1pGbYjvsyCZbQmies29EoJbkEc+vYuU5o45AfQn37vZlyXy4YJ8RQ==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.2.tgz", + "integrity": "sha512-kXXoiPVVGQcnIYGOeaovwOURpniDBpSq4A03qkQ+BMQqtGG6HYap3xne9C1O1yo4TR3qxlCX5IqqmX6fFo2Lqg==", "cpu": [ "arm" ], @@ -55,9 +55,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.7.tgz", - "integrity": "sha512-62dPZHpIXzvChfvfLJow3q5dDtiNMkwiRzPylSCfriLvZeq0a1bWChrGx/BbUbPwOrsWKMn8idSllklzBy+dgQ==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.2.tgz", + "integrity": "sha512-5YfKeeI8qWfBZIX+u2xZC3Zlb3Os/gLS2sbEKM+I4ZOcsWmHS2WLysCcQZDAFRslDUU5Oiq44gf6PYN1vGwG5A==", "cpu": [ "arm64" ], @@ -71,9 +71,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.7.tgz", - "integrity": "sha512-x5VpMODneVDb70PYV2VQOmIUUiBtY3D3mPBG8NxVk5CogneYhkR7MmM3yR/uMdITLrC1ml/NV1rj4bMJuy9MCg==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.2.tgz", + "integrity": "sha512-O387ite7SzUyCcy3JQX4P4bLtEA7bLLkx+esve5JHnyYfNTxcVpXZo9jhdB0lTKN44gztELTdU7nS8Nr16Fs1Q==", "cpu": [ "x64" ], @@ -87,9 +87,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.7.tgz", - "integrity": "sha512-5lckdqeuBPlKUwvoCXIgI2D9/ABmPq3Rdp7IfL70393YgaASt7tbju3Ac+ePVi3KDH6N2RqePfHnXkaDtY9fkw==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.2.tgz", + "integrity": "sha512-n4KqkOQrraxHJcgjM1RvwbigfQKIKJVpM7xp+KsxiyUSrRdIXnt73VhrPAx0fV44hgfmIVKjxMN9J1t5jySVkw==", "cpu": [ "arm64" ], @@ -103,9 +103,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.7.tgz", - "integrity": "sha512-rYnXrKcXuT7Z+WL5K980jVFdvVKhCHhUwid+dDYQpH+qu+TefcomiMAJpIiC2EM3Rjtq0sO3StMV/+3w3MyyqQ==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.2.tgz", + "integrity": "sha512-uq6suIWYP37qzGddBKPw5QEQPi6HiLGsO7UmkpfyaYNQ3D+rN6w6WfwH+nuqcGXWvawGwxOEroO4YGnFh95azw==", "cpu": [ "x64" ], @@ -119,9 +119,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.7.tgz", - "integrity": "sha512-B48PqeCsEgOtzME2GbNM2roU29AMTuOIN91dsMO30t+Ydis3z/3Ngoj5hhnsOSSwNzS+6JppqWsuhTp6E82l2w==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.2.tgz", + "integrity": "sha512-n+I0BTSRIoy+d6RPKnEVwql5UwBJolytvY4mAOIEJorKlqgPII8ix6slVVrfZ5Tnj7glIZvloylbB/EJPMWEXw==", "cpu": [ "arm64" ], @@ -135,9 +135,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.7.tgz", - "integrity": "sha512-jOBDK5XEjA4m5IJK3bpAQF9/Lelu/Z9ZcdhTRLf4cajlB+8VEhFFRjWgfy3M1O4rO2GQ/b2dLwCUGpiF/eATNQ==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.2.tgz", + "integrity": "sha512-78XJTJkvPs0kz2w61301PJjXl4g7q3JqiYMZ/M/yVI73EHBrCRTgkhu9oqG7vPqq+a/yadEW8aD+agKlk5xrmg==", "cpu": [ "x64" ], @@ -151,9 +151,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.7.tgz", - "integrity": "sha512-RkT/YXYBTSULo3+af8Ib0ykH8u2MBh57o7q/DAs3lTJlyVQkgQvlrPTnjIzzRPQyavxtPtfg0EopvDyIt0j1rA==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.2.tgz", + "integrity": "sha512-XlDnu2q5yoqems+xay6wSAcg9DDD7K9RLKZEBOMZm3ckNpJBvOX20tSfby8KfrrhINDyv9V2YVZKY/SpoGJI8w==", "cpu": [ "arm" ], @@ -167,9 +167,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.7.tgz", - "integrity": "sha512-RZPHBoxXuNnPQO9rvjh5jdkRmVizktkT7TCDkDmQ0W2SwHInKCAV95GRuvdSvA7w4VMwfCjUiPwDi0ZO6Nfe9A==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.2.tgz", + "integrity": "sha512-pW4AC0P3it8c7do9MVM4p51FzHzdM/TZrerurgRcHJ2WTa1VQ1CIq18xncfpBJw4ojkiZZrKW2yIBWBP92j6Ug==", "cpu": [ "arm64" ], @@ -183,9 +183,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.7.tgz", - "integrity": "sha512-GA48aKNkyQDbd3KtkplYWT102C5sn/EZTY4XROkxONgruHPU72l+gW+FfF8tf2cFjeHaRbWpOYa/uRBz/Xq1Pg==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.2.tgz", + "integrity": "sha512-CYbnj78HsIeA+DhgUKgFCfvNsTHFhMMrinUrMZpDXJXKN8T3XViTZ/+wtHeVxEWY8ewSzTFN+nRmSwO2tZaLUQ==", "cpu": [ "ia32" ], @@ -199,9 +199,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.7.tgz", - "integrity": "sha512-a4POruNM2oWsD4WKvBSEKGIiWQF8fZOAsycHOt6JBpZ+JN2n2JH9WAv56SOyu9X5IqAjqSIPTaJkqN8F7XOQ5Q==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.2.tgz", + "integrity": "sha512-buwkd8nsph4R+ajRvw0qM5Hja/TXQow3ptzWO2EbG/cqcIkHloRrdlBtQlshyYGTNFvfkfJ5tpPLVkY4DtsPfQ==", "cpu": [ "loong64" ], @@ -215,9 +215,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.7.tgz", - "integrity": "sha512-KabT5I6StirGfIz0FMgl1I+R1H73Gp0ofL9A3nG3i/cYFJzKHhouBV5VWK1CSgKvVaG4q1RNpCTR2LuTVB3fIw==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.2.tgz", + "integrity": "sha512-ZVykbDyk7519VwiNb9Lcj9m8XM6v5V9uKPvrEMkkEedVewf+0itkhahp4HDpgERXhwLRpWFypsGbG/J8s0QjJA==", "cpu": [ "mips64el" ], @@ -231,9 +231,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.7.tgz", - "integrity": "sha512-gRsL4x6wsGHGRqhtI+ifpN/vpOFTQtnbsupUF5R5YTAg+y/lKelYR1hXbnBdzDjGbMYjVJLJTd2OFmMewAgwlQ==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.2.tgz", + "integrity": "sha512-CAXl+Dtd9UUuJd8pKKdwh6MLm3MUMiqMPmhZ3tTSXPqfyQ3vDl6R5hZdZ/kYojK4ofXtdfSv1tFq8XzWx3heNQ==", "cpu": [ "ppc64" ], @@ -247,9 +247,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.7.tgz", - "integrity": "sha512-hL25LbxO1QOngGzu2U5xeXtxXcW+/GvMN3ejANqXkxZ/opySAZMrc+9LY/WyjAan41unrR3YrmtTsUpwT66InQ==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.2.tgz", + "integrity": "sha512-GeXCej4IQtU1B+QlDV8W/RRvbzI3O/Stss+/bCXv4lZls5WGRtu2a+3JkA3i4qIUlMXpcHebWpF8AkJhATowuA==", "cpu": [ "riscv64" ], @@ -263,9 +263,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.7.tgz", - "integrity": "sha512-2k8go8Ycu1Kb46vEelhu1vqEP+UeRVj2zY1pSuPdgvbd5ykAw82Lrro28vXUrRmzEsUV0NzCf54yARIK8r0fdw==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.2.tgz", + "integrity": "sha512-3H1weTYZPxt/WOhByszQZybS9w5lKzUn1FDMsgEChbHWQwHYQQRfBxgCcZvPhjHfKyJjIievvMmEUawJrdY9Dg==", "cpu": [ "s390x" ], @@ -279,9 +279,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.7.tgz", - "integrity": "sha512-hzznmADPt+OmsYzw1EE33ccA+HPdIqiCRq7cQeL1Jlq2gb1+OyWBkMCrYGBJ+sxVzve2ZJEVeePbLM2iEIZSxA==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.2.tgz", + "integrity": "sha512-4xTZr1FUmSoQW4XIWmit3tzQrUTZM+N3P0XV8xROKYF50XfI7xeO90+1bZvNwxIufQ9hDQVRJH5YhgPVF8A/HQ==", "cpu": [ "x64" ], @@ -295,9 +295,9 @@ } }, "node_modules/@esbuild/netbsd-arm64": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.7.tgz", - "integrity": "sha512-b6pqtrQdigZBwZxAn1UpazEisvwaIDvdbMbmrly7cDTMFnw/+3lVxxCTGOrkPVnsYIosJJXAsILG9XcQS+Yu6w==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.2.tgz", + "integrity": "sha512-sSATRjPeDBg3pdgHoQfoYBob11Kk1FGa9lui5RIHZCoCkJa9QKlvl3/vKz2usCmYYjs7ymJR/2Nnsqe+Hjt5nw==", "cpu": [ "arm64" ], @@ -311,9 +311,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.7.tgz", - "integrity": "sha512-OfatkLojr6U+WN5EDYuoQhtM+1xco+/6FSzJJnuWiUw5eVcicbyK3dq5EeV/QHT1uy6GoDhGbFpprUiHUYggrw==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.2.tgz", + "integrity": "sha512-lqnzCV+mM0gIADaKihiCg6ifgfU2L3h5E33rNQBN1Y4MaVGnzryzmvvf7UHxprpQdE8hpqLolJ9Rl+SkIRDpyw==", "cpu": [ "x64" ], @@ -327,9 +327,9 @@ } }, "node_modules/@esbuild/openbsd-arm64": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.7.tgz", - "integrity": "sha512-AFuojMQTxAz75Fo8idVcqoQWEHIXFRbOc1TrVcFSgCZtQfSdc1RXgB3tjOn/krRHENUB4j00bfGjyl2mJrU37A==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.2.tgz", + "integrity": "sha512-AL2qJILH7lNjrDmCQDvdxMfAUIv8KMNZOvrwAQ8i8//ntL9FflhOyMJ8OZSMBb8/AWXe3/5v5S20y3zCoZWKoQ==", "cpu": [ "arm64" ], @@ -343,9 +343,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.7.tgz", - "integrity": "sha512-+A1NJmfM8WNDv5CLVQYJ5PshuRm/4cI6WMZRg1by1GwPIQPCTs1GLEUHwiiQGT5zDdyLiRM/l1G0Pv54gvtKIg==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.2.tgz", + "integrity": "sha512-QtiuPytchRyC4rwUKhexJdQKvDuZ6hWloi3igqPQNUJCS1/v9EiO3UTOXR6A3FoMo4fnAKbWJdqaIwhOzh8qEw==", "cpu": [ "x64" ], @@ -359,9 +359,9 @@ } }, "node_modules/@esbuild/openharmony-arm64": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.7.tgz", - "integrity": "sha512-+KrvYb/C8zA9CU/g0sR6w2RBw7IGc5J2BPnc3dYc5VJxHCSF1yNMxTV5LQ7GuKteQXZtspjFbiuW5/dOj7H4Yw==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.2.tgz", + "integrity": "sha512-WkhYDmpTjLvGlScA1rwjRUmhl4k8oXR3cIbtqWmELgU/dFeHHlEllxDvdWcNJV9rbzCexB5vz8gtNewWLgCT7Q==", "cpu": [ "arm64" ], @@ -375,9 +375,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.7.tgz", - "integrity": "sha512-ikktIhFBzQNt/QDyOL580ti9+5mL/YZeUPKU2ivGtGjdTYoqz6jObj6nOMfhASpS4GU4Q/Clh1QtxWAvcYKamA==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.2.tgz", + "integrity": "sha512-GPMSkTOtMnv2U2F8gxe4Io6qmVs+YKyp832Etqqxr0hFngmXQ3rzwytelm3GIn7T4VviRUlf3sOgBOiTdvaf7g==", "cpu": [ "x64" ], @@ -391,9 +391,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.7.tgz", - "integrity": "sha512-7yRhbHvPqSpRUV7Q20VuDwbjW5kIMwTHpptuUzV+AA46kiPze5Z7qgt6CLCK3pWFrHeNfDd1VKgyP4O+ng17CA==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.2.tgz", + "integrity": "sha512-PIhhEkE9uPBleRBrQEJpUn7MBnibZzbGzYWPmY3x+YoVg/95zbjB4CxPPOQ8l5tYYM4mMaCthF8/1DIfBQQyWQ==", "cpu": [ "arm64" ], @@ -407,9 +407,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.7.tgz", - "integrity": "sha512-SmwKXe6VHIyZYbBLJrhOoCJRB/Z1tckzmgTLfFYOfpMAx63BJEaL9ExI8x7v0oAO3Zh6D/Oi1gVxEYr5oUCFhw==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.2.tgz", + "integrity": "sha512-YmJbfTlvU7Sdn9BB+4PRES4oB6pxgS37MAONj+hBr/cpXS1aBPKXxNnDbu+QCWPj0o9dgyxeq79g6c5P8KeuYA==", "cpu": [ "ia32" ], @@ -423,9 +423,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.7.tgz", - "integrity": "sha512-56hiAJPhwQ1R4i+21FVF7V8kSD5zZTdHcVuRFMW0hn753vVfQN8xlx4uOPT4xoGH0Z/oVATuR82AiqSTDIpaHg==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.2.tgz", + "integrity": "sha512-5ebpxr3nWMzrL/rnUI755Jkuee0bHL/Gq0WTF9lvcpv73wAp5eu8MfBUgWK9bhWvZjj7yX8etf/8tI8Ney695g==", "cpu": [ "x64" ], @@ -468,9 +468,9 @@ } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", - "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.6.0.tgz", + "integrity": "sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==", "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { @@ -857,9 +857,9 @@ ] }, "node_modules/@sveltejs/acorn-typescript": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/@sveltejs/acorn-typescript/-/acorn-typescript-1.0.9.tgz", - "integrity": "sha512-lVJX6qEgs/4DOcRTpo56tmKzVPtoWAaVbL4hfO7t7NVwl9AAXzQR6cihesW1BmNMPl+bK6dreu2sOKBP2Q9CIA==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/@sveltejs/acorn-typescript/-/acorn-typescript-1.0.13.tgz", + "integrity": "sha512-wgKggnhZVL9Bfx1OaKKTrYY9BFRk6C8UAkQNUcIv1+llzYrIqy+RZm5HPKzn0NpEBvTVhTqB4kQyllZywsRBRQ==", "license": "MIT", "peerDependencies": { "acorn": "^8.9.0" @@ -910,29 +910,10 @@ "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", "license": "MIT" }, - "node_modules/@types/trusted-types": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", - "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", - "license": "MIT" - }, - "node_modules/@typescript-eslint/types": { - "version": "8.58.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.58.1.tgz", - "integrity": "sha512-io/dV5Aw5ezwzfPBBWLoT+5QfVtP8O7q4Kftjn5azJ88bYyp/ZMCsyW1lpKK46EXJcaYMZ1JtYj+s/7TdzmQMw==", - "license": "MIT", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, "node_modules/acorn": { - "version": "8.16.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", - "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.18.0.tgz", + "integrity": "sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ==", "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -1007,15 +988,15 @@ } }, "node_modules/devalue": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/devalue/-/devalue-5.7.1.tgz", - "integrity": "sha512-MUbZ586EgQqdRnC4yDrlod3BEdyvE4TapGYHMW2CiaW+KkkFmWEFqBUaLltEZCGi0iFXCEjRF0OjF0DV2QHjOA==", + "version": "5.9.4", + "resolved": "https://registry.npmjs.org/devalue/-/devalue-5.9.4.tgz", + "integrity": "sha512-sPAT4pztbu6586/hrhOnMKS17IJrvg12mXiSPSS3W5qDeN2RGgvZ0diZCm31dBbnevfVmujNO3IM2wrS4Y2Rhg==", "license": "MIT" }, "node_modules/esbuild": { - "version": "0.27.7", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.7.tgz", - "integrity": "sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.2.tgz", + "integrity": "sha512-HKVLS8dvII+xoKW9kmqxbRKrnWEXfJJr/FZhhJmiqIB0e053QNYFqOBouTMO/k5sID4MvCiUCvv8b9M4h32wIA==", "hasInstallScript": true, "license": "MIT", "bin": { @@ -1025,32 +1006,32 @@ "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.27.7", - "@esbuild/android-arm": "0.27.7", - "@esbuild/android-arm64": "0.27.7", - "@esbuild/android-x64": "0.27.7", - "@esbuild/darwin-arm64": "0.27.7", - "@esbuild/darwin-x64": "0.27.7", - "@esbuild/freebsd-arm64": "0.27.7", - "@esbuild/freebsd-x64": "0.27.7", - "@esbuild/linux-arm": "0.27.7", - "@esbuild/linux-arm64": "0.27.7", - "@esbuild/linux-ia32": "0.27.7", - "@esbuild/linux-loong64": "0.27.7", - "@esbuild/linux-mips64el": "0.27.7", - "@esbuild/linux-ppc64": "0.27.7", - "@esbuild/linux-riscv64": "0.27.7", - "@esbuild/linux-s390x": "0.27.7", - "@esbuild/linux-x64": "0.27.7", - "@esbuild/netbsd-arm64": "0.27.7", - "@esbuild/netbsd-x64": "0.27.7", - "@esbuild/openbsd-arm64": "0.27.7", - "@esbuild/openbsd-x64": "0.27.7", - "@esbuild/openharmony-arm64": "0.27.7", - "@esbuild/sunos-x64": "0.27.7", - "@esbuild/win32-arm64": "0.27.7", - "@esbuild/win32-ia32": "0.27.7", - "@esbuild/win32-x64": "0.27.7" + "@esbuild/aix-ppc64": "0.28.2", + "@esbuild/android-arm": "0.28.2", + "@esbuild/android-arm64": "0.28.2", + "@esbuild/android-x64": "0.28.2", + "@esbuild/darwin-arm64": "0.28.2", + "@esbuild/darwin-x64": "0.28.2", + "@esbuild/freebsd-arm64": "0.28.2", + "@esbuild/freebsd-x64": "0.28.2", + "@esbuild/linux-arm": "0.28.2", + "@esbuild/linux-arm64": "0.28.2", + "@esbuild/linux-ia32": "0.28.2", + "@esbuild/linux-loong64": "0.28.2", + "@esbuild/linux-mips64el": "0.28.2", + "@esbuild/linux-ppc64": "0.28.2", + "@esbuild/linux-riscv64": "0.28.2", + "@esbuild/linux-s390x": "0.28.2", + "@esbuild/linux-x64": "0.28.2", + "@esbuild/netbsd-arm64": "0.28.2", + "@esbuild/netbsd-x64": "0.28.2", + "@esbuild/openbsd-arm64": "0.28.2", + "@esbuild/openbsd-x64": "0.28.2", + "@esbuild/openharmony-arm64": "0.28.2", + "@esbuild/sunos-x64": "0.28.2", + "@esbuild/win32-arm64": "0.28.2", + "@esbuild/win32-ia32": "0.28.2", + "@esbuild/win32-x64": "0.28.2" } }, "node_modules/esm-env": { @@ -1060,13 +1041,20 @@ "license": "MIT" }, "node_modules/esrap": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/esrap/-/esrap-2.2.4.tgz", - "integrity": "sha512-suICpxAmZ9A8bzJjEl/+rLJiDKC0X4gYWUxT6URAWBLvlXmtbZd5ySMu/N2ZGEtMCAmflUDPSehrP9BQcsGcSg==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/esrap/-/esrap-2.4.0.tgz", + "integrity": "sha512-CQPcneEHw/czj32uwQC52nYnax8H4SXt25FCM+LIwGZ49cMIxpOj3bP8wmzcI+Z0HIy5KkClaPhRLfCySzwHPA==", "license": "MIT", "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.15", + "@jridgewell/sourcemap-codec": "^1.4.15" + }, + "peerDependencies": { "@typescript-eslint/types": "^8.2.0" + }, + "peerDependenciesMeta": { + "@typescript-eslint/types": { + "optional": true + } } }, "node_modules/fdir": { @@ -1181,9 +1169,9 @@ } }, "node_modules/nanoid": { - "version": "3.3.11", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", - "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", + "version": "3.3.19", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.19.tgz", + "integrity": "sha512-Y2tUNy4ouw6tq5oDSKeQYGOyhkUBhNOcGV/02KC+6kd9eDGqdZd++mjMiIDilrBYvjEnCYvVtsuHCuP+okSfug==", "funding": [ { "type": "github", @@ -1228,9 +1216,9 @@ } }, "node_modules/postcss": { - "version": "8.5.9", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.9.tgz", - "integrity": "sha512-7a70Nsot+EMX9fFU3064K/kdHWZqGVY+BADLyXc8Dfv+mTLLVl6JzJpPaCZ2kQL9gIJvKXSLMHhqdRRjwQeFtw==", + "version": "8.5.28", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.28.tgz", + "integrity": "sha512-RRuzqDtt5Y9h3quz5hWhK+TPnsmVs6WwSU6LkJMeY4HstUEDuYTG8UJSdawMRzmzAtV+KEoG8N3Qg2qLy5vM/A==", "funding": [ { "type": "opencollective", @@ -1247,7 +1235,7 @@ ], "license": "MIT", "dependencies": { - "nanoid": "^3.3.11", + "nanoid": "^3.3.18", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" }, @@ -1363,23 +1351,22 @@ } }, "node_modules/svelte": { - "version": "5.55.2", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.55.2.tgz", - "integrity": "sha512-z41M/hi0ZPTzrwVKLvB/R1/Oo08gL1uIib8HZ+FncqxxtY9MLb01emg2fqk+WLZ/lNrrtNDFh7BZLDxAHvMgLw==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.57.1.tgz", + "integrity": "sha512-Uqj49lWKB+iSSnneuwiYYJ7MZgkB+eXr0LXBhv4uDuAkXqnWmq65Sxflfvp0Lc6MdKjMUxGaeOKWJqz5SNiVIA==", "license": "MIT", "dependencies": { - "@jridgewell/remapping": "^2.3.4", - "@jridgewell/sourcemap-codec": "^1.5.0", - "@sveltejs/acorn-typescript": "^1.0.5", - "@types/estree": "^1.0.5", - "@types/trusted-types": "^2.0.7", - "acorn": "^8.12.1", + "@jridgewell/remapping": "^2.3.5", + "@jridgewell/sourcemap-codec": "^1.6.0", + "@sveltejs/acorn-typescript": "^1.0.13", + "@types/estree": "^1.0.9", + "acorn": "^8.18.0", "aria-query": "5.3.1", "axobject-query": "^4.1.0", "clsx": "^2.1.1", - "devalue": "^5.6.4", + "devalue": "^5.9.2", "esm-env": "^1.2.1", - "esrap": "^2.2.4", + "esrap": "^2.3.6", "is-reference": "^3.0.3", "locate-character": "^3.0.0", "magic-string": "^0.30.11", @@ -1413,6 +1400,12 @@ "typescript": ">=5.0.0" } }, + "node_modules/svelte/node_modules/@types/estree": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz", + "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==", + "license": "MIT" + }, "node_modules/tinyglobby": { "version": "0.2.16", "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.16.tgz", @@ -1456,12 +1449,12 @@ } }, "node_modules/vite": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.2.tgz", - "integrity": "sha512-Bby3NOsna2jsjfLVOHKes8sGwgl4TT0E6vvpYgnAYDIF/tie7MRaFthmKuHx1NSXjiTueXH3do80FMQgvEktRg==", + "version": "7.3.6", + "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.6.tgz", + "integrity": "sha512-4XP60spRGjSZFf1qYH+dJIkK2znL3zQfl9KkOV9MkkRR/3Dls0dxaBsQPTloEc5BLXWPL9vsOxopxyKoMmDueg==", "license": "MIT", "dependencies": { - "esbuild": "^0.27.0", + "esbuild": "^0.27.0 || ^0.28.0", "fdir": "^6.5.0", "picomatch": "^4.0.3", "postcss": "^8.5.6", diff --git a/tools/webui/src/App.svelte b/tools/webui/src/App.svelte index b1036e2..2cb7d48 100644 --- a/tools/webui/src/App.svelte +++ b/tools/webui/src/App.svelte @@ -1,18 +1,51 @@
-
- yue2.cpp - {__YUE2_VERSION__} -
- -
- - + {#if app.storageWarning}
{app.storageWarning}
{/if} +
+
YuE2 StudioLOCAL STUDIO
+
+ {#if app.props}{:else}{/if}{statusText}⌄
+
+
+ + focusSection('settings')} aria-label="Studio settings">
-
-
- -
-
- -
-
+
+ + +
+
+ {#if currentPage === 'create'} currentPage = 'library'} />{/if} +
+ {#if currentPage === 'library'} +
+
+

YOUR LOCAL COLLECTION

Library

{app.songs.length} track{app.songs.length === 1 ? '' : 's'} saved on this device

+ + +
+
currentPage = 'library'} showGenerated={false} />
+
+ {/if} +
diff --git a/tools/webui/src/assets/style-thumbnails/001_boom_bap.webp b/tools/webui/src/assets/style-thumbnails/001_boom_bap.webp new file mode 100644 index 0000000..19dac7e Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/001_boom_bap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/002_golden_era_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/002_golden_era_hip_hop.webp new file mode 100644 index 0000000..0df0fcf Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/002_golden_era_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/003_underground_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/003_underground_hip_hop.webp new file mode 100644 index 0000000..586c9e6 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/003_underground_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/004_lo_fi_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/004_lo_fi_hip_hop.webp new file mode 100644 index 0000000..fc5b604 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/004_lo_fi_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/005_jazz_rap.webp b/tools/webui/src/assets/style-thumbnails/005_jazz_rap.webp new file mode 100644 index 0000000..571cc04 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/005_jazz_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/006_conscious_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/006_conscious_hip_hop.webp new file mode 100644 index 0000000..0c2db66 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/006_conscious_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/007_abstract_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/007_abstract_hip_hop.webp new file mode 100644 index 0000000..e8f0e71 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/007_abstract_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/008_alternative_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/008_alternative_hip_hop.webp new file mode 100644 index 0000000..39fa83e Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/008_alternative_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/009_backpack_rap.webp b/tools/webui/src/assets/style-thumbnails/009_backpack_rap.webp new file mode 100644 index 0000000..7cedde4 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/009_backpack_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/010_hardcore_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/010_hardcore_hip_hop.webp new file mode 100644 index 0000000..4f9c83b Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/010_hardcore_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/011_gangsta_rap.webp b/tools/webui/src/assets/style-thumbnails/011_gangsta_rap.webp new file mode 100644 index 0000000..7fdf341 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/011_gangsta_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/012_g_funk.webp b/tools/webui/src/assets/style-thumbnails/012_g_funk.webp new file mode 100644 index 0000000..7bf805a Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/012_g_funk.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/013_west_coast_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/013_west_coast_hip_hop.webp new file mode 100644 index 0000000..7ca11ef Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/013_west_coast_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/014_east_coast_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/014_east_coast_hip_hop.webp new file mode 100644 index 0000000..7d71ffa Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/014_east_coast_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/015_southern_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/015_southern_hip_hop.webp new file mode 100644 index 0000000..40077c6 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/015_southern_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/016_dirty_south.webp b/tools/webui/src/assets/style-thumbnails/016_dirty_south.webp new file mode 100644 index 0000000..dded220 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/016_dirty_south.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/017_memphis_rap.webp b/tools/webui/src/assets/style-thumbnails/017_memphis_rap.webp new file mode 100644 index 0000000..ff07fb6 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/017_memphis_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/018_houston_rap.webp b/tools/webui/src/assets/style-thumbnails/018_houston_rap.webp new file mode 100644 index 0000000..f00b456 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/018_houston_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/019_chopped_and_screwed.webp b/tools/webui/src/assets/style-thumbnails/019_chopped_and_screwed.webp new file mode 100644 index 0000000..ad29aaa Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/019_chopped_and_screwed.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/020_crunk.webp b/tools/webui/src/assets/style-thumbnails/020_crunk.webp new file mode 100644 index 0000000..aba6d1e Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/020_crunk.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/021_bounce.webp b/tools/webui/src/assets/style-thumbnails/021_bounce.webp new file mode 100644 index 0000000..53d3d0b Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/021_bounce.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/022_trap.webp b/tools/webui/src/assets/style-thumbnails/022_trap.webp new file mode 100644 index 0000000..70a3115 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/022_trap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/023_dark_trap.webp b/tools/webui/src/assets/style-thumbnails/023_dark_trap.webp new file mode 100644 index 0000000..6b57d6d Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/023_dark_trap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/024_melodic_trap.webp b/tools/webui/src/assets/style-thumbnails/024_melodic_trap.webp new file mode 100644 index 0000000..3064e00 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/024_melodic_trap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/025_street_trap.webp b/tools/webui/src/assets/style-thumbnails/025_street_trap.webp new file mode 100644 index 0000000..eda4667 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/025_street_trap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/026_cloud_rap.webp b/tools/webui/src/assets/style-thumbnails/026_cloud_rap.webp new file mode 100644 index 0000000..3a4b9d2 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/026_cloud_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/027_plugg.webp b/tools/webui/src/assets/style-thumbnails/027_plugg.webp new file mode 100644 index 0000000..3bcb0ce Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/027_plugg.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/028_pluggnb.webp b/tools/webui/src/assets/style-thumbnails/028_pluggnb.webp new file mode 100644 index 0000000..49d25f9 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/028_pluggnb.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/029_rage.webp b/tools/webui/src/assets/style-thumbnails/029_rage.webp new file mode 100644 index 0000000..a2980ed Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/029_rage.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/030_drill.webp b/tools/webui/src/assets/style-thumbnails/030_drill.webp new file mode 100644 index 0000000..76b750a Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/030_drill.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/031_chicago_drill.webp b/tools/webui/src/assets/style-thumbnails/031_chicago_drill.webp new file mode 100644 index 0000000..a2b8309 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/031_chicago_drill.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/032_uk_drill.webp b/tools/webui/src/assets/style-thumbnails/032_uk_drill.webp new file mode 100644 index 0000000..669a36f Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/032_uk_drill.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/033_brooklyn_drill.webp b/tools/webui/src/assets/style-thumbnails/033_brooklyn_drill.webp new file mode 100644 index 0000000..a110f81 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/033_brooklyn_drill.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/034_jersey_club_rap.webp b/tools/webui/src/assets/style-thumbnails/034_jersey_club_rap.webp new file mode 100644 index 0000000..653b9af Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/034_jersey_club_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/035_phonk.webp b/tools/webui/src/assets/style-thumbnails/035_phonk.webp new file mode 100644 index 0000000..219adbf Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/035_phonk.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/036_drift_phonk.webp b/tools/webui/src/assets/style-thumbnails/036_drift_phonk.webp new file mode 100644 index 0000000..4e2c47f Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/036_drift_phonk.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/037_horrorcore.webp b/tools/webui/src/assets/style-thumbnails/037_horrorcore.webp new file mode 100644 index 0000000..240c69e Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/037_horrorcore.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/038_industrial_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/038_industrial_hip_hop.webp new file mode 100644 index 0000000..ee21c08 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/038_industrial_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/039_experimental_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/039_experimental_hip_hop.webp new file mode 100644 index 0000000..95f039c Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/039_experimental_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/040_glitch_hop.webp b/tools/webui/src/assets/style-thumbnails/040_glitch_hop.webp new file mode 100644 index 0000000..fe0a4a0 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/040_glitch_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/041_electronic_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/041_electronic_hip_hop.webp new file mode 100644 index 0000000..172662d Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/041_electronic_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/042_psychedelic_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/042_psychedelic_hip_hop.webp new file mode 100644 index 0000000..cd1de86 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/042_psychedelic_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/043_neo_psychedelic_rap.webp b/tools/webui/src/assets/style-thumbnails/043_neo_psychedelic_rap.webp new file mode 100644 index 0000000..42861e9 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/043_neo_psychedelic_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/044_trip_hop.webp b/tools/webui/src/assets/style-thumbnails/044_trip_hop.webp new file mode 100644 index 0000000..3ad9c4d Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/044_trip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/045_downtempo_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/045_downtempo_hip_hop.webp new file mode 100644 index 0000000..495a08b Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/045_downtempo_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/046_instrumental_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/046_instrumental_hip_hop.webp new file mode 100644 index 0000000..63908d3 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/046_instrumental_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/047_sampledelic_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/047_sampledelic_hip_hop.webp new file mode 100644 index 0000000..ee5eac8 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/047_sampledelic_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/048_soul_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/048_soul_hip_hop.webp new file mode 100644 index 0000000..b44b8b2 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/048_soul_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/049_chipmunk_soul.webp b/tools/webui/src/assets/style-thumbnails/049_chipmunk_soul.webp new file mode 100644 index 0000000..99f9e1b Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/049_chipmunk_soul.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/050_gospel_rap.webp b/tools/webui/src/assets/style-thumbnails/050_gospel_rap.webp new file mode 100644 index 0000000..258963d Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/050_gospel_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/051_funk_rap.webp b/tools/webui/src/assets/style-thumbnails/051_funk_rap.webp new file mode 100644 index 0000000..d9defaa Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/051_funk_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/052_disco_rap.webp b/tools/webui/src/assets/style-thumbnails/052_disco_rap.webp new file mode 100644 index 0000000..b6054de Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/052_disco_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/053_randb_rap.webp b/tools/webui/src/assets/style-thumbnails/053_randb_rap.webp new file mode 100644 index 0000000..5d73a93 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/053_randb_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/054_neo_soul_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/054_neo_soul_hip_hop.webp new file mode 100644 index 0000000..a1bd01d Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/054_neo_soul_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/055_pop_rap.webp b/tools/webui/src/assets/style-thumbnails/055_pop_rap.webp new file mode 100644 index 0000000..fc0ee7d Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/055_pop_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/056_party_rap.webp b/tools/webui/src/assets/style-thumbnails/056_party_rap.webp new file mode 100644 index 0000000..d8d85c5 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/056_party_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/057_club_rap.webp b/tools/webui/src/assets/style-thumbnails/057_club_rap.webp new file mode 100644 index 0000000..7b6d18a Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/057_club_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/058_miami_bass.webp b/tools/webui/src/assets/style-thumbnails/058_miami_bass.webp new file mode 100644 index 0000000..0eb9994 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/058_miami_bass.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/059_electro_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/059_electro_hip_hop.webp new file mode 100644 index 0000000..e143b16 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/059_electro_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/060_old_school_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/060_old_school_hip_hop.webp new file mode 100644 index 0000000..538b75d Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/060_old_school_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/061_breakbeat_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/061_breakbeat_hip_hop.webp new file mode 100644 index 0000000..69aad4f Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/061_breakbeat_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/062_freestyle_rap.webp b/tools/webui/src/assets/style-thumbnails/062_freestyle_rap.webp new file mode 100644 index 0000000..c527d10 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/062_freestyle_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/063_battle_rap.webp b/tools/webui/src/assets/style-thumbnails/063_battle_rap.webp new file mode 100644 index 0000000..e2200d2 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/063_battle_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/064_cypher_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/064_cypher_hip_hop.webp new file mode 100644 index 0000000..0a52bb7 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/064_cypher_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/065_storytelling_rap.webp b/tools/webui/src/assets/style-thumbnails/065_storytelling_rap.webp new file mode 100644 index 0000000..2226b6e Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/065_storytelling_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/066_lyrical_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/066_lyrical_hip_hop.webp new file mode 100644 index 0000000..9ae4606 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/066_lyrical_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/067_technical_rap.webp b/tools/webui/src/assets/style-thumbnails/067_technical_rap.webp new file mode 100644 index 0000000..c36a3df Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/067_technical_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/068_fast_rap_chopper.webp b/tools/webui/src/assets/style-thumbnails/068_fast_rap_chopper.webp new file mode 100644 index 0000000..8883c09 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/068_fast_rap_chopper.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/069_syllable_dense_rap.webp b/tools/webui/src/assets/style-thumbnails/069_syllable_dense_rap.webp new file mode 100644 index 0000000..ac7ef90 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/069_syllable_dense_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/070_spoken_word_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/070_spoken_word_hip_hop.webp new file mode 100644 index 0000000..9df942c Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/070_spoken_word_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/071_emo_rap.webp b/tools/webui/src/assets/style-thumbnails/071_emo_rap.webp new file mode 100644 index 0000000..59be4fd Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/071_emo_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/072_sad_rap.webp b/tools/webui/src/assets/style-thumbnails/072_sad_rap.webp new file mode 100644 index 0000000..1f0d68a Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/072_sad_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/073_bedroom_rap.webp b/tools/webui/src/assets/style-thumbnails/073_bedroom_rap.webp new file mode 100644 index 0000000..9c2bd19 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/073_bedroom_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/074_indie_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/074_indie_hip_hop.webp new file mode 100644 index 0000000..92662c3 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/074_indie_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/075_lo_fi_underground.webp b/tools/webui/src/assets/style-thumbnails/075_lo_fi_underground.webp new file mode 100644 index 0000000..d46311a Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/075_lo_fi_underground.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/076_grimy_boom_bap.webp b/tools/webui/src/assets/style-thumbnails/076_grimy_boom_bap.webp new file mode 100644 index 0000000..766497e Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/076_grimy_boom_bap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/077_dark_boom_bap.webp b/tools/webui/src/assets/style-thumbnails/077_dark_boom_bap.webp new file mode 100644 index 0000000..e8344d2 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/077_dark_boom_bap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/078_jazz_boom_bap.webp b/tools/webui/src/assets/style-thumbnails/078_jazz_boom_bap.webp new file mode 100644 index 0000000..844c91e Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/078_jazz_boom_bap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/079_soulful_boom_bap.webp b/tools/webui/src/assets/style-thumbnails/079_soulful_boom_bap.webp new file mode 100644 index 0000000..9184f23 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/079_soulful_boom_bap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/080_cinematic_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/080_cinematic_hip_hop.webp new file mode 100644 index 0000000..55cc64c Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/080_cinematic_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/081_orchestral_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/081_orchestral_hip_hop.webp new file mode 100644 index 0000000..b310a8a Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/081_orchestral_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/082_epic_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/082_epic_hip_hop.webp new file mode 100644 index 0000000..a5ae15a Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/082_epic_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/083_minimal_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/083_minimal_hip_hop.webp new file mode 100644 index 0000000..defc7a4 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/083_minimal_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/084_bass_heavy_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/084_bass_heavy_hip_hop.webp new file mode 100644 index 0000000..3d5966d Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/084_bass_heavy_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/085_atmospheric_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/085_atmospheric_hip_hop.webp new file mode 100644 index 0000000..0cdde1d Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/085_atmospheric_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/086_dream_rap.webp b/tools/webui/src/assets/style-thumbnails/086_dream_rap.webp new file mode 100644 index 0000000..b2d7b2b Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/086_dream_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/087_space_rap.webp b/tools/webui/src/assets/style-thumbnails/087_space_rap.webp new file mode 100644 index 0000000..3eaa7c4 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/087_space_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/088_futuristic_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/088_futuristic_hip_hop.webp new file mode 100644 index 0000000..6cc3adb Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/088_futuristic_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/089_cyberpunk_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/089_cyberpunk_hip_hop.webp new file mode 100644 index 0000000..5d5f00d Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/089_cyberpunk_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/090_retro_futuristic_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/090_retro_futuristic_hip_hop.webp new file mode 100644 index 0000000..9fc48ec Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/090_retro_futuristic_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/091_synthwave_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/091_synthwave_hip_hop.webp new file mode 100644 index 0000000..fa1e0e4 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/091_synthwave_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/092_latin_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/092_latin_hip_hop.webp new file mode 100644 index 0000000..2162a63 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/092_latin_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/093_reggae_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/093_reggae_hip_hop.webp new file mode 100644 index 0000000..d378006 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/093_reggae_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/094_dancehall_rap.webp b/tools/webui/src/assets/style-thumbnails/094_dancehall_rap.webp new file mode 100644 index 0000000..ae8bd00 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/094_dancehall_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/095_afro_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/095_afro_hip_hop.webp new file mode 100644 index 0000000..8b13fe2 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/095_afro_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/096_afrobeats_rap.webp b/tools/webui/src/assets/style-thumbnails/096_afrobeats_rap.webp new file mode 100644 index 0000000..0c37cd3 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/096_afrobeats_rap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/097_grime.webp b/tools/webui/src/assets/style-thumbnails/097_grime.webp new file mode 100644 index 0000000..31b8a20 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/097_grime.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/098_uk_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/098_uk_hip_hop.webp new file mode 100644 index 0000000..38b2da3 Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/098_uk_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/099_french_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/099_french_hip_hop.webp new file mode 100644 index 0000000..05c9d8a Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/099_french_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/100_japanese_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/100_japanese_hip_hop.webp new file mode 100644 index 0000000..fd8e20f Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/100_japanese_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/101_korean_hip_hop.webp b/tools/webui/src/assets/style-thumbnails/101_korean_hip_hop.webp new file mode 100644 index 0000000..7c7fafe Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/101_korean_hip_hop.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/102_latin_trap.webp b/tools/webui/src/assets/style-thumbnails/102_latin_trap.webp new file mode 100644 index 0000000..e0690ef Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/102_latin_trap.webp differ diff --git a/tools/webui/src/assets/style-thumbnails/103_trap_soul.webp b/tools/webui/src/assets/style-thumbnails/103_trap_soul.webp new file mode 100644 index 0000000..993f70d Binary files /dev/null and b/tools/webui/src/assets/style-thumbnails/103_trap_soul.webp differ diff --git a/tools/webui/src/components/Albums.svelte b/tools/webui/src/components/Albums.svelte new file mode 100644 index 0000000..aab277b --- /dev/null +++ b/tools/webui/src/components/Albums.svelte @@ -0,0 +1,44 @@ + +
+

Albums

Import one lyric file per track. Uses the current sound and voice plan. Audio is saved as MP3. Progress is saved after every stage.

+ + + + + + {#if busy}{/if} + {#each albums as album (album.id)}

{album.title}

{album.stage} · {album.tracks.filter(t=>t.songId).length}/{album.tracks.length} audio tracks saved

{#if album.error}

{album.error}

{/if} + +
    {#each album.tracks as track,index}
  1. {track.title} · {track.songId?'Audio saved':'Audio pending'}{album.artwork||album.video?` · Artwork ${track.artDone?'saved':'pending'}`:''}{album.video?` · Video ${track.videoDone?'saved':'pending'}`:''} + {#if album.error}{/if}
    2. {/each}
{/each} +
+ diff --git a/tools/webui/src/components/ArtworkCover.svelte b/tools/webui/src/components/ArtworkCover.svelte new file mode 100644 index 0000000..36c2c55 --- /dev/null +++ b/tools/webui/src/components/ArtworkCover.svelte @@ -0,0 +1,112 @@ + + + + + { event.preventDefault(); void close(); }} onclose={didClose} onclick={(event) => { if (event.target === dialog) void close(); }}> +
+
TRACK ARTWORK

{title}

+ {#if url}{/if} +
Click the image, click outside, or press Escape to close
+
+ + + diff --git a/tools/webui/src/components/BlendFavourites.svelte b/tools/webui/src/components/BlendFavourites.svelte new file mode 100644 index 0000000..5185974 --- /dev/null +++ b/tools/webui/src/components/BlendFavourites.svelte @@ -0,0 +1,105 @@ + + +
+ Saved {kind} blends · {entries.length} +
+ + + + + + + +
+ {#if saving}

Saving preset changes…

{/if} +
+ + diff --git a/tools/webui/src/components/Dialog.svelte b/tools/webui/src/components/Dialog.svelte index a44301e..02baeca 100644 --- a/tools/webui/src/components/Dialog.svelte +++ b/tools/webui/src/components/Dialog.svelte @@ -1,5 +1,5 @@ {#if open}
-
-
{title}
+
@@ -72,34 +87,52 @@ .dialog-overlay { position: fixed; inset: 0; - background: rgba(0, 0, 0, 0.5); + background: rgba(4, 5, 8, 0.66); + backdrop-filter: blur(6px); + -webkit-backdrop-filter: blur(6px); display: flex; align-items: center; justify-content: center; z-index: 100; + animation: overlay-in 0.15s ease-out; } .dialog { - background: var(--bg-card); - border-radius: 4px; - box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3); - padding: 0.75rem; - min-width: 16rem; - max-width: min(90vw, 28rem); + background: var(--bg-card-2); + border: 1px solid var(--border-strong); + border-radius: 14px; + box-shadow: var(--shadow); + padding: 1.1rem; + min-width: 17rem; + max-width: min(92vw, 28rem); display: flex; flex-direction: column; - gap: 0.5rem; + gap: 0.7rem; + animation: dialog-in 0.18s ease-out; } .dialog-title { - font-size: 0.85rem; + font-size: 0.92rem; + font-weight: 700; color: var(--fg); } .dialog-body { - font-size: 0.8rem; - color: var(--fg); + font-size: 0.83rem; + line-height: 1.55; + color: var(--fg-dim); } .dialog-footer { display: flex; justify-content: flex-end; - gap: 0.4rem; + gap: 0.5rem; + } + @keyframes overlay-in { + from { + opacity: 0; + } + } + @keyframes dialog-in { + from { + opacity: 0; + transform: translateY(0.6rem) scale(0.98); + } } diff --git a/tools/webui/src/components/DialogButton.svelte b/tools/webui/src/components/DialogButton.svelte index 8ecc86a..8e8bcd1 100644 --- a/tools/webui/src/components/DialogButton.svelte +++ b/tools/webui/src/components/DialogButton.svelte @@ -3,26 +3,42 @@ let { onclick, - children + children, + primary = false }: { onclick: (e: MouseEvent) => void; children: Snippet; + primary?: boolean; } = $props(); - + diff --git a/tools/webui/src/components/InfluenceRing.svelte b/tools/webui/src/components/InfluenceRing.svelte new file mode 100644 index 0000000..26e6cd1 --- /dev/null +++ b/tools/webui/src/components/InfluenceRing.svelte @@ -0,0 +1,34 @@ + + +
{ dragging = true; event.currentTarget.setPointerCapture(event.pointerId); move(event); }} + onpointermove={move} onpointerup={() => { dragging = false; }} onpointercancel={() => { dragging = false; }} onlostpointercapture={() => { dragging = false; }} onkeydown={key}> + {value}% +
+ + + diff --git a/tools/webui/src/components/LogCard.svelte b/tools/webui/src/components/LogCard.svelte index d467974..1fd6f2c 100644 --- a/tools/webui/src/components/LogCard.svelte +++ b/tools/webui/src/components/LogCard.svelte @@ -1,9 +1,11 @@
- +
+
{connected ? activity.stage : 'Reconnecting…'}{activity.running && connected && activity.percent !== null ? `${Math.floor(activity.percent)}%` : activity.running ? 'Working' : 'Idle'}
+ {#if activity.running && connected && activity.percent === null}{:else}{/if} +
{connected ? activity.detail || 'Start a track to see its progress' : 'Waiting for the server connection'}{activity.running && connected && activity.eta !== null ? `Stage ETA ≈ ${Math.floor(Math.ceil(activity.eta) / 60)}:${String(Math.ceil(activity.eta) % 60).padStart(2, '0')}` : activity.running ? 'ETA: unavailable' : 'ETA: —'}
+
{#if app.logsOpen} - 
{lines.join('\n')}
+
ComposeRenderAudioCompleteError
+ +
{#each lines as line}
{line}
{/each}
{/if}
diff --git a/tools/webui/src/components/Menu.svelte b/tools/webui/src/components/Menu.svelte index 81921a8..0ce3f67 100644 --- a/tools/webui/src/components/Menu.svelte +++ b/tools/webui/src/components/Menu.svelte @@ -14,7 +14,7 @@
- {#if open} -
+ -
Name
- - -
Style
- - -
Lyrics
- - -
- Score - -
- - -
- LM configuration - -
-
- Mode - -
-
- - - -
- -
- Score sampling - -
-
- - - - - - 1SoundDescribe & choose style { const section = document.getElementById('lyrics-editor'); if (section instanceof HTMLDetailsElement) section.open = true; }}>2LyricsWrite or generate3ArrangeStructure & options4GenerateRender & export +
+
+

01 Sound direction

+
+ + +
-
+
+
+ Selected styles {musicMix.length} / 3 +
+ {#each [0, 1, 2] as slot} + {@const id = musicMix[slot]} + {@const style = MUSIC_STYLE_BY_ID[id]} + {#if style} +
+ + + {style.name}{musicMixWeight[id] === 0 ? 'Excluded · 0%' : `${slot === 0 || musicMix.slice(0, slot).every(key => musicMixWeight[key] === 0) ? 'Primary' : 'Secondary'} · ${musicMixWeight[id] ?? 50}%`} +
+ {:else} + + {/if} + {/each} +
+ {#if !musicMix.length && app.request.style.trim()}Custom direction loaded. Choose a style to replace it.{/if} + +
+
+ +
{#each visibleMusicStyles as style}{/each}
+ Drag or scroll to explore all styles. + {#if visibleMusicStyles.length === 0}

No matching styles. Try another search.

{/if} +
+
Style blend & saved favourites {musicMix.length ? `${musicMix.filter(id => musicMixWeight[id] > 0).length} active influences` : app.request.style.trim() ? 'Custom direction' : 'No styles selected'} +
+ {#each musicMix as id, i} +
+ key === id)?.[1] || id} value={musicMixWeight[id] ?? 50} color={['#fb923c','#f472b6','#22d3ee','#a78bfa','#34d399'][i % 5]} thumbnail={MUSIC_STYLE_BY_ID[id]?.thumbnail} onchange={(value) => { musicMixWeight = {...musicMixWeight, [id]: value}; updateMusicPrompt(); }} /> + {musicStyles.find(([key]) => key === id)?.[1] || id} + +
+ {/each} + {#if musicMix.length === 0} +
+ { musicPromptStrength = value; }} /> + Prompt strength +
+ {/if} +

Turn a ring to shape the blend. Zero excludes a style. The first active style sets the foundation.

+
Advanced: custom direction

Editing this text replaces the selected blend with a custom direction.

+ { + const mix = cleanMix(data.ids, data.weights, musicStyles.map(([id]) => id).filter(Boolean), 3); + musicMix = mix.ids; musicMixWeight = mix.weights; + if (musicMix.length) updateMusicPrompt(); + else { app.request.style = typeof data.prompt === 'string' ? data.prompt : ''; mixedMusicPrompt = app.request.style; } + }} /> +
+
+ + +
+

02 Lyrics & writing

{app.request.lyrics ? "Lyrics ready · click to edit" : "Add lyrics or write with AI"}
+

02 Lyrics & writing

+
+ {(app.request.lyrics || "").trim().split(/\s+/).filter(Boolean).length} words + + +
+
+
+ + {#if lyricProfile}

{lyricProfile.description}

{/if} + Guides the lyric assistant. Existing lyrics stay unchanged; open the assistant below to write a new draft. +
+ +
Lyric assistant Write with your local model +
+ + + {#if lyricModelError}

{lyricModelError}

{/if} + {#if lyricBusy}{/if} + {#if lyricDraft} + + + + {/if} +
Lyric style · construction engineseparate from music style
+
+
+ {#each lyricMix as id, i} +
+ key === id)?.[1] || id} value={lyricMixWeight[id] ?? 50} color={['#fb923c','#f472b6','#22d3ee','#a78bfa','#34d399'][i % 5]} onchange={(value) => { lyricMixWeight = {...lyricMixWeight, [id]: value}; }} /> + {lyricPresets.find(([key]) => key === id)?.[1] || id} + +
+ {/each} +

Drag around a ring or use arrow keys. Influence is relative to other active styles, not an exact audio percentage. Zero excludes a style.

+ { + const mix = cleanMix(data.ids, data.weights, lyricPresets.map(([id]) => id), 3); + lyricMix = mix.ids; lyricMixWeight = mix.weights; + }} /> + + +
+
+
-
- Semantic sampling - -
-
- - - - - - - - + + {#if takeProgress}

{takeProgress} · completed takes are saved in your library.

{/if} +
+
+

03 Composition

+ +
+
+
+ 🤖 Auto duration + Estimate from lyrics. Turn off to enter a target length or use the server default.
-
+ +
Composition score {freshComposition ? "New score each time" : app.request.abc ? "Loaded score enabled" : "Let YuE2 compose"} + +
+
+ Score mode + +
+
+ + + +
+
+ +
+

04 Production engine

{automatic ? 'AUTO' : 'MANUAL'}
+ {#if app.remix} +
+
Remix: {app.remix.sourceName}Original seed: {app.remix.request.lm_seed} · Sound seed: {app.remix.request.seed}
+ +
0 · Original performance100 · More adventurous
+

{app.remix.amount === 0 ? 'Re-renders the saved performance with its original seeds.' : 'Generates a new performance with the original seeds, style, lyrics and score. Higher values allow more sampling freedom, not an exact percentage of audio change.'} The result is saved as a separate track.

+ {#if !app.remix.request.abc}

This track has no saved score, so its melody and arrangement are not locked.

{/if} +
+ {:else}

To vary a saved song with the same seed, choose its Remix button.

{/if} +
+
Output, mastering & profile details
{automatic ? profile.name : 'Your custom settings'}

{automatic ? 'Follows your active sound directions' : 'Sampling and render controls are unlocked below'}

+ {#if automatic}
COMPOSITION{profile.scoreTemperature.toFixed(2)}score temperature
RENDER{profile.settings.steps} stepsmodel default
OUTPUT{app.format === 'mp3' ? '320' : app.format === 'mp4' ? '16:9' : app.format.slice(3)}{app.format === 'mp3' ? ' kbps' : app.format === 'mp4' ? ' video' : ' bit'}{app.format === 'mp3' ? 'MP3 encoding' : app.format === 'mp4' ? 'MP4 video' : 'WAV encoding'}
{/if} + + +

{automatic ? 'Style-guided composition with the model’s stable audio defaults. A starting point you can fine-tune, not a guarantee of the best take.' : 'Imported and reused settings are preserved. Switch to Automatic to apply the current style profile.'}

+
+
+ + Score sampling + + +
{ app.request.abc_sampling[key] = value; }} />
-
- Advanced and post-processing - +
+ + Semantic sampling + + +
{ app.request.semantic_sampling[key] = value; }} />
Guidance & audio codes
+
+ +
+ + Render & output + +
+ {#if automatic}

{profile.settings.steps} flow steps · peak clip {profile.settings.peak_clip} · {app.format === "mp3" ? "320 kbps MP3" : app.format.toUpperCase()}. Output format stays under your control.

{:else}
@@ -578,28 +936,50 @@ +
+ {/if}
-
+ +
+ Surprise me + - + {#if busy} + Rendering · {elapsed} + {:else} + {app.remix ? 'Generate remix' : 'Generate track'} + {/if} + + {#if busy} + + {/if}
@@ -624,7 +1004,11 @@ {/snippet} - + + {#snippet body()}

Saves planner, voices, sound, lyrics and output settings to saved_presets.

{/snippet} + {#snippet actions(close)}Cancel {close();saveFormatOpen=true;}}>Export request fileSave full preset{/snippet} + + {#snippet actions(close)} Cancel .request-form { + display: grid; + grid-template-columns: repeat(2, minmax(0, 1fr)); + align-items: start; + gap: 0.65rem; + } + .request-form > .desk-nav, + .request-form > .sound-card, + .request-form > .words-card, + .request-form > #arrangement-workbench, + .request-form > .engine-card, + .request-form > #render-workbench, + .request-form > .action-bar { grid-column: 1 / -1; } + .request-form > .sound-card { grid-row: 2; } + .request-form > .words-card { grid-row: 3; } + .request-form > #arrangement-workbench { grid-row: 4; } + .request-form > #score-sampling { grid-column: 1; grid-row: 5; } + .request-form > #semantic-sampling { grid-column: 2; grid-row: 5; } + .request-form > .engine-card { grid-row: 6; } + .request-form > #render-workbench { grid-row: 7; } + .request-form > .action-bar { grid-row: 8; } + .request-form > input[type='file'] { display: none; } + @media (max-width: 800px) { .request-form { display:flex; flex-direction:column; } .request-form > * { width:100%; } } + .card { + background: var(--bg-card); + border: 1px solid var(--border); + border-radius: var(--radius); + padding: 1rem; display: flex; flex-direction: column; - gap: 0.75rem; + gap: 0.7rem; + box-shadow: var(--shadow); } - .toolbar { + .card-head { display: flex; + align-items: center; + justify-content: space-between; gap: 0.5rem; } - .toolbar button { - flex: 1; + .card-head h3 { + font-size: 0.72rem; + font-weight: 700; + text-transform: uppercase; + letter-spacing: 0.12em; + color: var(--fg-dim); + } + .toolbar { display: flex; + gap: 0.35rem; + } + .tool-btn { + display: inline-flex; align-items: center; - justify-content: center; gap: 0.3rem; - } - label { - display: flex; - flex-direction: column; - gap: 0.25rem; - font-size: 0.85rem; + font-size: 0.72rem; + font-weight: 600; color: var(--fg-dim); + background: var(--bg-btn); + border: 1px solid var(--border); + border-radius: 8px; + padding: 0.32rem 0.6rem; + cursor: pointer; + transition: + background 0.15s, + color 0.15s, + border-color 0.15s; } - .section-title { - font-size: 0.85rem; + .tool-btn:hover { + background: var(--bg-btn-hover); color: var(--fg); - font-weight: 600; - padding: 0.4rem 0 0; - } - .section-header { - display: flex; - align-items: center; - justify-content: space-between; - } - .has-clear { - position: relative; + border-color: var(--border-strong); } - .details-clear { - position: absolute; - top: 0.4rem; - right: 0; - } - .clear-btn { + .mini-btn { display: inline-flex; align-items: center; justify-content: center; - padding: 0; - border: none; + width: 1.5rem; + height: 1.5rem; + border-radius: 7px; + border: 1px solid transparent; background: transparent; - color: var(--fg-dim); + color: var(--fg-faint); cursor: pointer; - line-height: 0; + transition: + background 0.15s, + color 0.15s; } - .clear-btn:hover { + .mini-btn:hover { + background: var(--bg-btn); color: var(--fg); } + .field { + display: flex; + flex-direction: column; + gap: 0.35rem; + } + .field-name { + font-size: 0.76rem; + font-weight: 600; + color: var(--fg-dim); + } + .field-name em { + font-style: normal; + font-weight: 400; + color: var(--fg-faint); + } textarea, input[type='text'], select { font-family: inherit; - font-size: 0.9rem; - padding: 0.4rem 0.5rem; + font-size: 0.86rem; + line-height: 1.5; + padding: 0.55rem 0.7rem; border: 1px solid var(--border); - border-radius: 4px; + border-radius: 10px; background: var(--bg-input); color: var(--fg); resize: vertical; + width: 100%; + transition: + border-color 0.15s, + box-shadow 0.15s; + } + textarea::placeholder, + input[type='text']::placeholder { + color: var(--fg-faint); } textarea:focus, - input:focus { - outline: 2px solid var(--focus); - outline-offset: -1px; + input[type='text']:focus, + select:focus { + outline: none; + border-color: var(--accent); + box-shadow: 0 0 0 3px rgba(139, 92, 246, 0.22); + } + textarea.mono { + font-family: ui-monospace, 'Cascadia Mono', monospace; + font-size: 0.78rem; + } + select { + resize: none; + cursor: pointer; } .field-row { display: flex; align-items: center; - gap: 0.5rem; + gap: 0.6rem; } - .field-label { - font-size: 0.85rem; - color: var(--fg-dim); + .field-row .field-name { flex-shrink: 0; - min-width: 2rem; } .field-select { flex: 1; min-width: 0; } - .meta-grid { display: grid; - grid-template-columns: repeat(auto-fill, minmax(8rem, 1fr)); - gap: 0.5rem; + grid-template-columns: repeat(3, 1fr); + gap: 0.55rem; } - details summary { - cursor: pointer; - font-size: 0.85rem; - color: var(--fg); + .meta-grid label { + display: flex; + flex-direction: column; + gap: 0.3rem; + font-size: 0.72rem; font-weight: 600; - padding: 0.4rem 0; + color: var(--fg-dim); + } + .meta-grid input, + .meta-grid select { + font-size: 0.82rem; + padding: 0.45rem 0.55rem; + } + .unit { + font-weight: 400; + color: var(--fg-faint); + } + .collapsible { + padding: 0; + } + .collapsible summary { + display: flex; + align-items: center; + justify-content: space-between; + cursor: pointer; + list-style: none; + padding: 0.85rem 1rem; + font-size: 0.72rem; + font-weight: 700; + text-transform: uppercase; + letter-spacing: 0.12em; + color: var(--fg-dim); + } + .collapsible summary::-webkit-details-marker { + display: none; } - details summary:hover { + .collapsible summary:hover { color: var(--fg); } .details-body { display: flex; flex-direction: column; - gap: 0.5rem; - padding: 0.25rem 0 0.5rem; + gap: 0.6rem; + padding: 0 1rem 1rem; } - .action-row { + .action-bar { + position: sticky; + bottom: 0; display: flex; gap: 0.5rem; + padding: 0.7rem; + background: rgba(14, 16, 22, 0.9); + backdrop-filter: blur(12px); + -webkit-backdrop-filter: blur(12px); + border: 1px solid var(--border); + border-radius: var(--radius); + box-shadow: var(--shadow); } - .action-row button { - flex: 1; - } - button { - padding: 0.5rem 1rem; + .ghost-btn { + display: inline-flex; + align-items: center; + justify-content: center; + gap: 0.4rem; + padding: 0.65rem 0.8rem; border: 1px solid var(--border); - border-radius: 4px; + border-radius: 10px; background: var(--bg-btn); - color: var(--fg); + color: var(--fg-dim); cursor: pointer; - font-size: 0.85rem; + font-size: 0.82rem; + font-weight: 600; + transition: + background 0.15s, + color 0.15s, + border-color 0.15s; } - button:hover:not(:disabled) { + .ghost-btn:hover:not(:disabled) { background: var(--bg-btn-hover); + color: var(--fg); } - button:disabled { + .ghost-btn:disabled { opacity: 0.4; + cursor: default; + } + .ghost-btn.danger { + color: var(--error); + border-color: rgba(248, 113, 113, 0.35); + } + .generate-btn { + flex: 1; + display: inline-flex; + align-items: center; + justify-content: center; + gap: 0.5rem; + padding: 0.65rem 1rem; + border: none; + border-radius: 10px; + background: var(--accent-grad); + color: #fff; + cursor: pointer; + font-size: 0.88rem; + font-weight: 700; + letter-spacing: 0.02em; + box-shadow: 0 4px 20px rgba(139, 92, 246, 0.4); + transition: + transform 0.12s, + box-shadow 0.15s, + filter 0.15s; + font-variant-numeric: tabular-nums; + } + .generate-btn:hover:not(:disabled) { + filter: brightness(1.1); + box-shadow: 0 6px 26px rgba(139, 92, 246, 0.55); + } + .generate-btn:active:not(:disabled) { + transform: scale(0.98); + } + .generate-btn:disabled { + cursor: default; + } + .generate-btn.running { + background: linear-gradient(135deg, #6d28d9 0%, #4f46e5 60%, #0e7490 130%); + background-size: 200% 200%; + animation: render-pulse 2.2s ease-in-out infinite; + } + @keyframes render-pulse { + 0%, + 100% { + background-position: 0% 50%; + } + 50% { + background-position: 100% 50%; + } + } + :global(.spin) { + animation: spin 1s linear infinite; + } + @keyframes spin { + to { + transform: rotate(360deg); + } } +.library-head { display:flex; justify-content:space-between; color:var(--muted); font-size:.72rem; text-transform:uppercase; letter-spacing:.08em; margin-bottom:.4rem; } +.style-row { display:flex; gap:.45rem; align-items:center; } +.lyric-ai { margin-top:.65rem; padding:.65rem; border:1px solid rgba(45,212,191,.35); border-radius:.6rem; background:rgba(45,212,191,.05); } +.lyric-ai textarea { width:100%; margin-top:.45rem; } +.generate-lyrics { width:100%; margin-top:.45rem; padding:.5rem; border:1px solid var(--border-strong); border-radius:.45rem; color:var(--fg); background:var(--bg-btn); font-size:.75rem; } +.generate-lyrics:hover:not(:disabled) { background:var(--bg-btn-hover); } +.generate-lyrics:disabled { opacity:.45; cursor:not-allowed; } +.style-mixer { margin-top:.55rem; padding:.55rem; border:1px solid var(--border); border-radius:.6rem; background:rgba(0,0,0,.12); } +.music-mixer { margin-top:.55rem; padding:.65rem; border:1px solid rgba(45,212,163,.3); border-radius:.6rem; background:rgba(45,212,163,.045); } +.ring-stage { display:flex; flex-wrap:wrap; justify-content:center; gap:1rem; } +.style-ring-wrap { display:flex; flex-direction:column; align-items:center; gap:.28rem; width:8.4rem; text-align:center; color:var(--fg-dim); font-size:.66rem; } +.style-ring-wrap > button { border:0; background:transparent; color:var(--fg-faint); font-size:.62rem; cursor:pointer; } +.style-ring-wrap > button:hover { color:var(--error); } +.custom-style-ring { width:100%; } +.mixer-help { margin-top:.55rem; color:var(--fg-dim); font-size:.68rem; line-height:1.45; text-align:center; } +.duration-auto { display:flex; align-items:center; justify-content:space-between; gap:1rem; padding:.8rem .9rem; border:1px solid var(--border-strong); border-radius:12px; background:color-mix(in srgb, var(--accent) 7%, var(--bg-input)); } +.duration-copy { display:flex; flex-direction:column; gap:.22rem; min-width:0; } +.duration-copy .field-name { font-size:.82rem; color:var(--fg); } +.duration-help { color:var(--fg-dim); font-size:.7rem; line-height:1.4; } +.duration-toggle { position:relative; display:flex; align-items:center; flex:0 0 auto; cursor:pointer; } +.duration-toggle input { position:absolute; width:1px; height:1px; opacity:0; } +.duration-switch-track { position:relative; width:2.75rem; height:1.55rem; border:1px solid var(--border-strong); border-radius:999px; background:var(--bg-btn); transition:background .18s, border-color .18s, box-shadow .18s; } +.duration-switch-track::after { content:''; position:absolute; top:.17rem; left:.18rem; width:1.08rem; height:1.08rem; border-radius:50%; background:var(--fg-dim); transition:transform .18s cubic-bezier(.2,.8,.2,1), background .18s; } +.duration-toggle input:checked + .duration-switch-track { border-color:color-mix(in srgb, #2dd4a3 70%, transparent); background:color-mix(in srgb, #2dd4a3 25%, var(--bg-btn)); } +.duration-toggle input:checked + .duration-switch-track::after { transform:translateX(1.18rem); background:#73f0c8; } +.duration-toggle input:focus-visible + .duration-switch-track { outline:2px solid var(--focus); outline-offset:3px; } +.meta-grid input:disabled { opacity:.68; cursor:not-allowed; } +@media (max-width: 520px) { .duration-auto { align-items:flex-start; } .duration-help { max-width:28ch; } } diff --git a/tools/webui/src/components/SamplingControls.svelte b/tools/webui/src/components/SamplingControls.svelte new file mode 100644 index 0000000..497aa37 --- /dev/null +++ b/tools/webui/src/components/SamplingControls.svelte @@ -0,0 +1,33 @@ + +
+ {#each fields as field} +
+ {field.label} + onchange(field.key, Number(e.currentTarget.value))} /> + onchange(field.key, e.currentTarget.value === '' ? undefined : Number(e.currentTarget.value))} /> +
+ {/each} +
+ diff --git a/tools/webui/src/components/SavedPresets.svelte b/tools/webui/src/components/SavedPresets.svelte new file mode 100644 index 0000000..f8eb310 --- /dev/null +++ b/tools/webui/src/components/SavedPresets.svelte @@ -0,0 +1,52 @@ + + +
+

SAVED PRESETS · {presets.length}

+ {#each presets as preset} + {@const style = preset.kind === 'music' ? MUSIC_STYLE_BY_ID[preset.data.ids[0]] : undefined} + + {:else} +

{unavailable ? 'Saved presets could not be read.' : 'No saved presets yet. Save a music or lyric blend to find it here.'}

+ {/each} +
+ + + + {#snippet body()} +

Saved in the saved_presets folder. Select a preset to rename or delete it.

+ {#each presets as preset}{/each} + {#if selected} + + {#if confirmDelete}

Delete “{selected.name}” from saved presets?

{:else}{/if}{/if} + {/snippet} + {#snippet actions(close)}{/snippet} + + diff --git a/tools/webui/src/components/SignalVisualizer.svelte b/tools/webui/src/components/SignalVisualizer.svelte new file mode 100644 index 0000000..06656f8 --- /dev/null +++ b/tools/webui/src/components/SignalVisualizer.svelte @@ -0,0 +1,156 @@ + + +
+
+
SIGNAL / STUDIO{playing ? 'LIVE AUDIO' : 'STANDBY'}
+
+ +
{playing ? 'THE SOUND, IN MOTION' : 'YOUR NEXT FREQUENCY'}{playing ? 'Connected to playback' : 'Play a track to bring this to life'}
+
+
+
{#each ['ribbon','orbit','spectrum'] as item}{/each}
+ +
+
{#each ['BASS','BODY','AIR'] as band}
{band}
{/each}
+
+
+ {event.preventDefault();expand();}} aria-label="Expanded audio visualizer"> + + diff --git a/tools/webui/src/components/SongCard.svelte b/tools/webui/src/components/SongCard.svelte index a6c0acd..ff2ffc0 100644 --- a/tools/webui/src/components/SongCard.svelte +++ b/tools/webui/src/components/SongCard.svelte @@ -5,42 +5,197 @@ Pencil, Download, Trash2, - ChevronDown, Heart, Type, TriangleAlert, - Music + Music, + ImagePlus, + Sparkles, + Clapperboard, + Ellipsis, + LoaderCircle } from '@lucide/svelte'; - import { app, setRequest, toast } from '../lib/state.svelte.js'; - import { transcribeSubmit, pollJob, jobResultTranscribe } from '../lib/api.js'; - import { deleteSong, putSong } from '../lib/db.js'; + import { withStudioLock } from '../lib/coordination.js'; + import { app, setRequest, startRemix, toast } from '../lib/state.svelte.js'; + import { canRemix } from '../lib/remix.js'; + import { transcribeSubmit, pollJob, jobResultTranscribe, balanceVocalLevel, renderVideo } from '../lib/api.js'; + import { deleteSong, deleteSongs, updateSong } from '../lib/db.js'; import type { Song } from '../lib/types.js'; import Waveform from './Waveform.svelte'; import Menu, { type MenuItem } from './Menu.svelte'; import Dialog from './Dialog.svelte'; + import YouTubeDialog from './YouTubeDialog.svelte'; + import ArtworkCover from './ArtworkCover.svelte'; + import VideoArtwork from './VideoArtwork.svelte'; + import { validateArtwork } from '../lib/artwork.js'; + import { generateTrackArtwork, trackArtworkPrompt } from '../lib/track-artwork.js'; + import { checkArtwork, submitArtwork, artworkResult, uploadReference } from '../lib/comfy-art.js'; + import { JOB_POLL_MS } from '../lib/config.js'; + import { MUSIC_STYLE_BY_ID } from '../lib/style-profiles.js'; + import { LYRIC_STYLE_BY_ID } from '../lib/lyric-styles.js'; let { song }: { song: Song } = $props(); let playing = $state(false); + let youtubeOpen = $state(false); + let activeVersion = $state<'mastered' | 'original' | 'vocal-adjusted'>('mastered'); + let activeAudio = $derived(activeVersion === 'original' ? (song.vocalOriginalAudio ?? song.originalAudio ?? song.audio) : song.audio); let time = $state(0); let dur = $state(0); + let artworkInput: HTMLInputElement; + let artworkBusy = $state(false); + let vocalDialogOpen = $state(false); + let vocalBusy = $state(false); + let vocalGain = $state(3); + let vocalError = $state(''); + let artDialogOpen = $state(false); + let artBusy = $state(false); + let artPrompt = $state(''); + let artSeed = $state(0); + let artUseReference = $state(false); + let artError = $state(''); + let mediaController: AbortController | undefined; + async function owned(work: () => Promise) { try { const result = await withStudioLock(work); if (!result.acquired) toast('Another Studio operation is running. Finish or cancel it first.'); } catch(error) {toast(String(error));} } + let artAborted = false; + // Closing the dialog (Escape, outside click) aborts the poll loop; the + // ComfyUI job itself keeps running server-side and is simply ignored. + $effect(() => { + if (!artDialogOpen && artBusy) { artAborted = true; mediaController?.abort(); } + }); + $effect(() => { + if (song.vocalOriginalAudio && activeVersion === 'mastered') activeVersion = 'vocal-adjusted'; + }); + async function attachArtwork(event: Event) { + const input = event.currentTarget as HTMLInputElement; + const file = input.files?.[0]; + input.value = ''; + if (!file || artworkBusy) return; + artworkBusy = true; + try { + await validateArtwork(file); + await persist({artwork:file}); + toast('Artwork saved to this track.', 3000, true); + } catch (error) { toast(error instanceof Error ? error.message : 'Could not save artwork.'); } + finally { artworkBusy = false; } + } + async function persist(patch: Partial, revision?: number) { + if (song.id == null) throw new Error('Save this track before editing it.'); + const saved = await updateSong(song.id, patch, revision); + Object.assign(song, saved); + } + + // style profiles blended at generation, resolved to display names. + // Unknown ids (removed packs) fall back to the raw id. Empty on older + // records, imports and remixes, which show the style prompt instead. + let styleChips = $derived( + (song.musicStyles ?? []).map((entry) => ({ + id: entry.id, + weight: entry.weight, + name: MUSIC_STYLE_BY_ID[entry.id]?.name ?? entry.id + })) + ); + let lyricChips = $derived( + (song.lyricStyles ?? []).map((entry) => ({ + id: entry.id, + weight: entry.weight, + name: LYRIC_STYLE_BY_ID[entry.id] ?? entry.id + })) + ); + + // deterministic cover hue from the song id, so each track is recognizable + let hue = $derived(((song.id ?? song.created ?? 0) * 47) % 360); + let thumbStyle = $derived( + `background: linear-gradient(135deg, hsl(${hue} 65% 42%), hsl(${(hue + 50) % 360} 70% 26%)` + ); function toggle() { playing = !playing; } + function chooseVersion(version: 'mastered' | 'original' | 'vocal-adjusted') { + if (version === activeVersion) return; + playing = false; + time = 0; + activeVersion = version; + } + function load() { app.name = song.name; setRequest({ ...song.request }); } function downloadAudio() { - const url = URL.createObjectURL(song.audio); + downloadBlob(song.audio, ''); + } + + function downloadVideo() { + if (song.video) downloadBlob(song.video, ''); + } + + let videoBusy = $state(false); + // On-demand 16:9 MP4 over the currently selected mix, using the track's + // artwork or the card-style fallback cover. Saved onto the song so the + // library, backups and the MP4 delivery download all share it. + async function exportVideo() { + if (videoBusy || artBusy || artworkBusy) return; + videoBusy = true; + mediaController = new AbortController(); + try { + if (!song.artwork) toast('Creating artwork for the MP4…', 6000, true); + const artworkRevision = song.mediaRevision ?? 0; + const cover = song.artwork ?? (await generateTrackArtwork(song,undefined,undefined,mediaController.signal)); + if (!song.artwork) await persist({artwork:cover,artworkJobId:undefined},artworkRevision); + const revision = song.mediaRevision ?? 0, version = activeVersion, source = activeAudio; + const video = await renderVideo(source, cover, mediaController.signal, song.videoJobId, async id => { await persist({videoJobId:id}); }); + const completedVideoId=song.videoJobId; + await persist({video,format:'mp4',videoVersion:version,videoJobId:undefined},revision); + if(completedVideoId)void fetch(`job?id=${completedVideoId}&ack=1`,{method:'POST'}).catch(()=>{}); + toast('Video ready.', 4000, true); + } catch (error) { + toast('Video export failed: ' + (error instanceof Error ? error.message : String(error))); + } finally { + videoBusy = false; + } + } + + function downloadOriginal() { + if (song.originalAudio) downloadBlob(song.originalAudio, '-original'); + } + + function downloadBeforeVocalAdjustment() { + if (song.vocalOriginalAudio) downloadBlob(song.vocalOriginalAudio, '-before-vocal-adjustment'); + } + + async function applyVocalBalance(autoGain = false) { + if (vocalBusy) return; + vocalBusy = true; + vocalError = ''; + try { + const revision=song.mediaRevision??0; + mediaController=new AbortController(); + const source = song.vocalOriginalAudio ?? song.audio; + const result = await balanceVocalLevel(source, autoGain ? null : vocalGain,mediaController.signal); + await persist({vocalOriginalAudio:source,audio:result.audio,format:'wav32'},revision); + if(result.jobId)void fetch(`job?id=${result.jobId}&ack=1`,{method:'POST'}).catch(()=>{}); + vocalGain = result.gainDb; + activeVersion = 'vocal-adjusted'; + playing = false; + vocalDialogOpen = false; + toast(`${autoGain ? 'Auto suggested' : 'Vocal gain'} ${vocalGain >= 0 ? '+' : ''}${vocalGain} dB.`, 4000, true); + } catch (error) { + vocalError = error instanceof Error ? error.message : String(error); + } finally { + vocalBusy = false; + } + } + + function downloadBlob(blob: Blob, suffix: string) { + const url = URL.createObjectURL(blob); const a = document.createElement('a'); a.href = url; const safe = song.name.replace(/[\\/:*?"<>|\x00-\x1f]/g, '') || 'song'; - const ext = song.format === 'mp3' ? 'mp3' : 'wav'; - a.download = `${safe}.${ext}`; + const ext = blob.type.includes('mp4') || blob.type.includes('video') ? 'mp4' : blob.type.includes('mpeg') ? 'mp3' : 'wav'; + a.download = `${safe}${suffix}.${ext}`; a.click(); URL.revokeObjectURL(url); } @@ -52,8 +207,8 @@ async function toggleFavorite() { if (song.id == null) return; - song.favorite = !song.favorite; - await putSong($state.snapshot(song)); + try { await persist({favorite:!song.favorite}); } + catch (error) { toast(error instanceof Error ? error.message : 'Could not save favourite.'); } } function openRename() { @@ -65,15 +220,14 @@ if (song.id == null) return; const v = renameValue.trim(); if (!v || v === song.name) return; - song.name = v; - await putSong($state.snapshot(song)); + try { await persist({name:v}); } + catch (error) { toast(error instanceof Error ? error.message : 'Could not rename track.'); } } async function doRemove() { if (song.id == null) return; - await deleteSong(song.id); - const idx = app.songs.findIndex((s) => s.id === song.id); - if (idx >= 0) app.songs.splice(idx, 1); + try { await deleteSong(song.id); const idx = app.songs.findIndex((s) => s.id === song.id); if (idx >= 0) app.songs.splice(idx, 1); } + catch (error) { toast(error instanceof Error ? error.message : 'Could not delete track.'); } } // Deletes every non-favorite track in the list, regardless of which @@ -81,11 +235,8 @@ // purge if it is not flagged favorite. async function doRemoveNonFavorites() { const victims = app.songs.filter((s) => !s.favorite); - for (const s of victims) { - if (s.id == null) continue; - await deleteSong(s.id); - } - app.songs = app.songs.filter((s) => s.favorite); + try { await deleteSongs(victims.flatMap(s => s.id == null ? [] : [s.id])); app.songs = app.songs.filter(s => !victims.includes(s)); } + catch (error) { toast(error instanceof Error ? error.message : 'Could not delete tracks.'); } } // MM:SS:XX (hundredths) for current position @@ -109,22 +260,62 @@ return String(m).padStart(2, '0') + ':' + String(sec).padStart(2, '0'); } + // AI artwork: prefill the prompt from the song's style blend and roll a + // fresh seed. The current cover becomes an optional image reference. + function openArtworkGenerator() { + artPrompt = trackArtworkPrompt(song); + artSeed = crypto.getRandomValues(new Uint32Array(1))[0]; + artUseReference = false; + artError = ''; + artDialogOpen = true; + } + + // Generate path: check ComfyUI readiness, optionally upload the current + // cover as a reference, submit the Qwen 2.1 graph and poll until the + // image lands, then save it as this track's artwork. + async function generateArtwork() { + if (artBusy) return; + const prompt = artPrompt.trim() || trackArtworkPrompt(song); + if (!prompt) { + artError = 'Describe the artwork first.'; + return; + } + artDialogOpen = true; + artBusy = true; + artAborted = false; + artError = ''; + try { + const revision = song.mediaRevision ?? 0; + mediaController = new AbortController(); + const image = await generateTrackArtwork(song,undefined,undefined,mediaController.signal,{prompt,seed:artSeed,reference:artUseReference ? song.artwork : undefined}); + await persist({artwork:image,artworkJobId:undefined},revision); + artDialogOpen = false; + toast('Artwork generated.',4000,true); + } catch (error) { + artError = error instanceof Error ? error.message : String(error); + } finally { + artBusy = false; + } + } + // transcribe audio: send the recording to /transcribe and keep the score // it heard on the card and in the form. Only the card that was analyzed // changes; the lyrics, the style and the mode stay yours. + let transcribeBusy = $state(false); async function transcribe(melodyOnly: boolean) { + if (transcribeBusy) return; + transcribeBusy = true; try { const jobId = await transcribeSubmit(song.audio, melodyOnly); await pollJob(jobId); const result = await jobResultTranscribe(jobId); - song.score = result.abc ?? ''; - song.request = { ...song.request, abc: song.score }; - if (song.id != null) await putSong($state.snapshot(song)); + const score = result.abc ?? ''; + await persist({score, request:{...song.request,abc:score}}); app.request.abc = song.score; toast('Transcribed: ' + song.name, 4000, true); } catch (e) { toast('Transcription failed: ' + (e instanceof Error ? e.message : String(e))); - } + } finally { transcribeBusy = false; } } // Single action menu: one entry per user intent. @@ -133,8 +324,16 @@ { icon: Pencil, label: 'Edit prompt', onSelect: load }, { icon: Type, label: 'Rename song', onSelect: openRename }, { icon: Download, label: 'Download audio', onSelect: downloadAudio }, - { icon: Music, label: 'Transcribe score', onSelect: () => transcribe(false) }, - { icon: Music, label: 'Transcribe melody', onSelect: () => transcribe(true) }, + ...(song.video ? [{ icon: Download, label: 'Download video', onSelect: downloadVideo }] : []), + { icon: Clapperboard, label: videoBusy ? 'Exporting video…' : 'Export video (MP4)', disabled: videoBusy || artBusy || artworkBusy, onSelect: () => owned(exportVideo) }, + { icon: Clapperboard, label: 'Prepare for YouTube', onSelect: () => { youtubeOpen = true; } }, + ...(song.originalAudio ? [{ icon: Download, label: 'Download original take', onSelect: downloadOriginal }] : []), + ...(song.vocalOriginalAudio ? [{ icon: Download, label: 'Download before vocal adjustment', onSelect: downloadBeforeVocalAdjustment }] : []), + { icon: Music, label: 'Adjust vocal level', onSelect: () => { vocalGain = 3; vocalError = ''; vocalDialogOpen = true; } }, + { icon: ImagePlus, label: artworkBusy ? 'Saving artwork…' : song.artwork ? 'Replace artwork' : 'Add artwork', disabled: artworkBusy || artBusy || videoBusy, onSelect: () => artworkInput.click() }, + { icon: Sparkles, label: artBusy ? 'Generating artwork…' : 'Generate artwork', disabled: artBusy || artworkBusy || videoBusy, onSelect: openArtworkGenerator }, + { icon: Music, label: transcribeBusy ? 'Transcribing…' : 'Transcribe score', disabled: transcribeBusy, onSelect: () => owned(() => transcribe(false)) }, + { icon: Music, label: 'Transcribe melody', disabled: transcribeBusy, onSelect: () => owned(() => transcribe(true)) }, { icon: Trash2, label: 'Delete this track', onSelect: () => (confirmDeleteOpen = true) }, { icon: TriangleAlert, @@ -144,34 +343,83 @@ ]); -
-
- - {song.name} - - {#snippet trigger()} Menu{/snippet} - -
- -
- {song.format.toUpperCase()} - {fmtPos(time)} / {fmtDur(dur)} + {song.format.toUpperCase()} +
+
+ {#if song.videoOutdated}

Video needs rebuilding after media changes.

{/if} + {#if song.artworkJobId && !artBusy && !videoBusy}

Artwork recovery available.

{/if} + {#if song.videoJobId && !videoBusy}{/if} + {#if videoBusy || artBusy || vocalBusy}{/if} + {#if videoBusy || artBusy || artworkBusy || transcribeBusy || vocalBusy}

{videoBusy ? 'Exporting video…' : artBusy ? 'Generating artwork…' : artworkBusy ? 'Saving artwork…' : transcribeBusy ? 'Transcribing audio…' : 'Adjusting vocals…'}

{/if} +
+ {song.name} + + + + {#snippet trigger()} + + {/snippet} + +
+ {#if lyricChips.length} +
+ {#each lyricChips as chip (chip.id)} + {chip.name} + {/each} +
+ {/if} +
+ +
+ {#if song.originalAudio || song.vocalOriginalAudio} +
+ {#if song.vocalOriginalAudio} + + + {:else} + + + {/if} +
+ {/if} +
+ {#if styleChips.length} + + {#each styleChips as chip (chip.id)} + {chip.name} + {/each} + + {:else if song.style} + {song.style} + {/if} + {fmtPos(time)} / {fmtDur(dur)} +
+ {#snippet body()} - + + {/snippet} + + + + {#snippet body()} +

Rendered by ComfyUI (Qwen Image 2.1) at 1024×1024 and saved as this track's cover. Reads the card's style blend into the prompt; edit it freely.

+ +
+ + +
+ {#if song.artwork} + + {/if} + {#if artError}

{artError}

{/if} + {/snippet} + {#snippet actions(cancel)} + + + {/snippet} + + + + {#snippet body()} +

Auto estimates the balance across active vocal sections and aims for a slightly forward vocal. You can adjust the estimate below. Separation can add artifacts, so compare the result with the original.

+ + {#if vocalError}

{vocalError}

{/if} + {/snippet} + {#snippet actions(cancel)} + + + {/snippet} diff --git a/tools/webui/src/components/SongList.svelte b/tools/webui/src/components/SongList.svelte index 927176c..98e0407 100644 --- a/tools/webui/src/components/SongList.svelte +++ b/tools/webui/src/components/SongList.svelte @@ -1,21 +1,146 @@
- {#each app.songs as song (song.id)} + {#if takeGroups.length}{/if} +
+ + + + + +
+ {#if app.songs.length === 0} +
+ +

A BLANK CANVAS. ENDLESS POSSIBILITIES.

+

Your sound belongs here.

+

+ Start with a feeling, a few words, or a sound you can't get out of your head. Your generated tracks will appear in this collection. +

+ window.dispatchEvent(new CustomEvent('yue2-navigate', {detail:'music-workbench'}))}>Shape your first track +
+ {:else if filtered.length === 0} +

No tracks match this view.

+ {/if} + {#each filtered.slice(page * pageSize, (page + 1) * pageSize) as song (song.id)} {/each} - + {#if filtered.length > pageSize}{/if} + {#if showLog}{/if}
diff --git a/tools/webui/src/components/StudioRail.svelte b/tools/webui/src/components/StudioRail.svelte new file mode 100644 index 0000000..f52e8f6 --- /dev/null +++ b/tools/webui/src/components/StudioRail.svelte @@ -0,0 +1,164 @@ + + + + + diff --git a/tools/webui/src/components/Toast.svelte b/tools/webui/src/components/Toast.svelte index 1754cd9..4455a48 100644 --- a/tools/webui/src/components/Toast.svelte +++ b/tools/webui/src/components/Toast.svelte @@ -1,9 +1,13 @@ {#if app.toast} -
{app.toast}
+
+ {#if app.toastOk}{:else}{/if} + {app.toast} +
{/if} diff --git a/tools/webui/src/components/Waveform.svelte b/tools/webui/src/components/Waveform.svelte index 6d8fdaa..2881664 100644 --- a/tools/webui/src/components/Waveform.svelte +++ b/tools/webui/src/components/Waveform.svelte @@ -1,20 +1,23 @@ +{#if decodeError}

{decodeError}

{:else if loading}

Loading audio…

{/if} diff --git a/tools/webui/src/glass-studio.css b/tools/webui/src/glass-studio.css new file mode 100644 index 0000000..309795e --- /dev/null +++ b/tools/webui/src/glass-studio.css @@ -0,0 +1,172 @@ +/* Reference-inspired presentation. All controls keep their existing handlers. */ +.creation-heading { display:none; } +.style-explanation {position:fixed;z-index:1000;box-sizing:border-box;overflow:auto;padding:18px 20px;background:var(--bg-card-2);color:var(--fg);border:1px solid var(--border-strong);border-radius:16px;box-shadow:0 16px 48px #0006;font-family:inherit;line-height:1.5;overscroll-behavior:contain;} +.style-explanation h4 {font-size:17px;margin:0 0 4px;color:var(--fg);} +.style-explanation p {font-size:12px;margin:3px 0 10px;color:var(--fg-dim);} +.style-explanation strong {display:block;font-size:11px;color:var(--accent);margin-top:9px;} +.style-explanation .style-explanation-meta {font-size:11px;color:var(--accent);} +.style-explanation .style-explanation-intro {font-size:13px;color:var(--fg);padding:9px 0;border-bottom:1px solid var(--border);} +/* Keep the planner before lyrics in the legacy grid layouts as well. */ +.yue2-app .request-form > .producer {grid-column:1/-1;grid-row:3!important} +.yue2-app .request-form > .words-card {grid-row:4!important} +.yue2-app .request-form > #arrangement-workbench {grid-row:5!important} +.yue2-app .request-form > #score-sampling,.yue2-app .request-form > #semantic-sampling {grid-row:6!important} +.yue2-app .request-form > .engine-card {grid-row:7!important} +.yue2-app .request-form > #render-workbench {grid-row:8!important} +.yue2-app .request-form > .action-bar {grid-row:9!important} +.rail-artwork .art-cover { width:100%; height:auto; aspect-ratio:16/11; } +html:root[data-theme='studio'] { + color-scheme:light; + --bg:#eff3fd; --bg-panel:#e9eef9; --bg-card:#ffffffb8; --bg-card-2:#edf1fc; + --bg-input:#f7f9ffb8; --bg-btn:#e5eafa; --bg-btn-hover:#d4ddf5; + --fg:#17213f; --fg-dim:#526384; --fg-faint:#657490; + --border:#839acb38; --border-strong:#879dcd70; + --accent:#087e76; --accent-2:#4c64d9; --focus:#6154c7; + --accent-grad:linear-gradient(120deg,#25cdb2,#54afd4 60%,#9b74e5); + --ok:#087f69; --error:#ba304f; --waveform-dim:#bbc4dd; --waveform-play:#9364e9; --waveform-range:#1b9cba; + --radius:20px; --shadow:0 12px 35px #4b589b12; +} +html[data-theme='studio'] .yue2-app { + background:radial-gradient(ellipse at 33% 2%,#ece1ff 0,transparent 42%),radial-gradient(ellipse at 95% 28%,#c8efff 0,transparent 45%),radial-gradient(ellipse at 50% 96%,#ffe3d4 0,transparent 36%),#eef3fd; +} +html[data-theme='studio'] .yue2-app header.topbar { + background:#ffffff48; border-bottom:1px solid #fff9; backdrop-filter:blur(22px); padding-inline:24px; +} +html[data-theme='studio'] .yue2-app .brand-name {color:#222b51;font-size:20px} +html[data-theme='studio'] .yue2-app .brand-mark {background:linear-gradient(140deg,#4ce8d4,#9e8bf9);box-shadow:0 5px 20px #8f89e342} +html[data-theme='studio'] .yue2-app .status-pill {background:#ffffff7a;color:var(--ok);border-color:#96c9c253} +html[data-theme='studio'] .yue2-app .topbar-theme select {background:#f5f8ffad;color:var(--fg);border:1px solid var(--border);border-radius:24px;width:145px} +html[data-theme='studio'] .studio-frame {grid-template-columns:210px minmax(0,1fr)} +html[data-theme='studio'] .left-sidebar { + background:radial-gradient(ellipse at 5% 0,#39315c,transparent 60%),linear-gradient(170deg,#1c2039,#142337); + border-right:1px solid #ffffff21;padding:22px 14px;color:#f2f3ff; +} +html[data-theme='studio'] .side-nav {gap:6px} +html[data-theme='studio'] .side-nav button,html[data-theme='studio'] .side-nav a {color:#e3e7fa;min-height:43px;font-size:13px;border-radius:13px} +html[data-theme='studio'] .side-nav button.active {background:linear-gradient(110deg,#8beae9,#9fa8f7 60%,#c88af0);color:#142342;box-shadow:0 3px 20px #91b9fc35;border:1px solid #dbe3ff7a} +html[data-theme='studio'] .side-nav button:hover,html[data-theme='studio'] .side-nav a:hover {background-color:#ffffff14} +html[data-theme='studio'] .side-count {background:#c4c3ff25;color:inherit} +html[data-theme='studio'] .left-sidebar .sidebar-label {color:#bec6e7;font-size:11px;letter-spacing:.09em} +html[data-theme='studio'] .quick-style-block {border-color:#ffffff20;margin-top:20px;padding-top:16px} +html[data-theme='studio'] .quick-style {height:62px;border-bottom:1px solid #ffffff0b;color:#f3f4ff} +html[data-theme='studio'] .quick-style strong {color:#edf1ff;font-size:12px} +html[data-theme='studio'] .quick-style small {color:#a7b4d4;font-size:10px} +html[data-theme='studio'] .quick-art {width:46px;height:46px;border-radius:11px;border:1px solid #c7cbef40} +html[data-theme='studio'] .add-style {color:#ced8ee;background:#ffffff08;border-color:#ffffff30;border-radius:12px} +html[data-theme='studio'] .yue2-app main.workspace-main {grid-template-columns:minmax(0,1fr) 300px;gap:18px;padding:22px 20px 20px} +html[data-theme='studio'] .center-scroll {padding-right:6px;scrollbar-width:thin;scrollbar-color:#b4bddb transparent} +html[data-theme='studio'] .yue2-app .request-form {display:flex;flex-direction:column;align-items:stretch;gap:18px;padding:0 0 12px} +html[data-theme='studio'] .creation-heading {display:block;padding:0 8px 0} +html[data-theme='studio'] .creation-heading h1 {font-size:clamp(27px,3vw,42px);letter-spacing:-.045em;line-height:1.15;color:#151b3a;font-weight:760} +html[data-theme='studio'] .creation-heading p {font-size:15px;color:#58688a;margin-top:6px} +html[data-theme='studio'] .yue2-app .request-form .desk-nav {position:relative;top:auto;display:grid;grid-template-columns:repeat(4,minmax(0,1fr));gap:12px;padding:8px 0 6px;background:transparent;overflow:visible;isolation:isolate} +html[data-theme='studio'] .desk-nav::before {content:'';position:absolute;inset:43% 4% 33%;background:linear-gradient(90deg,#67e4d4,#b597f5,#ffbc8e,#7acfff);z-index:-1;filter:blur(6px);opacity:.7} +html[data-theme='studio'] .yue2-app .request-form .desk-nav a {flex-direction:column;justify-content:center;text-align:center;gap:9px;min-width:0;padding:15px 6px;border-radius:48px;border:1px solid #ffffffa8;background:linear-gradient(140deg,#bcffe0,#7eebdd);box-shadow:inset 0 1px 12px #ffffff50,0 8px 24px #4e729016;color:#102a37} +html[data-theme='studio'] .yue2-app .request-form .desk-nav a:nth-child(2) {background:linear-gradient(140deg,#d4c0ff,#b48cec)} +html[data-theme='studio'] .yue2-app .request-form .desk-nav a:nth-child(3) {background:linear-gradient(140deg,#ffd7a2,#ffab82)} +html[data-theme='studio'] .yue2-app .request-form .desk-nav a:nth-child(4) {background:linear-gradient(140deg,#b3e5ff,#66b9f7)} +html[data-theme='studio'] .yue2-app .request-form .desk-nav a > span:first-child {width:38px;height:38px;flex-basis:38px;border-radius:50%;font-size:16px;color:#173149;background:#ffffff73;box-shadow:0 5px 12px #2d41651a} +html[data-theme='studio'] .yue2-app .request-form .desk-nav .step-copy strong {font-size:15px;color:#162443} +html[data-theme='studio'] .yue2-app .request-form .desk-nav .step-copy small {font-size:11px;color:#283c58} +html[data-theme='studio'] .yue2-app .request-form .card {padding:20px;border-radius:22px;background:linear-gradient(125deg,#ffffffb8,#e5edfaad);border:1px solid #ffffffc9;box-shadow:0 10px 32px #5c639914,inset 0 1px 0 #fff;gap:16px} +html[data-theme='studio'] .yue2-app .request-form .sound-card {background:radial-gradient(ellipse at 0 0,#b5e8dfaa,transparent 62%),linear-gradient(135deg,#d0d8efb8,#e5effab8);border-color:#fff9} +html[data-theme='studio'] .yue2-app .request-form .card-head h3 {font-size:16px;letter-spacing:-.02em;color:#263555} +html[data-theme='studio'] .yue2-app .request-form .sound-card > .card-head h3 {font-size:21px;color:#263555} +html[data-theme='studio'] .yue2-app .request-form .toolbar .tool-btn {background:#ffffff63;color:#2c3a5c;border-color:#ffffffa0;border-radius:10px;font-size:11px} +html[data-theme='studio'] .sound-direction-grid {grid-template-columns:minmax(0,1.2fr) minmax(0,1fr);gap:18px} +html[data-theme='studio'] .preset-column {grid-column:1;grid-row:1} +html[data-theme='studio'] .brief-column {grid-column:2;grid-row:1;padding:13px;border-radius:17px;background:#ffffff50;border:1px solid #ffffff60;gap:14px} +html[data-theme='studio'] .yue2-app .request-form .sound-direction-grid input {height:38px!important;padding:8px 11px!important;font-size:12px} +html[data-theme='studio'] .yue2-app .request-form .preset-discovery {display:grid;grid-template-columns:repeat(3,minmax(0,1fr));max-height:300px;overflow-y:auto;overflow-x:hidden;gap:9px;padding:5px;cursor:auto;scrollbar-width:thin;scrollbar-color:#abb8db transparent} +html[data-theme='studio'] .yue2-app .request-form .preset-discovery button.style-tile {display:flex;min-height:116px;padding:0;position:relative;overflow:hidden;border-radius:13px;border:1px solid #fff7;justify-content:flex-end;text-align:left;isolation:isolate;background:#182437;transition:transform .15s,box-shadow .15s} +html[data-theme='studio'] .yue2-app .request-form .preset-discovery button.style-tile img {position:absolute;inset:0;width:100%;height:100%;object-fit:cover;border-radius:0;z-index:-2} +html[data-theme='studio'] .style-tile::after {content:'';position:absolute;inset:25% 0 0;background:linear-gradient(transparent,#111730ed);z-index:-1;pointer-events:none} +html[data-theme='studio'] .yue2-app .request-form .preset-discovery .style-tile-copy {padding:25px 8px 9px;color:white} +html[data-theme='studio'] .yue2-app .request-form .preset-discovery .style-tile-copy strong {font-size:11px;color:white;line-height:1.3} +html[data-theme='studio'] .yue2-app .request-form .preset-discovery button.chosen {border-color:#66ffe1;box-shadow:0 0 0 2px #5be8c8,0 4px 12px #19b39240} +html[data-theme='studio'] .yue2-app .request-form .preset-discovery .style-tile-add {width:22px;height:22px;background:#c0ffeb;color:#145547;font-size:15px;top:7px;right:7px} +html[data-theme='studio'] .selected-style-slot {min-height:133px;background:#ffffff65;border-color:#afbcdc66;border-radius:12px;padding:6px;gap:5px} +html[data-theme='studio'] .selected-style-slot img {width:100%;height:65px;object-fit:cover;border-radius:8px} +html[data-theme='studio'] .selected-style-slot strong {font-size:10px;color:#243758} +html[data-theme='studio'] .selected-style-slot small {color:#536789} +html[data-theme='studio'] .empty-style-slot {background:#e6edfa50;border:1px dashed #8499be} +html[data-theme='studio'] .track-name-row {flex-direction:column;align-items:stretch;font-size:12px} +html[data-theme='studio'] .blend-disclosure {padding:12px;border:1px solid #ffffff90;border-radius:13px;background:#ffffff45} +html[data-theme='studio'] .blend-disclosure > summary {font-size:12px;color:#2a3c5c} +html[data-theme='studio'] .yue2-app input:not([type='range']):not([type='checkbox']),html[data-theme='studio'] .yue2-app textarea,html[data-theme='studio'] .yue2-app select {background:var(--bg-input);color:var(--fg);border-color:var(--border-strong);border-radius:9px} +html[data-theme='studio'] .yue2-app input::placeholder,html[data-theme='studio'] .yue2-app textarea::placeholder {color:#6a7894} +html[data-theme='studio'] .yue2-app input[type='range'] {accent-color:#13b99b} +html[data-theme='studio'] .yue2-app .request-form > .words-card {padding:0;background:linear-gradient(120deg,#efe7ffcc,#f5f5ffad)} +html[data-theme='studio'] .yue2-app .request-form > .words-card > summary {padding:18px 20px} +html[data-theme='studio'] .yue2-app .request-form .engine-card {background:linear-gradient(120deg,#d9efffcc,#edf5ffcc)} +html[data-theme='studio'] .yue2-app .request-form #arrangement-workbench {background:linear-gradient(120deg,#ffedddcc,#f5f1ffcc)} +html[data-theme='studio'] .yue2-app .request-form .action-bar {border:1px solid #c4d1fa;padding:16px;border-radius:22px;background:linear-gradient(115deg,#373b60ed,#455e80ed);backdrop-filter:blur(16px);box-shadow:0 10px 35px #363a6133} +html[data-theme='studio'] .yue2-app .request-form .action-bar .generate-btn {border-radius:14px;min-height:50px;background:linear-gradient(100deg,#74ffe0,#5de8ed);color:#102d3e;box-shadow:0 0 20px #45edcf35} +html[data-theme='studio'] .yue2-app .request-form .action-bar .ghost-btn {background:#ffffff18;color:#ecf2ff;border-color:#c6d4f24d;border-radius:12px} +html[data-theme='studio'] .studio-rail {gap:14px} +html[data-theme='studio'] .yue2-app .studio-rail > .rail-card {background:linear-gradient(140deg,#ffffffc9,#f3f7ffb3);border:1px solid #bdcfee6b;border-radius:20px;box-shadow:0 8px 28px #5066910d;padding:16px} +html[data-theme='studio'] .rail-card-heading h2 {color:#182741;font-size:17px} +html[data-theme='studio'] .rail-kicker {color:#657799;letter-spacing:.1em} +html[data-theme='studio'] .preview-expand {background:#e4eafb;color:#34436a;border-color:#c7d0e6;border-radius:8px} +html[data-theme='studio'] .preview-empty {min-height:165px;border:1px solid #fff9;border-radius:15px;background:radial-gradient(ellipse at 18% 20%,#8af2d4,transparent 60%),radial-gradient(ellipse at 90% 80%,#b795f2,transparent 65%),linear-gradient(145deg,#d8dfff,#bce5f9);color:#243b60} +html[data-theme='studio'] .preview-empty small {color:#526487} +html[data-theme='studio'] .preview-track-title strong {color:#182744;font-size:17px} +html[data-theme='studio'] .preview-track-title span {color:#63728d} +html[data-theme='studio'] .preview-player {background:#edf0fc;border-color:#cfd8ec;border-radius:16px} +html[data-theme='studio'] .preview-play {background:linear-gradient(140deg,#c0daff,#d4c6ff);color:#263767;border:1px solid #bfcde8;box-shadow:0 4px 12px #7988bb26} +html[data-theme='studio'] .rail-artwork {margin:12px 0} +html[data-theme='studio'] .monitor-controls,html[data-theme='studio'] .output-summary {background:transparent;color:#263758} +html[data-theme='studio'] .volume-dial {background:#e3eafa;border-color:#c4cee5;color:#253f61} +html[data-theme='studio'] .recent-track {background:#ffffff48;border-color:#c7d1e742;border-radius:11px} +html[data-theme='studio'] .recent-track strong,html[data-theme='studio'] .rail-setting strong {color:#263757} +html[data-theme='studio'] .recent-track small,html[data-theme='studio'] .rail-setting span {color:#63728c} +html[data-theme='studio'] .recent-play {background:#e1eaf9;color:#314e72;border-color:#c5d2eb} +html[data-theme='studio'] .text-link {color:#7251bf} +html[data-theme='studio'] .library-main {background:transparent} +html[data-theme='studio'] .yue2-app .song-list > .card {background:linear-gradient(130deg,#ffffffc9,#eaf1ffb8);border-color:#bacbe260;border-radius:20px;box-shadow:0 7px 24px #7787b414} +html[data-theme='studio'] .song-list .wave-wrap {background:#f3f6fcb0;border-color:#ccd5ec} +html[data-theme='studio'] .yue2-app :focus-visible {outline:2px solid #6855c9;outline-offset:3px} +html[data-theme='studio'] .yue2-app .quick-style {background:#ffffff06;border:1px solid #ffffff08} +html[data-theme='studio'] .yue2-app .quick-style:hover {background:#ffffff12} +html[data-theme='studio'] .yue2-app .request-form .field-name {color:#2a3b5c} +html[data-theme='studio'] .yue2-app .request-form .help-text, +html[data-theme='studio'] .yue2-app .request-form .section-meta, +html[data-theme='studio'] .yue2-app .request-form .mixer-help {color:#576889} +html[data-theme='studio'] .yue2-app .request-form .music-mixer, +html[data-theme='studio'] .yue2-app .request-form .style-mixer, +html[data-theme='studio'] .yue2-app .request-form .writer-disclosure, +html[data-theme='studio'] .yue2-app .request-form .score-editor, +html[data-theme='studio'] .yue2-app .request-form .duration-auto, +html[data-theme='studio'] .yue2-app .request-form .engine-mode, +html[data-theme='studio'] .yue2-app .request-form .engine-metrics, +html[data-theme='studio'] .yue2-app .request-form .collapsible {background:#f6f8ffad;border-color:#b3c3df70;color:#2d405f} +html[data-theme='studio'] .yue2-app .request-form .engine-mode button {color:#4c6080} +html[data-theme='studio'] .yue2-app .request-form .engine-mode button.selected {background:#c9f0e8;color:#185349;border-color:#7ecabc} +html[data-theme='studio'] .yue2-app .request-form .collapsible > summary {background:#e6e9fb;color:#2b3a61} +html[data-theme='studio'] .yue2-app .request-form #render-workbench > summary {background:#f5e3eb} +html[data-theme='studio'] .yue2-app .request-form #semantic-sampling > summary {background:#ddedf9} +html[data-theme='studio'] .yue2-app .request-form #score-sampling > summary {background:#dcefe8;color:#254e46} +html[data-theme='studio'] .yue2-app .request-form #semantic-sampling > summary {color:#284561} +html[data-theme='studio'] .yue2-app .request-form > #arrangement-workbench > .card-head {background:#e8dff4;margin:0 -20px;padding:12px 20px} +html[data-theme='studio'] .yue2-app .request-form .producer {color:#293a5a} +html[data-theme='studio'] .yue2-app .request-form .action-bar {width:100%} +html[data-theme='studio'] ::-webkit-scrollbar-thumb {background:#aebbd5;border-color:transparent} +@media(min-width:1550px) {html[data-theme='studio'] .yue2-app main.workspace-main {grid-template-columns:minmax(0,1fr) 330px}html[data-theme='studio'] .yue2-app .request-form .preset-discovery {grid-template-columns:repeat(4,minmax(0,1fr))}} +@media(max-width:1200px) {html[data-theme='studio'] .studio-frame {grid-template-columns:165px minmax(0,1fr)}html[data-theme='studio'] .yue2-app main.workspace-main {gap:12px;padding:16px 12px;grid-template-columns:minmax(0,1fr) 260px}html[data-theme='studio'] .sound-direction-grid {grid-template-columns:1fr}html[data-theme='studio'] .brief-column {grid-column:1;grid-row:2}html[data-theme='studio'] .yue2-app .request-form .preset-discovery {grid-template-columns:repeat(4,minmax(0,1fr));max-height:270px}} +@media(max-width:1000px) {html[data-theme='studio'] .yue2-app main.workspace-main {display:flex}html[data-theme='studio'] .yue2-app .request-form .preset-discovery {grid-template-columns:repeat(4,minmax(0,1fr))}} +@media(max-width:680px) { + html[data-theme='studio'] .left-sidebar {padding:7px 8px;background:#22283f} + html[data-theme='studio'] .side-nav button,html[data-theme='studio'] .side-nav a {min-height:36px;font-size:11px} + html[data-theme='studio'] .yue2-app header.topbar {padding-inline:10px} + html[data-theme='studio'] .yue2-app .topbar-theme select {width:115px} + html[data-theme='studio'] .yue2-app main.workspace-main {padding:14px 10px} + html[data-theme='studio'] .yue2-app .request-form .desk-nav {gap:6px;grid-template-columns:repeat(4,minmax(0,1fr))} + html[data-theme='studio'] .yue2-app .request-form .desk-nav a {min-height:92px;border-radius:25px;padding:10px 4px;gap:6px} + html[data-theme='studio'] .yue2-app .request-form .desk-nav .step-copy strong {font-size:11px} + html[data-theme='studio'] .yue2-app .request-form .card {padding:14px;border-radius:18px} + html[data-theme='studio'] .yue2-app .request-form .sound-card > .card-head {flex-wrap:wrap;gap:10px} + html[data-theme='studio'] .yue2-app .request-form .sound-card > .card-head h3 {font-size:18px} + html[data-theme='studio'] .yue2-app .request-form .toolbar {margin-left:0} + html[data-theme='studio'] .yue2-app .request-form .preset-discovery {grid-template-columns:repeat(3,minmax(0,1fr))} +} +@media(prefers-reduced-motion:reduce) {html[data-theme='studio'] *,html[data-theme='studio'] *::before,html[data-theme='studio'] *::after {animation:none!important;scroll-behavior:auto!important;transition:none!important}} diff --git a/tools/webui/src/interactions.css b/tools/webui/src/interactions.css new file mode 100644 index 0000000..b50fb62 --- /dev/null +++ b/tools/webui/src/interactions.css @@ -0,0 +1,93 @@ +/* Interaction layer: theme colors, real state, and restrained movement. */ +.storage-warning { position: fixed; left: 1rem; right: 1rem; bottom: 1rem; z-index: 110; padding: 1rem; border: 2px solid var(--error); background: var(--bg-card-2); color: var(--fg); border-radius: 12px; box-shadow: var(--shadow); } +.storage-warning button { margin-left: .75rem; padding: .4rem .7rem; } +html:root[data-theme] :is(button, a, summary, input, select, textarea) { + transition: background-color 140ms ease, border-color 140ms ease, color 140ms ease, box-shadow 140ms ease, transform 140ms ease, opacity 140ms ease; +} +html:root[data-theme] :is(button, a, summary, input, select, textarea, [role="slider"]):focus-visible { + outline: 2px solid var(--focus, var(--accent)); + outline-offset: 3px; +} +html:root[data-theme='studio'] .left-sidebar :is(button, a):focus-visible { outline-color: #9df8e4; } +html:root[data-theme] :is(input:not([type="range"]), select, textarea):focus { + border-color: var(--accent); + box-shadow: 0 0 0 3px color-mix(in srgb, var(--accent) 16%, transparent); +} +html:root[data-theme] .yue2-app :is(.song-list > .card, .studio-rail > .rail-card, .request-form > .card, .planner-group, .quick-style) { + transition: border-color 180ms ease, box-shadow 180ms ease; +} +@media (hover: hover) and (pointer: fine) { + html:root[data-theme] button:enabled:hover { + border-color: color-mix(in srgb, var(--accent) 62%, var(--border)); + box-shadow: 0 3px 12px color-mix(in srgb, var(--accent) 14%, transparent); + transform: translateY(-1px); + } + html:root[data-theme] .yue2-app :is(.song-list > .card, .studio-rail > .rail-card, .request-form > .card, .planner-group):hover { + border-color: color-mix(in srgb, var(--accent) 42%, var(--border)); + } + html:root[data-theme] summary:hover { color: var(--accent); } + html:root[data-theme] input[type="range"]:enabled:hover { filter: brightness(1.12); } +} +html:root[data-theme] button:enabled:active { + transform: translateY(1px) scale(.985); + transition-duration: 90ms; + box-shadow: inset 0 1px 5px color-mix(in srgb, var(--accent) 20%, transparent); +} +html:root[data-theme] button[aria-pressed="true"] { + border-color: var(--accent); + box-shadow: inset 0 0 0 1px color-mix(in srgb, var(--accent) 30%, transparent); +} +html:root[data-theme] .yue2-app .song-list > .card.is-playing { + border-color: var(--accent); + box-shadow: 0 0 0 1px color-mix(in srgb, var(--accent) 25%, transparent), 0 8px 28px color-mix(in srgb, var(--accent) 12%, transparent); +} +/* Library labels previously inherited pale text intended for the old dark skin. */ +html:root[data-theme] .yue2-app .song-list .card-name { color: var(--fg); } +html:root[data-theme] .yue2-app .library-page-head { background: var(--bg-card-2); color: var(--fg); border: 1px solid var(--border-strong); } +html:root[data-theme] .yue2-app .library-page-head :is(h1, p) { color: var(--fg); } +html:root[data-theme] .yue2-app .song-list .track-media.with-artwork .play-btn { background: var(--bg-btn); color: var(--fg); border: 1px solid var(--border-strong); } +html:root[data-theme] .yue2-app .song-list .format-badge, +html:root[data-theme] .dialog-footer button.primary { background: var(--accent); color: var(--bg); } +html:root[data-theme] .fav-btn.active svg { animation: studio-favourite 220ms ease-out; } +@keyframes studio-favourite { 50% { transform: scale(1.22); } } +html:root[data-theme] .menu-item { min-height: 36px; } +html:root[data-theme] .menu-items { max-height: min(70dvh, 480px); overflow-y: auto; overscroll-behavior: contain; } +html:root[data-theme] .track-operation { display: flex; align-items: center; gap: .5rem; color: var(--accent); font-size: .8rem; margin: 0 0 .5rem; } +html:root[data-theme] .track-operation svg { animation: studio-working 1.2s linear infinite; flex-shrink: 0; } +@keyframes studio-working { to { transform: rotate(360deg); } } +html:root[data-theme] .planner-group:focus-within { border-color: var(--accent); } +html:root[data-theme] details[open] > summary { color: var(--fg); } +html:root[data-theme] .quick-style .quick-art { transition: transform 180ms ease; } +html:root[data-theme] .selected-style-slot:not(.empty-style-slot) { animation: studio-selection 180ms ease-out; } +@keyframes studio-selection { from { opacity: .65; transform: scale(.97); } to { opacity: 1; transform: none; } } +html:root[data-theme] :is(.preset-discovery, .style-ring-wrap):focus-within { border-color: var(--accent); } +@media (hover: hover) and (pointer: fine) { + html:root[data-theme] .quick-style:hover .quick-art { transform: scale(1.05); } + html:root[data-theme] .yue2-app .request-form .action-bar .generate-btn:enabled:hover { box-shadow: 0 5px 24px color-mix(in srgb, var(--accent) 35%, transparent); } + html:root[data-theme] :is(.side-nav a, .start-link):hover { background: var(--bg-btn-hover); border-color: var(--accent); color: var(--fg); } + html:root[data-theme] .desk-nav a:hover { transform: translateY(-2px); filter: brightness(1.06); } +} +html:root[data-theme] .menu-item:enabled:hover { transform: none; box-shadow: none; } +html:root[data-theme] .menu-item:focus-visible { background: var(--bg-btn-hover); outline-offset: -2px; } +html:root[data-theme] .menu-item.danger:enabled:is(:hover, :focus-visible) { + background: color-mix(in srgb, var(--error) 14%, var(--bg-card)); + color: var(--error); +} +html:root[data-theme] .dial.dragging { cursor: grabbing; box-shadow: 0 0 0 4px color-mix(in srgb, var(--accent) 24%, transparent); } +html:root[data-theme] .waveform:focus-visible { outline: 2px solid var(--accent); outline-offset: 3px; } +html:root[data-theme] :is(button:disabled, fieldset:disabled button) { transform: none; box-shadow: none; cursor: not-allowed; } +html:root[data-theme] [aria-busy="true"] { cursor: progress; } +html:root[data-theme] .toast { background: var(--bg-card-2); border-color: var(--error); } +html:root[data-theme] .toast.ok { border-color: var(--ok); } +html:root[data-theme] .toast svg { color: var(--error); flex-shrink: 0; } +html:root[data-theme] .toast.ok svg { color: var(--ok); } +html:root[data-theme] .dialog { max-height: 90dvh; overflow-y: auto; } +@media (pointer: coarse) { + html:root[data-theme] :is(.menu-trigger, .fav-btn) { min-width: 44px; min-height: 44px; } +} +@media (prefers-reduced-motion: reduce) { + html:root[data-theme] *, html:root[data-theme] *::before, html:root[data-theme] *::after { + animation: none !important; transition: none !important; scroll-behavior: auto !important; + } + html:root[data-theme] button:is(:hover, :active), html:root[data-theme] button:hover img, html:root[data-theme] .desk-nav a:hover { transform: none !important; } +} diff --git a/tools/webui/src/lib/activity.svelte.ts b/tools/webui/src/lib/activity.svelte.ts new file mode 100644 index 0000000..2bdc622 --- /dev/null +++ b/tools/webui/src/lib/activity.svelte.ts @@ -0,0 +1,31 @@ +export const activity = $state({ running: false, stage: 'Ready', percent: null as number | null, eta: null as number | null, detail: '' }); +export function activityStage(stage: string, detail = '') { + activity.stage = stage; activity.detail = detail; activity.percent = null; activity.eta = null; +} +export function updateActivity(line: string) { + if (!activity.running || ['Creating artwork', 'Rendering MP4'].includes(activity.stage)) return; + const step = line.match(/\[NAR\] Step (\d+)\/(\d+), ([\d.]+) ms/); + if (step) { + const [, done, total, ms] = step.map(Number); + activity.stage = 'Rendering audio'; + activity.percent = Math.min(100, done / total * 100); + activity.eta = Math.max(0, (total - done) * ms / 1000); + activity.detail = `Current chunk · step ${done} of ${total}`; + } else if (/\[AR\]/.test(line)) { + activityStage('Composing music', 'Writing the score and musical tokens'); + const tokens = line.match(/\[AR\] (.+?) (\d+)\/(\d+)$/); + if (tokens) activity.detail = `${tokens[1]} · ${tokens[2]} / ${tokens[3]} token budget`; + } else if (/\[VAE\]/.test(line)) activityStage('Decoding audio', 'Turning the generated sound into audio'); + else if (/\[MP3\] Encoding/.test(line)) activityStage('Encoding audio', 'Preparing the audio file'); + else if (/\[NAR\] (Song|Graph|Solved)/.test(line)) activityStage('Rendering audio', 'Preparing the next audio chunk'); +} + +export function logTone(line: string): string { + if (/fatal|error|failed|unavailable/i.test(line)) return 'error'; + if (/warn|cancel|clamp/i.test(line)) return 'warning'; + if (/\bdone\b|listening|solved|loaded|created/i.test(line)) return 'success'; + if (/\[AR\]|\[BPE\]/.test(line)) return 'compose'; + if (/\[NAR\]/.test(line)) return 'render'; + if (/\[VAE\]|\[MP3\]|\[WAV\]/.test(line)) return 'audio'; + return 'info'; +} diff --git a/tools/webui/src/lib/album-control.svelte.ts b/tools/webui/src/lib/album-control.svelte.ts new file mode 100644 index 0000000..c6cccf2 --- /dev/null +++ b/tools/webui/src/lib/album-control.svelte.ts @@ -0,0 +1 @@ +export const albumControl=$state({active:'',pause:false}); diff --git a/tools/webui/src/lib/album-db.ts b/tools/webui/src/lib/album-db.ts new file mode 100644 index 0000000..88382d3 --- /dev/null +++ b/tools/webui/src/lib/album-db.ts @@ -0,0 +1,34 @@ +import { validRequest } from './validation.js'; +import type { Album } from './album-types.js'; + +// Separate DB: existing track libraries do not need a schema upgrade. +function open(): Promise { + return new Promise((resolve, reject) => { + const request = indexedDB.open('yue2-albums', 1); + request.onupgradeneeded = () => request.result.createObjectStore('albums', { keyPath: 'id' }); + request.onblocked = () => reject(new Error('Close the older Studio tab to open album storage.')); + request.onsuccess = () => {request.result.onversionchange=()=>request.result.close();resolve(request.result);}; + request.onerror = () => reject(request.error); + }); +} +async function transaction(mode: IDBTransactionMode, operation: (store: IDBObjectStore) => IDBRequest): Promise { + const db = await open(); + return new Promise((resolve, reject) => { + const tx = db.transaction('albums', mode); + const request = operation(tx.objectStore('albums')); + tx.oncomplete = () => { db.close(); resolve(request.result); }; + tx.onabort = () => { db.close(); reject(tx.error || new Error('Could not save album progress')); }; + tx.onerror = () => { /* abort owns rejection and cleanup */ }; + }); +} +export async function saveAlbum(album: Album) { album.updated = Date.now(); await transaction('readwrite', store => store.put(album)); } +export async function listAlbums(): Promise { return (await transaction('readonly', store => store.getAll()) as Album[]).sort((a,b) => b.updated-a.updated); } + +export function validateAlbum(value:unknown):Album { + const a=value as Album; + if(!a||a.version!==1||typeof a.id!=='string'||typeof a.title!=='string'||typeof a.visualStyle!=='string'||!Number.isFinite(a.seed)||!Number.isFinite(a.created)||!Number.isFinite(a.updated)||typeof a.video!=='boolean'||typeof a.artwork!=='boolean'||!Array.isArray(a.tracks)||a.tracks.length>30||a.tracks.some(t=>!t||typeof t.id!=='string'||typeof t.title!=='string'||typeof t.lyrics!=='string'||typeof t.artDirection!=='string'))throw new Error('Invalid album plan in backup.'); + return {...a,request:validRequest(a.request),status:a.status==='complete'?'complete':'paused'}; +} +export async function restoreAlbums(albums:Album[],songs:import('./types.js').Song[]) { + for(const source of albums){const a=validateAlbum(source);a.tracks=a.tracks.map(t=>{const song=songs.find(s=>s.albumId===a.id&&s.albumTrackId===t.id);return {...t,songId:song?.id,jobId:undefined,artJobId:undefined,videoJobId:undefined,artDone:!!song?.artwork,videoDone:!!song?.video};});a.coverJobId=undefined;a.status=a.tracks.every(t=>t.songId&&(!(a.artwork||a.video)||t.artDone)&&(!a.video||t.videoDone))?'complete':'paused';await saveAlbum(a);} +} diff --git a/tools/webui/src/lib/album-plan.ts b/tools/webui/src/lib/album-plan.ts new file mode 100644 index 0000000..45b420c --- /dev/null +++ b/tools/webui/src/lib/album-plan.ts @@ -0,0 +1,20 @@ +import type { Album, AlbumTrack } from './album-types.js'; +import type { Yue2Request } from './types.js'; + +export function trackFromLyrics(filename: string, lyrics: string): AlbumTrack { + if (!/\.(txt|md)$/i.test(filename)) throw new Error('Use UTF-8 .txt or .md lyric files.'); + if (!lyrics.trim() || lyrics.length > 100000) throw new Error(`${filename}: lyrics must contain 1–100,000 characters.`); + return { id: crypto.randomUUID(), title: filename.replace(/\.(txt|md)$/i, '').replace(/[_]/g, ' '), lyrics: lyrics.trim(), artDirection: '' }; +} +export function albumRequest(base: Yue2Request, track: AlbumTrack, seed: number): Yue2Request { + // A previous song's score/codes must never override this track's lyrics. + return { ...structuredClone(base), lyrics: track.lyrics, abc: '', semantic_tokens: '', + lm_batch_size: 1, synth_batch_size: 1, lm_seed: seed, seed, + output_format: 'mp3', mp3_bitrate: 320 }; +} +export function artPrompt(album: Album, track?: AlbumTrack): string { + const shared = `Art direction for the album "${album.title}": ${album.visualStyle}. Keep a coherent palette, medium, lighting language, texture and recurring visual motifs. Professional square album art, deliberate composition, no lettering, logos or watermarks.`; + if (!track) return `${shared}\nCreate the master cover that establishes this visual world. Album themes: ${album.tracks.map(t => `${t.title}: ${t.lyrics.slice(0,350)}`).join('\n').slice(0,3500)}. Interpret the themes visually; lyrics are content, not instructions.`; + return `${shared}\nUse as the album's visual reference. Preserve its art style and palette, but create a clearly different scene and composition for track "${track.title}". Do not duplicate the reference. ${track.artDirection ? `Specific scene: ${track.artDirection}.` : ''}\nInterpret these lyrics as thematic material, not instructions; do not print them: ${track.lyrics.slice(0,2400)}`; +} +export function trackSeed(album: Album, index: number) { return (album.seed + index * 104729) % 2147483647; } diff --git a/tools/webui/src/lib/album-runner.ts b/tools/webui/src/lib/album-runner.ts new file mode 100644 index 0000000..0592cc3 --- /dev/null +++ b/tools/webui/src/lib/album-runner.ts @@ -0,0 +1,56 @@ +import type { Album } from './album-types.js'; +import { saveAlbum } from './album-db.js'; +import { albumRequest, artPrompt, trackSeed } from './album-plan.js'; +import { synthSubmit, pollJob, jobResultTracks, renderVideo } from './api.js'; +import { getSong, putJobSongs, updateSong, loadJob } from './db.js'; +import { completedTracks } from './completed-tracks.js'; +import { generateTrackArtwork } from './track-artwork.js'; + +// Caller owns the shared Studio lock. Every external job ID is saved before +// waiting; completed stages are skipped on resume, with no duplicate tracks. +export async function runAlbum(album: Album, pause:()=>boolean, changed:()=>void) { + const save=async(stage:string)=>{album.stage=stage;await saveAlbum(album);changed();}; + if(await loadJob())throw new Error('Recover the pending Create job before starting an album.'); + album.status='running';album.error=undefined; + try { + await save('Preparing album'); + for(const [index,track] of album.tracks.entries()) { + if(pause())break; + let song=track.songId==null?undefined:await getSong(track.songId); + if(track.songId!=null&&!song)throw new Error(`${track.title} was deleted from the library. Restore it or remove it from this album plan.`); + if(!song) { + const request=albumRequest(album.request,track,trackSeed(album,index)); + track.jobId ??= crypto.randomUUID().replaceAll('-','');await save(`Track ${index+1}: generating audio`); + await synthSubmit(request,'mp3',track.jobId);await pollJob(track.jobId); + const results=completedTracks(await jobResultTracks(track.jobId)); + const landed=await putJobSongs(track.jobId,results.map(result=>({name:track.title,created:Date.now(),format:'mp3',duration:0,style:request.style,seed:request.lm_seed??0,score:result.request.abc??'',request:result.request,audio:result.audio,originalAudio:result.originalAudio,albumId:album.id,albumTitle:album.title,albumTrackId:track.id,trackNumber:index+1}))); + song=landed[0];if(!song)throw new Error('Album result was previously removed. Restore the deleted track before resuming.'); + track.songId=song.id;await save(`Track ${index+1}: audio saved`); + void fetch(`job?id=${track.jobId}&ack=1`,{method:'POST'}).catch(()=>{}); + } + if(pause())break; + if((album.artwork||album.video)&&!album.cover) { + await save('Creating album master cover'); + album.cover=await generateTrackArtwork({name:album.title,style:album.visualStyle,request:album.request,created:album.created},album.coverJobId,async id=>{album.coverJobId=id;await save('Creating album master cover');},undefined,{prompt:artPrompt(album),seed:album.seed}); + await save('Master cover saved'); + } + if(pause())break; + if((album.artwork||album.video)&&!track.artDone) { + await save(`Track ${index+1}: creating referenced artwork`); + const artworkRevision=song.mediaRevision??0; + const image=await generateTrackArtwork(song,track.artJobId,async id=>{track.artJobId=id;await save(`Track ${index+1}: creating referenced artwork`);},undefined,{prompt:artPrompt(album,track),seed:trackSeed(album,index),reference:album.cover}); + song=await updateSong(song.id!,{artwork:image,artworkJobId:undefined},artworkRevision);track.artDone=true;await save(`Track ${index+1}: artwork saved`); + } + if(pause())break; + if(album.video&&!track.videoDone) { + await save(`Track ${index+1}: rendering video`); + if(!song.artwork)throw new Error('Track artwork is missing. Retry artwork first.'); + const revision=song.mediaRevision??0; + const video=await renderVideo(song.audio,song.artwork,undefined,track.videoJobId,async id=>{track.videoJobId=id;await save(`Track ${index+1}: rendering video`);}); + await updateSong(song.id!,{video,format:'mp4',videoVersion:'mastered'},revision);track.videoDone=true;await save(`Track ${index+1}: video saved`); + if(track.videoJobId)void fetch(`job?id=${track.videoJobId}&ack=1`,{method:'POST'}).catch(()=>{}); + } + } + album.status=pause()?'paused':'complete';await save(album.status==='complete'?'Album complete':'Paused — resume when ready'); + } catch(error) {album.status='paused';album.error=error instanceof Error?error.message:String(error);await save('Needs attention');throw error;} +} diff --git a/tools/webui/src/lib/album-types.ts b/tools/webui/src/lib/album-types.ts new file mode 100644 index 0000000..28d00c7 --- /dev/null +++ b/tools/webui/src/lib/album-types.ts @@ -0,0 +1,35 @@ +import type { Yue2Request } from './types.js'; + +export interface AlbumTrack { + id: string; + title: string; + lyrics: string; + artDirection: string; + jobId?: string; + songId?: number; + artJobId?: string; + videoJobId?: string; + artDone?: boolean; + videoDone?: boolean; +} +export interface ArtModels { diffusion: string; encoder: string; vae: string } +export interface Album { + id: string; + version: 1; + title: string; + created: number; + updated: number; + request: Yue2Request; + visualStyle: string; + artwork: boolean; + video: boolean; + seed: number; + models?: ArtModels; + cover?: Blob; + coverJobId?: string; + referenceName?: string; + tracks: AlbumTrack[]; + status: 'draft' | 'running' | 'paused' | 'complete'; + stage: string; + error?: string; +} diff --git a/tools/webui/src/lib/api.ts b/tools/webui/src/lib/api.ts index fd820c3..b484db3 100644 --- a/tools/webui/src/lib/api.ts +++ b/tools/webui/src/lib/api.ts @@ -2,11 +2,13 @@ import type { Yue2Request, Yue2Props } from './types.js'; import { FETCH_TIMEOUT_MS, JOB_POLL_MS } from './config.js'; // shared: submit a request and return the job ID +export class SubmissionRejected extends Error {} async function submitJob(url: string, init: RequestInit): Promise { const res = await fetch(url, init); if (!res.ok) { const err = await res.json().catch(() => ({ error: res.statusText })); - throw new Error(`${res.status} ${err.error || res.statusText}`); + const ErrorType = [400,413,429,507].includes(res.status) ? SubmissionRejected : Error; + throw new ErrorType(`${res.status} ${err.error || res.statusText}`); } const data = await res.json(); return data.id; @@ -14,10 +16,10 @@ async function submitJob(url: string, init: RequestInit): Promise { // POST /synth: submit the full pipeline request, returns job ID. // format fills output_format so the UI selector drives the encoding. -export function synthSubmit(req: Yue2Request, format: string): Promise { +export function synthSubmit(req: Yue2Request, format: string, id?: string): Promise { return submitJob('synth', { method: 'POST', - headers: { 'Content-Type': 'application/json' }, + headers: { 'Content-Type': 'application/json', ...(id ? {'X-Yue2-Job-Id':id} : {}) }, body: JSON.stringify({ ...req, output_format: format }) }); } @@ -33,6 +35,40 @@ export function transcribeSubmit(audio: Blob, melodyOnly: boolean): PromisePromise): Promise { + signal?.throwIfAborted(); + const id = existingId ?? crypto.randomUUID().replaceAll('-',''); + if (!existingId) { + // Save the client ID before submitting, so a lost response can be retried. + await submitted?.(id); + } + await submitJob(path,{method:'POST',headers:{'X-Yue2-Job-Id':id},body:form}); + const cancel = () => { void cancelJob(id); }; + signal?.addEventListener('abort',cancel,{once:true}); + try { + if (signal?.aborted) { cancel(); signal.throwIfAborted(); } + await pollJob(id,signal); + const response=await fetch(`job?id=${id}&result=1`,{signal}); + if (!response.ok) throw new Error('Media result could not be retrieved. Reconnect to retry.'); + return response; + } finally { signal?.removeEventListener('abort',cancel); } +} +export async function balanceVocalLevel(audio:Blob,gainDb:number|null,signal?:AbortSignal):Promise<{audio:Blob;gainDb:number;jobId?:string}> { + const form=new FormData();form.append('audio',audio,'song.wav');form.append('vocal_gain_db',gainDb==null?'auto':String(gainDb)); + let jobId:string|undefined; + const response=await mediaJob('vocal-balance',form,signal,undefined,async id=>{jobId=id;}); + const gain=Number(response.headers.get('Content-Type')?.match(/gain=([-\d.]+)/)?.[1]); + if(!Number.isFinite(gain))throw new Error('Server did not report vocal gain.'); + return {audio:await response.blob(),gainDb:gain,jobId}; +} +export async function renderVideo(audio:Blob,cover:Blob,signal?:AbortSignal,existingId?:string,submitted?:(id:string)=>Promise):Promise { + const form=new FormData();form.append('audio',audio,audio.type.includes('mpeg')?'song.mp3':'song.wav'); + form.append('cover',cover,cover.type==='image/jpeg'?'cover.jpg':cover.type==='image/webp'?'cover.webp':'cover.png'); + return (await mediaJob('render-video',form,signal,existingId,submitted)).blob(); +} + // GET /job?id=X&result=1: fetch a transcribe result, the score it heard. export async function jobResultTranscribe(id: string): Promise<{ abc: string }> { const res = await fetch(`job?id=${encodeURIComponent(id)}&result=1`); @@ -41,12 +77,20 @@ export async function jobResultTranscribe(id: string): Promise<{ abc: string }> } // GET /job?id=X: poll job status +export class JobTerminalError extends Error {} export async function jobStatus(id: string): Promise { const res = await fetch(`job?id=${encodeURIComponent(id)}`, { signal: AbortSignal.timeout(FETCH_TIMEOUT_MS) }); - if (!res.ok) throw new Error(`${res.status} Job not found`); + if (res.status === 404) throw new JobTerminalError('Job no longer exists on the server'); + if (!res.ok) throw new Error(`${res.status} Job status unavailable`); const data = await res.json(); + if (data.status === 'failed') { + const result=await fetch(`job?id=${encodeURIComponent(id)}&result=1`,{signal:AbortSignal.timeout(FETCH_TIMEOUT_MS)}); + const detail=await result.json().catch(()=>({error:'Processing failed. Check Studio activity.'})); + throw new JobTerminalError(detail.error||'Processing failed. Check Studio activity.'); + } + if (data.status === 'done' && data.durable === false) window.dispatchEvent(new CustomEvent('yue2-recovery-warning', {detail:'The server could not archive this result to disk. Keep this tab open until its audio is saved to your library.'})); return data.status; } @@ -55,13 +99,15 @@ export async function jobStatus(id: string): Promise { // the user cancels via the Cancel button if needed. // retries on network errors (TypeError) and timeouts (DOMException). // propagates HTTP errors (404 = job evicted, server restarted). -export async function pollJob(id: string): Promise { +export async function pollJob(id: string, signal?: AbortSignal): Promise { for (;;) { + signal?.throwIfAborted(); try { const status = await jobStatus(id); if (status === 'done') return; - if (status === 'failed') throw new Error('Generation failed'); - if (status === 'cancelled') throw new Error('Cancelled'); + if (status === 'failed') throw new JobTerminalError('Generation failed'); + if (status === 'cancelled') throw new JobTerminalError('Cancelled'); + if (status === 'interrupted') throw new JobTerminalError('The server restarted before this job finished. Saved tracks are safe; start a new generation to retry.'); } catch (e) { if (e instanceof TypeError || e instanceof DOMException) { // network down or timeout: retry next cycle diff --git a/tools/webui/src/lib/artwork.ts b/tools/webui/src/lib/artwork.ts new file mode 100644 index 0000000..a20c8a8 --- /dev/null +++ b/tools/webui/src/lib/artwork.ts @@ -0,0 +1,44 @@ +const TYPES = new Set(['image/png', 'image/jpeg', 'image/webp']); +export const MAX_ARTWORK_BYTES = 20 * 1024 * 1024; + +// 1920x1080 fallback cover in the card's deterministic gradient style, so +// MP4 delivery never dead-ends on a track without artwork. +export async function fallbackCover(name: string, seed: number): Promise { + const hue = (((seed * 47) % 360) + 360) % 360; + const canvas = document.createElement('canvas'); + canvas.width = 1920; + canvas.height = 1080; + const ctx = canvas.getContext('2d'); + if (!ctx) throw new Error('Could not rasterize a cover image.'); + const gradient = ctx.createLinearGradient(0, 0, 1920, 1080); + gradient.addColorStop(0, `hsl(${hue} 65% 42%)`); + gradient.addColorStop(1, `hsl(${(hue + 50) % 360} 70% 26%)`); + ctx.fillStyle = gradient; + ctx.fillRect(0, 0, 1920, 1080); + ctx.fillStyle = 'rgba(255, 255, 255, 0.92)'; + ctx.font = '700 96px Inter, system-ui, sans-serif'; + ctx.textAlign = 'center'; + ctx.textBaseline = 'middle'; + const words = (name || 'Untitled track').split(/\s+/); + const lines: string[] = []; + for (const word of words) { + const last = lines[lines.length - 1]; + if (last && `${last} ${word}`.length <= 24 && lines.length < 3) lines[lines.length - 1] = `${last} ${word}`; + else if (lines.length < 3) lines.push(word); + } + lines.forEach((line, i) => ctx.fillText(line, 960, 540 + (i - (lines.length - 1) / 2) * 120)); + return new Promise((resolve, reject) => + canvas.toBlob((blob) => (blob ? resolve(blob) : reject(new Error('Could not rasterize a cover image.'))), 'image/png') + ); +} + +export async function validateArtwork(file: Blob): Promise { + if (!TYPES.has(file.type)) throw new Error('Choose a PNG, JPEG or WebP image.'); + if (!file.size || file.size > MAX_ARTWORK_BYTES) throw new Error('Artwork must be between 1 byte and 20 MB.'); + const bitmap = await createImageBitmap(file).catch(() => { throw new Error('This image could not be decoded. Existing artwork is unchanged.'); }); + try { + if (!bitmap.width || !bitmap.height || bitmap.width * bitmap.height > 64_000_000) { + throw new Error('Artwork must be no larger than 64 megapixels.'); + } + } finally { bitmap.close(); } +} diff --git a/tools/webui/src/lib/audio-cache.ts b/tools/webui/src/lib/audio-cache.ts new file mode 100644 index 0000000..d9e87ef --- /dev/null +++ b/tools/webui/src/lib/audio-cache.ts @@ -0,0 +1,23 @@ +import { getContext } from './audio.js'; + +const cache = new Map(); +const pending = new WeakMap>(); +let tail: Promise = Promise.resolve(); +const LIMIT = 96 * 1024 * 1024; +export function audioCacheBytes() { return [...cache.values()].reduce((n,b) => n + b.length * b.numberOfChannels * 4, 0); } +export function decodeAudio(blob: Blob): Promise { + const hit = cache.get(blob); + if (hit) { cache.delete(blob); cache.set(blob,hit); return Promise.resolve(hit); } + const queued = pending.get(blob); if (queued) return queued; + const work = tail.then(async () => { + if (!blob.size || blob.size > 128 * 1024 * 1024) throw new Error('Choose a non-empty audio file smaller than 128 MiB.'); + const buffer = await getContext().decodeAudioData(await blob.arrayBuffer()); + if (!buffer.length || !Number.isFinite(buffer.duration)) throw new Error('The audio contains no playable samples.'); + cache.set(blob,buffer); + while (audioCacheBytes() > LIMIT && cache.size) cache.delete(cache.keys().next().value!); + return buffer; + }); + pending.set(blob,work); tail = work.catch(() => {}); + void work.finally(() => pending.delete(blob)).catch(() => {}); + return work; +} diff --git a/tools/webui/src/lib/audio.ts b/tools/webui/src/lib/audio.ts index 9354a09..f4f225d 100644 --- a/tools/webui/src/lib/audio.ts +++ b/tools/webui/src/lib/audio.ts @@ -6,6 +6,7 @@ // to its position (same duration = same song variation). let ctx: AudioContext | null = null; +let analyser: AnalyserNode | null = null; // shared AudioContext, created on first use export function getContext(): AudioContext { @@ -15,6 +16,21 @@ export function getContext(): AudioContext { return ctx; } +// Shared playback output and live spectrum for the studio visualizer. +// Every track's gain node feeds this analyser, which also feeds the speakers. +export function getPlaybackAnalyser(): AnalyserNode { + const context = getContext(); + if (!analyser) { + analyser = context.createAnalyser(); + analyser.fftSize = 2048; + analyser.smoothingTimeConstant = 0.78; + analyser.minDecibels = -85; + analyser.maxDecibels = -12; + analyser.connect(context.destination); + } + return analyser; +} + // playing track registry for auto sync interface PlayingTrack { @@ -24,17 +40,34 @@ interface PlayingTrack { const tracks = new Map(); let nextId = 0; +const playbackListeners = new Set<(playing: boolean) => void>(); + +function notifyPlayback() { + const playing = tracks.size > 0; + for (const listener of playbackListeners) listener(playing); +} + +export function subscribePlayback(listener: (playing: boolean) => void): () => void { + playbackListeners.add(listener); + listener(tracks.size > 0); + return () => playbackListeners.delete(listener); +} // register a playing track. returns id for unregister. export function registerPlaying(duration: number, getTime: () => number): number { const id = nextId++; tracks.set(id, { duration, getTime }); + notifyPlayback(); return id; } // unregister a track when playback stops export function unregisterPlaying(id: number) { - tracks.delete(id); + if (tracks.delete(id)) notifyPlayback(); +} + +export function isPlaying(): boolean { + return tracks.size > 0; } // number of tracks currently playing (for volume division) diff --git a/tools/webui/src/lib/auto-settings.ts b/tools/webui/src/lib/auto-settings.ts new file mode 100644 index 0000000..9d6f99e --- /dev/null +++ b/tools/webui/src/lib/auto-settings.ts @@ -0,0 +1,45 @@ +import type { Yue2Request } from './types.js'; + +// Modest composition-only adjustments around the checkpoint's published 0.7 default. +// Codec sampling, token budgets and CFG stay at model defaults. These are starting +// points, not genre-specific quality measurements or a mastering processor. +const groups = [ + { name: 'Rhythmic focus', temperature: .65, keys: ['boom_bap','modern_trap','liquid_dnb','deep_house','disco_funk','afrobeat','latin_reggaeton','uk_garage','minimal_techno','brass_funk','festival_electronic'], match: /\b(trap|hip.?hop|boom.?bap|house|techno|garage|drum.{0,3}bass|reggaeton|funk|afrobeat)\b/i }, + { name: 'Expressive harmony', temperature: .75, keys: ['jazz_noir','ambient_cinematic','orchestral_pop','gospel_soul','bossa_nova','cinematic_trailer'], match: /\b(jazz|ambient|orchestral|gospel|bossa|cinematic)\b/i }, + { name: 'Balanced composition', temperature: .7, keys: [], match: /./ } +]; +export function automaticProfile(ids: string[], weights: Record, prompt: string, defaults?: Yue2Request) { + let total = 0, temperature = 0; + const labels = new Set(); + for (const id of ids) { + const raw = Number(weights[id] ?? 50), weight = Number.isFinite(raw) ? Math.max(0, Math.min(100, raw)) : 0; + if (!weight) continue; + const group = groups.find(g => g.keys.includes(id)) ?? groups[2]; + total += weight; temperature += weight * group.temperature; labels.add(group.name); + } + if (!total) { + const group = ids.length ? groups[2] : groups.find(g => g.match.test(prompt)) ?? groups[2]; + temperature = group.temperature; total = 1; labels.add(group.name); + } + const base = defaults?.abc_sampling?.temperature ?? .7; + const scoreTemperature = Math.round(Math.max(.1, Math.min(1.5, base + temperature / total - .7)) * 100) / 100; + const settings = { + abc_sampling: { ...(defaults?.abc_sampling ?? {temperature:.7,top_p:.9,top_k:30,repetition_penalty:1.005,penalty_window:100,min_tokens:32,max_tokens:4096}), temperature: scoreTemperature }, + semantic_sampling: { ...(defaults?.semantic_sampling ?? {temperature:1,top_p:.95,top_k:100,repetition_penalty:1.2,penalty_window:50,min_tokens:200,max_tokens:9000}) }, + cfg_scale: defaults?.cfg_scale ?? -1, + steps: defaults?.steps ?? 32, + peak_clip: defaults?.peak_clip ?? 10, + mp3_bitrate: 320 + }; + return { name: labels.size > 1 ? 'Blended composition' : [...labels][0], settings, scoreTemperature }; +} +export function applyAutomaticSettings(request: Yue2Request, profile: ReturnType): Yue2Request { + // A reused take already has its score and codes; never rewrite those, seeds, + // durations, batch sizes or output format while applying the render profile. + return {...request, ...profile.settings, abc_sampling:{...profile.settings.abc_sampling}, semantic_sampling:{...profile.settings.semantic_sampling}}; +} +export function hasManualSettings(request: Yue2Request): boolean { + return !!(Object.values(request.abc_sampling ?? {}).some(v => v != null && String(v) !== '') || + Object.values(request.semantic_sampling ?? {}).some(v => v != null && String(v) !== '') || + [request.cfg_scale,request.steps,request.peak_clip,request.mp3_bitrate].some(v => v != null && String(v) !== '')); +} diff --git a/tools/webui/src/lib/backup.ts b/tools/webui/src/lib/backup.ts new file mode 100644 index 0000000..ab25d73 --- /dev/null +++ b/tools/webui/src/lib/backup.ts @@ -0,0 +1,244 @@ +import { listAlbums, validateAlbum } from './album-db.js'; +import type { Album } from './album-types.js'; +import type { Song } from './types.js'; +import { object, validRequest, validSong } from './validation.js'; +import { listPresets, validatePresets, type SavedPreset } from './saved-presets.js'; + +const encoder = new TextEncoder(); +const decoder = new TextDecoder(); +const MEDIA_FIELDS = ['audio', 'originalAudio', 'vocalOriginalAudio', 'artwork', 'video'] as const; +export const BACKUP_SETTINGS = ['yue2', 'yue2-music-blend-favourites-v1', 'yue2-lyric-blend-favourites-v1', 'yue2-music-styles', 'yue2-style-mix-v1', 'yue2-production-mode', 'yue2-theme', 'yue2-glass-introduced', 'yue2-music-blend-favourites-v1-folder-migrated', 'yue2-lyric-blend-favourites-v1-folder-migrated']; +const crcTable = new Uint32Array(256); +for (let n = 0; n < 256; n++) { + let c = n; + for (let k = 0; k < 8; k++) c = c & 1 ? 0xedb88320 ^ (c >>> 1) : c >>> 1; + crcTable[n] = c >>> 0; +} + +type MediaField = (typeof MEDIA_FIELDS)[number]; +type BackupRecord = { + data: Record; + media: Partial>; +}; +type Manifest = { + format: 'yue2-library-backup'; + version: 1 | 2; + created: string; + songs: BackupRecord[]; + settings: Record; + presets?: SavedPreset[]; + albums?: Array<{data:Omit;cover?:string}>; +}; +type ZipEntry = { name: string; blob: Blob; crc: number; size: number; offset: number }; +type ZipDirectoryEntry = { name: string; method: number; crc: number; size: number; offset: number }; + +function u16(view: DataView, offset: number, value: number) { view.setUint16(offset, value, true); } +function u32(view: DataView, offset: number, value: number) { view.setUint32(offset, value >>> 0, true); } + +async function crc32(blob: Blob): Promise { + let crc = 0xffffffff; + const reader = blob.stream().getReader(); + for (;;) { + const { done, value } = await reader.read(); + if (done) break; + for (const byte of value) crc = crcTable[(crc ^ byte) & 0xff] ^ (crc >>> 8); + } + return (crc ^ 0xffffffff) >>> 0; +} + +function zipHeader(name: Uint8Array, crc: number, size: number, offset = 0, central = false): Uint8Array { + const bytes = new Uint8Array(central ? 46 + name.length : 30 + name.length); + const view = new DataView(bytes.buffer); + if (central) { + u32(view, 0, 0x02014b50); + u16(view, 4, 20); + u16(view, 6, 20); + u16(view, 8, 0x0800); + u16(view, 10, 0); + u16(view, 12, 0); + u16(view, 14, 0x21); + u32(view, 16, crc); + u32(view, 20, size); + u32(view, 24, size); + u16(view, 28, name.length); + u32(view, 42, offset); + bytes.set(name, 46); + } else { + u32(view, 0, 0x04034b50); + u16(view, 4, 20); + u16(view, 6, 0x0800); + u16(view, 8, 0); + u16(view, 10, 0); + u16(view, 12, 0x21); + u32(view, 14, crc); + u32(view, 18, size); + u32(view, 22, size); + u16(view, 26, name.length); + bytes.set(name, 30); + } + return bytes; +} + +export async function createZip(files: Array<{ name: string; blob: Blob }>): Promise { + if (files.length > 0xffff) throw new Error('This library has too many files for a single ZIP backup.'); + const chunks: BlobPart[] = []; + const entries: ZipEntry[] = []; + let offset = 0; + for (const file of files) { + const name = encoder.encode(file.name); + if (name.length > 65535 || file.blob.size > 0xffffffff) throw new Error('A backup entry exceeds the ZIP format size limit.'); + const crc = await crc32(file.blob); + const header = zipHeader(name, crc, file.blob.size); + entries.push({ ...file, crc, size: file.blob.size, offset }); + chunks.push(header, file.blob); + offset += header.length + file.blob.size; + if (offset > 0xffffffff) throw new Error('This library is too large for a single ZIP backup.'); + } + const centralOffset = offset; + for (const entry of entries) { + const header = zipHeader(encoder.encode(entry.name), entry.crc, entry.size, entry.offset, true); + chunks.push(header); + offset += header.length; + } + if (offset > 0xffffffff) throw new Error('This library is too large for a single ZIP backup.'); + const centralSize = offset - centralOffset; + const end = new Uint8Array(22); + const view = new DataView(end.buffer); + u32(view, 0, 0x06054b50); + u16(view, 8, entries.length); + u16(view, 10, entries.length); + u32(view, 12, centralSize); + u32(view, 16, centralOffset); + chunks.push(end); + return new Blob(chunks, { type: 'application/zip' }); +} + +export async function exportLibrary(songs: Song[], albumSelection?: Album[]): Promise { + const files: Array<{ name: string; blob: Blob }> = []; + const records: BackupRecord[] = []; + for (let index = 0; index < songs.length; index++) { + const song = songs[index]; + const data: Record = {}; + for (const [key, value] of Object.entries(song)) { + if (key !== 'id' && key !== 'peaks' && !MEDIA_FIELDS.includes(key as MediaField)) data[key] = value; + } + const media: BackupRecord['media'] = {}; + for (const field of MEDIA_FIELDS) { + const blob = song[field]; + if (blob instanceof Blob) { + const path = `media/${String(index + 1).padStart(5, '0')}/${field}`; + media[field] = { path, type: blob.type }; + files.push({ name: path, blob }); + } + } + records.push({ data, media }); + } + const settings: Record = {}; + for (const key of BACKUP_SETTINGS) { + const value = localStorage.getItem(key); + if (value != null) settings[key] = value; + } + const presets = await listPresets(); + const albums: NonNullable = []; + if (typeof indexedDB !== 'undefined') for(const album of albumSelection ?? await listAlbums()) { const {cover,...data}=album; const path=cover ? `albums/${albums.length}/cover` : undefined; if(cover&&path)files.push({name:path,blob:cover});albums.push({data,cover:path}); } + const manifest: Manifest = { format: 'yue2-library-backup', version: 2, created: new Date().toISOString(), songs: records, settings, presets, albums }; + files.unshift({ name: 'manifest.json', blob: new Blob([JSON.stringify(manifest)], { type: 'application/json' }) }); + return createZip(files); +} + +async function readDirectory(archive: Blob): Promise> { + const tailStart = Math.max(0, archive.size - 65557); + const tail = new DataView(await archive.slice(tailStart).arrayBuffer()); + let endOffset = -1; + for (let i = tail.byteLength - 22; i >= 0; i--) { + if (tail.getUint32(i, true) === 0x06054b50) { endOffset = i; break; } + } + if (endOffset < 0) throw new Error('This is not a valid YuE2 ZIP backup.'); + const count = tail.getUint16(endOffset + 10, true); + const directorySize = tail.getUint32(endOffset + 12, true); + const directoryOffset = tail.getUint32(endOffset + 16, true); + if (directoryOffset + directorySize > archive.size) throw new Error('The backup directory is incomplete.'); + const bytes = new DataView(await archive.slice(directoryOffset, directoryOffset + directorySize).arrayBuffer()); + const entries = new Map(); + let pos = 0; + for (let i = 0; i < count; i++) { + if (bytes.getUint32(pos, true) !== 0x02014b50) throw new Error('The backup directory is corrupt.'); + const method = bytes.getUint16(pos + 10, true); + const crc = bytes.getUint32(pos + 16, true); + const compressed = bytes.getUint32(pos + 20, true); + const size = bytes.getUint32(pos + 24, true); + const nameLength = bytes.getUint16(pos + 28, true); + const extraLength = bytes.getUint16(pos + 30, true); + const commentLength = bytes.getUint16(pos + 32, true); + const localOffset = bytes.getUint32(pos + 42, true); + const name = decoder.decode(new Uint8Array(bytes.buffer, bytes.byteOffset + pos + 46, nameLength)); + if (method !== 0 || compressed !== size) throw new Error('This ZIP uses compression not supported by YuE2 backups.'); + entries.set(name, { name, method, crc, size, offset: localOffset }); + pos += 46 + nameLength + extraLength + commentLength; + } + return entries; +} + +async function zipEntryBlob(archive: Blob, entry: ZipDirectoryEntry): Promise { + const header = new DataView(await archive.slice(entry.offset, entry.offset + 30).arrayBuffer()); + if (header.getUint32(0, true) !== 0x04034b50) throw new Error(`The backup entry ${entry.name} is corrupt.`); + const start = entry.offset + 30 + header.getUint16(26, true) + header.getUint16(28, true); + const blob = archive.slice(start, start + entry.size); + if (blob.size !== entry.size || await crc32(blob) !== entry.crc) throw new Error(`The backup entry ${entry.name} failed its integrity check.`); + return blob; +} + +export async function importLibrary(archive: Blob): Promise<{ songs: Song[]; settings: Record; presets: SavedPreset[]; albums:Album[] }> { + const directory = await readDirectory(archive); + const manifestEntry = directory.get('manifest.json'); + if (!manifestEntry) throw new Error('The backup does not contain a library manifest.'); + if (manifestEntry.size > 32 * 1024 * 1024) throw new Error('Backup manifest is too large.'); + const manifest = JSON.parse(await (await zipEntryBlob(archive, manifestEntry)).text()) as Manifest; + if (!manifest || manifest.format !== 'yue2-library-backup' || ![1,2].includes(manifest.version) || !Array.isArray(manifest.songs)) { + throw new Error('This YuE2 backup version is not supported.'); + } + if (!manifest.settings || typeof manifest.settings !== 'object' || Array.isArray(manifest.settings)) { + throw new Error('The backup contains invalid settings.'); + } + const settings: Record = {}; + for (const key of BACKUP_SETTINGS) { + if (!Object.hasOwn(manifest.settings,key)) continue; + const raw = manifest.settings[key]; + if (typeof raw !== 'string') throw new Error(`Invalid backup setting: ${key}`); + if (key === 'yue2') { + const saved = JSON.parse(raw); if (!object(saved)) throw new Error('Invalid saved Studio settings.'); + saved.request = validRequest(saved.request ?? {}); + settings[key] = JSON.stringify(saved); continue; + } + if (key.endsWith('-v1') || key === 'yue2-music-styles') { + const parsed = JSON.parse(raw); + if (key === 'yue2-style-mix-v1' ? !object(parsed) : !Array.isArray(parsed)) throw new Error(`Invalid backup setting: ${key}`); + } + if (key === 'yue2-theme' && !['studio','dark','mint','cyberpunk','colorful','burnt-orange'].includes(raw)) throw new Error('Invalid backup theme.'); + if (key === 'yue2-production-mode' && !['auto','manual'].includes(raw)) throw new Error('Invalid backup production mode.'); + settings[key] = raw; + } + const presets = manifest.version === 2 ? validatePresets(manifest.presets) : []; + const songs: Song[] = []; + for (const record of manifest.songs) { + if (!record || typeof record.data !== 'object' || !record.data || !record.media || typeof record.media !== 'object') { + throw new Error('The backup contains an invalid song record.'); + } + const song = { ...record.data } as unknown as Song; + for (const field of MEDIA_FIELDS) { + const media = record.media[field]; + if (media) { + if (typeof media.path !== 'string' || typeof media.type !== 'string') throw new Error('The backup contains invalid media metadata.'); + const entry = directory.get(media.path); + if (!entry) throw new Error(`The backup is missing ${media.path}.`); + const bytes = await zipEntryBlob(archive, entry); + (song as unknown as Record)[field] = new Blob([bytes], { type: media.type }); + } + } + songs.push(validSong(song)); + } + const albums:Album[]=[]; + if(manifest.albums!==undefined&&!Array.isArray(manifest.albums))throw new Error('Invalid album list.'); + for(const entry of manifest.albums??[]) {const album=validateAlbum(entry.data);if(entry.cover){const record=directory.get(entry.cover);if(!record)throw new Error('Album cover missing.');album.cover=new Blob([await zipEntryBlob(archive,record)],{type:'image/png'});}albums.push(album);} + return { songs, settings, presets, albums }; +} diff --git a/tools/webui/src/lib/comfy-art.ts b/tools/webui/src/lib/comfy-art.ts new file mode 100644 index 0000000..0a06d26 --- /dev/null +++ b/tools/webui/src/lib/comfy-art.ts @@ -0,0 +1,70 @@ +import type { ArtModels } from './album-types.js'; + +type NodeSpec = { input?: { required?: Record; optional?: Record } }; +export type NodeInfo = Record; +const nodes = ['UnetLoaderGGUF','CLIPLoader','VAELoader','TextEncodeQwenImage21','KSampler','VAEDecode','SaveImage','LoadImage']; + +async function api(path: string, init?: RequestInit): Promise { + const response = await fetch(`comfy/${path}`, { ...init, signal: init?.signal ? AbortSignal.any([init.signal, AbortSignal.timeout(30000)]) : AbortSignal.timeout(30000) }); + if (!response.ok) throw new Error(`Artwork service: ${response.status} ${(await response.text()).slice(0,350)}`); + return response; +} +export function availableArtModels(info: NodeInfo): ArtModels { + const missing = nodes.filter(name => !info[name]); + if (missing.length) throw new Error(`ComfyUI needs Qwen 2.1 support and its GGUF loader. Missing: ${missing.join(', ')}`); + function choose(node: string, field: string, pattern: RegExp) { + const values = info[node]?.input?.required?.[field]?.[0]; + const options = Array.isArray(values) ? values.filter((v): v is string => typeof v === 'string') : []; + const match = options.find(name => pattern.test(name)); + if (!match) throw new Error(`Missing compatible Qwen 2.1 file for ${field}. No models are downloaded automatically.`); + return match; + } + return { diffusion: choose('UnetLoaderGGUF','unet_name',/qwen[-_]image[-_]?2[._]1.*Q4_K_M/i), + encoder: choose('CLIPLoader','clip_name',/qwen3vl.*8b.*int8/i), vae: choose('VAELoader','vae_name',/qwen_image_2[._]1_vae/i) }; +} +export async function checkArtwork(): Promise { return availableArtModels(await (await api('object_info')).json()); } +export async function ensureComfyIdle() { + const queue = await (await api('queue')).json(); + if (queue.queue_running?.length || queue.queue_pending?.length) throw new Error('ComfyUI has another queued/running task. Wait for it to finish before starting artwork.'); +} +export async function freeArtworkMemory() { + await ensureComfyIdle(); + await api('free', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ unload_models: true, free_memory: true }) }); +} +export function artworkGraph(models: ArtModels, prompt: string, seed: number, prefix: string, reference?: string) { + const graph: Record }> = { + '1': { class_type: 'UnetLoaderGGUF', inputs: { unet_name: models.diffusion } }, + '2': { class_type: 'CLIPLoader', inputs: { clip_name: models.encoder, type: 'qwen_image', device: 'cpu' } }, + '3': { class_type: 'VAELoader', inputs: { vae_name: models.vae } }, + '4': { class_type: 'TextEncodeQwenImage21', inputs: { clip: ['2',0], vae: ['3',0], prompt, negative_prompt: '', resolution: 1024 } }, + '6': { class_type: 'KSampler', inputs: { model: ['1',0], seed, steps: 25, cfg: reference ? 4 : 1, sampler_name: 'euler', scheduler: 'simple', positive: ['4',0], negative: ['4',1], latent_image: ['4',2], denoise: 1 } }, + '7': { class_type: 'VAEDecode', inputs: { samples: ['6',0], vae: ['3',0] } }, + '8': { class_type: 'SaveImage', inputs: { images: ['7',0], filename_prefix: prefix } } + }; + if (reference) { graph['9'] = { class_type: 'LoadImage', inputs: { image: reference } }; graph['4'].inputs['images.image_1'] = ['9',0]; } + return graph; +} +export async function submitArtwork(models: ArtModels, prompt: string, seed: number, prefix: string, reference?: string): Promise { + await ensureComfyIdle(); + const data = await (await api('prompt', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ prompt: artworkGraph(models, prompt, seed, prefix, reference), client_id: 'yue2-album' }) })).json(); + if (!data.prompt_id) throw new Error('Artwork was not accepted by ComfyUI.'); + return data.prompt_id; +} +export async function artworkResult(id: string): Promise { + const history = await (await api(`history/${encodeURIComponent(id)}`)).json(); + const item = history[id]; + if (!item) { + const queue = await (await api('queue')).json(); + if (![...(queue.queue_running || []), ...(queue.queue_pending || [])].some((entry: unknown[]) => entry[1] === id)) throw new Error('Artwork job missing after ComfyUI restart. Use Retry artwork to start a new image.'); + return null; + } + if (item.status?.status_str === 'error') throw new Error(`Artwork failed: ${JSON.stringify(item.status.messages).slice(-500)}. Use Retry artwork to start a new image.`); + const image = item.outputs?.['8']?.images?.[0]; + if (!image) { if (item.status?.completed) throw new Error('Artwork job produced no image.'); return null; } + return (await api(`view?${new URLSearchParams({ filename: image.filename, subfolder: image.subfolder || '', type: image.type || 'output' })}`)).blob(); +} +export async function uploadReference(cover: Blob, albumId: string): Promise { + const form = new FormData(); form.append('image', cover, `yue2-album-${albumId}.png`); form.append('type', 'input'); form.append('overwrite', 'false'); + const result = await (await api('upload/image', { method: 'POST', body: form })).json(); + return `${result.subfolder ? result.subfolder + '/' : ''}${result.name} [input]`; +} diff --git a/tools/webui/src/lib/completed-tracks.ts b/tools/webui/src/lib/completed-tracks.ts new file mode 100644 index 0000000..c5103bc --- /dev/null +++ b/tools/webui/src/lib/completed-tracks.ts @@ -0,0 +1,16 @@ +import type { JobTrack } from './api.js'; + +// Replay requests omit default values, including mastering_profile: 'off'. +// The server emits each dry take immediately before its mastered version. +export function completedTracks(tracks: JobTrack[]): (JobTrack & { originalAudio?: Blob })[] { + const result: (JobTrack & { originalAudio?: Blob })[] = []; + for (let i = 0; i < tracks.length; i++) { + const track = tracks[i]; + const next = tracks[i + 1]; + if ((track.request.mastering_profile ?? 'off') === 'off' && next?.request.mastering_profile && next.request.mastering_profile !== 'off') { + result.push({ ...next, originalAudio: track.audio }); + i++; + } else result.push(track); + } + return result; +} diff --git a/tools/webui/src/lib/config.ts b/tools/webui/src/lib/config.ts index c820cd6..1c38185 100644 --- a/tools/webui/src/lib/config.ts +++ b/tools/webui/src/lib/config.ts @@ -8,7 +8,7 @@ export const WAVEFORM_HEIGHT = 64; export const WAVEFORM_BINS = 4096; // audio output formats (mirror request.h) -export const OUTPUT_FORMATS = ['mp3', 'wav16', 'wav24', 'wav32'] as const; +export const OUTPUT_FORMATS = ['mp3', 'wav16', 'wav24', 'wav32', 'mp4'] as const; // Chain of thought modes of the protocol, a closed set the checkpoint freezes export const COT_FULL = 'full'; diff --git a/tools/webui/src/lib/coordination.ts b/tools/webui/src/lib/coordination.ts new file mode 100644 index 0000000..d4532a6 --- /dev/null +++ b/tools/webui/src/lib/coordination.ts @@ -0,0 +1,5 @@ +// Browser-owned locks are released automatically when a tab crashes/closes. +export async function withStudioLock(work: () => Promise): Promise<{ acquired: boolean; value?: T }> { + if (!navigator.locks) throw new Error('This browser cannot coordinate safe saves. Open Studio in an up-to-date browser on localhost.'); + return navigator.locks.request('yue2-studio-operation', {mode:'exclusive',ifAvailable:true}, async lock => lock ? {acquired:true,value:await work()} : {acquired:false}); +} diff --git a/tools/webui/src/lib/db.ts b/tools/webui/src/lib/db.ts index e7f5974..38a2857 100644 --- a/tools/webui/src/lib/db.ts +++ b/tools/webui/src/lib/db.ts @@ -1,7 +1,7 @@ import type { Song, Yue2Request } from './types.js'; const DB_NAME = 'yue2-songs'; -const DB_VERSION = 1; +const DB_VERSION = 2; const STORE = 'songs'; // Module-scoped singleton: one IDB connection for the whole page lifetime. @@ -13,13 +13,16 @@ function open(): Promise { if (dbPromise) return dbPromise; dbPromise = new Promise((resolve, reject) => { const req = indexedDB.open(DB_NAME, DB_VERSION); + let blocked = false; + req.onblocked = () => { blocked = true; dbPromise = null; reject(new Error('Close older Studio tabs, then reload to upgrade the library safely.')); }; req.onupgradeneeded = () => { const db = req.result; if (!db.objectStoreNames.contains(STORE)) { db.createObjectStore(STORE, { keyPath: 'id', autoIncrement: true }); } + for (const name of ['pending','landed']) if (!db.objectStoreNames.contains(name)) db.createObjectStore(name, {keyPath:'id'}); }; - req.onsuccess = () => resolve(req.result); + req.onsuccess = () => { if (blocked) { req.result.close(); return; } req.result.onversionchange = () => { req.result.close(); dbPromise = null; }; resolve(req.result); }; req.onerror = () => { dbPromise = null; reject(req.error); @@ -33,52 +36,158 @@ function tx(mode: IDBTransactionMode, fn: (store: IDBObjectStore) => IDBReque return open().then( (db) => new Promise((resolve, reject) => { - const store = db.transaction(STORE, mode).objectStore(STORE); - const req = fn(store); - req.onsuccess = () => resolve(req.result); - req.onerror = () => reject(req.error); + const transaction = db.transaction(STORE, mode); + const req = fn(transaction.objectStore(STORE)); + transaction.oncomplete = () => resolve(req.result); + transaction.onabort = () => reject(transaction.error || new Error('Library transaction aborted')); + transaction.onerror = () => reject(transaction.error || req.error); }) ); } export function putSong(song: Song): Promise { + if (song.id != null) return updateSong(song.id, song).then(() => song.id!); // IDBValidKey -> number (autoIncrement) - return tx('readwrite', (s) => s.put(song)) as Promise; + return (tx('readwrite', (s) => s.put(song)) as Promise).then(id => { announceLibraryChange(); return id; }); } +const changes = typeof BroadcastChannel !== 'undefined' ? new BroadcastChannel('yue2-library') : null; +export function announceLibraryChange() { changes?.postMessage('changed'); } +changes?.addEventListener('message', () => window.dispatchEvent(new Event('yue2-library-changed'))); + +export async function updateSong(id: number, patch: Partial, expectedRevision?: number): Promise { + const db = await open(); + return new Promise((resolve, reject) => { + const transaction = db.transaction(STORE, 'readwrite'); + const store = transaction.objectStore(STORE); + let saved: Song; + let failure: Error | undefined; + const request = store.get(id); + request.onsuccess = () => { + if (!request.result) { failure = new Error('This track was deleted. Its operation result was not restored over your library.'); transaction.abort(); return; } + if (expectedRevision !== undefined && (request.result.mediaRevision ?? 0) !== expectedRevision) { failure = new Error('Track media changed while this operation was running. Retry with the current version.'); transaction.abort(); return; } + saved = {...request.result, ...patch, id}; + if (patch.audio || patch.artwork) { saved.mediaRevision = (request.result.mediaRevision ?? 0) + 1; saved.videoOutdated = !!request.result.video || !!request.result.videoOutdated; } + if (patch.video) { saved.videoRevision = saved.mediaRevision ?? 0; saved.videoOutdated = false; } + if (patch.audio && patch.audio !== request.result.audio) { saved.peaks = undefined; saved.duration = 0; saved.video = undefined; } + if (patch.artwork && !patch.video) saved.video = undefined; + try { store.put(saved); } catch (error) { failure = error as Error; transaction.abort(); } + }; + transaction.oncomplete = () => { announceLibraryChange(); resolve(saved); }; + transaction.onabort = () => reject(failure || transaction.error || new Error('Could not save track changes.')); + transaction.onerror = () => reject(transaction.error || new Error('Could not save track changes.')); + }); +} + +// Commit the entire result together; retrying recovery must not duplicate tracks. +export async function putJobSongs(jobId: string, songs: Song[]): Promise { + const db = await open(); + return new Promise((resolve, reject) => { + const transaction = db.transaction([STORE,'landed'], 'readwrite'); + const store = transaction.objectStore(STORE); + let saved: Song[] = []; + transaction.oncomplete = () => { announceLibraryChange(); resolve(saved); }; + transaction.onabort = () => reject(transaction.error || new Error('Could not save completed song; recovery retained')); + transaction.onerror = () => reject(transaction.error || new Error('Library storage failed')); + const landed = transaction.objectStore('landed').get(jobId); + landed.onsuccess = () => { + const existing = store.getAll(); + existing.onsuccess = () => { + saved = existing.result.filter((song: Song) => song.sourceJob === jobId); + if (landed.result || saved.length) { transaction.objectStore('landed').put({id:jobId}); return; } + for (const [sourceIndex,song] of songs.entries()) { const record = {...song,sourceJob:jobId,sourceIndex}; const add = store.add(record); add.onsuccess = () => { saved.push({...record,id:add.result as number}); }; } + transaction.objectStore('landed').put({id:jobId}); + }; + }; + }); +} + +export function getSong(id: number): Promise { return tx('readonly', s => s.get(id)); } + export function getAllSongs(): Promise { return tx('readonly', (s) => s.getAll()); } +// Replace the library in one IndexedDB transaction. Imported IDs are omitted +// so the store assigns fresh keys without risking collisions with old records. +export async function replaceAllSongs(songs: Song[]): Promise { + const db = await open(); + return new Promise((resolve, reject) => { + const transaction = db.transaction(STORE, 'readwrite'); + const store = transaction.objectStore(STORE); + store.clear(); + for (const song of songs) { + const { id: _id, peaks: _peaks, ...record } = song; + store.add(record); + } + transaction.oncomplete = () => { announceLibraryChange(); resolve(); }; + transaction.onabort = () => reject(transaction.error || new Error('Library restore was rolled back')); + transaction.onerror = () => reject(transaction.error || new Error('Library restore failed')); + }); +} + export function deleteSong(id: number): Promise { - return tx('readwrite', (s) => s.delete(id)) as Promise; + return (tx('readwrite', (s) => s.delete(id)) as Promise).then(() => announceLibraryChange()); +} +export async function deleteSongs(ids: number[]): Promise { + const db = await open(); + await new Promise((resolve,reject) => { + const transaction = db.transaction(STORE,'readwrite'); + for (const id of ids) transaction.objectStore(STORE).delete(id); + transaction.oncomplete = () => resolve(); + transaction.onabort = transaction.onerror = () => reject(transaction.error || new Error('No tracks were deleted; library update failed.')); + }); + announceLibraryChange(); } // pending job: saved before polling starts, cleared on completion, // so a page reload resumes polling and lands the finished song. export interface PendingJob { + queueOrder?: number; + submitted?: boolean; + artworkJobs?: Record; + takeGroup?: string; id: string; name: string; request: Yue2Request; + // delivery format at submit, including 'mp4' (muxed client-side after the + // audio lands; the request itself always carries an audio encoding). + format?: string; + // style blend snapshot taken at submit so the landed song can name the + // styles even if the form (or a page reload) moves on before it lands. + musicStyles?: { id: string; weight: number }[]; + lyricStyles?: { id: string; weight: number }[]; } const JOB_KEY = 'yue2-job-synth'; +let checkedLegacyJob = false; -export function saveJob(job: PendingJob) { - localStorage.setItem(JOB_KEY, JSON.stringify(job)); +export async function saveJob(job: PendingJob) { + const db = await open(); + await new Promise((resolve,reject) => { const transaction = db.transaction('pending','readwrite'); transaction.objectStore('pending').put(job); transaction.oncomplete = () => resolve(); transaction.onabort = transaction.onerror = () => reject(transaction.error || new Error('Cannot save recovery information; generation was not started.')); }); } -export function loadJob(): PendingJob | null { - const raw = localStorage.getItem(JOB_KEY); - if (!raw) return null; - try { - return JSON.parse(raw); - } catch { - return null; +export async function loadJob(): Promise { + let legacy: string | null = null; + try { if (!checkedLegacyJob) legacy = localStorage.getItem(JOB_KEY); } catch { /* IndexedDB recovery remains available. */ } + if (legacy) { + let job: PendingJob | undefined; + try { const parsed = JSON.parse(legacy); if (typeof parsed?.id === 'string' && parsed.request) job = {...parsed,submitted:true}; } catch { /* Invalid legacy record. */ } + if (job) await saveJob(job); + try { localStorage.removeItem(JOB_KEY); } catch { /* Leave legacy copy; deduplication is by ID. */ } } + checkedLegacyJob = true; + const db = await open(); + return new Promise((resolve,reject) => { const request = db.transaction('pending').objectStore('pending').getAll(); request.onsuccess = () => resolve(request.result.sort((a:PendingJob,b:PendingJob)=>(a.queueOrder ?? 0)-(b.queueOrder ?? 0))[0] ?? null); request.onerror = () => reject(request.error); }); +} + +export async function clearJob(id: string) { + const db = await open(); + await new Promise((resolve,reject) => { const transaction = db.transaction('pending','readwrite'); transaction.objectStore('pending').delete(id); transaction.oncomplete = () => resolve(); transaction.onabort = transaction.onerror = () => reject(transaction.error); }); } -export function clearJob() { - localStorage.removeItem(JOB_KEY); +export async function cancelQueuedTakes() { + const db=await open(); + await new Promise((resolve,reject)=>{ const t=db.transaction('pending','readwrite'),s=t.objectStore('pending'),q=s.getAll(); q.onsuccess=()=>{for(const job of q.result) if(!job.submitted)s.delete(job.id);};t.oncomplete=()=>resolve();t.onabort=()=>reject(t.error); }); } diff --git a/tools/webui/src/lib/fields.ts b/tools/webui/src/lib/fields.ts index ad3c159..feb71f9 100644 --- a/tools/webui/src/lib/fields.ts +++ b/tools/webui/src/lib/fields.ts @@ -38,7 +38,8 @@ export const FIELDS: readonly FieldDef[] = [ { key: 'synth_batch_size', section: 'post', type: 'num' }, { key: 'seed', section: 'post', type: 'num' }, { key: 'peak_clip', section: 'post', type: 'num' }, - { key: 'mp3_bitrate', section: 'post', type: 'num' } + { key: 'mp3_bitrate', section: 'post', type: 'num' }, + { key: 'mastering_profile', section: 'post', type: 'str' } ]; // the seven knobs of a sampling preset, same order as the protocol @@ -128,6 +129,7 @@ export function emptyRequest(): Yue2Request { for (const f of FIELDS) { set(r, f.key, f.type === 'str' ? '' : undefined); } + r.mastering_profile = 'off'; return r; } @@ -137,6 +139,7 @@ export function clearSection(r: Yue2Request, section: FieldSection): void { if (f.section !== section) continue; set(r, f.key, f.type === 'str' ? '' : undefined); } + if (section === 'post') r.mastering_profile = 'off'; for (const s of SAMPLING_FIELDS) { if (s.section !== section) continue; set(r, s.key, {}); diff --git a/tools/webui/src/lib/generation-request.ts b/tools/webui/src/lib/generation-request.ts new file mode 100644 index 0000000..d8f33f3 --- /dev/null +++ b/tools/webui/src/lib/generation-request.ts @@ -0,0 +1,15 @@ +import type { Yue2Request } from './types.js'; + +export function prepareGeneration(request: Yue2Request, fresh: boolean): Yue2Request { + const next = { ...request }; + if (fresh) { + // Cached scores bypass composition; cached codes bypass performance generation. + delete next.abc; + delete next.semantic_tokens; + } + for (const key of ['lm_seed', 'seed'] as const) { + const seed = next[key]; + if (fresh || seed == null || seed < 0) next[key] = crypto.getRandomValues(new Uint32Array(1))[0]; + } + return next; +} diff --git a/tools/webui/src/lib/lyric-styles.ts b/tools/webui/src/lib/lyric-styles.ts new file mode 100644 index 0000000..6932752 --- /dev/null +++ b/tools/webui/src/lib/lyric-styles.ts @@ -0,0 +1,45 @@ +import { parse } from 'yaml'; + +const sources = import.meta.glob('../../../../lyric_styles/*.yaml', { + query: '?raw', import: 'default', eager: true +}) as Record; + +const markdownSources = import.meta.glob('../../../../lyric_styles/hiphop_30/*.md', { + query: '?raw', import: 'default', eager: true +}) as Record; + +export const LYRIC_PACK_STYLES = Object.entries(markdownSources).map(([path, instructions]) => { + const filename = path.split('/').pop()!.replace(/\.md$/, ''); + const name = instructions.match(/^#\s+(.+)$/m)?.[1].trim() || filename; + const description = instructions.match(/## Purpose\s+([^\r\n]+)/)?.[1].trim() || ''; + return { id: `pack_${filename}`, name, description, instructions: instructions.trim() }; +}).sort((a, b) => a.id.localeCompare(b.id)); + +export const LEGACY_LYRIC_CHOICES = [ + ['rapid_fire', 'Rapid-Fire Momentum'], ['syllable_dense', 'Technical Rhyme Architecture'], ['chilled_conversational', 'Chilled Conversational Flow'], + ['punchline', 'Bar-Heavy Punchline Craft'], ['cinematic_story', 'Cinematic Storytelling'], ['melodic_emotional', 'Melodic Emotional Anchors'], + ['raw_direct', 'Raw Direct Precision'], ['abstract_psychedelic', 'Abstract Dream Logic'], ['minimalist_space', 'Minimal Space-Driven Writing'], ['progressive_switching', 'Progressive Flow Switching'] +] as const; +export const LYRIC_STYLE_CHOICES: ReadonlyArray = [ + ...LYRIC_PACK_STYLES.map(style => [style.id, style.name] as const), ...LEGACY_LYRIC_CHOICES +]; + +// id -> display name across packs and legacy engines. Unknown ids fall back +// to the raw id at the call site. +export const LYRIC_STYLE_BY_ID: Record = Object.fromEntries(LYRIC_STYLE_CHOICES); + +export function lyricStyleInstructions(id: string): string { + const profile = LYRIC_PACK_STYLES.find(style => style.id === id); + if (profile) return profile.instructions; + for (const [path, text] of Object.entries(sources)) { + if (path.endsWith('00_STYLE_INDEX.yaml')) continue; + const data = parse(text); + if (data?.style?.id !== id) continue; + for (const section of ['identity', 'rhythm', 'rhyme', 'language', 'delivery', 'composition', + 'storytelling', 'technical_rules', 'anti_patterns', 'generation_guidance', 'adaptation', 'metrics']) { + if (!data[section]) throw new Error(`Invalid lyric engine ${id}: missing ${section}`); + } + return JSON.stringify(data); + } + throw new Error(`Lyric engine not found: ${id}`); +} diff --git a/tools/webui/src/lib/ollama.ts b/tools/webui/src/lib/ollama.ts new file mode 100644 index 0000000..0c4e854 --- /dev/null +++ b/tools/webui/src/lib/ollama.ts @@ -0,0 +1,29 @@ +export interface LyricModel { name: string; size: number } +const endpoint = 'ollama'; + +export async function discoverLyricModels(): Promise { + const response = await fetch(`${endpoint}/api/tags`, { signal: AbortSignal.timeout(10000) }); + if (!response.ok) throw new Error(`Ollama model discovery failed (${response.status})`); + const data = await response.json(); + return (data.models || []).filter((m: LyricModel) => typeof m.name === 'string') + .sort((a: LyricModel, b: LyricModel) => a.size - b.size); +} + +export async function writeLyrics(model: string, prompt: string, signal: AbortSignal, onStatus?: (message:string)=>void): Promise { + const request={model,prompt,stream:false,think:false,keep_alive:0,options:{temperature:.82,num_ctx:8192,num_predict:2048,num_gpu:undefined as number|undefined}}; + for(let attempt=0;attempt<2;attempt++){ + const response=await fetch(`${endpoint}/api/generate`,{method:'POST',signal,headers:{'Content-Type':'application/json'},body:JSON.stringify(request)}); + const data=await response.json(); + if(!response.ok){ + const error=String(data.error||`Ollama failed (${response.status})`); + if(attempt===0&&/CUDA.*(initialization failed|out of memory)|CUDA error/i.test(error)){ + signal.throwIfAborted();request.options.num_gpu=0;onStatus?.('Ollama GPU unavailable. Retrying lyrics on CPU; this may take longer.');continue; + } + throw new Error(error); + } + const lyrics=typeof data.response==='string'?data.response.trim():''; + if(!lyrics)throw new Error('Ollama returned no lyrics. Existing lyrics preserved.'); + return lyrics; + } + throw new Error('Ollama could not generate lyrics.'); +} diff --git a/tools/webui/src/lib/producer.ts b/tools/webui/src/lib/producer.ts new file mode 100644 index 0000000..ad1ed02 --- /dev/null +++ b/tools/webui/src/lib/producer.ts @@ -0,0 +1,84 @@ +import type { Yue2Request } from './types.js'; + +export interface ProducerSettings { + enabled: boolean; + singing: number; + presence: number; + voices: number; + voiceProfiles: string[]; + voiceLocked: boolean; + bpm: number; + structure: string; + takes: number; +} +export const defaultProducer: ProducerSettings = { + enabled: true, singing: 75, presence: 75, voices: 1, + voiceProfiles: ['Warm clear mid-range lead, natural phrasing', 'Bright airy upper voice', 'Low resonant voice', 'Soft textured voice'], + voiceLocked: false, bpm: 100, structure: '', takes: 1 +}; +export function cleanProducer(value: Partial = {}): ProducerSettings { + const number = (v: unknown, fallback: number, min: number, max: number) => typeof v === 'number' && Number.isFinite(v) ? Math.round(Math.max(min, Math.min(max, v))) : fallback; + return { + enabled: value.enabled !== false, + singing: number(value.singing, 75, 0, 100), presence: number(value.presence, 75, 0, 100), + voices: number(value.voices, 1, 1, 4), bpm: number(value.bpm, 100, 40, 220), takes: value.takes === 3 ? 3 : 1, + voiceLocked: value.voiceLocked === true, + voiceProfiles: defaultProducer.voiceProfiles.map((fallback, i) => typeof value.voiceProfiles?.[i] === 'string' ? value.voiceProfiles[i].slice(0, 240) : fallback), + structure: typeof value.structure === 'string' ? value.structure.slice(0, 2000) : '' + }; +} +export function delivery(p: ProducerSettings): string { + if (p.presence === 0) return 'Instrumental only; no singing, speech, humming or vocal samples.'; + if (p.singing === 0) return 'Rhythmic rap or spoken delivery throughout; no melodic singing.'; + if (p.singing === 100) return 'Fully melodic singing throughout vocal sections; no rap or spoken delivery.'; + return p.singing < 35 ? 'Mostly rhythmic rap verses, with a short melodic sung hook.' : p.singing < 70 + ? 'Rap or rhythmic spoken verses contrasting with clearly sung melodic choruses.' + : 'Mostly melodic singing, with occasional rhythmic spoken phrases in verses; fully sung choruses.'; +} +export function songPlan(p: ProducerSettings): string { + if (p.structure.trim()) return p.structure.trim(); + if (p.presence === 0) return 'Instrumental intro → main theme → contrasting theme → breakdown → developed main theme → resolved outro'; + const verse = p.singing < 70 ? 'rhythmic verse' : 'restrained sung verse'; + const chorus = p.singing === 0 ? 'rhythmic hook' : 'memorable sung chorus'; + const breakSection = p.presence < 50 ? 'extended instrumental break' : 'short instrumental turnaround'; + return `Instrumental intro → ${verse} → ${chorus} → ${breakSection} → contrasting second verse → sparse bridge → fuller final ${chorus} → resolved outro`; +} +export function producerDirection(p: ProducerSettings): string { + const parts = [`Tempo: approximately ${p.bpm} BPM.`, delivery(p), `Arrangement: ${songPlan(p)}.`]; + if (p.presence > 0) { + parts.push(`Singing balance: approximately ${p.singing}% melodic singing and ${100 - p.singing}% rap or spoken phrasing within vocal passages.`); + parts.push(`Vocal presence: approximately ${p.presence}% of the arrangement, leaving ${100 - p.presence}% for instrumental space and breaths.`); + parts.push(`Requested cast: ${p.voices} distinct vocal ${p.voices === 1 ? 'voice; solo lead' : 'voices; alternate lead sections and join on the final hook'}.`); + parts.push(...p.voiceProfiles.slice(0, p.voices).map((voice, i) => `Voice ${i + 1}: ${voice.trim() || defaultProducer.voiceProfiles[i]}.`)); + parts.push('Keep vocal character consistent within the song. Clear diction, natural breaths, dynamic contrast between sections.'); + } + return parts.join('\n'); +} +export function lyricGuidance(p: ProducerSettings, style: string, duration?: number): string { + return `Musical direction: ${style}\n${producerDirection(p)}\nTarget duration: ${duration && duration > 0 ? `${duration} seconds` : 'choose a natural length for the plan'}.\nFit lyric density to tempo and delivery. Use natural word stress, singable vowels and breathing space. Sung lines should be less dense than rap lines. Build a memorable repeating hook, develop the second verse, and vary the final chorus deliberately. Use bracketed section labels; keep production instructions out of performed lines. For multiple voices, identify the voice in section labels. Instrumental sections contain no words. The arrangement and delivery instructions take priority over conflicting lyric-style density rules. Return only the final lyrics.`; +} +export function estimatedDuration(p: ProducerSettings, lyrics: string): number { + // Approximate 4/4 phrase budget, not audio alignment. Labels never count as words. + const lines = lyrics.replace(/\[[^\]]*\]/g, '').split(/\n/).map(s => s.trim()).filter(Boolean); + if (!lines.length || p.presence === 0) return 180; + const wordsPerBar = 9 - p.singing / 100 * 5; + const bars = lines.reduce((sum, line) => sum + Math.max(1, Math.ceil(line.split(/\s+/).length / wordsPerBar)), 0); + return Math.min(600, Math.max(30, Math.ceil(bars * 240 / p.bpm / Math.max(.15, p.presence / 100) + 8 * 240 / p.bpm))); +} +export function applyProducer(request: Yue2Request, settings: ProducerSettings): Yue2Request { + const p = cleanProducer(settings); + if (!p.enabled) return request; + const style = request.style.replace(/(?:^|\n\n)Song direction:\n[\s\S]*$/, '').trim(); + return { ...request, style: `${style}\n\nSong direction:\n${producerDirection(p)}`.trim(), + lyrics: p.presence === 0 ? '' : request.lyrics, + duration: request.duration === 0 ? estimatedDuration(p, request.lyrics || '') : request.duration }; +} +export function lyricWarnings(p: ProducerSettings, lyrics: string): string[] { + if (!p.enabled) return []; + if (p.presence === 0) return lyrics.trim() ? ['Instrumental mode omits lyrics from this render; your editor text is preserved.'] : []; + if (!lyrics.trim()) return ['Add lyrics for the requested vocal performance.']; + const lines = lyrics.replace(/\[[^\]]*\]/g, '').split(/\n/).filter(s => s.trim()); + const dense = lines.filter(s => s.trim().split(/\s+/).length > (p.singing >= 70 ? 14 : 24)).length; + return [! /\[(verse|chorus|hook)/i.test(lyrics) ? 'Section labels would help connect these lyrics to the arrangement.' : '', + dense ? `${dense} long lyric line${dense > 1 ? 's' : ''}: review phrasing and breathing space.` : ''].filter(Boolean); +} diff --git a/tools/webui/src/lib/remix.ts b/tools/webui/src/lib/remix.ts new file mode 100644 index 0000000..4105ab4 --- /dev/null +++ b/tools/webui/src/lib/remix.ts @@ -0,0 +1,25 @@ +import type { Song, Yue2Request } from './types.js'; + +export interface RemixDraft { + sourceName: string; + amount: number; + request: Yue2Request; +} + +export function canRemix(song: Song): boolean { + return !!song.request.semantic_tokens?.trim() && + [song.request.lm_seed, song.request.seed].every(seed => typeof seed === 'number' && Number.isFinite(seed) && seed >= 0); +} + +export function remixRequest(source: Yue2Request, amount: number, defaults?: Yue2Request): Yue2Request { + const value = Math.max(0, Math.min(100, Math.round(Number.isFinite(amount) ? amount : 0))); + const result: Yue2Request = { ...source, abc_sampling: { ...source.abc_sampling }, semantic_sampling: { ...source.semantic_sampling }, lm_batch_size: 1, synth_batch_size: 1 }; + if (value > 0) { + // Replay codes freeze the performance. Regenerate them while holding the + // source score and both seeds fixed. Sampling freedom is not audio distance. + delete result.semantic_tokens; + const base = source.semantic_sampling?.temperature ?? defaults?.semantic_sampling?.temperature ?? 1; + result.semantic_sampling.temperature = Math.round((base + value / 100 * 0.5) * 1000) / 1000; + } + return result; +} diff --git a/tools/webui/src/lib/saved-presets.ts b/tools/webui/src/lib/saved-presets.ts new file mode 100644 index 0000000..53789d8 --- /dev/null +++ b/tools/webui/src/lib/saved-presets.ts @@ -0,0 +1,45 @@ +import { validRequest } from './validation.js'; +import { cleanProducer, type ProducerSettings } from './producer.js'; +export type PresetData = { ids: string[]; weights: Record; prompt?: string; configuration?: {request: import('./types.js').Yue2Request; producer: ProducerSettings; format:string; mix?: string; automatic?:boolean; freshComposition?:boolean} }; +export type SavedPreset = { name: string; kind: 'music' | 'lyric' | 'studio'; data: PresetData }; +export function validatePresets(value: unknown): SavedPreset[] { + if (!Array.isArray(value) || value.length > 1000) throw new Error('Invalid saved preset list.'); + const names = new Set(); + return value.map(p => { + if (!p || typeof p.name !== 'string' || !p.name.trim() || new TextEncoder().encode(p.name).length > 200 || /[<>:"/\\|?*\x00-\x1f]/.test(p.name) || /[. ]$/.test(p.name) || !['music','lyric','studio'].includes(p.kind) || !p.data || !Array.isArray(p.data.ids) || p.data.ids.some((id:unknown) => typeof id !== 'string') || !p.data.weights || typeof p.data.weights !== 'object' || Array.isArray(p.data.weights) || Object.values(p.data.weights).some(v => typeof v !== 'number' || !Number.isFinite(v) || v < 0 || v > 100) || (p.data.prompt !== undefined && typeof p.data.prompt !== 'string')) throw new Error('Invalid saved preset name or style data.'); + const key = `${p.kind}:${p.name.toLowerCase()}`; if (names.has(key)) throw new Error('Duplicate preset name in backup.'); names.add(key); + if (p.kind==='studio') { if (!p.data.configuration || !['mp3','mp4','wav16','wav24','wav32'].includes(p.data.configuration.format)) throw new Error('Invalid Studio configuration.'); p.data.configuration={request:validRequest(p.data.configuration.request),producer:cleanProducer(p.data.configuration.producer),format:p.data.configuration.format,automatic:typeof p.data.configuration.automatic==='boolean'?p.data.configuration.automatic:undefined,freshComposition:typeof p.data.configuration.freshComposition==='boolean'?p.data.configuration.freshComposition:undefined,mix:typeof p.data.configuration.mix==='string'?p.data.configuration.mix:undefined}; } + return {name:p.name,kind:p.kind,data:{ids:p.data.ids,weights:p.data.weights,...(p.kind==='studio'?{configuration:p.data.configuration}:{}),...(p.data.prompt !== undefined ? {prompt:p.data.prompt} : {})}}; + }); +} +export async function listPresets(): Promise { + const response = await fetch('presets'); + if (!response.ok) throw new Error('Could not read the saved_presets folder.'); + return validatePresets(await response.json()); +} + +// Merge restored presets without overwriting newer local presets. Matching +// names with different content receive a new name; a partial failure is safe. +export async function importPresets(presets: SavedPreset[]): Promise { + for (const preset of validatePresets(presets)) { + const existing = await listPresets(); + const match = existing.find(p => p.kind === preset.kind && p.name.toLowerCase() === preset.name.toLowerCase()); + if (match && JSON.stringify(match.data) === JSON.stringify(preset.data)) continue; + let name = preset.name; + for (let index = 2; existing.some(p => p.kind === preset.kind && p.name.toLowerCase() === name.toLowerCase()); index++) name = `${preset.name.slice(0, 35)} (restored ${index})`; + await writePreset({...preset,name}); + } +} +export async function writePreset(preset: SavedPreset, operation: 'save' | 'delete' = 'save', overwrite = false) { + const response = await fetch('presets', { method:'POST', headers:{'Content-Type':'application/json'}, body:JSON.stringify({...preset,operation,overwrite}) }); + if (!response.ok) throw new Error(await response.text() || 'Could not save preset.'); + notifyPresets(); +} + +const channel = typeof window==='undefined' || typeof BroadcastChannel==='undefined'?null:new BroadcastChannel('yue2-presets'); +channel?.addEventListener('message',()=>window.dispatchEvent(new Event('yue2-presets-changed'))); +function notifyPresets(){window.dispatchEvent(new Event('yue2-presets-changed'));channel?.postMessage('changed');} +export async function renamePreset(preset:SavedPreset,oldName:string) { + const response=await fetch('presets',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({...preset,oldName,operation:'rename'})}); + if(!response.ok)throw new Error(await response.text()); notifyPresets(); +} diff --git a/tools/webui/src/lib/scroll-strip.ts b/tools/webui/src/lib/scroll-strip.ts new file mode 100644 index 0000000..dcbbeae --- /dev/null +++ b/tools/webui/src/lib/scroll-strip.ts @@ -0,0 +1,76 @@ +// Native touch scrolling plus mouse dragging, wheel and keyboard navigation. +export function scrollStrip(node: HTMLElement) { + let startX = 0, startScroll = 0, pointer: number | undefined, dragged = false; + function down(event: PointerEvent) { + if (node.scrollWidth <= node.clientWidth) return; + if (event.pointerType !== 'mouse' || event.button !== 0) return; + pointer = event.pointerId; + startX = event.clientX; + startScroll = node.scrollLeft; + dragged = false; + } + function move(event: PointerEvent) { + if (event.pointerId !== pointer) return; + const distance = event.clientX - startX; + if (!dragged && Math.abs(distance) < 6) return; + if (!dragged) { + dragged = true; + node.setPointerCapture(event.pointerId); + node.classList.add('is-dragging'); + } + event.preventDefault(); + node.scrollLeft = startScroll - distance; + } + function up(event: PointerEvent) { + if (event.pointerId !== pointer) return; + if (node.hasPointerCapture(event.pointerId)) node.releasePointerCapture(event.pointerId); + pointer = undefined; + node.classList.remove('is-dragging'); + } + function click(event: MouseEvent) { + if (dragged && event.detail !== 0) { + event.preventDefault(); + event.stopImmediatePropagation(); + } + dragged = false; + } + function wheel(event: WheelEvent) { + if (event.ctrlKey) return; + const delta = (Math.abs(event.deltaX) > Math.abs(event.deltaY) ? event.deltaX : event.deltaY) + * (event.deltaMode === 1 ? 16 : event.deltaMode === 2 ? node.clientWidth : 1); + const before = node.scrollLeft; + node.scrollLeft += delta; + if (node.scrollLeft !== before) event.preventDefault(); + } + function key(event: KeyboardEvent) { + if (event.target !== node) return; + if (node.scrollWidth <= node.clientWidth && node.scrollHeight > node.clientHeight) { + const offsets: Record = { ArrowUp: -120, ArrowDown: 120, Home: -node.scrollHeight, End: node.scrollHeight }; + if (event.key in offsets) { event.preventDefault(); node.scrollTop += offsets[event.key]; } + return; + } + const offsets: Record = { ArrowLeft: -180, ArrowRight: 180, Home: -node.scrollWidth, End: node.scrollWidth }; + if (!(event.key in offsets)) return; + event.preventDefault(); + node.scrollLeft += offsets[event.key]; + } + const noImageDrag = (event: DragEvent) => event.preventDefault(); + node.addEventListener('pointerdown', down); + window.addEventListener('pointermove', move); + window.addEventListener('pointerup', up); + window.addEventListener('pointercancel', up); + node.addEventListener('click', click, true); + node.addEventListener('wheel', wheel, { passive: false }); + node.addEventListener('keydown', key); + node.addEventListener('dragstart', noImageDrag); + return { destroy() { + node.removeEventListener('pointerdown', down); + window.removeEventListener('pointermove', move); + window.removeEventListener('pointerup', up); + window.removeEventListener('pointercancel', up); + node.removeEventListener('click', click, true); + node.removeEventListener('wheel', wheel); + node.removeEventListener('keydown', key); + node.removeEventListener('dragstart', noImageDrag); + } }; +} diff --git a/tools/webui/src/lib/state.svelte.ts b/tools/webui/src/lib/state.svelte.ts index 2fd4984..97adc0d 100644 --- a/tools/webui/src/lib/state.svelte.ts +++ b/tools/webui/src/lib/state.svelte.ts @@ -1,10 +1,22 @@ import type { Yue2Request, Yue2Props, Song } from './types.js'; import { OUTPUT_FORMATS } from './config.js'; import { emptyRequest } from './fields.js'; +import { canRemix, type RemixDraft } from './remix.js'; +import { cleanProducer, type ProducerSettings } from './producer.js'; +import { validRequest, object } from './validation.js'; const STORAGE_KEY = 'yue2'; +let initialStorageWarning = ''; + +// Safe recovery route: clears only UI/request state, preserving pending jobs. The +// IndexedDB song library, model files, and generated audio remain untouched. +if (typeof window !== 'undefined' && new URLSearchParams(window.location.search).get('reset') === '1') { + try { localStorage.removeItem(STORAGE_KEY); } catch { initialStorageWarning = 'Settings storage is unavailable. Changes are not saved.'; } + history.replaceState({}, '', window.location.pathname); +} interface Saved { + producer: ProducerSettings; name: string; volume: number; format: string; @@ -18,19 +30,22 @@ function load(): Saved { const raw = localStorage.getItem(STORAGE_KEY); if (raw) { const parsed = JSON.parse(raw); + if (!object(parsed)) throw new Error('Invalid saved settings'); return { - name: parsed.name || '', - volume: parsed.volume ?? 0.5, - format: OUTPUT_FORMATS.includes(parsed.format) ? parsed.format : 'mp3', - dark: parsed.dark ?? true, - logsOpen: parsed.logsOpen ?? true, - request: parsed.request || emptyRequest() + producer: cleanProducer(parsed.producer || {}), + name: typeof parsed.name === 'string' ? parsed.name : '', + volume: typeof parsed.volume === 'number' && Number.isFinite(parsed.volume) ? Math.max(0, Math.min(1, parsed.volume)) : .5, + format: typeof parsed.format === 'string' && OUTPUT_FORMATS.some(format => format === parsed.format) ? parsed.format : 'mp3', + dark: typeof parsed.dark === 'boolean' ? parsed.dark : true, + logsOpen: typeof parsed.logsOpen === 'boolean' ? parsed.logsOpen : true, + request: validRequest(parsed.request ?? {}) }; } } catch { - // corrupt or unavailable + initialStorageWarning = 'Saved settings could not be loaded. Default settings are in use; your library is unchanged.'; } return { + producer: cleanProducer(), name: '', volume: 0.5, format: 'mp3', @@ -43,12 +58,15 @@ function load(): Saved { const saved = load(); export const app = $state({ + storageWarning: initialStorageWarning, + producer: saved.producer, name: saved.name, volume: saved.volume, format: saved.format, dark: saved.dark, logsOpen: saved.logsOpen, request: saved.request as Yue2Request, + remix: null as RemixDraft | null, songs: [] as Song[], props: null as Yue2Props | null, toast: '' as string, @@ -72,6 +90,8 @@ export function toast(msg: string, ms = 4000, ok = false) { // an empty one: a field the sender omitted reads back as unset instead of // missing, which is what the form binds to. export function setRequest(incoming: Yue2Request) { + incoming = validRequest(incoming); + app.remix = null; const base = emptyRequest(); app.request = { ...base, @@ -81,10 +101,20 @@ export function setRequest(incoming: Yue2Request) { }; } +export function startRemix(song: Song) { + if (!canRemix(song)) { toast('Remix needs a generated track with saved seeds and audio codes.'); return; } + const request = { ...song.request, abc_sampling: { ...song.request.abc_sampling }, semantic_sampling: { ...song.request.semantic_sampling } }; + setRequest(request); + app.name = `${song.name} (Remix)`; + app.format = song.format; + app.remix = { sourceName: song.name, amount: 25, request: $state.snapshot(app.request) }; +} + // persist on every change $effect.root(() => { $effect(() => { const data: Saved = { + producer: app.producer, name: app.name, volume: app.volume, format: app.format, @@ -92,6 +122,14 @@ $effect.root(() => { logsOpen: app.logsOpen, request: app.request }; - localStorage.setItem(STORAGE_KEY, JSON.stringify(data)); + try { localStorage.setItem(STORAGE_KEY, JSON.stringify(data)); } + catch { app.storageWarning = 'Settings could not be saved. Free browser storage or allow local storage, then retry. Your current settings remain usable.'; } }); }); + +export function retrySettingsStorage() { + try { + localStorage.setItem(STORAGE_KEY, JSON.stringify({producer:app.producer,name:app.name,volume:app.volume,format:app.format,dark:app.dark,logsOpen:app.logsOpen,request:app.request})); + app.storageWarning = ''; toast('Current settings saved.', 3000, true); + } catch { toast('Settings storage is still unavailable.'); } +} diff --git a/tools/webui/src/lib/style-mix.ts b/tools/webui/src/lib/style-mix.ts new file mode 100644 index 0000000..39bb098 --- /dev/null +++ b/tools/webui/src/lib/style-mix.ts @@ -0,0 +1,34 @@ +export function clampInfluence(value: unknown, fallback = 50): number { + return typeof value === 'number' && Number.isFinite(value) + ? Math.max(0, Math.min(100, Math.round(value))) : fallback; +} + +export function cleanMix(ids: unknown, weights: unknown, allowed: readonly string[], limit = Infinity) { + const selected = Array.isArray(ids) ? [...new Set(ids.filter((id): id is string => typeof id === 'string' && allowed.includes(id)))].slice(0, limit) : []; + const values = weights && typeof weights === 'object' ? weights as Record : {}; + return { ids: selected, weights: Object.fromEntries(selected.map(id => [id, clampInfluence(values[id])])) }; +} + +export function musicPrompt(ids: string[], weights: Record, descriptions: Record, names: ReadonlyArray): string { + const active = [...new Set(ids)].slice(0, 3).filter(id => descriptions[id] && clampInfluence(weights[id]) > 0); + if (!active.length) return ''; + const directions = active.map((id, index) => { + const role = index === 0 ? 'Primary style' : 'Secondary influence'; + return `${role} — ${names.find(([key]) => key === id)?.[1] || id} (${clampInfluence(weights[id])}/100 strength): ${descriptions[id]}`; + }); + return [ + 'Use the primary style as the foundation. Blend secondary styles at their independent 0–100 strengths. Keep the supplied lyrics and language.', + ...directions + ].join('\n'); +} + +export function freeformMusicPrompt(prompt: string, strength: unknown): string { + const direction = prompt.trim(); + const amount = clampInfluence(strength); + if (!direction || amount === 0) return ''; + return `Music generation brief. Follow the user's musical direction at ${amount}/100 strength. A higher value means the direction should more strongly shape genre, rhythm, instrumentation, vocal delivery, arrangement and production. Preserve the requested lyrics and composition.\n${direction}`; +} + +export function angleInfluence(x: number, y: number): number { + return Math.round(((Math.atan2(y, x) * 180 / Math.PI + 450) % 360) / 3.6); +} diff --git a/tools/webui/src/lib/style-profiles.ts b/tools/webui/src/lib/style-profiles.ts new file mode 100644 index 0000000..8247bc6 --- /dev/null +++ b/tools/webui/src/lib/style-profiles.ts @@ -0,0 +1,47 @@ +const profileFiles = import.meta.glob('../../../../music_styles/*.md', { + query: '?raw', import: 'default', eager: true +}) as Record; + +const thumbnailFiles = import.meta.glob('../assets/style-thumbnails/*.webp', { + query: '?url', import: 'default', eager: true +}) as Record; + +export interface MusicStyleProfile { + id: string; + name: string; + family: string; + profile: string; + thumbnail: string; + searchText: string; +} + +export const HIP_HOP_STYLES: MusicStyleProfile[] = Object.entries(profileFiles) + .map(([path, profile]) => { + const filename = path.split('/').pop() || ''; + const id = filename.replace(/\.md$/i, ''); + const name = profile.match(/^#\s+(.+)$/m)?.[1]?.trim() || id; + const family = profile.match(/^\*\*Family:\*\*\s*(.+?)\s*$/m)?.[1]?.trim() || 'Hip-Hop'; + const thumbnailPath = `../assets/style-thumbnails/${id}.webp`; + const searchText = `${name} ${family} ${profile}`.toLocaleLowerCase(); + return { + id, + name, + family, + profile: profile.trim(), + thumbnail: thumbnailFiles[thumbnailPath] || '', + searchText: `${searchText} ${searchText.replace(/[^a-z0-9]/g, '')}` + }; + }) + .sort((a, b) => a.id.localeCompare(b.id)); + +export const MUSIC_STYLE_CHOICES = HIP_HOP_STYLES.map(({ id, name }) => [id, name] as const); +export const MUSIC_STYLE_DESCRIPTIONS = Object.fromEntries( + HIP_HOP_STYLES.map(({ id, profile }) => [id, profile]) +); +export const MUSIC_STYLE_BY_ID = Object.fromEntries(HIP_HOP_STYLES.map((style) => [style.id, style])); + +export const FEATURED_HIP_HOP_STYLE_IDS = [ + '001_boom_bap', '003_underground_hip_hop', '004_lo_fi_hip_hop', '005_jazz_rap', + '013_west_coast_hip_hop', '017_memphis_rap', '022_trap', '023_dark_trap', + '030_drill', '032_uk_drill', '048_soul_hip_hop', '076_grimy_boom_bap' +] as const; diff --git a/tools/webui/src/lib/style-tooltip.ts b/tools/webui/src/lib/style-tooltip.ts new file mode 100644 index 0000000..effe747 --- /dev/null +++ b/tools/webui/src/lib/style-tooltip.ts @@ -0,0 +1,63 @@ +import type { MusicStyleProfile } from './style-profiles.js'; + +// Portal to body so the explanation is never clipped by the scrolling style grid. +export function styleTooltip(node: HTMLElement, initial: MusicStyleProfile) { + let style = initial; + let popup: HTMLDivElement | undefined; + let timer: ReturnType | undefined; + const id = `style-help-${crypto.randomUUID()}`; + function hide() { + clearTimeout(timer); + popup?.remove(); popup = undefined; + node.removeAttribute('aria-describedby'); + } + function position() { + if (!popup) return; + const box = node.getBoundingClientRect(); + const width = Math.min(360, window.innerWidth - 24); + popup.style.width = `${width}px`; + popup.style.maxHeight = `${Math.min(480, window.innerHeight - 32)}px`; + const height = popup.getBoundingClientRect().height; + const right = box.right + 12; + const left = right + width <= window.innerWidth - 12 ? right : Math.max(12, box.left - width - 12); + popup.style.left = `${Math.min(left, window.innerWidth - width - 12)}px`; + popup.style.top = `${Math.max(12, Math.min(box.top, window.innerHeight - height - 12))}px`; + } + function show() { + clearTimeout(timer); + if (popup) return; + popup = document.createElement('div'); + popup.className = 'style-explanation'; popup.id = id; popup.setAttribute('role', 'tooltip'); + function append(tag: string, text: string, className = '') { + const el = document.createElement(tag); el.textContent = text; el.className = className; popup!.append(el); + } + append('h4', style.name); + const tempo = style.profile.match(/^\*\*Typical tempo:\*\*\s*(.+)$/m)?.[1]; + append('p', [style.family, tempo].filter(Boolean).join(' · '), 'style-explanation-meta'); + const sections = new Map([...style.profile.matchAll(/^## (.+)\r?\n([\s\S]*?)(?=^## |$(?![\s\S]))/gm)].map(match => [match[1].trim(), match[2].trim()])); + const identity = sections.get('Core Identity'); + if (identity) append('p', identity, 'style-explanation-intro'); + for (const [key, label] of [['Rhythm & Drums', 'Rhythm & drums'], ['Bass & Low End', 'Bass'], ['Harmony, Melody & Sound Palette', 'Sounds & instruments'], ['Vocal / Rap Approach', 'Vocal delivery'], ['Mood & Energy', 'Mood & energy']]) { + const value = sections.get(key); + if (value) { append('strong', label); append('p', value); } + } + popup.addEventListener('mouseenter', () => clearTimeout(timer)); + popup.addEventListener('mouseleave', leave); + document.body.append(popup); node.setAttribute('aria-describedby', id); position(); + } + function enter() { clearTimeout(timer); timer = setTimeout(show, 200); } + function leave() { clearTimeout(timer); timer = setTimeout(hide, 180); } + function key(event: KeyboardEvent) { if (event.key === 'Escape') hide(); } + node.addEventListener('mouseenter', enter); node.addEventListener('mouseleave', leave); + node.addEventListener('focus', show); node.addEventListener('blur', leave); + document.addEventListener('keydown', key); + window.addEventListener('resize', hide); window.addEventListener('scroll', position, true); + return { + update(next: MusicStyleProfile) { style = next; }, + destroy() { + hide(); node.removeEventListener('mouseenter', enter); node.removeEventListener('mouseleave', leave); + node.removeEventListener('focus', show); node.removeEventListener('blur', leave); + document.removeEventListener('keydown', key); window.removeEventListener('resize', hide); window.removeEventListener('scroll', position, true); + } + }; +} diff --git a/tools/webui/src/lib/track-artwork.ts b/tools/webui/src/lib/track-artwork.ts new file mode 100644 index 0000000..ff5ef23 --- /dev/null +++ b/tools/webui/src/lib/track-artwork.ts @@ -0,0 +1,33 @@ +import { checkArtwork, submitArtwork, artworkResult, uploadReference } from './comfy-art.js'; +import { updateSong } from './db.js'; +import { JOB_POLL_MS } from './config.js'; +import type { Song } from './types.js'; + +export function trackArtworkPrompt(song: Pick): string { + return `Create finished album cover artwork inspired by this song. Interpret the title and lyrics as a specific scene with expressive lighting, rich texture, depth and a strong focal subject. Professional cinematic illustration. No lettering, typography, logos, watermarks or plain title cards. Center the main subject for widescreen cropping. +Song title: ${song.name.slice(0,200)} +Musical mood: ${song.style.slice(0,1200)} +Lyrical imagery: ${(song.request.lyrics ?? '').slice(0,2200)}`; +} +export async function generateTrackArtwork(song: Pick & Partial, existingId?: string, submitted?: (id:string)=>void|Promise, signal?: AbortSignal, options?: {prompt?:string;seed?:number;reference?:Blob}): Promise { + signal?.throwIfAborted(); + let id = existingId ?? song.artworkJobId; + if (!id) { + const models = await checkArtwork(); + const reference = options?.reference ? await uploadReference(options.reference,String(song.id ?? song.created)) : undefined; + signal?.throwIfAborted(); + id = await submitArtwork(models, options?.prompt ?? trackArtworkPrompt(song), options?.seed ?? crypto.getRandomValues(new Uint32Array(1))[0], `yue2-track-${song.created}`, reference); + // Persist ownership before polling. Closing the dialog or tab can reconnect. + if (song.id != null) { await updateSong(song.id,{artworkJobId:id}); song.artworkJobId = id; } + await submitted?.(id); + } + const deadline = Date.now()+20*60_000; + while (Date.now()setTimeout(resolve,JOB_POLL_MS)); + } + throw new Error('Artwork is still processing. Your prompt ID is saved; use Reconnect artwork to collect it later.'); +} diff --git a/tools/webui/src/lib/types.ts b/tools/webui/src/lib/types.ts index e66916d..5ef43d8 100644 --- a/tools/webui/src/lib/types.ts +++ b/tools/webui/src/lib/types.ts @@ -30,6 +30,7 @@ export interface Yue2Request { output_format?: string; peak_clip?: number; mp3_bitrate?: number; + mastering_profile?: string; } // GET /props response @@ -45,11 +46,28 @@ export interface Yue2Props { // what we store in IndexedDB per song export interface Song { + mediaRevision?: number; + videoRevision?: number; + videoVersion?: string; + videoOutdated?: boolean; + artworkJobId?: string; + videoJobId?: string; + youtubeDraft?: import('./youtube.js').YouTubeDraft; + takeGroup?: string; + sourceJob?: string; + sourceIndex?: number; id?: number; name: string; format: string; created: number; style: string; + // style profiles blended for this song (ids into music_styles/ plus their + // weights), snapshotted at generation so the card can name them. Absent + // on older records, imports and remixes, which fall back to the style prompt. + musicStyles?: { id: string; weight: number }[]; + // lyric engines blended for this song (ids into lyric_styles/ plus their + // weights), snapshotted alongside the music blend. Same fallback rules. + lyricStyles?: { id: string; weight: number }[]; seed: number; // the LM seed, the one that decides which song it is // length of the audio in seconds, decoded once and cached with the peaks duration: number; @@ -57,6 +75,16 @@ export interface Song { score: string; request: Yue2Request; audio: Blob; + originalAudio?: Blob; + // Mix before the last vocal-balance operation, retained for A/B playback. + vocalOriginalAudio?: Blob; + // Optional decoded-audio artwork. Stored as a Blob, never a temporary URL. + artwork?: Blob; + albumId?: string; + albumTitle?: string; + albumTrackId?: string; + trackNumber?: number; + video?: Blob; // user-marked favorite, persisted across reloads. Acts as a sticky // flag for the bulk "Delete non-favorites" action. favorite?: boolean; diff --git a/tools/webui/src/lib/validation.ts b/tools/webui/src/lib/validation.ts new file mode 100644 index 0000000..b1fe227 --- /dev/null +++ b/tools/webui/src/lib/validation.ts @@ -0,0 +1,51 @@ +import { emptyRequest, FIELDS, SAMPLING_KEYS } from './fields.js'; +import type { Yue2Request, Song } from './types.js'; + +export function object(value: unknown): value is Record { + return !!value && typeof value === 'object' && !Array.isArray(value); +} +export function validRequest(value: unknown): Yue2Request { + if (!object(value)) throw new Error('Saved request must be an object.'); + const result = emptyRequest(); + const target = result as unknown as Record; + for (const field of [...FIELDS, {key:'output_format',type:'str'}]) { + const raw = value[field.key]; + if (raw == null || raw === '') continue; + if (field.type === 'str') { + if (typeof raw !== 'string') throw new Error(`Invalid request field: ${field.key}`); + target[field.key] = raw; + } else { + if (!['number','string'].includes(typeof raw) || !Number.isFinite(Number(raw))) throw new Error(`Invalid request number: ${field.key}`); + target[field.key] = Number(raw); + } + } + for (const key of ['abc_sampling','semantic_sampling'] as const) { + const raw = value[key]; + if (raw == null) continue; + if (!object(raw)) throw new Error(`Invalid ${key}`); + for (const field of SAMPLING_KEYS) { + const n = raw[field]; + if (n == null || n === '') continue; + if (!['number','string'].includes(typeof n) || !Number.isFinite(Number(n))) throw new Error(`Invalid sampling field: ${field}`); + result[key][field] = Number(n); + } + } + return result; +} +export function validSong(value: unknown): Song { + if (!object(value) || !(value.audio instanceof Blob) || value.audio.size === 0) throw new Error('Backup track has no audio.'); + for (const key of ['name','style','format']) if (typeof value[key] !== 'string') throw new Error(`Backup track has invalid ${key}.`); + if (!['mp3','wav','wav16','wav24','wav32','mp4'].includes(value.format as string)) throw new Error('Backup track format is unsupported.'); + for (const key of ['created','duration','seed']) if (typeof value[key] !== 'number' || !Number.isFinite(value[key])) throw new Error(`Backup track has invalid ${key}.`); + for (const key of ['musicStyles','lyricStyles']) { + const list = value[key]; + if (list !== undefined && (!Array.isArray(list) || list.some(v => !object(v) || typeof v.id !== 'string' || typeof v.weight !== 'number' || !Number.isFinite(v.weight)))) throw new Error(`Backup track has invalid ${key}.`); + } + if (value.favorite !== undefined && typeof value.favorite !== 'boolean') throw new Error('Backup favourite is invalid.'); + if (value.youtubeDraft !== undefined) { + const draft = value.youtubeDraft; + if (!object(draft) || draft.version !== 1 || ['title','description','tags','playlist','endScreen'].some(key => typeof draft[key] !== 'string') || !['review','kids','general'].includes(String(draft.audience)) || !['private','unlisted','public'].includes(String(draft.visibility))) throw new Error('Backup YouTube draft is invalid.'); + } + for (const key of ['sourceJob','takeGroup','score','albumId','albumTitle','albumTrackId']) if (value[key] !== undefined && typeof value[key] !== 'string') throw new Error(`Backup track has invalid ${key}.`); + return {...value, score: value.score ?? '', request:validRequest(value.request)} as unknown as Song; +} diff --git a/tools/webui/src/lib/youtube.ts b/tools/webui/src/lib/youtube.ts new file mode 100644 index 0000000..791facf --- /dev/null +++ b/tools/webui/src/lib/youtube.ts @@ -0,0 +1,19 @@ +export interface YouTubeDraft { + version: 1; + title: string; + description: string; + tags: string; + audience: 'review' | 'kids' | 'general'; + playlist: string; + endScreen: string; + visibility: 'private' | 'unlisted' | 'public'; +} + +export function downloadYouTubeFile(blob: Blob, name: string) { + const url = URL.createObjectURL(blob); + const link = document.createElement('a'); + link.href = url; + link.download = name; + link.click(); + setTimeout(() => URL.revokeObjectURL(url), 60_000); +} diff --git a/tools/webui/src/reference-studio.css b/tools/webui/src/reference-studio.css new file mode 100644 index 0000000..0b42baf --- /dev/null +++ b/tools/webui/src/reference-studio.css @@ -0,0 +1,141 @@ +/* Reference studio: compact creation desk, expandable editors and persistent playback. */ +.yue2-app .studio-rail > .rail-card {flex-shrink:0} +.yue2-app .request-form .sound-direction-grid input {height:28px!important;min-height:0!important;padding:4px 8px!important} +.yue2-app .request-form #arrangement-workbench input:not([type=checkbox]),.yue2-app .request-form #arrangement-workbench select {height:34px!important;min-height:0!important;padding:5px 8px!important} +.yue2-app .request-form #arrangement-workbench .meta-grid label {display:flex;flex-flow:row wrap;gap:5px;align-content:flex-start} +.yue2-app .request-form #arrangement-workbench .meta-grid label input {flex-basis:100%;width:100%} +.yue2-app .request-form #arrangement-workbench .duration-copy {flex-direction:row;gap:12px;align-items:center} +.yue2-app .request-form #arrangement-workbench .duration-auto {min-height:34px;padding:4px 9px} +.yue2-app .request-form #arrangement-workbench .duration-help {font-size:9px} +.yue2-app .request-form .sound-card {gap:7px} +.yue2-app .request-form .sound-card > .card-head {min-height:25px} +.yue2-app .request-form .sound-card .field {gap:5px} +.yue2-app .request-form .collapsible > summary {text-transform:none;letter-spacing:0} +.yue2-app .sampling-control input[type=range] {appearance:none;height:4px;padding:0;background:var(--bg-btn-hover);border:0;border-radius:6px} +.yue2-app .sampling-control input[type=range]::-webkit-slider-thumb {appearance:none;width:10px;height:10px;border-radius:50%;background:#70f0d8;border:1px solid var(--accent)} +.yue2-app .sampling-control input[type=range]::-moz-range-thumb {width:10px;height:10px;border-radius:50%;background:#70f0d8;border:1px solid var(--accent)} +.yue2-app .sampling-control input[type=range]:disabled {opacity:.7} +@media(max-width:680px) {.yue2-app header.topbar {flex-wrap:nowrap!important;gap:7px!important}.yue2-app .status-pill {display:none!important}.yue2-app .topbar-theme {margin-left:auto}.yue2-app .request-form #arrangement-workbench .meta-grid label {font-size:10px}} +.sr-only {position:absolute;width:1px;height:1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border:0} +.yue2-app .topbar-theme select {width:145px;height:35px;padding:0 12px;border-radius:12px;background:var(--bg-input);font-size:12px} +.yue2-app .brand-name {font-size:21px;letter-spacing:-.04em} +.yue2-app .brand-mark {width:40px;height:40px;background:linear-gradient(145deg,#53eda7,#00c8cd);box-shadow:0 0 22px #00dac219} +.yue2-app .status-pill {max-width:340px} +.yue2-app .request-form .card {border-radius:11px;background:linear-gradient(130deg,color-mix(in srgb,var(--bg-panel) 88%,var(--accent) 3%),var(--bg));padding:12px;gap:10px} +.yue2-app .request-form .desk-nav {padding:3px 0 8px;background:var(--bg);border:0} +.yue2-app .request-form .desk-nav a {padding:7px 5px;gap:11px} +.yue2-app .request-form .desk-nav a > span:first-child {width:34px;height:34px;flex-basis:34px;font-size:17px;background:linear-gradient(145deg,#284659,#12232b)} +.yue2-app .request-form .desk-nav a:first-child > span:first-child {background:var(--accent);color:#03221c} +.yue2-app .request-form .desk-nav .step-copy strong {font-size:12px} +.yue2-app .request-form .desk-nav .step-copy small {font-size:10px} +.yue2-app .request-form .sound-card > .card-head h3 {font-size:11px;color:var(--fg-dim)} +.yue2-app .request-form .sound-card > .card-head .step-number {display:none} +.yue2-app .request-form .toolbar {margin-left:auto} +.yue2-app .request-form .toolbar .tool-btn {border:1px solid var(--border);background:var(--bg-btn);padding:6px 9px;color:var(--fg);border-radius:7px} +.sound-direction-grid {display:grid;grid-template-columns:1.05fr 1fr;gap:12px;min-width:0;scroll-margin-top:75px} +.brief-column,.preset-column {min-width:0;display:flex;flex-direction:column;gap:7px} +.yue2-app .request-form .field-name {display:flex;justify-content:space-between;align-items:center;font-size:12px} +.field-name small {font-size:10px;font-weight:400;color:var(--fg-dim)} +.yue2-app .request-form .brief-column textarea {height:95px;min-height:75px;resize:vertical;font-size:12px;padding:9px 11px;line-height:1.6} +.track-name-row {display:flex;align-items:center;gap:10px;font-size:10px;color:var(--fg-dim)} +.yue2-app .request-form .track-name-row input {flex:1;padding:5px 8px;min-width:0} +.style-tags {display:flex;gap:5px;flex-wrap:wrap} +.style-tags:empty {display:none} +.selected-style-slots {display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:8px} +.selected-style-slot {position:relative;min-width:0;min-height:142px;display:flex;flex-direction:column;align-items:center;justify-content:center;gap:5px;padding:10px 6px;border:1px solid var(--border);border-radius:10px;background:var(--bg-input);color:var(--fg);text-align:center} +.selected-style-slot img {width:64px;height:64px;object-fit:cover;border-radius:8px} +.selected-style-slot strong {font-size:11px;line-height:1.3;overflow-wrap:anywhere} +.selected-style-slot small {font-size:9px;color:var(--fg-dim)} +.selected-style-slot.inactive {opacity:.6} +.selected-style-slot .remove-selected-style {position:absolute;top:4px;right:4px;display:grid;place-items:center;width:24px;height:24px;padding:0;border:1px solid var(--border);border-radius:50%;background:var(--bg-input);color:var(--fg);cursor:pointer} +.empty-style-slot {border-style:dashed;cursor:pointer;background:transparent} +.empty-style-slot > span {font-size:27px;font-weight:300;color:var(--accent)} +.empty-style-slot:hover,.empty-style-slot:focus-visible {border-color:var(--accent)} +.custom-direction {margin-top:10px} +.custom-direction > summary {cursor:pointer;color:var(--fg-dim);font-size:11px;margin-bottom:8px} +.remix-track-button {flex-shrink:0;padding:5px 7px;border:1px solid var(--border);border-radius:6px;background:var(--bg-btn);color:var(--fg);font-size:10px;cursor:pointer} +.remix-track-button:disabled {opacity:.4;cursor:default} +.remix-panel {width:100%;box-sizing:border-box;margin:8px 0;padding:12px;border:1px solid var(--accent);border-radius:10px;background:var(--bg-input)} +.remix-heading {display:flex;align-items:center;justify-content:space-between;gap:10px} +.remix-heading > div {display:flex;flex-direction:column;gap:5px;min-width:0;overflow-wrap:anywhere} +.remix-heading small,.remix-scale,.remix-panel p,.remix-hint {font-size:11px;color:var(--fg-dim);line-height:1.5} +.remix-variation {display:flex;flex-wrap:wrap;justify-content:space-between;gap:10px;margin-top:14px;font-size:12px} +.remix-variation input {width:100%;accent-color:var(--accent)} +.remix-scale {display:flex;justify-content:space-between;gap:10px} +.lyric-profile-selector {margin:0 0 12px;padding:12px;border:1px solid var(--border);border-radius:9px;background:var(--bg-input)} +.lyric-profile-selector p {font-size:12px;line-height:1.5;margin:8px 0} +.lyric-profile-selector > small {color:var(--fg-dim);font-size:11px;line-height:1.4} +.style-tags button {display:flex;align-items:center;gap:7px;padding:4px 7px;border:1px solid var(--border);border-radius:6px;background:var(--bg-btn);color:var(--fg);font-size:9px;cursor:pointer} +.yue2-app .request-form .preset-column .style-search {padding:4px 8px;font-size:10px} +.yue2-app .request-form .preset-discovery {display:flex;flex-wrap:nowrap;gap:6px;overflow-x:auto;overflow-y:hidden;max-height:none;padding:3px 2px 6px;cursor:grab;user-select:none;overscroll-behavior-x:contain} +.yue2-app .request-form .preset-discovery.is-dragging,.yue2-app .request-form .preset-discovery.is-dragging button {cursor:grabbing} +.yue2-app .request-form .preset-discovery:focus-visible {outline:2px solid var(--accent);outline-offset:2px} +.yue2-app .request-form .preset-discovery button.style-tile {display:flex;position:relative;flex-direction:column;flex:0 0 78px;gap:5px;padding:3px;min-height:104px;border-radius:8px;scroll-snap-align:start;text-align:center;background:var(--bg-input)} +.yue2-app .request-form .preset-discovery button.style-tile img {width:70px;height:65px;border-radius:5px;object-fit:cover} +.yue2-app .request-form .preset-discovery .style-tile-copy {gap:2px;width:100%} +.yue2-app .request-form .preset-discovery .style-tile-copy strong {font-size:9px;line-height:1.35;white-space:normal} +.yue2-app .request-form .preset-discovery .style-tile-copy small {display:none} +.yue2-app .request-form .preset-discovery .style-tile-add {position:absolute;right:6px;top:5px;border-radius:50%;background:#031a1ce6;width:16px;height:16px;font-size:10px} +.yue2-app .request-form .preset-discovery button.chosen {box-shadow:0 0 0 1px var(--accent),0 0 13px #22d9b329} +.blend-disclosure {grid-column:1/-1;border-top:1px solid var(--border);padding-top:6px} +.blend-disclosure > summary,.engine-options > summary,.sampling-extra > summary {cursor:pointer;color:var(--fg-dim);font-size:10px;padding:3px 0} +.blend-disclosure > summary span {float:right;color:var(--accent);font-size:9px} +.blend-disclosure[open] > summary {margin-bottom:9px} +.yue2-app .request-form > .words-card {padding:0;display:block} +.yue2-app .request-form > .words-card > summary {padding:9px 12px;display:flex;cursor:pointer;list-style:none} +.yue2-app .request-form > .words-card > summary::after {content:'+';margin-left:auto;color:var(--accent)} +.yue2-app .request-form > .words-card[open] > summary::after {content:'−'} +.words-card > summary .step-number {width:20px!important;height:20px!important;font-size:9px!important;background:var(--bg-btn)!important;color:var(--fg)!important} +.words-card > summary .section-meta {margin-left:auto;font-size:9px} +.lyrics-content {display:flex;flex-direction:column;gap:12px;padding:12px} +.lyrics-content > .card-head h3 {display:none!important} +.lyrics-content > .card-head {justify-content:flex-end} +.yue2-app .request-form > #arrangement-workbench {display:grid;grid-template-columns:1fr 2fr;gap:9px 12px;padding-top:0;overflow:hidden} +.yue2-app .request-form > #arrangement-workbench > .card-head {grid-column:1/-1;margin:0 -12px;padding:8px 12px;background:linear-gradient(100deg,#44337388,#192a4070)} +.yue2-app .request-form > #arrangement-workbench .step-number {width:22px;height:22px;background:transparent;color:#c0a7ff} +.yue2-app .request-form > #arrangement-workbench > .field-row {grid-column:1;grid-row:2;display:flex;flex-direction:column;align-items:stretch;gap:5px} +.yue2-app .request-form > #arrangement-workbench > .meta-grid {grid-column:2;grid-row:2;gap:10px} +.yue2-app .request-form > #arrangement-workbench > .duration-auto {grid-column:1/-1;grid-row:3;padding:7px 10px;gap:10px} +.yue2-app .request-form .duration-copy {display:flex;align-items:center;gap:12px} +.yue2-app .request-form .duration-help {font-size:9px;margin:0} +.yue2-app .request-form > #arrangement-workbench > .composition-choice {grid-column:1/-1;grid-row:4;display:flex;gap:10px;align-items:center;padding:10px;border:1px solid var(--border);border-radius:8px;cursor:pointer} +.composition-choice > span {display:flex;flex-direction:column;gap:4px;font-size:12px} +.composition-choice small {font-size:10px;color:var(--fg-dim)} +.composition-choice input {accent-color:var(--accent)} +.yue2-app .request-form > #arrangement-workbench > .score-editor {grid-column:1/-1;grid-row:5} +.yue2-app .request-form .score-editor > summary {padding:7px 10px;font-size:10px} +.yue2-app .request-form .meta-grid input,.yue2-app .request-form .meta-grid select {padding:5px 8px;height:31px} +.yue2-app .request-form .collapsible {padding:0;overflow:hidden;border-top-width:1px!important} +.yue2-app .request-form .collapsible > summary {padding:8px 12px;margin:0;font-size:12px;min-height:34px} +.yue2-app .request-form #score-sampling > summary {background:linear-gradient(100deg,#08634499,#123b3377)} +.yue2-app .request-form #semantic-sampling > summary {background:linear-gradient(100deg,#12577b99,#10354877)} +.yue2-app .request-form #render-workbench > summary {background:linear-gradient(100deg,#69334099,#3c253077)} +.yue2-app .request-form .details-body {padding:10px 12px} +.sampling-extra {margin-top:8px} +.sampling-extra .field {margin-top:8px} +.yue2-app .request-form > .engine-card {display:grid;grid-template-columns:auto 1fr;align-items:center;padding:8px 12px;border:1px solid #67512b;background:linear-gradient(100deg,#49351588,#221e1777)} +.yue2-app .request-form .engine-card .step-number {display:none} +.yue2-app .request-form .engine-card .engine-indicator {display:none} +.yue2-app .request-form .engine-mode {margin:0;min-width:0} +.yue2-app .request-form .engine-mode button {padding:7px 8px;font-size:10px} +.engine-options {grid-column:1/-1} +.engine-options[open] {display:flex;flex-direction:column;gap:10px} +.yue2-app .request-form .action-bar {padding:0;border:0;background:var(--bg);gap:10px;border-radius:9px} +.yue2-app .request-form .action-bar .generate-btn {min-height:47px;font-size:16px;background:linear-gradient(105deg,#2bd48a,#06d3bc)} +.yue2-app .request-form .action-bar .ghost-btn {min-height:47px;font-size:12px} +.yue2-app .rail-card {border-radius:12px;background:linear-gradient(135deg,var(--bg-panel),var(--bg-card));box-shadow:inset 0 1px 0 #ffffff03} +.yue2-app .preview-card {min-height:215px} +.yue2-app .preview-player {padding:17px 12px;min-height:102px;border:0;background:var(--bg-input)} +.yue2-app .preview-wave,.yue2-app .preview-wave canvas,.yue2-app .preview-wave .waveform {height:76px} +.yue2-app .preview-play {width:45px;height:45px} +.yue2-app .rail-kicker {display:none} +.yue2-app .recent-track {min-height:60px;border-radius:9px} +.yue2-app .recent-info strong {font-size:11px} +.yue2-app .recent-info small {font-size:10px} +.yue2-app .activity-card .log-body {min-height:140px;max-height:230px;font-size:10px} +.yue2-app .settings-card {background:var(--bg-panel)} +.yue2-app .quick-style {height:46px;background:var(--bg-input)} +.yue2-app .side-nav button,.yue2-app .side-nav a {font-size:13px} +@media(min-width:1500px) {.yue2-app main.workspace-main {grid-template-columns:minmax(0,1fr) minmax(350px,32%)}.yue2-app .request-form .preset-discovery button.style-tile {flex-basis:86px}.yue2-app .request-form .preset-discovery button.style-tile img {width:78px;height:72px}} +@media(max-width:1100px) {.sound-direction-grid {grid-template-columns:1fr}.blend-disclosure {grid-column:1}.yue2-app .topbar-theme select {width:95px}.words-card > summary .section-meta {display:none}} +@media(max-width:680px) {.yue2-app .brand-name {font-size:15px}.yue2-app .topbar-theme select {width:78px;font-size:10px;padding:4px}.yue2-app .status-pill {max-width:105px}.yue2-app .settings-shortcut {display:none}.sound-direction-grid {grid-template-columns:1fr}.yue2-app .request-form > #arrangement-workbench {display:flex;flex-direction:column;align-items:stretch}.yue2-app .request-form > #arrangement-workbench > .card-head {margin:0 -12px}.yue2-app .request-form > #arrangement-workbench > .meta-grid {grid-template-columns:repeat(3,minmax(0,1fr))}.yue2-app .request-form > .engine-card {display:flex;align-items:stretch}.yue2-app .request-form .duration-help {display:none}.yue2-app .request-form .desk-nav .step-copy strong {font-size:10px}.yue2-app .request-form .desk-nav a {gap:5px}.yue2-app .request-form .desk-nav a > span:first-child {width:25px;height:25px;flex-basis:25px;font-size:12px}.yue2-app .request-form .toolbar .tool-btn {padding:5px}.yue2-app .request-form .action-bar .generate-btn {font-size:13px}} diff --git a/tools/webui/src/studio.css b/tools/webui/src/studio.css new file mode 100644 index 0000000..2b070a2 --- /dev/null +++ b/tools/webui/src/studio.css @@ -0,0 +1,249 @@ +/* Theme-aware studio surfaces. No remote fonts, assets or animation libraries. */ +:root { --muted: var(--fg-dim); } +html { scroll-behavior: smooth; scroll-padding-top: 90px; } +.yue2-app { isolation: isolate; } +.yue2-app::before { content: ''; position: fixed; inset: 0; z-index: -1; pointer-events: none; background: radial-gradient(ellipse at 85% 5%, color-mix(in srgb, var(--accent) 11%, transparent), transparent 45%), radial-gradient(ellipse at 5% 60%, color-mix(in srgb, var(--accent-2) 5%, transparent), transparent 50%); } +.yue2-app button, .yue2-app input, .yue2-app select, .yue2-app textarea { font: inherit; } +.yue2-app button, .yue2-app select, .yue2-app input, .yue2-app textarea { transition: border-color .18s, background-color .18s, box-shadow .18s, transform .18s; } +.yue2-app button:focus-visible, .yue2-app a:focus-visible, .yue2-app summary:focus-visible, .yue2-app select:focus-visible, .yue2-app input:focus-visible, .yue2-app textarea:focus-visible { outline: 2px solid var(--focus); outline-offset: 4px; } +.yue2-app input:not([type='range']):not([type='checkbox']):not([type='file']), .yue2-app textarea, .yue2-app select { background: var(--bg-input); color: var(--fg); border: 1px solid var(--border-strong); border-radius: 10px; padding: .65rem .75rem; min-width: 0; max-width: 100%; } +.yue2-app input::placeholder, .yue2-app textarea::placeholder { color: var(--fg-dim); opacity: .7; } +.yue2-app button:not(:disabled):active { transform: translateY(1px); } +.yue2-app button:disabled { opacity: .45; cursor: not-allowed; } +.yue2-app .theme-control { display: flex; align-items: center; gap: .45rem; color: var(--fg-dim); } +.yue2-app .theme-control select { border-radius: 999px; font-size: .75rem; padding: .4rem .65rem; } +.studio-intro { display: flex; align-items: center; justify-content: space-between; gap: 2rem; width: 100%; max-width: 1540px; margin: 0 auto; padding: 2.5rem 2rem 2rem; animation: studio-enter .6s ease both; } +.eyebrow { font-size: .62rem; font-weight: 700; letter-spacing: .16em; color: var(--fg-dim); } +.intro-copy > .eyebrow { display: flex; gap: .55rem; align-items: center; color: var(--accent); margin-bottom: .85rem; } +.intro-copy > .eyebrow span { width: 6px; height: 6px; border-radius: 50%; background: currentColor; box-shadow: 0 0 14px currentColor; } +.studio-intro h1 { font-size: clamp(1.65rem, 2.8vw, 2.8rem); font-weight: 650; line-height: 1.18; letter-spacing: -.05em; } +.studio-intro h1 em { font-style: normal; color: var(--accent); } +.intro-note { color: var(--fg-dim); font-size: .85rem; line-height: 1.7; margin-top: .65rem; } +.studio-shortcuts { display: flex; gap: .55rem; margin-top: 1.15rem; flex-wrap: wrap; } +.studio-shortcuts a { display: inline-flex; align-items: center; gap: .6rem; color: var(--fg-dim); background: color-mix(in srgb, var(--bg-card) 75%, transparent); border: 1px solid var(--border); border-radius: 999px; padding: .45rem .75rem; text-decoration: none; font-size: .7rem; transition: color .2s, border-color .2s; } +.studio-shortcuts a:hover { color: var(--fg); border-color: var(--accent); } +.signal-art { position: relative; display: grid; place-items: center; width: 30%; max-width: 370px; height: 150px; flex-shrink: 0; overflow: hidden; } +.signal-orbit { position: absolute; width: 130px; height: 130px; border: 1px solid color-mix(in srgb, #42d9ae 28%, transparent); border-radius: 50%; box-shadow: 0 0 0 23px color-mix(in srgb, #42d9ae 5%, transparent), 0 0 0 45px color-mix(in srgb, #42d9ae 2%, transparent); transition: transform .8s cubic-bezier(.2,.8,.2,1), border-color .6s, box-shadow .8s; } +.signal-bars { height: 100px; width: 100%; display: flex; align-items: center; justify-content: center; gap: 4px; z-index: 1; } +.signal-bars span { height: var(--live-bar, var(--idle-bar)); width: 4px; border-radius: 6px; background: linear-gradient(#32d2a5, #147b63); opacity: .7; transform-origin: center; animation: signal-breathe 5s ease-in-out var(--delay) infinite alternate; transition: height .11s ease-out, opacity .45s, filter .45s; will-change: height; } +.signal-art.is-playing .signal-orbit { transform: scale(1.08); border-color: color-mix(in srgb, #63efc7 55%, transparent); box-shadow: 0 0 0 23px color-mix(in srgb, #42d9ae 8%, transparent), 0 0 0 45px color-mix(in srgb, #42d9ae 4%, transparent), 0 0 34px color-mix(in srgb, #42d9ae 22%, transparent); animation: signal-orbit 5s ease-in-out infinite alternate; } +.signal-art.is-playing .signal-bars span { opacity: .95; filter: drop-shadow(0 0 4px #31d5a44a); animation: none; } +.signal-caption { position: absolute; bottom: 0; font: 9px ui-monospace, monospace; letter-spacing: .2em; color: #448f7b; transition: color .4s; } +.signal-art.is-playing .signal-caption { color: #65d8b7; } +.workspace-heading { display: flex; align-items: center; gap: .7rem; margin-bottom: 1rem; } +.workspace-heading h2, .yue2-app .library-head h2 { font-size: 1.1rem; letter-spacing: -.025em; margin-top: .2rem; } +.workspace-icon { display: grid; place-items: center; width: 38px; height: 38px; border: 1px solid var(--border-strong); border-radius: 12px; color: var(--accent); background: color-mix(in srgb, var(--accent) 8%, var(--bg-card)); } +.yue2-app .library-head .count { margin-left: auto; border: 1px solid var(--border); padding: .35rem .65rem; border-radius: 999px; color: var(--fg-dim); } +.yue2-app .request-form .card { background: linear-gradient(150deg, color-mix(in srgb, var(--bg-card-2) 45%, var(--bg-card)), var(--bg-card)); box-shadow: inset 0 1px 0 #ffffff04, var(--shadow); padding: 1.15rem; gap: 1rem; } +.yue2-app .request-form .card.collapsible { padding: 0; } +.yue2-app .request-form .card-head h3 { color: var(--fg); letter-spacing: .06em; font-size: .75rem; } +.yue2-app .request-form .field-name { font-size: .78rem; color: var(--fg); } +.yue2-app .request-form .field-name em { display: block; font-size: .67rem; margin-top: .2rem; color: var(--fg-dim); font-weight: 400; } +.yue2-app .request-form .lyric-ai { background: color-mix(in srgb, var(--accent) 5%, var(--bg-panel)); border: 1px solid color-mix(in srgb, var(--accent) 25%, var(--border)); border-radius: 14px; padding: 1rem; } +.yue2-app .request-form .music-mixer, .yue2-app .request-form .style-mixer { background: color-mix(in srgb, var(--bg) 40%, transparent); border: 1px solid var(--border); border-radius: 12px; } +.yue2-app .request-form .ring-stage { gap: .8rem; flex-wrap: wrap; justify-content: flex-start; } +.yue2-app .request-form .style-ring-wrap { flex: 1 1 115px; max-width: 160px; padding: .5rem; border-radius: 12px; background: color-mix(in srgb, var(--bg-card-2) 60%, transparent); } +.yue2-app .favourites .controls button, .yue2-app .lyric-ai > button { border: 1px solid var(--border-strong); border-radius: 8px; background: var(--bg-btn); color: var(--fg); padding: .5rem .7rem; font-size: .74rem; cursor: pointer; } +.yue2-app .favourites .controls button:hover:not(:disabled), .yue2-app .lyric-ai > button:hover:not(:disabled) { background: var(--bg-btn-hover); border-color: var(--accent); } +.yue2-app .request-form .generate-btn, .yue2-app .request-form .generate-lyrics { min-height: 46px; background: linear-gradient(110deg, var(--accent), var(--accent-2)); border: 1px solid color-mix(in srgb, var(--accent) 70%, white); box-shadow: 0 5px 24px color-mix(in srgb, var(--accent) 22%, transparent); color: #10121a; } +.yue2-app .request-form .generate-btn:hover:not(:disabled) { transform: translateY(-2px); box-shadow: 0 9px 30px color-mix(in srgb, var(--accent) 32%, transparent); } +.yue2-app .request-form .action-bar { z-index: 5; background: color-mix(in srgb, var(--bg-panel) 92%, transparent); border-radius: 16px; } +.yue2-app .request-form details[open] > summary { border-bottom: 1px solid var(--border); margin-bottom: .75rem; } +.yue2-app .songs-panel { min-width: 0; animation: studio-enter .65s .1s ease both; } +.yue2-app .song-list > .card { transition: border-color .2s, box-shadow .2s; } +.yue2-app .song-list > .card:hover { border-color: var(--border-strong); } +.yue2-app .song-list > .card.is-playing { border-color: var(--accent); box-shadow: 0 0 30px color-mix(in srgb, var(--accent) 12%, transparent); } +#music-workbench, #lyric-workbench, #render-workbench { scroll-margin-top: 90px; } +@keyframes studio-enter { from { opacity: 0; transform: translateY(8px); } to { opacity: 1; transform: translateY(0); } } +@keyframes signal-breathe { from { transform: scaleY(.7); opacity: .4; } to { transform: scaleY(1); opacity: .85; } } +@keyframes signal-orbit { from { transform: scale(1.03) rotate(-4deg); } to { transform: scale(1.1) rotate(4deg); } } +@media (max-width: 1100px) { .yue2-app .brand-version { display: none; } .studio-intro { gap: 1rem; } } +@media (max-width: 600px) { .studio-intro { padding: 1.5rem 1rem; flex-direction: column; align-items: stretch; } .signal-art { display: grid; width: 100%; max-width: none; height: 118px; } .signal-bars { height: 78px; } .signal-orbit { width: 105px; height: 105px; } .yue2-app header { gap: .6rem; flex-wrap: wrap; padding: .7rem 1rem; } .yue2-app .volume { display: none; } .yue2-app .brand-name { font-size: .95rem; } .yue2-app .theme-control { margin-left: auto; } .yue2-app .request-form .meta-grid { grid-template-columns: repeat(2, minmax(0, 1fr)); } .yue2-app .request-form .style-row { flex-wrap: wrap; } .yue2-app .request-form .style-row select { width: 100%; } .yue2-app .request-form .card { padding: .85rem; } } +@media (max-width: 600px) { .yue2-app > header .volume { display: none; } } +@media (prefers-reduced-motion: reduce) { html { scroll-behavior: auto; } *, *::before, *::after { animation-duration: .01ms !important; animation-iteration-count: 1 !important; transition-duration: .01ms !important; } } + +/* Studio v2: a listening stage and a focused production desk. */ +.studio-intro { display:grid; grid-template-columns:minmax(260px,.8fr) minmax(0,1.2fr); gap:3rem; padding-top:2rem; padding-bottom:2.25rem; } +.studio-intro h1 { font-size:clamp(2rem,3.5vw,3.6rem); max-width:12ch; line-height:1.07; } +.studio-intro .intro-note { max-width:32ch; margin-top:1.1rem; } +.yue2-app .form-panel { scrollbar-width:thin; scrollbar-color:var(--border-strong) transparent; padding-right:6px; scroll-behavior:smooth; } +.yue2-app .request-form { gap:12px; } +.desk-nav { display:flex; position:sticky; top:0; z-index:4; padding:6px; gap:4px; background:color-mix(in srgb,var(--bg-panel) 95%,transparent); border:1px solid var(--border); border-radius:13px; backdrop-filter:blur(16px); box-shadow:0 5px 20px #0002; } +.desk-nav a { flex:1; text-align:center; padding:8px 3px; color:var(--fg-dim); text-decoration:none; font-size:10px; letter-spacing:.02em; border-radius:8px; white-space:nowrap; transition:background .2s,color .2s; } +.desk-nav a:hover,.desk-nav a:focus-visible { background:color-mix(in srgb,var(--accent) 12%,transparent);color:var(--accent); } +.yue2-app .request-form .card { border-radius:17px; padding:20px; gap:17px; background:linear-gradient(145deg,color-mix(in srgb,var(--bg-card-2) 35%,var(--bg-card)),var(--bg-panel)); box-shadow:inset 0 1px 0 #ffffff04; transition:border-color .25s,box-shadow .25s; } +.yue2-app .request-form .card:focus-within { border-color:color-mix(in srgb,var(--accent) 45%,var(--border)); box-shadow:0 0 25px color-mix(in srgb,var(--accent) 5%,transparent); } +.yue2-app .request-form .card-head { flex-wrap:wrap; gap:10px; } +.yue2-app .request-form .card-head h3 { display:flex; align-items:center; gap:10px; letter-spacing:.035em; font-size:12px; text-transform:none; } +.step-number { display:inline-grid; place-items:center; height:26px; width:26px; border:1px solid var(--border-strong); border-radius:8px; font:10px ui-monospace,monospace; color:var(--accent); background:color-mix(in srgb,var(--accent) 7%,transparent); } +.section-meta { font:10px ui-monospace,monospace; color:var(--fg-dim); } +.lyrics-heading-actions { display:flex; align-items:center; gap:10px; } +.lyrics-file-input { display:none; } +.lyrics-load-btn { display:inline-flex; align-items:center; justify-content:center; gap:6px; min-height:30px; padding:0 9px; border:1px solid #24504d; border-radius:7px; color:#c6e1d9; background:#0a2022; font-size:10px; cursor:pointer; } +.lyrics-load-btn:hover { border-color:#2bd9b3; color:#effff9; background:#0d302d; } +.yue2-app .request-form .toolbar .tool-btn { background:transparent; padding:6px; border-color:transparent; font-size:10px; } +.yue2-app .request-form .toolbar .tool-btn:hover { border-color:var(--border-strong);background:var(--bg-btn); } +.yue2-app .request-form .field { gap:8px; } +.yue2-app .request-form .field-name { font-size:12px; } +.yue2-app .request-form input,.yue2-app .request-form textarea,.yue2-app .request-form select { font-size:13px; line-height:1.6; } +.yue2-app .request-form .style-search { padding:11px 13px; border-radius:10px; } +.preset-discovery { display:flex; gap:6px; flex-wrap:wrap; } +.preset-discovery button { display:flex; gap:8px; align-items:center; font-size:10px; padding:7px 9px; border:1px solid var(--border); background:var(--bg-input); border-radius:7px; color:var(--fg-dim); cursor:pointer; } +.preset-discovery button span { color:var(--accent); } +.preset-discovery button:hover,.preset-discovery button.chosen { border-color:var(--accent); color:var(--fg); background:color-mix(in srgb,var(--accent) 8%,var(--bg-input)); } +.yue2-app .request-form .preset-discovery { display:grid; grid-template-columns:repeat(4,minmax(0,1fr)); gap:7px; max-height:310px; overflow:auto; padding:1px 2px 3px 1px; scrollbar-width:thin; scrollbar-color:#24504d transparent; } +.yue2-app .request-form .preset-discovery button.style-tile { display:grid; grid-template-columns:46px minmax(0,1fr) 14px; align-items:center; gap:8px; min-width:0; min-height:58px; padding:5px 7px; border-color:#1c4041; border-radius:9px; background:#0a2022; color:#bfcec9; text-align:left; } +.yue2-app .request-form .preset-discovery button.style-tile img { width:46px; height:46px; border-radius:6px; object-fit:cover; background:#102526; } +.style-tile-copy { display:flex; flex-direction:column; min-width:0; gap:4px; } +.yue2-app .request-form .preset-discovery .style-tile-copy strong { overflow:hidden; color:#e7f5f0; font-size:10px; font-weight:650; line-height:1.2; text-overflow:ellipsis; } +.yue2-app .request-form .preset-discovery .style-tile-copy small { overflow:hidden; color:#88a8a0; font-size:8px; line-height:1.2; text-overflow:ellipsis; white-space:nowrap; } +.yue2-app .request-form .preset-discovery button.style-tile .style-tile-add { display:grid; place-items:center; color:#2bd9b3; font-size:13px; } +.yue2-app .request-form .preset-discovery button.style-tile:hover,.yue2-app .request-form .preset-discovery button.style-tile.chosen { border-color:#2bd9b3; background:#0d302d; } +.yue2-app .request-form .music-style-help,.yue2-app .request-form .mixer-help { text-align:left; font-size:11px; line-height:1.6; margin:0; color:var(--fg-dim); } +.yue2-app .request-form .music-mixer,.yue2-app .request-form .style-mixer { padding:13px; display:flex;flex-direction:column;gap:12px; background:color-mix(in srgb,var(--bg-input) 65%,transparent); } +.yue2-app .request-form .style-ring-wrap { padding:10px 5px; background:transparent; min-width:105px; border:1px solid var(--border); } +.yue2-app .request-form .style-ring-wrap > span {font-size:11px;line-height:1.5;} +.yue2-app .request-form .style-ring-wrap > button {font-size:10px; color:var(--fg-dim);} +.writer-disclosure,.score-editor {border:1px solid var(--border);border-radius:11px;background:color-mix(in srgb,var(--bg-input) 50%,transparent);} +.writer-disclosure > summary,.score-editor > summary { display:flex;align-items:center;gap:8px;padding:13px;cursor:pointer;font-size:12px;list-style:none;color:var(--fg); } +.writer-disclosure > summary span,.score-editor > summary span {margin-left:auto;font-size:10px;color:var(--fg-dim);} +.writer-disclosure > summary::after,.score-editor > summary::after {content:'+';color:var(--accent);font-size:16px;} +.writer-disclosure[open] > summary::after,.score-editor[open] > summary::after {content:'−';} +.score-editor > .field {padding:0 13px 13px;} +.yue2-app .request-form .lyric-ai {border:0;background:transparent;padding:13px;margin:0;display:flex;flex-direction:column;gap:12px;} +.yue2-app .request-form .duration-auto {padding:14px;border-radius:11px;background:color-mix(in srgb,var(--accent) 5%,var(--bg-input));} +.yue2-app .request-form .duration-help {font-size:11px;line-height:1.6;} +.yue2-app .request-form .field-name-emoji {display:none;} +.engine-card {position:relative;overflow:hidden;} +.engine-indicator {font:9px ui-monospace,monospace;color:var(--fg-dim);letter-spacing:.12em;padding:5px 8px;border:1px solid var(--border);border-radius:5px;} +.engine-indicator.active {color:var(--accent);border-color:color-mix(in srgb,var(--accent) 35%,transparent);background:color-mix(in srgb,var(--accent) 8%,transparent);} +.engine-mode {display:flex;padding:4px;background:var(--bg-input);border:1px solid var(--border);border-radius:10px;gap:4px;} +.engine-mode button {flex:1;cursor:pointer;padding:9px 6px;border:1px solid transparent;border-radius:7px;font-size:12px;color:var(--fg-dim);background:transparent;} +.engine-mode button.selected {color:var(--fg);border-color:var(--border-strong);background:var(--bg-card-2);box-shadow:0 3px 8px #0002;} +.profile-title {display:flex;align-items:center;gap:12px;color:var(--accent);} +.profile-title strong {font-size:14px;color:var(--fg);font-weight:550;}.profile-title p {font-size:11px;line-height:1.5;color:var(--fg-dim);margin-top:4px;} +.engine-metrics {display:grid;grid-template-columns:repeat(3,minmax(0,1fr));border:1px solid var(--border);border-radius:12px;background:var(--bg-input);overflow:hidden;} +.engine-metrics > div {display:flex;flex-direction:column;padding:13px 10px;gap:8px;min-width:0;}.engine-metrics > div + div {border-left:1px solid var(--border);} +.engine-metrics span {font:8px ui-monospace,monospace;letter-spacing:.08em;color:var(--fg-dim);}.engine-metrics strong {font-size:24px;font-weight:450;letter-spacing:-.04em;color:var(--fg);font-variant-numeric:tabular-nums;}.engine-metrics em {font-style:normal;font-size:10px;letter-spacing:0;color:var(--fg-dim);}.engine-metrics small {font-size:9px;color:var(--fg-dim);} +.engine-format {display:flex;align-items:center;gap:15px;font-size:12px;color:var(--fg-dim);}.engine-format select {flex:1;} +.engine-note,.auto-detail {font-size:11px;line-height:1.7;color:var(--fg-dim);margin:0;} +.auto-detail button {display:block;margin-top:10px;padding:6px 10px;border:1px solid var(--border-strong);border-radius:7px;background:var(--bg-btn);color:var(--fg);font-size:11px;cursor:pointer;} +.yue2-app .request-form .card.collapsible {padding:0;border-radius:12px;gap:0;background:var(--bg-panel);} +.yue2-app .request-form .collapsible > summary {min-height:45px;padding:12px 16px;font-size:10px;letter-spacing:.08em;gap:8px;} +.yue2-app .request-form .collapsible > summary::after {content:'⌄';color:var(--fg-dim);font-size:16px;transform:rotate(0);transition:transform .2s;} +.yue2-app .request-form .collapsible[open] > summary::after {transform:rotate(180deg);} +.yue2-app .request-form .collapsible > summary .mini-btn {margin-left:auto;width:20px;height:20px;} +.yue2-app .request-form .details-body {padding:14px 16px;} +.yue2-app .request-form .action-bar {position:sticky;bottom:0;margin:0;padding:12px;border:1px solid var(--border-strong);backdrop-filter:blur(16px);box-shadow:0 -8px 30px #0002;border-radius:13px;} +.yue2-app .request-form.is-generating .action-bar {border-color:var(--accent);} +#music-workbench,#lyrics-editor,#arrangement-workbench,#engine-workbench {scroll-margin-top:65px;} +@media(max-width:1050px){.studio-intro{gap:1.5rem;grid-template-columns:minmax(220px,.75fr) minmax(0,1.25fr);}} +@media(max-width:900px){.studio-intro{grid-template-columns:1fr;padding:1.5rem 1rem;}.studio-intro h1{max-width:none;font-size:2rem;}.studio-intro .intro-note{max-width:none;}.yue2-app .form-panel{padding-right:0;}.desk-nav{top:62px;}.signal-dock{max-width:none;}} +@media(max-width:460px){.yue2-app .request-form .card{padding:16px;}.desk-nav a{font-size:9px;}.engine-metrics strong{font-size:20px;}.engine-format{align-items:stretch;flex-direction:column;gap:7px;}.writer-disclosure > summary span{display:none;}.studio-intro{gap:1.25rem;}.studio-shortcuts a{font-size:10px;}.yue2-app .request-form .card-head{gap:8px;}} + +/* Mint production desk: persistent navigation, focused form and listening rail. */ +.yue2-app { height:100dvh; min-height:0; overflow:hidden; background:#061315; color:#e8f4f1; } +.yue2-app header.topbar { height:62px; min-height:62px; display:flex; position:relative; top:auto; z-index:20; gap:16px; padding:0 19px; background:linear-gradient(90deg,#061315,#091a1b 54%,#071516); border-bottom:1px solid #173436; backdrop-filter:none; } +.yue2-app .brand { gap:10px; flex-shrink:0; } +.yue2-app .brand-mark { width:40px; height:40px; border-radius:12px; background:linear-gradient(145deg,#21ddb6,#16a987); color:#03231e; box-shadow:0 0 22px #1fdbb533; } +.yue2-app .brand-name { color:#f0fbf8; font-size:17px; font-weight:700; letter-spacing:-.035em; } +.yue2-app .brand-version { display:inline-flex; color:#44e1c2; border:1px solid #146b5e; border-radius:99px; padding:4px 8px; font:9px ui-monospace,monospace; letter-spacing:.08em; } +.yue2-app .status-pill { height:36px; max-width:360px; display:flex; gap:9px; padding:0 12px; border:1px solid #185b54; border-radius:12px; color:#4fe2c5; background:#0b2929; font-size:11px; } +.yue2-app .status-pill span:first-of-type { overflow:hidden; text-overflow:ellipsis; white-space:nowrap; } +.status-chevron { color:#80a8a0; font-size:14px; } +.topbar-spacer { flex:1; } +.yue2-app .volume { display:flex; align-items:center; gap:10px; color:#9bb4ae; } +.yue2-app .volume input[type=range] { width:82px; accent-color:#22d9b3; } +.yue2-app .settings-shortcut { display:grid; place-items:center; width:36px; height:36px; color:#b6cac5; border-radius:9px; } +.yue2-app .settings-shortcut:hover { color:#48e2c3; background:#102a2b; } +.studio-frame { display:grid; grid-template-columns:190px minmax(0,1fr); height:calc(100dvh - 62px); min-height:0; } +.left-sidebar { display:flex; flex-direction:column; min-width:0; gap:14px; padding:14px 10px 12px; overflow-y:auto; border-right:1px solid #173436; background:linear-gradient(180deg,#081719,#071416); } +.side-nav { display:flex; flex-direction:column; gap:4px; } +.side-nav button,.side-nav a { display:flex; align-items:center; gap:12px; width:100%; min-height:42px; padding:0 12px; border:1px solid transparent; border-radius:9px; background:transparent; color:#a7bdb8; text-decoration:none; text-align:left; font-size:12px; cursor:pointer; } +.side-nav button:hover,.side-nav a:hover { color:#effaf7; background:#102628; } +.side-nav button.active { color:#031e19; font-weight:700; background:linear-gradient(100deg,#25dfb7,#16caa2); box-shadow:0 5px 18px #1ad4ab2a; } +.side-nav button.active svg { color:#04231e; } +.side-count { margin-left:auto; color:inherit; opacity:.72; font:10px ui-monospace,monospace; } +.quick-style-block { display:flex; flex-direction:column; gap:5px; padding-top:10px; border-top:1px solid #1b3b3b; } +.sidebar-label { color:#8ba49f; font:9px ui-monospace,monospace; letter-spacing:.13em; } +.quick-style-block > .sidebar-label { padding:0 8px 5px; } +.quick-style { display:flex; align-items:center; gap:9px; min-width:0; height:48px; padding:5px 7px; border:1px solid #163333; border-radius:9px; color:#e2f2ed; background:#0a2022; text-align:left; cursor:pointer; } +.quick-style:hover { border-color:#1fc8a4; background:#0e2a2a; } +.quick-style > span:last-child { display:flex; flex-direction:column; min-width:0; gap:3px; } +.quick-style strong { overflow:hidden; text-overflow:ellipsis; white-space:nowrap; font-size:10px; font-weight:650; } +.quick-style small { color:#92aaa4; font-size:9px; } +.quick-art { display:block; flex-shrink:0; width:34px; height:34px; border:1px solid #ffffff1d; border-radius:7px; object-fit:cover; background:#102526; } +.quick-trap .quick-art { background:radial-gradient(circle at 65% 30%,#b44487,#42285f 55%,#101a30); }.quick-lofi .quick-art { background:radial-gradient(circle at 65% 30%,#fd9477,#8d3c91 55%,#172743); }.quick-cinema .quick-art { background:radial-gradient(circle at 65% 30%,#ffbf5f,#713c31 55%,#172b2e); }.quick-soul .quick-art { background:radial-gradient(circle at 65% 30%,#eb6d52,#6b2b32 55%,#132737); }.quick-rock .quick-art { background:radial-gradient(circle at 65% 30%,#ed5437,#4e253d 55%,#111a2e); }.quick-edm .quick-art { background:radial-gradient(circle at 65% 30%,#48d8ef,#4a3b96 55%,#12253d); }.quick-acoustic .quick-art { background:radial-gradient(circle at 65% 30%,#e9ae61,#654631 55%,#142a2b); } +.add-style { display:flex; align-items:center; justify-content:center; gap:8px; min-height:39px; margin-top:auto; border:1px solid #23665d; border-radius:9px; color:#d6eee7; background:#0b2324; font-size:11px; cursor:pointer; } +.add-style:hover { border-color:#35dab5; color:#42e0bf; } +.workspace-main { display:grid; grid-template-columns:minmax(0,1fr) minmax(300px,31%); gap:10px; min-width:0; min-height:0; padding:10px 12px 12px; overflow:hidden; } +.center-scroll,.workspace-main > .studio-rail,.library-main,.library-rail { min-width:0; min-height:0; overflow:auto; scrollbar-width:thin; scrollbar-color:#24504d transparent; } +.center-scroll { padding:0 2px 6px 0; } +.workspace-main > .studio-rail { position:sticky; top:0; align-self:start; max-height:100%; padding:0 1px 12px 0; } +.yue2-app .request-form { width:100%; max-width:none; padding:0; gap:9px; } +.yue2-app .request-form .desk-nav { position:sticky; top:0; z-index:5; margin:0 0 1px; padding:4px 7px; border:0; border-bottom:1px solid #1b3a3a; border-radius:0; background:color-mix(in srgb,#071719 96%,transparent); box-shadow:none; } +.yue2-app .request-form .desk-nav a { position:relative; display:flex; align-items:center; gap:9px; padding:7px 9px; border-radius:8px; color:#a7beb8; font-size:10px; } +.yue2-app .request-form .desk-nav a::first-letter { display:inline-grid; } +.yue2-app .request-form .desk-nav a:hover { color:#4ce0c2; background:#102a29; } +.yue2-app .request-form .card { padding:14px; gap:11px; border-color:#193b3c; border-radius:13px; background:linear-gradient(150deg,#0d2224,#09191b); box-shadow:0 5px 18px #0002; } +.yue2-app .request-form .card:focus-within { border-color:#287d6f; box-shadow:0 0 22px #15bd9920; } +.yue2-app .request-form .card-head { margin:0; } +.yue2-app .request-form .card-head h3 { color:#e7f5f0; font-size:12px; } +.yue2-app .request-form .step-number { width:26px; height:26px; border-radius:50%; color:#05221d; background:#25d9b3; border:0; font-size:11px; font-weight:750; } +.yue2-app .request-form .field-name { color:#e4f1ed; font-size:11px; } +.yue2-app .request-form input,.yue2-app .request-form textarea,.yue2-app .request-form select { border-color:#285253; border-radius:8px; background:#061719; color:#edf7f4; font-size:11px; } +.yue2-app .request-form input:focus,.yue2-app .request-form textarea:focus,.yue2-app .request-form select:focus { border-color:#24d6b2; box-shadow:0 0 0 2px #24d6b21a; } +.yue2-app .request-form .preset-discovery button { border-color:#1c4041; border-radius:7px; background:#0a2022; color:#bfcec9; } +.yue2-app .request-form .preset-discovery button:hover,.yue2-app .request-form .preset-discovery button.chosen { border-color:#2bd9b3; color:#ecfffa; background:#0d302d; } +.yue2-app .request-form .music-mixer,.yue2-app .request-form .style-mixer { border-color:#1c3f40; border-radius:9px; background:#071819; } +.yue2-app .request-form .writer-disclosure,.yue2-app .request-form .score-editor { border-color:#204342; background:#08191b; } +.yue2-app .request-form .duration-auto { border:1px solid #26574e; border-radius:9px; background:#0b2723; } +.yue2-app .request-form .engine-card { border-color:#23594e; background:linear-gradient(100deg,#122c25,#19271c); } +.yue2-app .request-form .engine-mode { border-color:#26514b; background:#081a1b; } +.yue2-app .request-form .engine-mode button.selected { border-color:#28d8b2; color:#eafff8; background:#0c302c; } +.yue2-app .request-form .engine-indicator.active { color:#54e5c8; } +.yue2-app .request-form .engine-metrics,.yue2-app .request-form .engine-format select { border-color:#214647; background:#061719; } +.yue2-app .request-form .collapsible { border-color:#24484a; background:#091a1c; } +.yue2-app .request-form .action-bar { bottom:0; z-index:6; padding:9px; border-color:#25564d; border-radius:10px; background:#071819ed; } +.yue2-app .request-form .action-bar .generate-btn { min-height:43px; border:0; border-radius:9px; color:#03211b; background:linear-gradient(100deg,#23d7b0,#1abe98); box-shadow:0 5px 20px #20d6ad30; font-weight:750; } +.yue2-app .request-form .action-bar .ghost-btn { border-color:#28504e; border-radius:9px; background:#0a2022; color:#d4e5df; } +.library-main { padding:20px; } +.library-page-head { display:flex; justify-content:space-between; align-items:center; gap:20px; margin-bottom:18px; padding:17px; border:1px solid #1c3d3e; border-radius:14px; background:linear-gradient(110deg,#102527,#0b1b1d); } +.library-page-head h1 { margin-top:5px; font-size:24px; letter-spacing:-.04em; } +.library-page-head p:last-child { margin-top:5px; color:#95aca6; font-size:11px; } +.library-page-head button { display:flex; align-items:center; gap:8px; padding:9px 12px; border:1px solid #267467; border-radius:9px; color:#06251f; background:#22d4ad; font-size:11px; cursor:pointer; } +.library-rail { width:min(370px,30vw); padding:10px 12px 12px 0; border-left:1px solid #173436; } +.library-rail .studio-rail { padding-left:10px; } +.library-main .song-list { max-width:1000px; } +.library-main .song-list .empty { border-color:#1c3d3e; background:#0a1c1e; } +.yue2-app .request-form { display:grid; grid-template-columns:repeat(2,minmax(0,1fr)); align-items:start; } +.yue2-app .request-form > input[type=file] { display:none; } +.yue2-app .request-form > .desk-nav { grid-column:1/-1; } +.yue2-app .request-form > .sound-card,.yue2-app .request-form > .words-card,.yue2-app .request-form > #arrangement-workbench { grid-column:1/-1; } +.yue2-app .request-form > .sound-card { grid-row:2; } +.yue2-app .request-form > .words-card { grid-row:3; } +.yue2-app .request-form > #arrangement-workbench { grid-row:4; } +.yue2-app .request-form > #score-sampling { grid-column:1; grid-row:5; } +.yue2-app .request-form > #semantic-sampling { grid-column:2; grid-row:5; } +.yue2-app .request-form > .engine-card { grid-column:1/-1; grid-row:6; } +.yue2-app .request-form > #render-workbench { grid-column:1/-1; grid-row:7; } +.yue2-app .request-form > .action-bar { grid-column:1/-1; grid-row:8; } +.yue2-app .request-form .desk-nav a { justify-content:flex-start; text-align:left; } +.yue2-app .request-form .desk-nav a > span:first-child { display:grid; place-items:center; flex:0 0 27px; width:27px; height:27px; border:1px solid #315250; border-radius:50%; color:#b3c8c2; font:11px ui-monospace,monospace; } +.yue2-app .request-form .desk-nav a:first-child > span:first-child { border-color:#28d8b2; color:#03211b; background:#28d8b2; } +.yue2-app .request-form .desk-nav .step-copy { display:flex; flex-direction:column; gap:2px; } +.yue2-app .request-form .desk-nav .step-copy strong { color:#e7f5f0; font-size:10px; font-weight:650; } +.yue2-app .request-form .desk-nav .step-copy small { color:#87a49d; font-size:8px; } +.yue2-app .request-form > #score-sampling,.yue2-app .request-form > #semantic-sampling { min-height:100%; } +.yue2-app .request-form > #score-sampling summary,.yue2-app .request-form > #semantic-sampling summary { color:#e7f5f0; } +.yue2-app .request-form > #score-sampling { border-top:2px solid #22ad81; } +.yue2-app .request-form > #semantic-sampling { border-top:2px solid #2393aa; } +.yue2-app .request-form > #render-workbench { border-top:2px solid #b65c64; } +.yue2-app .request-form > .engine-card { border-top:2px solid #bc8d40; } +.yue2-app .request-form .generate-btn span { font-weight:750; } +@media(max-width:1250px) { .studio-frame { grid-template-columns:168px minmax(0,1fr); }.workspace-main { grid-template-columns:minmax(0,1fr) 290px; gap:8px; padding:8px; }.left-sidebar { padding-inline:8px; }.quick-style { height:43px; } } +@media(max-width:1250px) { .yue2-app .request-form .preset-discovery { grid-template-columns:repeat(3,minmax(0,1fr)); } } +@media(max-width:1000px) { .studio-frame { grid-template-columns:150px minmax(0,1fr); }.workspace-main { display:flex; flex-direction:column; overflow:auto; }.center-scroll { overflow:visible; }.workspace-main > .studio-rail { position:static; display:grid; grid-template-columns:repeat(2,minmax(0,1fr)); overflow:visible; max-height:none; }.workspace-main > .studio-rail > .rail-card { min-width:0; }.workspace-main > .studio-rail > .activity-card,.workspace-main > .studio-rail > .settings-card { grid-column:1/-1; } } +@media(max-width:680px) { .yue2-app { height:auto; min-height:100dvh; overflow:visible; }.yue2-app header.topbar { position:sticky; top:0; padding:0 10px; gap:9px; }.yue2-app .brand-name { font-size:14px; }.yue2-app .brand-mark { width:34px;height:34px; }.yue2-app .brand-version { display:none; }.yue2-app .status-pill { max-width:145px; height:32px; padding:0 8px; font-size:9px; }.yue2-app .volume { display:none; }.studio-frame { display:flex; height:auto; min-height:calc(100dvh - 58px); flex-direction:column; }.left-sidebar { position:sticky; top:58px; z-index:10; display:block; padding:6px 8px; overflow:visible; border-right:0; border-bottom:1px solid #173436; }.side-nav { flex-direction:row; overflow:auto; gap:5px; }.side-nav button,.side-nav a { justify-content:center; width:auto; min-width:max-content; min-height:36px; padding:0 10px; gap:7px; font-size:10px; }.side-nav a,.side-nav button:nth-child(4),.side-nav button:nth-child(5),.side-nav button:nth-child(6) { display:none; }.quick-style-block,.add-style { display:none; }.workspace-main { display:flex; overflow:visible; padding:7px; }.center-scroll { overflow:visible; }.workspace-main > .studio-rail { display:flex; overflow:visible; }.library-main { overflow:visible; padding:12px; }.library-rail { display:none; }.yue2-app .request-form { display:flex; }.yue2-app .request-form .desk-nav { top:101px; overflow:auto; justify-content:flex-start; }.yue2-app .request-form .desk-nav a { flex:0 0 auto; }.yue2-app .request-form .desk-nav .step-copy small { display:none; }.library-page-head { align-items:flex-start; }.library-page-head h1 { font-size:20px; } } +@media(max-width:680px) { .yue2-app .request-form .preset-discovery { grid-template-columns:repeat(2,minmax(0,1fr)); max-height:270px; }.yue2-app .request-form .preset-discovery button.style-tile { grid-template-columns:38px minmax(0,1fr) 12px; gap:6px; padding:5px; }.yue2-app .request-form .preset-discovery button.style-tile img { width:38px; height:38px; } } +@media(max-width:680px) { .workspace-main > .studio-rail { width:100%; max-width:100%; align-self:stretch; }.workspace-main > .studio-rail > .rail-card { width:100%; max-width:100%; } } diff --git a/tools/webui/src/theme-identities.css b/tools/webui/src/theme-identities.css new file mode 100644 index 0000000..7d0e62c --- /dev/null +++ b/tools/webui/src/theme-identities.css @@ -0,0 +1,212 @@ +/* Theme identities: geometry, typography, materials and navigation, not only hue. + Repeated data-theme raises this final layer above the legacy component skins. */ +html:root[data-theme][data-theme] { + --theme-font: 'Segoe UI', system-ui, sans-serif; + --theme-heading: var(--theme-font); + --theme-radius: 16px; + --theme-control-radius: 9px; + --theme-surface: linear-gradient(145deg,var(--bg-card-2),var(--bg-card)); + --theme-shadow: 0 12px 28px #0003, inset 0 1px #ffffff08; + --theme-backdrop: var(--bg); + --theme-sidebar: var(--bg-panel); + --theme-nav: var(--accent); + --theme-nav-ink: var(--bg); + --theme-heading-spacing: -.035em; +} +html:root[data-theme][data-theme] .yue2-app { + font-family:var(--theme-font); background:var(--theme-backdrop); +} +html:root[data-theme][data-theme] .yue2-app::before {background:none} +html:root[data-theme][data-theme] .yue2-app header.topbar { + background:var(--bg-panel); border-bottom:1px solid var(--border-strong); + box-shadow:0 4px 22px #00000012; +} +html:root[data-theme][data-theme] .yue2-app .left-sidebar {background:var(--theme-sidebar);border-right:1px solid var(--border)} +html:root[data-theme][data-theme] .yue2-app .brand-mark {background:var(--accent-grad);color:var(--bg);border-radius:var(--theme-control-radius);box-shadow:0 3px 16px color-mix(in srgb,var(--accent) 20%,transparent)} +html:root[data-theme][data-theme] .yue2-app .brand-name {font-family:var(--theme-heading);letter-spacing:var(--theme-heading-spacing);color:var(--fg)} +html:root[data-theme][data-theme] .yue2-app .side-nav :is(button,a) {border-radius:var(--theme-control-radius)} +html:root[data-theme][data-theme] .yue2-app .side-nav button.active {background:var(--theme-nav);color:var(--theme-nav-ink);box-shadow:none;border:1px solid var(--border-strong)} +html:root[data-theme][data-theme] .yue2-app :is(.request-form > .card,.studio-rail > .rail-card,.song-list > .card,.library-page-head) { + background:var(--theme-surface);border:1px solid var(--border-strong);border-radius:var(--theme-radius);box-shadow:var(--theme-shadow); +} +html:root[data-theme][data-theme] .yue2-app .request-form > .card {border-top:2px solid var(--section-accent,var(--accent))} +html:root[data-theme][data-theme] .yue2-app .creation-heading {display:block;grid-column:1/-1;padding:14px 2px 8px} +html:root[data-theme][data-theme] .yue2-app .creation-heading h1, +html:root[data-theme][data-theme] .yue2-app .library-page-head h1 {font-family:var(--theme-heading);font-size:clamp(27px,2.8vw,40px);letter-spacing:var(--theme-heading-spacing);line-height:1.15;color:var(--fg)} +html:root[data-theme][data-theme] .yue2-app .creation-heading p {color:var(--fg-dim);font-size:13px;margin-top:8px;line-height:1.6} +html:root[data-theme][data-theme] .yue2-app .request-form {display:flex;flex-direction:column;align-items:stretch} +html:root[data-theme][data-theme] .yue2-app .request-form :is(.card-head h3,.heading h3), +html:root[data-theme][data-theme] .yue2-app .rail-card-heading h2 {font-family:var(--theme-heading);letter-spacing:var(--theme-heading-spacing)} +html:root[data-theme][data-theme] .yue2-app .request-form .desk-nav {position:relative;top:auto;display:grid;grid-template-columns:repeat(4,minmax(0,1fr));gap:8px;background:transparent;border:0;padding:0 0 6px} +html:root[data-theme][data-theme] .yue2-app .request-form .desk-nav a {background:var(--bg-card-2);border:1px solid var(--border-strong);border-radius:var(--theme-control-radius);padding:13px 9px;min-width:0;gap:9px} +html:root[data-theme][data-theme] .yue2-app .request-form .desk-nav a > span:first-child {background:var(--bg-input);color:var(--accent);border-radius:var(--theme-control-radius);border:1px solid var(--border);width:30px;height:30px;flex-basis:30px} +html:root[data-theme][data-theme] .yue2-app :is(input:not([type='range']):not([type='checkbox']),select,textarea) {border-radius:var(--theme-control-radius)} +html:root[data-theme][data-theme] .yue2-app .request-form :is(.planner-group,.music-mixer,.style-mixer,.writer-disclosure,.engine-mode,.engine-metrics) {border-radius:var(--theme-control-radius)} +html:root[data-theme][data-theme] .yue2-app .request-form .action-bar {border-radius:var(--theme-radius);background:var(--bg-panel);border:1px solid var(--border-strong);box-shadow:0 -5px 22px #0002} +html:root[data-theme][data-theme] .yue2-app .request-form :is(.action-bar .generate-btn,.generate-lyrics) {background:var(--accent-grad);color:var(--bg);border-radius:var(--theme-control-radius);border:1px solid var(--accent);font-weight:750} +html:root[data-theme][data-theme] .yue2-app .sampling-control input[type=range]::-webkit-slider-thumb {background:var(--accent)} +html:root[data-theme][data-theme] .yue2-app .sampling-control input[type=range]::-moz-range-thumb {background:var(--accent)} +html:root[data-theme][data-theme] .yue2-app .status-pill.offline {color:var(--fg-dim)} + +/* CYBERPUNK: black technical panels, electric cyan, acid-yellow actions, magenta traces. */ +html:root[data-theme='cyberpunk'][data-theme] { + --bg:#080d12;--bg-panel:#0b141c;--bg-card:#101d27;--bg-card-2:#182a35;--bg-input:#08131b;--bg-btn:#20343e;--bg-btn-hover:#2b4653; + --fg:#edfaff;--fg-dim:#b1ccd5;--fg-faint:#94b6c3;--border:#284653;--border-strong:#3e6977; + --accent:#e6fa53;--accent-2:#42e7f5;--focus:#42e7f5;--accent-grad:linear-gradient(105deg,#e6fa53,#bce84f); + --waveform-dim:#37505b;--waveform-play:#e6fa53;--waveform-range:#42e7f5; + --theme-heading:'Bahnschrift','Consolas',monospace;--theme-heading-spacing:.035em; + --theme-radius:2px;--theme-control-radius:2px; + --theme-surface:linear-gradient(120deg,#10222c,#0d1822 75%); + --theme-sidebar:linear-gradient(180deg,#0b1c26,#080d12); + --theme-shadow:3px 3px 0 #0005,inset 0 1px #42e7f51c; + --theme-backdrop:linear-gradient(#42e7f507 1px,transparent 1px),linear-gradient(90deg,#42e7f507 1px,transparent 1px),#080d12; + --theme-nav:#e6fa5315;--theme-nav-ink:#e6fa53; +} +html:root[data-theme='cyberpunk'][data-theme] .yue2-app {background-size:32px 32px,32px 32px,auto} +html:root[data-theme='cyberpunk'][data-theme] .yue2-app header.topbar {border-bottom:2px solid #42e7f5;box-shadow:0 2px 24px #42e7f519} +html:root[data-theme='cyberpunk'][data-theme] .yue2-app .brand-name {text-transform:uppercase;text-shadow:2px 0 #ff4aab60} +html:root[data-theme='cyberpunk'][data-theme] .yue2-app .creation-heading {border-left:4px solid var(--accent);padding-left:18px;background:linear-gradient(90deg,#e6fa5308,transparent)} +html:root[data-theme='cyberpunk'][data-theme] .yue2-app .creation-heading h1 {text-transform:uppercase;font-weight:800} +html:root[data-theme='cyberpunk'][data-theme] .yue2-app .request-form > .card {border-top-color:#42e7f5;background-image:linear-gradient(135deg,transparent calc(100% - 13px),#42e7f5 calc(100% - 13px),#42e7f5 calc(100% - 11px),#0b141c calc(100% - 11px)),var(--theme-surface)} +html:root[data-theme='cyberpunk'][data-theme] .yue2-app .request-form > .words-card {border-top-color:#ff66b5} +html:root[data-theme='cyberpunk'][data-theme] .yue2-app .side-nav button.active {border-left:3px solid var(--accent)} +html:root[data-theme='cyberpunk'][data-theme] .yue2-app .request-form .desk-nav a {border-bottom:2px solid var(--accent-2);font-family:'Consolas',monospace} +html:root[data-theme='cyberpunk'][data-theme] .yue2-app .request-form .action-bar {border-top:3px solid var(--accent);background-image:repeating-linear-gradient(135deg,#e6fa5310 0 5px,transparent 5px 12px)} +html:root[data-theme='cyberpunk'][data-theme] .yue2-app .request-form .action-bar .generate-btn {text-transform:uppercase;letter-spacing:.1em;box-shadow:4px 4px 0 #42e7f540} + +/* DARK: a quiet graphite mastering console with machined edges and signal LEDs. */ +html:root[data-theme='dark'][data-theme] { + --bg:#101112;--bg-panel:#17191b;--bg-card:#202326;--bg-card-2:#2a2e32;--bg-input:#141719;--bg-btn:#33383c;--bg-btn-hover:#41484e; + --fg:#f0f2f3;--fg-dim:#bdc4c9;--fg-faint:#a0abb3;--border:#383e43;--border-strong:#4b535b; + --accent:#bce6cd;--accent-2:#d7bd86;--focus:#bce6cd;--accent-grad:linear-gradient(180deg,#d8efdf,#a9cdb7); + --waveform-dim:#46514b;--waveform-play:#bce6cd;--waveform-range:#d7bd86; + --theme-radius:8px;--theme-control-radius:5px;--theme-surface:linear-gradient(180deg,#282c30,#202326 75px); + --theme-sidebar:linear-gradient(90deg,#181a1c,#1c1f22); + --theme-shadow:0 8px 18px #0004,inset 0 1px #ffffff12; + --theme-nav:#303b35;--theme-nav-ink:#d9f0e2; +} +html:root[data-theme='dark'][data-theme] .yue2-app .request-form > .card {border-top:1px solid #596168} +html:root[data-theme='dark'][data-theme] .yue2-app .side-nav button.active {border-left:3px solid var(--accent)} +html:root[data-theme='dark'][data-theme] .yue2-app :is(.sidebar-label,.brand-version,.step-copy small) {font-family:'Consolas',monospace;letter-spacing:.07em} +html:root[data-theme='dark'][data-theme] .yue2-app .request-form .desk-nav a > span:first-child {border-radius:50%;box-shadow:inset 0 2px 6px #0009,0 1px #ffffff16;color:var(--accent-2)} +html:root[data-theme='dark'][data-theme] .yue2-app .rail-card-heading {border-bottom:3px double var(--border-strong)} + +/* MINT: botanical curves and a spacious, calm green drafting desk. */ +html:root[data-theme='mint'][data-theme] { + --bg:#0c1815;--bg-panel:#10251e;--bg-card:#19362b;--bg-card-2:#234538;--bg-input:#10271f;--bg-btn:#2c5141;--bg-btn-hover:#386550; + --fg:#f1faed;--fg-dim:#c3d8c6;--fg-faint:#abc5b3;--border:#385c49;--border-strong:#557962; + --accent:#b9e99e;--accent-2:#88dbbe;--focus:#c3f2a8;--accent-grad:linear-gradient(110deg,#c9eeae,#88dbbe); + --waveform-dim:#496451;--waveform-play:#b9e99e;--waveform-range:#88dbbe; + --theme-heading:'Georgia',serif;--theme-heading-spacing:-.025em;--theme-radius:24px;--theme-control-radius:14px; + --theme-surface:linear-gradient(145deg,#1f3d30,#152e25);--theme-sidebar:linear-gradient(170deg,#1e392b,#10251e 70%); + --theme-shadow:0 10px 28px #020c0730,inset 0 1px #d2ffcd12; + --theme-nav:#c5e7ad;--theme-nav-ink:#153023; + --theme-backdrop:radial-gradient(ellipse at 100% 0,#6fa86a20,transparent 55%),#0c1815; +} +html:root[data-theme='mint'][data-theme] .yue2-app .creation-heading {border-bottom:1px solid var(--border);padding-bottom:20px} +html:root[data-theme='mint'][data-theme] .yue2-app .creation-heading h1 {font-weight:400} +html:root[data-theme='mint'][data-theme] .yue2-app .request-form > .card {border-top-width:1px;border-radius:24px 8px 24px 24px;padding:20px} +html:root[data-theme='mint'][data-theme] .yue2-app .request-form > .card.collapsible {padding:0} +html:root[data-theme='mint'][data-theme] .yue2-app .request-form .desk-nav a {border-radius:22px 7px 22px 22px} +html:root[data-theme='mint'][data-theme] .yue2-app .request-form .desk-nav a > span:first-child {border-radius:50% 50% 8px 50%;background:#b9e99e18} +html:root[data-theme='mint'][data-theme] .yue2-app .brand-mark {border-radius:15px 4px 15px 15px} + +/* BURNT ORANGE: smoked walnut, cream typography and brass analog details. */ +html:root[data-theme='burnt-orange'][data-theme] { + --bg:#1b1612;--bg-panel:#261f18;--bg-card:#34291f;--bg-card-2:#453529;--bg-input:#211b15;--bg-btn:#55412f;--bg-btn-hover:#67513c; + --fg:#fff0d8;--fg-dim:#e0c8a5;--fg-faint:#c8ad89;--border:#634a34;--border-strong:#886644; + --accent:#ffb777;--accent-2:#e6ce8b;--focus:#ffd69f;--accent-grad:linear-gradient(180deg,#ffc088,#ed9457); + --waveform-dim:#786043;--waveform-play:#ffb777;--waveform-range:#e6ce8b; + --theme-heading:'Georgia',serif;--theme-heading-spacing:-.02em;--theme-radius:10px;--theme-control-radius:5px; + --theme-surface:radial-gradient(circle at 8px 8px,#b3966d 0 1px,#211b15 2px 3px,transparent 4px),radial-gradient(circle at calc(100% - 8px) 8px,#b3966d 0 1px,#211b15 2px 3px,transparent 4px),linear-gradient(160deg,#403326,#30261e); + --theme-sidebar:repeating-linear-gradient(92deg,#38261d 0 2px,#322219 2px 6px,#35251b 6px 11px); + --theme-shadow:0 8px 20px #0004,inset 0 0 0 3px #00000016; + --theme-nav:#dc945b;--theme-nav-ink:#241b13; + --theme-backdrop:radial-gradient(ellipse at 50% 0,#b97b2520,transparent 65%),#1b1612; +} +html:root[data-theme='burnt-orange'][data-theme] .yue2-app .request-form > .card {border-top:1px solid var(--border-strong)} +html:root[data-theme='burnt-orange'][data-theme] .yue2-app .creation-heading h1 {font-style:italic;font-weight:400} +html:root[data-theme='burnt-orange'][data-theme] .yue2-app .creation-heading {border-bottom:4px double var(--border-strong);padding-bottom:18px} +html:root[data-theme='burnt-orange'][data-theme] .yue2-app .request-form .desk-nav a {border-bottom:3px solid #bb7847;box-shadow:0 3px 0 #0004} +html:root[data-theme='burnt-orange'][data-theme] .yue2-app .request-form .desk-nav a > span:first-child {background:#e6ce8b;color:#38271a;border-radius:50%;font-family:Georgia,serif} +html:root[data-theme='burnt-orange'][data-theme] .yue2-app :is(.brand-version,.sidebar-label) {font-family:'Consolas',monospace;letter-spacing:.12em;color:var(--accent-2)} +html:root[data-theme='burnt-orange'][data-theme] .yue2-app .rail-card-heading {border-bottom:3px double var(--border-strong)} + +/* COLORFUL: a graphic record sleeve, bold section colors and offset ink shadows. */ +html:root[data-theme='colorful'][data-theme] { + --bg:#17102f;--bg-panel:#29164b;--bg-card:#35205a;--bg-card-2:#493078;--bg-input:#201337;--bg-btn:#58368a;--bg-btn-hover:#7144ac; + --fg:#fff8ef;--fg-dim:#e0d4ef;--fg-faint:#c4b8d9;--border:#675879;--border-strong:#8e78a0; + --accent:#ffe052;--accent-2:#46efda;--focus:#ffe052;--accent-grad:linear-gradient(110deg,#ffe052,#ffad69 48%,#ff8ecb); + --waveform-dim:#8060a5;--waveform-play:#ffe052;--waveform-range:#46efda; + --theme-heading:'Trebuchet MS','Segoe UI',sans-serif;--theme-heading-spacing:-.04em; + --theme-radius:18px;--theme-control-radius:12px;--theme-surface:linear-gradient(135deg,#45266a,#2b1c4a); + --theme-shadow:5px 5px 0 #080714;--theme-nav:linear-gradient(110deg,#ffe052,#ff9cb8);--theme-nav-ink:#211c38; + --theme-sidebar:linear-gradient(165deg,#512276,#292056 55%,#103f4c); + --theme-backdrop:radial-gradient(ellipse at 95% 8%,#da32944d,transparent 48%),radial-gradient(ellipse at 12% 85%,#13cdb538,transparent 48%),#17102f; +} +html:root[data-theme='colorful'][data-theme] .yue2-app header.topbar {background:linear-gradient(100deg,#49216c,#24346a 60%,#125357);border-bottom:3px solid #46efda} +html:root[data-theme='colorful'][data-theme] .yue2-app .creation-heading {padding:24px;border:1px solid #ffc7a0;border-radius:18px;background:linear-gradient(115deg,#ffe052,#ffb775 45%,#ff91c7 78%,#b8a0ff);box-shadow:5px 5px 0 #080714} +html:root[data-theme='colorful'][data-theme] .yue2-app .creation-heading h1 {font-weight:900;color:#29143f} +html:root[data-theme='colorful'][data-theme] .yue2-app .creation-heading p {color:#482348} +html:root[data-theme='colorful'][data-theme] .yue2-app .request-form > .card {border-top:5px solid var(--section-accent,var(--accent));background:linear-gradient(125deg,var(--section-tint,#45316d),#281b45)} +html:root[data-theme='colorful'][data-theme] .yue2-app .request-form > .sound-card {--section-accent:#46efda;--section-tint:#125052} +html:root[data-theme='colorful'][data-theme] .yue2-app .request-form > .words-card {--section-accent:#ff87c8;--section-tint:#602653} +html:root[data-theme='colorful'][data-theme] .yue2-app .request-form > #arrangement-workbench {--section-accent:#ffe052;--section-tint:#594027} +html:root[data-theme='colorful'][data-theme] .yue2-app .request-form > .engine-card {--section-accent:#bba0ff;--section-tint:#482b80} +html:root[data-theme='colorful'][data-theme] .yue2-app .request-form .card-head h3 {color:var(--section-accent,var(--accent))} +html:root[data-theme='colorful'][data-theme] .yue2-app .request-form .desk-nav a {--step-color:#46efda;background:var(--step-color);border:2px solid #110e20;box-shadow:3px 3px 0 #080714} +html:root[data-theme='colorful'][data-theme] .yue2-app .request-form .desk-nav a:nth-child(2) {--step-color:#ff87c8} +html:root[data-theme='colorful'][data-theme] .yue2-app .request-form .desk-nav a:nth-child(3) {--step-color:#ffe052} +html:root[data-theme='colorful'][data-theme] .yue2-app .request-form .desk-nav a:nth-child(4) {--step-color:#bba0ff} +html:root[data-theme='colorful'][data-theme] .yue2-app .request-form .desk-nav .step-copy :is(strong,small) {color:#241b35} +html:root[data-theme='colorful'][data-theme] .yue2-app .request-form .desk-nav a > span:first-child {background:#241b35;color:var(--step-color);border-radius:50%} +html:root[data-theme='colorful'][data-theme] .yue2-app .brand-mark {transform:rotate(-7deg);box-shadow:3px 3px 0 #080714} +html:root[data-theme='colorful'][data-theme] .yue2-app .studio-rail > .rail-card:nth-child(2n) {background:linear-gradient(135deg,#164e58,#29214e);border-top:3px solid #46efda} +html:root[data-theme='colorful'][data-theme] .yue2-app .request-form .action-bar {background:linear-gradient(110deg,#48236a,#203d57);border-color:#bba0ff} +html:root[data-theme='colorful'][data-theme] .yue2-app .request-form :is(.action-bar .generate-btn,.generate-lyrics) {color:#29143f;box-shadow:0 4px 18px #ff87c82e} + +/* STUDIO GLASS: translucent pearl panels, fine edges and a floating navigation dock. */ +html:root[data-theme='studio'][data-theme] { + --theme-radius:22px;--theme-control-radius:12px; + --theme-surface:linear-gradient(135deg,#ffffffed,#f5f8ffcc); + --theme-shadow:0 12px 30px #526b9c15,inset 0 1px #fff; + --theme-sidebar:linear-gradient(165deg,#29364f,#263149 70%,#35344f); + --theme-nav:linear-gradient(110deg,#aff0e2,#d4ccff);--theme-nav-ink:#24334f; + --theme-backdrop:radial-gradient(ellipse at 25% 0,#ded6fa,transparent 48%),radial-gradient(ellipse at 100% 35%,#c6e8f3,transparent 50%),radial-gradient(ellipse at 55% 100%,#f7dfcd,transparent 42%),#edf1fa; +} +html:root[data-theme='studio'][data-theme] .yue2-app header.topbar {background:#ffffff9e;backdrop-filter:blur(22px);border-bottom-color:#fff} +html:root[data-theme='studio'][data-theme] .yue2-app :is(.request-form > .card,.studio-rail > .rail-card) {backdrop-filter:blur(14px)} +html:root[data-theme='studio'][data-theme] .yue2-app .request-form > .card {border-top:1px solid #fff} +html:root[data-theme='studio'][data-theme] .yue2-app .creation-heading h1 {font-weight:650} +html:root[data-theme='studio'][data-theme] .yue2-app .request-form .desk-nav {padding:8px;background:#ffffff60;border:1px solid #ffffffc9;border-radius:22px;box-shadow:0 6px 22px #55658f12} +html:root[data-theme='studio'][data-theme] .yue2-app .request-form .desk-nav::before {display:none} +html:root[data-theme='studio'][data-theme] .yue2-app .request-form .desk-nav a {flex-direction:row;text-align:left;border:1px solid #ffffffd9;border-radius:15px;background:#ffffff9c;box-shadow:0 3px 10px #55658f0c;padding:12px 8px} +html:root[data-theme='studio'][data-theme] .yue2-app .request-form .desk-nav a > span:first-child {border-radius:10px;background:#e0f4ef;color:#176358} +html:root[data-theme='studio'][data-theme] .yue2-app .request-form .desk-nav a:nth-child(2) > span:first-child {background:#ebe3f8;color:#654794} +html:root[data-theme='studio'][data-theme] .yue2-app .request-form .desk-nav a:nth-child(3) > span:first-child {background:#fae8dd;color:#8d5030} +html:root[data-theme='studio'][data-theme] .yue2-app .request-form .desk-nav a:nth-child(4) > span:first-child {background:#e0edf9;color:#355f94} +html:root[data-theme='studio'][data-theme] .yue2-app .request-form .desk-nav .step-copy strong {font-size:12px} +html:root[data-theme='studio'][data-theme] .yue2-app .request-form :is(.action-bar .generate-btn,.generate-lyrics) {background:linear-gradient(110deg,#196e68,#405e93);color:#fff} + +@media(max-width:1100px) { + html:root[data-theme][data-theme] .yue2-app .request-form .desk-nav .step-copy small {display:none} +} +@media(max-width:680px) { + html:root[data-theme][data-theme] .yue2-app .creation-heading {padding-top:8px} + html:root[data-theme][data-theme] .yue2-app .creation-heading h1 {font-size:27px} + html:root[data-theme][data-theme] .yue2-app .request-form .desk-nav {grid-template-columns:repeat(2,minmax(0,1fr));gap:7px} + html:root[data-theme][data-theme] .yue2-app .request-form .desk-nav a {padding:9px} + html:root[data-theme][data-theme] .yue2-app .brand-name {font-size:16px;letter-spacing:-.03em} + html:root[data-theme][data-theme] .yue2-app .topbar-theme select {width:116px;padding-inline:7px} + html:root[data-theme][data-theme] .yue2-app .request-form > .card:not(.collapsible) {padding:12px} +} +@media(prefers-reduced-motion:reduce) { + html:root[data-theme][data-theme] .yue2-app *,html:root[data-theme][data-theme] .yue2-app *::before,html:root[data-theme][data-theme] .yue2-app *::after {animation:none!important;transition:none!important;scroll-behavior:auto!important} +} +/* Keep secondary actions legible on the light glass action bar. */ +html:root[data-theme='studio'][data-theme] .yue2-app .request-form .action-bar .ghost-btn {background:#e6edf9;color:#344568;border-color:#899dc1} +@media(max-width:680px) { + html:root[data-theme][data-theme] .yue2-app .side-nav :is(button,a) {display:flex;flex-shrink:0} + html:root[data-theme][data-theme] .yue2-app .sidebar-albums {display:none} + html:root[data-theme][data-theme] .yue2-app .request-form .desk-nav a {min-height:52px} +} diff --git a/tools/webui/src/theme-readability.css b/tools/webui/src/theme-readability.css new file mode 100644 index 0000000..ab94e4c --- /dev/null +++ b/tools/webui/src/theme-readability.css @@ -0,0 +1,101 @@ +/* Shared contrast and surface hierarchy; each palette owns its hue. */ +html:root[data-theme='dark'] {--bg:#090c14;--bg-panel:#111725;--bg-card:#1b2334;--bg-card-2:#263148;--bg-input:#101726;--fg:#f2f5ff;--fg-dim:#c1cce0;--fg-faint:#a2b1cd;--border:#61769b66;--border-strong:#879bca99;--accent:#b299ff;--accent-2:#79d4f0;--focus:#bba9ff;} +html:root[data-theme='mint'] {--bg:#051415;--bg-panel:#0b2325;--bg-card:#143335;--bg-card-2:#204547;--bg-input:#0b2326;--fg:#effff9;--fg-dim:#c0ddd3;--fg-faint:#9ac5ba;--border:#67b6a76b;--border-strong:#75d3bd99;--accent:#57edc6;--accent-2:#6dd9e0;--focus:#77fbdc;} +html:root[data-theme='cyberpunk'] {--bg:#10051b;--bg-panel:#1d0e2c;--bg-card:#2d1742;--bg-card-2:#402358;--bg-input:#1a0c29;--fg:#fff2ff;--fg-dim:#e1c5f1;--fg-faint:#cba7e0;--border:#b477c56b;--border-strong:#d497eb99;--accent:#f4b6fb;--accent-2:#73e6f0;--focus:#73e6f0;} +html:root[data-theme='colorful'] {--bg:#0c142c;--bg-panel:#142544;--bg-card:#213c60;--bg-card-2:#304f76;--bg-input:#142743;--fg:#f6f8ff;--fg-dim:#c8dafa;--fg-faint:#adc7ea;--border:#7a9fd175;--border-strong:#9ebbe6a8;--accent:#ffacd7;--accent-2:#ffe17e;--focus:#ffe17e;} +html:root[data-theme='burnt-orange'] {--bg:#180c08;--bg-panel:#29170f;--bg-card:#422619;--bg-card-2:#5b3724;--bg-input:#27160f;--fg:#fff6e9;--fg-dim:#edcfb2;--fg-faint:#d8b08e;--border:#bd875e75;--border-strong:#e4a36ba8;--accent:#ffba70;--accent-2:#ffe09a;--focus:#ffca8e;} +html:root[data-theme='studio'] {--bg-card:#f8faff;--bg-card-2:#e6edf9;--bg-input:#ffffffcf;--fg:#17213f;--fg-dim:#435575;--fg-faint:#526483;--border:#718ab754;--border-strong:#607ca58c;--accent:#086c65;--accent-2:#6550b0;} + +html:root[data-theme]:not([data-theme='studio']) .yue2-app {background:radial-gradient(ellipse at 70% 0,color-mix(in srgb,var(--accent) 7%,transparent),transparent 60%),var(--bg);} +html:root[data-theme]:not([data-theme='studio']) .yue2-app header.topbar {background:var(--bg-panel);border-color:var(--border);} +html:root[data-theme]:not([data-theme='studio']) .yue2-app .left-sidebar {background:linear-gradient(180deg,var(--bg-panel),var(--bg));border-color:var(--border);} +html:root[data-theme]:not([data-theme='studio']) .yue2-app .side-nav button, +html:root[data-theme]:not([data-theme='studio']) .yue2-app .side-nav a {color:var(--fg-dim);} +html:root[data-theme]:not([data-theme='studio']) .yue2-app .side-nav button.active {background:linear-gradient(110deg,var(--accent),color-mix(in srgb,var(--accent) 65%,var(--accent-2)));color:var(--bg);box-shadow:0 4px 16px color-mix(in srgb,var(--accent) 15%,transparent);} +html:root[data-theme]:not([data-theme='studio']) .yue2-app .side-nav button.active svg {color:inherit;} +html:root[data-theme]:not([data-theme='studio']) .yue2-app .quick-style {background:var(--bg-card);border-color:var(--border);color:var(--fg);} +html:root[data-theme]:not([data-theme='studio']) .yue2-app .quick-style small, +html:root[data-theme]:not([data-theme='studio']) .yue2-app .sidebar-label {color:var(--fg-dim);} +html:root[data-theme]:not([data-theme='studio']) .yue2-app .add-style {background:var(--bg-card-2);border-color:var(--border-strong);color:var(--fg);} +html:root[data-theme]:not([data-theme='studio']) .yue2-app .status-pill {background:var(--bg-card);border-color:var(--border);color:var(--accent);} +html:root[data-theme] .yue2-app .brand-version {color:var(--accent);border-color:var(--border-strong);} +html:root[data-theme] .yue2-app .volume, +html:root[data-theme] .yue2-app .settings-shortcut {color:var(--fg-dim);} +html:root[data-theme] .yue2-app .volume input[type='range'] {accent-color:var(--accent);} + +html:root[data-theme] .yue2-app .request-form {gap:18px;} +html:root[data-theme] .yue2-app .request-form > .card, +html:root[data-theme] .yue2-app .studio-rail > .rail-card, +html:root[data-theme] .yue2-app .song-list > .card { + border:1px solid var(--border-strong);border-radius:18px; + box-shadow:0 8px 22px #00000020,inset 0 1px 0 #ffffff0a; +} +html:root[data-theme]:not([data-theme='studio']) .yue2-app .request-form > .card, +html:root[data-theme]:not([data-theme='studio']) .yue2-app .studio-rail > .rail-card, +html:root[data-theme]:not([data-theme='studio']) .yue2-app .song-list > .card { + background:linear-gradient(125deg,color-mix(in srgb,var(--bg-card) 93%,var(--accent)),var(--bg-card)); +} +html:root[data-theme] .yue2-app .studio-rail {gap:16px;} +html:root[data-theme] .yue2-app .request-form > .card {--section-accent:var(--accent);border-top:3px solid var(--section-accent);} +html:root[data-theme] .yue2-app .request-form > .producer {--section-accent:var(--accent-2);} +html:root[data-theme] .yue2-app .request-form > .words-card {--section-accent:color-mix(in srgb,var(--accent) 40%,var(--accent-2));} +html:root[data-theme] .yue2-app .request-form > .engine-card {--section-accent:var(--accent-2);} +html:root[data-theme] .yue2-app .request-form .card-head h3, +html:root[data-theme] .yue2-app .request-form .heading h3 {color:var(--fg);font-size:16px;letter-spacing:0;font-weight:700;} +html:root[data-theme] .yue2-app .request-form .sound-card > .card-head h3 {font-size:20px;} +html:root[data-theme] .yue2-app .request-form .card-head, +html:root[data-theme] .yue2-app .request-form .producer > .heading {padding-bottom:10px;border-bottom:1px solid var(--border);gap:10px;} +html:root[data-theme] .yue2-app .rail-card-heading {padding-bottom:10px;border-bottom:1px solid var(--border);margin-bottom:12px;} +html:root[data-theme] .yue2-app .rail-card-heading h2 {font-size:16px;color:var(--fg);} +html:root[data-theme] .yue2-app .request-form .field-name {color:var(--fg);font-size:12px;} +html:root[data-theme] .yue2-app .request-form .help-text, +html:root[data-theme] .yue2-app .request-form .section-meta, +html:root[data-theme] .yue2-app .request-form .mixer-help, +html:root[data-theme] .yue2-app .request-form .field-name small {color:var(--fg-dim);font-size:11px;line-height:1.5;} +html:root[data-theme] .yue2-app .request-form input:not([type='range']):not([type='checkbox']), +html:root[data-theme] .yue2-app .request-form select, +html:root[data-theme] .yue2-app .request-form textarea {background:var(--bg-input);border:1px solid var(--border-strong);color:var(--fg);font-size:12px;} +html:root[data-theme] .yue2-app input::placeholder, +html:root[data-theme] .yue2-app textarea::placeholder {color:var(--fg-faint);opacity:1;} +html:root[data-theme] .yue2-app .request-form .planner-group, +html:root[data-theme] .yue2-app .request-form .music-mixer, +html:root[data-theme] .yue2-app .request-form .style-mixer, +html:root[data-theme] .yue2-app .request-form .writer-disclosure, +html:root[data-theme] .yue2-app .request-form .duration-auto, +html:root[data-theme] .yue2-app .request-form .score-editor, +html:root[data-theme] .yue2-app .request-form .engine-mode, +html:root[data-theme] .yue2-app .request-form .engine-metrics {background:var(--bg-input);border-color:var(--border);color:var(--fg);border-radius:12px;} +html:root[data-theme] .yue2-app .request-form .planner-group h4 {color:var(--accent);} +html:root[data-theme] .yue2-app .request-form .toolbar .tool-btn, +html:root[data-theme] .yue2-app .request-form .engine-mode button {background:var(--bg-card-2);border-color:var(--border-strong);color:var(--fg);} +html:root[data-theme] .yue2-app .request-form .engine-mode button.selected {background:color-mix(in srgb,var(--accent) 18%,var(--bg-card-2));border-color:var(--accent);color:var(--fg);} +html:root[data-theme] .yue2-app .request-form > #arrangement-workbench > .card-head, +html:root[data-theme] .yue2-app .request-form > #score-sampling > summary, +html:root[data-theme] .yue2-app .request-form > #semantic-sampling > summary, +html:root[data-theme] .yue2-app .request-form > #render-workbench > summary { + background:color-mix(in srgb,var(--accent) 12%,var(--bg-card-2));color:var(--fg);font-size:13px;border-bottom:1px solid var(--border-strong);min-height:42px; +} +html:root[data-theme] .yue2-app .request-form > #semantic-sampling > summary {background:color-mix(in srgb,var(--accent-2) 14%,var(--bg-card-2));} +html:root[data-theme]:not([data-theme='studio']) .yue2-app .request-form .desk-nav {background:var(--bg-panel);border:1px solid var(--border);border-radius:12px;padding:8px;} +html:root[data-theme]:not([data-theme='studio']) .yue2-app .request-form .desk-nav a {background:var(--bg-card);border:1px solid var(--border);border-radius:10px;} +html:root[data-theme]:not([data-theme='studio']) .yue2-app .request-form .desk-nav .step-copy strong {color:var(--fg);font-size:12px;} +html:root[data-theme]:not([data-theme='studio']) .yue2-app .request-form .desk-nav .step-copy small {color:var(--fg-dim);font-size:10px;} +html:root[data-theme]:not([data-theme='studio']) .yue2-app .request-form .desk-nav a > span:first-child {background:var(--bg-card-2);color:var(--accent);border-color:var(--border-strong);} +html:root[data-theme]:not([data-theme='studio']) .yue2-app .request-form .action-bar {padding:10px;background:var(--bg-card-2);border:1px solid var(--border-strong);box-shadow:0 -5px 25px #0003;} +html:root[data-theme]:not([data-theme='studio']) .yue2-app .request-form .action-bar .generate-btn, +html:root[data-theme]:not([data-theme='studio']) .yue2-app .request-form .generate-lyrics {background:linear-gradient(110deg,var(--accent),color-mix(in srgb,var(--accent) 60%,var(--accent-2)));color:var(--bg);border-color:var(--accent);box-shadow:0 5px 18px color-mix(in srgb,var(--accent) 15%,transparent);} +html:root[data-theme]:not([data-theme='studio']) .yue2-app .request-form .action-bar .ghost-btn {background:var(--bg-input);color:var(--fg);border-color:var(--border-strong);} +html:root[data-theme] .yue2-app .recent-info strong, +html:root[data-theme] .yue2-app .preview-track-title strong, +html:root[data-theme] .yue2-app .rail-setting strong {color:var(--fg);} +html:root[data-theme] .yue2-app .recent-info small, +html:root[data-theme] .yue2-app .rail-setting span {color:var(--fg-dim);} +html:root[data-theme] .yue2-app .recent-track {border:1px solid var(--border);background:var(--bg-input);} +html:root[data-theme] .yue2-app .song-list .wave-wrap {background:var(--bg-input);border-color:var(--border-strong);} +html:root[data-theme] .yue2-app .style-chip.lyric {color:var(--fg-dim);border-color:var(--border-strong);} +html:root[data-theme] .yue2-app :focus-visible {outline:2px solid var(--focus);outline-offset:3px;} +@media(max-width:680px) { + html:root[data-theme] .yue2-app .request-form .card-head h3 {font-size:14px;} + html:root[data-theme] .yue2-app .request-form .card-head {flex-wrap:wrap;} + html:root[data-theme]:not([data-theme='studio']) .yue2-app .request-form .desk-nav {gap:5px;} +} diff --git a/tools/webui/tests/completed-tracks.test.mjs b/tools/webui/tests/completed-tracks.test.mjs new file mode 100644 index 0000000..c08af61 --- /dev/null +++ b/tools/webui/tests/completed-tracks.test.mjs @@ -0,0 +1,28 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { completedTracks } from '../src/lib/completed-tracks.ts'; + +const track = profile => ({ request: { style: '', abc_sampling: {}, semantic_sampling: {}, ...(profile === undefined ? {} : { mastering_profile: profile }) }, audio: new Blob([profile ?? 'dry']) }); +test('sparse original and master land as one song with both audio versions', () => { + for (const profile of ['streaming', 'broadcast']) { + for (const off of [undefined, 'off']) { + const dry = track(off), master = track(profile); + const result = completedTracks([dry, master]); + assert.equal(result.length, 1); + assert.equal(result[0].audio, master.audio); + assert.equal(result[0].originalAudio, dry.audio); + } + } +}); +test('unmastered batches remain separate songs', () => { + const tracks = [track(), track()]; + assert.deepEqual(completedTracks(tracks), tracks); +}); +test('multiple mastered songs retain their own original audio', () => { + const a = track(), b = track('streaming'), c = track(), d = track('streaming'); + const result = completedTracks([a, b, c, d]); + assert.equal(result.length, 2); + assert.equal(result[0].originalAudio, a.audio); + assert.equal(result[1].originalAudio, c.audio); + assert.equal(result[1].audio, d.audio); +}); diff --git a/tools/webui/tests/generation-request.test.mjs b/tools/webui/tests/generation-request.test.mjs new file mode 100644 index 0000000..7120877 --- /dev/null +++ b/tools/webui/tests/generation-request.test.mjs @@ -0,0 +1,20 @@ +import { test } from 'node:test'; +import assert from 'node:assert/strict'; +import { prepareGeneration } from '../src/lib/generation-request.ts'; + +test('fresh songs omit persisted score/codes and redraw both seeds on every request', t => { + let seed = 500; + t.mock.method(globalThis.crypto, 'getRandomValues', array => { array[0] = seed++; return array; }); + const saved = { style: 'UK Drill', lyrics: 'Keep these lyrics', abc: 'old composition', semantic_tokens: '1,2,3', lm_seed: 42, seed: 9, duration: 90, mastering_profile: 'streaming', abc_sampling: {}, semantic_sampling: {} }; + const first = prepareGeneration(saved, true); + const second = prepareGeneration({ ...saved, style: 'Jazz Rap' }, true); + for (const request of [first, second]) { + assert.ok(!('abc' in request)); assert.ok(!('semantic_tokens' in request)); + assert.equal(request.lyrics, saved.lyrics); assert.equal(request.duration, 90); + assert.equal(request.mastering_profile, 'streaming'); + } + assert.equal(first.style, 'UK Drill'); assert.equal(second.style, 'Jazz Rap'); + assert.deepEqual([first.lm_seed, first.seed, second.lm_seed, second.seed], [500,501,502,503]); + assert.equal(saved.abc, 'old composition'); assert.equal(saved.semantic_tokens, '1,2,3'); + assert.deepEqual(prepareGeneration(saved, false), saved, 'explicit reuse preserves replay data'); +}); diff --git a/tools/webui/tests/lyrics-browser.mjs b/tools/webui/tests/lyrics-browser.mjs new file mode 100644 index 0000000..a350f54 --- /dev/null +++ b/tools/webui/tests/lyrics-browser.mjs @@ -0,0 +1,124 @@ +// Isolated browser profile and preview origin: never changes the user's library. +import http from 'node:http'; +import fs from 'node:fs'; +import os from 'node:os'; +import path from 'node:path'; +import { spawn } from 'node:child_process'; +import assert from 'node:assert/strict'; +import { fileURLToPath } from 'node:url'; + +const root = fileURLToPath(new URL('../../../', import.meta.url)); +const output = path.join(root, 'build/ui-review'); +fs.mkdirSync(output, { recursive: true }); +const html = fs.readFileSync(new URL('../dist/index.html', import.meta.url)); +const submitted = []; +const server = http.createServer((req, res) => { + if (req.url === '/synth') { + let body='';req.on('data',chunk=>body+=chunk);req.on('end',()=>{submitted.push(JSON.parse(body));res.writeHead(400,{'Content-Type':'application/json'});res.end(JSON.stringify({error:'Preview capture only; no generation.'}));});return; + } + if (['/props', '/logs', '/health'].includes(req.url)) { + const upstream = http.get(`http://127.0.0.1:8087${req.url}`, response => { res.writeHead(response.statusCode, response.headers); response.pipe(res); }); + upstream.on('error', () => { res.writeHead(502); res.end(); }); + res.on('close', () => upstream.destroy()); + } else { res.writeHead(200, { 'Content-Type': 'text/html' }); res.end(html); } +}); +await new Promise(resolve => server.listen(18788, '127.0.0.1', resolve)); +const profile = fs.mkdtempSync(path.join(os.tmpdir(), 'yue2-ui-review-')); +const browser = spawn('C:/Program Files/Google/Chrome/Application/chrome.exe', [ + '--headless=new', '--remote-debugging-port=19229', `--user-data-dir=${profile}`, + '--no-first-run', '--no-default-browser-check', '--disable-background-networking', '--mute-audio', '--autoplay-policy=no-user-gesture-required', 'about:blank' +], { windowsHide: true, stdio: 'ignore' }); +let ws; +let sequence = 0; +const pending = new Map(); +const errors = []; +const delay = ms => new Promise(resolve => setTimeout(resolve, ms)); +function send(method, params = {}) { + return new Promise((resolve, reject) => { + const id = ++sequence; + const timer = setTimeout(() => { pending.delete(id); reject(new Error(`CDP timeout: ${method}`)); }, 10000); + pending.set(id, { resolve, reject, timer }); + ws.send(JSON.stringify({ id, method, params })); + }); +} +const evaluate = async expression => { + const result = await send('Runtime.evaluate', { expression, returnByValue: true, awaitPromise: true }); + if (result.exceptionDetails) throw new Error(JSON.stringify(result.exceptionDetails)); + return result.result.value; +}; +try { + let target; + for (let n = 0; n < 60; n++) { + try { target = (await (await fetch('http://127.0.0.1:19229/json')).json()).find(item => item.type === 'page'); if (target) break; } catch {} + await delay(200); + } + assert.ok(target, 'Chrome debugging target unavailable'); + ws = new WebSocket(target.webSocketDebuggerUrl); + await new Promise(resolve => ws.addEventListener('open', resolve, { once: true })); + ws.addEventListener('message', event => { + const message = JSON.parse(event.data); + if (message.method === 'Runtime.exceptionThrown') errors.push(message.params.exceptionDetails.text); + if (message.id && pending.has(message.id)) { + const task = pending.get(message.id); pending.delete(message.id); clearTimeout(task.timer); + if (message.error) task.reject(new Error(JSON.stringify(message.error))); else task.resolve(message.result); + } + }); + await send('Runtime.enable'); + await send('Page.enable'); + await send('Emulation.setDeviceMetricsOverride', { width: 1440, height: 1000, deviceScaleFactor: 1, mobile: false }); + await send('Page.navigate', { url: 'http://127.0.0.1:18788' }); + await delay(1800); + const lyricCalls=[]; + ws.addEventListener('message',async event=>{ + const msg=JSON.parse(event.data);if(msg.method!=='Fetch.requestPaused')return; + const {requestId,request}=msg.params; + let data; + if(request.method==='OPTIONS')data={}; + else if(request.url.endsWith('/api/tags'))data={models:[{name:'lyric-test',size:100}]}; + else {lyricCalls.push(JSON.parse(request.postData));data={response:'[Verse]\nA fresh test verse with a rhythmic rhyme.'};} + await send('Fetch.fulfillRequest',{requestId,responseCode:200,responseHeaders:[{name:'Content-Type',value:'application/json'},{name:'Access-Control-Allow-Origin',value:'*'},{name:'Access-Control-Allow-Headers',value:'content-type'},{name:'Access-Control-Allow-Methods',value:'GET, POST, OPTIONS'}],body:Buffer.from(JSON.stringify(data)).toString('base64')}); + }); + await send('Fetch.enable',{patterns:[{urlPattern:'*/ollama/*'}]}); + await send('Page.reload');await delay(1000); + await evaluate("document.querySelector('#lyrics-editor').open=true"); + assert.equal(await evaluate("document.querySelector('[aria-label=\"Primary lyric style\"] optgroup').children.length"),30); + await evaluate("{const input=document.querySelector('#lyrics-editor > .lyrics-content > .field textarea');input.value='My existing lyrics';input.dispatchEvent(new Event('input',{bubbles:true}))}"); + const select=async id=>{await evaluate(`{const input=document.querySelector('[aria-label="Primary lyric style"]');input.value=${JSON.stringify(id)};input.dispatchEvent(new Event('change',{bubbles:true}))}`);await delay(80)}; + await select('pack_01_fast_punchy'); + assert.equal(await evaluate("document.querySelector('#lyrics-editor > .lyrics-content > .field textarea').value"),'My existing lyrics'); + assert.ok(await evaluate("document.querySelector('.lyric-profile-selector p').textContent.includes('compact bars')")); + await evaluate("document.querySelector('.writer-disclosure').open=true;const topic=document.querySelector('#lyric-workbench > textarea');topic.value='Finding your voice';topic.dispatchEvent(new Event('input',{bubbles:true}))"); + await evaluate("document.querySelector('.generate-lyrics').click()");await delay(350); + assert.equal(lyricCalls.length,1); + assert.match(lyricCalls[0].prompt,/PRIMARY STYLE.*\n# Fast Punchy/); + assert.match(lyricCalls[0].prompt,/## Mandatory Writing Rules/); + assert.match(lyricCalls[0].prompt,/## Style Compliance Check/); + assert.match(lyricCalls[0].prompt,/Finding your voice/); + assert.match(lyricCalls[0].prompt,/rewrite|revise/); + assert.equal(await evaluate("document.querySelector('#lyrics-editor > .lyrics-content > .field textarea').value"),'My existing lyrics','generated draft requires Use these lyrics'); + await select('pack_30_experimental_flow'); + await evaluate("document.querySelector('.generate-lyrics').click()");await delay(350); + assert.match(lyricCalls.at(-1).prompt,/# Experimental Flow/); + assert.doesNotMatch(lyricCalls.at(-1).prompt,/# Fast Punchy/); + await send('Page.reload');await delay(900); + await evaluate("document.querySelector('#lyrics-editor').open=true"); + assert.equal(await evaluate("document.querySelector('[aria-label=\"Primary lyric style\"]').value"),'pack_30_experimental_flow'); + await select('syllable_dense'); + await evaluate("document.querySelector('.writer-disclosure').open=true;document.querySelector('.generate-lyrics').click()");await delay(350); + assert.match(lyricCalls.at(-1).prompt,/technical_rules/,'legacy engine remains usable'); + await select('pack_02_syllable_dense'); + await evaluate("document.querySelector('.writer-disclosure').open=false"); + for(const [width,height,name] of [[1440,1000,'lyrics-desktop'],[390,844,'lyrics-mobile']]) { + await send('Emulation.setDeviceMetricsOverride',{width,height,deviceScaleFactor:1,mobile:width<500}); + await evaluate("document.querySelector('#lyrics-editor').scrollIntoView({block:'start',behavior:'instant'})");await delay(150); + assert.ok(await evaluate('document.documentElement.scrollWidth <= innerWidth'),name+' overflow'); + const capture=await send('Page.captureScreenshot',{format:'png'});fs.writeFileSync(path.join(output,name+'.png'),Buffer.from(capture.data,'base64')); + } + await evaluate("document.querySelector('.generate-btn').click()");await delay(300); + assert.doesNotMatch(submitted.at(-1).style,/Mandatory Writing Rules|Syllable Dense/,'lyric profiles do not pollute music style'); + assert.deepEqual(errors,[]); + console.log('PASS: 30 profiles visible, style-specific full instructions sent to lyric model, draft review, existing lyrics preserved, persistence, legacy compatibility, music/lyric separation, desktop/mobile.'); +} finally { + if(ws?.readyState===WebSocket.OPEN){try{await send('Browser.close')}catch{}ws.close()} + browser.kill();server.closeAllConnections();await new Promise(resolve=>server.close(resolve)); +} diff --git a/tools/webui/tests/ollama-fallback.test.mjs b/tools/webui/tests/ollama-fallback.test.mjs new file mode 100644 index 0000000..66a653c --- /dev/null +++ b/tools/webui/tests/ollama-fallback.test.mjs @@ -0,0 +1,5 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import {writeLyrics} from '../src/lib/ollama.ts'; +test('CUDA failure retries once on CPU and reports the slower path',async()=>{const original=globalThis.fetch,requests=[],notices=[];try{globalThis.fetch=async(url,init)=>{requests.push(JSON.parse(init.body));return requests.length===1?Response.json({error:'CUDA error: shared object initialization failed'},{status:500}):Response.json({response:'[Verse]\nRain turns into gold'});};const result=await writeLyrics('test','prompt',new AbortController().signal,m=>notices.push(m));assert.match(result,/Rain/);assert.equal(requests.length,2);assert.equal(requests[1].options.num_gpu,0);assert.equal(requests[1].keep_alive,0);assert.match(notices[0],/CPU/);}finally{globalThis.fetch=original;}}); +test('ordinary errors do not resubmit or overwrite lyrics',async()=>{const original=globalThis.fetch;let calls=0;try{globalThis.fetch=async()=>{calls++;return Response.json({error:'model missing'},{status:404});};await assert.rejects(writeLyrics('missing','prompt',new AbortController().signal),/model missing/);assert.equal(calls,1);}finally{globalThis.fetch=original;}}); diff --git a/tools/webui/tests/producer-browser.mjs b/tools/webui/tests/producer-browser.mjs new file mode 100644 index 0000000..1635b8d --- /dev/null +++ b/tools/webui/tests/producer-browser.mjs @@ -0,0 +1,81 @@ +// Disposable profile and mocked generation: never touches the live library/GPU. +import http from 'node:http'; +import fs from 'node:fs'; +import os from 'node:os'; +import path from 'node:path'; +import { spawn } from 'node:child_process'; +import assert from 'node:assert/strict'; +const html=fs.readFileSync(new URL('../dist/index.html',import.meta.url)); +const jobs=new Map(), submitted=[]; +let hold=false, active=0, maxActive=0; +const wav=Buffer.alloc(48044);wav.write('RIFF');wav.writeUInt32LE(wav.length-8,4);wav.write('WAVEfmt ',8);wav.writeUInt32LE(16,16);wav.writeUInt16LE(1,20);wav.writeUInt16LE(1,22);wav.writeUInt32LE(24000,24);wav.writeUInt32LE(48000,28);wav.writeUInt16LE(2,32);wav.writeUInt16LE(16,34);wav.write('data',36);wav.writeUInt32LE(48000,40); +const server=http.createServer(async(req,res)=>{ + const url=new URL(req.url,'http://localhost'); + const json=(data,status=200)=>{res.writeHead(status,{'Content-Type':'application/json'});res.end(JSON.stringify(data));}; + if(url.pathname==='/synth') { let body='';for await(const chunk of req)body+=chunk;const request=JSON.parse(body);submitted.push(request);const id=String(submitted.length);jobs.set(id,{request,status:hold?'running':'done'});active++;maxActive=Math.max(active,maxActive);json({id});return; } + if(url.pathname==='/job') { + const job=jobs.get(url.searchParams.get('id'));if(!job){json({},404);return;} + if(req.method==='POST'){job.status='cancelled';active--;json({status:'cancelled'});return;} + if(url.searchParams.has('result')){active--;res.writeHead(200,{'Content-Type':'multipart/mixed; boundary=take'});res.end(Buffer.concat([Buffer.from('--take\r\nContent-Type: application/json\r\n\r\n'+JSON.stringify({...job.request,output_format:'wav16',abc:'X:1',semantic_tokens:'1,2'})+'\r\n--take\r\nContent-Type: audio/wav\r\n\r\n'),wav,Buffer.from('\r\n--take--\r\n')]));return;} + json({status:job.status});return; + } + if(url.pathname==='/props'){json({version:'test',sample_rate:48000,frame_rate:25,defaults:{style:'',cot:'full',abc_sampling:{temperature:.7},semantic_sampling:{temperature:1},steps:32}});return;} + if(url.pathname==='/logs'){res.writeHead(200,{'Content-Type':'text/event-stream'});res.end();return;} + res.writeHead(200,{'Content-Type':'text/html'});res.end(html); +}); +await new Promise(r=>server.listen(18789,'127.0.0.1',r)); +const profile=fs.mkdtempSync(path.join(os.tmpdir(),'yue2-producer-')); +const browser=spawn('C:/Program Files/Google/Chrome/Application/chrome.exe',['--headless=new','--remote-debugging-port=19230',`--user-data-dir=${profile}`,'--no-first-run','--disable-background-networking','--mute-audio','about:blank'],{windowsHide:true,stdio:'ignore'}); +let ws,sequence=0;const pending=new Map(),errors=[]; +const delay=ms=>new Promise(r=>setTimeout(r,ms)); +function send(method,params={}){return new Promise((resolve,reject)=>{const id=++sequence;const timer=setTimeout(()=>reject(new Error(method+' timed out')),10000);pending.set(id,{resolve,reject,timer});ws.send(JSON.stringify({id,method,params}));});} +async function evaluate(expression){const result=await send('Runtime.evaluate',{expression,returnByValue:true,awaitPromise:true});if(result.exceptionDetails)throw new Error(JSON.stringify(result.exceptionDetails));return result.result.value;} +async function until(expression){for(let i=0;i<100;i++){if(await evaluate(expression))return;await delay(100);}throw new Error('Timeout: '+expression);} +async function input(label,value,event='input'){await evaluate(`{const e=document.querySelector('[aria-label="${label}"]');e.value=${JSON.stringify(String(value))};e.dispatchEvent(new Event('${event}',{bubbles:true}));}`);await delay(50);} +try { + let target;for(let i=0;i<60;i++){try{target=(await(await fetch('http://127.0.0.1:19230/json')).json()).find(x=>x.type==='page');if(target)break;}catch{}await delay(200);} + assert.ok(target);ws=new WebSocket(target.webSocketDebuggerUrl);await new Promise(r=>ws.addEventListener('open',r,{once:true})); + ws.addEventListener('message',event=>{const m=JSON.parse(event.data);if(m.method==='Runtime.exceptionThrown')errors.push(m.params.exceptionDetails);if(pending.has(m.id)){const p=pending.get(m.id);pending.delete(m.id);clearTimeout(p.timer);m.error?p.reject(m.error):p.resolve(m.result);}}); + await send('Runtime.enable');await send('Page.enable'); + await send('Emulation.setDeviceMetricsOverride',{width:1440,height:1000,deviceScaleFactor:1,mobile:false}); + await send('Page.navigate',{url:'http://127.0.0.1:18789'}); + await until(`!!document.querySelector('[aria-label="Amount of singing"]')`); + await input('Amount of singing',100);await input('Different voices',2,'change');await input('Voice 1 description','Warm velvet tenor'); + await evaluate(`document.querySelector('.producer .lock input').click()`); + assert.equal(await evaluate(`document.querySelector('[aria-label="Voice 1 description"]').disabled`),true); + await input('Takes per generation',3,'change');await input('Planner tempo',90); + await evaluate(`{const e=document.querySelector('#lyrics-editor textarea');e.value='[Verse]\\nWe carry light into the morning';e.dispatchEvent(new Event('input',{bubbles:true}));}`); + await send('Page.reload');await until(`!!document.querySelector('[aria-label="Amount of singing"]')`); + assert.equal(await evaluate(`document.querySelector('[aria-label="Amount of singing"]').value`),'100'); + assert.equal(await evaluate(`document.querySelector('[aria-label="Voice 1 description"]').value`),'Warm velvet tenor'); + assert.equal(await evaluate(`document.querySelector('[aria-label="Voice 1 description"]').disabled`),true); + await evaluate(`document.querySelector('.generate-btn').click()`); + await until(`document.querySelector('.side-count').textContent==='3'`); + assert.equal(submitted.length,3);assert.equal(maxActive,1,'takes are sequential'); + assert.equal(new Set(submitted.map(r=>r.lm_seed)).size,3); + for(const r of submitted){assert.match(r.style,/Fully melodic/);assert.match(r.style,/Warm velvet tenor/);assert.match(r.style,/2 distinct/);assert.equal(r.lm_batch_size,1);assert.equal(r.synth_batch_size,1);} + await evaluate(`document.querySelectorAll('.side-nav button')[2].click()`); + await until(`!!document.querySelector('[aria-label="Compare takes"]')`); + await evaluate(`{const s=document.querySelector('[aria-label="Compare takes"]');s.selectedIndex=1;s.dispatchEvent(new Event('change',{bubbles:true}));}`); + assert.equal(await evaluate(`document.querySelectorAll('.song-list .card-name').length`),3); + await evaluate(`document.querySelectorAll('.side-nav button')[1].click()`); + // Cancel a held first take and prove the rest are not sent. + hold=true;await evaluate(`document.querySelector('.generate-btn').click()`); + await until(`!!document.querySelector('[title="Cancel the active job"]')`); + await evaluate(`document.querySelector('[title="Cancel the active job"]').click()`); + await until(`!document.querySelector('.request-form').classList.contains('is-generating')`); + assert.equal(submitted.length,4);assert.equal(await evaluate(`localStorage.getItem('yue2-job-synth')`),null); + // Instrumental request preserves editor text and can run after cancellation. + hold=false;await input('Vocal presence',0);await input('Takes per generation',1,'change'); + await evaluate(`document.querySelector('.generate-btn').click()`); + await until(`!document.querySelector('.request-form').classList.contains('is-generating')`); + assert.equal(submitted.length,5);assert.equal(submitted.at(-1).lyrics,''); + assert.match(await evaluate(`document.querySelector('#lyrics-editor textarea').value`),/carry light/); + await send('Emulation.setDeviceMetricsOverride',{width:390,height:844,deviceScaleFactor:1,mobile:true}); + await evaluate(`document.querySelector('.producer').scrollIntoView({behavior:'instant'})`);await delay(150); + assert.equal(await evaluate('document.documentElement.scrollWidth<=innerWidth'),true,'mobile overflow'); + fs.writeFileSync(new URL('../../../build/ui-review/producer-mobile.png',import.meta.url),Buffer.from((await send('Page.captureScreenshot',{format:'png'})).data,'base64')); + assert.deepEqual(errors,[]); + console.log('PASS: controls, locked profile persistence, three sequential independent takes, comparison grouping, cancellation, instrumental preservation, mobile layout; no live generation.'); +}catch(error){console.error({submitted:submitted.length,errors,body:await evaluate('document.body.innerText.slice(-5000)'),pendingJob:await evaluate(`localStorage.getItem('yue2-job-synth')`)});throw error;} +finally{ws?.close();browser.kill();server.closeAllConnections();server.close();for(const p of pending.values())clearTimeout(p.timer);} diff --git a/tools/webui/tests/producer.test.mjs b/tools/webui/tests/producer.test.mjs new file mode 100644 index 0000000..864d491 --- /dev/null +++ b/tools/webui/tests/producer.test.mjs @@ -0,0 +1,50 @@ +import { test } from 'node:test'; +import assert from 'node:assert/strict'; +import { cleanProducer, applyProducer, delivery, estimatedDuration, lyricGuidance, lyricWarnings } from '../src/lib/producer.ts'; +import { prepareGeneration } from '../src/lib/generation-request.ts'; + +const base = {style:'Soul', lyrics:'[Verse]\nWe carry light into the morning\n[Chorus]\nCarry me home', duration:0, abc_sampling:{}, semantic_sampling:{}}; +test('instrumental renders omit words without destroying the source lyrics', () => { + const result = applyProducer(base, cleanProducer({presence:0})); + assert.equal(result.lyrics, ''); + assert.match(base.lyrics, /carry light/); + assert.match(result.style, /Instrumental only/); + assert.doesNotMatch(result.style, /Requested cast/); + assert.match(lyricWarnings(cleanProducer({presence:0}), base.lyrics)[0], /preserved/); +}); +test('delivery endpoints and voice cast reach music and lyric directions', () => { + assert.match(delivery(cleanProducer({singing:0})), /no melodic singing/); + assert.match(delivery(cleanProducer({singing:100})), /no rap/); + const p = cleanProducer({singing:50,voices:2,voiceLocked:true,voiceProfiles:['Warm low lead','Airy upper lead'],bpm:88}); + const result = applyProducer(base,p); + const prompt = lyricGuidance(p,base.style,150); + for (const text of [result.style,prompt]) { + assert.match(text,/2 distinct vocal voices/); + assert.match(text,/Voice 2: Airy upper lead/); + assert.match(text,/88 BPM/); + } + assert.match(prompt,/150 seconds/); + assert.match(prompt,/breathing space/); + const a=prepareGeneration(result,true),b=prepareGeneration(result,true); + assert.equal(a.style,b.style,'locked profiles remain stable while takes vary'); + assert.notEqual(a.lm_seed,b.lm_seed); + assert.notEqual(a.seed,b.seed); + assert.equal(applyProducer(result,p).style,result.style,'reusing a generated prompt does not duplicate direction'); + const emptyStyle=applyProducer({...base,style:''},p); + assert.equal(applyProducer(emptyStyle,p).style,emptyStyle.style); + assert.match(applyProducer(base,{...p,singing:55}).style,/55% melodic singing/); +}); +test('duration accounts for tempo, delivery and instrumental space but preserves explicit length', () => { + const lyrics=Array(16).fill('We carry light into the morning').join('\n'); + const p=cleanProducer(); + assert.ok(estimatedDuration({...p,bpm:60},lyrics)>estimatedDuration({...p,bpm:120},lyrics)); + assert.ok(estimatedDuration({...p,presence:40},lyrics)>estimatedDuration({...p,presence:90},lyrics)); + assert.equal(estimatedDuration(p,lyrics),estimatedDuration(p,'[Verse]\n'+lyrics)); + assert.equal(applyProducer({...base,duration:123},p).duration,123); + assert.equal(applyProducer(base,{...p,enabled:false}),base); +}); +test('persisted controls are bounded and independent', () => { + const p=cleanProducer({bpm:NaN,voices:99,takes:100,singing:-2,presence:101}); + assert.equal(p.bpm,100);assert.equal(p.voices,4);assert.equal(p.takes,1);assert.equal(p.singing,0);assert.equal(p.presence,100); + const a=cleanProducer(),b=cleanProducer();a.voiceProfiles[0]='changed';assert.notEqual(a.voiceProfiles[0],b.voiceProfiles[0]); +}); diff --git a/tools/webui/tests/reference-browser.mjs b/tools/webui/tests/reference-browser.mjs new file mode 100644 index 0000000..3ea4503 --- /dev/null +++ b/tools/webui/tests/reference-browser.mjs @@ -0,0 +1,129 @@ +// Isolated browser profile and preview origin: never changes the user's library. +import http from 'node:http'; +import fs from 'node:fs'; +import os from 'node:os'; +import path from 'node:path'; +import { spawn } from 'node:child_process'; +import assert from 'node:assert/strict'; +import { fileURLToPath } from 'node:url'; + +const root = fileURLToPath(new URL('../../../', import.meta.url)); +const output = path.join(root, 'build/ui-review'); +fs.mkdirSync(output, { recursive: true }); +const html = fs.readFileSync(new URL('../dist/index.html', import.meta.url)); +const submitted = []; +const server = http.createServer((req, res) => { + if (req.url === '/synth') { + let body='';req.on('data',chunk=>body+=chunk);req.on('end',()=>{submitted.push(JSON.parse(body));res.writeHead(400,{'Content-Type':'application/json'});res.end(JSON.stringify({error:'Preview capture only; no generation.'}));});return; + } + if (['/props', '/logs', '/health'].includes(req.url)) { + const upstream = http.get(`http://127.0.0.1:8087${req.url}`, response => { res.writeHead(response.statusCode, response.headers); response.pipe(res); }); + upstream.on('error', () => { res.writeHead(502); res.end(); }); + res.on('close', () => upstream.destroy()); + } else { res.writeHead(200, { 'Content-Type': 'text/html' }); res.end(html); } +}); +await new Promise(resolve => server.listen(18788, '127.0.0.1', resolve)); +const profile = fs.mkdtempSync(path.join(os.tmpdir(), 'yue2-ui-review-')); +const browser = spawn('C:/Program Files/Google/Chrome/Application/chrome.exe', [ + '--headless=new', '--remote-debugging-port=19229', `--user-data-dir=${profile}`, + '--no-first-run', '--no-default-browser-check', '--disable-background-networking', '--mute-audio', '--autoplay-policy=no-user-gesture-required', 'about:blank' +], { windowsHide: true, stdio: 'ignore' }); +let ws; +let sequence = 0; +const pending = new Map(); +const errors = []; +const delay = ms => new Promise(resolve => setTimeout(resolve, ms)); +function send(method, params = {}) { + return new Promise((resolve, reject) => { + const id = ++sequence; + const timer = setTimeout(() => { pending.delete(id); reject(new Error(`CDP timeout: ${method}`)); }, 10000); + pending.set(id, { resolve, reject, timer }); + ws.send(JSON.stringify({ id, method, params })); + }); +} +const evaluate = async expression => { + const result = await send('Runtime.evaluate', { expression, returnByValue: true, awaitPromise: true }); + if (result.exceptionDetails) throw new Error(JSON.stringify(result.exceptionDetails)); + return result.result.value; +}; +try { + let target; + for (let n = 0; n < 60; n++) { + try { target = (await (await fetch('http://127.0.0.1:19229/json')).json()).find(item => item.type === 'page'); if (target) break; } catch {} + await delay(200); + } + assert.ok(target, 'Chrome debugging target unavailable'); + ws = new WebSocket(target.webSocketDebuggerUrl); + await new Promise(resolve => ws.addEventListener('open', resolve, { once: true })); + ws.addEventListener('message', event => { + const message = JSON.parse(event.data); + if (message.method === 'Runtime.exceptionThrown') errors.push(message.params.exceptionDetails.text); + if (message.id && pending.has(message.id)) { + const task = pending.get(message.id); pending.delete(message.id); clearTimeout(task.timer); + if (message.error) task.reject(new Error(JSON.stringify(message.error))); else task.resolve(message.result); + } + }); + await send('Runtime.enable'); + await send('Page.enable'); + await send('Emulation.setDeviceMetricsOverride', { width: 1440, height: 1000, deviceScaleFactor: 1, mobile: false }); + await send('Page.navigate', { url: 'http://127.0.0.1:18788' }); + await delay(1800); + + assert.ok(await evaluate("document.body.innerText.includes('Track description')")); + await evaluate("document.querySelector('.quick-style').click()"); + await delay(150); + assert.ok(await evaluate("document.querySelector('.style-tags button') !== null")); + assert.ok(await evaluate("document.querySelector('.brief-column textarea').value.length > 0")); + await evaluate("document.querySelector('.desk-nav a[href=\"#lyrics-editor\"]').click()"); + await delay(100); + assert.ok(await evaluate("document.getElementById('lyrics-editor').open")); + await evaluate("document.getElementById('lyrics-editor').open = false; document.querySelector('.center-scroll').scrollTo({top:0,behavior:'instant'})"); + await evaluate("document.querySelectorAll('.engine-mode button')[1].click()"); + await delay(100); + await evaluate(`{const input=document.querySelector('#score-sampling input[type=range]');input.value='0.83';input.dispatchEvent(new Event('input',{bubbles:true}));}`); + await delay(100); + assert.equal(await evaluate("document.querySelector('#score-sampling input[type=number]').value"),'0.83'); + await evaluate("document.querySelector('.generate-btn').click()"); + await delay(350); + assert.equal(submitted.at(-1).abc_sampling.temperature,.83); + await evaluate("document.querySelector('.engine-mode button').click()"); + await delay(100); + await evaluate("document.querySelector('.generate-btn').click()"); + await delay(350); + assert.equal(submitted.at(-1).steps,32); + await evaluate(`new Promise((resolve,reject)=>{ + const buffer=new ArrayBuffer(1920044), view=new DataView(buffer); + const text=(offset,value)=>{for(let i=0;ireject(open.error);open.onsuccess=()=>{const db=open.result;const tx=db.transaction('songs','readwrite');const store=tx.objectStore('songs');for(const [name,favorite] of [['Northern Lights',false],['Midnight Echo',true]])store.add({name,favorite,format:'wav16',created:Date.now(),style:'Ambient cinematic',seed:1,duration:.1,score:'',request:{style:'Ambient cinematic',abc_sampling:{},semantic_sampling:{}},audio:new Blob([buffer],{type:'audio/wav'})});tx.oncomplete=()=>{db.close();resolve(true)};tx.onerror=()=>reject(tx.error);}; + })`); + + await send('Page.navigate', {url:'http://127.0.0.1:18788'}); + await delay(1000); + await evaluate("document.querySelector('.recent-select').click()"); + await delay(1300); + assert.ok(await evaluate("document.querySelector('.preview-time').textContent.includes('0:01')"),'preview playback advances'); + await evaluate("document.querySelectorAll('.recent-select')[1].click()"); + await delay(1300); + assert.ok(await evaluate("document.querySelector('.preview-time').textContent.includes('0:01')"),'switching tracks starts playback after decoding'); + await evaluate("document.querySelector('.preview-play').click();document.querySelectorAll('.track-action')[2].click()"); + await delay(200); + assert.equal(await evaluate("document.querySelectorAll('.track-action')[2].getAttribute('aria-pressed')"),'true'); + await send('Page.navigate', {url:'http://127.0.0.1:18788'}); + await delay(800); + assert.equal(await evaluate("document.querySelectorAll('.track-action')[2].getAttribute('aria-pressed')"),'true','favourite persists'); + for (const [width,height,name] of [[1672,941,'reference-desktop'],[1280,800,'reference-laptop'],[390,844,'reference-mobile']]) { + await send('Emulation.setDeviceMetricsOverride',{width,height,deviceScaleFactor:1,mobile:width<500}); + await evaluate("window.scrollTo(0,0);document.querySelector('.center-scroll').scrollTo({top:0,behavior:'instant'})"); + await delay(350); + assert.ok(await evaluate('document.documentElement.scrollWidth <= innerWidth'),name+' page overflow'); + console.log(name,await evaluate(`JSON.stringify([...document.querySelectorAll('.sound-card')].map(e=>({width:e.clientWidth,scroll:e.scrollWidth})))`)); + const capture=await send('Page.captureScreenshot',{format:'png'}); + fs.writeFileSync(path.join(output,name+'.png'),Buffer.from(capture.data,'base64')); + } + assert.deepEqual(errors,[]); + console.log('PASS: style selection, lyrics navigation, manual slider submission, automatic generation settings, desktop/laptop/mobile layout; no runtime exceptions.'); +} finally { + ws?.close(); browser.kill(); server.closeAllConnections(); server.close(); +} diff --git a/tools/webui/tests/remix-browser.mjs b/tools/webui/tests/remix-browser.mjs new file mode 100644 index 0000000..28973c3 --- /dev/null +++ b/tools/webui/tests/remix-browser.mjs @@ -0,0 +1,113 @@ +// Isolated browser profile and preview origin: never changes the user's library. +import http from 'node:http'; +import fs from 'node:fs'; +import os from 'node:os'; +import path from 'node:path'; +import { spawn } from 'node:child_process'; +import assert from 'node:assert/strict'; +import { fileURLToPath } from 'node:url'; + +const root = fileURLToPath(new URL('../../../', import.meta.url)); +const output = path.join(root, 'build/ui-review'); +fs.mkdirSync(output, { recursive: true }); +const html = fs.readFileSync(new URL('../dist/index.html', import.meta.url)); +const submitted = []; +const server = http.createServer((req, res) => { + if (req.url === '/synth') { + let body='';req.on('data',chunk=>body+=chunk);req.on('end',()=>{submitted.push(JSON.parse(body));res.writeHead(400,{'Content-Type':'application/json'});res.end(JSON.stringify({error:'Preview capture only; no generation.'}));});return; + } + if (['/props', '/logs', '/health'].includes(req.url)) { + const upstream = http.get(`http://127.0.0.1:8087${req.url}`, response => { res.writeHead(response.statusCode, response.headers); response.pipe(res); }); + upstream.on('error', () => { res.writeHead(502); res.end(); }); + res.on('close', () => upstream.destroy()); + } else { res.writeHead(200, { 'Content-Type': 'text/html' }); res.end(html); } +}); +await new Promise(resolve => server.listen(18788, '127.0.0.1', resolve)); +const profile = fs.mkdtempSync(path.join(os.tmpdir(), 'yue2-ui-review-')); +const browser = spawn('C:/Program Files/Google/Chrome/Application/chrome.exe', [ + '--headless=new', '--remote-debugging-port=19229', `--user-data-dir=${profile}`, + '--no-first-run', '--no-default-browser-check', '--disable-background-networking', '--mute-audio', '--autoplay-policy=no-user-gesture-required', 'about:blank' +], { windowsHide: true, stdio: 'ignore' }); +let ws; +let sequence = 0; +const pending = new Map(); +const errors = []; +const delay = ms => new Promise(resolve => setTimeout(resolve, ms)); +function send(method, params = {}) { + return new Promise((resolve, reject) => { + const id = ++sequence; + const timer = setTimeout(() => { pending.delete(id); reject(new Error(`CDP timeout: ${method}`)); }, 10000); + pending.set(id, { resolve, reject, timer }); + ws.send(JSON.stringify({ id, method, params })); + }); +} +const evaluate = async expression => { + const result = await send('Runtime.evaluate', { expression, returnByValue: true, awaitPromise: true }); + if (result.exceptionDetails) throw new Error(JSON.stringify(result.exceptionDetails)); + return result.result.value; +}; +try { + let target; + for (let n = 0; n < 60; n++) { + try { target = (await (await fetch('http://127.0.0.1:19229/json')).json()).find(item => item.type === 'page'); if (target) break; } catch {} + await delay(200); + } + assert.ok(target, 'Chrome debugging target unavailable'); + ws = new WebSocket(target.webSocketDebuggerUrl); + await new Promise(resolve => ws.addEventListener('open', resolve, { once: true })); + ws.addEventListener('message', event => { + const message = JSON.parse(event.data); + if (message.method === 'Runtime.exceptionThrown') errors.push(message.params.exceptionDetails.text); + if (message.id && pending.has(message.id)) { + const task = pending.get(message.id); pending.delete(message.id); clearTimeout(task.timer); + if (message.error) task.reject(new Error(JSON.stringify(message.error))); else task.resolve(message.result); + } + }); + await send('Runtime.enable'); + await send('Page.enable'); + await send('Emulation.setDeviceMetricsOverride', { width: 1440, height: 1000, deviceScaleFactor: 1, mobile: false }); + await send('Page.navigate', { url: 'http://127.0.0.1:18788' }); + await delay(1800); + await evaluate(`new Promise((resolve,reject)=>{ + const buffer=new ArrayBuffer(96044),view=new DataView(buffer); + const text=(o,s)=>{for(let i=0;ireject(open.error);open.onsuccess=()=>{const db=open.result;const tx=db.transaction('songs','readwrite');const store=tx.objectStore('songs');store.add({name:'Remix source',format:'wav16',created:Date.now(),style:'Jazz Rap',seed:42,duration:1,score:'X:1',request:{style:'Jazz Rap',abc:'X:1',semantic_tokens:'1,2,3',lm_seed:42,seed:9,duration:20,abc_sampling:{},semantic_sampling:{temperature:1,top_p:.95}},audio:new Blob([buffer],{type:'audio/wav'})});tx.oncomplete=()=>{db.close();resolve(true)};tx.onerror=()=>reject(tx.error)}; + })`); + await send('Page.reload');await delay(1000); + await evaluate("document.querySelector('[aria-label=\"Remix Remix source\"]').click()");await delay(200); + assert.ok(await evaluate("!!document.querySelector('.remix-panel')"),'instrumental source with no lyrics opens remix'); + assert.equal(await evaluate("document.querySelector('.generate-btn').textContent.trim()"),'Generate remix'); + assert.equal(await evaluate("document.querySelector('[aria-label=\"Remix variation\"]').value"),'25'); + for (const amount of [0,25,75,75]) { + await evaluate(`{const input=document.querySelector('[aria-label="Remix variation"]');input.value='${amount}';input.dispatchEvent(new Event('input',{bubbles:true}))}`);await delay(50); + await evaluate("document.querySelector('.generate-btn').click()");await delay(300); + const request=submitted.at(-1); + assert.equal(request.lm_seed,42);assert.equal(request.seed,9);assert.equal(request.abc,'X:1');assert.equal(request.style,'Jazz Rap'); + if(amount===0)assert.equal(request.semantic_tokens,'1,2,3');else assert.ok(!request.semantic_tokens); + assert.equal(request.semantic_sampling.temperature,1+amount*.005); + } + assert.deepEqual(submitted.at(-1),submitted.at(-2),'repeat same remix is reproducible at request level'); + await evaluate("Array.from(document.querySelectorAll('.side-nav button')).find(e=>e.textContent.includes('Library')).click()");await delay(200); + await evaluate("document.querySelector('.library-main [aria-label=\"Remix Remix source\"]').click()");await delay(300); + assert.ok(await evaluate("!!document.querySelector('.remix-panel')"),'library remix navigates back to Mix & Render'); + for(const [width,height,name] of [[1440,1000,'remix-desktop'],[390,844,'remix-mobile']]) { + await send('Emulation.setDeviceMetricsOverride',{width,height,deviceScaleFactor:1,mobile:width<500}); + await evaluate("document.querySelector('.remix-panel').scrollIntoView({block:'center',behavior:'instant'})");await delay(150); + assert.ok(await evaluate('document.documentElement.scrollWidth <= innerWidth'),name+' overflow'); + const capture=await send('Page.captureScreenshot',{format:'png'});fs.writeFileSync(path.join(output,name+'.png'),Buffer.from(capture.data,'base64')); + } + await evaluate("Array.from(document.querySelectorAll('.remix-panel button')).find(e=>e.textContent==='Exit remix').click()");await delay(100); + assert.equal(await evaluate("document.querySelector('.remix-panel')"),null); + await evaluate("document.querySelector('.generate-btn').click()");await delay(300); + assert.ok(!submitted.at(-1).abc && !submitted.at(-1).semantic_tokens); + assert.notEqual(submitted.at(-1).lm_seed,42); + const source=await evaluate(`new Promise((resolve,reject)=>{const open=indexedDB.open('yue2-songs');open.onsuccess=()=>{const db=open.result;const tx=db.transaction('songs');const get=tx.objectStore('songs').getAll();get.onsuccess=()=>resolve(get.result.map(s=>({name:s.name,request:s.request})));tx.oncomplete=()=>db.close()};open.onerror=()=>reject(open.error)})`); + assert.equal(source.length,1);assert.equal(source[0].name,'Remix source');assert.equal(source[0].request.semantic_tokens,'1,2,3');assert.equal(source[0].request.semantic_sampling.temperature,1); + assert.deepEqual(errors,[]); + console.log('PASS: recent/library Remix buttons, navigation, 0/25/75 variation, same seeds and score, repeatability, original untouched, exit to fresh composition, desktop/mobile.'); +} finally { + if(ws?.readyState===WebSocket.OPEN){try{await send('Browser.close')}catch{}ws.close()} + browser.kill();server.closeAllConnections();await new Promise(resolve=>server.close(resolve)); +} + diff --git a/tools/webui/tests/remix.test.mjs b/tools/webui/tests/remix.test.mjs new file mode 100644 index 0000000..63a2014 --- /dev/null +++ b/tools/webui/tests/remix.test.mjs @@ -0,0 +1,28 @@ +import { test } from 'node:test'; +import assert from 'node:assert/strict'; +import { canRemix, remixRequest } from '../src/lib/remix.ts'; + +const request = { style:'Jazz Rap', lyrics:'Original lyrics', abc:'X:1\nK:C\nCDEF|', semantic_tokens:'1,2,3', lm_seed:42, seed:9, duration:60, abc_sampling:{temperature:.7}, semantic_sampling:{temperature:1,top_p:.95}, steps:32 }; +test('remix eligibility requires saved audio codes and both original seeds', () => { + assert.equal(canRemix({request}),true); + assert.equal(canRemix({request:{...request,semantic_tokens:''}}),false); + assert.equal(canRemix({request:{...request,lm_seed:-1}}),false); + assert.equal(canRemix({request:{...request,seed:undefined}}),false); +}); +test('zero variation preserves performance; positive variation keeps source identity and changes sampling', () => { + const zero = remixRequest(request,0); + assert.equal(zero.semantic_tokens,request.semantic_tokens); + assert.deepEqual(zero.semantic_sampling,request.semantic_sampling); + for (const amount of [1,25,75,100]) { + const result=remixRequest(request,amount); + for (const key of ['style','lyrics','abc','lm_seed','seed','duration','steps']) assert.equal(result[key],request[key]); + assert.equal(result.semantic_tokens,undefined); + assert.equal(result.semantic_sampling.temperature,1+amount*.005); + assert.equal(result.semantic_sampling.top_p,.95); + assert.deepEqual(result,remixRequest(request,amount),'same amount yields same request'); + assert.equal(result.lm_batch_size,1); assert.equal(result.synth_batch_size,1); + } + assert.equal(request.semantic_tokens,'1,2,3');assert.equal(request.semantic_sampling.temperature,1); + assert.equal(remixRequest(request,NaN).semantic_tokens,'1,2,3'); + assert.equal(remixRequest(request,200).semantic_sampling.temperature,1.5); +}); diff --git a/tools/webui/tests/repair-regression.test.mjs b/tools/webui/tests/repair-regression.test.mjs new file mode 100644 index 0000000..fe97199 --- /dev/null +++ b/tools/webui/tests/repair-regression.test.mjs @@ -0,0 +1,114 @@ +import { test } from 'node:test'; +import assert from 'node:assert/strict'; +import { readFileSync, readdirSync } from 'node:fs'; +import { parse } from 'yaml'; +import { discoverLyricModels, writeLyrics } from '../src/lib/ollama.ts'; +import { angleInfluence, clampInfluence, cleanMix, freeformMusicPrompt, musicPrompt } from '../src/lib/style-mix.ts'; +import { validateArtwork, MAX_ARTWORK_BYTES } from '../src/lib/artwork.ts'; +import { automaticProfile, applyAutomaticSettings, hasManualSettings } from '../src/lib/auto-settings.ts'; + +test('automatic settings follow active music weights and preserve replay identity', () => { + const rhythmic = automaticProfile(['modern_trap'], { modern_trap: 100 }, ''); + const harmonic = automaticProfile(['jazz_noir'], { jazz_noir: 100 }, ''); + assert.equal(rhythmic.scoreTemperature, .65); + assert.equal(harmonic.scoreTemperature, .75); + const blended = automaticProfile(['modern_trap','jazz_noir'], {modern_trap:50,jazz_noir:50}, ''); + assert.equal(blended.scoreTemperature, .7); + assert.equal(automaticProfile(['modern_trap','jazz_noir'], {modern_trap:0,jazz_noir:100}, '').scoreTemperature,.75); + assert.equal(automaticProfile(['modern_trap'], {modern_trap:0}, 'trap').scoreTemperature,.7); + const request = {style:'Trap',abc_sampling:{temperature:1.1},semantic_sampling:{},abc:'score',semantic_tokens:'1,2,3',lm_seed:42,seed:8,duration:0,output_format:'wav24',lm_batch_size:2}; + const result = applyAutomaticSettings(request, rhythmic); + for(const field of ['abc','semantic_tokens','lm_seed','seed','duration','output_format','lm_batch_size']) assert.equal(result[field],request[field]); + assert.equal(result.abc_sampling.temperature,.65); + assert.equal(request.abc_sampling.temperature,1.1,'source request is not mutated'); + assert.equal(result.semantic_sampling.temperature,1,'codec sampler stays at model default'); + assert.equal(result.mp3_bitrate,320); + assert.equal(hasManualSettings(request),true); + assert.equal(hasManualSettings({style:'',abc_sampling:{},semantic_sampling:{}}),false); +}); + +test('artwork rejects unsupported, empty, oversized and undecodable uploads', async () => { + await assert.rejects(validateArtwork(new Blob(['x'], { type: 'image/svg+xml' })), /PNG, JPEG or WebP/); + await assert.rejects(validateArtwork(new Blob([], { type: 'image/png' })), /20 MB/); + await assert.rejects(validateArtwork(new Blob([new Uint8Array(MAX_ARTWORK_BYTES + 1)], { type: 'image/png' })), /20 MB/); + const original = globalThis.createImageBitmap; + try { + globalThis.createImageBitmap = async () => { throw new Error('Invalid image'); }; + await assert.rejects(validateArtwork(new Blob(['x'], { type: 'image/png' })), /could not be decoded/); + let closed = 0; + globalThis.createImageBitmap = async () => ({ width: 800, height: 800, close: () => { closed++; } }); + await validateArtwork(new Blob(['x'], { type: 'image/png' })); + assert.equal(closed, 1); + globalThis.createImageBitmap = async () => ({ width: 9000, height: 9000, close: () => { closed++; } }); + await assert.rejects(validateArtwork(new Blob(['x'], { type: 'image/png' })), /64 megapixels/); + assert.equal(closed, 2); + } finally { globalThis.createImageBitmap = original; } +}); + +test('mixer sanitizes persisted state and permits exact zero and hundred', () => { + assert.equal(clampInfluence(0), 0); + assert.equal(clampInfluence(100), 100); + assert.equal(clampInfluence(NaN), 50); + assert.equal(clampInfluence(1000), 100); + assert.deepEqual(cleanMix(['a', 'a', '', 'missing'], { a: 0 }, ['a']), { ids: ['a'], weights: { a: 0 } }); +}); + +test('music prompt sends direct style strengths, descriptions, and excludes zero styles', () => { + const descriptions = { a: 'Warm acoustic strings.', b: 'Metallic percussion.' }; + const names = [['a', 'Acoustic'], ['b', 'Industrial']]; + const one = musicPrompt(['a', 'b'], { a: 50, b: 0 }, descriptions, names); + assert.match(one, /Acoustic \(50\/100 strength\): Warm acoustic strings\./); + assert.doesNotMatch(one, /Industrial/); + assert.equal(musicPrompt([], { a: 50 }, descriptions, names), ''); + const mix = musicPrompt(['a', 'b'], { a: 25, b: 75 }, descriptions, names); + assert.match(mix, /Acoustic \(25\/100 strength\)/); + assert.match(mix, /Industrial \(75\/100 strength\)/); + assert.doesNotMatch(musicPrompt(['b'], { a: 50, b: 50 }, descriptions, names), /Acoustic/); +}); + +test('freeform music strength changes the exact style instructions sent with generation', () => { + assert.match(freeformMusicPrompt('Bar-heavy punchline craft', 35), /35\/100 strength/); + assert.match(freeformMusicPrompt('Bar-heavy punchline craft', 35), /Bar-heavy punchline craft/); + assert.equal(freeformMusicPrompt('Bar-heavy punchline craft', 0), ''); + assert.equal(freeformMusicPrompt(' ', 100), ''); +}); + +test('circular input uses clockwise angle from twelve oclock', () => { + assert.equal(angleInfluence(0, -1), 0); + assert.equal(angleInfluence(1, 0), 25); + assert.equal(angleInfluence(0, 1), 50); + assert.equal(angleInfluence(-1, 0), 75); +}); + +test('all lyric files parse without accidental null fields', () => { + const root = new URL('../../../lyric_styles/', import.meta.url); + const files = readdirSync(root).filter(f => f.endsWith('.yaml')); + assert.equal(files.length, 11); + function validate(value, path) { + assert.notEqual(value, null, path); + if (value && typeof value === 'object') { + for (const [key, child] of Object.entries(value)) validate(child, `${path}.${key}`); + } + } + for (const file of files) validate(parse(readFileSync(new URL(file, root), 'utf8')), file); +}); + +test('discovery orders installed models by size; generation uses selected model', async () => { + const original = globalThis.fetch; + try { + globalThis.fetch = async () => Response.json({ models: [{ name: 'large', size: 20 }, { name: 'small', size: 10 }] }); + assert.equal((await discoverLyricModels())[0].name, 'small'); + globalThis.fetch = async (url, options) => { + const body = JSON.parse(options.body); + assert.equal(body.model, 'small'); + assert.equal(body.keep_alive, 0); + assert.equal(body.think, false); + return Response.json({ response: ' [Verse]\nA specific scene ' }); + }; + assert.equal(await writeLyrics('small', 'topic', new AbortController().signal), '[Verse]\nA specific scene'); + globalThis.fetch = async () => Response.json({ error: 'model unavailable' }, { status: 404 }); + await assert.rejects(writeLyrics('missing', 'topic', new AbortController().signal), /model unavailable/); + globalThis.fetch = async () => Response.json({ response: '' }); + await assert.rejects(writeLyrics('small', 'topic', new AbortController().signal), /Existing lyrics preserved/); + } finally { globalThis.fetch = original; } +}); diff --git a/tools/webui/tests/storage-browser.mjs b/tools/webui/tests/storage-browser.mjs new file mode 100644 index 0000000..8adf446 --- /dev/null +++ b/tools/webui/tests/storage-browser.mjs @@ -0,0 +1,46 @@ +import {chromium} from '../../youtube-agent/node_modules/playwright/index.mjs'; +import {readFile} from 'node:fs/promises'; +import assert from 'node:assert/strict'; +const html=await readFile(new URL('../dist/index.html',import.meta.url)); +const browser=await chromium.launch({...(process.env.CI?{}:{channel:'msedge'}),headless:true}); +const base='http://localhost:8087'; +function wav(){const b=Buffer.alloc(44+32000);b.write('RIFF');b.writeUInt32LE(b.length-8,4);b.write('WAVEfmt ',8);b.writeUInt32LE(16,16);b.writeUInt16LE(1,20);b.writeUInt16LE(1,22);b.writeUInt32LE(16000,24);b.writeUInt32LE(32000,28);b.writeUInt16LE(2,32);b.writeUInt16LE(16,34);b.write('data',36);b.writeUInt32LE(b.length-44,40);return b;} +async function context(){const c=await browser.newContext();await c.route(base+'/',r=>r.fulfill({contentType:'text/html',body:html}));await c.route('**/presets',r=>r.fulfill({json:[]}));return c;} +async function library(page,store='songs'){return page.evaluate(store=>new Promise((resolve,reject)=>{const r=indexedDB.open('yue2-songs');r.onsuccess=()=>{const db=r.result,q=db.transaction(store).objectStore(store).getAll();q.onsuccess=()=>{resolve(q.result.map(x=>({id:x.id,name:x.name,audioSize:x.audio?.size,submitted:x.submitted})));db.close();};q.onerror=()=>reject(q.error);};r.onerror=()=>reject(r.error);}),store);} +async function until(fn,label){for(let i=0;i<100;i++){if(await fn())return;await new Promise(r=>setTimeout(r,100));}throw Error(label);} +try{ + for(const mode of ['quota','malformed']){ + const c=await context(),page=await c.newPage(),errors=[];page.on('pageerror',e=>errors.push(e.message)); + await page.addInitScript(mode=>{if(mode==='quota'){const original=Storage.prototype.setItem;Storage.prototype.setItem=function(k,v){if(k==='yue2')throw new DOMException('Quota failure','QuotaExceededError');return original.call(this,k,v);};}else localStorage.setItem('yue2',JSON.stringify({request:{style:42}}));},mode); + await page.goto(base);await page.getByRole('heading',{name:'Create your song'}).waitFor();await page.locator('.storage-warning').waitFor();assert.deepEqual(errors,[]);await c.close(); + } + const c=await context(),a=await c.newPage(),b=await c.newPage();let submissions=0,done=false,releaseArt; + const artGate=new Promise(r=>releaseArt=r);let artRequested=false; + const errors=[];for(const p of [a,b])p.on('pageerror',e=>errors.push(e.message)); + await c.route('**/synth',async r=>{submissions++;return r.fulfill({json:{id:r.request().headers()['x-yue2-job-id']}});}); + const payload=Buffer.concat([Buffer.from('--fixture\r\nContent-Type: application/json\r\n\r\n'+JSON.stringify({style:'Audit',output_format:'mp3',lm_seed:1,seed:1,abc_sampling:{},semantic_sampling:{}})+'\r\n--fixture\r\nContent-Type: audio/wav\r\n\r\n'),wav(),Buffer.from('\r\n--fixture--\r\n')]); + await c.route('**/job?*',r=>r.request().url().includes('result=1')?r.fulfill({contentType:'multipart/mixed; boundary=fixture',body:payload}):r.fulfill({json:{status:done?'done':'running',durable:true}})); + await c.route('**/comfy/object_info',r=>r.fulfill({json:{UnetLoaderGGUF:{input:{required:{unet_name:[['qwen-image-2.1-Q4_K_M.gguf']]}}},CLIPLoader:{input:{required:{clip_name:[['qwen3vl_8b_int8.safetensors']]}}},VAELoader:{input:{required:{vae_name:[['qwen_image_2.1_vae.safetensors']]}}},TextEncodeQwenImage21:{},EmptyLatentImage:{},KSampler:{},VAEDecode:{},SaveImage:{},LoadImage:{}}})); + await c.route('**/comfy/queue',r=>r.fulfill({json:{queue_running:[],queue_pending:[]}})); + await c.route('**/comfy/prompt',r=>{artRequested=true;return r.fulfill({json:{prompt_id:'audit-art'}});}); + await c.route('**/comfy/history/*',async r=>{await artGate;return r.fulfill({json:{'audit-art':{outputs:{'8':{images:[{filename:'audit.png'}]}}}}});}); + await c.route('**/comfy/view?*',r=>r.fulfill({contentType:'image/png',body:Buffer.from('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=','base64')})); + await c.route('**/render-video',r=>r.fulfill({status:503,json:{error:'Fixture forbids real rendering'}})); + await a.goto(base);await a.getByRole('heading',{name:'Create your song'}).waitFor();await b.goto(base);await b.getByRole('heading',{name:'Create your song'}).waitFor();await a.waitForTimeout(300); + await a.getByLabel('Output format',{exact:true}).selectOption('mp4'); + await a.getByRole('button',{name:'Generate track',exact:true}).click();await until(()=>submissions===1,'submission'); + assert.equal((await library(a,'pending')).length,1,'recovery persisted'); + await b.getByRole('button',{name:'Generate track',exact:true}).click();await b.getByRole('status').filter({hasText:'Another tab'}).waitFor();assert.equal(submissions,1,'duplicate submit blocked'); + done=true;await until(()=>artRequested,'art submission'); + assert.ok((await library(a))[0]?.audioSize>0,'audio saved before artwork completes'); + await b.getByRole('button',{name:/^Library/}).click();await b.locator('.song-list .card').waitFor(); + // A failed save must not toggle the heart or produce an unhandled exception. + await b.evaluate(()=>{window.originalPut=IDBObjectStore.prototype.put;IDBObjectStore.prototype.put=function(){throw new DOMException('Quota test','QuotaExceededError');};}); + const favourite=b.locator('.song-list .fav-btn');await favourite.click();await b.getByRole('status').filter({hasText:'Quota test'}).waitFor();assert.equal(await favourite.getAttribute('aria-pressed'),'false'); + await b.evaluate(()=>{IDBObjectStore.prototype.put=window.originalPut;}); + await b.getByRole('button',{name:'Track actions'}).click();await b.getByRole('menuitem',{name:'Delete this track',exact:true}).click();await b.getByRole('button',{name:'OK',exact:true}).click(); + await until(async()=>!(await library(b)).length,'delete');releaseArt(); + await until(async()=>!(await library(a,'pending')).length,'completion');assert.equal((await library(a)).length,0,'late completion must not resurrect deleted track'); + assert.deepEqual(errors,[]);await c.close(); + console.log('PASS: storage failure and malformed settings remain usable; recovery precedes submit; two tabs submit once; audio saves before artwork; failed favourite stays unchanged; late completion cannot resurrect deleted tracks.'); +}finally{await browser.close();} diff --git a/tools/webui/tests/storage-validation.test.mjs b/tools/webui/tests/storage-validation.test.mjs new file mode 100644 index 0000000..72d890b --- /dev/null +++ b/tools/webui/tests/storage-validation.test.mjs @@ -0,0 +1,52 @@ +import {test} from 'node:test'; +import assert from 'node:assert/strict'; +import {registerHooks} from 'node:module'; +import {existsSync} from 'node:fs'; +import {fileURLToPath} from 'node:url'; +registerHooks({resolve(specifier,context,next){ + if(specifier.endsWith('.js') && context.parentURL?.includes('/src/lib/')) { + const url=new URL(specifier.replace(/\.js$/,'.ts'),context.parentURL); + if(existsSync(fileURLToPath(url))) return {url:url.href,shortCircuit:true}; + } + return next(specifier,context); +}}); +const {validRequest,validSong}=await import('../src/lib/validation.ts'); +const {validatePresets}=await import('../src/lib/saved-presets.ts'); +const {exportLibrary,importLibrary}=await import('../src/lib/backup.ts'); +test('request validation rejects malformed persisted fields and retains numeric legacy values',()=>{ + assert.throws(()=>validRequest({style:42}),/style/); + assert.throws(()=>validRequest({abc_sampling:[]}),/sampling/); + assert.throws(()=>validRequest({duration:'infinity'}),/duration/); + assert.equal(validRequest({style:'Jazz',duration:'120'}).duration,120); + assert.equal(validRequest({}).style,''); +}); +test('backup songs require valid UI fields and draft metadata',()=>{ + const song={name:'Track',style:'Jazz',format:'mp3',duration:10,created:1,seed:0,request:{},audio:new Blob(['audio'],{type:'audio/mpeg'})}; + assert.equal(validSong(song).request.style,''); + assert.throws(()=>validSong({...song,format:undefined}),/format/); + assert.throws(()=>validSong({...song,youtubeDraft:{title:42}}),/draft/); + assert.throws(()=>validSong({...song,musicStyles:[{}]}),/musicStyles/); +}); +test('preset schema rejects invalid names, weights and duplicate names',()=>{ + const p={name:'My blend',kind:'music',data:{ids:['jazz'],weights:{jazz:50}}}; + assert.equal(validatePresets([p]).length,1); + assert.throws(()=>validatePresets([{...p,name:'../escape'}]),/Invalid/); + assert.throws(()=>validatePresets([{...p,data:{ids:[],weights:{jazz:NaN}}}]),/Invalid/); + assert.throws(()=>validatePresets([p,{...p,name:'MY BLEND'}]),/Duplicate/); +}); +test('version 2 backup includes disk presets and current settings; corrupt request fails before restore',async()=>{ + const originalFetch=globalThis.fetch, originalStorage=globalThis.localStorage; + const presets=[{name:'Jazz',kind:'music',data:{ids:['jazz'],weights:{jazz:100}}}]; + let corrupt=false; + globalThis.localStorage={getItem:key=>key==='yue2'?JSON.stringify({request:{style:corrupt?42:'Jazz'}}):key==='yue2-theme'?'mint':null}; + globalThis.fetch=async()=>new Response(JSON.stringify(presets),{headers:{'Content-Type':'application/json'}}); + try { + const song={name:'Track',style:'Jazz',format:'mp3',duration:10,created:1,seed:0,request:{style:'Jazz'},audio:new Blob(['audio'],{type:'audio/mpeg'})}; + const restored=await importLibrary(await exportLibrary([song])); + assert.deepEqual(restored.presets,presets); + assert.equal(restored.settings['yue2-theme'],'mint'); + assert.equal(await restored.songs[0].audio.text(),'audio'); + corrupt=true; + await assert.rejects(importLibrary(await exportLibrary([song])),/style/); + } finally {globalThis.fetch=originalFetch;globalThis.localStorage=originalStorage;} +}); diff --git a/tools/webui/tests/studio-browser.mjs b/tools/webui/tests/studio-browser.mjs new file mode 100644 index 0000000..f595790 --- /dev/null +++ b/tools/webui/tests/studio-browser.mjs @@ -0,0 +1,219 @@ +// Isolated browser profile and preview origin: never changes the user's library. +import http from 'node:http'; +import fs from 'node:fs'; +import os from 'node:os'; +import path from 'node:path'; +import { spawn } from 'node:child_process'; +import assert from 'node:assert/strict'; +import { fileURLToPath } from 'node:url'; + +const root = fileURLToPath(new URL('../../../', import.meta.url)); +const output = path.join(root, 'build/ui-review'); +fs.mkdirSync(output, { recursive: true }); +const html = fs.readFileSync(new URL('../dist/index.html', import.meta.url)); +const submitted = []; +const server = http.createServer((req, res) => { + if (req.url === '/synth') { + let body='';req.on('data',chunk=>body+=chunk);req.on('end',()=>{submitted.push(JSON.parse(body));res.writeHead(400,{'Content-Type':'application/json'});res.end(JSON.stringify({error:'Preview capture only; no generation.'}));});return; + } + if (['/props', '/logs', '/health'].includes(req.url)) { + const upstream = http.get(`http://127.0.0.1:8087${req.url}`, response => { res.writeHead(response.statusCode, response.headers); response.pipe(res); }); + upstream.on('error', () => { res.writeHead(502); res.end(); }); + res.on('close', () => upstream.destroy()); + } else { res.writeHead(200, { 'Content-Type': 'text/html' }); res.end(html); } +}); +await new Promise(resolve => server.listen(18788, '127.0.0.1', resolve)); +const profile = fs.mkdtempSync(path.join(os.tmpdir(), 'yue2-ui-review-')); +const browser = spawn('C:/Program Files/Google/Chrome/Application/chrome.exe', [ + '--headless=new', '--remote-debugging-port=19229', `--user-data-dir=${profile}`, + '--no-first-run', '--no-default-browser-check', '--disable-background-networking', '--mute-audio', '--autoplay-policy=no-user-gesture-required', 'about:blank' +], { windowsHide: true, stdio: 'ignore' }); +let ws; +let sequence = 0; +const pending = new Map(); +const errors = []; +const delay = ms => new Promise(resolve => setTimeout(resolve, ms)); +function send(method, params = {}) { + return new Promise((resolve, reject) => { + const id = ++sequence; + const timer = setTimeout(() => { pending.delete(id); reject(new Error(`CDP timeout: ${method}`)); }, 10000); + pending.set(id, { resolve, reject, timer }); + ws.send(JSON.stringify({ id, method, params })); + }); +} +const evaluate = async expression => { + const result = await send('Runtime.evaluate', { expression, returnByValue: true, awaitPromise: true }); + if (result.exceptionDetails) throw new Error(JSON.stringify(result.exceptionDetails)); + return result.result.value; +}; +try { + let target; + for (let n = 0; n < 60; n++) { + try { target = (await (await fetch('http://127.0.0.1:19229/json')).json()).find(item => item.type === 'page'); if (target) break; } catch {} + await delay(200); + } + assert.ok(target, 'Chrome debugging target unavailable'); + ws = new WebSocket(target.webSocketDebuggerUrl); + await new Promise(resolve => ws.addEventListener('open', resolve, { once: true })); + ws.addEventListener('message', event => { + const message = JSON.parse(event.data); + if (message.method === 'Runtime.exceptionThrown') errors.push(message.params.exceptionDetails.text); + if (message.id && pending.has(message.id)) { + const task = pending.get(message.id); pending.delete(message.id); clearTimeout(task.timer); + if (message.error) task.reject(new Error(JSON.stringify(message.error))); else task.resolve(message.result); + } + }); + await send('Runtime.enable'); + await send('Page.enable'); + await send('Emulation.setDeviceMetricsOverride', { width: 1440, height: 1000, deviceScaleFactor: 1, mobile: false }); + await send('Page.navigate', { url: 'http://127.0.0.1:18788' }); + await delay(1800); + assert.ok(await evaluate(`document.body.innerText.includes('Sound desk')`)); + for (const theme of ['dark', 'cyberpunk', 'colorful', 'mint', 'burnt-orange']) { + await evaluate(`{const select=document.querySelector('[aria-label="Color theme"]');select.value=${JSON.stringify(theme)};select.dispatchEvent(new Event('change',{bubbles:true}));}`); + await delay(120); + assert.equal(await evaluate('document.documentElement.dataset.theme'), theme); + assert.ok(await evaluate('document.documentElement.scrollWidth <= innerWidth'), `${theme} desktop overflow`); + const capture = await send('Page.captureScreenshot', { format: 'png' }); + fs.writeFileSync(path.join(output, `studio-${theme}.png`), Buffer.from(capture.data, 'base64')); + } + await evaluate(`{const select=document.querySelector('[aria-label="Add music style"]');select.value='dark_industrial';select.dispatchEvent(new Event('change',{bubbles:true}));}`); + await delay(100); + assert.ok(await evaluate(`document.querySelector('[aria-label="Music style prompt and descriptions"]').value.includes('metallic percussion')`)); + assert.ok(await evaluate(`document.querySelector('.music-mixer [role="slider"]').getAttribute('aria-label').includes('Dark Industrial')`)); + await evaluate(`document.querySelector('.music-mixer [role="slider"]').dispatchEvent(new KeyboardEvent('keydown',{key:'End',bubbles:true}))`); + await delay(60); + assert.equal(await evaluate(`document.querySelector('.music-mixer [role="slider"]').getAttribute('aria-valuenow')`), '100'); + await evaluate(`document.querySelector('.music-mixer .style-ring-wrap > button').click()`); + await delay(60); + assert.equal(await evaluate(`document.querySelector('[aria-label="Music style prompt and descriptions"]').value`), ''); + assert.ok(await evaluate(`!!document.querySelector('.music-mixer .custom-style-ring [role="slider"]')`), 'custom prompt strength ring remains available'); + assert.ok(await evaluate(`Array.from(document.querySelector('[aria-label="Add music style"]').options).some(option => option.value === 'liquid_dnb')`), 'expanded music style catalogue is available'); + assert.ok(await evaluate(`document.querySelector('#duration-auto').closest('.duration-auto') && getComputedStyle(document.querySelector('.duration-switch-track')).width !== '0px'`), 'auto duration uses a visible switch row'); + await evaluate(`document.querySelector('a[href="#render-workbench"]').click()`); + await delay(100); + assert.ok(await evaluate(`document.querySelector('#render-workbench').open`)); + await send('Emulation.setEmulatedMedia', { features: [{ name: 'prefers-reduced-motion', value: 'reduce' }] }); + await send('Emulation.setDeviceMetricsOverride', { width: 390, height: 844, deviceScaleFactor: 1, mobile: true }); + await evaluate('window.scrollTo(0,0)'); + await delay(300); + assert.ok(await evaluate('document.documentElement.scrollWidth <= innerWidth'), 'mobile overflow'); + assert.ok(await evaluate(`document.querySelector('.sculpture-stage canvas').width > 100`)); + const mobile = await send('Page.captureScreenshot', { format: 'png' }); + fs.writeFileSync(path.join(output, 'studio-mobile.png'), Buffer.from(mobile.data, 'base64')); + // Capture actual UI requests locally. Never forward song creation to the live server. + await evaluate(`{const select=document.querySelector('[aria-label="Add music style"]');select.value='modern_trap';select.dispatchEvent(new Event('change',{bubbles:true}));}`); + await delay(100); + assert.ok(await evaluate(`document.querySelector('.profile-title').textContent.includes('Rhythmic focus')`)); + await evaluate(`document.querySelector('.generate-btn').click()`); + await delay(300); + assert.equal(submitted.at(-1).abc_sampling.temperature,.65); + assert.equal(submitted.at(-1).steps,32); + assert.equal(submitted.at(-1).mp3_bitrate,320); + assert.match(submitted.at(-1).style,/Modern Trap/); + await evaluate(`document.querySelectorAll('.engine-mode button')[1].click()`); + await delay(60); + await evaluate(`{const input=document.querySelector('#render-workbench .meta-grid input');input.value='40';input.dispatchEvent(new Event('input',{bubbles:true}));}`); + await evaluate(`document.querySelector('.generate-btn').click()`); + await delay(200); + assert.equal(submitted.at(-1).steps,40,'manual controls reach the request'); + await evaluate(`document.querySelector('.engine-mode button').click()`); + await send('Emulation.setDeviceMetricsOverride', { width: 1440, height: 1000, deviceScaleFactor: 1, mobile: false }); + await evaluate(`document.querySelector('#engine-workbench').scrollIntoView({block:'center',behavior:'instant'})`); + await delay(150); + const production = await send('Page.captureScreenshot',{format:'png'});fs.writeFileSync(path.join(output,'production-desk.png'),Buffer.from(production.data,'base64')); + // Seed 10-second PCM tones only in this disposable profile. Chrome output is muted. + await evaluate(`new Promise((resolve,reject)=>{ + const buffer=new ArrayBuffer(1920044), view=new DataView(buffer); + const text=(offset,value)=>{for(let i=0;ireject(open.error);open.onsuccess=()=>{const db=open.result;const tx=db.transaction('songs','readwrite');const store=tx.objectStore('songs');for(const [name,favorite] of [['Northern Lights',false],['Midnight Echo',true]])store.add({name,favorite,format:'wav16',created:Date.now(),style:'Ambient cinematic',seed:1,duration:.1,score:'',request:{style:'Ambient cinematic',abc_sampling:{},semantic_sampling:{}},audio:new Blob([buffer],{type:'audio/wav'})});tx.oncomplete=()=>{db.close();resolve(true)};tx.onerror=()=>reject(tx.error);}; + })`); + await send('Emulation.setDeviceMetricsOverride', { width: 1440, height: 1000, deviceScaleFactor: 1, mobile: false }); + await send('Page.navigate', { url: 'http://127.0.0.1:18788' }); + await delay(900); + assert.equal(await evaluate(`document.querySelector('.engine-indicator').textContent`),'AUTO','production mode persists after reload'); + assert.equal(await evaluate(`document.querySelectorAll('.card-name').length`), 2); + await evaluate(`window.scrollTo(0,0);document.querySelector('.play-btn').click()`); + await delay(800); + assert.ok(await evaluate(`document.querySelector('.audio-sculpture').classList.contains('is-playing')`)); + const measured = await evaluate(`Array.from(document.querySelectorAll('.signal-meters i')).map(el => parseFloat(el.style.transform.replace('scaleX(','')))`); + assert.ok(measured.some(value => value > .01), 'real PCM playback drives the audio meters: ' + JSON.stringify(measured)); + const live = await send('Page.captureScreenshot',{format:'png'});fs.writeFileSync(path.join(output,'signal-live.png'),Buffer.from(live.data,'base64')); + await evaluate(`document.querySelector('[aria-label="Expand visualizer"]').click()`); + await delay(200); + assert.ok(await evaluate(`document.querySelector('.signal-dialog').open`)); + await evaluate(`document.querySelectorAll('.signal-dialog .view-modes button')[1].click()`); + await delay(160); + const orbit = await send('Page.captureScreenshot',{format:'png'});fs.writeFileSync(path.join(output,'signal-orbit.png'),Buffer.from(orbit.data,'base64')); + await send('Input.dispatchKeyEvent',{type:'keyDown',key:'Escape',code:'Escape',windowsVirtualKeyCode:27}); + await delay(100); + assert.equal(await evaluate(`document.querySelector('.signal-dialog').open`),false); + assert.ok(await evaluate(`document.activeElement.classList.contains('expand-signal')`)); + await evaluate(`document.querySelector('.play-btn').click()`); + await delay(300); + assert.ok(await evaluate(`!document.querySelector('.audio-sculpture').classList.contains('is-playing')`)); + await evaluate(`{const input=document.querySelector('[aria-label="Search tracks"]');input.value='Northern';input.dispatchEvent(new Event('input',{bubbles:true}));}`); + await delay(80); + assert.equal(await evaluate(`document.querySelectorAll('.card-name').length`), 1); + await evaluate(`document.querySelector('.library-tools button').click()`); + await delay(80); + assert.ok(await evaluate(`document.body.innerText.includes('No tracks match this view.')`)); + await evaluate(`document.querySelector('.no-results button').click()`); + await delay(80); + assert.equal(await evaluate(`document.querySelectorAll('.card-name').length`), 2); + const populated = await send('Page.captureScreenshot', { format: 'png' }); + fs.writeFileSync(path.join(output, 'studio-library.png'), Buffer.from(populated.data, 'base64')); + // Attach test-only raster artwork through the real upload handler. + await evaluate(`(async()=>{ + const canvas=document.createElement('canvas');canvas.width=800;canvas.height=800; + const context=canvas.getContext('2d');const gradient=context.createLinearGradient(0,0,800,800);gradient.addColorStop(0,'#162b54');gradient.addColorStop(1,'#e58b43');context.fillStyle=gradient;context.fillRect(0,0,800,800); + context.strokeStyle='#fce5b0';context.lineWidth=3;for(let i=0;i<9;i++){context.beginPath();context.arc(400,400,70+i*30,0,Math.PI*2);context.stroke();} + context.fillStyle='#fff';context.font='32px sans-serif';context.fillText('ARTWORK VIEWER TEST',185,725); + const blob=await new Promise(resolve=>canvas.toBlob(resolve,'image/png')); + const transfer=new DataTransfer();transfer.items.add(new File([blob],'test-cover.png',{type:'image/png'})); + const input=document.querySelector('input[aria-label^="Artwork file"]');input.files=transfer.files;input.dispatchEvent(new Event('change',{bubbles:true})); + })()`); + for(let i=0;i<20;i++){if(await evaluate(`!!document.querySelector('.art-cover img')`))break;await delay(100);} + assert.equal(await evaluate(`document.querySelectorAll('.art-cover').length`),1); + await send('Page.navigate', { url: 'http://127.0.0.1:18788' }); + await delay(700); + assert.equal(await evaluate(`document.querySelectorAll('.art-cover').length`),1,'artwork persists after reload'); + await send('Emulation.setEmulatedMedia', { features: [{ name: 'prefers-reduced-motion', value: 'no-preference' }] }); + await evaluate(`document.querySelector('.art-cover').click()`); + await delay(80); + assert.ok(await evaluate(`document.querySelector('.large-art').getAnimations().length > 0`),'morph animation runs'); + await delay(450); + assert.ok(await evaluate(`document.querySelector('.art-dialog').open`)); + assert.equal(await evaluate(`document.documentElement.style.overflow`),'hidden'); + const art = await send('Page.captureScreenshot', { format: 'png' }); + fs.writeFileSync(path.join(output, 'artwork-expanded.png'), Buffer.from(art.data, 'base64')); + await send('Input.dispatchKeyEvent',{type:'keyDown',key:'Escape',code:'Escape',windowsVirtualKeyCode:27}); + await send('Input.dispatchKeyEvent',{type:'keyUp',key:'Escape',code:'Escape',windowsVirtualKeyCode:27}); + await delay(350); + assert.equal(await evaluate(`document.querySelector('.art-dialog').open`),false); + assert.ok(await evaluate(`document.activeElement.classList.contains('art-cover')`),'focus returns to thumbnail'); + assert.equal(await evaluate(`document.documentElement.style.overflow`),''); + const covers = await send('Page.captureScreenshot', { format: 'png' }); + fs.writeFileSync(path.join(output, 'artwork-track.png'), Buffer.from(covers.data, 'base64')); + await send('Emulation.setEmulatedMedia', { features: [{ name: 'prefers-reduced-motion', value: 'reduce' }] }); + await send('Emulation.setDeviceMetricsOverride', { width: 390, height: 844, deviceScaleFactor: 1, mobile: true }); + await evaluate(`document.querySelector('.art-cover').scrollIntoView();document.querySelector('.art-cover').click()`); + await delay(150); + assert.equal(await evaluate(`document.querySelector('.large-art').getAnimations().length`),0); + assert.ok(await evaluate(`document.querySelector('.large-art').getBoundingClientRect().width <= innerWidth`)); + const mobileArt = await send('Page.captureScreenshot', { format: 'png' }); + fs.writeFileSync(path.join(output, 'artwork-mobile.png'), Buffer.from(mobileArt.data, 'base64')); + await evaluate(`document.querySelector('.art-close').click()`); + await delay(80); + assert.equal(await evaluate(`document.querySelector('.art-dialog').open`),false); + assert.ok(await evaluate(`document.documentElement.scrollWidth <= innerWidth`),'artwork card mobile overflow'); + assert.deepEqual(errors, []); + console.log('PASS: themes/mobile; automatic/manual request capture and persistence; real PCM visualizer response and expanded-view focus; artwork persistence, morph and reduced-motion. No runtime exceptions. Screenshots: ' + output); +} finally { + if (ws?.readyState === WebSocket.OPEN) { try { await send('Browser.close'); } catch {} ws.close(); } + browser.kill(); + server.closeAllConnections(); + await new Promise(resolve => server.close(resolve)); +} diff --git a/tools/webui/tests/style-slots-browser.mjs b/tools/webui/tests/style-slots-browser.mjs new file mode 100644 index 0000000..f6f416f --- /dev/null +++ b/tools/webui/tests/style-slots-browser.mjs @@ -0,0 +1,167 @@ +// Isolated browser profile and preview origin: never changes the user's library. +import http from 'node:http'; +import fs from 'node:fs'; +import os from 'node:os'; +import path from 'node:path'; +import { spawn } from 'node:child_process'; +import assert from 'node:assert/strict'; +import { fileURLToPath } from 'node:url'; + +const root = fileURLToPath(new URL('../../../', import.meta.url)); +const output = path.join(root, 'build/ui-review'); +fs.mkdirSync(output, { recursive: true }); +const html = fs.readFileSync(new URL('../dist/index.html', import.meta.url)); +const submitted = []; +const server = http.createServer((req, res) => { + if (req.url === '/synth') { + let body='';req.on('data',chunk=>body+=chunk);req.on('end',()=>{submitted.push(JSON.parse(body));res.writeHead(400,{'Content-Type':'application/json'});res.end(JSON.stringify({error:'Preview capture only; no generation.'}));});return; + } + if (['/props', '/logs', '/health'].includes(req.url)) { + const upstream = http.get(`http://127.0.0.1:8087${req.url}`, response => { res.writeHead(response.statusCode, response.headers); response.pipe(res); }); + upstream.on('error', () => { res.writeHead(502); res.end(); }); + res.on('close', () => upstream.destroy()); + } else { res.writeHead(200, { 'Content-Type': 'text/html' }); res.end(html); } +}); +await new Promise(resolve => server.listen(18788, '127.0.0.1', resolve)); +const profile = fs.mkdtempSync(path.join(os.tmpdir(), 'yue2-ui-review-')); +const browser = spawn('C:/Program Files/Google/Chrome/Application/chrome.exe', [ + '--headless=new', '--remote-debugging-port=19229', `--user-data-dir=${profile}`, + '--no-first-run', '--no-default-browser-check', '--disable-background-networking', '--mute-audio', '--autoplay-policy=no-user-gesture-required', 'about:blank' +], { windowsHide: true, stdio: 'ignore' }); +let ws; +let sequence = 0; +const pending = new Map(); +const errors = []; +const delay = ms => new Promise(resolve => setTimeout(resolve, ms)); +function send(method, params = {}) { + return new Promise((resolve, reject) => { + const id = ++sequence; + const timer = setTimeout(() => { pending.delete(id); reject(new Error(`CDP timeout: ${method}`)); }, 10000); + pending.set(id, { resolve, reject, timer }); + ws.send(JSON.stringify({ id, method, params })); + }); +} +const evaluate = async expression => { + const result = await send('Runtime.evaluate', { expression, returnByValue: true, awaitPromise: true }); + if (result.exceptionDetails) throw new Error(JSON.stringify(result.exceptionDetails)); + return result.result.value; +}; +try { + let target; + for (let n = 0; n < 60; n++) { + try { target = (await (await fetch('http://127.0.0.1:19229/json')).json()).find(item => item.type === 'page'); if (target) break; } catch {} + await delay(200); + } + assert.ok(target, 'Chrome debugging target unavailable'); + ws = new WebSocket(target.webSocketDebuggerUrl); + await new Promise(resolve => ws.addEventListener('open', resolve, { once: true })); + ws.addEventListener('message', event => { + const message = JSON.parse(event.data); + if (message.method === 'Runtime.exceptionThrown') errors.push(message.params.exceptionDetails.text); + if (message.id && pending.has(message.id)) { + const task = pending.get(message.id); pending.delete(message.id); clearTimeout(task.timer); + if (message.error) task.reject(new Error(JSON.stringify(message.error))); else task.resolve(message.result); + } + }); + await send('Runtime.enable'); + await send('Page.enable'); + await send('Emulation.setDeviceMetricsOverride', { width: 1440, height: 1000, deviceScaleFactor: 1, mobile: false }); + await send('Page.navigate', { url: 'http://127.0.0.1:18788' }); + await delay(1800); + assert.equal(await evaluate("document.querySelectorAll('.style-tile').length"), 103); + const stripBox = await evaluate("(()=>{const r=document.querySelector('.preset-discovery').getBoundingClientRect();return {x:r.x,y:r.y,width:r.width,height:r.height}})()"); + const mouseX = stripBox.x + stripBox.width - 25, mouseY = stripBox.y + 35; + await send('Input.dispatchMouseEvent',{type:'mouseMoved',x:mouseX,y:mouseY}); + await send('Input.dispatchMouseEvent',{type:'mousePressed',x:mouseX,y:mouseY,button:'left',clickCount:1}); + await send('Input.dispatchMouseEvent',{type:'mouseMoved',x:mouseX-180,y:mouseY,button:'left',buttons:1}); + await send('Input.dispatchMouseEvent',{type:'mouseReleased',x:mouseX-180,y:mouseY,button:'left',clickCount:1}); + await delay(100); + assert.ok(await evaluate("document.querySelector('.preset-discovery').scrollLeft > 100"), 'mouse drag scrolls'); + assert.equal(await evaluate("document.querySelectorAll('.remove-selected-style').length"),0,'drag must not select a style'); + const beforeWheel = await evaluate("document.querySelector('.preset-discovery').scrollLeft"); + await send('Input.dispatchMouseEvent',{type:'mouseWheel',x:mouseX,y:mouseY,deltaX:0,deltaY:230}); await delay(150); + assert.ok(await evaluate("document.querySelector('.preset-discovery').scrollLeft") > beforeWheel, 'vertical wheel scrolls styles horizontally'); + await evaluate("document.querySelector('.preset-discovery').focus()"); + await send('Input.dispatchKeyEvent',{type:'keyDown',key:'End',code:'End',windowsVirtualKeyCode:35});await delay(100); + assert.ok(await evaluate("(()=>{const e=document.querySelector('.preset-discovery');return e.scrollLeft + e.clientWidth >= e.scrollWidth-2})()"),'last style reachable'); + await evaluate("document.querySelector('.preset-discovery').scrollLeft=0"); + assert.equal(await evaluate("document.querySelectorAll('.selected-style-slot').length"), 3); + assert.equal(await evaluate("document.querySelectorAll('.empty-style-slot').length"), 3); + assert.equal(await evaluate("document.querySelector('.brief-column textarea')"), null); + await evaluate("document.querySelector('.empty-style-slot').click()"); + assert.ok(await evaluate("document.activeElement.classList.contains('style-search')")); + for (const name of ['Boom Bap', 'Underground Hip-Hop', 'Lo-Fi Hip-Hop', 'Jazz Rap']) { + await evaluate(`Array.from(document.querySelectorAll('.style-tile')).find(e=>e.querySelector('strong').textContent===${JSON.stringify(name)}).click()`); + await delay(70); + } + assert.equal(await evaluate("document.querySelectorAll('.remove-selected-style').length"), 3); + await evaluate("document.querySelector('.generate-btn').click()"); + await delay(400); + assert.equal(submitted.length, 1); + assert.match(submitted[0].style, /Boom Bap/); + assert.match(submitted[0].style, /Underground Hip-Hop/); + assert.match(submitted[0].style, /Lo-Fi Hip-Hop/); + assert.doesNotMatch(submitted[0].style, /Purpose|Context Guidance|generation brief|Production Priorities/); + assert.ok(submitted[0].style.length < 3500); + console.log('Submitted three-style prompt:', submitted[0].style.length, 'characters'); + await evaluate("document.querySelector('.blend-disclosure').open=true;document.querySelector('.music-mixer [role=slider]').dispatchEvent(new KeyboardEvent('keydown',{key:'Home',bubbles:true}))"); + await delay(100); + await evaluate("document.querySelector('.generate-btn').click()"); + await delay(300); + assert.doesNotMatch(submitted.at(-1).style, /Boom Bap/); + assert.match(submitted.at(-1).style, /Primary style — Underground/); + await evaluate("document.querySelector('.remove-selected-style').click()"); + await delay(100); + assert.equal(await evaluate("document.querySelectorAll('.empty-style-slot').length"), 1); + await send('Page.reload'); await delay(1000); + assert.equal(await evaluate("document.querySelectorAll('.remove-selected-style').length"), 2); + // Simulate the old persisted long prompt and an oversized saved blend. + await evaluate(`{ + const mix=JSON.parse(localStorage.getItem('yue2-style-mix-v1')); + mix.musicIds=['003_underground_hip_hop','032_uk_drill','048_soul_hip_hop','022_trap']; + mix.musicWeights=Object.fromEntries(mix.musicIds.map(id=>[id,50])); + mix.musicPrompt='Hip-hop generation brief for YuE2. These are full style profiles; legacy boilerplate'; + const state=JSON.parse(localStorage.getItem('yue2'));state.request.style=mix.musicPrompt; + localStorage.setItem('yue2',JSON.stringify(state));localStorage.setItem('yue2-style-mix-v1',JSON.stringify(mix)); + }`); + await send('Page.reload'); await delay(1000); + assert.equal(await evaluate("document.querySelectorAll('.remove-selected-style').length"), 3); + await evaluate("document.querySelector('.generate-btn').click()");await delay(300); + assert.doesNotMatch(submitted.at(-1).style,/legacy boilerplate|These are full|Primary style — Trap/); + assert.match(submitted.at(-1).style,/UK Drill/); + // Existing browser drafts may contain a completed score, audio codes and fixed seeds. + await evaluate(`{const state=JSON.parse(localStorage.getItem('yue2'));Object.assign(state.request,{abc:'X:1\\nK:C\\nCDEF|',semantic_tokens:'1,2,3',lm_seed:42,seed:9});localStorage.setItem('yue2',JSON.stringify(state));}`); + await send('Page.reload');await delay(1000); + await evaluate("document.querySelector('.generate-btn').click()");await delay(300); + const freshOne = submitted.at(-1); + assert.ok(!freshOne.abc && !freshOne.semantic_tokens); + await evaluate("document.querySelector('.generate-btn').click()");await delay(300); + assert.notEqual(submitted.at(-1).lm_seed,freshOne.lm_seed); + assert.notEqual(submitted.at(-1).seed,freshOne.seed); + assert.ok(!submitted.at(-1).abc && !submitted.at(-1).semantic_tokens); + await evaluate("document.querySelector('[aria-label=\"New composition each time\"]').click()"); + await delay(100); + assert.equal(await evaluate("document.querySelector('[aria-label=\"New composition each time\"]').checked"),false); + await evaluate("window.dispatchEvent(new CustomEvent('yue2-select-style',{detail:'022_trap'}))");await delay(100); + assert.equal(await evaluate("document.querySelector('[aria-label=\"New composition each time\"]').checked"),true,'changing style exits reuse'); + await evaluate("document.querySelector('.generate-btn').click()");await delay(300); + assert.match(submitted.at(-1).style,/Primary style.*Trap/); + assert.ok(!submitted.at(-1).abc && !submitted.at(-1).semantic_tokens); + for (const [width,height,name] of [[1916,966,'styles-desktop'],[1280,800,'styles-laptop'],[390,844,'styles-mobile']]) { + await send('Emulation.setDeviceMetricsOverride',{width,height,deviceScaleFactor:1,mobile:width<500}); + await evaluate("document.querySelector('.center-scroll').scrollTo({top:0,behavior:'instant'})");await delay(150); + assert.ok(await evaluate('document.documentElement.scrollWidth <= innerWidth'), name); + assert.ok(await evaluate("document.querySelector('.selected-style-slots').scrollWidth <= document.querySelector('.selected-style-slots').clientWidth"),name+' slots overflow'); + const capture=await send('Page.captureScreenshot',{format:'png'}); + fs.writeFileSync(path.join(output,name+'.png'),Buffer.from(capture.data,'base64')); + } + await evaluate("document.querySelector('.blend-disclosure').open=true;document.querySelector('.custom-direction').open=true;const input=document.querySelector('.custom-direction textarea');input.value='Warm piano and soft drums';input.dispatchEvent(new Event('input',{bubbles:true}))");await delay(100); + assert.equal(await evaluate("document.querySelectorAll('.empty-style-slot').length"), 3); + await evaluate("document.querySelector('.generate-btn').click()");await delay(300); + assert.match(submitted.at(-1).style,/Warm piano and soft drums/); + assert.deepEqual(errors, []); + console.log('PASS: empty/selected slots, maximum three, removal, zero strength, actual generation payload, reload, legacy migration, custom direction, desktop/mobile layout.'); +} finally { + if (ws?.readyState === WebSocket.OPEN) { try { await send('Browser.close'); } catch {} ws.close(); } + browser.kill(); server.closeAllConnections(); await new Promise(resolve => server.close(resolve)); +} diff --git a/tools/webui/vite.config.ts b/tools/webui/vite.config.ts index 0d2a27e..e401c93 100644 --- a/tools/webui/vite.config.ts +++ b/tools/webui/vite.config.ts @@ -64,6 +64,8 @@ export default defineConfig({ // dev server: proxy yue-server endpoints server: { proxy: { + '/comfy': 'http://localhost:8087', + '/album': 'http://localhost:8087', '/synth': 'http://localhost:8087', '/job': 'http://localhost:8087', '/health': 'http://localhost:8087', diff --git a/tools/youtube-agent/.gitignore b/tools/youtube-agent/.gitignore new file mode 100644 index 0000000..7e97123 --- /dev/null +++ b/tools/youtube-agent/.gitignore @@ -0,0 +1,2 @@ +profile/ +runs/ diff --git a/tools/youtube-agent/README.md b/tools/youtube-agent/README.md new file mode 100644 index 0000000..e1ee433 --- /dev/null +++ b/tools/youtube-agent/README.md @@ -0,0 +1,39 @@ +# YouTube draft agent + +Current integrated workflow: **Prepare for YouTube → Launch agent** on a saved MP4. The native server starts the loopback bridge; a dedicated Chrome profile opens. The ordinary signed-in Chrome window cannot be attached without a debugging connection. Metadata drafts save locally; playlist, end screens and publishing remain review actions. The user deferred signed-in upload acceptance on 27 September 2026; nothing was uploaded. + +The CLI below remains an alternative. Its separate Edge profile is independent of the integrated Chrome bridge. + +# YouTube browser agent — first version + +Creates a local publishing draft from a YuE2 song and assists a signed-in YouTube Studio upload. Uses a dedicated persistent Edge profile; Google credentials are entered in the browser, never in a configuration file. + +## Start + +1. On the song menu select **Export video (MP4)** if necessary, then **Prepare for YouTube**. +2. Edit the metadata, save/download the draft, and download the MP4. Optionally download artwork. +3. In PowerShell: + +```powershell +cd C:\Users\mrmul\yue2.cpp\tools\youtube-agent +npm install +npm start -- --draft "$env:USERPROFILE\Downloads\youtube-1.json" --video "$env:USERPROFILE\Downloads\youtube-1.mp4" +``` + +Use your actual filenames. Add `--thumbnail "C:\path\cover.png"` for a thumbnail. Edge is the default browser; `--channel chrome` uses installed Chrome. `--validate-only` checks the draft and input files without opening a browser or uploading anything. + +4. Sign in, select your channel, and open **Create → Upload videos**. Type `UPLOAD` in the terminal to authorize transferring this video. +5. The agent supplies the MP4, title, description, chosen audience, optional thumbnail and tags. +6. Review the fields and thumbnail in Studio. Apply the requested playlist and end screen manually, review disclosures and checks, wait for processing, and choose visibility or scheduling. Save/publish in Studio yourself. Type `REVIEWED` only after Studio confirms your changes were saved. + +## Implemented and pending + +Implemented: per-song local draft, export of draft/video/artwork, input validation, dedicated browser session, upload and basic metadata filling, staged review, run status and error screenshot. Selectors currently target English Studio. The browser automation has not yet been exercised against a signed-in channel. + +Playlist selection, end-screen editing, disclosures, scheduling and the final save/publish action currently require the user in Studio. End screens may be unavailable based on audience and video eligibility. These steps are explicitly presented for review, never recorded as automatically completed. A completed run means the user confirmed review; it is not proof of publication. + +Runs are saved under `runs/`; browser session data under `profile/`. Both are ignored by git. Keep them local. Errors stop without retrying the upload. Inspect the existing Studio draft before running again, because YouTube may already have retained it. Browser layout changes may require selector updates. Close the agent before launching another run with the same profile. + +The UI bundle is embedded in yue-server. Building the WebUI alone updates the bundle on disk; rebuilding/restarting yue-server is needed to expose it on port 8087. + +The runner uses Playwright [persistent browser contexts](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-persistent-context) and [file input actions](https://playwright.dev/docs/input#upload-files). diff --git a/tools/youtube-agent/agent.mjs b/tools/youtube-agent/agent.mjs new file mode 100644 index 0000000..2303bb3 --- /dev/null +++ b/tools/youtube-agent/agent.mjs @@ -0,0 +1,100 @@ +import { chromium } from 'playwright'; +import { readFile, writeFile, mkdir, stat } from 'node:fs/promises'; +import { resolve, dirname, extname } from 'node:path'; +import { fileURLToPath } from 'node:url'; +import { parseArgs } from 'node:util'; +import { createInterface } from 'node:readline/promises'; +import { validateDraft } from './draft.mjs'; + +const root = dirname(fileURLToPath(import.meta.url)); +const { values } = parseArgs({ options: { + draft: { type: 'string' }, video: { type: 'string' }, thumbnail: { type: 'string' }, + channel: { type: 'string', default: 'msedge' }, 'validate-only': { type: 'boolean' } +} }); +if (!values.draft || !values.video) { + console.error('Usage: npm start -- --draft draft.json --video video.mp4 [--thumbnail cover.png] [--validate-only]'); + process.exit(1); +} +const draft = validateDraft(JSON.parse(await readFile(resolve(values.draft), 'utf8'))); +const video = resolve(values.video); +if (extname(video).toLowerCase() !== '.mp4' || !(await stat(video)).isFile() || !(await stat(video)).size) throw new Error('Choose a nonempty MP4 file.'); +const thumbnail = values.thumbnail && resolve(values.thumbnail); +if (thumbnail && (!['.png', '.jpg', '.jpeg', '.webp'].includes(extname(thumbnail).toLowerCase()) || !(await stat(thumbnail)).isFile())) throw new Error('Choose a PNG, JPEG or WebP thumbnail.'); +if (values['validate-only']) { console.log('Draft and input files validated; no browser opened.'); process.exit(0); } +if (!process.stdin.isTTY) throw new Error('Run this agent in an interactive terminal for Studio review.'); + +const runDir = resolve(root, 'runs', new Date().toISOString().replace(/[:.]/g, '-')); +await mkdir(runDir, { recursive: true }); +const state = { title: draft.title, video, status: 'starting', steps: [], studioUrl: '', error: '' }; +const record = async (step) => { state.steps.push({ step, at: new Date().toISOString() }); await writeFile(resolve(runDir, 'status.json'), JSON.stringify(state, null, 2)); }; +const terminal = createInterface({ input: process.stdin, output: process.stdout }); +let context; +let page; +async function review(message, word = 'DONE') { + console.log(`\n${message}`); + while (true) { + const answer = (await terminal.question(`Type ${word} to continue, or STOP to end: `)).trim(); + if (answer === word) return; + if (answer === 'STOP' || terminal.closed) throw new Error('Stopped by user.'); + console.log(`Enter exactly ${word}; press Ctrl+C to stop.`); + } +} +// Aborting always closes the local agent; Studio may retain a draft already uploaded. +terminal.on('SIGINT', () => { terminal.close(); void context?.close(); process.exitCode = 130; }); +try { + context = await chromium.launchPersistentContext(resolve(root, 'profile'), { channel: values.channel, headless: false, viewport: null }); + page = await context.newPage(); + page.setDefaultTimeout(20_000); + await page.goto('https://studio.youtube.com', { waitUntil: 'domcontentloaded' }); + await review(`Sign in, select the intended channel, then open Create → Upload videos.\nVideo: ${video}\nTitle: ${draft.title}\nConfirm the channel before authorizing this upload.`, 'UPLOAD'); + const input = page.locator('input[type="file"][accept*="video"]'); + if (await input.count() !== 1) throw new Error('Could not uniquely identify the Studio video picker. Open Upload videos and retry only after checking for an existing upload.'); + await input.setInputFiles(video); + state.status = 'upload-started'; + await record('Video handed to Studio; processing and saving are not yet verified.'); + const title = page.locator('ytcp-social-suggestions-textbox#title-textarea #textbox'); + const description = page.locator('ytcp-social-suggestions-textbox#description-textarea #textbox'); + await title.fill(draft.title); + await description.fill(draft.description); + if (await title.innerText() !== draft.title) throw new Error('Studio title did not match the draft.'); + await record('Title and description filled.'); + if (draft.audience !== 'review') { + await page.getByRole('radio', { name: draft.audience === 'kids' ? /Yes, it.*made for kids/i : /No, it.*not made for kids/i }).click(); + await record('Audience selected; verify in Studio.'); + } + if (thumbnail) { + const [chooser] = await Promise.all([ + page.waitForEvent('filechooser'), + page.getByRole('button', { name: /Upload (file|thumbnail)/i }).click() + ]); + await chooser.setFiles(thumbnail); + await record('Thumbnail submitted; verify preview in Studio.'); + } + if (draft.parsedTags.length) { + await page.getByRole('button', { name: /show more/i }).click(); + const tags = page.locator('ytcp-form-input-container#tags-container input'); + await tags.fill(draft.parsedTags.join(',')); + await tags.press('Enter'); + await record('Tags entered; verify in Studio.'); + } + state.status = 'awaiting-review'; + state.studioUrl = page.url(); + await record('Automatic steps finished; manual review required.'); + await review(`Review Details in Studio:\n• Title, description, tags and thumbnail preview\n• Audience: ${draft.audience}\n• Playlist: ${draft.playlist || 'No playlist requested'}\n• Language, category, AI/altered-content disclosure and other upload settings\nThen go to Video elements and apply the end screen: ${draft.endScreen || 'No end screen requested'}.\nMade-for-kids uploads may not offer end screens. Record any unavailable option yourself.\nComplete copyright/checks review and wait for video processing.\nIntended visibility: ${draft.visibility}. Choose visibility/scheduling and save or publish yourself.\nKeep the Studio tab open until it confirms saving.`, 'REVIEWED'); + state.status = 'user-reviewed'; + state.studioUrl = page.url(); + await record('User confirmed review. Publication has not been independently verified.'); + console.log(`Run record: ${runDir}`); +} catch (error) { + state.status = 'needs-attention'; + state.error = error instanceof Error ? error.message : String(error); + await record('Stopped; inspect Studio before retrying to avoid duplicate uploads.'); + if (page && !page.isClosed()) await page.screenshot({ path: resolve(runDir, 'attention.png') }).catch(() => {}); + console.error(state.error); + console.error(`Details: ${runDir}`); + if (!terminal.closed && page && !page.isClosed()) await terminal.question('Inspect or finish the existing Studio draft. Press Enter when ready to close the browser.').catch(() => {}); + process.exitCode = 1; +} finally { + terminal.close(); + await context?.close(); +} diff --git a/tools/youtube-agent/bridge.mjs b/tools/youtube-agent/bridge.mjs new file mode 100644 index 0000000..353e119 --- /dev/null +++ b/tools/youtube-agent/bridge.mjs @@ -0,0 +1,64 @@ +import http from 'node:http'; +import {chromium} from 'playwright'; +import {readFile,writeFile,mkdir,rename} from 'node:fs/promises'; +import {fileURLToPath} from 'node:url'; +import {join} from 'node:path'; +import {validateDraft} from './draft.mjs'; + +const root=fileURLToPath(new URL('.',import.meta.url)),folder=join(root,'runs'); +await mkdir(folder,{recursive:true}); +let state={status:'idle',channel:'HipHop Circuit',message:'Choose a track to prepare an upload.'},context,page,operation=false; +try{state=JSON.parse(await readFile(join(folder,'latest.json'),'utf8'));if(state.status!=='idle')state={...state,status:'needs-attention',message:'Agent restarted. Resume the existing Studio draft to avoid uploading twice.'};}catch{} +async function save(){const temp=join(folder,'latest.json.tmp');await writeFile(temp,JSON.stringify(state,null,2),{flush:true});await rename(temp,join(folder,'latest.json'));} +async function progress(status,message){state.status=status;state.message=message;await save();} +async function openBrowser(url){context??=await chromium.launchPersistentContext(join(root,'profile'),{channel:'chrome',headless:false,viewport:null});page=context.pages()[0]??await context.newPage();page.setDefaultTimeout(20000);await page.goto(url,{waitUntil:'domcontentloaded'});} +function resumeUrl(value){const url=new URL(value);if(url.origin!=='https://studio.youtube.com'||!/^\/video\/[\w-]+\/edit/.test(url.pathname))throw new Error('Paste the existing video edit URL from YouTube Studio.');return url.href;} +async function launch(form){ + if(state.uploadAttempted&&form.get('newUpload')!=='true'&&!form.get('resumeUrl'))throw new Error('A previous upload may exist. Resume its Studio edit URL, or explicitly choose a new upload after checking the channel.'); + const draft=validateDraft(JSON.parse(String(form.get('draft')))); + if(form.get('resumeUrl')){state={...state,draft,studioUrl:resumeUrl(String(form.get('resumeUrl'))),channel:'HipHop Circuit'};await save();await openBrowser(state.studioUrl);await progress('review','Existing draft opened. Review playlist, end screen, disclosures and visibility in Studio. No file was uploaded.');return;} + const video=form.get('video');if(!(video instanceof Blob)||!video.size||video.size>256*1024*1024)throw new Error('Choose an MP4 smaller than 256 MiB.'); + const run=join(folder,crypto.randomUUID());await mkdir(run); + await writeFile(join(run,'video.mp4'),Buffer.from(await video.arrayBuffer())); + const thumbnail=form.get('thumbnail');let image; + if(thumbnail instanceof Blob&&thumbnail.size){if(thumbnail.size>10*1024*1024)throw new Error('Thumbnail exceeds 10 MiB.');image=join(run,thumbnail.type==='image/jpeg'?'cover.jpg':thumbnail.type==='image/webp'?'cover.webp':'cover.png');await writeFile(image,Buffer.from(await thumbnail.arrayBuffer()));} + state={status:'starting',channel:'HipHop Circuit',run,video:join(run,'video.mp4'),image,draft,uploadAttempted:false};await save(); + await openBrowser('https://studio.youtube.com'); + await progress('confirm-channel','Sign in to HipHop Circuit and open Create → Upload videos. Choose Confirm channel & upload here when ready.'); +} +async function upload(){ + if(state.status!=='confirm-channel'||!page)throw new Error('Open an upload session and confirm the channel first.'); + const picker=page.locator('input[type="file"][accept*="video"]');if(await picker.count()!==1)throw new Error('Open Create → Upload videos in the HipHop Circuit Studio window.'); + // Mark before handing the file to the browser. A crash cannot silently re-upload. + state.uploadAttempted=true;await progress('uploading','Uploading to the channel you confirmed. Keep Studio open.'); + await picker.setInputFiles(state.video); + const title=page.locator('ytcp-social-suggestions-textbox#title-textarea #textbox'); + const description=page.locator('ytcp-social-suggestions-textbox#description-textarea #textbox'); + await title.fill(state.draft.title);await description.fill(state.draft.description); + if((await title.innerText())!==state.draft.title)throw new Error('Studio did not retain the expected title.'); + if(state.draft.audience!=='review')await page.getByRole('radio',{name:state.draft.audience==='kids'?/Yes, it.*made for kids/i:/No, it.*not made for kids/i}).click(); + if(state.image){const [chooser]=await Promise.all([page.waitForEvent('filechooser'),page.getByRole('button',{name:/Upload (file|thumbnail)/i}).click()]);await chooser.setFiles(state.image);} + if(state.draft.parsedTags.length){await page.getByRole('button',{name:/show more/i}).click();const tags=page.locator('ytcp-form-input-container#tags-container input');await tags.fill(state.draft.parsedTags.join(','));await tags.press('Enter');} + const link=await page.locator('a[href*="youtu.be/"]').first().getAttribute('href').catch(()=>null); + if(link){const id=new URL(link).pathname.slice(1);if(/^[\w-]+$/.test(id))state.studioUrl=`https://studio.youtube.com/video/${id}/edit`;} + await progress('review','Details entered. Select your playlist in Studio, configure the end screen, check disclosures/copyright/processing, and choose visibility or scheduling. Saving or publishing is your action in Studio.'); +} +const server=http.createServer(async(req,res)=>{ + res.setHeader('Content-Type','application/json'); + // Loopback server accepts same-origin native proxy requests only; no CORS. + if(req.headers.origin){res.writeHead(403);res.end(JSON.stringify({error:'Use the Studio app.'}));return;} + try{ + if(req.method==='GET'&&req.url==='/status'){res.end(JSON.stringify(state));return;} + if(req.method!=='POST'){res.writeHead(404);res.end('{}');return;} + if(operation)throw new Error('An agent action is still running.'); + if(req.url==='/stop'){await context?.close();context=page=undefined;await progress('needs-attention','Browser closed. Any existing Studio draft remains. Resume it before retrying.');res.end(JSON.stringify(state));return;} + const parts=[];let size=0;for await(const part of req){size+=part.length;if(size>270*1024*1024)throw new Error('Request too large');parts.push(part);} + let action; + if(req.url==='/launch'){const request=new Request('http://localhost/',{method:'POST',headers:{'Content-Type':req.headers['content-type']},body:Buffer.concat(parts)});const form=await request.formData();action=()=>launch(form);} + else if(req.url==='/continue')action=upload; + else throw new Error('Unknown agent action'); + operation=true;res.end(JSON.stringify({accepted:true})); + void action().catch(async error=>{await progress('needs-attention',error.message+' Inspect the current Studio draft before retrying.');}).finally(()=>{operation=false;}); + }catch(error){res.statusCode=400;res.end(JSON.stringify({error:error.message}));} +}); +server.listen(18189,'127.0.0.1',()=>console.log('YouTube agent bridge ready on loopback:18189')); diff --git a/tools/youtube-agent/draft.mjs b/tools/youtube-agent/draft.mjs new file mode 100644 index 0000000..1bddfa8 --- /dev/null +++ b/tools/youtube-agent/draft.mjs @@ -0,0 +1,14 @@ +export function validateDraft(draft) { + if (!draft || draft.version !== 1) throw new Error('Expected a version 1 YouTube draft.'); + for (const key of ['title', 'description', 'tags', 'playlist', 'endScreen']) { + if (typeof draft[key] !== 'string') throw new Error(`Missing text field: ${key}`); + } + if (!draft.title.trim() || draft.title.length > 100 || /[<>]/.test(draft.title)) throw new Error('Invalid title (1–100 characters, no angle brackets).'); + if (draft.description.length > 5000 || /[<>]/.test(draft.description)) throw new Error('Invalid description (up to 5000 characters, no angle brackets).'); + if (!['review', 'kids', 'general'].includes(draft.audience)) throw new Error('Invalid audience.'); + if (!['private', 'unlisted', 'public'].includes(draft.visibility)) throw new Error('Invalid visibility.'); + const tags = draft.tags.split(',').map(t => t.trim()).filter(Boolean); + const tagLength = tags.reduce((sum, tag) => sum + tag.length + (tag.includes(' ') ? 2 : 0), Math.max(0, tags.length - 1)); + if (tagLength > 500) throw new Error('Tags exceed the 500 character budget.'); + return { ...draft, parsedTags: tags }; +} diff --git a/tools/youtube-agent/draft.test.mjs b/tools/youtube-agent/draft.test.mjs new file mode 100644 index 0000000..a8d5cb2 --- /dev/null +++ b/tools/youtube-agent/draft.test.mjs @@ -0,0 +1,18 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { validateDraft } from './draft.mjs'; +const draft = { version: 1, title: 'A song', description: '', tags: 'music, piano', audience: 'review', playlist: '', endScreen: '', visibility: 'private' }; +test('draft preserves an undecided audience and normalizes tags', () => { + const result = validateDraft(draft); + assert.equal(result.audience, 'review'); + assert.deepEqual(result.parsedTags, ['music', 'piano']); +}); +test('reject malformed drafts before opening a browser', () => { + for (const invalid of [null, {}, { ...draft, title: '' }, { ...draft, title: 'x'.repeat(101) }, { ...draft, description: '' }, { ...draft, audience: true }, { ...draft, visibility: 'scheduled' }, { ...draft, tags: 'a'.repeat(501) }]) { + assert.throws(() => validateDraft(invalid)); + } +}); +test('tag budget counts commas and quotes around phrases', () => { + assert.throws(() => validateDraft({ ...draft, tags: `${'a'.repeat(496)},b c` })); + assert.doesNotThrow(() => validateDraft({ ...draft, tags: 'a'.repeat(500) })); +}); diff --git a/tools/youtube-agent/package-lock.json b/tools/youtube-agent/package-lock.json new file mode 100644 index 0000000..aeb994f --- /dev/null +++ b/tools/youtube-agent/package-lock.json @@ -0,0 +1,40 @@ +{ + "name": "yue2-youtube-agent", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "yue2-youtube-agent", + "dependencies": { + "playwright": "^1.58.0" + } + }, + "node_modules/playwright": { + "version": "1.63.0", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.63.0.tgz", + "integrity": "sha512-+7ziBLidS4NaNCdt57SUDT+wYmmd5fmiQejUic/kb+YsYSCPyOOE9sebzMjNmQrsnNpDJqd4WHvV/8lfKfUDUg==", + "license": "Apache-2.0", + "dependencies": { + "playwright-core": "1.63.0" + }, + "bin": { + "playwright": "cli.js" + }, + "engines": { + "node": ">=20" + } + }, + "node_modules/playwright-core": { + "version": "1.63.0", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.63.0.tgz", + "integrity": "sha512-rYCsBF/M5HjUch52bbtVONEFjv6Xu8sm8h72dNlR5bzIE1fvC/bxgspzkjSfU+MweEMmPM8KJebG6nnyxo5mCg==", + "license": "Apache-2.0", + "bin": { + "playwright-core": "cli.js" + }, + "engines": { + "node": ">=20" + } + } + } +} diff --git a/tools/youtube-agent/package.json b/tools/youtube-agent/package.json new file mode 100644 index 0000000..3bb7cbd --- /dev/null +++ b/tools/youtube-agent/package.json @@ -0,0 +1,7 @@ +{ + "name": "yue2-youtube-agent", + "private": true, + "type": "module", + "scripts": { "start": "node agent.mjs", "test": "node --test" }, + "dependencies": { "playwright": "^1.58.0" } +} diff --git a/tools/youtube-api.h b/tools/youtube-api.h new file mode 100644 index 0000000..36f4e68 --- /dev/null +++ b/tools/youtube-api.h @@ -0,0 +1,45 @@ +#pragma once +#include "httplib.h" +#include +#include +#include +#ifdef _WIN32 +#include +#else +#include +#include +extern char ** environ; +#endif + +static void register_youtube_api(httplib::Server &server) { + auto mutex=std::make_shared(); + auto forward=[mutex](const httplib::Request &req,httplib::Response &res){ + const auto origin=req.get_header_value("Origin");if((!origin.empty() && origin!="http://"+req.get_header_value("Host")) || req.get_header_value("Sec-Fetch-Site")=="cross-site"){res.status=403;return;} + if(req.body.size()>270ULL*1024*1024){res.status=413;return;} + httplib::Client client("127.0.0.1",18189);client.set_connection_timeout(1);client.set_read_timeout(30);client.set_write_timeout(30); + auto status=client.Get("/status"); + if(!status&&req.target=="/youtube/launch"){ + std::lock_guard lock(*mutex); + status=client.Get("/status"); + if(!status){ +#ifdef _WIN32 + const char *args[]={"node","tools/youtube-agent/bridge.mjs",nullptr}; + const auto child=_spawnvp(_P_NOWAIT,"node",args);if(child!=-1)CloseHandle((HANDLE)child); +#else + char node[]="node",script[]="tools/youtube-agent/bridge.mjs";char *args[]={node,script,nullptr};pid_t pid; + if(posix_spawnp(&pid,"node",nullptr,nullptr,args,environ)==0)std::thread([pid]{int result;waitpid(pid,&result,0);}).detach(); +#endif + for(int i=0;i<30&&!status;i++){std::this_thread::sleep_for(std::chrono::milliseconds(100));status=client.Get("/status");} + } + } + if(!status){if(req.method=="POST")res.status=503;res.set_content("{\"status\":\"offline\",\"message\":\"Start an upload session to launch the agent.\"}","application/json");return;} + httplib::UploadFormDataItems items;size_t size=req.body.size(); + for(const auto &entry:req.form.fields){const auto &v=entry.second;items.push_back({v.name,v.content,"",""});size+=v.content.size();} + for(const auto &entry:req.form.files){const auto &v=entry.second;items.push_back({v.name,v.content,v.filename,v.content_type});size+=v.content.size();} + if(size>270ULL*1024*1024){res.status=413;return;} + auto response=req.method=="GET"?std::move(status):req.is_multipart_form_data()?client.Post(req.target.substr(8),items):client.Post(req.target.substr(8),req.body,req.get_header_value("Content-Type")); + if(!response){res.status=503;return;}res.status=response->status;res.set_content(response->body,"application/json"); + }; + server.Get("/youtube/status",forward); + server.Post(R"(/youtube/(launch|continue|stop))",forward); +} diff --git a/tools/yue-server.cpp b/tools/yue-server.cpp index f62babb..f3bfd47 100644 --- a/tools/yue-server.cpp +++ b/tools/yue-server.cpp @@ -10,20 +10,30 @@ // live in src/. #include "audio-io.h" +#include "audio-master.h" +#include "audio-vocal-balance.h" +#include "audio-video.h" #include "httplib.h" #include "index.html.gz.hpp" #include "pipeline.h" #include "version.h" #include "yyjson.h" +#include "comfy-api.h" +#include "youtube-api.h" +#include "saved-presets.h" +#include "job-archive.h" #include #include #include +#include +#include #include #include #include #include #include +#include #include #include #include @@ -157,6 +167,7 @@ enum class JobStatus : int { DONE = 1, FAILED = 2, CANCELLED = 3, + INTERRUPTED = 4, }; struct Job { @@ -165,6 +176,13 @@ struct Job { std::string result_body; std::string result_mime; std::atomic cancel{ false }; + std::atomic durable{ false }; + std::atomic started{false}; + std::string kind = "generation"; + std::mutex progress_mutex; + std::string stage = "Queued"; + int stage_done=0, stage_total=0; + std::chrono::steady_clock::time_point stage_start=std::chrono::steady_clock::now(); // memory ordering contract: result_body and result_mime are written // before status is stored (seq_cst). the client loads status (seq_cst) @@ -177,6 +195,13 @@ static std::unordered_map> g_jobs; static std::deque g_job_order; static const int MAX_JOBS = 32; +static void job_finish(const std::shared_ptr & job, JobStatus status) { + try { job_archive::finish(job->id, (int)status, job->result_mime, job->result_body); job->durable.store(true); } + catch (const std::exception & error) { fprintf(stderr, "[ERROR] Job %s is memory-only: %s\n", job->id.c_str(), error.what()); } + job->status.store(status); + if(job->durable.load()) { std::lock_guard lock(mtx_jobs); g_jobs.erase(job->id); g_job_order.erase(std::remove(g_job_order.begin(),g_job_order.end(),job->id),g_job_order.end()); } +} + // job currently on the GPU, tracked so shutdown can cancel it and return // within one pipeline cancel poll instead of waiting out the generation. static std::mutex mtx_active; @@ -211,10 +236,28 @@ static std::string job_make_id() { return buf; } -static std::shared_ptr job_create() { +static std::shared_ptr job_create(const std::string & requested_id = "", bool * created = nullptr) { std::lock_guard lock(mtx_jobs); + if (created) *created = false; + if (!requested_id.empty()) { + auto existing = g_jobs.find(requested_id); + if (existing != g_jobs.end()) return existing->second; + auto archived = std::make_shared(); int status = 0; + if (job_archive::read(requested_id,status,archived->result_mime,archived->result_body,false)) { + archived->id = requested_id; archived->status.store((JobStatus)status); archived->durable.store(true); return archived; + } + } + int pending = 0; + for (const auto & entry : g_jobs) { + if (entry.second->status.load() == JobStatus::RUNNING) ++pending; + } + // Includes the executing job. Admission is checked under the same lock + // as insertion, so concurrent HTTP requests cannot oversubscribe it. + if (pending >= 4) return nullptr; auto job = std::make_shared(); - job->id = job_make_id(); + job->id = requested_id.empty() ? job_make_id() : requested_id; + job_archive::start(job->id); + if (created) *created = true; g_jobs[job->id] = job; g_job_order.push_back(job->id); @@ -240,10 +283,13 @@ static std::shared_ptr job_create() { return job; } -static std::shared_ptr job_find(const std::string & id) { +static std::shared_ptr job_find(const std::string & id, bool include_body = false) { std::lock_guard lock(mtx_jobs); auto it = g_jobs.find(id); - return it != g_jobs.end() ? it->second : nullptr; + if (it != g_jobs.end()) return it->second; + auto job = std::make_shared(); int status = 0; + if (!job_archive::read(id,status,job->result_mime,job->result_body,include_body)) return nullptr; + job->id = id; job->status.store((JobStatus)status); job->durable.store(true); return job; } static const char * job_status_str(JobStatus s) { @@ -256,6 +302,8 @@ static const char * job_status_str(JobStatus s) { return "failed"; case JobStatus::CANCELLED: return "cancelled"; + case JobStatus::INTERRUPTED: + return "interrupted"; } return "running"; } @@ -388,11 +436,57 @@ static std::deque> g_work_queue; static std::mutex mtx_work; static std::condition_variable cv_work; static bool g_work_stop = false; +static std::atomic g_native_resource{false}; +static std::timed_mutex g_resource_gate; +static int g_comfy_port=8188; +static void wait_for_artwork(const std::shared_ptr & job) { + httplib::Client client("127.0.0.1",g_comfy_port);client.set_connection_timeout(1);client.set_read_timeout(3); + const auto deadline=std::chrono::steady_clock::now()+std::chrono::minutes(20); + for(;;) { + if(job->cancel.load())throw std::runtime_error("Cancelled before GPU handoff"); + auto response=client.Get("/queue");if(!response)return; + auto doc=yyjson_read(response->body.data(),response->body.size(),0);if(!doc)throw std::runtime_error("Cannot inspect artwork queue"); + auto root=yyjson_doc_get_root(doc);bool busy=yyjson_arr_size(yyjson_obj_get(root,"queue_running")) || yyjson_arr_size(yyjson_obj_get(root,"queue_pending"));yyjson_doc_free(doc); + if(!busy) { client.Post("/free","{\"unload_models\":true,\"free_memory\":true}","application/json");return; } + {std::lock_guard lock(job->progress_mutex);job->stage="Waiting for artwork GPU";} + if(std::chrono::steady_clock::now()>deadline)throw std::runtime_error("Artwork queue did not become idle within 20 minutes"); + std::this_thread::sleep_for(std::chrono::milliseconds(500)); + } +} -static void work_push(std::function fn) { +static void work_push(std::shared_ptr job, std::function fn) { { std::lock_guard lock(mtx_work); - g_work_queue.push_back(std::move(fn)); + if (g_work_stop) { + job_finish(job, JobStatus::CANCELLED); + return; + } + g_work_queue.push_back([job, fn = std::move(fn)] { + if (job->cancel.load()) { + job_finish(job, JobStatus::CANCELLED); + return; + } + try { + std::unique_lock ownership(g_resource_gate,std::defer_lock); + while(!ownership.try_lock_for(std::chrono::milliseconds(200)))if(job->cancel.load())throw std::runtime_error("Cancelled waiting for resource"); + g_native_resource.store(true); + wait_for_artwork(job); + job->started.store(true); + { std::lock_guard lock(job->progress_mutex);job->stage=job->kind;job->stage_start=std::chrono::steady_clock::now(); } + active_job_set(job); + audio_process_cancel = &job->cancel; + fn(); + } catch (const std::exception & error) { + fprintf(stderr, "[Server] Job %s failed: %s\n", job->id.c_str(), error.what()); + job_finish(job,job->cancel.load()?JobStatus::CANCELLED:JobStatus::FAILED); + } catch (...) { + fprintf(stderr, "[Server] Job %s failed: unknown exception\n", job->id.c_str()); + job_finish(job, JobStatus::FAILED); + } + g_native_resource.store(false); + audio_process_cancel = nullptr; + active_job_set(nullptr); + }); } cv_work.notify_one(); } @@ -474,6 +568,11 @@ static void handle_props(const httplib::Request &, httplib::Response & res) { // Validates what the pipeline would refuse anyway, so a bad request fails // fast with a 400 instead of occupying the worker static bool validate(const httplib::Request & req, httplib::Response & res, Yue2Request * r) { + if (req.body.size() > 1024 * 1024) { + res.status = 413; + res.set_content(json_string("error", "generation request exceeds 1 MiB"), "application/json"); + return false; + } if (!request_parse_json(r, req.body.c_str())) { res.status = 400; res.set_content(json_string("error", "invalid JSON"), "application/json"); @@ -492,9 +591,31 @@ static bool validate(const httplib::Request & req, httplib::Response & res, Yue2 res.set_content(json_string("error", "unknown output format"), "application/json"); return false; } - if (r->steps < 1) { + if (r->mastering_profile != "off" && r->mastering_profile != "streaming" && + r->mastering_profile != "broadcast") { res.status = 400; - res.set_content(json_string("error", "steps must be positive"), "application/json"); + res.set_content(json_string("error", "mastering_profile must be off, streaming or broadcast"), "application/json"); + return false; + } + if (r->steps < 1 || r->steps > 200) { + res.status = 400; + res.set_content(json_string("error", "steps must be between 1 and 200"), "application/json"); + return false; + } + if (!std::isfinite(r->duration) || r->duration < 0 || r->duration > 600 || + !std::isfinite(r->cfg_scale) || r->cfg_scale < -1 || r->cfg_scale > 30 || + r->peak_clip < 0 || r->peak_clip > 999) { + res.status = 400; + res.set_content(json_string("error", "duration must be 0 (auto) to 600 seconds, CFG -1 to 30, peak clip 0 to 999"), "application/json"); + return false; + } + if (is_mp3 && r->mp3_bitrate != 32 && r->mp3_bitrate != 40 && r->mp3_bitrate != 48 && + r->mp3_bitrate != 56 && r->mp3_bitrate != 64 && r->mp3_bitrate != 80 && + r->mp3_bitrate != 96 && r->mp3_bitrate != 112 && r->mp3_bitrate != 128 && + r->mp3_bitrate != 160 && r->mp3_bitrate != 192 && r->mp3_bitrate != 224 && + r->mp3_bitrate != 256 && r->mp3_bitrate != 320) { + res.status = 400; + res.set_content(json_string("error", "unsupported MP3 bitrate; recommended: 320 kbps"), "application/json"); return false; } if (r->lm_batch_size < 1 || r->lm_batch_size > g_pipeline.params.max_batch) { @@ -527,12 +648,12 @@ static void run_transcribe(std::shared_ptr job, std::vector audio, b active_job_set(nullptr); if (!ok) { fprintf(stderr, "[Server] Transcribe job %s failed: %s\n", job->id.c_str(), error.c_str()); - job->status.store(job->cancel.load() ? JobStatus::CANCELLED : JobStatus::FAILED); + job_finish(job, job->cancel.load() ? JobStatus::CANCELLED : JobStatus::FAILED); return; } job->result_body = json_string("abc", abc); job->result_mime = "application/json"; - job->status.store(JobStatus::DONE); + job_finish(job, JobStatus::DONE); } static void run_job(std::shared_ptr job, Yue2Request request) { @@ -540,11 +661,14 @@ static void run_job(std::shared_ptr job, Yue2Request request) { fprintf(stderr, "[Server] Job %s: %s\n", job->id.c_str(), request_to_json(&request).c_str()); std::vector songs; + g_pipeline.progress=[job](const char *stage,int done,int total) { std::lock_guard lock(job->progress_mutex); if(job->stage!=stage)job->stage_start=std::chrono::steady_clock::now();job->stage=stage;job->stage_done=done;job->stage_total=total; }; bool ok = pipeline_generate(&g_pipeline, request, &songs, server_cancel_job, (void *) &job->cancel); + g_pipeline.progress={}; + { std::lock_guard lock(job->progress_mutex);job->stage="Encoding and mastering";job->stage_done=job->stage_total=0; } if (!ok) { active_job_set(nullptr); - job->status.store(job->cancel.load() ? JobStatus::CANCELLED : JobStatus::FAILED); + job_finish(job, job->cancel.load() ? JobStatus::CANCELLED : JobStatus::FAILED); return; } @@ -560,8 +684,35 @@ static void run_job(std::shared_ptr job, Yue2Request request) { std::vector request_parts; for (size_t t = 0; t < songs.size(); t++) { Yue2Song & song = songs[t]; - // Normalization belongs to the output stage, WAV32 keeping the full range - if (is_mp3 || wav_fmt != WAV_F32) { + if (request.mastering_profile != "off") { + std::vector mastered; + std::string error; + if (!audio_master_ffmpeg(song.audio.data(), song.T_audio, YUE2_SAMPLE_RATE, + request.mastering_profile, &mastered, &error)) { + fprintf(stderr, "[Master] Job %s failed: %s\n", job->id.c_str(), error.c_str()); + active_job_set(nullptr); + job_finish(job, JobStatus::FAILED); + return; + } + // Keep the original take beside its master for in-app A/B preview. + if (is_mp3 || wav_fmt != WAV_F32) { + audio_normalize(song.audio.data(), song.T_audio * 2, request.peak_clip); + } + audio_parts.push_back( + is_mp3 ? audio_encode_mp3(song.audio.data(), song.T_audio, YUE2_SAMPLE_RATE, request.mp3_bitrate) : + audio_encode_wav(song.audio.data(), song.T_audio, YUE2_SAMPLE_RATE, wav_fmt)); + if (audio_parts.back().empty()) { + active_job_set(nullptr); + job_finish(job, JobStatus::FAILED); + return; + } + Yue2Request original = request_replay(request, song.score.empty() ? request.abc : song.score, + pipeline_format_tokens(song.tokens), (int) t / M, (int) t % M); + original.mastering_profile = "off"; + request_parts.push_back(request_to_json(&original)); + song.audio.swap(mastered); + // Normalization belongs to the output stage; WAV32 keeps the full range. + } else if (is_mp3 || wav_fmt != WAV_F32) { audio_normalize(song.audio.data(), song.T_audio * 2, request.peak_clip); } audio_parts.push_back( @@ -569,7 +720,7 @@ static void run_job(std::shared_ptr job, Yue2Request request) { audio_encode_wav(song.audio.data(), song.T_audio, YUE2_SAMPLE_RATE, wav_fmt)); if (audio_parts.back().empty()) { active_job_set(nullptr); - job->status.store(JobStatus::FAILED); + job_finish(job, JobStatus::FAILED); return; } Yue2Request replay = request_replay(request, song.score.empty() ? request.abc : song.score, @@ -580,7 +731,7 @@ static void run_job(std::shared_ptr job, Yue2Request request) { active_job_set(nullptr); job->result_body = multipart_build_tracks(request_parts, audio_parts, is_mp3 ? "audio/mpeg" : "audio/wav"); job->result_mime = MULTIPART_MIME; - job->status.store(JobStatus::DONE); + job_finish(job, JobStatus::DONE); } static void print_usage(const char * prog) { @@ -594,7 +745,7 @@ static void print_usage(const char * prog) { "\n" "Optional:\n" " --transcriber SheetSage2 GGUF, enables /transcribe\n" - " --host Listen address (default: 0.0.0.0)\n" + " --host Listen address (default: 127.0.0.1)\n" " --port Listen port (default: 8087)\n" " --max-batch Song batch limit, one KV set each (default: 1)\n" " --keep-loaded Keep every model resident in VRAM (default: evict between stages)\n" @@ -614,8 +765,9 @@ int main(int argc, char ** argv) { return 1; } - const char * host = "0.0.0.0"; + const char * host = "127.0.0.1"; int port = 8087; + int comfy_port = 8188; Yue2PipelineParams params; for (int i = 1; i < argc; i++) { @@ -626,6 +778,9 @@ int main(int argc, char ** argv) { g_vae_path = argv[++i]; } else if (!strcmp(argv[i], "--transcriber") && !last) { g_transcriber_path = argv[++i]; + } else if (!strcmp(argv[i], "--comfy-port") && !last) { + comfy_port = atoi(argv[++i]); + if (comfy_port < 1 || comfy_port > 65535) return 1; } else if (!strcmp(argv[i], "--host") && !last) { host = argv[++i]; } else if (!strcmp(argv[i], "--port") && !last) { @@ -658,6 +813,29 @@ int main(int argc, char ** argv) { return 1; } + auto readable_model_file = [](const std::string & path) { + std::error_code ec; + return std::filesystem::is_regular_file(std::filesystem::path(path), ec) && !ec; + }; + if (!readable_model_file(g_model_path)) { + fprintf(stderr, "[Startup] Required backbone model not found or not a file: %s\n" + "[Startup] Check the --model path or put the GGUF in models\\ and launch music again.\n", + g_model_path.c_str()); + return 1; + } + if (!readable_model_file(g_vae_path)) { + fprintf(stderr, "[Startup] Required VAE model not found or not a file: %s\n" + "[Startup] Check the --vae path or put the GGUF in models\\ and launch music again.\n", + g_vae_path.c_str()); + return 1; + } + if (!g_transcriber_path.empty() && !readable_model_file(g_transcriber_path)) { + fprintf(stderr, "[Startup] Optional transcriber model not found: %s\n" + "[Startup] Music generation will work, but audio transcription is disabled.\n", + g_transcriber_path.c_str()); + g_transcriber_path.clear(); + } + LogCapture log_capture; // Model loads go through the store: STRICT by default (one half of the @@ -673,6 +851,9 @@ int main(int argc, char ** argv) { std::thread worker(worker_main); httplib::Server svr; + svr.set_payload_max_length(270ULL*1024*1024); + g_comfy_port=comfy_port; + register_comfy_api(svr, comfy_port, []{return g_native_resource.load();}, &g_resource_gate); g_svr = &svr; // SO_REUSEADDR lets us rebind a port still in TIME_WAIT after a restart. @@ -696,6 +877,18 @@ int main(int argc, char ** argv) { }); svr.Get("/props", handle_props); + register_saved_presets(svr); + register_youtube_api(svr); + svr.Get("/ollama/api/tags",[](const httplib::Request &,httplib::Response &res){httplib::Client client("127.0.0.1",11434);client.set_connection_timeout(2);client.set_read_timeout(10);auto response=client.Get("/api/tags");if(!response){res.status=503;return;}res.status=response->status;res.set_content(response->body,"application/json");}); + svr.Post("/ollama/api/generate",[](const httplib::Request &req,httplib::Response &res){ + std::unique_lock ownership(g_resource_gate,std::try_to_lock); + if(!ownership.owns_lock()){res.status=409;res.set_content(json_string("error","Studio GPU is busy. Try lyrics when the current operation finishes."),"application/json");return;} + if(req.body.size()>1024*1024){res.status=413;return;} + auto check=std::make_shared();wait_for_artwork(check); + httplib::Client client("127.0.0.1",11434);client.set_connection_timeout(2);client.set_read_timeout(600); + auto response=client.Post("/api/generate",req.body,"application/json"); + if(!response){res.status=503;res.set_content(json_string("error","Ollama request failed or timed out"),"application/json");return;}res.status=response->status;res.set_content(response->body,"application/json"); + }); svr.Get("/logs", handle_logs); @@ -704,8 +897,18 @@ int main(int argc, char ** argv) { if (!validate(req, res, &request)) { return; } - auto job = job_create(); - work_push([job, request] { run_job(job, request); }); + const auto requested_id = req.get_header_value("X-Yue2-Job-Id"); + if (!requested_id.empty() && !job_archive::valid_id(requested_id)) { res.status = 400; res.set_content(json_string("error","invalid recovery ID"),"application/json"); return; } + bool created = false; + std::shared_ptr job; + try { job = job_create(requested_id,&created); } + catch (const std::exception & error) { res.status = 507; res.set_content(json_string("error",error.what()),"application/json"); return; } + if (!job) { + res.status = 429; + res.set_content(json_string("error", "generation queue full; wait for a job to finish"), "application/json"); + return; + } + if (created) work_push(job, [job, request] { run_job(job, request); }); res.set_content(json_string("id", job->id), "application/json"); }); @@ -730,13 +933,172 @@ int main(int argc, char ** argv) { return; } auto job = job_create(); - work_push([job, audio, melody_only] { run_transcribe(job, audio, melody_only); }); + if (!job) { + res.status = 429; + res.set_content(json_string("error", "generation queue full; wait for a job to finish"), "application/json"); + return; + } + work_push(job, [job, audio = std::move(audio), melody_only] { run_transcribe(job, audio, melody_only); }); res.set_content(json_string("id", job->id), "application/json"); }); } + // POST /vocal-balance, multipart/form-data: an audio file and a vocal + // gain in dB. The original upload is never modified. + svr.Post("/vocal-balance", [](const httplib::Request & req, httplib::Response & res) { + if (req.body.size() > 256ULL * 1024 * 1024) { res.status=413; res.set_content(json_string("error","Media request exceeds 256 MiB"),"application/json"); return; } + if(!audio_tool_available("ffmpeg") || (req.path=="/vocal-balance" && !audio_tool_available("audio-separator"))) {res.status=503;res.set_content(json_string("error","Required FFmpeg or audio-separator dependency is missing. Check Studio setup before retrying."),"application/json");return;} + const auto id = req.get_header_value("X-Yue2-Job-Id"); + if (!id.empty() && !job_archive::valid_id(id)) { res.status=400; return; } + bool created = false; std::shared_ptr job; + try { job = job_create(id,&created); } catch(const std::exception & e) { res.status=507; res.set_content(json_string("error",e.what()),"application/json"); return; } + if (!job) { res.status=429; res.set_content(json_string("error","Studio queue is full"),"application/json"); return; } + if (created) { + job->kind = "vocal-balance"; + work_push(job, [job, req] { + httplib::Response result; + auto process = [](const httplib::Request & req, httplib::Response & res) { + if (!req.is_multipart_form_data() || !req.form.has_file("audio") || !req.form.has_field("vocal_gain_db")) { + res.status = 400; + res.set_content(json_string("error", "multipart audio and vocal_gain_db fields required"), "application/json"); + return; + } + const std::string & file = req.form.get_file("audio").content; + int samples = 0, sample_rate = 0; + float * audio = audio_read_buf((const uint8_t *) file.data(), file.size(), &samples, &sample_rate); + if (!audio || samples <= 0 || sample_rate <= 0) { + free(audio); + res.status = 400; + res.set_content(json_string("error", "cannot decode audio"), "application/json"); + return; + } + const std::string gain_text = req.form.get_field("vocal_gain_db"); + char * end = nullptr; + const float gain = strtof(gain_text.c_str(), &end); + const bool auto_gain = gain_text == "auto"; + if (!auto_gain && (end == gain_text.c_str() || *end != '\0' || !std::isfinite(gain) || gain < -12.0f || gain > 12.0f)) { + free(audio); + res.status = 400; + res.set_content(json_string("error", "vocal_gain_db must be between -12 and +12"), "application/json"); + return; + } + std::vector balanced; + std::string error; + float applied_gain = 0.0f; + const bool ok = audio_vocal_balance_ffmpeg(audio, samples, sample_rate, gain, auto_gain, + &balanced, &applied_gain, &error); + free(audio); + if (!ok) { + res.status = 503; + res.set_content(json_string("error", error), "application/json"); + return; + } + const std::string wav = audio_encode_wav_f32(balanced.data(), samples, sample_rate); + if (wav.empty()) { + res.status = 500; + res.set_content(json_string("error", "could not encode balanced audio"), "application/json"); + return; + } + char applied_gain_text[32]; + snprintf(applied_gain_text, sizeof(applied_gain_text), "%.1f", (double) applied_gain); + res.set_header("X-Yue2-Vocal-Gain-Db", applied_gain_text); + res.set_content(wav, "audio/wav"); + + }; + process(req,result); + job->result_body = std::move(result.body); + job->result_mime = result.get_header_value("Content-Type"); + const auto gain = result.get_header_value("X-Yue2-Vocal-Gain-Db"); + if (!gain.empty()) job->result_mime += ";gain=" + gain; + job_finish(job, job->cancel.load() ? JobStatus::CANCELLED : result.status >= 400 ? JobStatus::FAILED : JobStatus::DONE); + }); + } + res.set_content(json_string("id",job->id),"application/json"); + }); + + // POST /render-video, multipart/form-data: an "audio" part (MP3 or WAV, + // the finished track) and a "cover" part (PNG, JPEG or WebP). Renders a + // 1920x1080 MP4 (H.264 + AAC) for YouTube delivery. The uploads are + // never modified. + svr.Post("/render-video", [](const httplib::Request & req, httplib::Response & res) { + if (req.body.size() > 256ULL * 1024 * 1024) { res.status=413; res.set_content(json_string("error","Media request exceeds 256 MiB"),"application/json"); return; } + const auto id = req.get_header_value("X-Yue2-Job-Id"); + if (!id.empty() && !job_archive::valid_id(id)) { res.status=400; return; } + bool created = false; std::shared_ptr job; + try { job = job_create(id,&created); } catch(const std::exception & e) { res.status=507; res.set_content(json_string("error",e.what()),"application/json"); return; } + if (!job) { res.status=429; res.set_content(json_string("error","Studio queue is full"),"application/json"); return; } + if (created) { + job->kind = "render-video"; + work_push(job, [job, req] { + httplib::Response result; + auto process = [](const httplib::Request & req, httplib::Response & res) { + if (req.body.size() > 256 * 1024 * 1024) { + res.status = 413; + res.set_content(json_string("error", "video render request exceeds 256 MiB"), "application/json"); + return; + } + if (!req.is_multipart_form_data() || !req.form.has_file("audio") || !req.form.has_file("cover")) { + res.status = 400; + res.set_content(json_string("error", "multipart audio and cover fields required"), "application/json"); + return; + } + const std::string & audio_file = req.form.get_file("audio").content; + const std::string & cover_file = req.form.get_file("cover").content; + const std::string audio_name = req.form.get_file("audio").filename; + const std::string cover_name = req.form.get_file("cover").filename; + const std::string audio_ext = video_ext_of(audio_name, ".mp3"); + const std::string cover_ext = video_ext_of(cover_name, ".png"); + if (audio_ext != ".mp3" && audio_ext != ".wav") { + res.status = 400; + res.set_content(json_string("error", "audio must be MP3 or WAV"), "application/json"); + return; + } + if (cover_ext != ".png" && cover_ext != ".jpg" && cover_ext != ".jpeg" && cover_ext != ".webp") { + res.status = 400; + res.set_content(json_string("error", "cover must be PNG, JPEG or WebP"), "application/json"); + return; + } + std::string mp4, error; + if (!audio_render_video_ffmpeg(cover_file, cover_ext, audio_file, audio_ext, &mp4, &error)) { + res.status = 503; + res.set_content(json_string("error", error), "application/json"); + return; + } + res.set_content(mp4, "video/mp4"); + + }; + process(req,result); + job->result_body = std::move(result.body); + job->result_mime = result.get_header_value("Content-Type"); + const auto gain = result.get_header_value("X-Yue2-Vocal-Gain-Db"); + if (!gain.empty()) job->result_mime += ";gain=" + gain; + job_finish(job, job->cancel.load() ? JobStatus::CANCELLED : result.status >= 400 ? JobStatus::FAILED : JobStatus::DONE); + }); + } + res.set_content(json_string("id",job->id),"application/json"); + }); + + svr.Get("/capabilities",[](const httplib::Request &,httplib::Response &res){ + res.set_content(std::string("{\"ffmpeg\":")+(audio_tool_available("ffmpeg")?"true":"false")+",\"separator\":"+(audio_tool_available("audio-separator")?"true":"false")+"}","application/json"); + }); + svr.Get("/jobs", [](const httplib::Request &, httplib::Response & res) { + std::lock_guard lock(mtx_jobs); + std::string body="["; + int position=0; + for(const auto &id:g_job_order) { + const auto found=g_jobs.find(id);if(found==g_jobs.end())continue; + const auto &job=found->second;if(job->status.load()!=JobStatus::RUNNING)continue; + std::lock_guard progress(job->progress_mutex); + if(body.size()>1)body+=","; + auto fields=json_string("stage",job->stage);fields.pop_back(); + body+=fields+",\"id\":\""+job->id+"\",\"queuePosition\":"+std::to_string(position++)+",\"done\":"+std::to_string(job->stage_done)+",\"total\":"+std::to_string(job->stage_total)+",\"elapsed\":"+std::to_string(std::chrono::duration_cast(std::chrono::steady_clock::now()-job->stage_start).count())+"}"; + } + res.set_content(body+"]","application/json"); + }); svr.Get("/job", [](const httplib::Request & req, httplib::Response & res) { - auto job = job_find(req.get_param_value("id")); + std::shared_ptr job; + try { job = job_find(req.get_param_value("id"),req.has_param("result")); } + catch (const std::exception & error) { res.status = 500; res.set_content(json_string("error",error.what()),"application/json"); return; } if (!job) { res.status = 404; res.set_content(json_string("error", "job not found"), "application/json"); @@ -744,7 +1106,12 @@ int main(int argc, char ** argv) { } JobStatus status = job->status.load(); if (!req.has_param("result")) { - res.set_content(json_string("status", job_status_str(status)), "application/json"); + res.set_content(std::string("{\"status\":\"") + job_status_str(status) + "\",\"durable\":" + (job->durable.load() ? "true" : "false") + "}", "application/json"); + return; + } + if (status == JobStatus::FAILED) { + res.status = 422; + res.set_content(job->result_mime=="application/json"&&!job->result_body.empty()?job->result_body:json_string("error","Processing failed. Check Studio activity for the dependency or model error."),"application/json"); return; } if (status != JobStatus::DONE) { @@ -766,6 +1133,10 @@ int main(int argc, char ** argv) { job->cancel.store(true); fprintf(stderr, "[Server] Cancel requested for job %s\n", job->id.c_str()); } + if (req.has_param("ack") && job->status.load() == JobStatus::DONE) { + try { job_archive::acknowledge(job->id); job_archive::cleanup(); } + catch (const std::exception & error) { res.status = 500; res.set_content(json_string("error",error.what()),"application/json"); return; } + } res.set_content(json_string("status", job_status_str(job->status.load())), "application/json"); }); @@ -793,6 +1164,10 @@ int main(int argc, char ** argv) { std::lock_guard lock(mtx_work); g_work_stop = true; } + { + std::lock_guard lock(mtx_jobs); + for (const auto & entry : g_jobs) entry.second->cancel.store(true); + } cv_work.notify_all(); worker.join(); pipeline_free(&g_pipeline); diff --git a/youtube-agent.cmd b/youtube-agent.cmd new file mode 100644 index 0000000..c8fb3b0 --- /dev/null +++ b/youtube-agent.cmd @@ -0,0 +1,12 @@ +@echo off +setlocal +cd /d "%~dp0tools\youtube-agent" +if not exist "node_modules\playwright\package.json" ( + echo Run npm install in tools\youtube-agent first. + exit /b 1 +) +if "%~1"=="" ( + echo Usage: youtube-agent --draft "draft.json" --video "video.mp4" [--thumbnail "cover.png"] + exit /b 1 +) +node agent.mjs %*