diff --git a/frontend/apps/editor3d/app/src/pages/PageEnigma/TauriEvents/generations/useGenerationCompleteEvent.ts b/frontend/apps/editor3d/app/src/pages/PageEnigma/TauriEvents/generations/useGenerationCompleteEvent.ts index 42350aa461..05f98db2ae 100644 --- a/frontend/apps/editor3d/app/src/pages/PageEnigma/TauriEvents/generations/useGenerationCompleteEvent.ts +++ b/frontend/apps/editor3d/app/src/pages/PageEnigma/TauriEvents/generations/useGenerationCompleteEvent.ts @@ -7,7 +7,7 @@ import { GenerationAction, GenerationModel, GenerationServiceProvider } from "./ import { BasicEventWrapper } from "../BasicEventWrapper"; type GenerationCompleteEvent = { - action: GenerationAction, + action?: GenerationAction, service: GenerationServiceProvider, model?: GenerationModel, }; @@ -46,6 +46,9 @@ export const useGenerationCompleteEvent = () => { } const makeMessage = (event: GenerationCompleteEvent) => { + if (!event.action) { + return "Generation complete!"; + } switch (event.action) { case GenerationAction.GenerateImage: return "Image generation complete!"; diff --git a/frontend/libs/components/promptbox/src/lib/PromptBox2D.tsx b/frontend/libs/components/promptbox/src/lib/PromptBox2D.tsx index 314973c738..ed1ab2e96c 100644 --- a/frontend/libs/components/promptbox/src/lib/PromptBox2D.tsx +++ b/frontend/libs/components/promptbox/src/lib/PromptBox2D.tsx @@ -302,49 +302,6 @@ export const PromptBox2D = ({ }); console.log("generateResponse", generateResponse); - - if (generateResponse.status === CommandSuccessStatus.Success) { - const prefs = await GetAppPreferences(); - const soundName = prefs.preferences?.enqueue_success_sound; - if (soundName !== undefined) { - const registry = SoundRegistry.getInstance(); - registry.playSound(soundName); - } - toast.success("Image added to queue"); - } else { - const prefs = await GetAppPreferences(); - const soundName = prefs.preferences?.enqueue_failure_sound; - if (soundName !== undefined) { - const registry = SoundRegistry.getInstance(); - registry.playSound(soundName); - } - - let errorMessage = "Failed to enqueue image"; - - if ("error_type" in generateResponse) { - switch (generateResponse.error_type) { - case SoraImageRemixErrorType.SoraLoginRequired: - errorMessage = - "You need to log into Sora to continue. See the settings menu."; - break; - case SoraImageRemixErrorType.ServerError: - errorMessage = "Server error. Failed to enqueue image."; - break; - case SoraImageRemixErrorType.TooManyConcurrentTasks: - errorMessage = - "You have too many Sora image generation tasks running. Please wait a moment."; - break; - case SoraImageRemixErrorType.SoraUsernameNotYetCreated: - errorMessage = - "Your Sora username is not yet created. Please visit the Sora.com website to create it first."; - break; - case SoraImageRemixErrorType.SoraIsHavingProblems: - errorMessage = "Sora is having problems. Please try again later."; - break; - } - } - toast.error(errorMessage); - } }; const handleWebEnqueue = async () => { diff --git a/frontend/libs/components/promptbox/src/lib/PromptBox3D.tsx b/frontend/libs/components/promptbox/src/lib/PromptBox3D.tsx index 9fa85f775d..59e1ddaf32 100644 --- a/frontend/libs/components/promptbox/src/lib/PromptBox3D.tsx +++ b/frontend/libs/components/promptbox/src/lib/PromptBox3D.tsx @@ -429,49 +429,9 @@ export const PromptBox3D = ({ console.log("generateResponse", generateResponse); if (generateResponse.status === CommandSuccessStatus.Success) { - const prefs = await GetAppPreferences(); - const soundName = prefs.preferences?.enqueue_success_sound; - if (soundName !== undefined) { - const registry = SoundRegistry.getInstance(); - registry.playSound(soundName); - } - toast.success("Image added to queue"); setisEnqueueing(false); return; } else { - const prefs = await GetAppPreferences(); - const soundName = prefs.preferences?.enqueue_failure_sound; - if (soundName !== undefined) { - const registry = SoundRegistry.getInstance(); - registry.playSound(soundName); - } - - let errorMessage = "Failed to enqueue image"; - - if ("error_type" in generateResponse) { - switch (generateResponse.error_type) { - case SoraImageRemixErrorType.SoraLoginRequired: - errorMessage = - "You need to log into Sora to continue. See the settings menu."; - break; - case SoraImageRemixErrorType.ServerError: - errorMessage = "Server error. Failed to enqueue image."; - break; - case SoraImageRemixErrorType.TooManyConcurrentTasks: - errorMessage = - "You have too many Sora image generation tasks running. Please wait a moment."; - break; - case SoraImageRemixErrorType.SoraUsernameNotYetCreated: - errorMessage = - "Your Sora username is not yet created. Please visit the Sora.com website to create it first."; - break; - case SoraImageRemixErrorType.SoraIsHavingProblems: - errorMessage = - "Sora is having problems. Please try again later."; - break; - } - } - toast.error(errorMessage); setisEnqueueing(false); return; } diff --git a/frontend/libs/components/promptbox/src/lib/PromptBoxImage.tsx b/frontend/libs/components/promptbox/src/lib/PromptBoxImage.tsx index 6131584ee7..542eee20cc 100644 --- a/frontend/libs/components/promptbox/src/lib/PromptBoxImage.tsx +++ b/frontend/libs/components/promptbox/src/lib/PromptBoxImage.tsx @@ -1,6 +1,5 @@ import { useState, useRef, useEffect } from "react"; import { useSignals } from "@preact/signals-react/runtime"; -import { toast } from "@storyteller/ui-toaster"; import { JobContextType } from "@storyteller/common"; import { downloadFileFromUrl } from "@storyteller/api"; import { PopoverMenu, PopoverItem } from "@storyteller/ui-popover"; @@ -25,11 +24,6 @@ import { import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { IsDesktopApp } from "@storyteller/tauri-utils"; import { GalleryItem, GalleryModal } from "@storyteller/ui-gallery-modal"; -import { - CommandSuccessStatus, - GetAppPreferences, -} from "@storyteller/tauri-api"; -import { SoundRegistry } from "@storyteller/soundboard"; interface ReferenceImage { id: string; @@ -209,48 +203,6 @@ export const PromptBoxImage = ({ console.log("generateResponse", generateResponse); onEnqueuePressed?.(); - if (generateResponse.status === CommandSuccessStatus.Success) { - const prefs = await GetAppPreferences(); - const soundName = prefs.preferences?.enqueue_success_sound; - if (soundName !== undefined) { - const registry = SoundRegistry.getInstance(); - registry.playSound(soundName); - } - toast.success("Image added to queue"); - } else { - const prefs = await GetAppPreferences(); - const soundName = prefs.preferences?.enqueue_failure_sound; - if (soundName !== undefined) { - const registry = SoundRegistry.getInstance(); - registry.playSound(soundName); - } - } - - // let errorMessage = "Failed to enqueue image"; - // if ("error_type" in generateResponse) { - // switch (generateResponse.error_type) { - // case SoraImageRemixErrorType.SoraLoginRequired: - // errorMessage = - // "You need to log into Sora to continue. See the settings menu."; - // break; - // case SoraImageRemixErrorType.ServerError: - // errorMessage = "Server error. Failed to enqueue image."; - // break; - // case SoraImageRemixErrorType.TooManyConcurrentTasks: - // errorMessage = - // "You have too many Sora image generation tasks running. Please wait a moment."; - // break; - // case SoraImageRemixErrorType.SoraUsernameNotYetCreated: - // errorMessage = - // "Your Sora username is not yet created. Please visit the Sora.com website to create it first."; - // break; - // case SoraImageRemixErrorType.SoraIsHavingProblems: - // errorMessage = "Sora is having problems. Please try again later."; - // break; - // } - // } - // toast.error(errorMessage); - // } setIsEnqueueing(false); }; diff --git a/frontend/libs/components/promptbox/src/lib/PromptBoxVideo.tsx b/frontend/libs/components/promptbox/src/lib/PromptBoxVideo.tsx index 9b626464e7..c5e4ad9635 100644 --- a/frontend/libs/components/promptbox/src/lib/PromptBoxVideo.tsx +++ b/frontend/libs/components/promptbox/src/lib/PromptBoxVideo.tsx @@ -1,6 +1,5 @@ import { useState, useRef, useEffect } from "react"; import { useSignals } from "@preact/signals-react/runtime"; -import { toast } from "@storyteller/ui-toaster"; import { JobContextType } from "@storyteller/common"; import { downloadFileFromUrl } from "@storyteller/api"; import { PopoverMenu, PopoverItem } from "@storyteller/ui-popover"; @@ -21,11 +20,6 @@ import { faRectangle } from "@fortawesome/pro-regular-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { IsDesktopApp } from "@storyteller/tauri-utils"; import { GalleryItem, GalleryModal } from "@storyteller/ui-gallery-modal"; -import { - CommandSuccessStatus, - GetAppPreferences, -} from "@storyteller/tauri-api"; -import { SoundRegistry } from "@storyteller/soundboard"; interface ReferenceImage { id: string; @@ -196,48 +190,6 @@ export const PromptBoxVideo = ({ console.log("generateResponse", generateResponse); onEnqueuePressed?.(); - if (generateResponse.status === CommandSuccessStatus.Success) { - const prefs = await GetAppPreferences(); - const soundName = prefs.preferences?.enqueue_success_sound; - if (soundName !== undefined) { - const registry = SoundRegistry.getInstance(); - registry.playSound(soundName); - } - toast.success("Image added to queue"); - } else { - const prefs = await GetAppPreferences(); - const soundName = prefs.preferences?.enqueue_failure_sound; - if (soundName !== undefined) { - const registry = SoundRegistry.getInstance(); - registry.playSound(soundName); - } - } - - // let errorMessage = "Failed to enqueue image"; - // if ("error_type" in generateResponse) { - // switch (generateResponse.error_type) { - // case SoraImageRemixErrorType.SoraLoginRequired: - // errorMessage = - // "You need to log into Sora to continue. See the settings menu."; - // break; - // case SoraImageRemixErrorType.ServerError: - // errorMessage = "Server error. Failed to enqueue image."; - // break; - // case SoraImageRemixErrorType.TooManyConcurrentTasks: - // errorMessage = - // "You have too many Sora image generation tasks running. Please wait a moment."; - // break; - // case SoraImageRemixErrorType.SoraUsernameNotYetCreated: - // errorMessage = - // "Your Sora username is not yet created. Please visit the Sora.com website to create it first."; - // break; - // case SoraImageRemixErrorType.SoraIsHavingProblems: - // errorMessage = "Sora is having problems. Please try again later."; - // break; - // } - // } - // toast.error(errorMessage); - // } setIsEnqueueing(false); };