From 8dd1938f7ffb7e66e1004095c2ecd0d1a806e1d4 Mon Sep 17 00:00:00 2001 From: BFlat Date: Thu, 27 Jun 2024 02:51:40 +0700 Subject: [PATCH] bug fix: ip adapter change empty strings to null (#535) - fixes generation failing if ip adapter image not applied / empty string given to backend - fixed bug where removing IPA image doesn't clear the file state --- app/pages/PageEnigma/Editor/editor.ts | 2 +- .../comps/SidePanelTabs/itemTabs/StylizeTab/IPAdapter.tsx | 7 +++++-- app/pages/PageEnigma/models/generationOptions.ts | 6 +++--- app/pages/PageEnigma/models/sceneGenerationMetadata.ts | 2 +- app/pages/PageEnigma/signals/stylizeTab.ts | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/pages/PageEnigma/Editor/editor.ts b/app/pages/PageEnigma/Editor/editor.ts index f5ba059012..47e1b9dbe6 100644 --- a/app/pages/PageEnigma/Editor/editor.ts +++ b/app/pages/PageEnigma/Editor/editor.ts @@ -247,7 +247,7 @@ class Editor { styleStrength: 1.0, lipSync: false, cinematic: false, - globalIpAdapterImageMediaToken: "", + globalIpAdapterImageMediaToken: null, }; this.media_upload = new MediaUploadApi(); diff --git a/app/pages/PageEnigma/comps/SidePanelTabs/itemTabs/StylizeTab/IPAdapter.tsx b/app/pages/PageEnigma/comps/SidePanelTabs/itemTabs/StylizeTab/IPAdapter.tsx index e5758110f8..a2ca18b3de 100644 --- a/app/pages/PageEnigma/comps/SidePanelTabs/itemTabs/StylizeTab/IPAdapter.tsx +++ b/app/pages/PageEnigma/comps/SidePanelTabs/itemTabs/StylizeTab/IPAdapter.tsx @@ -65,7 +65,7 @@ export const IPAdapter: React.FC = () => { ) { try { const response = await mediaFilesApi.GetMediaFileByToken({ - mediaFileToken: globalIPAMediaToken.value || "", + mediaFileToken: globalIPAMediaToken.value, }); if (response.success && response.data) { const imageUrl = bucketConfig.getGcsUrl( @@ -185,7 +185,10 @@ export const IPAdapter: React.FC = () => { setImageSrc(null); setCrop(undefined); adapterImage.value = null; - globalIPAMediaToken.value = ""; + globalIPAMediaToken.value = null; + if (editorEngine) { + editorEngine.globalIpAdapterImage = undefined; + } }; const DragAndDropZone = () => { diff --git a/app/pages/PageEnigma/models/generationOptions.ts b/app/pages/PageEnigma/models/generationOptions.ts index c77c734029..8c716bd126 100644 --- a/app/pages/PageEnigma/models/generationOptions.ts +++ b/app/pages/PageEnigma/models/generationOptions.ts @@ -4,7 +4,7 @@ export interface GenerationOptions { styleStrength: number; lipSync: boolean; cinematic: boolean; - globalIpAdapterImageMediaToken: string; // base 64 image + globalIpAdapterImageMediaToken: string | null; } export class GenerationOptions { @@ -13,14 +13,14 @@ export class GenerationOptions { public styleStrength: number; public lipSync: boolean; public cinematic: boolean; - public globalIpAdapterImageMediaToken: string; + public globalIpAdapterImageMediaToken: string | null; constructor( upscale: boolean, faceDetail: boolean, styleStrength: number, lipSync: boolean, cinematic: boolean, - globalIpAdapterImageMediaToken: string, + globalIpAdapterImageMediaToken: string | null, ) { this.upscale = upscale; this.faceDetail = faceDetail; diff --git a/app/pages/PageEnigma/models/sceneGenerationMetadata.ts b/app/pages/PageEnigma/models/sceneGenerationMetadata.ts index d394cae23a..a0da5b8a7f 100644 --- a/app/pages/PageEnigma/models/sceneGenerationMetadata.ts +++ b/app/pages/PageEnigma/models/sceneGenerationMetadata.ts @@ -7,7 +7,7 @@ export interface SceneGenereationMetaData { negativePrompt: string; cameraAspectRatio: CameraAspectRatio; - globalIPAMediaToken: string; + globalIPAMediaToken: string | null; upscale: boolean; faceDetail: boolean; diff --git a/app/pages/PageEnigma/signals/stylizeTab.ts b/app/pages/PageEnigma/signals/stylizeTab.ts index 82753f7d39..f6e4d4343e 100644 --- a/app/pages/PageEnigma/signals/stylizeTab.ts +++ b/app/pages/PageEnigma/signals/stylizeTab.ts @@ -11,7 +11,7 @@ export const promptsStore = { showNegativePrompt: signal(false), }; -export const globalIPAMediaToken = signal(""); +export const globalIPAMediaToken = signal(null); export const adapterImage = signal(null); export const selectedArtStyle = signal(styleList[0].type); export const upscale = signal(false);