Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): control adapter models select disable if incompatible

Browse Source
This commit is contained in:
psychedelicious 2024-01-02 18:23:50 +11:00 committed by Kent Keirsey
parent 61c10a7ca8
commit 799ef0e7c1
2 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
invokeai/frontend/web/src/features/controlAdapters/components/parameters/ParamControlAdapterModel.tsx
View File

@ -11,13 +11,14 @@ import { useControlAdapterModelEntities } from 'features/controlAdapters/hooks/u
import { useControlAdapterType } from 'features/controlAdapters/hooks/useControlAdapterType';
import { controlAdapterModelChanged } from 'features/controlAdapters/store/controlAdaptersSlice';
import { pick } from 'lodash-es';
import { memo, useCallback } from 'react';
import { memo, useCallback, useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import type {
ControlNetModelConfigEntity,
IPAdapterModelConfigEntity,
T2IAdapterModelConfigEntity,
} from 'services/api/endpoints/models';
import type { AnyModelConfig } from 'services/api/types';
type ParamControlAdapterModelProps = {
id: string;
@ -33,7 +34,9 @@ const ParamControlAdapterModel = ({ id }: ParamControlAdapterModelProps) => {
const controlAdapterType = useControlAdapterType(id);
const model = useControlAdapterModel(id);
const dispatch = useAppDispatch();
const currentBaseModel = useAppSelector(
(state) => state.generation.model?.base_model
);
const { mainModel } = useAppSelector(selector);
const { t } = useTranslation();
@ -60,14 +63,29 @@ const ParamControlAdapterModel = ({ id }: ParamControlAdapterModelProps) => {
[dispatch, id]
);
const selectedModel = useMemo(
() =>
model && controlAdapterType
? { ...model, model_type: controlAdapterType }
: null,
[controlAdapterType, model]
);
const getIsDisabled = useCallback(
(model: AnyModelConfig): boolean => {
const isCompatible = currentBaseModel === model.base_model;
const hasMainModel = Boolean(currentBaseModel);
return !hasMainModel || !isCompatible;
},
[currentBaseModel]
);
const { options, value, onChange, noOptionsMessage } =
useGroupedModelInvSelect({
modelEntities: models,
onChange: _onChange,
selectedModel:
model && controlAdapterType
? { ...model, model_type: controlAdapterType }
: null,
selectedModel,
getIsDisabled,
});
return (

15
invokeai/frontend/web/src/features/embedding/EmbeddingSelect.tsx
View File

@ -21,13 +21,14 @@ export const EmbeddingSelect = memo(
(state) => state.generation.model?.base_model
);
const getIsDisabled = (
embedding: TextualInversionModelConfigEntity
): boolean => {
const isCompatible = currentBaseModel === embedding.base_model;
const hasMainModel = Boolean(currentBaseModel);
return !hasMainModel || !isCompatible;
};
const getIsDisabled = useCallback(
(embedding: TextualInversionModelConfigEntity): boolean => {
const isCompatible = currentBaseModel === embedding.base_model;
const hasMainModel = Boolean(currentBaseModel);
return !hasMainModel || !isCompatible;
},
[currentBaseModel]
);
const { data, isLoading } = useGetTextualInversionModelsQuery();
const _onChange = useCallback(