(chore) cleanup and schema

Author: dunkeroni

invokeai/app/invocations/image.py

@@ -689,21 +689,20 @@ def _match_histogram_channel(self, source: numpy.ndarray, reference: numpy.ndarr
     def invoke(self, context: InvocationContext) -> ImageOutput:
         # Load images as RGBA
         base_image = context.images.get_pil(self.base_image.image_name, "RGBA")
-        color_reference = context.images.get_pil(self.color_reference.image_name, "RGBA")
 
         # Store original alpha channel
         original_alpha = base_image.getchannel("A")
 
         # Convert to working colorspace
         if self.colorspace == "RGB":
-            # Work directly in RGB
             base_array = numpy.asarray(base_image.convert("RGB"), dtype=numpy.uint8)
-            ref_array = numpy.asarray(color_reference.convert("RGB"), dtype=numpy.uint8)
+            ref_rgb = context.images.get_pil(self.color_reference.image_name, "RGB")
+            ref_array = numpy.asarray(ref_rgb, dtype=numpy.uint8)
             channels_to_match = [0, 1, 2]  # R, G, B
         else:
             # Convert to YCbCr colorspace
             base_ycbcr = base_image.convert("YCbCr")
-            ref_ycbcr = color_reference.convert("YCbCr")
+            ref_ycbcr = context.images.get_pil(self.color_reference.image_name, "YCbCr")
 
             base_array = numpy.asarray(base_ycbcr, dtype=numpy.uint8)
             ref_array = numpy.asarray(ref_ycbcr, dtype=numpy.uint8)

invokeai/frontend/web/src/services/api/schema.ts

@@ -4776,8 +4776,8 @@ export type components = {
         };
         /**
          * Color Correct
-         * @description Shifts the colors of a target image to match the reference image, optionally
-         *     using a mask to only color-correct certain regions of the target image.
+         * @description Matches the color histogram of a base image to a reference image, optionally
+         *     using a mask to only color-correct certain regions of the base image.
          */
         ColorCorrectInvocation: {
             /**
@@ -4811,23 +4811,24 @@ export type components = {
              * @description The image to color-correct
              * @default null
              */
-            image?: components["schemas"]["ImageField"] | null;
+            base_image?: components["schemas"]["ImageField"] | null;
             /**
              * @description Reference image for color-correction
              * @default null
              */
-            reference?: components["schemas"]["ImageField"] | null;
+            color_reference?: components["schemas"]["ImageField"] | null;
             /**
-             * @description Mask to use when applying color-correction
+             * @description Optional mask to limit color correction area
              * @default null
              */
             mask?: components["schemas"]["ImageField"] | null;
             /**
-             * Mask Blur Radius
-             * @description Mask blur radius
-             * @default 8
+             * Colorspace
+             * @description Colorspace in which to apply histogram matching
+             * @default RGB
+             * @enum {string}
              */
-            mask_blur_radius?: number;
+            colorspace?: "RGB" | "YCbCr" | "YCbCr-Chroma" | "YCbCr-Luma";
             /**
              * type
              * @default color_correct