Merge branch 'main' into fix/ui/fix-click-node-collapse

invokeai/frontend/web/src/features/gallery/components/ImageMetadataViewer/ImageMetadataActions.tsx

@@ -101,13 +101,15 @@ const ImageMetadataActions = (props: Props) => {
           onClick={handleRecallSeed}
         />
       )}
-      {metadata.model !== undefined && metadata.model !== null && (
-        <ImageMetadataItem
-          label="Model"
-          value={metadata.model.model_name}
-          onClick={handleRecallModel}
-        />
-      )}
+      {metadata.model !== undefined &&
+        metadata.model !== null &&
+        metadata.model.model_name && (
+          <ImageMetadataItem
+            label="Model"
+            value={metadata.model.model_name}
+            onClick={handleRecallModel}
+          />
+        )}
       {metadata.width && (
         <ImageMetadataItem
           label="Width"

invokeai/frontend/web/src/features/nodes/types/types.ts

@@ -1,7 +1,9 @@
 import {
   SchedulerParam,
   zBaseModel,
+  zMainModel,
   zMainOrOnnxModel,
+  zOnnxModel,
   zSDXLRefinerModel,
   zScheduler,
 } from 'features/parameters/types/parameterSchemas';
@@ -769,12 +771,14 @@ export const zCoreMetadata = z
     steps: z.number().int().nullish(),
     scheduler: z.string().nullish(),
     clip_skip: z.number().int().nullish(),
-    model: zMainOrOnnxModel.nullish(),
-    controlnets: z.array(zControlField).nullish(),
+    model: z
+      .union([zMainModel.deepPartial(), zOnnxModel.deepPartial()])
+      .nullish(),
+    controlnets: z.array(zControlField.deepPartial()).nullish(),
     loras: z
       .array(
         z.object({
-          lora: zLoRAModelField,
+          lora: zLoRAModelField.deepPartial(),
           weight: z.number(),
         })
       )
@@ -784,15 +788,15 @@ export const zCoreMetadata = z
     init_image: z.string().nullish(),
     positive_style_prompt: z.string().nullish(),
     negative_style_prompt: z.string().nullish(),
-    refiner_model: zSDXLRefinerModel.nullish(),
+    refiner_model: zSDXLRefinerModel.deepPartial().nullish(),
     refiner_cfg_scale: z.number().nullish(),
     refiner_steps: z.number().int().nullish(),
     refiner_scheduler: z.string().nullish(),
-    refiner_positive_aesthetic_store: z.number().nullish(),
-    refiner_negative_aesthetic_store: z.number().nullish(),
+    refiner_positive_aesthetic_score: z.number().nullish(),
+    refiner_negative_aesthetic_score: z.number().nullish(),
     refiner_start: z.number().nullish(),
   })
-  .catchall(z.record(z.any()));
+  .passthrough();
 
 export type CoreMetadata = z.infer<typeof zCoreMetadata>;
 

invokeai/frontend/web/src/features/nodes/util/getMetadataAndWorkflowFromImageBlob.ts

@@ -1,4 +1,6 @@
 import * as png from '@stevebel/png';
+import { logger } from 'app/logging/logger';
+import { parseify } from 'common/util/serialize';
 import {
   ImageMetadataAndWorkflow,
   zCoreMetadata,
@@ -18,6 +20,11 @@ export const getMetadataAndWorkflowFromImageBlob = async (
     const metadataResult = zCoreMetadata.safeParse(JSON.parse(rawMetadata));
     if (metadataResult.success) {
       data.metadata = metadataResult.data;
+    } else {
+      logger('system').error(
+        { error: parseify(metadataResult.error) },
+        'Problem reading metadata from image'
+      );
     }
   }
 
@@ -26,6 +33,11 @@ export const getMetadataAndWorkflowFromImageBlob = async (
     const workflowResult = zWorkflow.safeParse(JSON.parse(rawWorkflow));
     if (workflowResult.success) {
       data.workflow = workflowResult.data;
+    } else {
+      logger('system').error(
+        { error: parseify(workflowResult.error) },
+        'Problem reading workflow from image'
+      );
     }
   }
 

invokeai/frontend/web/src/features/nodes/util/graphBuilders/addSDXLRefinerToGraph.ts

@@ -60,9 +60,9 @@ export const addSDXLRefinerToGraph = (
 
   if (metadataAccumulator) {
     metadataAccumulator.refiner_model = refinerModel;
-    metadataAccumulator.refiner_positive_aesthetic_store =
+    metadataAccumulator.refiner_positive_aesthetic_score =
       refinerPositiveAestheticScore;
-    metadataAccumulator.refiner_negative_aesthetic_store =
+    metadataAccumulator.refiner_negative_aesthetic_score =
       refinerNegativeAestheticScore;
     metadataAccumulator.refiner_cfg_scale = refinerCFGScale;
     metadataAccumulator.refiner_scheduler = refinerScheduler;

invokeai/frontend/web/src/features/parameters/hooks/useRecallParameters.ts

@@ -341,8 +341,8 @@ export const useRecallParameters = () => {
         refiner_cfg_scale,
         refiner_steps,
         refiner_scheduler,
-        refiner_positive_aesthetic_store,
-        refiner_negative_aesthetic_store,
+        refiner_positive_aesthetic_score,
+        refiner_negative_aesthetic_score,
         refiner_start,
       } = metadata;
 
@@ -403,21 +403,21 @@ export const useRecallParameters = () => {
 
       if (
         isValidSDXLRefinerPositiveAestheticScore(
-          refiner_positive_aesthetic_store
+          refiner_positive_aesthetic_score
         )
       ) {
         dispatch(
-          setRefinerPositiveAestheticScore(refiner_positive_aesthetic_store)
+          setRefinerPositiveAestheticScore(refiner_positive_aesthetic_score)
         );
       }
 
       if (
         isValidSDXLRefinerNegativeAestheticScore(
-          refiner_negative_aesthetic_store
+          refiner_negative_aesthetic_score
         )
       ) {
         dispatch(
-          setRefinerNegativeAestheticScore(refiner_negative_aesthetic_store)
+          setRefinerNegativeAestheticScore(refiner_negative_aesthetic_score)
         );
       }