diff --git a/frontend/apps/editor3d/app/src/pages/PageImage/TextToImage.tsx b/frontend/apps/editor3d/app/src/pages/PageImage/TextToImage.tsx index 1ebbded2f3..537b686374 100644 --- a/frontend/apps/editor3d/app/src/pages/PageImage/TextToImage.tsx +++ b/frontend/apps/editor3d/app/src/pages/PageImage/TextToImage.tsx @@ -103,7 +103,7 @@ const TextToImage = ({ imageMediaId, imageUrl }: TextToImageProps) => {
@@ -175,8 +175,8 @@ const TextToImage = ({ imageMediaId, imageUrl }: TextToImageProps) => { modelInfo={selectedModelInfo} imageMediaId={imageMediaId} url={imageUrl ?? undefined} - onEnqueuePressed={async (prompt, count) => { - startBatch(prompt, count, selectedModel); + onEnqueuePressed={async (prompt, count, subscriberId) => { + startBatch(prompt, count, selectedModel, subscriberId); }} /> diff --git a/frontend/apps/editor3d/app/src/pages/PageImage/TextToImageStore.ts b/frontend/apps/editor3d/app/src/pages/PageImage/TextToImageStore.ts index 4a51a8b808..75b9f2d94e 100644 --- a/frontend/apps/editor3d/app/src/pages/PageImage/TextToImageStore.ts +++ b/frontend/apps/editor3d/app/src/pages/PageImage/TextToImageStore.ts @@ -18,6 +18,7 @@ type TextToImageState = { prompt: string, requestedCount: number, modelLabel: string, + subscriberId?: string, ) => string; completeBatch: ( images: GeneratedImage[], @@ -29,10 +30,17 @@ type TextToImageState = { export const useTextToImageStore = create((set, get) => ({ batches: [], - startBatch: (prompt: string, requestedCount: number, modelLabel: string) => { - const id = crypto.randomUUID - ? crypto.randomUUID() - : Math.random().toString(36).slice(2); + startBatch: ( + prompt: string, + requestedCount: number, + modelLabel: string, + subscriberId?: string, + ) => { + const id = subscriberId + ? subscriberId + : crypto.randomUUID + ? crypto.randomUUID() + : Math.random().toString(36).slice(2); const batch: TextToImageBatch = { id, prompt, diff --git a/frontend/libs/components/promptbox/src/lib/PromptBoxImage.tsx b/frontend/libs/components/promptbox/src/lib/PromptBoxImage.tsx index a11d321e96..f9fca84e78 100644 --- a/frontend/libs/components/promptbox/src/lib/PromptBoxImage.tsx +++ b/frontend/libs/components/promptbox/src/lib/PromptBoxImage.tsx @@ -34,7 +34,11 @@ import { gtagEvent } from "@storyteller/google-analytics"; interface PromptBoxImageProps { useJobContext: () => JobContextType; - onEnqueuePressed?: (prompt: string, count: number) => void | Promise; + onEnqueuePressed?: ( + prompt: string, + count: number, + subscriberId: string + ) => void | Promise; model: string; modelInfo?: ModelInfo; imageMediaId?: string; @@ -268,7 +272,7 @@ export const PromptBoxImage = ({ ? crypto.randomUUID() : Math.random().toString(36).slice(2); - onEnqueuePressed?.(prompt, generationCount); + onEnqueuePressed?.(prompt, generationCount, subscriberId); setTimeout(() => { // TODO(bt,2025-05-08): This is a hack so we don't accidentally wind up with a permanently disabled prompt box if diff --git a/frontend/libs/model-list/src/lib/Models.ts b/frontend/libs/model-list/src/lib/Models.ts index 0403c75903..390944181a 100644 --- a/frontend/libs/model-list/src/lib/Models.ts +++ b/frontend/libs/model-list/src/lib/Models.ts @@ -55,7 +55,7 @@ export const ALL_MODELS: ModelConfig[] = [ }, description: "High quality model", badges: [{ label: "15 sec." }], - capabilities: { maxGenerationCount: 4 }, + capabilities: { maxGenerationCount: 4, defaultGenerationCount: 4 }, }), cfg({ id: "flux_pro_1_1", @@ -67,7 +67,7 @@ export const ALL_MODELS: ModelConfig[] = [ }, description: "High quality model", badges: [{ label: "15 sec." }], - capabilities: { maxGenerationCount: 4 }, + capabilities: { maxGenerationCount: 4, defaultGenerationCount: 4 }, }), cfg({ id: "flux_1_dev", @@ -79,7 +79,7 @@ export const ALL_MODELS: ModelConfig[] = [ }, description: "High quality model", badges: [{ label: "15 sec." }], - capabilities: { maxGenerationCount: 4 }, + capabilities: { maxGenerationCount: 4, defaultGenerationCount: 4 }, }), cfg({ id: "flux_1_schnell", @@ -91,7 +91,7 @@ export const ALL_MODELS: ModelConfig[] = [ }, description: "High quality model", badges: [{ label: "15 sec." }], - capabilities: { maxGenerationCount: 4 }, + capabilities: { maxGenerationCount: 4, defaultGenerationCount: 4 }, }), cfg({ id: "gpt_image_1",