Implement a cancel after next iteration button

invokeai/frontend/.gitignore

@@ -25,4 +25,7 @@ dist-ssr
 *.sw?
 
 # build stats
-stats.html
+stats.html
+
+# Yarn
+.yarn

invokeai/frontend/.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

invokeai/frontend/dist/index.html

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>InvokeAI - A Stable Diffusion Toolkit</title>
     <link rel="shortcut icon" type="icon" href="./assets/favicon-0d253ced.ico" />
-    <script type="module" crossorigin src="./assets/index-ad762ffd.js"></script>
+    <script type="module" crossorigin src="./assets/index-f007d4c5.js"></script>
     <link rel="stylesheet" href="./assets/index-fecb6dd4.css">
   </head>
 

invokeai/frontend/dist/locales/parameters/en.json

@@ -44,6 +44,8 @@
   "toggleLoopback": "Toggle Loopback",
   "invoke": "Invoke",
   "cancel": "Cancel",
+  "scheduleCancel": "Cancel after current iteration",
+  "cancelScheduled": "Canceling",
   "promptPlaceholder": "Type prompt here. [negative tokens], (upweight)++, (downweight)--, swap and blend are available (see docs)",
   "negativePrompts": "Negative Prompts",
   "sendTo": "Send to",

invokeai/frontend/public/locales/parameters/en.json

@@ -44,6 +44,8 @@
   "toggleLoopback": "Toggle Loopback",
   "invoke": "Invoke",
   "cancel": "Cancel",
+  "scheduleCancel": "Cancel after current iteration",
+  "cancelScheduled": "Canceling",
   "promptPlaceholder": "Type prompt here. [negative tokens], (upweight)++, (downweight)--, swap and blend are available (see docs)",
   "negativePrompts": "Negative Prompts",
   "sendTo": "Send to",

invokeai/frontend/src/features/parameters/components/ProcessButtons/CancelButton.tsx

@@ -7,10 +7,12 @@ import IAIIconButton, {
 import { systemSelector } from 'features/system/store/systemSelectors';
 import { SystemState } from 'features/system/store/systemSlice';
 import { isEqual } from 'lodash';
+import { useState, useEffect, useCallback } from 'react';
+import { Spinner } from '@chakra-ui/react';
 
 import { useHotkeys } from 'react-hotkeys-hook';
 import { useTranslation } from 'react-i18next';
-import { MdCancel } from 'react-icons/md';
+import { MdCancel, MdCancelScheduleSend } from 'react-icons/md';
 
 const cancelButtonSelector = createSelector(
   systemSelector,
@@ -19,6 +21,8 @@ const cancelButtonSelector = createSelector(
       isProcessing: system.isProcessing,
       isConnected: system.isConnected,
       isCancelable: system.isCancelable,
+      currentIteration: system.currentIteration,
+      totalIterations: system.totalIterations,
     };
   },
   {
@@ -31,14 +35,27 @@ const cancelButtonSelector = createSelector(
 export default function CancelButton(
   props: Omit<IAIIconButtonProps, 'aria-label'>
 ) {
-  const { ...rest } = props;
   const dispatch = useAppDispatch();
-  const { isProcessing, isConnected, isCancelable } =
+  const { ...rest } = props;
-    useAppSelector(cancelButtonSelector);
+  const {
-  const handleClickCancel = () => dispatch(cancelProcessing());
+    isProcessing,
+    isConnected,
+    isCancelable,
+    currentIteration,
+    totalIterations,
+  } = useAppSelector(cancelButtonSelector);
+  const [cancelAfterIteration, setCancelAfterIteration] = useState<number>(
+    Number.MAX_SAFE_INTEGER
+  );
+  const handleClickCancel = useCallback(() => {
+    dispatch(cancelProcessing());
+    setCancelAfterIteration(Number.MAX_SAFE_INTEGER);
+  }, [dispatch]);
 
   const { t } = useTranslation();
 
+  const isCancelScheduled = cancelAfterIteration !== Number.MAX_SAFE_INTEGER;
+
   useHotkeys(
     'shift+x',
     () => {
@@ -49,15 +66,50 @@ export default function CancelButton(
     [isConnected, isProcessing, isCancelable]
   );
 
+  useEffect(() => {
+    if (cancelAfterIteration < currentIteration) {
+      handleClickCancel();
+    }
+  }, [cancelAfterIteration, currentIteration, handleClickCancel]);
+
   return (
-    <IAIIconButton
+    <>
-      icon={<MdCancel />}
+      <IAIIconButton
-      tooltip={t('parameters:cancel')}
+        icon={<MdCancel />}
-      aria-label={t('parameters:cancel')}
+        tooltip={t('parameters:cancel')}
-      isDisabled={!isConnected || !isProcessing || !isCancelable}
+        aria-label={t('parameters:cancel')}
-      onClick={handleClickCancel}
+        isDisabled={!isConnected || !isProcessing || !isCancelable}
-      styleClass="cancel-btn"
+        onClick={handleClickCancel}
-      {...rest}
+        styleClass="cancel-btn"
-    />
+        {...rest}
+      />
+      <IAIIconButton
+        icon={isCancelScheduled ? <Spinner /> : <MdCancelScheduleSend />}
+        tooltip={
+          isCancelScheduled
+            ? t('parameters:cancelScheduled')
+            : t('parameters:scheduleCancel')
+        }
+        aria-label={
+          isCancelScheduled
+            ? t('parameters:cancelScheduled')
+            : t('parameters:scheduleCancel')
+        }
+        isDisabled={
+          !isConnected ||
+          !isProcessing ||
+          !isCancelable ||
+          currentIteration === totalIterations
+        }
+        onClick={() => {
+          // If a cancel request has already been made, and the user clicks again before the next iteration has been processed, stop the request.
+          if (isCancelScheduled)
+            setCancelAfterIteration(Number.MAX_SAFE_INTEGER);
+          else setCancelAfterIteration(currentIteration);
+        }}
+        styleClass="cancel-btn"
+        {...rest}
+      />
+    </>
   );
 }