Merge branch 'v2.3' into enhance/simple-param-scanner-script

invokeai/frontend/.prettierrc.js

@@ -1,6 +1,7 @@
 module.exports = {
   trailingComma: 'es5',
   tabWidth: 2,
+  endOfLine: 'auto',
   semi: true,
   singleQuote: true,
   overrides: [

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-c33fa9da.js"></script>
+    <script type="module" crossorigin src="./assets/index-720872d1.js"></script>
     <link rel="stylesheet" href="./assets/index-14cb2922.css">
   </head>
 

invokeai/frontend/src/features/gallery/components/CurrentImageButtons.tsx

@@ -21,6 +21,7 @@ import {
   setInitialImage,
   setSeed,
 } from 'features/parameters/store/generationSlice';
+import { setAllPostProcessingParameters } from 'features/parameters/store/postprocessingSlice';
 import { postprocessingSelector } from 'features/parameters/store/postprocessingSelectors';
 import { systemSelector } from 'features/system/store/systemSelectors';
 import { SystemState } from 'features/system/store/systemSlice';
@@ -189,11 +190,12 @@ const CurrentImageButtons = () => {
   );
 
   const handleClickUseAllParameters = () => {
-    if (!currentImage) return;
-    currentImage.metadata && dispatch(setAllParameters(currentImage.metadata));
-    if (currentImage.metadata?.image.type === 'img2img') {
+    if (!currentImage?.metadata) return;
+    dispatch(setAllParameters(currentImage.metadata));
+    dispatch(setAllPostProcessingParameters(currentImage.metadata));
+    if (currentImage.metadata.image.type === 'img2img') {
       dispatch(setActiveTab('img2img'));
-    } else if (currentImage.metadata?.image.type === 'txt2img') {
+    } else if (currentImage.metadata.image.type === 'txt2img') {
       dispatch(setActiveTab('txt2img'));
     }
   };

invokeai/frontend/src/features/gallery/components/HoverableImage.tsx

@@ -10,6 +10,7 @@ import {
   setInitialImage,
   setSeed,
 } from 'features/parameters/store/generationSlice';
+import { setAllPostProcessingParameters } from 'features/parameters/store/postprocessingSlice';
 import { DragEvent, memo, useState } from 'react';
 import { FaCheck, FaTrashAlt } from 'react-icons/fa';
 import DeleteImageModal from './DeleteImageModal';
@@ -114,7 +115,10 @@ const HoverableImage = memo((props: HoverableImageProps) => {
   };
 
   const handleUseAllParameters = () => {
-    metadata && dispatch(setAllParameters(metadata));
+    if (metadata) {
+      dispatch(setAllParameters(metadata));
+      dispatch(setAllPostProcessingParameters(metadata));
+    }
     toast({
       title: t('toast.parametersSet'),
       status: 'success',

invokeai/frontend/src/features/parameters/store/generationSlice.ts

@@ -301,7 +301,6 @@ export const generationSlice = createSlice({
         state.perlin = perlin;
       }
       if (typeof seamless === 'boolean') state.seamless = seamless;
-      // if (typeof hires_fix === 'boolean') state.hiresFix = hires_fix; // TODO: Needs to be fixed after reorg
       if (width) state.width = width;
       if (height) state.height = height;
 

invokeai/frontend/src/features/parameters/store/postprocessingSlice.ts

@@ -1,5 +1,6 @@
 import type { PayloadAction } from '@reduxjs/toolkit';
 import { createSlice } from '@reduxjs/toolkit';
+import * as InvokeAI from 'app/invokeai';
 import { FACETOOL_TYPES } from 'app/constants';
 
 export type UpscalingLevel = 2 | 4;
@@ -40,6 +41,17 @@ export const postprocessingSlice = createSlice({
   name: 'postprocessing',
   initialState,
   reducers: {
+    setAllPostProcessingParameters: (
+      state,
+      action: PayloadAction<InvokeAI.Metadata>
+    ) => {
+      const { type, hires_fix } = action.payload.image;
+
+      if (type === 'txt2img') {
+        state.hiresFix = Boolean(hires_fix);
+        // Strength of img2img used in hires_fix is not currently exposed in the Metadata for the final image.
+      }
+    },
     setFacetoolStrength: (state, action: PayloadAction<number>) => {
       state.facetoolStrength = action.payload;
     },
@@ -83,6 +95,7 @@ export const postprocessingSlice = createSlice({
 });
 
 export const {
+  setAllPostProcessingParameters,
   resetPostprocessingState,
   setCodeformerFidelity,
   setFacetoolStrength,

ldm/invoke/args.py

@@ -1181,7 +1181,7 @@ def metadata_dumps(opt,
     )
 
     # remove any image keys not mentioned in RFC #266
-    rfc266_img_fields = ['type','postprocessing','sampler','prompt','seed','variations','steps',
+    rfc266_img_fields = ['type','postprocessing','sampler','prompt','seed','variations','steps','hires_fix',
                          'cfg_scale','threshold','perlin','step_number','width','height','extra','strength','seamless'
                          'init_img','init_mask','facetool','facetool_strength','upscale','h_symmetry_time_pct',
                          'v_symmetry_time_pct']