Remove Omni upscale models 3x/4x from required models list

* they aren't used internally

Author: Acly

ai_diffusion/resources.py

@@ -824,8 +824,6 @@ def is_required(kind: ResourceKind, arch: Arch, identifier: ControlMode | Upscal
     ResourceId(ResourceKind.lora, Arch.sdxl, "hyper"),
     ResourceId(ResourceKind.upscaler, Arch.all, UpscalerName.default),
     ResourceId(ResourceKind.upscaler, Arch.all, UpscalerName.fast_2x),
-    ResourceId(ResourceKind.upscaler, Arch.all, UpscalerName.fast_3x),
-    ResourceId(ResourceKind.upscaler, Arch.all, UpscalerName.fast_4x),
     ResourceId(ResourceKind.inpaint, Arch.sdxl, "fooocus_head"),
     ResourceId(ResourceKind.inpaint, Arch.sdxl, "fooocus_patch"),
     ResourceId(ResourceKind.inpaint, Arch.all, "default"),

ai_diffusion/workflow.py

@@ -1092,7 +1092,8 @@ def inpaint(
             model, prompt_up, latent, models.arch, **sampler_params
         )
         out_image = vae_decode(w, vae, out_latent, checkpoint.tiled_vae)
-        out_image = w.color_match(out_image, upscale, upscale_mask, misc.color_match)
+        input_cropped = w.crop_image(in_image, initial_bounds)
+        out_image = w.color_match(out_image, input_cropped, upscale_mask, misc.color_match)
         out_image = scale_to_target(upscale_extent, w, out_image, models)
     else:
         desired_bounds = extent.convert(target_bounds, "target", "desired")

tests/test_workflow.py

@@ -103,7 +103,6 @@ def create(kind: WorkflowKind, client: Client, **kwargs):
     kwargs.setdefault("seed", default_seed)
     kwargs.setdefault("perf", default_perf)
     kwargs.setdefault("files", files)
-    kwargs.setdefault("color_match", 1.0)
 
     prompt = workflow.prepare_prompts(
         kwargs["cond"], kwargs["style"], kwargs["seed"], Arch.sd15, kwargs["files"]
@@ -937,7 +936,7 @@ def test_edit_reference(qtapp, client):
 
 def test_flux2_outpaint_lora(qtapp, client):
     image = Image.load(image_dir / "beach_1536x1024.webp")
-    mask = Mask.rectangle(Bounds(0, 0, 480, 1024), Bounds(0, 0, 768, 1024))
+    mask = Mask.rectangle(Bounds(0, 0, 400, 1024), Bounds(0, 0, 880, 1024))
     style = default_style(client, Arch.flux2_4b)
     cond = ConditioningInput("")
     cond, _, md = workflow.prepare_prompts(cond, style, 1, Arch.flux2_4b, InpaintMode.expand)