From 6a07f007a479e81bcd06e7eb6f5803aca76d365f Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Mon, 17 Jun 2024 12:33:35 +1000 Subject: [PATCH] fix(ui): move lora followup fixes --- .../web/src/features/metadata/util/handlers.ts | 3 +-- .../web/src/features/metadata/util/parsers.ts | 5 ++--- .../web/src/features/metadata/util/recallers.ts | 11 ++++++----- .../web/src/features/metadata/util/validators.ts | 3 +-- .../web/src/features/prompt/PromptTriggerSelect.tsx | 2 +- .../components/SettingsModal/useClearIntermediates.ts | 1 + 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/invokeai/frontend/web/src/features/metadata/util/handlers.ts b/invokeai/frontend/web/src/features/metadata/util/handlers.ts index d0f151118c..8c6f517005 100644 --- a/invokeai/frontend/web/src/features/metadata/util/handlers.ts +++ b/invokeai/frontend/web/src/features/metadata/util/handlers.ts @@ -2,8 +2,7 @@ import { getStore } from 'app/store/nanostores/store'; import { deepClone } from 'common/util/deepClone'; import { objectKeys } from 'common/util/objectKeys'; import { shouldConcatPromptsChanged } from 'features/controlLayers/store/canvasV2Slice'; -import type { LayerData } from 'features/controlLayers/store/types'; -import type { LoRA } from 'features/lora/store/loraSlice'; +import type { LayerData, LoRA } from 'features/controlLayers/store/types'; import type { AnyControlAdapterConfigMetadata, BuildMetadataHandlers, diff --git a/invokeai/frontend/web/src/features/metadata/util/parsers.ts b/invokeai/frontend/web/src/features/metadata/util/parsers.ts index 734b457c82..909296c512 100644 --- a/invokeai/frontend/web/src/features/metadata/util/parsers.ts +++ b/invokeai/frontend/web/src/features/metadata/util/parsers.ts @@ -1,5 +1,6 @@ import { getCAId, getImageObjectId, getIPAId, getLayerId } from 'features/controlLayers/konva/naming'; -import type { ControlAdapterData, IPAdapterData, LayerData } from 'features/controlLayers/store/types'; +import { defaultLoRAConfig } from 'features/controlLayers/store/lorasReducers'; +import type { ControlAdapterData, IPAdapterData, LayerData, LoRA } from 'features/controlLayers/store/types'; import { CA_PROCESSOR_DATA, imageDTOToImageWithDims, @@ -9,8 +10,6 @@ import { isProcessorTypeV2, zLayerData, } from 'features/controlLayers/store/types'; -import type { LoRA } from 'features/lora/store/loraSlice'; -import { defaultLoRAConfig } from 'features/lora/store/loraSlice'; import type { ControlNetConfigMetadata, IPAdapterConfigMetadata, diff --git a/invokeai/frontend/web/src/features/metadata/util/recallers.ts b/invokeai/frontend/web/src/features/metadata/util/recallers.ts index 0f3399833e..1ab3da59ae 100644 --- a/invokeai/frontend/web/src/features/metadata/util/recallers.ts +++ b/invokeai/frontend/web/src/features/metadata/util/recallers.ts @@ -16,6 +16,8 @@ import { ipaRecalled, layerAllDeleted, layerRecalled, + loraAllDeleted, + loraRecalled, negativePrompt2Changed, negativePromptChanged, positivePrompt2Changed, @@ -41,11 +43,10 @@ import type { ControlAdapterData, IPAdapterData, LayerData, + LoRA, RegionalGuidanceData, } from 'features/controlLayers/store/types'; import { setHrfEnabled, setHrfMethod, setHrfStrength } from 'features/hrf/store/hrfSlice'; -import type { LoRA } from 'features/lora/store/loraSlice'; -import { loraRecalled, lorasReset } from 'features/lora/store/loraSlice'; import type { ControlNetConfigMetadata, IPAdapterConfigMetadata, @@ -186,17 +187,17 @@ const recallVAE: MetadataRecallFunc = (vae }; const recallLoRA: MetadataRecallFunc = (lora) => { - getStore().dispatch(loraRecalled(lora)); + getStore().dispatch(loraRecalled({ lora })); }; const recallAllLoRAs: MetadataRecallFunc = (loras) => { const { dispatch } = getStore(); - dispatch(lorasReset()); + dispatch(loraAllDeleted()); if (!loras.length) { return; } loras.forEach((lora) => { - dispatch(loraRecalled(lora)); + dispatch(loraRecalled({ lora })); }); }; diff --git a/invokeai/frontend/web/src/features/metadata/util/validators.ts b/invokeai/frontend/web/src/features/metadata/util/validators.ts index 6547e01ac4..f0e5c84f39 100644 --- a/invokeai/frontend/web/src/features/metadata/util/validators.ts +++ b/invokeai/frontend/web/src/features/metadata/util/validators.ts @@ -1,6 +1,5 @@ import { getStore } from 'app/store/nanostores/store'; -import type { LayerData } from 'features/controlLayers/store/types'; -import type { LoRA } from 'features/lora/store/loraSlice'; +import type { LayerData, LoRA } from 'features/controlLayers/store/types'; import type { ControlNetConfigMetadata, IPAdapterConfigMetadata, diff --git a/invokeai/frontend/web/src/features/prompt/PromptTriggerSelect.tsx b/invokeai/frontend/web/src/features/prompt/PromptTriggerSelect.tsx index e8f0032d10..493979f504 100644 --- a/invokeai/frontend/web/src/features/prompt/PromptTriggerSelect.tsx +++ b/invokeai/frontend/web/src/features/prompt/PromptTriggerSelect.tsx @@ -18,7 +18,7 @@ export const PromptTriggerSelect = memo(({ onSelect, onClose }: PromptTriggerSel const { t } = useTranslation(); const mainModel = useAppSelector((s) => s.canvasV2.params.model); - const addedLoRAs = useAppSelector((s) => s.lora.loras); + const addedLoRAs = useAppSelector((s) => s.canvasV2.loras); const { data: mainModelConfig, isLoading: isLoadingMainModelConfig } = useGetModelConfigQuery( mainModel?.key ?? skipToken ); diff --git a/invokeai/frontend/web/src/features/system/components/SettingsModal/useClearIntermediates.ts b/invokeai/frontend/web/src/features/system/components/SettingsModal/useClearIntermediates.ts index 6302a16ba5..4df8d20e29 100644 --- a/invokeai/frontend/web/src/features/system/components/SettingsModal/useClearIntermediates.ts +++ b/invokeai/frontend/web/src/features/system/components/SettingsModal/useClearIntermediates.ts @@ -38,6 +38,7 @@ export const useClearIntermediates = (shouldShowClearIntermediates: boolean): Us _clearIntermediates() .unwrap() .then((clearedCount) => { + // TODO(psyche): Do we need to reset things w/ canvas v2? // dispatch(controlAdaptersReset()); // dispatch(resetCanvas()); toast({