feat: add inpaint region functionality and related tools

- Enhanced cursor behavior for new tools: semantic select, mask lasso, and mask rectangle.
- Updated mask edit state to include mask asset ID and kind.
- Implemented inpaint region commands for adding, applying, and removing inpaint regions.
- Introduced new operations for lasso and semantic selection tools.
- Created UI components for candidate review and inpaint region management.
- Added tests for inpaint region commands to ensure functionality.
- Updated various components to support new inpaint features and improve user experience.

operations/generation/runGenerate.ts

@@ -18,6 +18,7 @@ export async function runGenerate(options: {
   settings: GenerateSettings;
   dispatch: AppStore["dispatch"];
   signal?: AbortSignal;
+  onProgress?: (progress: number, detail: string) => void;
 }) {
   const { document, selection, settings, dispatch } = options;
   const precondition = checkGenerationPreconditions(document, selection, settings);
@@ -41,25 +42,27 @@ export async function runGenerate(options: {
     maskImage,
     inpaintBundle,
     signal: options.signal,
+    onProgress: options.onProgress,
   });
-  const intrinsicSize = await loadImageSize(generated.source);
-  const placement = resolveGeneratedOutputPlacement({ document, selection, settings, intrinsicSize, inpaintBundle });
-
-  dispatch(commandIds.generationAddCandidate, {
-    candidate: createGenerationCandidate({
-      source: generated.source,
-      mimeType: generated.mimeType,
-      intrinsicSize,
-      settings: requestSettings,
-      seed,
-      width,
-      height,
-      inputImage,
-      maskImage,
-      placement,
-      inpaintBundle,
-    }),
-  });
+  for (const result of generated.results) {
+    const intrinsicSize = await loadImageSize(result.source);
+    const placement = resolveGeneratedOutputPlacement({ document, selection, settings, intrinsicSize, inpaintBundle });
+    dispatch(commandIds.generationAddCandidate, {
+      candidate: createGenerationCandidate({
+        source: result.source,
+        mimeType: result.mimeType,
+        intrinsicSize,
+        settings: requestSettings,
+        seed: result.seed || seed,
+        width,
+        height,
+        inputImage,
+        maskImage,
+        placement,
+        inpaintBundle,
+      }),
+    });
+  }
 }
 
 export async function runGenerateFromCandidate(options: {
@@ -67,6 +70,7 @@ export async function runGenerateFromCandidate(options: {
   settings?: GenerateSettings;
   dispatch: AppStore["dispatch"];
   signal?: AbortSignal;
+  onProgress?: (progress: number, detail: string) => void;
 }) {
   const settings = options.settings ?? options.candidate.settings;
   const seed = resolveSeed(settings.seed);
@@ -79,20 +83,22 @@ export async function runGenerateFromCandidate(options: {
     maskImage: options.candidate.maskImage,
     inpaintCandidate: options.candidate,
     signal: options.signal,
+    onProgress: options.onProgress,
   });
-  const intrinsicSize = await loadImageSize(generated.source);
-
-  options.dispatch(commandIds.generationAddCandidate, {
-    candidate: {
-      ...options.candidate,
-      id: crypto.randomUUID(),
-      source: generated.source,
-      mimeType: generated.mimeType,
-      intrinsicSize,
-      settings: requestSettings,
-      seed,
-    },
-  });
+  for (const result of generated.results) {
+    const intrinsicSize = await loadImageSize(result.source);
+    options.dispatch(commandIds.generationAddCandidate, {
+      candidate: {
+        ...options.candidate,
+        id: crypto.randomUUID(),
+        source: result.source,
+        mimeType: result.mimeType,
+        intrinsicSize,
+        settings: requestSettings,
+        seed: result.seed || seed,
+      },
+    });
+  }
 }
 
 function createGenerationCandidate(options: {
@@ -120,15 +126,19 @@ function createGenerationCandidate(options: {
     height: options.height,
     inputImage: options.inputImage,
     maskImage: options.maskImage,
+    blendMaskImage: options.inpaintBundle?.blendMaskImage,
     placement: options.placement,
     inpaint: options.inpaintBundle
       ? {
           targetLayerId: options.inpaintBundle.targetLayerId,
-          maskLayerId: options.inpaintBundle.maskLayerId,
+          regionId: options.inpaintBundle.regionId,
           sourceAssetId: options.inpaintBundle.sourceAssetId,
           maskAssetId: options.inpaintBundle.maskAssetId,
           inputImage: options.inpaintBundle.inputImage,
           maskImage: options.inpaintBundle.maskImage,
+          editMaskImage: options.inpaintBundle.editMaskImage,
+          blendMaskImage: options.inpaintBundle.blendMaskImage,
+          revision: options.inpaintBundle.revision,
           crop: options.inpaintBundle.crop,
           mask: options.inpaintBundle.mask,
           backend: options.inpaintBundle.backend,
@@ -146,6 +156,7 @@ async function requestGenerate(options: {
   inpaintBundle?: InpaintBundle;
   inpaintCandidate?: GenerationCandidate;
   signal?: AbortSignal;
+  onProgress?: (progress: number, detail: string) => void;
 }) {
   return requestGeneration({
       architecture: options.settings.architecture,
@@ -163,11 +174,14 @@ async function requestGenerate(options: {
       scheduler: options.settings.scheduler,
       width: options.width,
       height: options.height,
+      batchSize: options.settings.batchSize,
+      refinePass: options.settings.refinePass,
+      refineStrength: options.settings.refineStrength,
       outpaint: options.settings.outpaint,
       inpaint: resolveInpaintRequest(options.inpaintBundle, options.inpaintCandidate, options.settings),
       inputImage: options.inputImage,
       maskImage: options.maskImage,
-  }, options.signal);
+  }, options.signal, options.onProgress);
 }
 
 function resolveInpaintRequest(inpaintBundle: InpaintBundle | undefined, inpaintCandidate: GenerationCandidate | undefined, settings: GenerateSettings) {
@@ -182,6 +196,9 @@ function resolveInpaintRequest(inpaintBundle: InpaintBundle | undefined, inpaint
       maskPolarity: inpaintBundle.mask.polarity,
       crop: inpaintBundle.crop,
       placement: inpaintBundle.placement,
+      structureControl: settings.inpaint.structureControl,
+      controlStrength: settings.inpaint.controlStrength,
+      controlModel: settings.inpaint.controlModel,
     };
   }
 
@@ -196,6 +213,9 @@ function resolveInpaintRequest(inpaintBundle: InpaintBundle | undefined, inpaint
       maskPolarity: inpaintCandidate.inpaint.mask.polarity,
       crop: inpaintCandidate.inpaint.crop,
       placement: inpaintCandidate.placement,
+      structureControl: settings.inpaint.structureControl,
+      controlStrength: settings.inpaint.controlStrength,
+      controlModel: settings.inpaint.controlModel,
     };
   }