Merge branch 'main' into patch-1

invokeai/frontend/dist/index.html

@@ -7,7 +7,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.9310184f.js"></script>
+    <script type="module" crossorigin src="./assets/index.b7daf15c.js"></script>
     <link rel="stylesheet" href="./assets/index.1536494e.css">
     <script type="module">try{import.meta.url;import("_").catch(()=>1);}catch(e){}window.__vite_is_modern_browser=true;</script>
     <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy build because dynamic import or import.meta.url is unsupported, syntax error above should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
@@ -18,6 +18,6 @@
     
     <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
     <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-dde3a68a.js"></script>
-    <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-a33ada34.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-7649c4ae.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

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

@@ -24,6 +24,7 @@
   "otherOptions": "Other Options",
   "seamlessTiling": "Seamless Tiling",
   "hiresOptim": "High Res Optimization",
+  "hiresStrength": "High Res Strength",
   "imageFit": "Fit Initial Image To Output Size",
   "codeformerFidelity": "Fidelity",
   "seamSize": "Seam Size",

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

@@ -24,6 +24,7 @@
   "otherOptions": "Other Options",
   "seamlessTiling": "Seamless Tiling",
   "hiresOptim": "High Res Optimization",
+  "hiresStrength": "High Res Strength",
   "imageFit": "Fit Initial Image To Output Size",
   "codeformerFidelity": "Fidelity",
   "seamSize": "Seam Size",

invokeai/frontend/public/locales/options/en-US.json

@@ -24,6 +24,7 @@
   "otherOptions": "Other Options",
   "seamlessTiling": "Seamless Tiling",
   "hiresOptim": "High Res Optimization",
+  "hiresStrength": "High Res Strength",
   "imageFit": "Fit Initial Image To Output Size",
   "codeformerFidelity": "Fidelity",
   "seamSize": "Seam Size",

invokeai/frontend/public/locales/options/en.json

@@ -24,6 +24,7 @@
   "otherOptions": "Other Options",
   "seamlessTiling": "Seamless Tiling",
   "hiresOptim": "High Res Optimization",
+  "hiresStrength": "High Res Strength",
   "imageFit": "Fit Initial Image To Output Size",
   "codeformerFidelity": "Fidelity",
   "seamSize": "Seam Size",

invokeai/frontend/src/common/util/parameterTranslation.ts

@@ -100,6 +100,7 @@ export const frontendToBackendParameters = (
     facetoolType,
     height,
     hiresFix,
+    hiresStrength,
     img2imgStrength,
     infillMethod,
     initialImage,
@@ -169,6 +170,8 @@ export const frontendToBackendParameters = (
     generationParameters.seamless = seamless;
     generationParameters.hires_fix = hiresFix;
 
+    if (hiresFix) generationParameters.strength = hiresStrength;
+
     if (shouldRunESRGAN) {
       esrganParameters = {
         level: upscalingLevel,

invokeai/frontend/src/features/options/components/AdvancedOptions/Output/HiresOptions.tsx

@@ -1,10 +1,53 @@
 import { Flex } from '@chakra-ui/react';
 import { ChangeEvent } from 'react';
-import { RootState } from 'app/store';
+import type { RootState } from 'app/store';
 import { useAppDispatch, useAppSelector } from 'app/storeHooks';
 import IAISwitch from 'common/components/IAISwitch';
-import { setHiresFix } from 'features/options/store/optionsSlice';
+import {
+  setHiresFix,
+  setHiresStrength,
+} from 'features/options/store/optionsSlice';
 import { useTranslation } from 'react-i18next';
+import IAISlider from 'common/components/IAISlider';
+
+function HighResStrength() {
+  const hiresFix = useAppSelector((state: RootState) => state.options.hiresFix);
+  const hiresStrength = useAppSelector(
+    (state: RootState) => state.options.hiresStrength
+  );
+
+  const dispatch = useAppDispatch();
+
+  const { t } = useTranslation();
+
+  const handleHiresStrength = (v: number) => {
+    dispatch(setHiresStrength(v));
+  };
+
+  const handleHiResStrengthReset = () => {
+    dispatch(setHiresStrength(0.75));
+  };
+
+  return (
+    <IAISlider
+      label={t('options:hiresStrength')}
+      step={0.01}
+      min={0.01}
+      max={0.99}
+      onChange={handleHiresStrength}
+      value={hiresStrength}
+      isInteger={false}
+      withInput
+      withSliderMarks
+      inputWidth={'5.5rem'}
+      withReset
+      handleReset={handleHiResStrengthReset}
+      isSliderDisabled={!hiresFix}
+      isInputDisabled={!hiresFix}
+      isResetDisabled={!hiresFix}
+    />
+  );
+}
 
 /**
  * Hires Fix Toggle
@@ -27,6 +70,7 @@ const HiresOptions = () => {
         isChecked={hiresFix}
         onChange={handleChangeHiresFix}
       />
+      <HighResStrength />
     </Flex>
   );
 };

invokeai/frontend/src/features/options/store/optionsSlice.ts

@@ -20,6 +20,7 @@ export interface OptionsState {
   facetoolType: FacetoolType;
   height: number;
   hiresFix: boolean;
+  hiresStrength: number;
   img2imgStrength: number;
   infillMethod: string;
   initialImage?: InvokeAI.Image | string; // can be an Image or url
@@ -71,6 +72,7 @@ const initialOptionsState: OptionsState = {
   facetoolType: 'gfpgan',
   height: 512,
   hiresFix: false,
+  hiresStrength: 0.75,
   img2imgStrength: 0.75,
   infillMethod: 'patchmatch',
   isLightBoxOpen: false,
@@ -189,6 +191,9 @@ export const optionsSlice = createSlice({
     setHiresFix: (state, action: PayloadAction<boolean>) => {
       state.hiresFix = action.payload;
     },
+    setHiresStrength: (state, action: PayloadAction<number>) => {
+      state.hiresStrength = action.payload;
+    },
     setShouldFitToWidthHeight: (state, action: PayloadAction<boolean>) => {
       state.shouldFitToWidthHeight = action.payload;
     },
@@ -459,6 +464,7 @@ export const {
   setFacetoolType,
   setHeight,
   setHiresFix,
+  setHiresStrength,
   setImg2imgStrength,
   setInfillMethod,
   setInitialImage,