Merge branch 'main' into tiled-upscaling-graph

invokeai/configs/INITIAL_MODELS.yaml

@@ -32,9 +32,9 @@ sd-1/main/Analog-Diffusion:
    description: An SD-1.5 model trained on diverse analog photographs (2.13 GB)
    repo_id: wavymulder/Analog-Diffusion
    recommended: False
-sd-1/main/Deliberate:
+sd-1/main/Deliberate_v5:
    description: Versatile model that produces detailed images up to 768px (4.27 GB)
-   repo_id: XpucT/Deliberate
+   path: https://huggingface.co/XpucT/Deliberate/resolve/main/Deliberate_v5.safetensors
    recommended: False
 sd-1/main/Dungeons-and-Diffusion:
    description: Dungeons & Dragons characters (2.13 GB)

invokeai/frontend/web/public/locales/de.json

@@ -99,7 +99,18 @@
         "data": "Daten",
         "safetensors": "Safetensors",
         "outpaint": "outpaint",
-        "details": "Details"
+        "details": "Details",
+        "format": "Format",
+        "unknown": "Unbekannt",
+        "folder": "Ordner",
+        "error": "Fehler",
+        "installed": "Installiert",
+        "ai": "KI",
+        "file": "Datei",
+        "somethingWentWrong": "Etwas ist schief gelaufen",
+        "copyError": "$t(gallery.copy) Fehler",
+        "input": "Eingabe",
+        "notInstalled": "Nicht $t(common.installed)"
     },
     "gallery": {
         "generations": "Erzeugungen",
@@ -696,7 +707,9 @@
         "menu": "Menü",
         "loadMore": "Mehr laden",
         "invokeProgressBar": "Invoke Fortschrittsanzeige",
-        "mode": "Modus"
+        "mode": "Modus",
+        "resetUI": "$t(accessibility.reset) von UI",
+        "createIssue": "Ticket erstellen"
     },
     "boards": {
         "autoAddBoard": "Automatisches Hinzufügen zum Ordner",
@@ -718,7 +731,9 @@
         "deleteBoardOnly": "Nur Ordner löschen",
         "deleteBoard": "Löschen Ordner",
         "deleteBoardAndImages": "Löschen Ordner und Bilder",
-        "deletedBoardsCannotbeRestored": "Gelöschte Ordner könnte nicht wiederhergestellt werden"
+        "deletedBoardsCannotbeRestored": "Gelöschte Ordner könnte nicht wiederhergestellt werden",
+        "movingImagesToBoard_one": "Verschiebe {{count}} Bild zu Ordner",
+        "movingImagesToBoard_other": "Verschiebe {{count}} Bilder in Ordner"
     },
     "controlnet": {
         "showAdvanced": "Zeige Erweitert",
@@ -843,7 +858,7 @@
         "cancelBatchSucceeded": "Stapel abgebrochen",
         "cancelBatch": "Stapel stoppen",
         "enqueueing": "Stapel in der Warteschlange",
-        "queueMaxExceeded": "Maximum von  {{max_queue_size}} Elementen erreicht, würde {{skip}} Elemente überspringen",
+        "queueMaxExceeded": "Maximum von {{max_queue_size}} Elementen erreicht, würde {{skip}} Elemente überspringen",
         "cancelBatchFailed": "Problem beim Abbruch vom Stapel",
         "clearQueueAlertDialog2": "bist du sicher die Warteschlange zu leeren?",
         "pruneSucceeded": "{{item_count}} abgeschlossene Elemente aus der Warteschlange entfernt",
@@ -932,7 +947,8 @@
     "embedding": {
         "noMatchingEmbedding": "Keine passenden Embeddings",
         "addEmbedding": "Embedding hinzufügen",
-        "incompatibleModel": "Inkompatibles Basismodell:"
+        "incompatibleModel": "Inkompatibles Basismodell:",
+        "noEmbeddingsLoaded": "Kein Embedding geladen"
     },
     "nodes": {
         "booleanPolymorphicDescription": "Eine Sammlung boolescher Werte.",

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

@@ -161,6 +161,7 @@
         "txt2img": "Text To Image",
         "unifiedCanvas": "Unified Canvas",
         "unknown": "Unknown",
+        "unknownError": "Unknown Error",
         "upload": "Upload"
     },
     "controlnet": {
@@ -384,7 +385,9 @@
         "deleteSelection": "Delete Selection",
         "downloadSelection": "Download Selection",
         "preparingDownload": "Preparing Download",
-        "preparingDownloadFailed": "Problem Preparing Download"
+        "preparingDownloadFailed": "Problem Preparing Download",
+        "problemDeletingImages": "Problem Deleting Images",
+        "problemDeletingImagesDesc": "One or more images could not be deleted"
     },
     "hotkeys": {
         "acceptStagingImage": {

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/batchEnqueued.ts

@@ -3,7 +3,7 @@ import { logger } from 'app/logging/logger';
 import { parseify } from 'common/util/serialize';
 import { zPydanticValidationError } from 'features/system/store/zodSchemas';
 import { t } from 'i18next';
-import { get, truncate, upperFirst } from 'lodash-es';
+import { truncate, upperFirst } from 'lodash-es';
 import { queueApi } from 'services/api/endpoints/queue';
 import { TOAST_OPTIONS, theme } from 'theme/theme';
 import { startAppListening } from '..';
@@ -74,22 +74,11 @@ export const addBatchEnqueuedListener = () => {
             ),
           });
         });
-      } else {
-        let detail = 'Unknown Error';
-        let duration = undefined;
-        if (response.status === 403 && 'body' in response) {
-          detail = get(response, 'body.detail', 'Unknown Error');
-        } else if (response.status === 403 && 'error' in response) {
-          detail = get(response, 'error.detail', 'Unknown Error');
-        } else if (response.status === 403 && 'data' in response) {
-          detail = get(response, 'data.detail', 'Unknown Error');
-          duration = 15000;
-        }
+      } else if (response.status !== 403) {
         toast({
           title: t('queue.batchFailedToQueue'),
+          description: t('common.unknownError'),
           status: 'error',
-          description: detail,
-          ...(duration ? { duration } : {}),
         });
       }
       logger('queue').error(

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/controlNetImageProcessed.ts

@@ -109,20 +109,9 @@ export const addControlNetImageProcessedListener = () => {
           t('queue.graphFailedToQueue')
         );
 
-        // handle usage-related errors
         if (error instanceof Object) {
           if ('data' in error && 'status' in error) {
             if (error.status === 403) {
-              // eslint-disable-next-line @typescript-eslint/no-explicit-any
-              const detail = (error.data as any)?.detail || 'Unknown Error';
-              dispatch(
-                addToast({
-                  title: t('queue.graphFailedToQueue'),
-                  status: 'error',
-                  description: detail,
-                  duration: 15000,
-                })
-              );
               dispatch(pendingControlImagesCleared());
               dispatch(controlAdapterImageChanged({ id, controlImage: null }));
               return;

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/upscaleRequested.ts

@@ -75,31 +75,20 @@ export const addUpscaleRequestedListener = () => {
           t('queue.graphFailedToQueue')
         );
 
-        // handle usage-related errors
-        if (error instanceof Object) {
-          if ('data' in error && 'status' in error) {
-            if (error.status === 403) {
-              // eslint-disable-next-line @typescript-eslint/no-explicit-any
-              const detail = (error.data as any)?.detail || 'Unknown Error';
-              dispatch(
-                addToast({
-                  title: t('queue.graphFailedToQueue'),
-                  status: 'error',
-                  description: detail,
-                  duration: 15000,
-                })
-              );
-              return;
-            }
-          }
+        if (
+          error instanceof Object &&
+          'status' in error &&
+          error.status === 403
+        ) {
+          return;
+        } else {
+          dispatch(
+            addToast({
+              title: t('queue.graphFailedToQueue'),
+              status: 'error',
+            })
+          );
         }
-
-        dispatch(
-          addToast({
-            title: t('queue.graphFailedToQueue'),
-            status: 'error',
-          })
-        );
       }
     },
   });

invokeai/frontend/web/src/app/store/store.ts

@@ -33,6 +33,7 @@ import { actionsDenylist } from './middleware/devtools/actionsDenylist';
 import { stateSanitizer } from './middleware/devtools/stateSanitizer';
 import { listenerMiddleware } from './middleware/listenerMiddleware';
 import { createStore as createIDBKeyValStore, get, set } from 'idb-keyval';
+import { authToastMiddleware } from 'services/api/authToastMiddleware';
 
 const allReducers = {
   canvas: canvasReducer,
@@ -107,6 +108,7 @@ export const createStore = (uniqueStoreKey?: string) =>
       })
         .concat(api.middleware)
         .concat(dynamicMiddlewares)
+        .concat(authToastMiddleware)
         .prepend(listenerMiddleware.middleware),
     devTools: {
       actionSanitizer,

invokeai/frontend/web/src/services/api/authToastMiddleware.ts

@@ -0,0 +1,26 @@
+import { isRejectedWithValue } from '@reduxjs/toolkit';
+import type { MiddlewareAPI, Middleware } from '@reduxjs/toolkit';
+import { addToast } from 'features/system/store/systemSlice';
+import { t } from 'i18next';
+
+export const authToastMiddleware: Middleware =
+  (api: MiddlewareAPI) => (next) => (action) => {
+    if (isRejectedWithValue(action)) {
+      if (action.payload.status === 403) {
+        const { dispatch } = api;
+        const customMessage =
+          action.payload.data.detail !== 'Forbidden'
+            ? action.payload.data.detail
+            : undefined;
+        dispatch(
+          addToast({
+            title: t('common.somethingWentWrong'),
+            status: 'error',
+            description: customMessage,
+          })
+        );
+      }
+    }
+
+    return next(action);
+  };

invokeai/frontend/web/src/services/api/endpoints/images.ts

@@ -27,6 +27,8 @@ import {
   imagesSelectors,
 } from 'services/api/util';
 import { boardsApi } from './boards';
+import { addToast } from 'features/system/store/systemSlice';
+import { t } from 'i18next';
 
 export const imagesApi = api.injectEndpoints({
   endpoints: (build) => ({
@@ -208,6 +210,16 @@ export const imagesApi = api.injectEndpoints({
         try {
           const { data } = await queryFulfilled;
 
+          if (data.deleted_images.length < imageDTOs.length) {
+            dispatch(
+              addToast({
+                title: t('gallery.problemDeletingImages'),
+                description: t('gallery.problemDeletingImagesDesc'),
+                status: 'warning',
+              })
+            );
+          }
+
           // convert to an object so we can access the successfully delete image DTOs by name
           const groupedImageDTOs = keyBy(imageDTOs, 'image_name');