build: [WebUI] model-merge

invokeai/frontend/dist/index.html

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>InvokeAI - A Stable Diffusion Toolkit</title>
     <link rel="shortcut icon" type="icon" href="./assets/favicon-0d253ced.ico" />
-    <script type="module" crossorigin src="./assets/index-9237ac63.js"></script>
+    <script type="module" crossorigin src="./assets/index-7062a172.js"></script>
     <link rel="stylesheet" href="./assets/index-14cb2922.css">
   </head>
 

invokeai/frontend/dist/locales/common/en-US.json

@@ -9,6 +9,19 @@
   "darkTheme": "Dark",
   "lightTheme": "Light",
   "greenTheme": "Green",
+  "langArabic": "العربية",
+  "langEnglish": "English",
+  "langDutch": "Nederlands",
+  "langFrench": "Français",
+  "langGerman": "Deutsch",
+  "langItalian": "Italiano",
+  "langJapanese": "日本語",
+  "langPolish": "Polski",
+  "langBrPortuguese": "Português do Brasil",
+  "langRussian": "Русский",
+  "langSimplifiedChinese": "简体中文",
+  "langUkranian": "Украї́нська",
+  "langSpanish": "Español",
   "text2img": "Text To Image",
   "img2img": "Image To Image",
   "unifiedCanvas": "Unified Canvas",
@@ -45,5 +58,9 @@
   "statusUpscaling": "Upscaling",
   "statusUpscalingESRGAN": "Upscaling (ESRGAN)",
   "statusLoadingModel": "Loading Model",
-  "statusModelChanged": "Model Changed"
+  "statusModelChanged": "Model Changed",
+  "statusConvertingModel": "Converting Model",
+  "statusModelConverted": "Model Converted",
+  "statusMergingModels": "Merging Models",
+  "statusMergedModels": "Models Merged"
 }

invokeai/frontend/dist/locales/common/en.json

@@ -60,5 +60,7 @@
   "statusLoadingModel": "Loading Model",
   "statusModelChanged": "Model Changed",
   "statusConvertingModel": "Converting Model",
-  "statusModelConverted": "Model Converted"
+  "statusModelConverted": "Model Converted",
+  "statusMergingModels": "Merging Models",
+  "statusMergedModels": "Models Merged"
 }

invokeai/frontend/dist/locales/modelmanager/en-US.json

@@ -22,7 +22,7 @@
   "config": "Config",
   "configValidationMsg": "Path to the config file of your model.",
   "modelLocation": "Model Location",
-  "modelLocationValidationMsg": "Path to where your model is located.",
+  "modelLocationValidationMsg": "Path to where your model is located locally.",
   "repo_id": "Repo ID",
   "repoIDValidationMsg": "Online repository of your model",
   "vaeLocation": "VAE Location",
@@ -72,14 +72,33 @@
   "convertToDiffusersHelpText4": "This is a one time process only. It might take around 30s-60s depending on the specifications of your computer.",
   "convertToDiffusersHelpText5": "Please make sure you have enough disk space. Models generally vary between 4GB-7GB in size.",
   "convertToDiffusersHelpText6": "Do you wish to convert this model?",
+  "convertToDiffusersSaveLocation": "Save Location",
   "v1": "v1",
   "v2": "v2",
   "inpainting": "v1 Inpainting",
   "customConfig": "Custom Config",
   "pathToCustomConfig": "Path To Custom Config",
   "statusConverting": "Converting",
-  "sameFolder": "Same Folder",
-  "invokeRoot": "Invoke Models",
+  "modelConverted": "Model Converted",
+  "sameFolder": "Same folder",
+  "invokeRoot": "InvokeAI folder",
   "custom": "Custom",
-  "customSaveLocation": "Custom Save Location"
+  "customSaveLocation": "Custom Save Location",
+  "merge": "Merge",
+  "modelsMerged": "Models Merged",
+  "mergeModels": "Merge Models",
+  "modelOne": "Model 1",
+  "modelTwo": "Model 2",
+  "modelThree": "Model 3",
+  "mergedModelName": "Merged Model Name",
+  "alpha": "Alpha",
+  "interpolationType": "Interpolation Type",
+  "mergedModelSaveLocation": "Save Location",
+  "mergedModelCustomSaveLocation": "Custom Path",
+  "invokeAIFolder": "Invoke AI Folder",
+  "ignoreMismatch": "Ignore Mismatches Between Selected Models",
+  "modelMergeHeaderHelp1": "You can merge upto three different models to create a blend that suits your needs.",
+  "modelMergeHeaderHelp2": "Only Diffusers are available for merging. If you want to merge a checkpoint model, please convert it to Diffusers first.",
+  "modelMergeAlphaHelp": "Alpha controls blend strength for the models. Lower alpha values lead to lower influence of the second model.",
+  "modelMergeInterpAddDifferenceHelp": "In this mode, Model 3 is first subtracted from Model 2. The resulting version is blended with Model 1 with the alpha rate set above."
 }

invokeai/frontend/dist/locales/modelmanager/en.json

@@ -76,12 +76,29 @@
   "v1": "v1",
   "v2": "v2",
   "inpainting": "v1 Inpainting",
-  "customConfig": "Custom Config",  
+  "customConfig": "Custom Config",
   "pathToCustomConfig": "Path To Custom Config",
   "statusConverting": "Converting",
   "modelConverted": "Model Converted",
   "sameFolder": "Same folder",
   "invokeRoot": "InvokeAI folder",
   "custom": "Custom",
-  "customSaveLocation": "Custom Save Location"
+  "customSaveLocation": "Custom Save Location",
+  "merge": "Merge",
+  "modelsMerged": "Models Merged",
+  "mergeModels": "Merge Models",
+  "modelOne": "Model 1",
+  "modelTwo": "Model 2",
+  "modelThree": "Model 3",
+  "mergedModelName": "Merged Model Name",
+  "alpha": "Alpha",
+  "interpolationType": "Interpolation Type",
+  "mergedModelSaveLocation": "Save Location",
+  "mergedModelCustomSaveLocation": "Custom Path",
+  "invokeAIFolder": "Invoke AI Folder",
+  "ignoreMismatch": "Ignore Mismatches Between Selected Models",
+  "modelMergeHeaderHelp1": "You can merge upto three different models to create a blend that suits your needs.",
+  "modelMergeHeaderHelp2": "Only Diffusers are available for merging. If you want to merge a checkpoint model, please convert it to Diffusers first.",
+  "modelMergeAlphaHelp": "Alpha controls blend strength for the models. Lower alpha values lead to lower influence of the second model.",
+  "modelMergeInterpAddDifferenceHelp": "In this mode, Model 3 is first subtracted from Model 2. The resulting version is blended with Model 1 with the alpha rate set above."
 }

invokeai/frontend/dist/locales/parameters/en-US.json

@@ -22,6 +22,7 @@
   "upscaling": "Upscaling",
   "upscale": "Upscale",
   "upscaleImage": "Upscale Image",
+  "denoisingStrength": "Denoising Strength",
   "scale": "Scale",
   "otherOptions": "Other Options",
   "seamlessTiling": "Seamless Tiling",
@@ -46,9 +47,11 @@
   "invoke": "Invoke",
   "cancel": "Cancel",
   "promptPlaceholder": "Type prompt here. [negative tokens], (upweight)++, (downweight)--, swap and blend are available (see docs)",
+  "negativePrompts": "Negative Prompts",
   "sendTo": "Send to",
   "sendToImg2Img": "Send to Image to Image",
   "sendToUnifiedCanvas": "Send To Unified Canvas",
+  "copyImage": "Copy Image",
   "copyImageToLink": "Copy Image To Link",
   "downloadImage": "Download Image",
   "openInViewer": "Open In Viewer",

invokeai/frontend/src/features/system/components/ModelManager/MergeModels.tsx

@@ -176,6 +176,7 @@ export default function MergeModels() {
                 withReset
                 handleReset={() => setModelMergeAlpha(0.5)}
                 withSliderMarks
+                sliderMarkRightOffset={-7}
               />
               <Text fontSize="0.9rem" color="var(--text-color-secondary)">
                 {t('modelmanager:modelMergeAlphaHelp')}