Skip to content

Add batch generation support #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Steve Castellotti (castellotti) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add batch generation support #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions frontend/hooks/use-generation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ interface GenerationProgress {
}

interface UseGenerationReturn extends GenerationState {
generate: (prompt: string, imagePath: string | null, settings: GenerationSettings, audioPath?: string | null) => Promise<void>
generateImage: (prompt: string, settings: GenerationSettings) => Promise<void>
generate: (prompt: string, imagePath: string | null, settings: GenerationSettings, audioPath?: string | null) => Promise<{ success: boolean; videoUrl: string | null; videoPath: string | null }>
generateImage: (prompt: string, settings: GenerationSettings) => Promise<{ success: boolean }>
cancel: () => void
reset: () => void
}
Expand Down Expand Up @@ -111,7 +111,7 @@ export function useGeneration(): UseGenerationReturn {
imagePath: string | null,
settings: GenerationSettings,
audioPath?: string | null,
) => {
): Promise<{ success: boolean; videoUrl: string | null; videoPath: string | null }> => {
const statusMsg = settings.model === 'pro'
? 'Loading Pro model & generating...'
: 'Generating video...'
Expand All @@ -132,6 +132,9 @@ export function useGeneration(): UseGenerationReturn {
abortControllerRef.current = new AbortController()
let progressInterval: ReturnType<typeof setInterval> | null = null
let shouldApplyPollingUpdates = true
let succeeded = false
let resultVideoUrl: string | null = null
let resultVideoPath: string | null = null

try {
// Prepare JSON body
Expand Down Expand Up @@ -223,6 +226,8 @@ export function useGeneration(): UseGenerationReturn {
const videoPathNormalized = result.video_path.replace(/\\/g, '/')
const fileUrl = videoPathNormalized.startsWith('/') ? `file://${videoPathNormalized}` : `file:///${videoPathNormalized}`

resultVideoUrl = fileUrl
resultVideoPath = result.video_path
setState({
isGenerating: false,
progress: 100,
Expand All @@ -235,6 +240,7 @@ export function useGeneration(): UseGenerationReturn {
imagePaths: [],
error: null,
})
succeeded = true
} else if (result.status === 'cancelled') {
setState(prev => ({
...prev,
Expand Down Expand Up @@ -265,6 +271,7 @@ export function useGeneration(): UseGenerationReturn {
clearInterval(progressInterval)
}
}
return { success: succeeded, videoUrl: resultVideoUrl, videoPath: resultVideoPath }
}, [])

const cancel = useCallback(async () => {
Expand All @@ -288,7 +295,7 @@ export function useGeneration(): UseGenerationReturn {
const generateImage = useCallback(async (
prompt: string,
settings: GenerationSettings
) => {
): Promise<{ success: boolean }> => {
if (forceApiGenerations) {
try {
const response = await backendFetch('/api/settings')
Expand All @@ -304,7 +311,7 @@ export function useGeneration(): UseGenerationReturn {
blocking: false,
},
}))
return
return { success: false }
}
}
} catch {
Expand All @@ -317,7 +324,7 @@ export function useGeneration(): UseGenerationReturn {
blocking: false,
},
}))
return
return { success: false }
}
}
}
Expand All @@ -338,6 +345,7 @@ export function useGeneration(): UseGenerationReturn {
})

abortControllerRef.current = new AbortController()
let succeeded = false

try {
// Skip prompt enhancement for T2I - use original prompt directly
Expand Down Expand Up @@ -425,6 +433,7 @@ export function useGeneration(): UseGenerationReturn {
imagePaths: rawPaths, // All image paths
error: null,
})
succeeded = true
}
} else if (result.status === 'cancelled') {
setState(prev => ({
Expand All @@ -451,6 +460,7 @@ export function useGeneration(): UseGenerationReturn {
}))
}
}
return { success: succeeded }
}, [appSettings.hasFalApiKey, forceApiGenerations, refreshSettings])

const reset = useCallback(() => {
Expand Down
Loading