add: size option for image noise node and filter

Author: dunkeroni

invokeai/app/invocations/image.py

@@ -1097,7 +1097,7 @@ def invoke(self, context: InvocationContext) -> ImageOutput:
     title="Add Image Noise",
     tags=["image", "noise"],
     category="image",
-    version="1.0.0",
+    version="1.0.1",
 )
 class ImageNoiseInvocation(BaseInvocation, WithMetadata, WithBoard):
     """Add noise to an image"""
@@ -1115,6 +1115,7 @@ class ImageNoiseInvocation(BaseInvocation, WithMetadata, WithBoard):
     )
     amount: float = InputField(default=0.1, ge=0, le=1, description="The amount of noise to add")
     noise_color: bool = InputField(default=True, description="Whether to add colored noise")
+    size: int = InputField(default=1, ge=1, description="The size of the noise points")
 
     def invoke(self, context: InvocationContext) -> ImageOutput:
         image = context.images.get_pil(self.image.image_name, mode="RGBA")
@@ -1127,18 +1128,18 @@ def invoke(self, context: InvocationContext) -> ImageOutput:
 
         if self.noise_type == "gaussian":
             if self.noise_color:
-                noise = rs.normal(0, 1, (image.height, image.width, 3)) * 255
+                noise = rs.normal(0, 1, (image.height // self.size, image.width // self.size, 3)) * 255
             else:
-                noise = rs.normal(0, 1, (image.height, image.width)) * 255
+                noise = rs.normal(0, 1, (image.height // self.size, image.width // self.size)) * 255
                 noise = numpy.stack([noise] * 3, axis=-1)
         elif self.noise_type == "salt_and_pepper":
             if self.noise_color:
-                noise = rs.choice([0, 255], (image.height, image.width, 3), p=[1 - self.amount, self.amount])
+                noise = rs.choice([0, 255], (image.height // self.size, image.width // self.size, 3), p=[1 - self.amount, self.amount])
             else:
-                noise = rs.choice([0, 255], (image.height, image.width), p=[1 - self.amount, self.amount])
+                noise = rs.choice([0, 255], (image.height // self.size, image.width // self.size), p=[1 - self.amount, self.amount])
                 noise = numpy.stack([noise] * 3, axis=-1)
 
-        noise = Image.fromarray(noise.astype(numpy.uint8), mode="RGB")
+        noise = Image.fromarray(noise.astype(numpy.uint8), mode="RGB").resize((image.width, image.height), Image.Resampling.NEAREST)
         noisy_image = Image.blend(image.convert("RGB"), noise, self.amount).convert("RGBA")
 
         # Paste back the alpha channel

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

@@ -1948,7 +1948,8 @@
                 "noise_amount": "Amount",
                 "gaussian_type": "Gaussian",
                 "salt_and_pepper_type": "Salt and Pepper",
-                "noise_color": "Colored Noise"
+                "noise_color": "Colored Noise",
+                "size": "Noise Size"
             }
         },
         "transform": {

invokeai/frontend/web/src/features/controlLayers/components/Filters/FilterNoise.tsx

@@ -37,6 +37,13 @@ export const FilterNoise = memo(({ onChange, config }: Props) => {
     [config, onChange]
   );
 
+  const handleSizeChange = useCallback(
+    (v: number) => {
+      onChange({ ...config, size: v });
+    },
+    [config, onChange]
+  );
+
   const options: { label: string; value: NoiseTypes }[] = useMemo(
     () => [
       { label: t('controlLayers.filter.img_noise.gaussian_type'), value: 'gaussian' },
@@ -73,6 +80,26 @@ export const FilterNoise = memo(({ onChange, config }: Props) => {
           step={0.01}
         />
       </FormControl>
+      <FormControl>
+        <FormLabel m={0}>{t('controlLayers.filter.img_noise.size')}</FormLabel>
+        <CompositeSlider
+          value={config.size}
+          defaultValue={DEFAULTS.size}
+          onChange={handleSizeChange}
+          min={1}
+          max={16}
+          step={1}
+          marks
+        />
+        <CompositeNumberInput
+          value={config.size}
+          defaultValue={DEFAULTS.size}
+          onChange={handleSizeChange}
+          min={1}
+          max={256}
+          step={1}
+        />
+      </FormControl>
       <FormControl w="max-content">
         <FormLabel m={0}>{t('controlLayers.filter.img_noise.noise_color')}</FormLabel>
         <Switch defaultChecked={DEFAULTS.noise_color} isChecked={config.noise_color} onChange={handleColorChange} />

invokeai/frontend/web/src/features/controlLayers/store/filters.ts

@@ -113,6 +113,7 @@ const zNoiseFilterConfig = z.object({
   noise_type: zNoiseTypes,
   amount: z.number().gte(0).lte(1),
   noise_color: z.boolean(),
+  size: z.number().int().gte(1),
 });
 export type NoiseFilterConfig = z.infer<typeof zNoiseFilterConfig>;
 
@@ -483,8 +484,9 @@ export const IMAGE_FILTERS: { [key in FilterConfig['type']]: ImageFilterData<key
       noise_type: 'gaussian',
       amount: 0.3,
       noise_color: true,
+      size: 1,
     }),
-    buildGraph: ({ image_name }, { noise_type, amount, noise_color }) => {
+    buildGraph: ({ image_name }, { noise_type, amount, noise_color, size }) => {
       const graph = new Graph(getPrefixedId('img_noise'));
       const node = graph.addNode({
         id: getPrefixedId('img_noise'),
@@ -493,6 +495,7 @@ export const IMAGE_FILTERS: { [key in FilterConfig['type']]: ImageFilterData<key
         noise_type: noise_type,
         amount: amount,
         noise_color: noise_color,
+        size: size,
       });
       const rand = graph.addNode({
         id: getPrefixedId('rand_int'),

invokeai/frontend/web/src/features/controlLayers/store/types.test.ts

@@ -74,7 +74,9 @@ describe('Control Adapter Types', () => {
     type _MLSDDetectionFilterConfig = Required<
       Pick<Invocation<'mlsd_detection'>, 'type' | 'score_threshold' | 'distance_threshold'>
     >;
-    type _NoiseFilterConfig = Required<Pick<Invocation<'img_noise'>, 'type' | 'noise_type' | 'amount' | 'noise_color'>>;
+    type _NoiseFilterConfig = Required<
+      Pick<Invocation<'img_noise'>, 'type' | 'noise_type' | 'amount' | 'noise_color' | 'size'>
+    >;
     type _NormalMapFilterConfig = Required<Pick<Invocation<'normal_map'>, 'type'>>;
     type _DWOpenposeDetectionFilterConfig = Required<
       Pick<Invocation<'dw_openpose_detection'>, 'type' | 'draw_body' | 'draw_face' | 'draw_hands'>

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

@@ -8494,6 +8494,12 @@ export type components = {
              * @default true
              */
             noise_color?: boolean;
+            /**
+             * Size
+             * @description The size of the noise
+             * @default 1
+             */
+            size?: number;
             /**
              * type
              * @default img_noise