diff --git a/invokeai/frontend/web/package.json b/invokeai/frontend/web/package.json index 9a45dd89a5..e5f1513c89 100644 --- a/invokeai/frontend/web/package.json +++ b/invokeai/frontend/web/package.json @@ -157,6 +157,7 @@ "prettier": "^3.0.2", "rollup-plugin-visualizer": "^5.9.2", "ts-toolbelt": "^9.6.0", + "typescript": "^5.2.2", "vite": "^4.4.9", "vite-plugin-css-injected-by-js": "^3.3.0", "vite-plugin-dts": "^3.5.2", diff --git a/invokeai/frontend/web/src/app/store/enhancers/reduxRemember/serialize.ts b/invokeai/frontend/web/src/app/store/enhancers/reduxRemember/serialize.ts index d7627ebdef..4741f08b16 100644 --- a/invokeai/frontend/web/src/app/store/enhancers/reduxRemember/serialize.ts +++ b/invokeai/frontend/web/src/app/store/enhancers/reduxRemember/serialize.ts @@ -1,5 +1,5 @@ import { canvasPersistDenylist } from 'features/canvas/store/canvasPersistDenylist'; -import { controlAdaptersPersistDenylist } from 'features/controlNet/store/controlAdaptersPersistDenylist'; +import { controlAdaptersPersistDenylist } from 'features/controlAdapters/store/controlAdaptersPersistDenylist'; import { dynamicPromptsPersistDenylist } from 'features/dynamicPrompts/store/dynamicPromptsPersistDenylist'; import { galleryPersistDenylist } from 'features/gallery/store/galleryPersistDenylist'; import { nodesPersistDenylist } from 'features/nodes/store/nodesPersistDenylist'; diff --git a/invokeai/frontend/web/src/app/store/enhancers/reduxRemember/unserialize.ts b/invokeai/frontend/web/src/app/store/enhancers/reduxRemember/unserialize.ts index 156bd69a77..0dcc9e5971 100644 --- a/invokeai/frontend/web/src/app/store/enhancers/reduxRemember/unserialize.ts +++ b/invokeai/frontend/web/src/app/store/enhancers/reduxRemember/unserialize.ts @@ -1,5 +1,5 @@ import { initialCanvasState } from 'features/canvas/store/canvasSlice'; -import { initialControlAdapterState } from 'features/controlNet/store/controlAdaptersSlice'; +import { initialControlAdapterState } from 'features/controlAdapters/store/controlAdaptersSlice'; import { initialDynamicPromptsState } from 'features/dynamicPrompts/store/dynamicPromptsSlice'; import { initialGalleryState } from 'features/gallery/store/gallerySlice'; import { initialNodesState } from 'features/nodes/store/nodesSlice'; diff --git a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/boardAndImagesDeleted.ts b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/boardAndImagesDeleted.ts index 0c47a1e37c..a1be8de312 100644 --- a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/boardAndImagesDeleted.ts +++ b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/boardAndImagesDeleted.ts @@ -1,5 +1,5 @@ import { resetCanvas } from 'features/canvas/store/canvasSlice'; -import { controlAdaptersReset } from 'features/controlNet/store/controlAdaptersSlice'; +import { controlAdaptersReset } from 'features/controlAdapters/store/controlAdaptersSlice'; import { getImageUsage } from 'features/deleteImageModal/store/selectors'; import { nodeEditorReset } from 'features/nodes/store/nodesSlice'; import { clearInitialImage } from 'features/parameters/store/generationSlice'; diff --git a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/canvasImageToControlNet.ts b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/canvasImageToControlNet.ts index 1be305170f..01eda311e5 100644 --- a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/canvasImageToControlNet.ts +++ b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/canvasImageToControlNet.ts @@ -1,6 +1,6 @@ import { logger } from 'app/logging/logger'; import { getBaseLayerBlob } from 'features/canvas/util/getBaseLayerBlob'; -import { controlAdapterImageChanged } from 'features/controlNet/store/controlAdaptersSlice'; +import { controlAdapterImageChanged } from 'features/controlAdapters/store/controlAdaptersSlice'; import { addToast } from 'features/system/store/systemSlice'; import { t } from 'i18next'; import { imagesApi } from 'services/api/endpoints/images'; diff --git a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/canvasMaskToControlNet.ts b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/canvasMaskToControlNet.ts index b6a36c0ea0..ccd5a3972b 100644 --- a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/canvasMaskToControlNet.ts +++ b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/canvasMaskToControlNet.ts @@ -1,7 +1,7 @@ import { logger } from 'app/logging/logger'; import { canvasMaskToControlAdapter } from 'features/canvas/store/actions'; import { getCanvasData } from 'features/canvas/util/getCanvasData'; -import { controlAdapterImageChanged } from 'features/controlNet/store/controlAdaptersSlice'; +import { controlAdapterImageChanged } from 'features/controlAdapters/store/controlAdaptersSlice'; import { addToast } from 'features/system/store/systemSlice'; import { t } from 'i18next'; import { imagesApi } from 'services/api/endpoints/images'; diff --git a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/controlNetAutoProcess.ts b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/controlNetAutoProcess.ts index 4bf75eea85..b16c2d8556 100644 --- a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/controlNetAutoProcess.ts +++ b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/controlNetAutoProcess.ts @@ -1,7 +1,7 @@ import { AnyListenerPredicate } from '@reduxjs/toolkit'; import { logger } from 'app/logging/logger'; import { RootState } from 'app/store/store'; -import { controlAdapterImageProcessed } from 'features/controlNet/store/actions'; +import { controlAdapterImageProcessed } from 'features/controlAdapters/store/actions'; import { controlAdapterAutoConfigToggled, controlAdapterImageChanged, @@ -9,9 +9,9 @@ import { controlAdapterProcessorParamsChanged, controlAdapterProcessortTypeChanged, selectControlAdapterById, -} from 'features/controlNet/store/controlAdaptersSlice'; +} from 'features/controlAdapters/store/controlAdaptersSlice'; import { startAppListening } from '..'; -import { isControlNetOrT2IAdapter } from 'features/controlNet/store/types'; +import { isControlNetOrT2IAdapter } from 'features/controlAdapters/store/types'; type AnyControlAdapterParamChangeAction = | ReturnType diff --git a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/controlNetImageProcessed.ts b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/controlNetImageProcessed.ts index b29d9d5b4a..cbefaafbb4 100644 --- a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/controlNetImageProcessed.ts +++ b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/controlNetImageProcessed.ts @@ -5,7 +5,7 @@ import { controlAdapterImageChanged, selectControlAdapterById, controlAdapterProcessedImageChanged, -} from 'features/controlNet/store/controlAdaptersSlice'; +} from 'features/controlAdapters/store/controlAdaptersSlice'; import { SAVE_IMAGE } from 'features/nodes/util/graphBuilders/constants'; import { addToast } from 'features/system/store/systemSlice'; import { t } from 'i18next'; @@ -15,8 +15,8 @@ import { isImageOutput } from 'services/api/guards'; import { Graph, ImageDTO } from 'services/api/types'; import { socketInvocationComplete } from 'services/events/actions'; import { startAppListening } from '..'; -import { controlAdapterImageProcessed } from 'features/controlNet/store/actions'; -import { isControlNetOrT2IAdapter } from 'features/controlNet/store/types'; +import { controlAdapterImageProcessed } from 'features/controlAdapters/store/actions'; +import { isControlNetOrT2IAdapter } from 'features/controlAdapters/store/types'; export const addControlNetImageProcessedListener = () => { startAppListening({ diff --git a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageDeleted.ts b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageDeleted.ts index d941df11ba..79a09c628f 100644 --- a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageDeleted.ts +++ b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageDeleted.ts @@ -4,7 +4,7 @@ import { controlAdapterImageChanged, controlAdapterProcessedImageChanged, selectControlAdapterAll, -} from 'features/controlNet/store/controlAdaptersSlice'; +} from 'features/controlAdapters/store/controlAdaptersSlice'; import { imageDeletionConfirmed } from 'features/deleteImageModal/store/actions'; import { isModalOpenChanged } from 'features/deleteImageModal/store/slice'; import { selectListImagesBaseQueryArgs } from 'features/gallery/store/gallerySelectors'; @@ -17,7 +17,7 @@ import { api } from 'services/api'; import { imagesApi } from 'services/api/endpoints/images'; import { imagesAdapter } from 'services/api/util'; import { startAppListening } from '..'; -import { isControlNetOrT2IAdapter } from 'features/controlNet/store/types'; +import { isControlNetOrT2IAdapter } from 'features/controlAdapters/store/types'; export const addRequestedSingleImageDeletionListener = () => { startAppListening({ diff --git a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageDropped.ts b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageDropped.ts index d8d1e607ed..584ec18f26 100644 --- a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageDropped.ts +++ b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageDropped.ts @@ -5,7 +5,7 @@ import { setInitialCanvasImage } from 'features/canvas/store/canvasSlice'; import { controlAdapterImageChanged, controlAdapterIsEnabledChanged, -} from 'features/controlNet/store/controlAdaptersSlice'; +} from 'features/controlAdapters/store/controlAdaptersSlice'; import { TypesafeDraggableData, TypesafeDroppableData, diff --git a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageUploaded.ts b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageUploaded.ts index d3ebb5eac5..3cff64f5bb 100644 --- a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageUploaded.ts +++ b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageUploaded.ts @@ -4,7 +4,7 @@ import { setInitialCanvasImage } from 'features/canvas/store/canvasSlice'; import { controlAdapterImageChanged, controlAdapterIsEnabledChanged, -} from 'features/controlNet/store/controlAdaptersSlice'; +} from 'features/controlAdapters/store/controlAdaptersSlice'; import { fieldImageValueChanged } from 'features/nodes/store/nodesSlice'; import { initialImageChanged } from 'features/parameters/store/generationSlice'; import { addToast } from 'features/system/store/systemSlice'; diff --git a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/modelSelected.ts b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/modelSelected.ts index edb3cfd397..7542be2743 100644 --- a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/modelSelected.ts +++ b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/modelSelected.ts @@ -3,7 +3,7 @@ import { setBoundingBoxDimensions } from 'features/canvas/store/canvasSlice'; import { controlAdapterRemoved, selectControlAdapterAll, -} from 'features/controlNet/store/controlAdaptersSlice'; +} from 'features/controlAdapters/store/controlAdaptersSlice'; import { loraRemoved } from 'features/lora/store/loraSlice'; import { modelSelected } from 'features/parameters/store/actions'; import { diff --git a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/modelsLoaded.ts b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/modelsLoaded.ts index fefc063679..785630495b 100644 --- a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/modelsLoaded.ts +++ b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/modelsLoaded.ts @@ -4,7 +4,7 @@ import { selectAllControlNets, selectAllIPAdapters, selectAllT2IAdapters, -} from 'features/controlNet/store/controlAdaptersSlice'; +} from 'features/controlAdapters/store/controlAdaptersSlice'; import { loraRemoved } from 'features/lora/store/loraSlice'; import { modelChanged, diff --git a/invokeai/frontend/web/src/app/store/store.ts b/invokeai/frontend/web/src/app/store/store.ts index bfc3f5a621..00cbdcccd1 100644 --- a/invokeai/frontend/web/src/app/store/store.ts +++ b/invokeai/frontend/web/src/app/store/store.ts @@ -7,7 +7,7 @@ import { } from '@reduxjs/toolkit'; import canvasReducer from 'features/canvas/store/canvasSlice'; import changeBoardModalReducer from 'features/changeBoardModal/store/slice'; -import controlAdaptersReducer from 'features/controlNet/store/controlAdaptersSlice'; +import controlAdaptersReducer from 'features/controlAdapters/store/controlAdaptersSlice'; import deleteImageModalReducer from 'features/deleteImageModal/store/slice'; import dynamicPromptsReducer from 'features/dynamicPrompts/store/dynamicPromptsSlice'; import galleryReducer from 'features/gallery/store/gallerySlice'; diff --git a/invokeai/frontend/web/src/app/types/invokeai.ts b/invokeai/frontend/web/src/app/types/invokeai.ts index 764ecc91f4..0f1f7b3aaa 100644 --- a/invokeai/frontend/web/src/app/types/invokeai.ts +++ b/invokeai/frontend/web/src/app/types/invokeai.ts @@ -1,4 +1,4 @@ -import { CONTROLNET_PROCESSORS } from 'features/controlNet/store/constants'; +import { CONTROLNET_PROCESSORS } from 'features/controlAdapters/store/constants'; import { InvokeTabName } from 'features/ui/store/tabMap'; import { O } from 'ts-toolbelt'; diff --git a/invokeai/frontend/web/src/common/hooks/useIsReadyToEnqueue.ts b/invokeai/frontend/web/src/common/hooks/useIsReadyToEnqueue.ts index 92f8a7cbf0..b9daf7feaa 100644 --- a/invokeai/frontend/web/src/common/hooks/useIsReadyToEnqueue.ts +++ b/invokeai/frontend/web/src/common/hooks/useIsReadyToEnqueue.ts @@ -2,8 +2,8 @@ import { createSelector } from '@reduxjs/toolkit'; import { stateSelector } from 'app/store/store'; import { useAppSelector } from 'app/store/storeHooks'; import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions'; -import { selectControlAdapterAll } from 'features/controlNet/store/controlAdaptersSlice'; -import { isControlNetOrT2IAdapter } from 'features/controlNet/store/types'; +import { selectControlAdapterAll } from 'features/controlAdapters/store/controlAdaptersSlice'; +import { isControlNetOrT2IAdapter } from 'features/controlAdapters/store/types'; import { isInvocationNode } from 'features/nodes/types/types'; import { activeTabNameSelector } from 'features/ui/store/uiSelectors'; import i18n from 'i18next'; diff --git a/invokeai/frontend/web/src/features/controlNet/components/ControlNet.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/ControlAdapterConfig.tsx similarity index 77% rename from invokeai/frontend/web/src/features/controlNet/components/ControlNet.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/ControlAdapterConfig.tsx index cedfebac6e..37683568ba 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/ControlNet.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/ControlAdapterConfig.tsx @@ -7,8 +7,8 @@ import { controlAdapterIsEnabledChanged, controlAdapterRemoved, } from '../store/controlAdaptersSlice'; -import ParamControlNetModel from './parameters/ParamControlNetModel'; -import ParamControlNetWeight from './parameters/ParamControlNetWeight'; +import ParamControlAdapterModel from './parameters/ParamControlAdapterModel'; +import ParamControlAdapterWeight from './parameters/ParamControlAdapterWeight'; import { ChevronUpIcon } from '@chakra-ui/icons'; import IAIIconButton from 'common/components/IAIIconButton'; @@ -18,16 +18,16 @@ import { useTranslation } from 'react-i18next'; import { useToggle } from 'react-use'; import { useControlAdapterIsEnabled } from '../hooks/useControlAdapterIsEnabled'; import { useControlAdapterType } from '../hooks/useControlAdapterType'; -import ControlNetImagePreview from './ControlNetImagePreview'; -import ControlNetProcessorComponent from './ControlNetProcessorComponent'; -import ParamControlNetShouldAutoConfig from './ParamControlNetShouldAutoConfig'; +import ControlAdapterImagePreview from './ControlAdapterImagePreview'; +import ControlAdapterProcessorComponent from './ControlAdapterProcessorComponent'; +import ControlAdapterShouldAutoConfig from './ControlAdapterShouldAutoConfig'; import ControlNetCanvasImageImports from './imports/ControlNetCanvasImageImports'; -import ParamControlNetBeginEnd from './parameters/ParamControlNetBeginEnd'; -import ParamControlNetControlMode from './parameters/ParamControlNetControlMode'; -import ParamControlNetProcessorSelect from './parameters/ParamControlNetProcessorSelect'; -import ParamControlNetResizeMode from './parameters/ParamControlNetResizeMode'; +import ParamControlAdapterBeginEnd from './parameters/ParamControlAdapterBeginEnd'; +import ParamControlAdapterControlMode from './parameters/ParamControlAdapterControlMode'; +import ParamControlAdapterProcessorSelect from './parameters/ParamControlAdapterProcessorSelect'; +import ParamControlAdapterResizeMode from './parameters/ParamControlAdapterResizeMode'; -const ControlNet = (props: { id: string }) => { +const ControlAdapterConfig = (props: { id: string }) => { const { id } = props; const controlAdapterType = useControlAdapterType(id); const dispatch = useAppDispatch(); @@ -90,7 +90,7 @@ const ControlNet = (props: { id: string }) => { transitionDuration: '0.1s', }} > - + {activeTabName === 'unifiedCanvas' && ( @@ -160,8 +160,8 @@ const ControlNet = (props: { id: string }) => { justifyContent: 'space-between', }} > - - + + {!isExpanded && ( { aspectRatio: '1/1', }} > - + )} - - + + - + {isExpanded && ( <> - - - + + + )} ); }; -export default memo(ControlNet); +export default memo(ControlAdapterConfig); diff --git a/invokeai/frontend/web/src/features/controlNet/components/ControlNetImagePreview.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/ControlAdapterImagePreview.tsx similarity index 98% rename from invokeai/frontend/web/src/features/controlNet/components/ControlNetImagePreview.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/ControlAdapterImagePreview.tsx index aadfb0c3ac..3179e50d47 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/ControlNetImagePreview.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/ControlAdapterImagePreview.tsx @@ -47,7 +47,7 @@ const selector = createSelector( defaultSelectorOptions ); -const ControlNetImagePreview = ({ isSmall, id }: Props) => { +const ControlAdapterImagePreview = ({ isSmall, id }: Props) => { const controlImageName = useControlAdapterControlImage(id); const processedControlImageName = useControlAdapterProcessedControlImage(id); const processorType = useControlAdapterProcessorType(id); @@ -247,4 +247,4 @@ const ControlNetImagePreview = ({ isSmall, id }: Props) => { ); }; -export default memo(ControlNetImagePreview); +export default memo(ControlAdapterImagePreview); diff --git a/invokeai/frontend/web/src/features/controlNet/components/ControlNetPreprocessButton.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/ControlAdapterPreprocessButton.tsx similarity index 88% rename from invokeai/frontend/web/src/features/controlNet/components/ControlNetPreprocessButton.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/ControlAdapterPreprocessButton.tsx index 89d18e7b62..44a34dcd46 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/ControlNetPreprocessButton.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/ControlAdapterPreprocessButton.tsx @@ -9,7 +9,7 @@ type Props = { id: string; }; -const ControlNetPreprocessButton = ({ id }: Props) => { +const ControlAdapterPreprocessButton = ({ id }: Props) => { const controlImage = useControlAdapterControlImage(id); const dispatch = useAppDispatch(); const isReady = useIsReadyToEnqueue(); @@ -33,4 +33,4 @@ const ControlNetPreprocessButton = ({ id }: Props) => { ); }; -export default memo(ControlNetPreprocessButton); +export default memo(ControlAdapterPreprocessButton); diff --git a/invokeai/frontend/web/src/features/controlNet/components/ControlNetProcessorComponent.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/ControlAdapterProcessorComponent.tsx similarity index 97% rename from invokeai/frontend/web/src/features/controlNet/components/ControlNetProcessorComponent.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/ControlAdapterProcessorComponent.tsx index b96464a838..285c6014f5 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/ControlNetProcessorComponent.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/ControlAdapterProcessorComponent.tsx @@ -19,7 +19,7 @@ export type Props = { id: string; }; -const ControlNetProcessorComponent = ({ id }: Props) => { +const ControlAdapterProcessorComponent = ({ id }: Props) => { const isEnabled = useControlAdapterIsEnabled(id); const processorNode = useControlAdapterProcessorNode(id); @@ -160,4 +160,4 @@ const ControlNetProcessorComponent = ({ id }: Props) => { return null; }; -export default memo(ControlNetProcessorComponent); +export default memo(ControlAdapterProcessorComponent); diff --git a/invokeai/frontend/web/src/features/controlNet/components/ParamControlNetShouldAutoConfig.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/ControlAdapterShouldAutoConfig.tsx similarity index 88% rename from invokeai/frontend/web/src/features/controlNet/components/ParamControlNetShouldAutoConfig.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/ControlAdapterShouldAutoConfig.tsx index 14f496abd0..f905a89f1b 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/ParamControlNetShouldAutoConfig.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/ControlAdapterShouldAutoConfig.tsx @@ -1,6 +1,6 @@ import { useAppDispatch } from 'app/store/storeHooks'; import IAISwitch from 'common/components/IAISwitch'; -import { controlAdapterAutoConfigToggled } from 'features/controlNet/store/controlAdaptersSlice'; +import { controlAdapterAutoConfigToggled } from 'features/controlAdapters/store/controlAdaptersSlice'; import { memo, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { useControlAdapterIsEnabled } from '../hooks/useControlAdapterIsEnabled'; @@ -11,7 +11,7 @@ type Props = { id: string; }; -const ParamControlNetShouldAutoConfig = ({ id }: Props) => { +const ControlAdapterShouldAutoConfig = ({ id }: Props) => { const isEnabled = useControlAdapterIsEnabled(id); const shouldAutoConfig = useControlAdapterShouldAutoConfig(id); const dispatch = useAppDispatch(); @@ -36,4 +36,4 @@ const ParamControlNetShouldAutoConfig = ({ id }: Props) => { ); }; -export default memo(ParamControlNetShouldAutoConfig); +export default memo(ControlAdapterShouldAutoConfig); diff --git a/invokeai/frontend/web/src/features/controlNet/components/hooks/useProcessorNodeChanged.ts b/invokeai/frontend/web/src/features/controlAdapters/components/hooks/useProcessorNodeChanged.ts similarity index 80% rename from invokeai/frontend/web/src/features/controlNet/components/hooks/useProcessorNodeChanged.ts rename to invokeai/frontend/web/src/features/controlAdapters/components/hooks/useProcessorNodeChanged.ts index c0b05957b7..80cde897a2 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/hooks/useProcessorNodeChanged.ts +++ b/invokeai/frontend/web/src/features/controlAdapters/components/hooks/useProcessorNodeChanged.ts @@ -1,6 +1,6 @@ import { useAppDispatch } from 'app/store/storeHooks'; -import { controlAdapterProcessorParamsChanged } from 'features/controlNet/store/controlAdaptersSlice'; -import { ControlAdapterProcessorNode } from 'features/controlNet/store/types'; +import { controlAdapterProcessorParamsChanged } from 'features/controlAdapters/store/controlAdaptersSlice'; +import { ControlAdapterProcessorNode } from 'features/controlAdapters/store/types'; import { useCallback } from 'react'; export const useProcessorNodeChanged = () => { diff --git a/invokeai/frontend/web/src/features/controlNet/components/imports/ControlNetCanvasImageImports.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/imports/ControlNetCanvasImageImports.tsx similarity index 100% rename from invokeai/frontend/web/src/features/controlNet/components/imports/ControlNetCanvasImageImports.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/imports/ControlNetCanvasImageImports.tsx diff --git a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetBeginEnd.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/parameters/ParamControlAdapterBeginEnd.tsx similarity index 90% rename from invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetBeginEnd.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/parameters/ParamControlAdapterBeginEnd.tsx index b46f8496a0..eada86609e 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetBeginEnd.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/parameters/ParamControlAdapterBeginEnd.tsx @@ -11,12 +11,12 @@ import { } from '@chakra-ui/react'; import { useAppDispatch } from 'app/store/storeHooks'; import IAIInformationalPopover from 'common/components/IAIInformationalPopover/IAIInformationalPopover'; -import { useControlAdapterBeginEndStepPct } from 'features/controlNet/hooks/useControlAdapterBeginEndStepPct'; -import { useControlAdapterIsEnabled } from 'features/controlNet/hooks/useControlAdapterIsEnabled'; +import { useControlAdapterBeginEndStepPct } from 'features/controlAdapters/hooks/useControlAdapterBeginEndStepPct'; +import { useControlAdapterIsEnabled } from 'features/controlAdapters/hooks/useControlAdapterIsEnabled'; import { controlAdapterBeginStepPctChanged, controlAdapterEndStepPctChanged, -} from 'features/controlNet/store/controlAdaptersSlice'; +} from 'features/controlAdapters/store/controlAdaptersSlice'; import { memo, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; @@ -26,7 +26,7 @@ type Props = { const formatPct = (v: number) => `${Math.round(v * 100)}%`; -const ParamControlNetBeginEnd = ({ id }: Props) => { +const ParamControlAdapterBeginEnd = ({ id }: Props) => { const isEnabled = useControlAdapterIsEnabled(id); const stepPcts = useControlAdapterBeginEndStepPct(id); const dispatch = useAppDispatch(); @@ -120,4 +120,4 @@ const ParamControlNetBeginEnd = ({ id }: Props) => { ); }; -export default memo(ParamControlNetBeginEnd); +export default memo(ParamControlAdapterBeginEnd); diff --git a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetControlMode.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/parameters/ParamControlAdapterControlMode.tsx similarity index 78% rename from invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetControlMode.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/parameters/ParamControlAdapterControlMode.tsx index 7565e31071..b1099f30c0 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetControlMode.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/parameters/ParamControlAdapterControlMode.tsx @@ -1,10 +1,10 @@ import { useAppDispatch } from 'app/store/storeHooks'; import IAIInformationalPopover from 'common/components/IAIInformationalPopover/IAIInformationalPopover'; import IAIMantineSelect from 'common/components/IAIMantineSelect'; -import { useControlAdapterControlMode } from 'features/controlNet/hooks/useControlAdapterControlMode'; -import { useControlAdapterIsEnabled } from 'features/controlNet/hooks/useControlAdapterIsEnabled'; -import { controlAdapterControlModeChanged } from 'features/controlNet/store/controlAdaptersSlice'; -import { ControlMode } from 'features/controlNet/store/types'; +import { useControlAdapterControlMode } from 'features/controlAdapters/hooks/useControlAdapterControlMode'; +import { useControlAdapterIsEnabled } from 'features/controlAdapters/hooks/useControlAdapterIsEnabled'; +import { controlAdapterControlModeChanged } from 'features/controlAdapters/store/controlAdaptersSlice'; +import { ControlMode } from 'features/controlAdapters/store/types'; import { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; @@ -12,7 +12,7 @@ type Props = { id: string; }; -export default function ParamControlNetControlMode({ id }: Props) { +export default function ParamControlAdapterControlMode({ id }: Props) { const isEnabled = useControlAdapterIsEnabled(id); const controlMode = useControlAdapterControlMode(id); const dispatch = useAppDispatch(); diff --git a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetModel.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/parameters/ParamControlAdapterModel.tsx similarity index 81% rename from invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetModel.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/parameters/ParamControlAdapterModel.tsx index 92533cee0e..38756c8da7 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetModel.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/parameters/ParamControlAdapterModel.tsx @@ -4,17 +4,17 @@ import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions'; import IAIMantineSearchableSelect from 'common/components/IAIMantineSearchableSelect'; import IAIMantineSelectItemWithTooltip from 'common/components/IAIMantineSelectItemWithTooltip'; -import { useControlAdapterIsEnabled } from 'features/controlNet/hooks/useControlAdapterIsEnabled'; -import { useControlAdapterModel } from 'features/controlNet/hooks/useControlAdapterModel'; -import { useControlAdapterModels } from 'features/controlNet/hooks/useControlAdapterModels'; -import { useControlAdapterType } from 'features/controlNet/hooks/useControlAdapterType'; -import { controlAdapterModelChanged } from 'features/controlNet/store/controlAdaptersSlice'; +import { useControlAdapterIsEnabled } from 'features/controlAdapters/hooks/useControlAdapterIsEnabled'; +import { useControlAdapterModel } from 'features/controlAdapters/hooks/useControlAdapterModel'; +import { useControlAdapterModels } from 'features/controlAdapters/hooks/useControlAdapterModels'; +import { useControlAdapterType } from 'features/controlAdapters/hooks/useControlAdapterType'; +import { controlAdapterModelChanged } from 'features/controlAdapters/store/controlAdaptersSlice'; import { MODEL_TYPE_MAP } from 'features/parameters/types/constants'; import { modelIdToControlNetModelParam } from 'features/parameters/util/modelIdToControlNetModelParam'; import { memo, useCallback, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; -type ParamControlNetModelProps = { +type ParamControlAdapterModelProps = { id: string; }; @@ -27,7 +27,7 @@ const selector = createSelector( defaultSelectorOptions ); -const ParamControlNetModel = ({ id }: ParamControlNetModelProps) => { +const ParamControlAdapterModel = ({ id }: ParamControlAdapterModelProps) => { const isEnabled = useControlAdapterIsEnabled(id); const controlAdapterType = useControlAdapterType(id); const model = useControlAdapterModel(id); @@ -80,12 +80,11 @@ const ParamControlNetModel = ({ id }: ParamControlNetModelProps) => { // grab the full model entity from the RTK Query cache const selectedModel = useMemo( () => - models?.find( + models.find( (m) => m?.id === `${model?.base_model}/${controlAdapterType}/${model?.model_name}` - // (m) => m?.id === `${model?.base_model}/controlnet/${model?.model_name}` - ) ?? null, + ), [controlAdapterType, model?.base_model, model?.model_name, models] ); @@ -122,4 +121,4 @@ const ParamControlNetModel = ({ id }: ParamControlNetModelProps) => { ); }; -export default memo(ParamControlNetModel); +export default memo(ParamControlAdapterModel); diff --git a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetProcessorSelect.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/parameters/ParamControlAdapterProcessorSelect.tsx similarity index 89% rename from invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetProcessorSelect.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/parameters/ParamControlAdapterProcessorSelect.tsx index 6167da7c24..5c63443865 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetProcessorSelect.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/parameters/ParamControlAdapterProcessorSelect.tsx @@ -5,8 +5,8 @@ import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions'; import IAIMantineSearchableSelect, { IAISelectDataType, } from 'common/components/IAIMantineSearchableSelect'; -import { useControlAdapterIsEnabled } from 'features/controlNet/hooks/useControlAdapterIsEnabled'; -import { useControlAdapterProcessorNode } from 'features/controlNet/hooks/useControlAdapterProcessorNode'; +import { useControlAdapterIsEnabled } from 'features/controlAdapters/hooks/useControlAdapterIsEnabled'; +import { useControlAdapterProcessorNode } from 'features/controlAdapters/hooks/useControlAdapterProcessorNode'; import { configSelector } from 'features/system/store/configSelectors'; import { map } from 'lodash-es'; import { memo, useCallback } from 'react'; @@ -49,7 +49,7 @@ const selector = createSelector( defaultSelectorOptions ); -const ParamControlNetProcessorSelect = ({ id }: Props) => { +const ParamControlAdapterProcessorSelect = ({ id }: Props) => { const isEnabled = useControlAdapterIsEnabled(id); const processorNode = useControlAdapterProcessorNode(id); const dispatch = useAppDispatch(); @@ -83,4 +83,4 @@ const ParamControlNetProcessorSelect = ({ id }: Props) => { ); }; -export default memo(ParamControlNetProcessorSelect); +export default memo(ParamControlAdapterProcessorSelect); diff --git a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetResizeMode.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/parameters/ParamControlAdapterResizeMode.tsx similarity index 77% rename from invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetResizeMode.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/parameters/ParamControlAdapterResizeMode.tsx index 96c66ff08b..ad5d25ec28 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetResizeMode.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/parameters/ParamControlAdapterResizeMode.tsx @@ -1,10 +1,10 @@ import { useAppDispatch } from 'app/store/storeHooks'; import IAIInformationalPopover from 'common/components/IAIInformationalPopover/IAIInformationalPopover'; import IAIMantineSelect from 'common/components/IAIMantineSelect'; -import { useControlAdapterIsEnabled } from 'features/controlNet/hooks/useControlAdapterIsEnabled'; -import { useControlAdapterResizeMode } from 'features/controlNet/hooks/useControlAdapterResizeMode'; -import { controlAdapterResizeModeChanged } from 'features/controlNet/store/controlAdaptersSlice'; -import { ResizeMode } from 'features/controlNet/store/types'; +import { useControlAdapterIsEnabled } from 'features/controlAdapters/hooks/useControlAdapterIsEnabled'; +import { useControlAdapterResizeMode } from 'features/controlAdapters/hooks/useControlAdapterResizeMode'; +import { controlAdapterResizeModeChanged } from 'features/controlAdapters/store/controlAdaptersSlice'; +import { ResizeMode } from 'features/controlAdapters/store/types'; import { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; @@ -12,7 +12,7 @@ type Props = { id: string; }; -export default function ParamControlNetResizeMode({ id }: Props) { +export default function ParamControlAdapterResizeMode({ id }: Props) { const isEnabled = useControlAdapterIsEnabled(id); const resizeMode = useControlAdapterResizeMode(id); const dispatch = useAppDispatch(); diff --git a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetWeight.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/parameters/ParamControlAdapterWeight.tsx similarity index 70% rename from invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetWeight.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/parameters/ParamControlAdapterWeight.tsx index d2f2ac6a86..9102a6ad3d 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetWeight.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/parameters/ParamControlAdapterWeight.tsx @@ -1,18 +1,18 @@ import { useAppDispatch } from 'app/store/storeHooks'; import IAIInformationalPopover from 'common/components/IAIInformationalPopover/IAIInformationalPopover'; import IAISlider from 'common/components/IAISlider'; -import { useControlAdapterIsEnabled } from 'features/controlNet/hooks/useControlAdapterIsEnabled'; -import { useControlAdapterWeight } from 'features/controlNet/hooks/useControlAdapterWeight'; -import { controlAdapterWeightChanged } from 'features/controlNet/store/controlAdaptersSlice'; +import { useControlAdapterIsEnabled } from 'features/controlAdapters/hooks/useControlAdapterIsEnabled'; +import { useControlAdapterWeight } from 'features/controlAdapters/hooks/useControlAdapterWeight'; +import { controlAdapterWeightChanged } from 'features/controlAdapters/store/controlAdaptersSlice'; import { isNil } from 'lodash-es'; import { memo, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; -type ParamControlNetWeightProps = { +type ParamControlAdapterWeightProps = { id: string; }; -const ParamControlNetWeight = ({ id }: ParamControlNetWeightProps) => { +const ParamControlAdapterWeight = ({ id }: ParamControlAdapterWeightProps) => { const isEnabled = useControlAdapterIsEnabled(id); const weight = useControlAdapterWeight(id); const dispatch = useAppDispatch(); @@ -46,4 +46,4 @@ const ParamControlNetWeight = ({ id }: ParamControlNetWeightProps) => { ); }; -export default memo(ParamControlNetWeight); +export default memo(ParamControlAdapterWeight); diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/CannyProcessor.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/processors/CannyProcessor.tsx similarity index 95% rename from invokeai/frontend/web/src/features/controlNet/components/processors/CannyProcessor.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/processors/CannyProcessor.tsx index f4813c0957..a8ebc8830e 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/CannyProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/processors/CannyProcessor.tsx @@ -1,6 +1,6 @@ import IAISlider from 'common/components/IAISlider'; -import { CONTROLNET_PROCESSORS } from 'features/controlNet/store/constants'; -import { RequiredCannyImageProcessorInvocation } from 'features/controlNet/store/types'; +import { CONTROLNET_PROCESSORS } from 'features/controlAdapters/store/constants'; +import { RequiredCannyImageProcessorInvocation } from 'features/controlAdapters/store/types'; import { memo, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { useProcessorNodeChanged } from '../hooks/useProcessorNodeChanged'; diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/ColorMapProcessor.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/processors/ColorMapProcessor.tsx similarity index 93% rename from invokeai/frontend/web/src/features/controlNet/components/processors/ColorMapProcessor.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/processors/ColorMapProcessor.tsx index 9c3d1c8a43..1085a0201b 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/ColorMapProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/processors/ColorMapProcessor.tsx @@ -1,6 +1,6 @@ import IAISlider from 'common/components/IAISlider'; -import { CONTROLNET_PROCESSORS } from 'features/controlNet/store/constants'; -import { RequiredColorMapImageProcessorInvocation } from 'features/controlNet/store/types'; +import { CONTROLNET_PROCESSORS } from 'features/controlAdapters/store/constants'; +import { RequiredColorMapImageProcessorInvocation } from 'features/controlAdapters/store/types'; import { memo, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { useProcessorNodeChanged } from '../hooks/useProcessorNodeChanged'; diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/ContentShuffleProcessor.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/processors/ContentShuffleProcessor.tsx similarity index 97% rename from invokeai/frontend/web/src/features/controlNet/components/processors/ContentShuffleProcessor.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/processors/ContentShuffleProcessor.tsx index efc943e800..fb3c106159 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/ContentShuffleProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/processors/ContentShuffleProcessor.tsx @@ -1,6 +1,6 @@ import IAISlider from 'common/components/IAISlider'; -import { CONTROLNET_PROCESSORS } from 'features/controlNet/store/constants'; -import { RequiredContentShuffleImageProcessorInvocation } from 'features/controlNet/store/types'; +import { CONTROLNET_PROCESSORS } from 'features/controlAdapters/store/constants'; +import { RequiredContentShuffleImageProcessorInvocation } from 'features/controlAdapters/store/types'; import { memo, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { useProcessorNodeChanged } from '../hooks/useProcessorNodeChanged'; diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/HedProcessor.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/processors/HedProcessor.tsx similarity index 96% rename from invokeai/frontend/web/src/features/controlNet/components/processors/HedProcessor.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/processors/HedProcessor.tsx index ab8de7b2e0..2dad199358 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/HedProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/processors/HedProcessor.tsx @@ -1,7 +1,7 @@ import IAISlider from 'common/components/IAISlider'; import IAISwitch from 'common/components/IAISwitch'; -import { CONTROLNET_PROCESSORS } from 'features/controlNet/store/constants'; -import { RequiredHedImageProcessorInvocation } from 'features/controlNet/store/types'; +import { CONTROLNET_PROCESSORS } from 'features/controlAdapters/store/constants'; +import { RequiredHedImageProcessorInvocation } from 'features/controlAdapters/store/types'; import { ChangeEvent, memo, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { useProcessorNodeChanged } from '../hooks/useProcessorNodeChanged'; diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/LineartAnimeProcessor.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/processors/LineartAnimeProcessor.tsx similarity index 95% rename from invokeai/frontend/web/src/features/controlNet/components/processors/LineartAnimeProcessor.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/processors/LineartAnimeProcessor.tsx index f7970fda75..2e37dc8074 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/LineartAnimeProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/processors/LineartAnimeProcessor.tsx @@ -1,6 +1,6 @@ import IAISlider from 'common/components/IAISlider'; -import { CONTROLNET_PROCESSORS } from 'features/controlNet/store/constants'; -import { RequiredLineartAnimeImageProcessorInvocation } from 'features/controlNet/store/types'; +import { CONTROLNET_PROCESSORS } from 'features/controlAdapters/store/constants'; +import { RequiredLineartAnimeImageProcessorInvocation } from 'features/controlAdapters/store/types'; import { memo, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { useProcessorNodeChanged } from '../hooks/useProcessorNodeChanged'; diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/LineartProcessor.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/processors/LineartProcessor.tsx similarity index 96% rename from invokeai/frontend/web/src/features/controlNet/components/processors/LineartProcessor.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/processors/LineartProcessor.tsx index 4879857a64..7e43872a69 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/LineartProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/processors/LineartProcessor.tsx @@ -1,7 +1,7 @@ import IAISlider from 'common/components/IAISlider'; import IAISwitch from 'common/components/IAISwitch'; -import { CONTROLNET_PROCESSORS } from 'features/controlNet/store/constants'; -import { RequiredLineartImageProcessorInvocation } from 'features/controlNet/store/types'; +import { CONTROLNET_PROCESSORS } from 'features/controlAdapters/store/constants'; +import { RequiredLineartImageProcessorInvocation } from 'features/controlAdapters/store/types'; import { ChangeEvent, memo, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { useProcessorNodeChanged } from '../hooks/useProcessorNodeChanged'; diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/MediapipeFaceProcessor.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/processors/MediapipeFaceProcessor.tsx similarity index 95% rename from invokeai/frontend/web/src/features/controlNet/components/processors/MediapipeFaceProcessor.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/processors/MediapipeFaceProcessor.tsx index d1b92a3b4f..416f1b2e19 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/MediapipeFaceProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/processors/MediapipeFaceProcessor.tsx @@ -1,6 +1,6 @@ import IAISlider from 'common/components/IAISlider'; -import { CONTROLNET_PROCESSORS } from 'features/controlNet/store/constants'; -import { RequiredMediapipeFaceProcessorInvocation } from 'features/controlNet/store/types'; +import { CONTROLNET_PROCESSORS } from 'features/controlAdapters/store/constants'; +import { RequiredMediapipeFaceProcessorInvocation } from 'features/controlAdapters/store/types'; import { memo, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { useProcessorNodeChanged } from '../hooks/useProcessorNodeChanged'; diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/MidasDepthProcessor.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/processors/MidasDepthProcessor.tsx similarity index 94% rename from invokeai/frontend/web/src/features/controlNet/components/processors/MidasDepthProcessor.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/processors/MidasDepthProcessor.tsx index 893e459875..eed0abbddf 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/MidasDepthProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/processors/MidasDepthProcessor.tsx @@ -1,6 +1,6 @@ import IAISlider from 'common/components/IAISlider'; -import { CONTROLNET_PROCESSORS } from 'features/controlNet/store/constants'; -import { RequiredMidasDepthImageProcessorInvocation } from 'features/controlNet/store/types'; +import { CONTROLNET_PROCESSORS } from 'features/controlAdapters/store/constants'; +import { RequiredMidasDepthImageProcessorInvocation } from 'features/controlAdapters/store/types'; import { memo, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { useProcessorNodeChanged } from '../hooks/useProcessorNodeChanged'; diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/MlsdImageProcessor.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/processors/MlsdImageProcessor.tsx similarity index 97% rename from invokeai/frontend/web/src/features/controlNet/components/processors/MlsdImageProcessor.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/processors/MlsdImageProcessor.tsx index c97c803021..eb3bd66736 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/MlsdImageProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/processors/MlsdImageProcessor.tsx @@ -1,6 +1,6 @@ import IAISlider from 'common/components/IAISlider'; -import { CONTROLNET_PROCESSORS } from 'features/controlNet/store/constants'; -import { RequiredMlsdImageProcessorInvocation } from 'features/controlNet/store/types'; +import { CONTROLNET_PROCESSORS } from 'features/controlAdapters/store/constants'; +import { RequiredMlsdImageProcessorInvocation } from 'features/controlAdapters/store/types'; import { memo, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { useProcessorNodeChanged } from '../hooks/useProcessorNodeChanged'; diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/NormalBaeProcessor.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/processors/NormalBaeProcessor.tsx similarity index 95% rename from invokeai/frontend/web/src/features/controlNet/components/processors/NormalBaeProcessor.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/processors/NormalBaeProcessor.tsx index a0c15374a8..302c0563bb 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/NormalBaeProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/processors/NormalBaeProcessor.tsx @@ -1,6 +1,6 @@ import IAISlider from 'common/components/IAISlider'; -import { CONTROLNET_PROCESSORS } from 'features/controlNet/store/constants'; -import { RequiredNormalbaeImageProcessorInvocation } from 'features/controlNet/store/types'; +import { CONTROLNET_PROCESSORS } from 'features/controlAdapters/store/constants'; +import { RequiredNormalbaeImageProcessorInvocation } from 'features/controlAdapters/store/types'; import { memo, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { useProcessorNodeChanged } from '../hooks/useProcessorNodeChanged'; diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/OpenposeProcessor.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/processors/OpenposeProcessor.tsx similarity index 96% rename from invokeai/frontend/web/src/features/controlNet/components/processors/OpenposeProcessor.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/processors/OpenposeProcessor.tsx index 904078ff6d..a71e8973a9 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/OpenposeProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/processors/OpenposeProcessor.tsx @@ -1,7 +1,7 @@ import IAISlider from 'common/components/IAISlider'; import IAISwitch from 'common/components/IAISwitch'; -import { CONTROLNET_PROCESSORS } from 'features/controlNet/store/constants'; -import { RequiredOpenposeImageProcessorInvocation } from 'features/controlNet/store/types'; +import { CONTROLNET_PROCESSORS } from 'features/controlAdapters/store/constants'; +import { RequiredOpenposeImageProcessorInvocation } from 'features/controlAdapters/store/types'; import { ChangeEvent, memo, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { useProcessorNodeChanged } from '../hooks/useProcessorNodeChanged'; diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/PidiProcessor.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/processors/PidiProcessor.tsx similarity index 96% rename from invokeai/frontend/web/src/features/controlNet/components/processors/PidiProcessor.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/processors/PidiProcessor.tsx index 50065d66d0..4b0f24cb7e 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/PidiProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/processors/PidiProcessor.tsx @@ -1,7 +1,7 @@ import IAISlider from 'common/components/IAISlider'; import IAISwitch from 'common/components/IAISwitch'; -import { CONTROLNET_PROCESSORS } from 'features/controlNet/store/constants'; -import { RequiredPidiImageProcessorInvocation } from 'features/controlNet/store/types'; +import { CONTROLNET_PROCESSORS } from 'features/controlAdapters/store/constants'; +import { RequiredPidiImageProcessorInvocation } from 'features/controlAdapters/store/types'; import { ChangeEvent, memo, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { useProcessorNodeChanged } from '../hooks/useProcessorNodeChanged'; diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/ZoeDepthProcessor.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/processors/ZoeDepthProcessor.tsx similarity index 91% rename from invokeai/frontend/web/src/features/controlNet/components/processors/ZoeDepthProcessor.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/processors/ZoeDepthProcessor.tsx index 1842f39e45..7e069e67cb 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/processors/ZoeDepthProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/processors/ZoeDepthProcessor.tsx @@ -1,4 +1,4 @@ -import { RequiredZoeDepthImageProcessorInvocation } from 'features/controlNet/store/types'; +import { RequiredZoeDepthImageProcessorInvocation } from 'features/controlAdapters/store/types'; import { memo } from 'react'; type Props = { diff --git a/invokeai/frontend/web/src/features/controlNet/components/processors/common/ProcessorWrapper.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/processors/common/ProcessorWrapper.tsx similarity index 100% rename from invokeai/frontend/web/src/features/controlNet/components/processors/common/ProcessorWrapper.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/processors/common/ProcessorWrapper.tsx diff --git a/invokeai/frontend/web/src/features/controlNet/hooks/useAddControlNet.ts b/invokeai/frontend/web/src/features/controlAdapters/hooks/useAddControlNet.ts similarity index 92% rename from invokeai/frontend/web/src/features/controlNet/hooks/useAddControlNet.ts rename to invokeai/frontend/web/src/features/controlAdapters/hooks/useAddControlNet.ts index 6d769f53cc..16eff19270 100644 --- a/invokeai/frontend/web/src/features/controlNet/hooks/useAddControlNet.ts +++ b/invokeai/frontend/web/src/features/controlAdapters/hooks/useAddControlNet.ts @@ -1,5 +1,5 @@ import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; -import { controlAdapterAdded } from 'features/controlNet/store/controlAdaptersSlice'; +import { controlAdapterAdded } from 'features/controlAdapters/store/controlAdaptersSlice'; import { useCallback, useMemo } from 'react'; import { controlNetModelsAdapter, diff --git a/invokeai/frontend/web/src/features/controlNet/hooks/useAddIPAdapter.ts b/invokeai/frontend/web/src/features/controlAdapters/hooks/useAddIPAdapter.ts similarity index 96% rename from invokeai/frontend/web/src/features/controlNet/hooks/useAddIPAdapter.ts rename to invokeai/frontend/web/src/features/controlAdapters/hooks/useAddIPAdapter.ts index 67d788253a..af212675d3 100644 --- a/invokeai/frontend/web/src/features/controlNet/hooks/useAddIPAdapter.ts +++ b/invokeai/frontend/web/src/features/controlAdapters/hooks/useAddIPAdapter.ts @@ -5,7 +5,7 @@ import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions'; import { controlAdapterAdded, selectAllIPAdapters, -} from 'features/controlNet/store/controlAdaptersSlice'; +} from 'features/controlAdapters/store/controlAdaptersSlice'; import { useCallback, useMemo } from 'react'; import { ipAdapterModelsAdapter, diff --git a/invokeai/frontend/web/src/features/controlNet/hooks/useAddT2IAdapter.ts b/invokeai/frontend/web/src/features/controlAdapters/hooks/useAddT2IAdapter.ts similarity index 92% rename from invokeai/frontend/web/src/features/controlNet/hooks/useAddT2IAdapter.ts rename to invokeai/frontend/web/src/features/controlAdapters/hooks/useAddT2IAdapter.ts index 7a9afe6ad3..dd01c8f740 100644 --- a/invokeai/frontend/web/src/features/controlNet/hooks/useAddT2IAdapter.ts +++ b/invokeai/frontend/web/src/features/controlAdapters/hooks/useAddT2IAdapter.ts @@ -1,5 +1,5 @@ import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; -import { controlAdapterAdded } from 'features/controlNet/store/controlAdaptersSlice'; +import { controlAdapterAdded } from 'features/controlAdapters/store/controlAdaptersSlice'; import { useCallback, useMemo } from 'react'; import { t2iAdapterModelsAdapter, diff --git a/invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapter.ts b/invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapter.ts similarity index 100% rename from invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapter.ts rename to invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapter.ts diff --git a/invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterBeginEndStepPct.ts b/invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterBeginEndStepPct.ts similarity index 100% rename from invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterBeginEndStepPct.ts rename to invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterBeginEndStepPct.ts diff --git a/invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterControlImage.ts b/invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterControlImage.ts similarity index 100% rename from invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterControlImage.ts rename to invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterControlImage.ts diff --git a/invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterControlMode.ts b/invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterControlMode.ts similarity index 100% rename from invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterControlMode.ts rename to invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterControlMode.ts diff --git a/invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterIsEnabled.ts b/invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterIsEnabled.ts similarity index 100% rename from invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterIsEnabled.ts rename to invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterIsEnabled.ts diff --git a/invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterModel.ts b/invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterModel.ts similarity index 100% rename from invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterModel.ts rename to invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterModel.ts diff --git a/invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterModels.ts b/invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterModels.ts similarity index 98% rename from invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterModels.ts rename to invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterModels.ts index 8c85df5d06..94ae1e37c2 100644 --- a/invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterModels.ts +++ b/invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterModels.ts @@ -18,6 +18,7 @@ export const useControlAdapterModels = (type?: ControlAdapterType) => { : [], [controlNetModelsData] ); + const { data: t2iAdapterModelsData } = useGetT2IAdapterModelsQuery(); const t2iAdapterModels = useMemo( () => @@ -44,5 +45,5 @@ export const useControlAdapterModels = (type?: ControlAdapterType) => { if (type === 'ip_adapter') { return ipAdapterModels; } - return; + return []; }; diff --git a/invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterProcessedControlImage.ts b/invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterProcessedControlImage.ts similarity index 100% rename from invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterProcessedControlImage.ts rename to invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterProcessedControlImage.ts diff --git a/invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterProcessorNode.ts b/invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterProcessorNode.ts similarity index 100% rename from invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterProcessorNode.ts rename to invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterProcessorNode.ts diff --git a/invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterProcessorType.ts b/invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterProcessorType.ts similarity index 100% rename from invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterProcessorType.ts rename to invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterProcessorType.ts diff --git a/invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterResizeMode.ts b/invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterResizeMode.ts similarity index 100% rename from invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterResizeMode.ts rename to invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterResizeMode.ts diff --git a/invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterShouldAutoConfig.ts b/invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterShouldAutoConfig.ts similarity index 100% rename from invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterShouldAutoConfig.ts rename to invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterShouldAutoConfig.ts diff --git a/invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterType.ts b/invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterType.ts similarity index 100% rename from invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterType.ts rename to invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterType.ts diff --git a/invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterWeight.ts b/invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterWeight.ts similarity index 100% rename from invokeai/frontend/web/src/features/controlNet/hooks/useControlAdapterWeight.ts rename to invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapterWeight.ts diff --git a/invokeai/frontend/web/src/features/controlNet/store/actions.ts b/invokeai/frontend/web/src/features/controlAdapters/store/actions.ts similarity index 100% rename from invokeai/frontend/web/src/features/controlNet/store/actions.ts rename to invokeai/frontend/web/src/features/controlAdapters/store/actions.ts diff --git a/invokeai/frontend/web/src/features/controlNet/store/constants.ts b/invokeai/frontend/web/src/features/controlAdapters/store/constants.ts similarity index 100% rename from invokeai/frontend/web/src/features/controlNet/store/constants.ts rename to invokeai/frontend/web/src/features/controlAdapters/store/constants.ts diff --git a/invokeai/frontend/web/src/features/controlNet/store/controlAdaptersPersistDenylist.ts b/invokeai/frontend/web/src/features/controlAdapters/store/controlAdaptersPersistDenylist.ts similarity index 100% rename from invokeai/frontend/web/src/features/controlNet/store/controlAdaptersPersistDenylist.ts rename to invokeai/frontend/web/src/features/controlAdapters/store/controlAdaptersPersistDenylist.ts diff --git a/invokeai/frontend/web/src/features/controlNet/store/controlAdaptersSlice.ts b/invokeai/frontend/web/src/features/controlAdapters/store/controlAdaptersSlice.ts similarity index 100% rename from invokeai/frontend/web/src/features/controlNet/store/controlAdaptersSlice.ts rename to invokeai/frontend/web/src/features/controlAdapters/store/controlAdaptersSlice.ts diff --git a/invokeai/frontend/web/src/features/controlNet/store/types.ts b/invokeai/frontend/web/src/features/controlAdapters/store/types.ts similarity index 99% rename from invokeai/frontend/web/src/features/controlNet/store/types.ts rename to invokeai/frontend/web/src/features/controlAdapters/store/types.ts index 9056e55bb1..0367695211 100644 --- a/invokeai/frontend/web/src/features/controlNet/store/types.ts +++ b/invokeai/frontend/web/src/features/controlAdapters/store/types.ts @@ -19,7 +19,6 @@ import { NormalbaeImageProcessorInvocation, OpenposeImageProcessorInvocation, PidiImageProcessorInvocation, - T2IAdapterModelConfig, ZoeDepthImageProcessorInvocation, } from 'services/api/types'; import { O } from 'ts-toolbelt'; diff --git a/invokeai/frontend/web/src/features/controlNet/util/buildControlAdapter.ts b/invokeai/frontend/web/src/features/controlAdapters/util/buildControlAdapter.ts similarity index 100% rename from invokeai/frontend/web/src/features/controlNet/util/buildControlAdapter.ts rename to invokeai/frontend/web/src/features/controlAdapters/util/buildControlAdapter.ts diff --git a/invokeai/frontend/web/src/features/controlNet/components/ipAdapter/IPAdapterPanel.tsx b/invokeai/frontend/web/src/features/controlNet/components/ipAdapter/IPAdapterPanel.tsx deleted file mode 100644 index fa269fefdc..0000000000 --- a/invokeai/frontend/web/src/features/controlNet/components/ipAdapter/IPAdapterPanel.tsx +++ /dev/null @@ -1,65 +0,0 @@ -import { Flex } from '@chakra-ui/react'; -import { memo } from 'react'; -import ParamIPAdapterBeginEnd from './ParamIPAdapterBeginEnd'; -import ParamIPAdapterFeatureToggle from './ParamIPAdapterFeatureToggle'; -import ParamIPAdapterImage from './ParamIPAdapterImage'; -import ParamIPAdapterModelSelect from './ParamIPAdapterModelSelect'; -import ParamIPAdapterWeight from './ParamIPAdapterWeight'; -import { createSelector } from '@reduxjs/toolkit'; -import { stateSelector } from '../../../../app/store/store'; -import { defaultSelectorOptions } from '../../../../app/store/util/defaultMemoizeOptions'; -import { useAppSelector } from '../../../../app/store/storeHooks'; - -const selector = createSelector( - stateSelector, - (state) => { - const { isIPAdapterEnabled } = state.controlNet; - - return { isIPAdapterEnabled }; - }, - defaultSelectorOptions -); - -const IPAdapterPanel = () => { - const { isIPAdapterEnabled } = useAppSelector(selector); - return ( - - - {isIPAdapterEnabled && ( - <> - - - - - - - - - - )} - - ); -}; - -export default memo(IPAdapterPanel); diff --git a/invokeai/frontend/web/src/features/controlNet/components/ipAdapter/ParamIPAdapterBeginEnd.tsx b/invokeai/frontend/web/src/features/controlNet/components/ipAdapter/ParamIPAdapterBeginEnd.tsx deleted file mode 100644 index 5bef23b66c..0000000000 --- a/invokeai/frontend/web/src/features/controlNet/components/ipAdapter/ParamIPAdapterBeginEnd.tsx +++ /dev/null @@ -1,100 +0,0 @@ -import { - FormControl, - FormLabel, - HStack, - RangeSlider, - RangeSliderFilledTrack, - RangeSliderMark, - RangeSliderThumb, - RangeSliderTrack, - Tooltip, -} from '@chakra-ui/react'; -import { RootState } from 'app/store/store'; -import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; -import { - ipAdapterBeginStepPctChanged, - ipAdapterEndStepPctChanged, -} from 'features/controlNet/store/controlNetSlice'; -import { memo, useCallback } from 'react'; -import { useTranslation } from 'react-i18next'; - -const formatPct = (v: number) => `${Math.round(v * 100)}%`; - -const ParamIPAdapterBeginEnd = () => { - const isEnabled = useAppSelector( - (state: RootState) => state.controlNet.isIPAdapterEnabled - ); - const beginStepPct = useAppSelector( - (state: RootState) => state.controlNet.ipAdapterInfo.beginStepPct - ); - const endStepPct = useAppSelector( - (state: RootState) => state.controlNet.ipAdapterInfo.endStepPct - ); - const dispatch = useAppDispatch(); - const { t } = useTranslation(); - - const handleStepPctChanged = useCallback( - (v: number[]) => { - dispatch(ipAdapterBeginStepPctChanged(v[0] as number)); - dispatch(ipAdapterEndStepPctChanged(v[1] as number)); - }, - [dispatch] - ); - - return ( - - {t('controlnet.beginEndStepPercent')} - - - - - - - - - - - - - 0% - - - 50% - - - 100% - - - - - ); -}; - -export default memo(ParamIPAdapterBeginEnd); diff --git a/invokeai/frontend/web/src/features/controlNet/components/ipAdapter/ParamIPAdapterFeatureToggle.tsx b/invokeai/frontend/web/src/features/controlNet/components/ipAdapter/ParamIPAdapterFeatureToggle.tsx deleted file mode 100644 index 7fae538cf0..0000000000 --- a/invokeai/frontend/web/src/features/controlNet/components/ipAdapter/ParamIPAdapterFeatureToggle.tsx +++ /dev/null @@ -1,44 +0,0 @@ -import { createSelector } from '@reduxjs/toolkit'; -import { stateSelector } from 'app/store/store'; -import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; -import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions'; -import IAISwitch from 'common/components/IAISwitch'; -import { isIPAdapterEnabledChanged } from 'features/controlNet/store/controlNetSlice'; -import { ChangeEvent, memo, useCallback } from 'react'; -import { useTranslation } from 'react-i18next'; - -const selector = createSelector( - stateSelector, - (state) => { - const { isIPAdapterEnabled } = state.controlNet; - - return { isIPAdapterEnabled }; - }, - defaultSelectorOptions -); - -const ParamIPAdapterFeatureToggle = () => { - const { isIPAdapterEnabled } = useAppSelector(selector); - const dispatch = useAppDispatch(); - const { t } = useTranslation(); - - const handleChange = useCallback( - (e: ChangeEvent) => { - dispatch(isIPAdapterEnabledChanged(e.target.checked)); - }, - [dispatch] - ); - - return ( - - ); -}; - -export default memo(ParamIPAdapterFeatureToggle); diff --git a/invokeai/frontend/web/src/features/controlNet/components/ipAdapter/ParamIPAdapterImage.tsx b/invokeai/frontend/web/src/features/controlNet/components/ipAdapter/ParamIPAdapterImage.tsx deleted file mode 100644 index b8e3bdbae0..0000000000 --- a/invokeai/frontend/web/src/features/controlNet/components/ipAdapter/ParamIPAdapterImage.tsx +++ /dev/null @@ -1,99 +0,0 @@ -import { Flex } from '@chakra-ui/react'; -import { createSelector } from '@reduxjs/toolkit'; -import { skipToken } from '@reduxjs/toolkit/dist/query'; -import { stateSelector } from 'app/store/store'; -import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; -import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions'; -import IAIDndImage from 'common/components/IAIDndImage'; -import IAIDndImageIcon from 'common/components/IAIDndImageIcon'; -import { IAINoContentFallback } from 'common/components/IAIImageFallback'; -import { ipAdapterImageChanged } from 'features/controlNet/store/controlNetSlice'; -import { - TypesafeDraggableData, - TypesafeDroppableData, -} from 'features/dnd/types'; -import { memo, useMemo } from 'react'; -import { useTranslation } from 'react-i18next'; -import { FaUndo } from 'react-icons/fa'; -import { useGetImageDTOQuery } from 'services/api/endpoints/images'; -import { PostUploadAction } from 'services/api/types'; - -const selector = createSelector( - stateSelector, - ({ controlNet }) => { - const { ipAdapterInfo } = controlNet; - return { ipAdapterInfo }; - }, - defaultSelectorOptions -); - -const ParamIPAdapterImage = () => { - const { ipAdapterInfo } = useAppSelector(selector); - const dispatch = useAppDispatch(); - const { t } = useTranslation(); - - const { currentData: imageDTO } = useGetImageDTOQuery( - ipAdapterInfo.adapterImage ?? skipToken - ); - - const draggableData = useMemo(() => { - if (imageDTO) { - return { - id: 'ip-adapter-image', - payloadType: 'IMAGE_DTO', - payload: { imageDTO }, - }; - } - }, [imageDTO]); - - const droppableData = useMemo( - () => ({ - id: 'ip-adapter-image', - actionType: 'SET_IP_ADAPTER_IMAGE', - }), - [] - ); - - const postUploadAction = useMemo( - () => ({ - type: 'SET_IP_ADAPTER_IMAGE', - }), - [] - ); - - return ( - - - } - /> - - dispatch(ipAdapterImageChanged(null))} - icon={ipAdapterInfo.adapterImage ? : undefined} - tooltip={t('controlnet.resetIPAdapterImage')} - /> - - ); -}; - -export default memo(ParamIPAdapterImage); diff --git a/invokeai/frontend/web/src/features/controlNet/components/ipAdapter/ParamIPAdapterModelSelect.tsx b/invokeai/frontend/web/src/features/controlNet/components/ipAdapter/ParamIPAdapterModelSelect.tsx deleted file mode 100644 index d164cb1208..0000000000 --- a/invokeai/frontend/web/src/features/controlNet/components/ipAdapter/ParamIPAdapterModelSelect.tsx +++ /dev/null @@ -1,105 +0,0 @@ -import { SelectItem } from '@mantine/core'; -import { RootState } from 'app/store/store'; -import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; -import IAIMantineSelect from 'common/components/IAIMantineSelect'; -import { ipAdapterModelChanged } from 'features/controlNet/store/controlNetSlice'; -import { MODEL_TYPE_MAP } from 'features/parameters/types/constants'; -import { modelIdToIPAdapterModelParam } from 'features/parameters/util/modelIdToIPAdapterModelParams'; -import { forEach } from 'lodash-es'; -import { memo, useCallback, useMemo } from 'react'; -import { useTranslation } from 'react-i18next'; -import { useGetIPAdapterModelsQuery } from 'services/api/endpoints/models'; - -const ParamIPAdapterModelSelect = () => { - const isEnabled = useAppSelector( - (state: RootState) => state.controlNet.isIPAdapterEnabled - ); - const ipAdapterModel = useAppSelector( - (state: RootState) => state.controlNet.ipAdapterInfo.model - ); - const model = useAppSelector((state: RootState) => state.generation.model); - - const dispatch = useAppDispatch(); - const { t } = useTranslation(); - - const { data: ipAdapterModels } = useGetIPAdapterModelsQuery(); - - // grab the full model entity from the RTK Query cache - const selectedModel = useMemo( - () => - ipAdapterModels?.entities[ - `${ipAdapterModel?.base_model}/ip_adapter/${ipAdapterModel?.model_name}` - ] ?? null, - [ - ipAdapterModel?.base_model, - ipAdapterModel?.model_name, - ipAdapterModels?.entities, - ] - ); - - const data = useMemo(() => { - if (!ipAdapterModels) { - return []; - } - - const data: SelectItem[] = []; - - forEach(ipAdapterModels.entities, (ipAdapterModel, id) => { - if (!ipAdapterModel) { - return; - } - - const disabled = model?.base_model !== ipAdapterModel.base_model; - - data.push({ - value: id, - label: ipAdapterModel.model_name, - group: MODEL_TYPE_MAP[ipAdapterModel.base_model], - disabled, - tooltip: disabled - ? `Incompatible base model: ${ipAdapterModel.base_model}` - : undefined, - }); - }); - - return data.sort((a, b) => (a.disabled && !b.disabled ? 1 : -1)); - }, [ipAdapterModels, model?.base_model]); - - const handleValueChanged = useCallback( - (v: string | null) => { - if (!v) { - return; - } - - const newIPAdapterModel = modelIdToIPAdapterModelParam(v); - - if (!newIPAdapterModel) { - return; - } - - dispatch(ipAdapterModelChanged(newIPAdapterModel)); - }, - [dispatch] - ); - - return ( - 0 - ? t('models.selectModel') - : t('models.noModelsAvailable') - } - error={!selectedModel && data.length > 0} - data={data} - onChange={handleValueChanged} - sx={{ width: '100%' }} - disabled={!isEnabled || data.length === 0} - /> - ); -}; - -export default memo(ParamIPAdapterModelSelect); diff --git a/invokeai/frontend/web/src/features/controlNet/components/ipAdapter/ParamIPAdapterWeight.tsx b/invokeai/frontend/web/src/features/controlNet/components/ipAdapter/ParamIPAdapterWeight.tsx deleted file mode 100644 index df5a9a36a3..0000000000 --- a/invokeai/frontend/web/src/features/controlNet/components/ipAdapter/ParamIPAdapterWeight.tsx +++ /dev/null @@ -1,46 +0,0 @@ -import { RootState } from 'app/store/store'; -import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; -import IAISlider from 'common/components/IAISlider'; -import { ipAdapterWeightChanged } from 'features/controlNet/store/controlNetSlice'; -import { memo, useCallback } from 'react'; -import { useTranslation } from 'react-i18next'; - -const ParamIPAdapterWeight = () => { - const isIpAdapterEnabled = useAppSelector( - (state: RootState) => state.controlNet.isIPAdapterEnabled - ); - const ipAdapterWeight = useAppSelector( - (state: RootState) => state.controlNet.ipAdapterInfo.weight - ); - const dispatch = useAppDispatch(); - const { t } = useTranslation(); - - const handleWeightChanged = useCallback( - (weight: number) => { - dispatch(ipAdapterWeightChanged(weight)); - }, - [dispatch] - ); - - const handleWeightReset = useCallback(() => { - dispatch(ipAdapterWeightChanged(1)); - }, [dispatch]); - - return ( - - ); -}; - -export default memo(ParamIPAdapterWeight); diff --git a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetFeatureToggle.tsx b/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetFeatureToggle.tsx deleted file mode 100644 index d13c29f500..0000000000 --- a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetFeatureToggle.tsx +++ /dev/null @@ -1,42 +0,0 @@ -import { Box } from '@chakra-ui/react'; -import { createSelector } from '@reduxjs/toolkit'; -import { stateSelector } from 'app/store/store'; -import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; -import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions'; -import IAIInformationalPopover from 'common/components/IAIInformationalPopover/IAIInformationalPopover'; -import IAISwitch from 'common/components/IAISwitch'; -import { isControlNetEnabledToggled } from 'features/controlNet/store/controlNetSlice'; -import { memo, useCallback } from 'react'; - -const selector = createSelector( - stateSelector, - (state) => { - const { isEnabled } = state.controlNet; - - return { isEnabled }; - }, - defaultSelectorOptions -); - -const ParamControlNetFeatureToggle = () => { - const { isEnabled } = useAppSelector(selector); - const dispatch = useAppDispatch(); - - const handleChange = useCallback(() => { - dispatch(isControlNetEnabledToggled()); - }, [dispatch]); - - return ( - - - - - - ); -}; - -export default memo(ParamControlNetFeatureToggle); diff --git a/invokeai/frontend/web/src/features/deleteImageModal/store/selectors.ts b/invokeai/frontend/web/src/features/deleteImageModal/store/selectors.ts index efd66f8cea..d8e68dca21 100644 --- a/invokeai/frontend/web/src/features/deleteImageModal/store/selectors.ts +++ b/invokeai/frontend/web/src/features/deleteImageModal/store/selectors.ts @@ -4,8 +4,8 @@ import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions'; import { isInvocationNode } from 'features/nodes/types/types'; import { some } from 'lodash-es'; import { ImageUsage } from './types'; -import { selectControlAdapterAll } from 'features/controlNet/store/controlAdaptersSlice'; -import { isControlNetOrT2IAdapter } from 'features/controlNet/store/types'; +import { selectControlAdapterAll } from 'features/controlAdapters/store/controlAdaptersSlice'; +import { isControlNetOrT2IAdapter } from 'features/controlAdapters/store/types'; export const getImageUsage = (state: RootState, image_name: string) => { const { generation, canvas, nodes, controlAdapters } = state; diff --git a/invokeai/frontend/web/src/features/nodes/util/graphBuilders/addControlNetToLinearGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graphBuilders/addControlNetToLinearGraph.ts index 8aaa81b59f..c9a9c59de8 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graphBuilders/addControlNetToLinearGraph.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graphBuilders/addControlNetToLinearGraph.ts @@ -1,5 +1,5 @@ import { RootState } from 'app/store/store'; -import { selectValidControlNets } from 'features/controlNet/store/controlAdaptersSlice'; +import { selectValidControlNets } from 'features/controlAdapters/store/controlAdaptersSlice'; import { omit } from 'lodash-es'; import { CollectInvocation, diff --git a/invokeai/frontend/web/src/features/nodes/util/graphBuilders/addIPAdapterToLinearGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graphBuilders/addIPAdapterToLinearGraph.ts index 78c4f23a80..6adb989936 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graphBuilders/addIPAdapterToLinearGraph.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graphBuilders/addIPAdapterToLinearGraph.ts @@ -9,7 +9,7 @@ import { IP_ADAPTER, METADATA_ACCUMULATOR, } from './constants'; -import { selectValidIPAdapters } from 'features/controlNet/store/controlAdaptersSlice'; +import { selectValidIPAdapters } from 'features/controlAdapters/store/controlAdaptersSlice'; export const addIPAdapterToLinearGraph = ( state: RootState, diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/ControlNet/ParamControlNetCollapse.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/ControlAdapters/ParamControlAdaptersCollapse.tsx similarity index 84% rename from invokeai/frontend/web/src/features/parameters/components/Parameters/ControlNet/ParamControlNetCollapse.tsx rename to invokeai/frontend/web/src/features/parameters/components/Parameters/ControlAdapters/ParamControlAdaptersCollapse.tsx index 949f8c7708..a5f0203ace 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Parameters/ControlNet/ParamControlNetCollapse.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/ControlAdapters/ParamControlAdaptersCollapse.tsx @@ -5,16 +5,16 @@ import { useAppSelector } from 'app/store/storeHooks'; import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions'; import IAIButton from 'common/components/IAIButton'; import IAICollapse from 'common/components/IAICollapse'; -import ControlNet from 'features/controlNet/components/ControlNet'; -import { useAddControlNet } from 'features/controlNet/hooks/useAddControlNet'; -import { useAddIPAdapter } from 'features/controlNet/hooks/useAddIPAdapter'; -import { useAddT2IAdapter } from 'features/controlNet/hooks/useAddT2IAdapter'; +import ControlAdapterConfig from 'features/controlAdapters/components/ControlAdapterConfig'; +import { useAddControlNet } from 'features/controlAdapters/hooks/useAddControlNet'; +import { useAddIPAdapter } from 'features/controlAdapters/hooks/useAddIPAdapter'; +import { useAddT2IAdapter } from 'features/controlAdapters/hooks/useAddT2IAdapter'; import { selectAllControlNets, selectAllIPAdapters, selectAllT2IAdapters, selectControlAdapterIds, -} from 'features/controlNet/store/controlAdaptersSlice'; +} from 'features/controlAdapters/store/controlAdaptersSlice'; import { useFeatureStatus } from 'features/system/hooks/useFeatureStatus'; import { Fragment, memo } from 'react'; import { FaPlus } from 'react-icons/fa'; @@ -50,7 +50,7 @@ const selector = createSelector( defaultSelectorOptions ); -const ParamControlNetCollapse = () => { +const ParamControlAdaptersCollapse = () => { const { controlAdapterIds, activeLabel } = useAppSelector(selector); const isControlNetDisabled = useFeatureStatus('controlNet').isFeatureDisabled; const { addControlNet } = useAddControlNet(); @@ -94,7 +94,7 @@ const ParamControlNetCollapse = () => { {controlAdapterIds.map((id, i) => ( {i > 0 && } - + ))} @@ -102,4 +102,4 @@ const ParamControlNetCollapse = () => { ); }; -export default memo(ParamControlNetCollapse); +export default memo(ParamControlAdaptersCollapse); diff --git a/invokeai/frontend/web/src/features/parameters/hooks/useRecallParameters.ts b/invokeai/frontend/web/src/features/parameters/hooks/useRecallParameters.ts index b983e6be37..f69f278ad6 100644 --- a/invokeai/frontend/web/src/features/parameters/hooks/useRecallParameters.ts +++ b/invokeai/frontend/web/src/features/parameters/hooks/useRecallParameters.ts @@ -6,19 +6,19 @@ import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions'; import { CONTROLNET_MODEL_DEFAULT_PROCESSORS, CONTROLNET_PROCESSORS, -} from 'features/controlNet/store/constants'; +} from 'features/controlAdapters/store/constants'; import { controlAdapterRecalled, controlAdaptersReset, -} from 'features/controlNet/store/controlAdaptersSlice'; +} from 'features/controlAdapters/store/controlAdaptersSlice'; import { ControlNetConfig, IPAdapterConfig, -} from 'features/controlNet/store/types'; +} from 'features/controlAdapters/store/types'; import { initialControlNet, initialIPAdapter, -} from 'features/controlNet/util/buildControlAdapter'; +} from 'features/controlAdapters/util/buildControlAdapter'; import { ControlNetMetadataItem, CoreMetadata, diff --git a/invokeai/frontend/web/src/features/sdxl/components/SDXLImageToImageTabParameters.tsx b/invokeai/frontend/web/src/features/sdxl/components/SDXLImageToImageTabParameters.tsx index 5a0d7daf4e..aae31cf110 100644 --- a/invokeai/frontend/web/src/features/sdxl/components/SDXLImageToImageTabParameters.tsx +++ b/invokeai/frontend/web/src/features/sdxl/components/SDXLImageToImageTabParameters.tsx @@ -1,7 +1,7 @@ import ParamDynamicPromptsCollapse from 'features/dynamicPrompts/components/ParamDynamicPromptsCollapse'; import ParamLoraCollapse from 'features/lora/components/ParamLoraCollapse'; import ParamAdvancedCollapse from 'features/parameters/components/Parameters/Advanced/ParamAdvancedCollapse'; -import ParamControlNetCollapse from 'features/parameters/components/Parameters/ControlNet/ParamControlNetCollapse'; +import ParamControlAdaptersCollapse from 'features/parameters/components/Parameters/ControlAdapters/ParamControlAdaptersCollapse'; import { memo } from 'react'; import ParamSDXLPromptArea from './ParamSDXLPromptArea'; import ParamSDXLRefinerCollapse from './ParamSDXLRefinerCollapse'; @@ -13,7 +13,7 @@ const SDXLImageToImageTabParameters = () => { - + diff --git a/invokeai/frontend/web/src/features/sdxl/components/SDXLTextToImageTabParameters.tsx b/invokeai/frontend/web/src/features/sdxl/components/SDXLTextToImageTabParameters.tsx index ab7e8c8a74..874ca22fcc 100644 --- a/invokeai/frontend/web/src/features/sdxl/components/SDXLTextToImageTabParameters.tsx +++ b/invokeai/frontend/web/src/features/sdxl/components/SDXLTextToImageTabParameters.tsx @@ -1,7 +1,7 @@ import ParamDynamicPromptsCollapse from 'features/dynamicPrompts/components/ParamDynamicPromptsCollapse'; import ParamLoraCollapse from 'features/lora/components/ParamLoraCollapse'; import ParamAdvancedCollapse from 'features/parameters/components/Parameters/Advanced/ParamAdvancedCollapse'; -import ParamControlNetCollapse from 'features/parameters/components/Parameters/ControlNet/ParamControlNetCollapse'; +import ParamControlAdaptersCollapse from 'features/parameters/components/Parameters/ControlAdapters/ParamControlAdaptersCollapse'; import TextToImageTabCoreParameters from 'features/ui/components/tabs/TextToImage/TextToImageTabCoreParameters'; import { memo } from 'react'; import ParamSDXLPromptArea from './ParamSDXLPromptArea'; @@ -13,7 +13,7 @@ const SDXLTextToImageTabParameters = () => { - + diff --git a/invokeai/frontend/web/src/features/sdxl/components/SDXLUnifiedCanvasTabParameters.tsx b/invokeai/frontend/web/src/features/sdxl/components/SDXLUnifiedCanvasTabParameters.tsx index a9e94a9df0..bee1fa2779 100644 --- a/invokeai/frontend/web/src/features/sdxl/components/SDXLUnifiedCanvasTabParameters.tsx +++ b/invokeai/frontend/web/src/features/sdxl/components/SDXLUnifiedCanvasTabParameters.tsx @@ -3,7 +3,7 @@ import ParamLoraCollapse from 'features/lora/components/ParamLoraCollapse'; import ParamAdvancedCollapse from 'features/parameters/components/Parameters/Advanced/ParamAdvancedCollapse'; import ParamCompositingSettingsCollapse from 'features/parameters/components/Parameters/Canvas/Compositing/ParamCompositingSettingsCollapse'; import ParamInfillAndScalingCollapse from 'features/parameters/components/Parameters/Canvas/InfillAndScaling/ParamInfillAndScalingCollapse'; -import ParamControlNetCollapse from 'features/parameters/components/Parameters/ControlNet/ParamControlNetCollapse'; +import ParamControlAdaptersCollapse from 'features/parameters/components/Parameters/ControlAdapters/ParamControlAdaptersCollapse'; import ParamSDXLPromptArea from './ParamSDXLPromptArea'; import ParamSDXLRefinerCollapse from './ParamSDXLRefinerCollapse'; import SDXLUnifiedCanvasTabCoreParameters from './SDXLUnifiedCanvasTabCoreParameters'; @@ -14,7 +14,7 @@ export default function SDXLUnifiedCanvasTabParameters() { - + diff --git a/invokeai/frontend/web/src/features/system/components/SettingsModal/SettingsClearIntermediates.tsx b/invokeai/frontend/web/src/features/system/components/SettingsModal/SettingsClearIntermediates.tsx index 53368bca94..b25fe6274e 100644 --- a/invokeai/frontend/web/src/features/system/components/SettingsModal/SettingsClearIntermediates.tsx +++ b/invokeai/frontend/web/src/features/system/components/SettingsModal/SettingsClearIntermediates.tsx @@ -1,6 +1,6 @@ import { Heading, Text } from '@chakra-ui/react'; import { useAppDispatch } from 'app/store/storeHooks'; -import { controlAdaptersReset } from 'features/controlNet/store/controlAdaptersSlice'; +import { controlAdaptersReset } from 'features/controlAdapters/store/controlAdaptersSlice'; import { useCallback, useEffect } from 'react'; import IAIButton from '../../../../common/components/IAIButton'; import { diff --git a/invokeai/frontend/web/src/features/ui/components/tabs/ImageToImage/ImageToImageTabParameters.tsx b/invokeai/frontend/web/src/features/ui/components/tabs/ImageToImage/ImageToImageTabParameters.tsx index 6015b776f4..2c6b46f76f 100644 --- a/invokeai/frontend/web/src/features/ui/components/tabs/ImageToImage/ImageToImageTabParameters.tsx +++ b/invokeai/frontend/web/src/features/ui/components/tabs/ImageToImage/ImageToImageTabParameters.tsx @@ -1,7 +1,7 @@ import ParamDynamicPromptsCollapse from 'features/dynamicPrompts/components/ParamDynamicPromptsCollapse'; import ParamLoraCollapse from 'features/lora/components/ParamLoraCollapse'; import ParamAdvancedCollapse from 'features/parameters/components/Parameters/Advanced/ParamAdvancedCollapse'; -import ParamControlNetCollapse from 'features/parameters/components/Parameters/ControlNet/ParamControlNetCollapse'; +import ParamControlAdaptersCollapse from 'features/parameters/components/Parameters/ControlAdapters/ParamControlAdaptersCollapse'; import ParamPromptArea from 'features/parameters/components/Parameters/Prompt/ParamPromptArea'; import ParamSymmetryCollapse from 'features/parameters/components/Parameters/Symmetry/ParamSymmetryCollapse'; import { memo } from 'react'; @@ -12,7 +12,7 @@ const ImageToImageTabParameters = () => { <> - + diff --git a/invokeai/frontend/web/src/features/ui/components/tabs/TextToImage/TextToImageTabParameters.tsx b/invokeai/frontend/web/src/features/ui/components/tabs/TextToImage/TextToImageTabParameters.tsx index 14f1aac778..0fc40de067 100644 --- a/invokeai/frontend/web/src/features/ui/components/tabs/TextToImage/TextToImageTabParameters.tsx +++ b/invokeai/frontend/web/src/features/ui/components/tabs/TextToImage/TextToImageTabParameters.tsx @@ -1,7 +1,7 @@ import ParamDynamicPromptsCollapse from 'features/dynamicPrompts/components/ParamDynamicPromptsCollapse'; import ParamLoraCollapse from 'features/lora/components/ParamLoraCollapse'; import ParamAdvancedCollapse from 'features/parameters/components/Parameters/Advanced/ParamAdvancedCollapse'; -import ParamControlNetCollapse from 'features/parameters/components/Parameters/ControlNet/ParamControlNetCollapse'; +import ParamControlAdaptersCollapse from 'features/parameters/components/Parameters/ControlAdapters/ParamControlAdaptersCollapse'; import ParamSymmetryCollapse from 'features/parameters/components/Parameters/Symmetry/ParamSymmetryCollapse'; import { memo } from 'react'; import ParamPromptArea from '../../../../parameters/components/Parameters/Prompt/ParamPromptArea'; @@ -12,7 +12,7 @@ const TextToImageTabParameters = () => { <> - + diff --git a/invokeai/frontend/web/src/features/ui/components/tabs/UnifiedCanvas/UnifiedCanvasParameters.tsx b/invokeai/frontend/web/src/features/ui/components/tabs/UnifiedCanvas/UnifiedCanvasParameters.tsx index a91ce1564b..a4f13054ad 100644 --- a/invokeai/frontend/web/src/features/ui/components/tabs/UnifiedCanvas/UnifiedCanvasParameters.tsx +++ b/invokeai/frontend/web/src/features/ui/components/tabs/UnifiedCanvas/UnifiedCanvasParameters.tsx @@ -3,7 +3,7 @@ import ParamLoraCollapse from 'features/lora/components/ParamLoraCollapse'; import ParamAdvancedCollapse from 'features/parameters/components/Parameters/Advanced/ParamAdvancedCollapse'; import ParamCompositingSettingsCollapse from 'features/parameters/components/Parameters/Canvas/Compositing/ParamCompositingSettingsCollapse'; import ParamInfillAndScalingCollapse from 'features/parameters/components/Parameters/Canvas/InfillAndScaling/ParamInfillAndScalingCollapse'; -import ParamControlNetCollapse from 'features/parameters/components/Parameters/ControlNet/ParamControlNetCollapse'; +import ParamControlAdaptersCollapse from 'features/parameters/components/Parameters/ControlAdapters/ParamControlAdaptersCollapse'; import ParamPromptArea from 'features/parameters/components/Parameters/Prompt/ParamPromptArea'; import ParamSymmetryCollapse from 'features/parameters/components/Parameters/Symmetry/ParamSymmetryCollapse'; import { memo } from 'react'; @@ -14,7 +14,7 @@ const UnifiedCanvasParameters = () => { <> - + diff --git a/invokeai/frontend/web/yarn.lock b/invokeai/frontend/web/yarn.lock index 787c81a756..2a531175d4 100644 --- a/invokeai/frontend/web/yarn.lock +++ b/invokeai/frontend/web/yarn.lock @@ -6727,6 +6727,11 @@ typescript@^4.0.0, typescript@^4.9.5: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== +typescript@^5.2.2: + version "5.2.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78" + integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w== + typescript@~5.0.4: version "5.0.4" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.4.tgz#b217fd20119bd61a94d4011274e0ab369058da3b"