feat: rip out enhance prompt as toggleable option, imagen always randomizes seed

Author: psychedelicious

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

@@ -79,7 +79,6 @@ export type ParamsState = {
   clipLEmbedModel: ParameterCLIPLEmbedModel | null;
   clipGEmbedModel: ParameterCLIPGEmbedModel | null;
   controlLora: ParameterControlLoRAModel | null;
-  imagen3EnhancePrompt: boolean;
 };
 
 const initialState: ParamsState = {
@@ -129,7 +128,6 @@ const initialState: ParamsState = {
   clipLEmbedModel: null,
   clipGEmbedModel: null,
   controlLora: null,
-  imagen3EnhancePrompt: true,
 };
 
 export const paramsSlice = createSlice({
@@ -292,9 +290,6 @@ export const paramsSlice = createSlice({
     setCanvasCoherenceMinDenoise: (state, action: PayloadAction<number>) => {
       state.canvasCoherenceMinDenoise = action.payload;
     },
-    imagen3EnhancePromptChanged: (state, action: PayloadAction<boolean>) => {
-      state.imagen3EnhancePrompt = action.payload;
-    },
     paramsReset: (state) => resetState(state),
   },
   extraReducers(builder) {
@@ -362,7 +357,6 @@ export const {
   setRefinerStart,
   modelChanged,
   paramsReset,
-  imagen3EnhancePromptChanged,
 } = paramsSlice.actions;
 
 /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
@@ -421,7 +415,6 @@ export const selectNegativePrompt = createParamsSelector((params) => params.nega
 export const selectPositivePrompt2 = createParamsSelector((params) => params.positivePrompt2);
 export const selectNegativePrompt2 = createParamsSelector((params) => params.negativePrompt2);
 export const selectShouldConcatPrompts = createParamsSelector((params) => params.shouldConcatPrompts);
-export const selectImagen3EnhancePrompt = createParamsSelector((params) => params.imagen3EnhancePrompt);
 export const selectScheduler = createParamsSelector((params) => params.scheduler);
 export const selectSeamlessXAxis = createParamsSelector((params) => params.seamlessXAxis);
 export const selectSeamlessYAxis = createParamsSelector((params) => params.seamlessYAxis);

invokeai/frontend/web/src/features/nodes/util/graph/buildLinearBatchConfig.ts

@@ -1,5 +1,7 @@
+import { NUMPY_RAND_MAX, NUMPY_RAND_MIN } from 'app/constants';
 import type { RootState } from 'app/store/store';
 import { generateSeeds } from 'common/util/generateSeeds';
+import randomInt from 'common/util/randomInt';
 import type { FieldIdentifier } from 'features/nodes/types/field';
 import type { Graph } from 'features/nodes/util/graph/generation/Graph';
 import { range } from 'lodash-es';
@@ -26,7 +28,9 @@ export const prepareLinearUIBatch = (
   if (seedBehaviour === 'PER_PROMPT') {
     const seeds = generateSeeds({
       count: prompts.length * iterations,
-      start: shouldRandomizeSeed ? undefined : seed,
+      // Imagen3's support for seeded generation is iffy, we are just not going too use in in linear UI generations.
+      start:
+        model?.base === 'imagen3' ? randomInt(NUMPY_RAND_MIN, NUMPY_RAND_MAX) : shouldRandomizeSeed ? undefined : seed,
     });
 
     firstBatchDatumList.push({

invokeai/frontend/web/src/features/nodes/util/graph/generation/buildImagen3Graph.ts

@@ -3,7 +3,6 @@ import type { RootState } from 'app/store/store';
 import type { CanvasManager } from 'features/controlLayers/konva/CanvasManager';
 import { getPrefixedId } from 'features/controlLayers/konva/util';
 import { selectCanvasSettingsSlice } from 'features/controlLayers/store/canvasSettingsSlice';
-import { selectParamsSlice } from 'features/controlLayers/store/paramsSlice';
 import { selectCanvasSlice } from 'features/controlLayers/store/selectors';
 import { isImagen3AspectRatioID } from 'features/controlLayers/store/types';
 import type { FieldIdentifier } from 'features/nodes/types/field';
@@ -32,12 +31,10 @@ export const buildImagen3Graph = async (
 
   log.debug({ generationMode }, 'Building Imagen3 graph');
 
-  const params = selectParamsSlice(state);
   const canvas = selectCanvasSlice(state);
   const canvasSettings = selectCanvasSettingsSlice(state);
 
   const { bbox } = canvas;
-  const { seed, imagen3EnhancePrompt: enhance_prompt } = params;
   const { positivePrompt, negativePrompt } = selectPresetModifiedPrompts(state);
 
   assert(isImagen3AspectRatioID(bbox.aspectRatio.id), 'Imagen3 does not support this aspect ratio');
@@ -54,10 +51,9 @@ export const buildImagen3Graph = async (
       positive_prompt: positivePrompt,
       negative_prompt: negativePrompt,
       aspect_ratio: bbox.aspectRatio.id,
-      seed,
-      enhance_prompt,
+      enhance_prompt: true,
       // When enhance_prompt is true, Imagen3 will return a new image every time, ignoring the seed.
-      use_cache: !enhance_prompt,
+      use_cache: false,
       is_intermediate,
       board,
     });
@@ -81,7 +77,6 @@ export const buildImagen3Graph = async (
       id: getPrefixedId(CANVAS_OUTPUT_PREFIX),
       positive_prompt: positivePrompt,
       negative_prompt: negativePrompt,
-      seed,
       base_image: { image_name },
       is_intermediate,
       board,

invokeai/frontend/web/src/features/parameters/components/Core/Imagen3EnhancePromptButton.tsx

@@ -2,7 +2,6 @@ import { Box, Textarea } from '@invoke-ai/ui-library';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import { positivePromptChanged, selectBase, selectPositivePrompt } from 'features/controlLayers/store/paramsSlice';
 import { ShowDynamicPromptsPreviewButton } from 'features/dynamicPrompts/components/ShowDynamicPromptsPreviewButton';
-import { Imagen3EnhancePromptButton } from 'features/parameters/components/Core/Imagen3EnhancePromptButton';
 import { PromptLabel } from 'features/parameters/components/Prompts/PromptLabel';
 import { PromptOverlayButtonWrapper } from 'features/parameters/components/Prompts/PromptOverlayButtonWrapper';
 import { ViewModePrompt } from 'features/parameters/components/Prompts/ViewModePrompt';
@@ -88,7 +87,6 @@ export const ParamPositivePrompt = memo(() => {
         <PromptOverlayButtonWrapper>
           <AddPromptTriggerButton isOpen={isOpen} onOpen={onOpen} />
           {baseModel === 'sdxl' && <SDXLConcatButton />}
-          {baseModel === 'imagen3' && <Imagen3EnhancePromptButton />}
           <ShowDynamicPromptsPreviewButton />
         </PromptOverlayButtonWrapper>
         <PromptLabel label={t('parameters.positivePromptPlaceholder')} />

invokeai/frontend/web/src/features/parameters/components/Core/ParamPositivePrompt.tsx

@@ -2,21 +2,13 @@ import { CompositeNumberInput, FormControl, FormLabel } from '@invoke-ai/ui-libr
 import { NUMPY_RAND_MAX, NUMPY_RAND_MIN } from 'app/constants';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import { InformationalPopover } from 'common/components/InformationalPopover/InformationalPopover';
-import {
-  selectImagen3EnhancePrompt,
-  selectIsImagen3,
-  selectSeed,
-  selectShouldRandomizeSeed,
-  setSeed,
-} from 'features/controlLayers/store/paramsSlice';
+import { selectSeed, selectShouldRandomizeSeed, setSeed } from 'features/controlLayers/store/paramsSlice';
 import { memo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 
 export const ParamSeedNumberInput = memo(() => {
   const seed = useAppSelector(selectSeed);
   const shouldRandomizeSeed = useAppSelector(selectShouldRandomizeSeed);
-  const isImagen3 = useAppSelector(selectIsImagen3);
-  const imagen3EnhancePrompt = useAppSelector(selectImagen3EnhancePrompt);
 
   const { t } = useTranslation();
 
@@ -25,7 +17,7 @@ export const ParamSeedNumberInput = memo(() => {
   const handleChangeSeed = useCallback((v: number) => dispatch(setSeed(v)), [dispatch]);
 
   return (
-    <FormControl flexGrow={1} isDisabled={shouldRandomizeSeed || (isImagen3 && imagen3EnhancePrompt)}>
+    <FormControl flexGrow={1} isDisabled={shouldRandomizeSeed}>
       <InformationalPopover feature="paramSeed">
         <FormLabel>{t('parameters.seed')}</FormLabel>
       </InformationalPopover>

invokeai/frontend/web/src/features/parameters/components/Seed/ParamSeedNumberInput.tsx

@@ -1,20 +1,13 @@
 import { FormControl, FormLabel, Switch } from '@invoke-ai/ui-library';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import {
-  selectImagen3EnhancePrompt,
-  selectIsImagen3,
-  selectShouldRandomizeSeed,
-  setShouldRandomizeSeed,
-} from 'features/controlLayers/store/paramsSlice';
+import { selectShouldRandomizeSeed, setShouldRandomizeSeed } from 'features/controlLayers/store/paramsSlice';
 import type { ChangeEvent } from 'react';
 import { memo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 
 export const ParamSeedRandomize = memo(() => {
   const dispatch = useAppDispatch();
   const { t } = useTranslation();
-  const isImagen3 = useAppSelector(selectIsImagen3);
-  const imagen3EnhancePrompt = useAppSelector(selectImagen3EnhancePrompt);
 
   const shouldRandomizeSeed = useAppSelector(selectShouldRandomizeSeed);
 
@@ -24,7 +17,7 @@ export const ParamSeedRandomize = memo(() => {
   );
 
   return (
-    <FormControl w="min-content" isDisabled={isImagen3 && imagen3EnhancePrompt}>
+    <FormControl w="min-content">
       <FormLabel m={0}>{t('common.random')}</FormLabel>
       <Switch isChecked={shouldRandomizeSeed} onChange={handleChangeShouldRandomizeSeed} />
     </FormControl>

invokeai/frontend/web/src/features/parameters/components/Seed/ParamSeedRandomize.tsx

@@ -3,8 +3,6 @@ import { NUMPY_RAND_MAX, NUMPY_RAND_MIN } from 'app/constants';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import randomInt from 'common/util/randomInt';
 import {
-  selectImagen3EnhancePrompt,
-  selectIsImagen3,
   selectShouldRandomizeSeed,
   setSeed,
 } from 'features/controlLayers/store/paramsSlice';
@@ -15,8 +13,6 @@ import { PiShuffleBold } from 'react-icons/pi';
 export const ParamSeedShuffle = memo(() => {
   const dispatch = useAppDispatch();
   const shouldRandomizeSeed = useAppSelector(selectShouldRandomizeSeed);
-  const isImagen3 = useAppSelector(selectIsImagen3);
-  const imagen3EnhancePrompt = useAppSelector(selectImagen3EnhancePrompt);
 
   const { t } = useTranslation();
 
@@ -28,7 +24,7 @@ export const ParamSeedShuffle = memo(() => {
   return (
     <Button
       size="sm"
-      isDisabled={shouldRandomizeSeed || (isImagen3 && imagen3EnhancePrompt)}
+      isDisabled={shouldRandomizeSeed}
       onClick={handleClickRandomizeSeed}
       leftIcon={<PiShuffleBold />}
       flexShrink={0}

invokeai/frontend/web/src/features/parameters/components/Seed/ParamSeedShuffle.tsx

@@ -3,7 +3,12 @@ import { Flex, FormControlGroup, StandaloneAccordion } from '@invoke-ai/ui-libra
 import { skipToken } from '@reduxjs/toolkit/query';
 import { createMemoizedSelector } from 'app/store/createMemoizedSelector';
 import { useAppSelector } from 'app/store/storeHooks';
-import { selectIsFLUX, selectIsSD3, selectParamsSlice, selectVAEKey } from 'features/controlLayers/store/paramsSlice';
+import {
+  selectIsFLUX,
+  selectIsSD3,
+  selectParamsSlice,
+  selectVAEKey,
+} from 'features/controlLayers/store/paramsSlice';
 import ParamCFGRescaleMultiplier from 'features/parameters/components/Advanced/ParamCFGRescaleMultiplier';
 import ParamCLIPEmbedModelSelect from 'features/parameters/components/Advanced/ParamCLIPEmbedModelSelect';
 import ParamCLIPGEmbedModelSelect from 'features/parameters/components/Advanced/ParamCLIPGEmbedModelSelect';

invokeai/frontend/web/src/features/settingsAccordions/components/AdvancedSettingsAccordion/AdvancedSettingsAccordion.tsx

@@ -73,9 +73,17 @@ export const ImageSettingsAccordion = memo(() => {
       isOpen={isOpenAccordion}
       onToggle={onToggleAccordion}
     >
-      <Flex px={4} pt={4} w="full" h="full" flexDir="column" data-testid="image-settings-accordion">
+      <Flex
+        px={4}
+        pt={4}
+        pb={isImagen3 ? 4 : 0}
+        w="full"
+        h="full"
+        flexDir="column"
+        data-testid="image-settings-accordion"
+      >
         <BboxSettings />
-        <ParamSeed py={3} />
+        {!isImagen3 && <ParamSeed py={3} />}
         {!isImagen3 && (
           <Expander label={t('accordions.advanced.options')} isOpen={isOpenExpander} onToggle={onToggleExpander}>
             <Flex gap={4} pb={4} flexDir="column">