invoke-ai · hipsterusername · May 30, 2023 · May 30, 2023 · May 30, 2023 · May 30, 2023
@@ -173,7 +173,7 @@ class TextToLatentsInvocation(BaseInvocation):
     negative_conditioning: Optional[ConditioningField] = Field(description="Negative conditioning for generation")
     noise: Optional[LatentsField] = Field(description="The noise to use")
     steps:       int = Field(default=10, gt=0, description="The number of steps to use to generate the image")
-    cfg_scale: float = Field(default=7.5, gt=0, description="The Classifier-Free Guidance, higher values may result in a result closer to the prompt", )
+    cfg_scale: float = Field(default=7.5, ge=1, description="The Classifier-Free Guidance, higher values may result in a result closer to the prompt", )
     scheduler: SAMPLER_NAME_VALUES = Field(default="euler", description="The scheduler to use" )
     model:       str = Field(default="", description="The model to use (currently ignored)")
     control: Union[ControlField, list[ControlField]] = Field(default=None, description="The control to use")
@@ -366,7 +366,7 @@ class LatentsToLatentsInvocation(TextToLatentsInvocation):
 
     # Inputs
     latents: Optional[LatentsField] = Field(description="The latents to use as a base image")
-    strength: float = Field(default=0.5, description="The strength of the latents to use")
+    strength: float = Field(default=0.7, ge=0, le=1, description="The strength of the latents to use")
 
     # Schema customisation
     class Config(InvocationConfig):

@@ -454,6 +454,8 @@
         "height": "Height",
         "scheduler": "Scheduler",
         "seed": "Seed",
+        "boundingBoxWidth": "Bounding Box Width",
+        "boundingBoxHeight": "Bounding Box Height",
         "imageToImage": "Image to Image",
         "randomizeSeed": "Randomize Seed",
         "shuffle": "Shuffle Seed",

@@ -351,6 +351,7 @@ export type AppConfig = {
   disabledSDFeatures: SDFeature[];
   canRestoreDeletedImagesFromBin: boolean;
   sd: {
+    defaultModel?: string;
     iterations: {
       initial: number;
       min: number;

@@ -21,9 +21,12 @@ import { OverlayScrollbarsComponent } from 'overlayscrollbars-react';
 
 import { memo } from 'react';
 
+export type ItemTooltips = { [key: string]: string };
+
 type IAICustomSelectProps = {
   label?: string;
   items: string[];
+  itemTooltips?: ItemTooltips;
   selectedItem: string;
   setSelectedItem: (v: string | null | undefined) => void;
   withCheckIcon?: boolean;
@@ -37,6 +40,7 @@ const IAICustomSelect = (props: IAICustomSelectProps) => {
   const {
     label,
     items,
+    itemTooltips,
     setSelectedItem,
     selectedItem,
     withCheckIcon,
@@ -118,48 +122,56 @@ const IAICustomSelect = (props: IAICustomSelectProps) => {
           >
             <OverlayScrollbarsComponent>
               {items.map((item, index) => (
-                <ListItem
-                  sx={{
-                    bg: highlightedIndex === index ? 'base.700' : undefined,
-                    py: 1,
-                    paddingInlineStart: 3,
-                    paddingInlineEnd: 6,
-                    cursor: 'pointer',
-                    transitionProperty: 'common',
-                    transitionDuration: '0.15s',
-                  }}
+                <Tooltip
+                  isDisabled={!itemTooltips}
                   key={`${item}${index}`}
-                  {...getItemProps({ item, index })}
+                  label={itemTooltips?.[item]}
+                  hasArrow
+                  placement="right"
                 >
-                  {withCheckIcon ? (
-                    <Grid gridTemplateColumns="1.25rem auto">
-                      <GridItem>
-                        {selectedItem === item && <CheckIcon boxSize={2} />}
-                      </GridItem>
-                      <GridItem>
-                        <Text
-                          sx={{
-                            fontSize: 'sm',
-                            color: 'base.100',
-                            fontWeight: 500,
-                          }}
-                        >
-                          {item}
-                        </Text>
-                      </GridItem>
-                    </Grid>
-                  ) : (
-                    <Text
-                      sx={{
-                        fontSize: 'sm',
-                        color: 'base.100',
-                        fontWeight: 500,
-                      }}
-                    >
-                      {item}
-                    </Text>
-                  )}
-                </ListItem>
+                  <ListItem
+                    sx={{
+                      bg: highlightedIndex === index ? 'base.700' : undefined,
+                      py: 1,
+                      paddingInlineStart: 3,
+                      paddingInlineEnd: 6,
+                      cursor: 'pointer',
+                      transitionProperty: 'common',
+                      transitionDuration: '0.15s',
+                    }}
+                    key={`${item}${index}`}
+                    {...getItemProps({ item, index })}
+                  >
+                    {withCheckIcon ? (
+                      <Grid gridTemplateColumns="1.25rem auto">
+                        <GridItem>
+                          {selectedItem === item && <CheckIcon boxSize={2} />}
+                        </GridItem>
+                        <GridItem>
+                          <Text
+                            sx={{
+                              fontSize: 'sm',
+                              color: 'base.100',
+                              fontWeight: 500,
+                            }}
+                          >
+                            {item}
+                          </Text>
+                        </GridItem>
+                      </Grid>
+                    ) : (
+                      <Text
+                        sx={{
+                          fontSize: 'sm',
+                          color: 'base.100',
+                          fontWeight: 500,
+                        }}
+                      >
+                        {item}
+                      </Text>
+                    )}
+                  </ListItem>
+                </Tooltip>
               ))}
             </OverlayScrollbarsComponent>
           </List>

@@ -29,6 +29,7 @@ import {
   isCanvasMaskLine,
 } from './canvasTypes';
 import { ImageDTO } from 'services/api';
+import { sessionCanceled } from 'services/thunks/session';
 
 export const initialLayerState: CanvasLayerState = {
   objects: [],
@@ -844,6 +845,13 @@ export const canvasSlice = createSlice({
       state.isTransformingBoundingBox = false;
     },
   },
+  extraReducers: (builder) => {
+    builder.addCase(sessionCanceled.pending, (state) => {
+      if (!state.layerState.stagingArea.images.length) {
+        state.layerState.stagingArea = initialLayerState.stagingArea;
+      }
+    });
+  },
 });
 
 export const {

@@ -9,7 +9,8 @@ import { IRect } from 'konva/lib/types';
  */
 const createMaskStage = async (
   lines: CanvasMaskLine[],
-  boundingBox: IRect
+  boundingBox: IRect,
+  shouldInvertMask: boolean
 ): Promise<Konva.Stage> => {
   // create an offscreen canvas and add the mask to it
   const { width, height } = boundingBox;
@@ -29,15 +30,15 @@ const createMaskStage = async (
   baseLayer.add(
     new Konva.Rect({
       ...boundingBox,
-      fill: 'white',
+      fill: shouldInvertMask ? 'black' : 'white',
     })
   );
 
   lines.forEach((line) =>
     maskLayer.add(
       new Konva.Line({
         points: line.points,
-        stroke: 'black',
+        stroke: shouldInvertMask ? 'white' : 'black',
         strokeWidth: line.strokeWidth * 2,
         tension: 0,
         lineCap: 'round',

@@ -25,6 +25,7 @@ export const getCanvasData = async (state: RootState) => {
     boundingBoxCoordinates,
     boundingBoxDimensions,
     isMaskEnabled,
+    shouldPreserveMaskedArea,
   } = state.canvas;
 
   const boundingBox = {
@@ -58,7 +59,8 @@ export const getCanvasData = async (state: RootState) => {
   // For the mask layer, use the normal boundingBox
   const maskStage = await createMaskStage(
     isMaskEnabled ? objects.filter(isCanvasMaskLine) : [], // only include mask lines, and only if mask is enabled
-    boundingBox
+    boundingBox,
+    shouldPreserveMaskedArea
   );
   const maskBlob = await konvaNodeToBlob(maskStage, boundingBox);
   const maskImageData = await konvaNodeToImageData(maskStage, boundingBox);

@@ -16,7 +16,7 @@ import { buildEdges } from '../edgeBuilders/buildEdges';
 import { log } from 'app/logging/useLogger';
 import { buildInpaintNode } from '../nodeBuilders/buildInpaintNode';
 
-const moduleLog = log.child({ namespace: 'buildCanvasGraph' });
+const moduleLog = log.child({ namespace: 'nodes' });
 
 const buildBaseNode = (
   nodeType: 'txt2img' | 'img2img' | 'inpaint' | 'outpaint',
@@ -80,18 +80,23 @@ export const buildCanvasGraphComponents = async (
       infillMethod,
     } = state.generation;
 
-    // generationParameters.invert_mask = shouldPreserveMaskedArea;
-    // if (boundingBoxScale !== 'none') {
-    //   generationParameters.inpaint_width = scaledBoundingBoxDimensions.width;
-    //   generationParameters.inpaint_height = scaledBoundingBoxDimensions.height;
-    // }
+    const { scaledBoundingBoxDimensions, boundingBoxScaleMethod } =
+      state.canvas;
+
+    if (boundingBoxScaleMethod !== 'none') {
+      baseNode.inpaint_width = scaledBoundingBoxDimensions.width;
+      baseNode.inpaint_height = scaledBoundingBoxDimensions.height;
+    }
+
     baseNode.seam_size = seamSize;
     baseNode.seam_blur = seamBlur;
     baseNode.seam_strength = seamStrength;
     baseNode.seam_steps = seamSteps;
-    baseNode.tile_size = tileSize;
     baseNode.infill_method = infillMethod as InpaintInvocation['infill_method'];
-    // baseNode.force_outpaint = false;
+
+    if (infillMethod === 'tile') {
+      baseNode.tile_size = tileSize;
+    }
   }
 
   // We always range and iterate nodes, no matter the iteration count