Add Image Iterate: nested multi-prompt still families.
Iterate runs a series of prompts as generate (no still), edit (still A), or compose (A+B), saves each output under one library collection like video extensions, and defaults to iterating from the original still.
This commit is contained in:
+33
-26
@@ -58,7 +58,7 @@ export interface StudioJobPayload {
|
||||
scaleToTotalPixels?: boolean
|
||||
scaleMegapixels?: number
|
||||
imagePipeline?: 'v1' | 'v2'
|
||||
v2Mode?: 'edit' | 'compose' | 'refine' | 'generate'
|
||||
v2Mode?: 'edit' | 'compose' | 'refine' | 'generate' | 'iterate'
|
||||
v2Task?: 'scene' | 'identity' | 'outfit' | 'face_lock' | 'refine' | 't2i'
|
||||
engine?: 'flux' | 'krea'
|
||||
snofsModel?: number
|
||||
@@ -1017,7 +1017,8 @@ async function startStudioEditJob(item: StudioJob) {
|
||||
const { runEditV2 } = await import('~/server/utils/imageChainV2')
|
||||
|
||||
const payload = item.payload
|
||||
const generate = payload.imagePipeline === 'v2' && payload.v2Mode === 'generate'
|
||||
const iterate = payload.imagePipeline === 'v2' && payload.v2Mode === 'iterate'
|
||||
const generate = payload.imagePipeline === 'v2' && (payload.v2Mode === 'generate' || (iterate && !payload.stillId))
|
||||
if (!generate && (!payload.stillId || !existsSync(stillPath(item.ownerKey, payload.stillId)))) {
|
||||
throw new Error('The input still is missing from the library')
|
||||
}
|
||||
@@ -1038,30 +1039,36 @@ async function startStudioEditJob(item: StudioJob) {
|
||||
: null
|
||||
|
||||
if (payload.imagePipeline === 'v2') {
|
||||
const mode = payload.v2Mode === 'compose'
|
||||
? 'compose'
|
||||
: payload.v2Mode === 'refine'
|
||||
? 'refine'
|
||||
: payload.v2Mode === 'generate'
|
||||
? 'generate'
|
||||
: 'edit'
|
||||
const mode = payload.v2Mode === 'iterate'
|
||||
? 'iterate'
|
||||
: payload.v2Mode === 'compose'
|
||||
? 'compose'
|
||||
: payload.v2Mode === 'refine'
|
||||
? 'refine'
|
||||
: payload.v2Mode === 'generate'
|
||||
? 'generate'
|
||||
: 'edit'
|
||||
const graphMode = mode === 'iterate'
|
||||
? (image ? (reference ? 'compose' : 'edit') : 'generate')
|
||||
: mode
|
||||
const maskId = payload.maskStillId
|
||||
const mask = mode === 'refine' && maskId && existsSync(stillPath(item.ownerKey, maskId))
|
||||
const mask = graphMode === 'refine' && maskId && existsSync(stillPath(item.ownerKey, maskId))
|
||||
? {
|
||||
filename: payload.maskStillFilename || 'refine-mask.png',
|
||||
data: readFileSync(stillPath(item.ownerKey, maskId)),
|
||||
type: 'image/png'
|
||||
}
|
||||
: null
|
||||
if (mode === 'refine' && !mask) {
|
||||
if (graphMode === 'refine' && !mask) {
|
||||
throw new Error('Refine requires a mask. Refusing to fall back to Edit.')
|
||||
}
|
||||
if (mode === 'compose' && !reference) {
|
||||
if (graphMode === 'compose' && !reference) {
|
||||
throw new Error('Compose requires image B. Refusing to fall back to one-image generation.')
|
||||
}
|
||||
if (mode === 'edit' && reference) {
|
||||
throw new Error('Edit mode takes one image. Use Compose for two stills.')
|
||||
}
|
||||
const passCount = (mode === 'edit' || mode === 'compose' || mode === 'iterate') ? (payload.passes?.length || 0) : 0
|
||||
live = createEditLiveJob({
|
||||
steps: payload.steps,
|
||||
hideThumbnail: payload.hideThumbnail,
|
||||
@@ -1088,9 +1095,9 @@ async function startStudioEditJob(item: StudioJob) {
|
||||
familyId: item.familyId,
|
||||
chainIndex: 0,
|
||||
chainStep: 1,
|
||||
chainTotal: 1 + ((mode === 'edit' || mode === 'compose') ? (payload.passes?.length || 0) : 0),
|
||||
chainLabel: (mode === 'edit' || mode === 'compose') && payload.passes?.length
|
||||
? (payload.passMode === 'chain' ? 'Pass 1' : 'Batch 1')
|
||||
chainTotal: 1 + passCount,
|
||||
chainLabel: passCount
|
||||
? (mode === 'iterate' ? 'Iteration 1' : (payload.passMode === 'chain' ? 'Pass 1' : 'Batch 1'))
|
||||
: undefined,
|
||||
passes: payload.passes,
|
||||
...persistLoraFields(payload.loraStack || payload.loraName)
|
||||
@@ -1102,30 +1109,30 @@ async function startStudioEditJob(item: StudioJob) {
|
||||
void runEditV2(live, {
|
||||
mode,
|
||||
engine: v2Engine,
|
||||
task: payload.v2Task || 'scene',
|
||||
image: mode === 'generate' ? null : image,
|
||||
reference: mode === 'refine' || mode === 'generate' ? null : reference,
|
||||
task: payload.v2Task || (graphMode === 'generate' ? 't2i' : 'scene'),
|
||||
image: graphMode === 'generate' ? null : image,
|
||||
reference: graphMode === 'compose' ? reference : null,
|
||||
mask,
|
||||
prompt: payload.prompt,
|
||||
passes: payload.passes || [],
|
||||
passMode: payload.passMode === 'chain' ? 'chain' : 'batch',
|
||||
negative: payload.negative || '',
|
||||
steps: payload.steps,
|
||||
seed: live.library?.seed || payload.seed,
|
||||
seed: payload.seed || Math.floor(Math.random() * 2_147_483_647),
|
||||
cfg: payload.cfg,
|
||||
snofsModel: v2Specials.snofs?.strengthModel ?? payload.snofsModel ?? 0,
|
||||
snofsClip: v2Specials.snofs?.strengthClip ?? payload.snofsClip ?? 0,
|
||||
consistencyModel: v2Specials.consistency?.strengthModel ?? payload.consistencyModel ?? (mode === 'generate' || payload.engine === 'krea' ? 0 : 0.7),
|
||||
consistencyClip: v2Specials.consistency?.strengthClip ?? payload.consistencyClip ?? (mode === 'generate' || payload.engine === 'krea' ? 0 : 0.7),
|
||||
megapixels: payload.scaleToTotalPixels === false ? 0 : (payload.scaleMegapixels ?? 1),
|
||||
consistencyModel: v2Specials.consistency?.strengthModel ?? payload.consistencyModel ?? 0,
|
||||
consistencyClip: v2Specials.consistency?.strengthClip ?? payload.consistencyClip ?? 0,
|
||||
megapixels: payload.scaleMegapixels || 0,
|
||||
strength: payload.refineStrength,
|
||||
aspect: payload.aspect || 'auto',
|
||||
width: payload.width,
|
||||
height: payload.height,
|
||||
turbo: payload.turbo === true,
|
||||
aspect: payload.aspect,
|
||||
sourceStillId: payload.stillId,
|
||||
referenceStillId: payload.referenceStillId,
|
||||
loraStack: payload.loraStack
|
||||
loraStack: payload.loraStack,
|
||||
passes: payload.passes,
|
||||
passMode: payload.passMode === 'chain' ? 'chain' : 'batch',
|
||||
}).catch((error) => {
|
||||
const message = error instanceof Error ? error.message : String(error)
|
||||
if (live && live.status !== 'error' && live.status !== 'cancelled' && live.status !== 'deferred') {
|
||||
|
||||
Reference in New Issue
Block a user