From c868605d8a804b836efad87161297dff9c588883 Mon Sep 17 00:00:00 2001 From: Towsty Date: Tue, 15 Sep 2026 18:19:46 -0500 Subject: [PATCH] Drop ACE and YuEGP defaults from studio music queue and library labels. Co-authored-by: Cursor --- server/utils/generationPresets.ts | 9 ++------- server/utils/studioQueue.ts | 7 +++---- utils/generationPresets.ts | 4 ---- utils/libraryGeneration.ts | 11 ++++++++++- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/server/utils/generationPresets.ts b/server/utils/generationPresets.ts index 6340e12..772776e 100644 --- a/server/utils/generationPresets.ts +++ b/server/utils/generationPresets.ts @@ -166,17 +166,12 @@ function sanitizeImageV2Settings(raw: unknown): ImageV2PresetSettings { function sanitizeMusicSettings(raw: unknown): MusicPresetSettings { const rec = raw && typeof raw === 'object' ? raw as Record : {} - const instrumental = rec.instrumental === true return { tags: sanitizeMusicTags(rec.tags), - lyrics: sanitizeMusicLyrics(rec.lyrics, instrumental), - instrumental, + lyrics: sanitizeMusicLyrics(rec.lyrics, false), duration: clampMusicDuration(rec.duration), - steps: clampMusicSteps(rec.steps), seed: typeof rec.seed === 'number' && Number.isFinite(rec.seed) ? Math.max(0, Math.floor(rec.seed)) : undefined, - cfg: rec.cfg == null ? undefined : clampMusicCfg(rec.cfg), - engine: parseMusicEngine(rec.engine), - ...(parseMusicEngine(rec.engine) === 'yue' ? { yueProfile: rec.yueProfile === 3 ? 3 as const : 1 as const } : {}) + engine: 'yue2' } } diff --git a/server/utils/studioQueue.ts b/server/utils/studioQueue.ts index 9887665..6d97e37 100644 --- a/server/utils/studioQueue.ts +++ b/server/utils/studioQueue.ts @@ -923,7 +923,7 @@ function repairStaleJobs(jobs: StudioJob[]) { job.updatedAt = Date.now() continue } - if (!job.payload.upscale && job.payload.musicEngine !== 'yue' && job.payload.musicEngine !== 'yue2' && job.status === 'error' && isTransientComfyError(job.lastError)) { + if (!job.payload.upscale && job.kind !== 'music' && job.status === 'error' && isTransientComfyError(job.lastError)) { job.status = 'waiting' job.liveJobId = undefined job.lastError = undefined @@ -932,7 +932,7 @@ function repairStaleJobs(jobs: StudioJob[]) { job.updatedAt = Date.now() continue } - if (!job.payload.upscale && job.payload.musicEngine !== 'yue' && job.payload.musicEngine !== 'yue2' && job.status === 'held' && isTransientComfyError(job.lastError)) { + if (!job.payload.upscale && job.kind !== 'music' && job.status === 'held' && isTransientComfyError(job.lastError)) { job.status = 'waiting' job.liveJobId = undefined job.lastError = undefined @@ -1407,8 +1407,7 @@ async function startStudioMusicJob(item: StudioJob) { lyricsStrength: payload.instrumental ? 0 : (payload.lyricsStrength ?? 0.9), instrumental: payload.instrumental === true, folderLocked: payload.folderLocked, - engine: payload.musicEngine || 'ace-step', - yueProfile: payload.yueProfile ?? 1, + engine: 'yue2', samplerName: payload.samplerName || 'euler', scheduler: payload.scheduler || 'simple' }) diff --git a/utils/generationPresets.ts b/utils/generationPresets.ts index 7f8b07b..79045c1 100644 --- a/utils/generationPresets.ts +++ b/utils/generationPresets.ts @@ -5,14 +5,10 @@ import type { ImageV2PresetSettings } from '~/utils/imageV2' export type GenerationPresetKind = 'video' | 'image' | 'imagev2' | 'music' export type MusicPresetSettings = { - yueProfile?: 1 | 3 tags?: string lyrics?: string - instrumental?: boolean duration?: number - steps?: number seed?: number - cfg?: number engine?: import('~/utils/music').MusicEngine } diff --git a/utils/libraryGeneration.ts b/utils/libraryGeneration.ts index 39dbb2d..10fd2b7 100644 --- a/utils/libraryGeneration.ts +++ b/utils/libraryGeneration.ts @@ -299,9 +299,18 @@ export function trackSettingsRows(track: { }) { const rows: SettingsRow[] = [] if (track.engine) { + const engine = String(track.engine) rows.push({ label: 'Engine', - value: track.engine === 'ace-step-1.5' ? 'ACE-Step 1.5' : track.engine === 'yue' ? 'YuE' : 'ACE-Step' + value: engine === 'yue2' || engine === 'yue-2' + ? 'YuE2' + : engine === 'ace-step-1.5' + ? 'ACE-Step 1.5 (legacy)' + : engine === 'yue' + ? 'YuE (legacy)' + : engine.startsWith('ace') + ? 'ACE-Step (legacy)' + : engine }) } if (track.tags?.trim()) rows.push({ label: 'Tags', value: track.tags.trim() })