towsty/aigen
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Post stillId with video generate and do not queue I2V behind a phantom busy job.

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Towsty
2026-08-28 17:37:03 -05:00
co-authored by Cursor
parent b48531d3c2
commit 2171ad3b44
3 changed files with 150 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/api/generate.post.ts
+24 -3
View File
@@ -1,3 +1,4 @@
import { existsSync, readFileSync } from 'node:fs'
import { addStudioJob, kickStudioQueue, listStudioJobs } from '~/server/utils/studioQueue'
import { listStudioLoras, parsePostedLoraStack, parseShotLoraStacks, persistLoraFields } from '~/server/utils/loras'
import type { LoraStackItem } from '~/utils/loras'
@@ -112,6 +113,27 @@ export default defineEventHandler(async (event) => {
throw createError({ statusCode: 400, statusMessage: LTX_DISABLED_MESSAGE })
}
const textToVideo = isTextToVideo(workflow)
const ownerKey = libraryOwnerKey(event)
const postedStillId = (fields.stillId || '').trim()
let libraryStill: { id: string; filename: string } | null = null
if (postedStillId) {
const path = stillPath(ownerKey, postedStillId)
if (existsSync(path)) {
try {
const existing = getStill(ownerKey, postedStillId)
libraryStill = { id: existing.id, filename: existing.filename }
if (!image) {
image = {
filename: existing.filename || 'still.png',
data: readFileSync(path),
type: 'image/png'
}
}
} catch {
libraryStill = null
}
}
}
if (!image && !textToVideo) {
throw createError({ statusCode: 400, statusMessage: 'An initial image is required' })
}
@@ -158,7 +180,6 @@ export default defineEventHandler(async (event) => {
const hideInput = fields.hideInput === 'true'
const sound = !isLtxWorkflow(workflow) && fields.sound !== 'false'
const clipName = (fields.name || '').trim().slice(0, 80)
const ownerKey = libraryOwnerKey(event)
const library = publicLibrary(event)
const folderId = library.folders.some(folder => folder.id === fields.folderId)
? fields.folderId
@@ -169,7 +190,7 @@ export default defineEventHandler(async (event) => {
const destFolder = library.folders.find(folder => folder.id === folderId)
const folderLocked = Boolean(destFolder?.protected && !destFolder.unlocked)
assertFolderExists(event, folderId)
const still = image
const still = libraryStill || (image
? await rememberInputStill({
ownerKey,
folderId,
@@ -179,7 +200,7 @@ export default defineEventHandler(async (event) => {
height,
hideInput
})
: null
: null)
const referenceStillIds: Array<string | null> = [null, null, null, null]
if (useIdentityRefs) {
for (const [index, ref] of referenceImages.entries()) {
server/utils/studioQueue.ts
+58 -16
View File
@@ -220,11 +220,35 @@ export function summarizeStudioJob(job: StudioJob) {
}
}
export function videoJobsBusy() {
if (listJobs().some(job => job.status === 'queued' || job.status === 'uploading' || job.status === 'running')) {
return true
const QUEUED_GRACE_MS = 4 * 60 * 1000
const PENDING_ORPHAN_MS = 2 * 60 * 1000
function liveJobIsActive(job: Job) {
if (job.status === 'uploading' || job.status === 'running') return true
if (job.status === 'queued') return Date.now() - job.startedAt < QUEUED_GRACE_MS
return false
}
function sweepStaleLiveJobs() {
const now = Date.now()
for (const job of listJobs()) {
if (job.status !== 'queued') continue
if (job.promptId) continue
if (now - job.startedAt < QUEUED_GRACE_MS) continue
job.status = 'error'
job.error = job.error || 'Job never started'
}
return listPendingJobs().some(job => Boolean(job.promptId))
}
export function videoJobsBusy() {
sweepStaleLiveJobs()
if (listJobs().some(liveJobIsActive)) return true
return listPendingJobs().some((pending) => {
if (!pending.promptId) return false
const live = getJob(pending.jobId)
if (live) return liveJobIsActive(live)
return Date.now() - pending.startedAt < PENDING_ORPHAN_MS
})
}
export function applyPersistedPauseToJob(job: Job) {
@@ -534,7 +558,7 @@ function repairStaleJobs(jobs: StudioJob[]) {
}
async function dispatchStudioQueue() {
if (videoJobsBusy()) return
sweepStaleLiveJobs()
for (const owner of listOwnersWithStudioQueues()) {
const store = await mutateStore(owner, (current) => {
migrateGlobalPause(current)
@@ -547,17 +571,22 @@ async function dispatchStudioQueue() {
jobs: current.jobs.map(item => structuredClone(item))
}
})
if (videoJobsBusy()) return
const cutIn = pickCutIn(store.jobs)
if (cutIn) {
await startStudioJob(cutIn)
return
}
const waiting = pickWaiting(store.jobs)
const held = pickHeld(store.jobs)
if (held?.shotQueueId) {
await resumeHeldStudioJob(held)
if (waiting && (!held || waiting.createdAt >= held.updatedAt)) {
await startStudioJob(waiting)
return
}
const waiting = pickWaiting(store.jobs)
if (held?.shotQueueId) {
const resumed = await resumeHeldStudioJob(held)
if (resumed) return
}
if (waiting) {
await startStudioJob(waiting)
return
@@ -571,7 +600,7 @@ async function resumeHeldStudioJob(item: StudioJob) {
job.status = 'complete'
job.holdForCutIn = false
})
return
return false
}
const { startQueueBurst } = await import('~/server/utils/videoChain')
const count = item.resumeAutoRun ? 'all' as const : 1
@@ -583,6 +612,7 @@ async function resumeHeldStudioJob(item: StudioJob) {
job.holdForCutIn = false
job.cutIn = false
})
return true
} catch (error) {
const message = error instanceof Error ? error.message : String(error)
await patchStudioJob(item.ownerKey, item.id, (job) => {
@@ -590,10 +620,12 @@ async function resumeHeldStudioJob(item: StudioJob) {
job.lastError = message
job.holdForCutIn = false
})
return false
}
}
async function startStudioEditJob(item: StudioJob) {
let live: Job | undefined
try {
const { stillPath } = await import('~/server/utils/library')
const { existsSync, readFileSync } = await import('node:fs')
@@ -618,7 +650,7 @@ async function startStudioEditJob(item: StudioJob) {
: null
const passes = payload.passes || []
const job = createEditLiveJob({
live = createEditLiveJob({
steps: payload.steps,
hideThumbnail: payload.hideThumbnail,
library: {
@@ -648,28 +680,32 @@ async function startStudioEditJob(item: StudioJob) {
}
})
await markStudioLive(item.ownerKey, item.id, job.id)
void runEdit(job, {
await markStudioLive(item.ownerKey, item.id, live.id)
void runEdit(live, {
image,
reference,
prompt: payload.prompt,
passes,
negative: payload.negative || '',
steps: payload.steps,
seed: job.library?.seed || payload.seed,
seed: live.library?.seed || payload.seed,
cfg: payload.cfg,
scaleToTotalPixels: payload.scaleToTotalPixels === true,
scaleMegapixels: payload.scaleMegapixels,
...persistLoraFields(payload.loraStack || payload.loraName)
}).catch((error) => {
const message = error instanceof Error ? error.message : String(error)
if (job.status !== 'error' && job.status !== 'cancelled' && job.status !== 'deferred') {
job.status = 'error'
job.error = message
if (live && live.status !== 'error' && live.status !== 'cancelled' && live.status !== 'deferred') {
live.status = 'error'
live.error = message
}
})
} catch (error) {
const message = error instanceof Error ? error.message : String(error)
if (live && (live.status === 'queued' || live.status === 'uploading' || live.status === 'running')) {
live.status = 'error'
live.error = message
}
await patchStudioJob(item.ownerKey, item.id, (job) => {
job.status = 'error'
job.lastError = message
@@ -683,6 +719,7 @@ export async function startStudioJob(item: StudioJob) {
await startStudioEditJob(item)
return
}
let live: Job | undefined
try {
const { createJob } = await import('~/server/utils/jobs')
const { runGeneration, frameLength } = await import('~/server/utils/videoChain')
@@ -702,6 +739,7 @@ export async function startStudioJob(item: StudioJob) {
payload.shotPermanenceRefs
)
const job = createJob()
live = job
job.kind = 'video'
job.maxStep = payload.steps
job.hideThumbnail = payload.hideThumbnail
@@ -840,6 +878,10 @@ export async function startStudioJob(item: StudioJob) {
})
} catch (error) {
const message = error instanceof Error ? error.message : String(error)
if (live && (live.status === 'queued' || live.status === 'uploading' || live.status === 'running')) {
live.status = 'error'
live.error = message
}
await patchStudioJob(item.ownerKey, item.id, (job) => {
job.status = 'error'
job.lastError = message