fix metadata references, add support for negative_conditioning syntax

invokeai/frontend/web/src/features/gallery/components/CurrentImageButtons.tsx

@@ -109,8 +109,9 @@ const currentImageButtonsSelector = createSelector(
       isLightboxOpen,
       shouldHidePreview,
       image: selectedImage,
-      seed: selectedImage?.metadata?.invokeai?.node?.seed,
-      prompt: selectedImage?.metadata?.invokeai?.node?.prompt,
+      seed: selectedImage?.metadata?.seed,
+      prompt: selectedImage?.metadata?.positive_conditioning,
+      negativePrompt: selectedImage?.metadata?.negative_conditioning,
     };
   },
   {
@@ -245,13 +246,16 @@ const CurrentImageButtons = (props: CurrentImageButtonsProps) => {
   );
 
   const handleUseSeed = useCallback(() => {
-    recallSeed(image?.metadata?.invokeai?.node?.seed);
+    recallSeed(image?.metadata?.seed);
   }, [image, recallSeed]);
 
   useHotkeys('s', handleUseSeed, [image]);
 
   const handleUsePrompt = useCallback(() => {
-    recallPrompt(image?.metadata?.invokeai?.node?.prompt);
+    recallPrompt(
+      image?.metadata?.positive_conditioning,
+      image?.metadata?.negative_conditioning
+    );
   }, [image, recallPrompt]);
 
   useHotkeys('p', handleUsePrompt, [image]);
@@ -454,7 +458,7 @@ const CurrentImageButtons = (props: CurrentImageButtonsProps) => {
                 {t('parameters.copyImageToLink')}
               </IAIButton>
 
-              <Link download={true} href={getUrl(image?.url ?? '')}>
+              <Link download={true} href={getUrl(image?.image_url ?? '')}>
                 <IAIButton leftIcon={<FaDownload />} size="sm" w="100%">
                   {t('parameters.downloadImage')}
                 </IAIButton>
@@ -500,7 +504,7 @@ const CurrentImageButtons = (props: CurrentImageButtonsProps) => {
             icon={<FaQuoteRight />}
             tooltip={`${t('parameters.usePrompt')} (P)`}
             aria-label={`${t('parameters.usePrompt')} (P)`}
-            isDisabled={!image?.metadata?.invokeai?.node?.prompt}
+            isDisabled={!image?.metadata?.positive_conditioning}
             onClick={handleUsePrompt}
           />
 
@@ -508,7 +512,7 @@ const CurrentImageButtons = (props: CurrentImageButtonsProps) => {
             icon={<FaSeedling />}
             tooltip={`${t('parameters.useSeed')} (S)`}
             aria-label={`${t('parameters.useSeed')} (S)`}
-            isDisabled={!image?.metadata?.invokeai?.node?.seed}
+            isDisabled={!image?.metadata?.seed}
             onClick={handleUseSeed}
           />
 
@@ -517,9 +521,8 @@ const CurrentImageButtons = (props: CurrentImageButtonsProps) => {
             tooltip={`${t('parameters.useAll')} (A)`}
             aria-label={`${t('parameters.useAll')} (A)`}
             isDisabled={
-              !['txt2img', 'img2img', 'inpaint'].includes(
-                String(image?.metadata?.invokeai?.node?.type)
-              )
+              // not sure what this list should be
+              !['t2l', 'l2l', 'inpaint'].includes(String(image?.metadata?.type))
             }
             onClick={handleClickUseAllParameters}
           />

invokeai/frontend/web/src/features/gallery/components/HoverableImage.tsx

@@ -155,7 +155,10 @@ const HoverableImage = memo((props: HoverableImageProps) => {
 
   // Recall parameters handlers
   const handleRecallPrompt = useCallback(() => {
-    recallPrompt(image.metadata?.positive_conditioning);
+    recallPrompt(
+      image.metadata?.positive_conditioning,
+      image.metadata?.negative_conditioning
+    );
   }, [image, recallPrompt]);
 
   const handleRecallSeed = useCallback(() => {

invokeai/frontend/web/src/features/gallery/components/ImageMetaDataViewer/ImageMetadataViewer.tsx

@@ -8,29 +8,20 @@ import {
   Text,
   Tooltip,
 } from '@chakra-ui/react';
-import * as InvokeAI from 'app/types/invokeai';
 import { useAppDispatch } from 'app/store/storeHooks';
 import { useGetUrl } from 'common/util/getUrl';
 import promptToString from 'common/util/promptToString';
-import { seedWeightsToString } from 'common/util/seedWeightPairs';
-import useSetBothPrompts from 'features/parameters/hooks/usePrompt';
 import {
   setCfgScale,
   setHeight,
   setImg2imgStrength,
   setNegativePrompt,
-  setPerlin,
   setPositivePrompt,
   setScheduler,
-  setSeamless,
   setSeed,
-  setSeedWeights,
-  setShouldFitToWidthHeight,
   setSteps,
-  setThreshold,
   setWidth,
 } from 'features/parameters/store/generationSlice';
-import { setHiresFix } from 'features/parameters/store/postprocessingSlice';
 import { setShouldShowImageDetails } from 'features/ui/store/uiSlice';
 import { memo } from 'react';
 import { useHotkeys } from 'react-hotkeys-hook';
@@ -39,7 +30,6 @@ import { FaCopy } from 'react-icons/fa';
 import { IoArrowUndoCircleOutline } from 'react-icons/io5';
 import { OverlayScrollbarsComponent } from 'overlayscrollbars-react';
 import { ImageDTO } from 'services/api';
-import { filter } from 'lodash-es';
 import { Scheduler } from 'app/constants';
 
 type MetadataItemProps = {
@@ -126,8 +116,6 @@ const memoEqualityCheck = (
 const ImageMetadataViewer = memo(({ image }: ImageMetadataViewerProps) => {
   const dispatch = useAppDispatch();
 
-  const setBothPrompts = useSetBothPrompts();
-
   useHotkeys('esc', () => {
     dispatch(setShouldShowImageDetails(false));
   });

invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildTextToImageGraph.ts

@@ -11,7 +11,7 @@ import { addNoiseNodes } from '../nodeBuilders/addNoiseNodes';
 const POSITIVE_CONDITIONING = 'positive_conditioning';
 const NEGATIVE_CONDITIONING = 'negative_conditioning';
 const TEXT_TO_LATENTS = 'text_to_latents';
-const LATENTS_TO_IMAGE = 'latnets_to_image';
+const LATENTS_TO_IMAGE = 'latents_to_image';
 
 /**
  * Builds the Text to Image tab graph.

invokeai/frontend/web/src/features/parameters/hooks/useParameters.ts

@@ -21,8 +21,8 @@ export const useParameters = () => {
    * Sets prompt with toast
    */
   const recallPrompt = useCallback(
-    (prompt: unknown) => {
-      if (!isString(prompt)) {
+    (prompt: unknown, negativePrompt?: unknown) => {
+      if (!isString(prompt) || !isString(negativePrompt)) {
         toaster({
           title: t('toast.promptNotSet'),
           description: t('toast.promptNotSetDesc'),
@@ -33,7 +33,7 @@ export const useParameters = () => {
         return;
       }
 
-      setBothPrompts(prompt);
+      setBothPrompts(prompt, negativePrompt);
       toaster({
         title: t('toast.promptSet'),
         status: 'info',
@@ -112,12 +112,13 @@ export const useParameters = () => {
   const recallAllParameters = useCallback(
     (image: ImageDTO | undefined) => {
       const type = image?.metadata?.type;
-      if (['txt2img', 'img2img', 'inpaint'].includes(String(type))) {
+      // not sure what this list should be
+      if (['t2l', 'l2l', 'inpaint'].includes(String(type))) {
         dispatch(allParametersSet(image));
 
-        if (image?.metadata?.type === 'img2img') {
+        if (image?.metadata?.type === 'l2l') {
           dispatch(setActiveTab('img2img'));
-        } else if (image?.metadata?.type === 'txt2img') {
+        } else if (image?.metadata?.type === 't2l') {
           dispatch(setActiveTab('txt2img'));
         }
 

invokeai/frontend/web/src/features/parameters/hooks/usePrompt.ts

@@ -12,16 +12,11 @@ const useSetBothPrompts = () => {
   const dispatch = useAppDispatch();
 
   return useCallback(
-    (inputPrompt: InvokeAI.Prompt) => {
-      const promptString =
-        typeof inputPrompt === 'string'
-          ? inputPrompt
-          : promptToString(inputPrompt);
-
-      const [prompt, negativePrompt] = getPromptAndNegative(promptString);
-
-      dispatch(setPositivePrompt(prompt));
+    (inputPrompt: InvokeAI.Prompt, negativePrompt?: InvokeAI.Prompt) => {
+      dispatch(setPositivePrompt(inputPrompt));
+      if (negativePrompt) {
         dispatch(setNegativePrompt(negativePrompt));
+      }
     },
     [dispatch]
   );