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: Misc fixes

Browse Source
This commit is contained in:
blessedcoolant 2023-07-15 01:23:08 +12:00
parent 79d65125c2
commit 401fa6deb5
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
invokeai/frontend/web/public/locales/en.json
View File

@ -398,8 +398,8 @@
"delete": "Delete", "delete": "Delete",
"deleteModel": "Delete Model", "deleteModel": "Delete Model",
"deleteConfig": "Delete Config", "deleteConfig": "Delete Config",
"deleteMsg1": "Are you sure you want to delete this model entry from InvokeAI?", "deleteMsg1": "Are you sure you want to delete this model from InvokeAI?",
"deleteMsg2": "This will not delete the model checkpoint file from your disk. You can readd them if you wish to.", "deleteMsg2": "This WILL delete the model from disk if it is in the InvokeAI root folder. If you are using a custom location, then the model WILL NOT be deleted from disk.",
"formMessageDiffusersModelLocation": "Diffusers Model Location", "formMessageDiffusersModelLocation": "Diffusers Model Location",
"formMessageDiffusersModelLocationDesc": "Please enter at least one.", "formMessageDiffusersModelLocationDesc": "Please enter at least one.",
"formMessageDiffusersVAELocation": "VAE Location", "formMessageDiffusersVAELocation": "VAE Location",

16
invokeai/frontend/web/src/features/ui/components/tabs/ModelManager/subpanels/MergeModelsPanel.tsx
View File

@ -30,10 +30,15 @@ const baseModelTypeSelectData = [
{ label: 'Stable Diffusion 2', value: 'sd-2' }, { label: 'Stable Diffusion 2', value: 'sd-2' },
]; ];
type MergeInterpolationMethods =
| 'weighted_sum'
| 'sigmoid'
| 'inv_sigmoid'
| 'add_difference';
export default function MergeModelsPanel() { export default function MergeModelsPanel() {
const { t } = useTranslation(); const { t } = useTranslation();
const { colorMode } = useColorMode(); const { colorMode } = useColorMode();
const dispatch = useAppDispatch(); const dispatch = useAppDispatch();
const { data } = useGetMainModelsQuery(); const { data } = useGetMainModelsQuery();
@ -74,9 +79,8 @@ export default function MergeModelsPanel() {
const [mergedModelName, setMergedModelName] = useState<string>(''); const [mergedModelName, setMergedModelName] = useState<string>('');
const [modelMergeAlpha, setModelMergeAlpha] = useState<number>(0.5); const [modelMergeAlpha, setModelMergeAlpha] = useState<number>(0.5);
const [modelMergeInterp, setModelMergeInterp] = useState< const [modelMergeInterp, setModelMergeInterp] =
'weighted_sum' | 'sigmoid' | 'inv_sigmoid' | 'add_difference' useState<MergeInterpolationMethods>('weighted_sum');
>('weighted_sum');
const [modelMergeSaveLocType, setModelMergeSaveLocType] = useState< const [modelMergeSaveLocType, setModelMergeSaveLocType] = useState<
'root' | 'custom' 'root' | 'custom'
@ -256,9 +260,7 @@ export default function MergeModelsPanel() {
</Text> </Text>
<RadioGroup <RadioGroup
value={modelMergeInterp} value={modelMergeInterp}
onChange={( onChange={(v: MergeInterpolationMethods) => setModelMergeInterp(v)}
v: 'weighted_sum' | 'sigmoid' | 'inv_sigmoid' | 'add_difference'
) => setModelMergeInterp(v)}
> >
<Flex columnGap={4}> <Flex columnGap={4}>
{modelThree === null ? ( {modelThree === null ? (