Merge branch 'main' into lstein/model-manager-refactor

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml

@@ -1,5 +1,5 @@
 name: Feature Request
-description: Commit a idea or Request a new feature
+description: Contribute a idea or request a new feature
 title: '[enhancement]: '
 labels: ['enhancement']
 # assignees:
@@ -9,14 +9,14 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to fill out this Feature request!
+        Thanks for taking the time to fill out this feature request!
 
   - type: checkboxes
     attributes:
       label: Is there an existing issue for this?
       description: |
         Please make use of the [search function](https://github.com/invoke-ai/InvokeAI/labels/enhancement)
-        to see if a simmilar issue already exists for the feature you want to request
+        to see if a similar issue already exists for the feature you want to request
       options:
         - label: I have searched the existing issues
           required: true
@@ -36,7 +36,7 @@ body:
       label: What should this feature add?
       description: Please try to explain the functionality this feature should add
       placeholder: |
-        Instead of one huge textfield, it would be nice to have forms for bug-reports, feature-requests, ...
+        Instead of one huge text field, it would be nice to have forms for bug-reports, feature-requests, ...
         Great benefits with automatic labeling, assigning and other functionalitys not available in that form
         via old-fashioned markdown-templates. I would also love to see the use of a moderator bot 🤖 like
         https://github.com/marketplace/actions/issue-moderator-with-commands to auto close old issues and other things
@@ -51,6 +51,6 @@ body:
 
   - type: textarea
     attributes:
-      label: Aditional Content
+      label: Additional Content
       description: Add any other context or screenshots about the feature request here.
-      placeholder: This is a Mockup of the design how I imagine it <screenshot>
+      placeholder: This is a mockup of the design how I imagine it <screenshot>

docs/index.md

@@ -15,7 +15,8 @@ title: Home
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.2.1/css/fontawesome.min.css">
 <style>
     .button {
-      width: 300px;
+      width: 100%;
+      max-width: 100%;
       height: 50px;
       background-color: #448AFF;
       color: #fff;
@@ -27,8 +28,9 @@ title: Home
 
     .button-container {
       display: grid;
-      grid-template-columns: repeat(3, 300px);
+      grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
       gap: 20px;
+      justify-content: center;
     }
 
     .button:hover {

invokeai/app/api_app.py

@@ -1,45 +1,47 @@
 # Copyright (c) 2022-2023 Kyle Schouviller (https://github.com/kyle0654) and the InvokeAI Team
-import asyncio
-import logging
-import socket
-from inspect import signature
-from pathlib import Path
-
-import uvicorn
-from fastapi import FastAPI
-from fastapi.middleware.cors import CORSMiddleware
-from fastapi.openapi.docs import get_redoc_html, get_swagger_ui_html
-from fastapi.openapi.utils import get_openapi
-from fastapi.staticfiles import StaticFiles
-from fastapi_events.handlers.local import local_handler
-from fastapi_events.middleware import EventHandlerASGIMiddleware
-from pydantic.schema import schema
-
 from .services.config import InvokeAIAppConfig
-from ..backend.util.logging import InvokeAILogger
-
-from invokeai.version.invokeai_version import __version__
-
-import invokeai.frontend.web as web_dir
-import mimetypes
-
-from .api.dependencies import ApiDependencies
-from .api.routers import sessions, models, images, boards, board_images, app_info
-from .api.sockets import SocketIO
-from .invocations.baseinvocation import BaseInvocation, _InputField, _OutputField, UIConfigBase
-
-import torch
-
-# noinspection PyUnresolvedReferences
-import invokeai.backend.util.hotfixes  # noqa: F401 (monkeypatching on import)
-
-if torch.backends.mps.is_available():
-    # noinspection PyUnresolvedReferences
-    import invokeai.backend.util.mps_fixes  # noqa: F401 (monkeypatching on import)
-
 
+# parse_args() must be called before any other imports. if it is not called first, consumers of the config
+# which are imported/used before parse_args() is called will get the default config values instead of the
+# values from the command line or config file.
 app_config = InvokeAIAppConfig.get_config()
 app_config.parse_args()
+
+if True:  # hack to make flake8 happy with imports coming after setting up the config
+    import asyncio
+    import logging
+    import mimetypes
+    import socket
+    from inspect import signature
+    from pathlib import Path
+
+    import torch
+    import uvicorn
+    from fastapi import FastAPI
+    from fastapi.middleware.cors import CORSMiddleware
+    from fastapi.openapi.docs import get_redoc_html, get_swagger_ui_html
+    from fastapi.openapi.utils import get_openapi
+    from fastapi.staticfiles import StaticFiles
+    from fastapi_events.handlers.local import local_handler
+    from fastapi_events.middleware import EventHandlerASGIMiddleware
+    from pydantic.schema import schema
+
+    # noinspection PyUnresolvedReferences
+    import invokeai.backend.util.hotfixes  # noqa: F401 (monkeypatching on import)
+    import invokeai.frontend.web as web_dir
+    from invokeai.version.invokeai_version import __version__
+
+    from ..backend.util.logging import InvokeAILogger
+    from .api.dependencies import ApiDependencies
+    from .api.routers import app_info, board_images, boards, images, models, sessions
+    from .api.sockets import SocketIO
+    from .invocations.baseinvocation import BaseInvocation, UIConfigBase, _InputField, _OutputField
+
+    if torch.backends.mps.is_available():
+        # noinspection PyUnresolvedReferences
+        import invokeai.backend.util.mps_fixes  # noqa: F401 (monkeypatching on import)
+
+
 logger = InvokeAILogger.getLogger(config=app_config)
 
 # fix for windows mimetypes registry entries being borked

invokeai/app/cli_app.py

@@ -1,67 +1,64 @@
 # Copyright (c) 2022 Kyle Schouviller (https://github.com/kyle0654)
 
-import argparse
-import re
-import shlex
-import sys
-import time
-from typing import Union, get_type_hints, Optional
-
-from pydantic import BaseModel, ValidationError
-from pydantic.fields import Field
-
-# This should come early so that the logger can pick up its configuration options
 from .services.config import InvokeAIAppConfig
-from invokeai.backend.util.logging import InvokeAILogger
-from invokeai.version.invokeai_version import __version__
-
-
-from invokeai.app.services.board_image_record_storage import (
-    SqliteBoardImageRecordStorage,
-)
-from invokeai.app.services.board_images import (
-    BoardImagesService,
-    BoardImagesServiceDependencies,
-)
-from invokeai.app.services.board_record_storage import SqliteBoardRecordStorage
-from invokeai.app.services.boards import BoardService, BoardServiceDependencies
-from invokeai.app.services.image_record_storage import SqliteImageRecordStorage
-from invokeai.app.services.images import ImageService, ImageServiceDependencies
-from invokeai.app.services.resource_name import SimpleNameService
-from invokeai.app.services.urls import LocalUrlService
-from invokeai.app.services.invocation_stats import InvocationStatsService
-from .services.default_graphs import default_text_to_image_graph_id, create_system_graphs
-from .services.latent_storage import DiskLatentsStorage, ForwardCacheLatentsStorage
-
-from .cli.commands import BaseCommand, CliContext, ExitCli, SortedHelpFormatter, add_graph_parsers, add_parsers
-from .cli.completer import set_autocompleter
-from .invocations.baseinvocation import BaseInvocation
-from .services.events import EventServiceBase
-from .services.graph import (
-    Edge,
-    EdgeConnection,
-    GraphExecutionState,
-    GraphInvocation,
-    LibraryGraph,
-    are_connection_types_compatible,
-)
-from .services.image_file_storage import DiskImageFileStorage
-from .services.invocation_queue import MemoryInvocationQueue
-from .services.invocation_services import InvocationServices
-from .services.invoker import Invoker
-from .services.model_manager_service import ModelManagerService
-from .services.processor import DefaultInvocationProcessor
-from .services.sqlite import SqliteItemStorage
-
-import torch
-import invokeai.backend.util.hotfixes  # noqa: F401 (monkeypatching on import)
-
-if torch.backends.mps.is_available():
-    import invokeai.backend.util.mps_fixes  # noqa: F401 (monkeypatching on import)
-
 
+# parse_args() must be called before any other imports. if it is not called first, consumers of the config
+# which are imported/used before parse_args() is called will get the default config values instead of the
+# values from the command line or config file.
 config = InvokeAIAppConfig.get_config()
 config.parse_args()
+
+if True:  # hack to make flake8 happy with imports coming after setting up the config
+    import argparse
+    import re
+    import shlex
+    import sys
+    import time
+    from typing import Optional, Union, get_type_hints
+
+    import torch
+    from pydantic import BaseModel, ValidationError
+    from pydantic.fields import Field
+
+    import invokeai.backend.util.hotfixes  # noqa: F401 (monkeypatching on import)
+    from invokeai.app.services.board_image_record_storage import SqliteBoardImageRecordStorage
+    from invokeai.app.services.board_images import BoardImagesService, BoardImagesServiceDependencies
+    from invokeai.app.services.board_record_storage import SqliteBoardRecordStorage
+    from invokeai.app.services.boards import BoardService, BoardServiceDependencies
+    from invokeai.app.services.image_record_storage import SqliteImageRecordStorage
+    from invokeai.app.services.images import ImageService, ImageServiceDependencies
+    from invokeai.app.services.invocation_stats import InvocationStatsService
+    from invokeai.app.services.resource_name import SimpleNameService
+    from invokeai.app.services.urls import LocalUrlService
+    from invokeai.backend.util.logging import InvokeAILogger
+    from invokeai.version.invokeai_version import __version__
+
+    from .cli.commands import BaseCommand, CliContext, ExitCli, SortedHelpFormatter, add_graph_parsers, add_parsers
+    from .cli.completer import set_autocompleter
+    from .invocations.baseinvocation import BaseInvocation
+    from .services.default_graphs import create_system_graphs, default_text_to_image_graph_id
+    from .services.events import EventServiceBase
+    from .services.graph import (
+        Edge,
+        EdgeConnection,
+        GraphExecutionState,
+        GraphInvocation,
+        LibraryGraph,
+        are_connection_types_compatible,
+    )
+    from .services.image_file_storage import DiskImageFileStorage
+    from .services.invocation_queue import MemoryInvocationQueue
+    from .services.invocation_services import InvocationServices
+    from .services.invoker import Invoker
+    from .services.latent_storage import DiskLatentsStorage, ForwardCacheLatentsStorage
+    from .services.model_manager_service import ModelManagerService
+    from .services.processor import DefaultInvocationProcessor
+    from .services.sqlite import SqliteItemStorage
+
+    if torch.backends.mps.is_available():
+        import invokeai.backend.util.mps_fixes  # noqa: F401 (monkeypatching on import)
+
+
 logger = InvokeAILogger().getLogger(config=config)
 
 

invokeai/app/invocations/baseinvocation.py

@@ -28,6 +28,8 @@ from pydantic.fields import Undefined, ModelField
 from pydantic.typing import NoArgAnyCallable
 import semver
 
+from invokeai.app.services.config.invokeai_config import InvokeAIAppConfig
+
 if TYPE_CHECKING:
     from ..services.invocation_services import InvocationServices
 
@@ -470,6 +472,7 @@ class BaseInvocation(ABC, BaseModel):
 
     @classmethod
     def get_all_subclasses(cls):
+        app_config = InvokeAIAppConfig.get_config()
         subclasses = []
         toprocess = [cls]
         while len(toprocess) > 0:
@@ -477,7 +480,23 @@ class BaseInvocation(ABC, BaseModel):
             next_subclasses = next.__subclasses__()
             subclasses.extend(next_subclasses)
             toprocess.extend(next_subclasses)
-        return subclasses
+        allowed_invocations = []
+        for sc in subclasses:
+            is_in_allowlist = (
+                sc.__fields__.get("type").default in app_config.allow_nodes
+                if isinstance(app_config.allow_nodes, list)
+                else True
+            )
+
+            is_in_denylist = (
+                sc.__fields__.get("type").default in app_config.deny_nodes
+                if isinstance(app_config.deny_nodes, list)
+                else False
+            )
+
+            if is_in_allowlist and not is_in_denylist:
+                allowed_invocations.append(sc)
+        return allowed_invocations
 
     @classmethod
     def get_invocations(cls):

invokeai/app/services/config/base.py

@@ -42,7 +42,9 @@ class InvokeAISettings(BaseSettings):
 
     def parse_args(self, argv: list = sys.argv[1:]):
         parser = self.get_parser()
-        opt = parser.parse_args(argv)
+        opt, unknown_opts = parser.parse_known_args(argv)
+        if len(unknown_opts) > 0:
+            print("Unknown args:", unknown_opts)
         for name in self.__fields__:
             if name not in self._excluded():
                 value = getattr(opt, name)

invokeai/app/services/config/invokeai_config.py

@@ -254,6 +254,10 @@ class InvokeAIAppConfig(InvokeAISettings):
     attention_slice_size: Literal[tuple(["auto", "balanced", "max", 1, 2, 3, 4, 5, 6, 7, 8])] = Field(default="auto", description='Slice size, valid when attention_type=="sliced"', category="Generation", )
     force_tiled_decode: bool = Field(default=False, description="Whether to enable tiled VAE decode (reduces memory consumption with some performance penalty)", category="Generation",)
 
+    # NODES
+    allow_nodes         : Optional[List[str]] = Field(default=None, description="List of nodes to allow. Omit to allow all.", category="Nodes")
+    deny_nodes          : Optional[List[str]] = Field(default=None, description="List of nodes to deny. Omit to deny none.", category="Nodes")
+
     # DEPRECATED FIELDS - STILL HERE IN ORDER TO OBTAN VALUES FROM PRE-3.1 CONFIG FILES
     always_use_cpu      : bool = Field(default=False, description="If true, use the CPU for rendering even if a GPU is available.", category='Memory/Performance')
     free_gpu_mem        : Optional[bool] = Field(default=None, description="If true, purge model from GPU after each generation.", category='Memory/Performance')

invokeai/frontend/web/dist/index.html

@@ -12,7 +12,7 @@
         margin: 0;
       }
     </style>
-    <script type="module" crossorigin src="./assets/index-08cda350.js"></script>
+    <script type="module" crossorigin src="./assets/index-f83c2c5c.js"></script>
   </head>
 
   <body dir="ltr">

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

@@ -511,6 +511,7 @@
         "maskBlur": "Blur",
         "maskBlurMethod": "Blur Method",
         "coherencePassHeader": "Coherence Pass",
+        "coherenceMode": "Mode",
         "coherenceSteps": "Steps",
         "coherenceStrength": "Strength",
         "seamLowThreshold": "Low",
@@ -520,6 +521,7 @@
         "scaledHeight": "Scaled H",
         "infillMethod": "Infill Method",
         "tileSize": "Tile Size",
+        "patchmatchDownScaleSize": "Downscale",
         "boundingBoxHeader": "Bounding Box",
         "seamCorrectionHeader": "Seam Correction",
         "infillScalingHeader": "Infill and Scaling",

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

@@ -9,13 +9,17 @@ import { startAppListening } from '..';
 export const addReceivedOpenAPISchemaListener = () => {
   startAppListening({
     actionCreator: receivedOpenAPISchema.fulfilled,
-    effect: (action, { dispatch }) => {
+    effect: (action, { dispatch, getState }) => {
       const log = logger('system');
       const schemaJSON = action.payload;
 
       log.debug({ schemaJSON }, 'Received OpenAPI schema');
-
-      const nodeTemplates = parseSchema(schemaJSON);
+      const { nodesAllowlist, nodesDenylist } = getState().config;
+      const nodeTemplates = parseSchema(
+        schemaJSON,
+        nodesAllowlist,
+        nodesDenylist
+      );
 
       log.debug(
         { nodeTemplates: parseify(nodeTemplates) },

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

@@ -45,10 +45,13 @@ export type AppConfig = {
    * Whether or not we should update image urls when image loading errors
    */
   shouldUpdateImagesOnConnect: boolean;
+  shouldFetchMetadataFromApi: boolean;
   disabledTabs: InvokeTabName[];
   disabledFeatures: AppFeature[];
   disabledSDFeatures: SDFeature[];
   canRestoreDeletedImagesFromBin: boolean;
+  nodesAllowlist: string[] | undefined;
+  nodesDenylist: string[] | undefined;
   sd: {
     defaultModel?: string;
     disabledControlNetModels: string[];

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

@@ -27,7 +27,7 @@ import {
   setShouldShowImageDetails,
   setShouldShowProgressInViewer,
 } from 'features/ui/store/uiSlice';
-import { memo, useCallback } from 'react';
+import { memo, useCallback, useMemo } from 'react';
 import { useHotkeys } from 'react-hotkeys-hook';
 import { useTranslation } from 'react-i18next';
 import {
@@ -49,7 +49,7 @@ import SingleSelectionMenuItems from '../ImageContextMenu/SingleSelectionMenuIte
 
 const currentImageButtonsSelector = createSelector(
   [stateSelector, activeTabNameSelector],
-  ({ gallery, system, ui }, activeTabName) => {
+  ({ gallery, system, ui, config }, activeTabName) => {
     const { isProcessing, isConnected, shouldConfirmOnDelete, progressImage } =
       system;
 
@@ -59,6 +59,8 @@ const currentImageButtonsSelector = createSelector(
       shouldShowProgressInViewer,
     } = ui;
 
+    const { shouldFetchMetadataFromApi } = config;
+
     const lastSelectedImage = gallery.selection[gallery.selection.length - 1];
 
     return {
@@ -72,6 +74,7 @@ const currentImageButtonsSelector = createSelector(
       shouldHidePreview,
       shouldShowProgressInViewer,
       lastSelectedImage,
+      shouldFetchMetadataFromApi,
     };
   },
   {
@@ -92,6 +95,7 @@ const CurrentImageButtons = (props: CurrentImageButtonsProps) => {
     shouldShowImageDetails,
     lastSelectedImage,
     shouldShowProgressInViewer,
+    shouldFetchMetadataFromApi,
   } = useAppSelector(currentImageButtonsSelector);
 
   const isUpscalingEnabled = useFeatureStatus('upscaling').isFeatureEnabled;
@@ -106,8 +110,16 @@ const CurrentImageButtons = (props: CurrentImageButtonsProps) => {
     lastSelectedImage?.image_name ?? skipToken
   );
 
+  const getMetadataArg = useMemo(() => {
+    if (lastSelectedImage) {
+      return { image: lastSelectedImage, shouldFetchMetadataFromApi };
+    } else {
+      return skipToken;
+    }
+  }, [lastSelectedImage, shouldFetchMetadataFromApi]);
+
   const { metadata, workflow, isLoading } = useGetImageMetadataFromFileQuery(
-    lastSelectedImage ?? skipToken,
+    getMetadataArg,
     {
       selectFromResult: (res) => ({
         isLoading: res.isFetching,

invokeai/frontend/web/src/features/gallery/components/ImageContextMenu/SingleSelectionMenuItems.tsx

@@ -1,6 +1,6 @@
 import { Flex, MenuItem, Spinner } from '@chakra-ui/react';
 import { useAppToaster } from 'app/components/Toaster';
-import { useAppDispatch } from 'app/store/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import { setInitialCanvasImage } from 'features/canvas/store/canvasSlice';
 import {
   imagesToChangeSelected,
@@ -34,6 +34,7 @@ import {
 import { ImageDTO } from 'services/api/types';
 import { sentImageToCanvas, sentImageToImg2Img } from '../../store/actions';
 import { workflowLoadRequested } from 'features/nodes/store/actions';
+import { configSelector } from '../../../system/store/configSelectors';
 
 type SingleSelectionMenuItemsProps = {
   imageDTO: ImageDTO;
@@ -48,9 +49,10 @@ const SingleSelectionMenuItems = (props: SingleSelectionMenuItemsProps) => {
   const toaster = useAppToaster();
 
   const isCanvasEnabled = useFeatureStatus('unifiedCanvas').isFeatureEnabled;
+  const { shouldFetchMetadataFromApi } = useAppSelector(configSelector);
 
   const { metadata, workflow, isLoading } = useGetImageMetadataFromFileQuery(
-    imageDTO,
+    { image: imageDTO, shouldFetchMetadataFromApi },
     {
       selectFromResult: (res) => ({
         isLoading: res.isFetching,

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

@@ -15,6 +15,8 @@ import { useGetImageMetadataFromFileQuery } from 'services/api/endpoints/images'
 import { ImageDTO } from 'services/api/types';
 import DataViewer from './DataViewer';
 import ImageMetadataActions from './ImageMetadataActions';
+import { useAppSelector } from '../../../../app/store/storeHooks';
+import { configSelector } from '../../../system/store/configSelectors';
 
 type ImageMetadataViewerProps = {
   image: ImageDTO;
@@ -27,12 +29,17 @@ const ImageMetadataViewer = ({ image }: ImageMetadataViewerProps) => {
   //   dispatch(setShouldShowImageDetails(false));
   // });
 
-  const { metadata, workflow } = useGetImageMetadataFromFileQuery(image, {
-    selectFromResult: (res) => ({
-      metadata: res?.currentData?.metadata,
-      workflow: res?.currentData?.workflow,
-    }),
-  });
+  const { shouldFetchMetadataFromApi } = useAppSelector(configSelector);
+
+  const { metadata, workflow } = useGetImageMetadataFromFileQuery(
+    { image, shouldFetchMetadataFromApi },
+    {
+      selectFromResult: (res) => ({
+        metadata: res?.currentData?.metadata,
+        workflow: res?.currentData?.workflow,
+      }),
+    }
+  );
 
   return (
     <Flex

invokeai/frontend/web/src/features/nodes/util/parseSchema.ts

@@ -60,11 +60,23 @@ const isNotInDenylist = (schema: InvocationSchemaObject) =>
   !invocationDenylist.includes(schema.properties.type.default);
 
 export const parseSchema = (
-  openAPI: OpenAPIV3.Document
+  openAPI: OpenAPIV3.Document,
+  nodesAllowlistExtra: string[] | undefined = undefined,
+  nodesDenylistExtra: string[] | undefined = undefined
 ): Record<string, InvocationTemplate> => {
   const filteredSchemas = Object.values(openAPI.components?.schemas ?? {})
     .filter(isInvocationSchemaObject)
-    .filter(isNotInDenylist);
+    .filter(isNotInDenylist)
+    .filter((schema) =>
+      nodesAllowlistExtra
+        ? nodesAllowlistExtra.includes(schema.properties.type.default)
+        : true
+    )
+    .filter((schema) =>
+      nodesDenylistExtra
+        ? !nodesDenylistExtra.includes(schema.properties.type.default)
+        : true
+    );
 
   const invocations = filteredSchemas.reduce<
     Record<string, InvocationTemplate>

invokeai/frontend/web/src/features/system/store/configSlice.ts

@@ -5,6 +5,7 @@ import { merge } from 'lodash-es';
 
 export const initialConfigState: AppConfig = {
   shouldUpdateImagesOnConnect: false,
+  shouldFetchMetadataFromApi: false,
   disabledTabs: [],
   disabledFeatures: ['lightbox', 'faceRestore', 'batches'],
   disabledSDFeatures: [
@@ -14,6 +15,8 @@ export const initialConfigState: AppConfig = {
     'perlinNoise',
     'noiseThreshold',
   ],
+  nodesAllowlist: undefined,
+  nodesDenylist: undefined,
   canRestoreDeletedImagesFromBin: true,
   sd: {
     disabledControlNetModels: [],

invokeai/frontend/web/src/features/system/store/systemSlice.ts

@@ -3,7 +3,7 @@ import { PayloadAction, createSlice, isAnyOf } from '@reduxjs/toolkit';
 import { InvokeLogLevel } from 'app/logging/logger';
 import { userInvoked } from 'app/store/actions';
 import { t } from 'i18next';
-import { get, startCase, upperFirst } from 'lodash-es';
+import { get, startCase, truncate, upperFirst } from 'lodash-es';
 import { LogLevelName } from 'roarr';
 import {
   isAnySessionRejected,
@@ -357,10 +357,13 @@ export const systemSlice = createSlice({
           result.data.error.detail.map((e) => {
             state.toastQueue.push(
               makeToast({
-                title: upperFirst(e.msg),
+                title: truncate(upperFirst(e.msg), { length: 128 }),
                 status: 'error',
-                description: `Path:
-                ${e.loc.slice(3).join('.')}`,
+                description: truncate(
+                  `Path:
+                ${e.loc.join('.')}`,
+                  { length: 128 }
+                ),
                 duration,
               })
             );
@@ -375,7 +378,10 @@ export const systemSlice = createSlice({
         makeToast({
           title: t('toast.serverError'),
           status: 'error',
-          description: get(errorDescription, 'detail', 'Unknown Error'),
+          description: truncate(
+            get(errorDescription, 'detail', 'Unknown Error'),
+            { length: 128 }
+          ),
           duration,
         })
       );

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

@@ -1,4 +1,5 @@
 import { EntityState, Update } from '@reduxjs/toolkit';
+import { fetchBaseQuery } from '@reduxjs/toolkit/dist/query';
 import { PatchCollection } from '@reduxjs/toolkit/dist/query/core/buildThunks';
 import {
   ASSETS_CATEGORIES,
@@ -6,9 +7,14 @@ import {
   IMAGE_CATEGORIES,
   IMAGE_LIMIT,
 } from 'features/gallery/store/types';
+import {
+  ImageMetadataAndWorkflow,
+  zCoreMetadata,
+} from 'features/nodes/types/types';
 import { getMetadataAndWorkflowFromImageBlob } from 'features/nodes/util/getMetadataAndWorkflowFromImageBlob';
 import { keyBy } from 'lodash-es';
 import { ApiFullTagDescription, LIST_TAG, api } from '..';
+import { $authToken, $projectId } from '../client';
 import { components, paths } from '../schema';
 import {
   DeleteBoardResult,
@@ -27,9 +33,6 @@ import {
   imagesSelectors,
 } from '../util';
 import { boardsApi } from './boards';
-import { ImageMetadataAndWorkflow } from 'features/nodes/types/types';
-import { fetchBaseQuery } from '@reduxjs/toolkit/dist/query';
-import { $authToken, $projectId } from '../client';
 
 export const imagesApi = api.injectEndpoints({
   endpoints: (build) => ({
@@ -117,8 +120,16 @@ export const imagesApi = api.injectEndpoints({
       ],
       keepUnusedDataFor: 86400, // 24 hours
     }),
-    getImageMetadataFromFile: build.query<ImageMetadataAndWorkflow, ImageDTO>({
-      queryFn: async (args: ImageDTO, api, extraOptions) => {
+    getImageMetadataFromFile: build.query<
+      ImageMetadataAndWorkflow,
+      { image: ImageDTO; shouldFetchMetadataFromApi: boolean }
+    >({
+      queryFn: async (
+        args: { image: ImageDTO; shouldFetchMetadataFromApi: boolean },
+        api,
+        extraOptions,
+        fetchWithBaseQuery
+      ) => {
         const authToken = $authToken.get();
         const projectId = $projectId.get();
         const customBaseQuery = fetchBaseQuery({
@@ -139,17 +150,35 @@ export const imagesApi = api.injectEndpoints({
         });
 
         const response = await customBaseQuery(
-          args.image_url,
+          args.image.image_url,
           api,
           extraOptions
         );
-        const data = await getMetadataAndWorkflowFromImageBlob(
+        const blobData = await getMetadataAndWorkflowFromImageBlob(
           response.data as Blob
         );
-        return { data };
+
+        let metadata = blobData.metadata;
+
+        if (args.shouldFetchMetadataFromApi) {
+          const metadataResponse = await fetchWithBaseQuery(
+            `images/i/${args.image.image_name}/metadata`
+          );
+          if (metadataResponse.data) {
+            const metadataResult = zCoreMetadata.safeParse(
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
+              (metadataResponse.data as any)?.metadata
+            );
+            if (metadataResult.success) {
+              metadata = metadataResult.data;
+            }
+          }
+        }
+
+        return { data: { ...blobData, metadata } };
       },
-      providesTags: (result, error, image_dto) => [
-        { type: 'ImageMetadataFromFile', id: image_dto.image_name },
+      providesTags: (result, error, { image }) => [
+        { type: 'ImageMetadataFromFile', id: image.image_name },
       ],
       keepUnusedDataFor: 86400, // 24 hours
     }),

invokeai/version/invokeai_version.py

@@ -1 +1 @@
-__version__ = "3.1.0"
+__version__ = "3.1.1rc1"

tests/test_config.py

@@ -1,9 +1,10 @@
 import os
+from pathlib import Path
 from typing import Any
 
 import pytest
 from omegaconf import OmegaConf
-from pathlib import Path
+from pydantic import ValidationError
 
 from invokeai.app.services.config import InvokeAIAppConfig
 
@@ -147,3 +148,58 @@ def test_type_coercion(patch_rootdir):
     conf.parse_args(argv=["--root=/tmp/foobar"])
     assert conf.root == Path("/tmp/different")
     assert isinstance(conf.root, Path)
+
+
+@pytest.mark.xfail(
+    reason="""
+    This test fails when run as part of the full test suite.
+
+    This test needs to deny nodes from being included in the InvocationsUnion by providing
+    an app configuration as a test fixture. Pytest executes all test files before running
+    tests, so the app configuration is already initialized by the time this test runs, and
+    the InvocationUnion is already created and the denied nodes are not omitted from it.
+
+    This test passes when `test_config.py` is tested in isolation.
+
+    Perhaps a solution would be to call `InvokeAIAppConfig.get_config().parse_args()` in
+    other test files?
+    """
+)
+def test_deny_nodes(patch_rootdir):
+    # Allow integer, string and float, but explicitly deny float
+    allow_deny_nodes_conf = OmegaConf.create(
+        """
+        InvokeAI:
+          Nodes:
+            allow_nodes:
+              - integer
+              - string
+              - float
+            deny_nodes:
+              - float
+        """
+    )
+    # must parse config before importing Graph, so its nodes union uses the config
+    conf = InvokeAIAppConfig().get_config()
+    conf.parse_args(conf=allow_deny_nodes_conf, argv=[])
+    from invokeai.app.services.graph import Graph
+
+    # confirm graph validation fails when using denied node
+    Graph(nodes={"1": {"id": "1", "type": "integer"}})
+    Graph(nodes={"1": {"id": "1", "type": "string"}})
+
+    with pytest.raises(ValidationError):
+        Graph(nodes={"1": {"id": "1", "type": "float"}})
+
+    from invokeai.app.invocations.baseinvocation import BaseInvocation
+
+    # confirm invocations union will not have denied nodes
+    all_invocations = BaseInvocation.get_invocations()
+
+    has_integer = len([i for i in all_invocations if i.__fields__.get("type").default == "integer"]) == 1
+    has_string = len([i for i in all_invocations if i.__fields__.get("type").default == "string"]) == 1
+    has_float = len([i for i in all_invocations if i.__fields__.get("type").default == "float"]) == 1
+
+    assert has_integer
+    assert has_string
+    assert not has_float