From 12cae33dcdf037fcd95e60c79545ccbda0cdcc21 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Wed, 19 Jul 2023 20:57:14 -0400 Subject: [PATCH 1/4] fix inpaint model detection (#3843) Co-authored-by: Lincoln Stein --- invokeai/backend/model_management/model_probe.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/invokeai/backend/model_management/model_probe.py b/invokeai/backend/model_management/model_probe.py index c8e33db393..6a65401675 100644 --- a/invokeai/backend/model_management/model_probe.py +++ b/invokeai/backend/model_management/model_probe.py @@ -39,6 +39,7 @@ class ModelProbe(object): CLASS2TYPE = { 'StableDiffusionPipeline' : ModelType.Main, + 'StableDiffusionInpaintPipeline' : ModelType.Main, 'StableDiffusionXLPipeline' : ModelType.Main, 'StableDiffusionXLImg2ImgPipeline' : ModelType.Main, 'AutoencoderKL' : ModelType.Vae, @@ -401,7 +402,7 @@ class PipelineFolderProbe(FolderProbeBase): in_channels = conf['in_channels'] if in_channels == 9: - return ModelVariantType.Inpainting + return ModelVariantType.Inpaint elif in_channels == 5: return ModelVariantType.Depth elif in_channels == 4: From f2515d9480b7569b32c94228d0a6296f5d652246 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Wed, 19 Jul 2023 22:13:56 -0400 Subject: [PATCH 2/4] fix v1-finetune.yaml is not in the subpath of "" (#3848) Co-authored-by: Lincoln Stein --- invokeai/app/services/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/invokeai/app/services/config.py b/invokeai/app/services/config.py index 0a70c1dd5d..35334b1bef 100644 --- a/invokeai/app/services/config.py +++ b/invokeai/app/services/config.py @@ -277,7 +277,7 @@ class InvokeAISettings(BaseSettings): @classmethod def _excluded_from_yaml(self)->List[str]: # combination of deprecated parameters and internal ones that shouldn't be exposed as invokeai.yaml options - return ['type','initconf', 'gpu_mem_reserved', 'max_loaded_models', 'version', 'from_file', 'model', 'restore'] + return ['type','initconf', 'gpu_mem_reserved', 'max_loaded_models', 'version', 'from_file', 'model', 'restore', 'root'] class Config: env_file_encoding = 'utf-8' @@ -446,7 +446,7 @@ setting environment variables INVOKEAI_. Path to the runtime root directory ''' if self.root: - return Path(self.root).expanduser() + return Path(self.root).expanduser().absolute() else: return self.find_root() From f6d5e930201723079eb70dba9ed8a8145cadc390 Mon Sep 17 00:00:00 2001 From: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com> Date: Thu, 20 Jul 2023 14:16:32 +1200 Subject: [PATCH 3/4] fix: Model List not scrolling through checkpoints (#3849) --- .../subpanels/ModelManagerPanel/ModelList.tsx | 81 ++++++++++--------- 1 file changed, 43 insertions(+), 38 deletions(-) diff --git a/invokeai/frontend/web/src/features/ui/components/tabs/ModelManager/subpanels/ModelManagerPanel/ModelList.tsx b/invokeai/frontend/web/src/features/ui/components/tabs/ModelManager/subpanels/ModelManagerPanel/ModelList.tsx index c9f8384b9a..722bd83b6e 100644 --- a/invokeai/frontend/web/src/features/ui/components/tabs/ModelManager/subpanels/ModelManagerPanel/ModelList.tsx +++ b/invokeai/frontend/web/src/features/ui/components/tabs/ModelManager/subpanels/ModelManagerPanel/ModelList.tsx @@ -75,42 +75,49 @@ const ModelList = (props: ModelListProps) => { labelPos="side" /> - {['images', 'diffusers'].includes(modelFormatFilter) && - filteredDiffusersModels.length > 0 && ( - - - - Diffusers - - {filteredDiffusersModels.map((model) => ( - - ))} - - - )} - {['images', 'checkpoint'].includes(modelFormatFilter) && - filteredCheckpointModels.length > 0 && ( - - - - Checkpoint - - {filteredCheckpointModels.map((model) => ( - - ))} - - - )} + + {['images', 'diffusers'].includes(modelFormatFilter) && + filteredDiffusersModels.length > 0 && ( + + + + Diffusers + + {filteredDiffusersModels.map((model) => ( + + ))} + + + )} + {['images', 'checkpoint'].includes(modelFormatFilter) && + filteredCheckpointModels.length > 0 && ( + + + + Checkpoints + + {filteredCheckpointModels.map((model) => ( + + ))} + + + )} + ); @@ -146,8 +153,6 @@ const StyledModelContainer = (props: PropsWithChildren) => { return ( Date: Thu, 20 Jul 2023 14:17:51 +1200 Subject: [PATCH 4/4] feat: Add Setting Switch Component (#3847) --- invokeai/frontend/web/public/locales/en.json | 7 ++- .../web/src/common/components/IAISwitch.tsx | 4 +- .../SettingsModal/SettingSwitch.tsx | 57 +++++++++++++++++++ .../SettingsModal/SettingsModal.tsx | 48 +++++++++------- 4 files changed, 90 insertions(+), 26 deletions(-) create mode 100644 invokeai/frontend/web/src/features/system/components/SettingsModal/SettingSwitch.tsx diff --git a/invokeai/frontend/web/public/locales/en.json b/invokeai/frontend/web/public/locales/en.json index 32ff574925..f5922a6ff4 100644 --- a/invokeai/frontend/web/public/locales/en.json +++ b/invokeai/frontend/web/public/locales/en.json @@ -547,7 +547,8 @@ "saveSteps": "Save images every n steps", "confirmOnDelete": "Confirm On Delete", "displayHelpIcons": "Display Help Icons", - "useCanvasBeta": "Use Canvas Beta Layout", + "alternateCanvasLayout": "Alternate Canvas Layout", + "enableNodesEditor": "Enable Nodes Editor", "enableImageDebugging": "Enable Image Debugging", "useSlidersForAll": "Use Sliders For All Options", "showProgressInViewer": "Show Progress Images in Viewer", @@ -564,7 +565,9 @@ "ui": "User Interface", "favoriteSchedulers": "Favorite Schedulers", "favoriteSchedulersPlaceholder": "No schedulers favorited", - "showAdvancedOptions": "Show Advanced Options" + "showAdvancedOptions": "Show Advanced Options", + "experimental": "Experimental", + "beta": "Beta" }, "toast": { "serverError": "Server Error", diff --git a/invokeai/frontend/web/src/common/components/IAISwitch.tsx b/invokeai/frontend/web/src/common/components/IAISwitch.tsx index d25ab0d87e..9803626397 100644 --- a/invokeai/frontend/web/src/common/components/IAISwitch.tsx +++ b/invokeai/frontend/web/src/common/components/IAISwitch.tsx @@ -9,7 +9,7 @@ import { } from '@chakra-ui/react'; import { memo } from 'react'; -interface Props extends SwitchProps { +export interface IAISwitchProps extends SwitchProps { label?: string; width?: string | number; formControlProps?: FormControlProps; @@ -20,7 +20,7 @@ interface Props extends SwitchProps { /** * Customized Chakra FormControl + Switch multi-part component. */ -const IAISwitch = (props: Props) => { +const IAISwitch = (props: IAISwitchProps) => { const { label, isDisabled = false, diff --git a/invokeai/frontend/web/src/features/system/components/SettingsModal/SettingSwitch.tsx b/invokeai/frontend/web/src/features/system/components/SettingsModal/SettingSwitch.tsx new file mode 100644 index 0000000000..e035b90d3a --- /dev/null +++ b/invokeai/frontend/web/src/features/system/components/SettingsModal/SettingSwitch.tsx @@ -0,0 +1,57 @@ +import { Badge, BadgeProps, Flex, Text, TextProps } from '@chakra-ui/react'; +import IAISwitch, { IAISwitchProps } from 'common/components/IAISwitch'; +import { useTranslation } from 'react-i18next'; + +type SettingSwitchProps = IAISwitchProps & { + label: string; + useBadge?: boolean; + badgeLabel?: string; + textProps?: TextProps; + badgeProps?: BadgeProps; +}; + +export default function SettingSwitch(props: SettingSwitchProps) { + const { t } = useTranslation(); + + const { + label, + textProps, + useBadge = false, + badgeLabel = t('settings.experimental'), + badgeProps, + ...rest + } = props; + + return ( + + + + {label} + + {useBadge && ( + + {badgeLabel} + + )} + + + + ); +} diff --git a/invokeai/frontend/web/src/features/system/components/SettingsModal/SettingsModal.tsx b/invokeai/frontend/web/src/features/system/components/SettingsModal/SettingsModal.tsx index ccc4a9aa24..5ec7a09b67 100644 --- a/invokeai/frontend/web/src/features/system/components/SettingsModal/SettingsModal.tsx +++ b/invokeai/frontend/web/src/features/system/components/SettingsModal/SettingsModal.tsx @@ -11,13 +11,12 @@ import { Text, useDisclosure, } from '@chakra-ui/react'; -import { createSelector, current } from '@reduxjs/toolkit'; +import { createSelector } from '@reduxjs/toolkit'; import { VALID_LOG_LEVELS } from 'app/logging/useLogger'; import { LOCALSTORAGE_KEYS, LOCALSTORAGE_PREFIX } from 'app/store/constants'; import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; import IAIButton from 'common/components/IAIButton'; import IAIMantineSelect from 'common/components/IAIMantineSelect'; -import IAISwitch from 'common/components/IAISwitch'; import { systemSelector } from 'features/system/store/systemSelectors'; import { SystemState, @@ -48,8 +47,9 @@ import { } from 'react'; import { useTranslation } from 'react-i18next'; import { LogLevelName } from 'roarr'; -import SettingsSchedulers from './SettingsSchedulers'; +import SettingSwitch from './SettingSwitch'; import SettingsClearIntermediates from './SettingsClearIntermediates'; +import SettingsSchedulers from './SettingsSchedulers'; const selector = createSelector( [systemSelector, uiSelector], @@ -206,7 +206,7 @@ const SettingsModal = ({ children, config }: SettingsModalProps) => { {t('settings.general')} - ) => @@ -214,7 +214,7 @@ const SettingsModal = ({ children, config }: SettingsModalProps) => { } /> {shouldShowAdvancedOptionsSettings && ( - ) => @@ -231,37 +231,29 @@ const SettingsModal = ({ children, config }: SettingsModalProps) => { {t('settings.ui')} - ) => dispatch(setShouldDisplayGuides(e.target.checked)) } /> - {shouldShowBetaLayout && ( - ) => - dispatch(setShouldUseCanvasBetaLayout(e.target.checked)) - } - /> - )} - ) => dispatch(setShouldUseSliders(e.target.checked)) } /> - ) => dispatch(setShouldShowProgressInViewer(e.target.checked)) } /> - ) => @@ -270,9 +262,21 @@ const SettingsModal = ({ children, config }: SettingsModalProps) => { ) } /> + {shouldShowBetaLayout && ( + ) => + dispatch(setShouldUseCanvasBetaLayout(e.target.checked)) + } + /> + )} {shouldShowNodesToggle && ( - @@ -282,7 +286,7 @@ const SettingsModal = ({ children, config }: SettingsModalProps) => { {shouldShowDeveloperSettings && ( {t('settings.developer')} - { value={consoleLogLevel} data={VALID_LOG_LEVELS.concat()} /> - ) =>