Skip to content

Commit 455bcb0

Browse files
fix(ui): restore flux dev & disabled model warnings
1 parent 9c633fe commit 455bcb0

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

invokeai/frontend/web/src/features/settingsAccordions/components/GenerationSettingsAccordion/GenerationSettingsAccordion.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import ParamCFGScale from 'features/parameters/components/Core/ParamCFGScale';
1717
import ParamGuidance from 'features/parameters/components/Core/ParamGuidance';
1818
import ParamScheduler from 'features/parameters/components/Core/ParamScheduler';
1919
import ParamSteps from 'features/parameters/components/Core/ParamSteps';
20+
import { DisabledModelWarning } from 'features/parameters/components/MainModel/DisabledModelWarning';
2021
import ParamUpscaleCFGScale from 'features/parameters/components/Upscale/ParamUpscaleCFGScale';
2122
import ParamUpscaleScheduler from 'features/parameters/components/Upscale/ParamUpscaleScheduler';
2223
import { MainModelPicker } from 'features/settingsAccordions/components/GenerationSettingsAccordion/MainModelPicker';
@@ -83,6 +84,7 @@ export const GenerationSettingsAccordion = memo(() => {
8384
>
8485
<Box px={4} pt={4} data-testid="generation-accordion">
8586
<Flex gap={4} flexDir="column" pb={isApiModel ? 4 : 0}>
87+
<DisabledModelWarning />
8688
<MainModelPicker />
8789
{!isApiModel && <LoRASelect />}
8890
{!isApiModel && <LoRAList />}

invokeai/frontend/web/src/features/settingsAccordions/components/GenerationSettingsAccordion/MainModelPicker.tsx

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
import { Flex, FormLabel } from '@invoke-ai/ui-library';
1+
import { Flex, FormLabel, Icon } from '@invoke-ai/ui-library';
22
import { useAppDispatch } from 'app/store/storeHooks';
33
import { InformationalPopover } from 'common/components/InformationalPopover/InformationalPopover';
44
import { UseDefaultSettingsButton } from 'features/parameters/components/MainModel/UseDefaultSettingsButton';
55
import { ModelPicker } from 'features/parameters/components/ModelPicker';
66
import { modelSelected } from 'features/parameters/store/actions';
7-
import { memo, useCallback } from 'react';
7+
import { memo, useCallback, useMemo } from 'react';
88
import { useTranslation } from 'react-i18next';
9+
import { MdMoneyOff } from 'react-icons/md';
910
import { useMainModels } from 'services/api/hooks/modelsByType';
1011
import { useSelectedModelConfig } from 'services/api/hooks/useSelectedModelConfig';
11-
import type { AnyModelConfig } from 'services/api/types';
12+
import { type AnyModelConfig, isCheckpointMainModelConfig } from 'services/api/types';
1213

1314
export const MainModelPicker = memo(() => {
1415
const { t } = useTranslation();
@@ -22,11 +23,26 @@ export const MainModelPicker = memo(() => {
2223
[dispatch]
2324
);
2425

26+
const isFluxDevSelected = useMemo(
27+
() =>
28+
selectedModelConfig &&
29+
isCheckpointMainModelConfig(selectedModelConfig) &&
30+
selectedModelConfig.config_path === 'flux-dev',
31+
[selectedModelConfig]
32+
);
33+
2534
return (
2635
<Flex alignItems="center" gap={2}>
2736
<InformationalPopover feature="paramModel">
2837
<FormLabel>{t('modelManager.model')}</FormLabel>
2938
</InformationalPopover>
39+
{isFluxDevSelected && (
40+
<InformationalPopover feature="fluxDevLicense" hideDisable={true}>
41+
<Flex justifyContent="flex-start">
42+
<Icon as={MdMoneyOff} />
43+
</Flex>
44+
</InformationalPopover>
45+
)}
3046
<ModelPicker
3147
modelConfigs={modelConfigs}
3248
selectedModelConfig={selectedModelConfig}

0 commit comments

Comments
 (0)