Merge branch 'main' into mm-ui

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

@@ -1,5 +1,5 @@
 import { api } from '..';
-import { AppVersion } from '../types';
+import { AppConfig, AppVersion } from '../types';
 
 export const appInfoApi = api.injectEndpoints({
   endpoints: (build) => ({
@@ -8,8 +8,16 @@ export const appInfoApi = api.injectEndpoints({
         url: `app/version`,
         method: 'GET',
       }),
+      keepUnusedDataFor: 86400000, // 1 day
+    }),
+    getAppConfig: build.query<AppConfig, void>({
+      query: () => ({
+        url: `app/config`,
+        method: 'GET',
+      }),
+      keepUnusedDataFor: 86400000, // 1 day
     }),
   }),
 });
 
-export const { useGetAppVersionQuery } = appInfoApi;
+export const { useGetAppVersionQuery, useGetAppConfigQuery } = appInfoApi;

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

@@ -1,11 +1,10 @@
 import { OffsetPaginatedResults_ImageDTO_ } from 'services/api/types';
-import { api } from '..';
+import { ApiFullTagDescription, LIST_TAG, api } from '..';
 import { paths } from '../schema';
-import { imagesApi } from './images';
 
 type ListBoardImagesArg =
   paths['/api/v1/board_images/{board_id}']['get']['parameters']['path'] &
-    paths['/api/v1/board_images/{board_id}']['get']['parameters']['query'];
+  paths['/api/v1/board_images/{board_id}']['get']['parameters']['query'];
 
 type AddImageToBoardArg =
   paths['/api/v1/board_images/']['post']['requestBody']['content']['application/json'];
@@ -25,9 +24,25 @@ export const boardImagesApi = api.injectEndpoints({
     >({
       query: ({ board_id, offset, limit }) => ({
         url: `board_images/${board_id}`,
-        method: 'DELETE',
-        body: { offset, limit },
+        method: 'GET',
+
       }),
+      providesTags: (result, error, arg) => {
+        // any list of boardimages
+        const tags: ApiFullTagDescription[] = [{ id: 'BoardImage', type: `${arg.board_id}_${LIST_TAG}` }];
+
+        if (result) {
+          // and individual tags for each boardimage
+          tags.push(
+            ...result.items.map(({ board_id, image_name }) => ({
+              type: 'BoardImage' as const,
+              id: `${board_id}_${image_name}`,
+            }))
+          );
+        }
+
+        return tags;
+      },
     }),
 
     /**
@@ -41,23 +56,9 @@ export const boardImagesApi = api.injectEndpoints({
         body: { board_id, image_name },
       }),
       invalidatesTags: (result, error, arg) => [
-        { type: 'Board', id: arg.board_id },
+        { type: 'BoardImage' },
+        { type: 'Board', id: arg.board_id }
       ],
-      async onQueryStarted(
-        { image_name, ...patch },
-        { dispatch, queryFulfilled }
-      ) {
-        const patchResult = dispatch(
-          imagesApi.util.updateQueryData('getImageDTO', image_name, (draft) => {
-            Object.assign(draft, patch);
-          })
-        );
-        try {
-          await queryFulfilled;
-        } catch {
-          patchResult.undo();
-        }
-      },
     }),
 
     removeImageFromBoard: build.mutation<void, RemoveImageFromBoardArg>({
@@ -67,23 +68,9 @@ export const boardImagesApi = api.injectEndpoints({
         body: { board_id, image_name },
       }),
       invalidatesTags: (result, error, arg) => [
-        { type: 'Board', id: arg.board_id },
+        { type: 'BoardImage' },
+        { type: 'Board', id: arg.board_id }
       ],
-      async onQueryStarted(
-        { image_name, ...patch },
-        { dispatch, queryFulfilled }
-      ) {
-        const patchResult = dispatch(
-          imagesApi.util.updateQueryData('getImageDTO', image_name, (draft) => {
-            Object.assign(draft, { board_id: null });
-          })
-        );
-        try {
-          await queryFulfilled;
-        } catch {
-          patchResult.undo();
-        }
-      },
     }),
   }),
 });

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

@@ -1,13 +1,22 @@
 import { ApiFullTagDescription, api } from '..';
+import { components } from '../schema';
 import { ImageDTO } from '../types';
 
+/**
+ * This is an unsafe type; the object inside is not guaranteed to be valid.
+ */
+export type UnsafeImageMetadata = {
+  metadata: components['schemas']['CoreMetadata'];
+  graph: NonNullable<components['schemas']['Graph']>;
+};
+
 export const imagesApi = api.injectEndpoints({
   endpoints: (build) => ({
     /**
      * Image Queries
      */
     getImageDTO: build.query<ImageDTO, string>({
-      query: (image_name) => ({ url: `images/${image_name}/metadata` }),
+      query: (image_name) => ({ url: `images/${image_name}` }),
       providesTags: (result, error, arg) => {
         const tags: ApiFullTagDescription[] = [{ type: 'Image', id: arg }];
         if (result?.board_id) {
@@ -17,7 +26,17 @@ export const imagesApi = api.injectEndpoints({
       },
       keepUnusedDataFor: 86400, // 24 hours
     }),
+    getImageMetadata: build.query<UnsafeImageMetadata, string>({
+      query: (image_name) => ({ url: `images/${image_name}/metadata` }),
+      providesTags: (result, error, arg) => {
+        const tags: ApiFullTagDescription[] = [
+          { type: 'ImageMetadata', id: arg },
+        ];
+        return tags;
+      },
+      keepUnusedDataFor: 86400, // 24 hours
+    }),
   }),
 });
 
-export const { useGetImageDTOQuery } = imagesApi;
+export const { useGetImageDTOQuery, useGetImageMetadataQuery } = imagesApi;

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

@@ -56,25 +56,28 @@ type MergeMainModelQuery = {
 };
 
 const mainModelsAdapter = createEntityAdapter<MainModelConfigEntity>({
-  sortComparer: (a, b) => a.name.localeCompare(b.name),
+  sortComparer: (a, b) => a.model_name.localeCompare(b.model_name),
 });
 const loraModelsAdapter = createEntityAdapter<LoRAModelConfigEntity>({
-  sortComparer: (a, b) => a.name.localeCompare(b.name),
+  sortComparer: (a, b) => a.model_name.localeCompare(b.model_name),
 });
 const controlNetModelsAdapter =
   createEntityAdapter<ControlNetModelConfigEntity>({
-    sortComparer: (a, b) => a.name.localeCompare(b.name),
+    sortComparer: (a, b) => a.model_name.localeCompare(b.model_name),
   });
 const textualInversionModelsAdapter =
   createEntityAdapter<TextualInversionModelConfigEntity>({
-    sortComparer: (a, b) => a.name.localeCompare(b.name),
+    sortComparer: (a, b) => a.model_name.localeCompare(b.model_name),
   });
 const vaeModelsAdapter = createEntityAdapter<VaeModelConfigEntity>({
-  sortComparer: (a, b) => a.name.localeCompare(b.name),
+  sortComparer: (a, b) => a.model_name.localeCompare(b.model_name),
 });
 
-export const getModelId = ({ base_model, type, name }: AnyModelConfig) =>
-  `${base_model}/${type}/${name}`;
+export const getModelId = ({
+  base_model,
+  model_type,
+  model_name,
+}: AnyModelConfig) => `${base_model}/${model_type}/${model_name}`;
 
 const createModelEntities = <T extends AnyModelConfigEntity>(
   models: AnyModelConfig[]

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

@@ -1,3 +1,4 @@
+import { FullTagDescription } from '@reduxjs/toolkit/dist/query/endpointDefinitions';
 import {
   BaseQueryFn,
   FetchArgs,
@@ -5,10 +6,9 @@ import {
   createApi,
   fetchBaseQuery,
 } from '@reduxjs/toolkit/query/react';
-import { FullTagDescription } from '@reduxjs/toolkit/dist/query/endpointDefinitions';
 import { $authToken, $baseUrl } from 'services/api/client';
 
-export const tagTypes = ['Board', 'Image', 'Model'];
+export const tagTypes = ['Board', 'Image', 'ImageMetadata', 'Model'];
 export type ApiFullTagDescription = FullTagDescription<
   (typeof tagTypes)[number]
 >;

invokeai/frontend/web/src/services/api/schema.d.ts

@@ -109,10 +109,10 @@ export type paths = {
   };
   "/api/v1/images/": {
     /**
-     * List Images With Metadata 
-     * @description Gets a list of images
+     * List Image Dtos 
+     * @description Gets a list of image DTOs
      */
-    get: operations["list_images_with_metadata"];
+    get: operations["list_image_dtos"];
     /**
      * Upload Image 
      * @description Uploads an image
@@ -121,10 +121,10 @@ export type paths = {
   };
   "/api/v1/images/{image_name}": {
     /**
-     * Get Image Full 
-     * @description Gets a full-resolution image file
+     * Get Image Dto 
+     * @description Gets an image's DTO
      */
-    get: operations["get_image_full"];
+    get: operations["get_image_dto"];
     /**
      * Delete Image 
      * @description Deletes an image
@@ -143,6 +143,13 @@ export type paths = {
      */
     get: operations["get_image_metadata"];
   };
+  "/api/v1/images/{image_name}/full": {
+    /**
+     * Get Image Full 
+     * @description Gets a full-resolution image file
+     */
+    get: operations["get_image_full"];
+  };
   "/api/v1/images/{image_name}/thumbnail": {
     /**
      * Get Image Thumbnail 
@@ -209,6 +216,10 @@ export type paths = {
     /** Get Version */
     get: operations["app_version"];
   };
+  "/api/v1/app/config": {
+    /** Get Config */
+    get: operations["get_config"];
+  };
 };
 
 export type webhooks = Record<string, never>;
@@ -250,12 +261,26 @@ export type components = {
        */
       b?: number;
     };
+    /**
+     * AppConfig 
+     * @description App Config Response
+     */
+    AppConfig: {
+      /**
+       * Infill Methods 
+       * @description List of available infill methods
+       */
+      infill_methods: (string)[];
+    };
     /**
      * AppVersion 
      * @description App Version Response
      */
     AppVersion: {
-      /** Version */
+      /**
+       * Version 
+       * @description App version
+       */
       version: string;
     };
     /**
@@ -798,14 +823,14 @@ export type components = {
     };
     /** ControlNetModelConfig */
     ControlNetModelConfig: {
-      /** Name */
-      name: string;
+      /** Model Name */
+      model_name: string;
       base_model: components["schemas"]["BaseModelType"];
       /**
-       * Type 
+       * Model Type 
        * @enum {string}
        */
-      type: "controlnet";
+      model_type: "controlnet";
       /** Path */
       path: string;
       /** Description */
@@ -836,6 +861,97 @@ export type components = {
        */
       control?: components["schemas"]["ControlField"];
     };
+    /**
+     * CoreMetadata 
+     * @description Core generation metadata for an image generated in InvokeAI.
+     */
+    CoreMetadata: {
+      /**
+       * Generation Mode 
+       * @description The generation mode that output this image
+       */
+      generation_mode: string;
+      /**
+       * Positive Prompt 
+       * @description The positive prompt parameter
+       */
+      positive_prompt: string;
+      /**
+       * Negative Prompt 
+       * @description The negative prompt parameter
+       */
+      negative_prompt: string;
+      /**
+       * Width 
+       * @description The width parameter
+       */
+      width: number;
+      /**
+       * Height 
+       * @description The height parameter
+       */
+      height: number;
+      /**
+       * Seed 
+       * @description The seed used for noise generation
+       */
+      seed: number;
+      /**
+       * Rand Device 
+       * @description The device used for random number generation
+       */
+      rand_device: string;
+      /**
+       * Cfg Scale 
+       * @description The classifier-free guidance scale parameter
+       */
+      cfg_scale: number;
+      /**
+       * Steps 
+       * @description The number of steps used for inference
+       */
+      steps: number;
+      /**
+       * Scheduler 
+       * @description The scheduler used for inference
+       */
+      scheduler: string;
+      /**
+       * Clip Skip 
+       * @description The number of skipped CLIP layers
+       */
+      clip_skip: number;
+      /**
+       * Model 
+       * @description The main model used for inference
+       */
+      model: components["schemas"]["MainModelField"];
+      /**
+       * Controlnets 
+       * @description The ControlNets used for inference
+       */
+      controlnets: (components["schemas"]["ControlField"])[];
+      /**
+       * Loras 
+       * @description The LoRAs used for inference
+       */
+      loras: (components["schemas"]["LoRAMetadataField"])[];
+      /**
+       * Strength 
+       * @description The strength used for latents-to-latents
+       */
+      strength?: number;
+      /**
+       * Init Image 
+       * @description The name of the initial image
+       */
+      init_image?: string;
+      /**
+       * Vae 
+       * @description The VAE used for decoding, if the main model's default was not used
+       */
+      vae?: components["schemas"]["VAEModelField"];
+    };
     /**
      * CvInpaintInvocation 
      * @description Simple inpaint using opencv.
@@ -1058,7 +1174,7 @@ export type components = {
        * @description The nodes in this graph
        */
       nodes?: {
-        [key: string]: (components["schemas"]["RangeInvocation"] | components["schemas"]["RangeOfSizeInvocation"] | components["schemas"]["RandomRangeInvocation"] | components["schemas"]["ImageCollectionInvocation"] | components["schemas"]["MainModelLoaderInvocation"] | components["schemas"]["LoraLoaderInvocation"] | components["schemas"]["VaeLoaderInvocation"] | components["schemas"]["CompelInvocation"] | components["schemas"]["ClipSkipInvocation"] | components["schemas"]["LoadImageInvocation"] | components["schemas"]["ShowImageInvocation"] | components["schemas"]["ImageCropInvocation"] | components["schemas"]["ImagePasteInvocation"] | components["schemas"]["MaskFromAlphaInvocation"] | components["schemas"]["ImageMultiplyInvocation"] | components["schemas"]["ImageChannelInvocation"] | components["schemas"]["ImageConvertInvocation"] | components["schemas"]["ImageBlurInvocation"] | components["schemas"]["ImageResizeInvocation"] | components["schemas"]["ImageScaleInvocation"] | components["schemas"]["ImageLerpInvocation"] | components["schemas"]["ImageInverseLerpInvocation"] | components["schemas"]["ControlNetInvocation"] | components["schemas"]["ImageProcessorInvocation"] | components["schemas"]["CvInpaintInvocation"] | components["schemas"]["TextToLatentsInvocation"] | components["schemas"]["LatentsToImageInvocation"] | components["schemas"]["ResizeLatentsInvocation"] | components["schemas"]["ScaleLatentsInvocation"] | components["schemas"]["ImageToLatentsInvocation"] | components["schemas"]["InpaintInvocation"] | components["schemas"]["InfillColorInvocation"] | components["schemas"]["InfillTileInvocation"] | components["schemas"]["InfillPatchMatchInvocation"] | components["schemas"]["AddInvocation"] | components["schemas"]["SubtractInvocation"] | components["schemas"]["MultiplyInvocation"] | components["schemas"]["DivideInvocation"] | components["schemas"]["RandomIntInvocation"] | components["schemas"]["NoiseInvocation"] | components["schemas"]["ParamIntInvocation"] | components["schemas"]["ParamFloatInvocation"] | components["schemas"]["FloatLinearRangeInvocation"] | components["schemas"]["StepParamEasingInvocation"] | components["schemas"]["DynamicPromptInvocation"] | components["schemas"]["RestoreFaceInvocation"] | components["schemas"]["UpscaleInvocation"] | components["schemas"]["GraphInvocation"] | components["schemas"]["IterateInvocation"] | components["schemas"]["CollectInvocation"] | components["schemas"]["CannyImageProcessorInvocation"] | components["schemas"]["HedImageProcessorInvocation"] | components["schemas"]["LineartImageProcessorInvocation"] | components["schemas"]["LineartAnimeImageProcessorInvocation"] | components["schemas"]["OpenposeImageProcessorInvocation"] | components["schemas"]["MidasDepthImageProcessorInvocation"] | components["schemas"]["NormalbaeImageProcessorInvocation"] | components["schemas"]["MlsdImageProcessorInvocation"] | components["schemas"]["PidiImageProcessorInvocation"] | components["schemas"]["ContentShuffleImageProcessorInvocation"] | components["schemas"]["ZoeDepthImageProcessorInvocation"] | components["schemas"]["MediapipeFaceProcessorInvocation"] | components["schemas"]["LeresImageProcessorInvocation"] | components["schemas"]["TileResamplerProcessorInvocation"] | components["schemas"]["SegmentAnythingProcessorInvocation"] | components["schemas"]["LatentsToLatentsInvocation"]) | undefined;
+        [key: string]: (components["schemas"]["LoadImageInvocation"] | components["schemas"]["ShowImageInvocation"] | components["schemas"]["ImageCropInvocation"] | components["schemas"]["ImagePasteInvocation"] | components["schemas"]["MaskFromAlphaInvocation"] | components["schemas"]["ImageMultiplyInvocation"] | components["schemas"]["ImageChannelInvocation"] | components["schemas"]["ImageConvertInvocation"] | components["schemas"]["ImageBlurInvocation"] | components["schemas"]["ImageResizeInvocation"] | components["schemas"]["ImageScaleInvocation"] | components["schemas"]["ImageLerpInvocation"] | components["schemas"]["ImageInverseLerpInvocation"] | components["schemas"]["ControlNetInvocation"] | components["schemas"]["ImageProcessorInvocation"] | components["schemas"]["MainModelLoaderInvocation"] | components["schemas"]["LoraLoaderInvocation"] | components["schemas"]["VaeLoaderInvocation"] | components["schemas"]["MetadataAccumulatorInvocation"] | components["schemas"]["DynamicPromptInvocation"] | components["schemas"]["CompelInvocation"] | components["schemas"]["ClipSkipInvocation"] | components["schemas"]["AddInvocation"] | components["schemas"]["SubtractInvocation"] | components["schemas"]["MultiplyInvocation"] | components["schemas"]["DivideInvocation"] | components["schemas"]["RandomIntInvocation"] | components["schemas"]["ParamIntInvocation"] | components["schemas"]["ParamFloatInvocation"] | components["schemas"]["TextToLatentsInvocation"] | components["schemas"]["LatentsToImageInvocation"] | components["schemas"]["ResizeLatentsInvocation"] | components["schemas"]["ScaleLatentsInvocation"] | components["schemas"]["ImageToLatentsInvocation"] | components["schemas"]["CvInpaintInvocation"] | components["schemas"]["RangeInvocation"] | components["schemas"]["RangeOfSizeInvocation"] | components["schemas"]["RandomRangeInvocation"] | components["schemas"]["ImageCollectionInvocation"] | components["schemas"]["FloatLinearRangeInvocation"] | components["schemas"]["StepParamEasingInvocation"] | components["schemas"]["NoiseInvocation"] | components["schemas"]["UpscaleInvocation"] | components["schemas"]["RestoreFaceInvocation"] | components["schemas"]["InpaintInvocation"] | components["schemas"]["InfillColorInvocation"] | components["schemas"]["InfillTileInvocation"] | components["schemas"]["InfillPatchMatchInvocation"] | components["schemas"]["GraphInvocation"] | components["schemas"]["IterateInvocation"] | components["schemas"]["CollectInvocation"] | components["schemas"]["CannyImageProcessorInvocation"] | components["schemas"]["HedImageProcessorInvocation"] | components["schemas"]["LineartImageProcessorInvocation"] | components["schemas"]["LineartAnimeImageProcessorInvocation"] | components["schemas"]["OpenposeImageProcessorInvocation"] | components["schemas"]["MidasDepthImageProcessorInvocation"] | components["schemas"]["NormalbaeImageProcessorInvocation"] | components["schemas"]["MlsdImageProcessorInvocation"] | components["schemas"]["PidiImageProcessorInvocation"] | components["schemas"]["ContentShuffleImageProcessorInvocation"] | components["schemas"]["ZoeDepthImageProcessorInvocation"] | components["schemas"]["MediapipeFaceProcessorInvocation"] | components["schemas"]["LeresImageProcessorInvocation"] | components["schemas"]["TileResamplerProcessorInvocation"] | components["schemas"]["SegmentAnythingProcessorInvocation"] | components["schemas"]["LatentsToLatentsInvocation"]) | undefined;
       };
       /**
        * Edges 
@@ -1101,7 +1217,7 @@ export type components = {
        * @description The results of node executions
        */
       results: {
-        [key: string]: (components["schemas"]["IntCollectionOutput"] | components["schemas"]["FloatCollectionOutput"] | components["schemas"]["ImageCollectionOutput"] | components["schemas"]["ModelLoaderOutput"] | components["schemas"]["LoraLoaderOutput"] | components["schemas"]["VaeLoaderOutput"] | components["schemas"]["CompelOutput"] | components["schemas"]["ClipSkipInvocationOutput"] | components["schemas"]["ImageOutput"] | components["schemas"]["MaskOutput"] | components["schemas"]["ControlOutput"] | components["schemas"]["LatentsOutput"] | components["schemas"]["IntOutput"] | components["schemas"]["FloatOutput"] | components["schemas"]["NoiseOutput"] | components["schemas"]["PromptOutput"] | components["schemas"]["PromptCollectionOutput"] | components["schemas"]["GraphInvocationOutput"] | components["schemas"]["IterateInvocationOutput"] | components["schemas"]["CollectInvocationOutput"]) | undefined;
+        [key: string]: (components["schemas"]["ImageOutput"] | components["schemas"]["MaskOutput"] | components["schemas"]["ControlOutput"] | components["schemas"]["ModelLoaderOutput"] | components["schemas"]["LoraLoaderOutput"] | components["schemas"]["VaeLoaderOutput"] | components["schemas"]["MetadataAccumulatorOutput"] | components["schemas"]["PromptOutput"] | components["schemas"]["PromptCollectionOutput"] | components["schemas"]["CompelOutput"] | components["schemas"]["ClipSkipInvocationOutput"] | components["schemas"]["IntOutput"] | components["schemas"]["FloatOutput"] | components["schemas"]["LatentsOutput"] | components["schemas"]["IntCollectionOutput"] | components["schemas"]["FloatCollectionOutput"] | components["schemas"]["ImageCollectionOutput"] | components["schemas"]["NoiseOutput"] | components["schemas"]["GraphInvocationOutput"] | components["schemas"]["IterateInvocationOutput"] | components["schemas"]["CollectInvocationOutput"]) | undefined;
       };
       /**
        * Errors 
@@ -1502,11 +1618,6 @@ export type components = {
        * @description The node ID that generated this image, if it is a generated image.
        */
       node_id?: string;
-      /**
-       * Metadata 
-       * @description A limited subset of the image's generation metadata. Retrieve the image's session for full metadata.
-       */
-      metadata?: components["schemas"]["ImageMetadata"];
       /**
        * Board Id 
        * @description The id of the board the image belongs to, if one exists.
@@ -1606,96 +1717,19 @@ export type components = {
     };
     /**
      * ImageMetadata 
-     * @description Core generation metadata for an image/tensor generated in InvokeAI.
-     * 
-     * Also includes any metadata from the image's PNG tEXt chunks.
-     * 
-     * Generated by traversing the execution graph, collecting the parameters of the nearest ancestors
-     * of a given node.
-     * 
-     * Full metadata may be accessed by querying for the session in the `graph_executions` table.
+     * @description An image's generation metadata
      */
     ImageMetadata: {
       /**
-       * Type 
-       * @description The type of the ancestor node of the image output node.
+       * Metadata 
+       * @description The image's core metadata, if it was created in the Linear or Canvas UI
        */
-      type?: string;
+      metadata?: Record<string, never>;
       /**
-       * Positive Conditioning 
-       * @description The positive conditioning.
+       * Graph 
+       * @description The graph that created the image
        */
-      positive_conditioning?: string;
-      /**
-       * Negative Conditioning 
-       * @description The negative conditioning.
-       */
-      negative_conditioning?: string;
-      /**
-       * Width 
-       * @description Width of the image/latents in pixels.
-       */
-      width?: number;
-      /**
-       * Height 
-       * @description Height of the image/latents in pixels.
-       */
-      height?: number;
-      /**
-       * Seed 
-       * @description The seed used for noise generation.
-       */
-      seed?: number;
-      /**
-       * Cfg Scale 
-       * @description The classifier-free guidance scale.
-       */
-      cfg_scale?: number | (number)[];
-      /**
-       * Steps 
-       * @description The number of steps used for inference.
-       */
-      steps?: number;
-      /**
-       * Scheduler 
-       * @description The scheduler used for inference.
-       */
-      scheduler?: string;
-      /**
-       * Model 
-       * @description The model used for inference.
-       */
-      model?: string;
-      /**
-       * Strength 
-       * @description The strength used for image-to-image/latents-to-latents.
-       */
-      strength?: number;
-      /**
-       * Latents 
-       * @description The ID of the initial latents.
-       */
-      latents?: string;
-      /**
-       * Vae 
-       * @description The VAE used for decoding.
-       */
-      vae?: string;
-      /**
-       * Unet 
-       * @description The UNet used dor inference.
-       */
-      unet?: string;
-      /**
-       * Clip 
-       * @description The CLIP Encoder used for conditioning.
-       */
-      clip?: string;
-      /**
-       * Extra 
-       * @description Uploaded image metadata, extracted from the PNG tEXt chunk.
-       */
-      extra?: string;
+      graph?: Record<string, never>;
     };
     /**
      * ImageMultiplyInvocation 
@@ -2436,6 +2470,11 @@ export type components = {
        * @default false
        */
       tiled?: boolean;
+      /**
+       * Metadata 
+       * @description Optional core metadata to be written to the image
+       */
+      metadata?: components["schemas"]["CoreMetadata"];
     };
     /**
      * LatentsToLatentsInvocation 
@@ -2659,16 +2698,32 @@ export type components = {
        */
       coarse?: boolean;
     };
+    /**
+     * LoRAMetadataField 
+     * @description LoRA metadata for an image generated in InvokeAI.
+     */
+    LoRAMetadataField: {
+      /**
+       * Lora 
+       * @description The LoRA model
+       */
+      lora: components["schemas"]["LoRAModelField"];
+      /**
+       * Weight 
+       * @description The weight of the LoRA model
+       */
+      weight: number;
+    };
     /** LoRAModelConfig */
     LoRAModelConfig: {
-      /** Name */
-      name: string;
+      /** Model Name */
+      model_name: string;
       base_model: components["schemas"]["BaseModelType"];
       /**
-       * Type 
+       * Model Type 
        * @enum {string}
        */
-      type: "lora";
+      model_type: "lora";
       /** Path */
       path: string;
       /** Description */
@@ -2956,6 +3011,131 @@ export type components = {
      * @enum {string}
      */
     MergeInterpolationMethod: "weighted_sum" | "sigmoid" | "inv_sigmoid" | "add_difference";
+    /**
+     * MetadataAccumulatorInvocation 
+     * @description Outputs a Core Metadata Object
+     */
+    MetadataAccumulatorInvocation: {
+      /**
+       * Id 
+       * @description The id of this node. Must be unique among all nodes.
+       */
+      id: string;
+      /**
+       * Is Intermediate 
+       * @description Whether or not this node is an intermediate node. 
+       * @default false
+       */
+      is_intermediate?: boolean;
+      /**
+       * Type 
+       * @default metadata_accumulator 
+       * @enum {string}
+       */
+      type?: "metadata_accumulator";
+      /**
+       * Generation Mode 
+       * @description The generation mode that output this image
+       */
+      generation_mode: string;
+      /**
+       * Positive Prompt 
+       * @description The positive prompt parameter
+       */
+      positive_prompt: string;
+      /**
+       * Negative Prompt 
+       * @description The negative prompt parameter
+       */
+      negative_prompt: string;
+      /**
+       * Width 
+       * @description The width parameter
+       */
+      width: number;
+      /**
+       * Height 
+       * @description The height parameter
+       */
+      height: number;
+      /**
+       * Seed 
+       * @description The seed used for noise generation
+       */
+      seed: number;
+      /**
+       * Rand Device 
+       * @description The device used for random number generation
+       */
+      rand_device: string;
+      /**
+       * Cfg Scale 
+       * @description The classifier-free guidance scale parameter
+       */
+      cfg_scale: number;
+      /**
+       * Steps 
+       * @description The number of steps used for inference
+       */
+      steps: number;
+      /**
+       * Scheduler 
+       * @description The scheduler used for inference
+       */
+      scheduler: string;
+      /**
+       * Clip Skip 
+       * @description The number of skipped CLIP layers
+       */
+      clip_skip: number;
+      /**
+       * Model 
+       * @description The main model used for inference
+       */
+      model: components["schemas"]["MainModelField"];
+      /**
+       * Controlnets 
+       * @description The ControlNets used for inference
+       */
+      controlnets: (components["schemas"]["ControlField"])[];
+      /**
+       * Loras 
+       * @description The LoRAs used for inference
+       */
+      loras: (components["schemas"]["LoRAMetadataField"])[];
+      /**
+       * Strength 
+       * @description The strength used for latents-to-latents
+       */
+      strength?: number;
+      /**
+       * Init Image 
+       * @description The name of the initial image
+       */
+      init_image?: string;
+      /**
+       * Vae 
+       * @description The VAE used for decoding, if the main model's default was not used
+       */
+      vae?: components["schemas"]["VAEModelField"];
+    };
+    /**
+     * MetadataAccumulatorOutput 
+     * @description The output of the MetadataAccumulator node
+     */
+    MetadataAccumulatorOutput: {
+      /**
+       * Type 
+       * @default metadata_accumulator_output 
+       * @enum {string}
+       */
+      type?: "metadata_accumulator_output";
+      /**
+       * Metadata 
+       * @description The core metadata for the image
+       */
+      metadata: components["schemas"]["CoreMetadata"];
+    };
     /**
      * MidasDepthImageProcessorInvocation 
      * @description Applies Midas depth processing to image
@@ -3110,7 +3290,7 @@ export type components = {
     /** ModelsList */
     ModelsList: {
       /** Models */
-      models: (components["schemas"]["StableDiffusion1ModelCheckpointConfig"] | components["schemas"]["StableDiffusion1ModelDiffusersConfig"] | components["schemas"]["VaeModelConfig"] | components["schemas"]["LoRAModelConfig"] | components["schemas"]["ControlNetModelConfig"] | components["schemas"]["TextualInversionModelConfig"] | components["schemas"]["StableDiffusion2ModelDiffusersConfig"] | components["schemas"]["StableDiffusion2ModelCheckpointConfig"])[];
+      models: (components["schemas"]["StableDiffusion1ModelDiffusersConfig"] | components["schemas"]["StableDiffusion1ModelCheckpointConfig"] | components["schemas"]["VaeModelConfig"] | components["schemas"]["LoRAModelConfig"] | components["schemas"]["ControlNetModelConfig"] | components["schemas"]["TextualInversionModelConfig"] | components["schemas"]["StableDiffusion2ModelCheckpointConfig"] | components["schemas"]["StableDiffusion2ModelDiffusersConfig"])[];
     };
     /**
      * MultiplyInvocation 
@@ -3900,14 +4080,14 @@ export type components = {
     };
     /** StableDiffusion1ModelCheckpointConfig */
     StableDiffusion1ModelCheckpointConfig: {
-      /** Name */
-      name: string;
+      /** Model Name */
+      model_name: string;
       base_model: components["schemas"]["BaseModelType"];
       /**
-       * Type 
+       * Model Type 
        * @enum {string}
        */
-      type: "main";
+      model_type: "main";
       /** Path */
       path: string;
       /** Description */
@@ -3926,14 +4106,14 @@ export type components = {
     };
     /** StableDiffusion1ModelDiffusersConfig */
     StableDiffusion1ModelDiffusersConfig: {
-      /** Name */
-      name: string;
+      /** Model Name */
+      model_name: string;
       base_model: components["schemas"]["BaseModelType"];
       /**
-       * Type 
+       * Model Type 
        * @enum {string}
        */
-      type: "main";
+      model_type: "main";
       /** Path */
       path: string;
       /** Description */
@@ -3950,14 +4130,14 @@ export type components = {
     };
     /** StableDiffusion2ModelCheckpointConfig */
     StableDiffusion2ModelCheckpointConfig: {
-      /** Name */
-      name: string;
+      /** Model Name */
+      model_name: string;
       base_model: components["schemas"]["BaseModelType"];
       /**
-       * Type 
+       * Model Type 
        * @enum {string}
        */
-      type: "main";
+      model_type: "main";
       /** Path */
       path: string;
       /** Description */
@@ -3976,14 +4156,14 @@ export type components = {
     };
     /** StableDiffusion2ModelDiffusersConfig */
     StableDiffusion2ModelDiffusersConfig: {
-      /** Name */
-      name: string;
+      /** Model Name */
+      model_name: string;
       base_model: components["schemas"]["BaseModelType"];
       /**
-       * Type 
+       * Model Type 
        * @enum {string}
        */
-      type: "main";
+      model_type: "main";
       /** Path */
       path: string;
       /** Description */
@@ -4190,14 +4370,14 @@ export type components = {
     };
     /** TextualInversionModelConfig */
     TextualInversionModelConfig: {
-      /** Name */
-      name: string;
+      /** Model Name */
+      model_name: string;
       base_model: components["schemas"]["BaseModelType"];
       /**
-       * Type 
+       * Model Type 
        * @enum {string}
        */
-      type: "embedding";
+      model_type: "embedding";
       /** Path */
       path: string;
       /** Description */
@@ -4367,14 +4547,14 @@ export type components = {
     };
     /** VaeModelConfig */
     VaeModelConfig: {
-      /** Name */
-      name: string;
+      /** Model Name */
+      model_name: string;
       base_model: components["schemas"]["BaseModelType"];
       /**
-       * Type 
+       * Model Type 
        * @enum {string}
        */
-      type: "vae";
+      model_type: "vae";
       /** Path */
       path: string;
       /** Description */
@@ -4425,18 +4605,18 @@ export type components = {
        */
       image?: components["schemas"]["ImageField"];
     };
-    /**
-     * StableDiffusion2ModelFormat 
-     * @description An enumeration. 
-     * @enum {string}
-     */
-    StableDiffusion2ModelFormat: "checkpoint" | "diffusers";
     /**
      * StableDiffusion1ModelFormat 
      * @description An enumeration. 
      * @enum {string}
      */
     StableDiffusion1ModelFormat: "checkpoint" | "diffusers";
+    /**
+     * StableDiffusion2ModelFormat 
+     * @description An enumeration. 
+     * @enum {string}
+     */
+    StableDiffusion2ModelFormat: "checkpoint" | "diffusers";
   };
   responses: never;
   parameters: never;
@@ -4547,7 +4727,7 @@ export type operations = {
     };
     requestBody: {
       content: {
-        "application/json": components["schemas"]["RangeInvocation"] | components["schemas"]["RangeOfSizeInvocation"] | components["schemas"]["RandomRangeInvocation"] | components["schemas"]["ImageCollectionInvocation"] | components["schemas"]["MainModelLoaderInvocation"] | components["schemas"]["LoraLoaderInvocation"] | components["schemas"]["VaeLoaderInvocation"] | components["schemas"]["CompelInvocation"] | components["schemas"]["ClipSkipInvocation"] | components["schemas"]["LoadImageInvocation"] | components["schemas"]["ShowImageInvocation"] | components["schemas"]["ImageCropInvocation"] | components["schemas"]["ImagePasteInvocation"] | components["schemas"]["MaskFromAlphaInvocation"] | components["schemas"]["ImageMultiplyInvocation"] | components["schemas"]["ImageChannelInvocation"] | components["schemas"]["ImageConvertInvocation"] | components["schemas"]["ImageBlurInvocation"] | components["schemas"]["ImageResizeInvocation"] | components["schemas"]["ImageScaleInvocation"] | components["schemas"]["ImageLerpInvocation"] | components["schemas"]["ImageInverseLerpInvocation"] | components["schemas"]["ControlNetInvocation"] | components["schemas"]["ImageProcessorInvocation"] | components["schemas"]["CvInpaintInvocation"] | components["schemas"]["TextToLatentsInvocation"] | components["schemas"]["LatentsToImageInvocation"] | components["schemas"]["ResizeLatentsInvocation"] | components["schemas"]["ScaleLatentsInvocation"] | components["schemas"]["ImageToLatentsInvocation"] | components["schemas"]["InpaintInvocation"] | components["schemas"]["InfillColorInvocation"] | components["schemas"]["InfillTileInvocation"] | components["schemas"]["InfillPatchMatchInvocation"] | components["schemas"]["AddInvocation"] | components["schemas"]["SubtractInvocation"] | components["schemas"]["MultiplyInvocation"] | components["schemas"]["DivideInvocation"] | components["schemas"]["RandomIntInvocation"] | components["schemas"]["NoiseInvocation"] | components["schemas"]["ParamIntInvocation"] | components["schemas"]["ParamFloatInvocation"] | components["schemas"]["FloatLinearRangeInvocation"] | components["schemas"]["StepParamEasingInvocation"] | components["schemas"]["DynamicPromptInvocation"] | components["schemas"]["RestoreFaceInvocation"] | components["schemas"]["UpscaleInvocation"] | components["schemas"]["GraphInvocation"] | components["schemas"]["IterateInvocation"] | components["schemas"]["CollectInvocation"] | components["schemas"]["CannyImageProcessorInvocation"] | components["schemas"]["HedImageProcessorInvocation"] | components["schemas"]["LineartImageProcessorInvocation"] | components["schemas"]["LineartAnimeImageProcessorInvocation"] | components["schemas"]["OpenposeImageProcessorInvocation"] | components["schemas"]["MidasDepthImageProcessorInvocation"] | components["schemas"]["NormalbaeImageProcessorInvocation"] | components["schemas"]["MlsdImageProcessorInvocation"] | components["schemas"]["PidiImageProcessorInvocation"] | components["schemas"]["ContentShuffleImageProcessorInvocation"] | components["schemas"]["ZoeDepthImageProcessorInvocation"] | components["schemas"]["MediapipeFaceProcessorInvocation"] | components["schemas"]["LeresImageProcessorInvocation"] | components["schemas"]["TileResamplerProcessorInvocation"] | components["schemas"]["SegmentAnythingProcessorInvocation"] | components["schemas"]["LatentsToLatentsInvocation"];
+        "application/json": components["schemas"]["LoadImageInvocation"] | components["schemas"]["ShowImageInvocation"] | components["schemas"]["ImageCropInvocation"] | components["schemas"]["ImagePasteInvocation"] | components["schemas"]["MaskFromAlphaInvocation"] | components["schemas"]["ImageMultiplyInvocation"] | components["schemas"]["ImageChannelInvocation"] | components["schemas"]["ImageConvertInvocation"] | components["schemas"]["ImageBlurInvocation"] | components["schemas"]["ImageResizeInvocation"] | components["schemas"]["ImageScaleInvocation"] | components["schemas"]["ImageLerpInvocation"] | components["schemas"]["ImageInverseLerpInvocation"] | components["schemas"]["ControlNetInvocation"] | components["schemas"]["ImageProcessorInvocation"] | components["schemas"]["MainModelLoaderInvocation"] | components["schemas"]["LoraLoaderInvocation"] | components["schemas"]["VaeLoaderInvocation"] | components["schemas"]["MetadataAccumulatorInvocation"] | components["schemas"]["DynamicPromptInvocation"] | components["schemas"]["CompelInvocation"] | components["schemas"]["ClipSkipInvocation"] | components["schemas"]["AddInvocation"] | components["schemas"]["SubtractInvocation"] | components["schemas"]["MultiplyInvocation"] | components["schemas"]["DivideInvocation"] | components["schemas"]["RandomIntInvocation"] | components["schemas"]["ParamIntInvocation"] | components["schemas"]["ParamFloatInvocation"] | components["schemas"]["TextToLatentsInvocation"] | components["schemas"]["LatentsToImageInvocation"] | components["schemas"]["ResizeLatentsInvocation"] | components["schemas"]["ScaleLatentsInvocation"] | components["schemas"]["ImageToLatentsInvocation"] | components["schemas"]["CvInpaintInvocation"] | components["schemas"]["RangeInvocation"] | components["schemas"]["RangeOfSizeInvocation"] | components["schemas"]["RandomRangeInvocation"] | components["schemas"]["ImageCollectionInvocation"] | components["schemas"]["FloatLinearRangeInvocation"] | components["schemas"]["StepParamEasingInvocation"] | components["schemas"]["NoiseInvocation"] | components["schemas"]["UpscaleInvocation"] | components["schemas"]["RestoreFaceInvocation"] | components["schemas"]["InpaintInvocation"] | components["schemas"]["InfillColorInvocation"] | components["schemas"]["InfillTileInvocation"] | components["schemas"]["InfillPatchMatchInvocation"] | components["schemas"]["GraphInvocation"] | components["schemas"]["IterateInvocation"] | components["schemas"]["CollectInvocation"] | components["schemas"]["CannyImageProcessorInvocation"] | components["schemas"]["HedImageProcessorInvocation"] | components["schemas"]["LineartImageProcessorInvocation"] | components["schemas"]["LineartAnimeImageProcessorInvocation"] | components["schemas"]["OpenposeImageProcessorInvocation"] | components["schemas"]["MidasDepthImageProcessorInvocation"] | components["schemas"]["NormalbaeImageProcessorInvocation"] | components["schemas"]["MlsdImageProcessorInvocation"] | components["schemas"]["PidiImageProcessorInvocation"] | components["schemas"]["ContentShuffleImageProcessorInvocation"] | components["schemas"]["ZoeDepthImageProcessorInvocation"] | components["schemas"]["MediapipeFaceProcessorInvocation"] | components["schemas"]["LeresImageProcessorInvocation"] | components["schemas"]["TileResamplerProcessorInvocation"] | components["schemas"]["SegmentAnythingProcessorInvocation"] | components["schemas"]["LatentsToLatentsInvocation"];
       };
     };
     responses: {
@@ -4584,7 +4764,7 @@ export type operations = {
     };
     requestBody: {
       content: {
-        "application/json": components["schemas"]["RangeInvocation"] | components["schemas"]["RangeOfSizeInvocation"] | components["schemas"]["RandomRangeInvocation"] | components["schemas"]["ImageCollectionInvocation"] | components["schemas"]["MainModelLoaderInvocation"] | components["schemas"]["LoraLoaderInvocation"] | components["schemas"]["VaeLoaderInvocation"] | components["schemas"]["CompelInvocation"] | components["schemas"]["ClipSkipInvocation"] | components["schemas"]["LoadImageInvocation"] | components["schemas"]["ShowImageInvocation"] | components["schemas"]["ImageCropInvocation"] | components["schemas"]["ImagePasteInvocation"] | components["schemas"]["MaskFromAlphaInvocation"] | components["schemas"]["ImageMultiplyInvocation"] | components["schemas"]["ImageChannelInvocation"] | components["schemas"]["ImageConvertInvocation"] | components["schemas"]["ImageBlurInvocation"] | components["schemas"]["ImageResizeInvocation"] | components["schemas"]["ImageScaleInvocation"] | components["schemas"]["ImageLerpInvocation"] | components["schemas"]["ImageInverseLerpInvocation"] | components["schemas"]["ControlNetInvocation"] | components["schemas"]["ImageProcessorInvocation"] | components["schemas"]["CvInpaintInvocation"] | components["schemas"]["TextToLatentsInvocation"] | components["schemas"]["LatentsToImageInvocation"] | components["schemas"]["ResizeLatentsInvocation"] | components["schemas"]["ScaleLatentsInvocation"] | components["schemas"]["ImageToLatentsInvocation"] | components["schemas"]["InpaintInvocation"] | components["schemas"]["InfillColorInvocation"] | components["schemas"]["InfillTileInvocation"] | components["schemas"]["InfillPatchMatchInvocation"] | components["schemas"]["AddInvocation"] | components["schemas"]["SubtractInvocation"] | components["schemas"]["MultiplyInvocation"] | components["schemas"]["DivideInvocation"] | components["schemas"]["RandomIntInvocation"] | components["schemas"]["NoiseInvocation"] | components["schemas"]["ParamIntInvocation"] | components["schemas"]["ParamFloatInvocation"] | components["schemas"]["FloatLinearRangeInvocation"] | components["schemas"]["StepParamEasingInvocation"] | components["schemas"]["DynamicPromptInvocation"] | components["schemas"]["RestoreFaceInvocation"] | components["schemas"]["UpscaleInvocation"] | components["schemas"]["GraphInvocation"] | components["schemas"]["IterateInvocation"] | components["schemas"]["CollectInvocation"] | components["schemas"]["CannyImageProcessorInvocation"] | components["schemas"]["HedImageProcessorInvocation"] | components["schemas"]["LineartImageProcessorInvocation"] | components["schemas"]["LineartAnimeImageProcessorInvocation"] | components["schemas"]["OpenposeImageProcessorInvocation"] | components["schemas"]["MidasDepthImageProcessorInvocation"] | components["schemas"]["NormalbaeImageProcessorInvocation"] | components["schemas"]["MlsdImageProcessorInvocation"] | components["schemas"]["PidiImageProcessorInvocation"] | components["schemas"]["ContentShuffleImageProcessorInvocation"] | components["schemas"]["ZoeDepthImageProcessorInvocation"] | components["schemas"]["MediapipeFaceProcessorInvocation"] | components["schemas"]["LeresImageProcessorInvocation"] | components["schemas"]["TileResamplerProcessorInvocation"] | components["schemas"]["SegmentAnythingProcessorInvocation"] | components["schemas"]["LatentsToLatentsInvocation"];
+        "application/json": components["schemas"]["LoadImageInvocation"] | components["schemas"]["ShowImageInvocation"] | components["schemas"]["ImageCropInvocation"] | components["schemas"]["ImagePasteInvocation"] | components["schemas"]["MaskFromAlphaInvocation"] | components["schemas"]["ImageMultiplyInvocation"] | components["schemas"]["ImageChannelInvocation"] | components["schemas"]["ImageConvertInvocation"] | components["schemas"]["ImageBlurInvocation"] | components["schemas"]["ImageResizeInvocation"] | components["schemas"]["ImageScaleInvocation"] | components["schemas"]["ImageLerpInvocation"] | components["schemas"]["ImageInverseLerpInvocation"] | components["schemas"]["ControlNetInvocation"] | components["schemas"]["ImageProcessorInvocation"] | components["schemas"]["MainModelLoaderInvocation"] | components["schemas"]["LoraLoaderInvocation"] | components["schemas"]["VaeLoaderInvocation"] | components["schemas"]["MetadataAccumulatorInvocation"] | components["schemas"]["DynamicPromptInvocation"] | components["schemas"]["CompelInvocation"] | components["schemas"]["ClipSkipInvocation"] | components["schemas"]["AddInvocation"] | components["schemas"]["SubtractInvocation"] | components["schemas"]["MultiplyInvocation"] | components["schemas"]["DivideInvocation"] | components["schemas"]["RandomIntInvocation"] | components["schemas"]["ParamIntInvocation"] | components["schemas"]["ParamFloatInvocation"] | components["schemas"]["TextToLatentsInvocation"] | components["schemas"]["LatentsToImageInvocation"] | components["schemas"]["ResizeLatentsInvocation"] | components["schemas"]["ScaleLatentsInvocation"] | components["schemas"]["ImageToLatentsInvocation"] | components["schemas"]["CvInpaintInvocation"] | components["schemas"]["RangeInvocation"] | components["schemas"]["RangeOfSizeInvocation"] | components["schemas"]["RandomRangeInvocation"] | components["schemas"]["ImageCollectionInvocation"] | components["schemas"]["FloatLinearRangeInvocation"] | components["schemas"]["StepParamEasingInvocation"] | components["schemas"]["NoiseInvocation"] | components["schemas"]["UpscaleInvocation"] | components["schemas"]["RestoreFaceInvocation"] | components["schemas"]["InpaintInvocation"] | components["schemas"]["InfillColorInvocation"] | components["schemas"]["InfillTileInvocation"] | components["schemas"]["InfillPatchMatchInvocation"] | components["schemas"]["GraphInvocation"] | components["schemas"]["IterateInvocation"] | components["schemas"]["CollectInvocation"] | components["schemas"]["CannyImageProcessorInvocation"] | components["schemas"]["HedImageProcessorInvocation"] | components["schemas"]["LineartImageProcessorInvocation"] | components["schemas"]["LineartAnimeImageProcessorInvocation"] | components["schemas"]["OpenposeImageProcessorInvocation"] | components["schemas"]["MidasDepthImageProcessorInvocation"] | components["schemas"]["NormalbaeImageProcessorInvocation"] | components["schemas"]["MlsdImageProcessorInvocation"] | components["schemas"]["PidiImageProcessorInvocation"] | components["schemas"]["ContentShuffleImageProcessorInvocation"] | components["schemas"]["ZoeDepthImageProcessorInvocation"] | components["schemas"]["MediapipeFaceProcessorInvocation"] | components["schemas"]["LeresImageProcessorInvocation"] | components["schemas"]["TileResamplerProcessorInvocation"] | components["schemas"]["SegmentAnythingProcessorInvocation"] | components["schemas"]["LatentsToLatentsInvocation"];
       };
     };
     responses: {
@@ -4817,7 +4997,7 @@ export type operations = {
       /** @description The model imported successfully */
       201: {
         content: {
-          "application/json": components["schemas"]["StableDiffusion1ModelCheckpointConfig"] | components["schemas"]["StableDiffusion1ModelDiffusersConfig"] | components["schemas"]["VaeModelConfig"] | components["schemas"]["LoRAModelConfig"] | components["schemas"]["ControlNetModelConfig"] | components["schemas"]["TextualInversionModelConfig"] | components["schemas"]["StableDiffusion2ModelDiffusersConfig"] | components["schemas"]["StableDiffusion2ModelCheckpointConfig"];
+          "application/json": components["schemas"]["StableDiffusion1ModelDiffusersConfig"] | components["schemas"]["StableDiffusion1ModelCheckpointConfig"] | components["schemas"]["VaeModelConfig"] | components["schemas"]["LoRAModelConfig"] | components["schemas"]["ControlNetModelConfig"] | components["schemas"]["TextualInversionModelConfig"] | components["schemas"]["StableDiffusion2ModelCheckpointConfig"] | components["schemas"]["StableDiffusion2ModelDiffusersConfig"];
         };
       };
       /** @description The model could not be found */
@@ -4885,14 +5065,14 @@ export type operations = {
     };
     requestBody: {
       content: {
-        "application/json": components["schemas"]["StableDiffusion1ModelCheckpointConfig"] | components["schemas"]["StableDiffusion1ModelDiffusersConfig"] | components["schemas"]["VaeModelConfig"] | components["schemas"]["LoRAModelConfig"] | components["schemas"]["ControlNetModelConfig"] | components["schemas"]["TextualInversionModelConfig"] | components["schemas"]["StableDiffusion2ModelDiffusersConfig"] | components["schemas"]["StableDiffusion2ModelCheckpointConfig"];
+        "application/json": components["schemas"]["StableDiffusion1ModelDiffusersConfig"] | components["schemas"]["StableDiffusion1ModelCheckpointConfig"] | components["schemas"]["VaeModelConfig"] | components["schemas"]["LoRAModelConfig"] | components["schemas"]["ControlNetModelConfig"] | components["schemas"]["TextualInversionModelConfig"] | components["schemas"]["StableDiffusion2ModelCheckpointConfig"] | components["schemas"]["StableDiffusion2ModelDiffusersConfig"];
       };
     };
     responses: {
       /** @description The model was updated successfully */
       200: {
         content: {
-          "application/json": components["schemas"]["StableDiffusion1ModelCheckpointConfig"] | components["schemas"]["StableDiffusion1ModelDiffusersConfig"] | components["schemas"]["VaeModelConfig"] | components["schemas"]["LoRAModelConfig"] | components["schemas"]["ControlNetModelConfig"] | components["schemas"]["TextualInversionModelConfig"] | components["schemas"]["StableDiffusion2ModelDiffusersConfig"] | components["schemas"]["StableDiffusion2ModelCheckpointConfig"];
+          "application/json": components["schemas"]["StableDiffusion1ModelDiffusersConfig"] | components["schemas"]["StableDiffusion1ModelCheckpointConfig"] | components["schemas"]["VaeModelConfig"] | components["schemas"]["LoRAModelConfig"] | components["schemas"]["ControlNetModelConfig"] | components["schemas"]["TextualInversionModelConfig"] | components["schemas"]["StableDiffusion2ModelCheckpointConfig"] | components["schemas"]["StableDiffusion2ModelDiffusersConfig"];
         };
       };
       /** @description Bad request */
@@ -4926,7 +5106,7 @@ export type operations = {
       /** @description Model converted successfully */
       200: {
         content: {
-          "application/json": components["schemas"]["StableDiffusion1ModelCheckpointConfig"] | components["schemas"]["StableDiffusion1ModelDiffusersConfig"] | components["schemas"]["VaeModelConfig"] | components["schemas"]["LoRAModelConfig"] | components["schemas"]["ControlNetModelConfig"] | components["schemas"]["TextualInversionModelConfig"] | components["schemas"]["StableDiffusion2ModelDiffusersConfig"] | components["schemas"]["StableDiffusion2ModelCheckpointConfig"];
+          "application/json": components["schemas"]["StableDiffusion1ModelDiffusersConfig"] | components["schemas"]["StableDiffusion1ModelCheckpointConfig"] | components["schemas"]["VaeModelConfig"] | components["schemas"]["LoRAModelConfig"] | components["schemas"]["ControlNetModelConfig"] | components["schemas"]["TextualInversionModelConfig"] | components["schemas"]["StableDiffusion2ModelCheckpointConfig"] | components["schemas"]["StableDiffusion2ModelDiffusersConfig"];
         };
       };
       /** @description Bad request */
@@ -4961,7 +5141,7 @@ export type operations = {
       /** @description Model converted successfully */
       200: {
         content: {
-          "application/json": components["schemas"]["StableDiffusion1ModelCheckpointConfig"] | components["schemas"]["StableDiffusion1ModelDiffusersConfig"] | components["schemas"]["VaeModelConfig"] | components["schemas"]["LoRAModelConfig"] | components["schemas"]["ControlNetModelConfig"] | components["schemas"]["TextualInversionModelConfig"] | components["schemas"]["StableDiffusion2ModelDiffusersConfig"] | components["schemas"]["StableDiffusion2ModelCheckpointConfig"];
+          "application/json": components["schemas"]["StableDiffusion1ModelDiffusersConfig"] | components["schemas"]["StableDiffusion1ModelCheckpointConfig"] | components["schemas"]["VaeModelConfig"] | components["schemas"]["LoRAModelConfig"] | components["schemas"]["ControlNetModelConfig"] | components["schemas"]["TextualInversionModelConfig"] | components["schemas"]["StableDiffusion2ModelCheckpointConfig"] | components["schemas"]["StableDiffusion2ModelDiffusersConfig"];
         };
       };
       /** @description Incompatible models */
@@ -4977,10 +5157,10 @@ export type operations = {
     };
   };
   /**
-   * List Images With Metadata 
-   * @description Gets a list of images
+   * List Image Dtos 
+   * @description Gets a list of image DTOs
    */
-  list_images_with_metadata: {
+  list_image_dtos: {
     parameters: {
       query?: {
         /** @description The origin of images to list */
@@ -5050,25 +5230,23 @@ export type operations = {
     };
   };
   /**
-   * Get Image Full 
-   * @description Gets a full-resolution image file
+   * Get Image Dto 
+   * @description Gets an image's DTO
    */
-  get_image_full: {
+  get_image_dto: {
     parameters: {
       path: {
-        /** @description The name of full-resolution image file to get */
+        /** @description The name of image to get */
         image_name: string;
       };
     };
     responses: {
-      /** @description Return the full-resolution image */
+      /** @description Successful Response */
       200: {
         content: {
-          "image/png": unknown;
+          "application/json": components["schemas"]["ImageDTO"];
         };
       };
-      /** @description Image not found */
-      404: never;
       /** @description Validation Error */
       422: {
         content: {
@@ -5149,7 +5327,7 @@ export type operations = {
       /** @description Successful Response */
       200: {
         content: {
-          "application/json": components["schemas"]["ImageDTO"];
+          "application/json": components["schemas"]["ImageMetadata"];
         };
       };
       /** @description Validation Error */
@@ -5160,6 +5338,34 @@ export type operations = {
       };
     };
   };
+  /**
+   * Get Image Full 
+   * @description Gets a full-resolution image file
+   */
+  get_image_full: {
+    parameters: {
+      path: {
+        /** @description The name of full-resolution image file to get */
+        image_name: string;
+      };
+    };
+    responses: {
+      /** @description Return the full-resolution image */
+      200: {
+        content: {
+          "image/png": unknown;
+        };
+      };
+      /** @description Image not found */
+      404: never;
+      /** @description Validation Error */
+      422: {
+        content: {
+          "application/json": components["schemas"]["HTTPValidationError"];
+        };
+      };
+    };
+  };
   /**
    * Get Image Thumbnail 
    * @description Gets a thumbnail image file
@@ -5450,4 +5656,15 @@ export type operations = {
       };
     };
   };
+  /** Get Config */
+  get_config: {
+    responses: {
+      /** @description Successful Response */
+      200: {
+        content: {
+          "application/json": components["schemas"]["AppConfig"];
+        };
+      };
+    };
+  };
 };

invokeai/frontend/web/src/services/api/thunks/image.ts

@@ -1,9 +1,13 @@
-import queryString from 'query-string';
 import { createAppAsyncThunk } from 'app/store/storeUtils';
-import { selectImagesAll } from 'features/gallery/store/gallerySlice';
+import { selectFilteredImages } from 'features/gallery/store/gallerySelectors';
+import {
+  ASSETS_CATEGORIES,
+  IMAGE_CATEGORIES,
+} from 'features/gallery/store/gallerySlice';
 import { size } from 'lodash-es';
-import { paths } from 'services/api/schema';
+import queryString from 'query-string';
 import { $client } from 'services/api/client';
+import { paths } from 'services/api/schema';
 
 type GetImageUrlsArg =
   paths['/api/v1/images/{image_name}/urls']['get']['parameters']['path'];
@@ -24,7 +28,7 @@ export const imageUrlsReceived = createAppAsyncThunk<
   GetImageUrlsResponse,
   GetImageUrlsArg,
   GetImageUrlsThunkConfig
->('api/imageUrlsReceived', async (arg, { rejectWithValue }) => {
+>('thunkApi/imageUrlsReceived', async (arg, { rejectWithValue }) => {
   const { image_name } = arg;
   const { get } = $client.get();
   const { data, error, response } = await get(
@@ -46,10 +50,10 @@ export const imageUrlsReceived = createAppAsyncThunk<
 });
 
 type GetImageMetadataArg =
-  paths['/api/v1/images/{image_name}/metadata']['get']['parameters']['path'];
+  paths['/api/v1/images/{image_name}']['get']['parameters']['path'];
 
 type GetImageMetadataResponse =
-  paths['/api/v1/images/{image_name}/metadata']['get']['responses']['200']['content']['application/json'];
+  paths['/api/v1/images/{image_name}']['get']['responses']['200']['content']['application/json'];
 
 type GetImageMetadataThunkConfig = {
   rejectValue: {
@@ -58,21 +62,18 @@ type GetImageMetadataThunkConfig = {
   };
 };
 
-export const imageMetadataReceived = createAppAsyncThunk<
+export const imageDTOReceived = createAppAsyncThunk<
   GetImageMetadataResponse,
   GetImageMetadataArg,
   GetImageMetadataThunkConfig
->('api/imageMetadataReceived', async (arg, { rejectWithValue }) => {
+>('thunkApi/imageMetadataReceived', async (arg, { rejectWithValue }) => {
   const { image_name } = arg;
   const { get } = $client.get();
-  const { data, error, response } = await get(
-    '/api/v1/images/{image_name}/metadata',
-    {
-      params: {
-        path: { image_name },
-      },
-    }
-  );
+  const { data, error, response } = await get('/api/v1/images/{image_name}', {
+    params: {
+      path: { image_name },
+    },
+  });
 
   if (error) {
     return rejectWithValue({ arg, error });
@@ -148,7 +149,7 @@ export const imageUploaded = createAppAsyncThunk<
   UploadImageResponse,
   UploadImageArg,
   UploadImageThunkConfig
->('api/imageUploaded', async (arg, { rejectWithValue }) => {
+>('thunkApi/imageUploaded', async (arg, { rejectWithValue }) => {
   const {
     postUploadAction,
     file,
@@ -199,7 +200,7 @@ export const imageDeleted = createAppAsyncThunk<
   DeleteImageResponse,
   DeleteImageArg,
   DeleteImageThunkConfig
->('api/imageDeleted', async (arg, { rejectWithValue }) => {
+>('thunkApi/imageDeleted', async (arg, { rejectWithValue }) => {
   const { image_name } = arg;
   const { del } = $client.get();
   const { data, error, response } = await del('/api/v1/images/{image_name}', {
@@ -235,7 +236,7 @@ export const imageUpdated = createAppAsyncThunk<
   UpdateImageResponse,
   UpdateImageArg,
   UpdateImageThunkConfig
->('api/imageUpdated', async (arg, { rejectWithValue }) => {
+>('thunkApi/imageUpdated', async (arg, { rejectWithValue }) => {
   const { image_name, image_category, is_intermediate, session_id } = arg;
   const { patch } = $client.get();
   const { data, error, response } = await patch('/api/v1/images/{image_name}', {
@@ -284,46 +285,46 @@ export const receivedPageOfImages = createAppAsyncThunk<
   ListImagesResponse,
   ListImagesArg,
   ListImagesThunkConfig
->('api/receivedPageOfImages', async (arg, { getState, rejectWithValue }) => {
-  const { get } = $client.get();
+>(
+  'thunkApi/receivedPageOfImages',
+  async (arg, { getState, rejectWithValue }) => {
+    const { get } = $client.get();
 
-  const state = getState();
-  const { categories, selectedBoardId } = state.gallery;
+    const state = getState();
 
-  const images = selectImagesAll(state).filter((i) => {
-    const isInCategory = categories.includes(i.image_category);
-    const isInSelectedBoard = selectedBoardId
-      ? i.board_id === selectedBoardId
-      : true;
-    return isInCategory && isInSelectedBoard;
-  });
+    const images = selectFilteredImages(state);
+    const categories =
+      state.gallery.galleryView === 'images'
+        ? IMAGE_CATEGORIES
+        : ASSETS_CATEGORIES;
 
-  let query: ListImagesArg = {};
+    let query: ListImagesArg = {};
 
-  if (size(arg)) {
-    query = {
-      ...DEFAULT_IMAGES_LISTED_ARG,
-      offset: images.length,
-      ...arg,
-    };
-  } else {
-    query = {
-      ...DEFAULT_IMAGES_LISTED_ARG,
-      categories,
-      offset: images.length,
-    };
+    if (size(arg)) {
+      query = {
+        ...DEFAULT_IMAGES_LISTED_ARG,
+        offset: images.length,
+        ...arg,
+      };
+    } else {
+      query = {
+        ...DEFAULT_IMAGES_LISTED_ARG,
+        categories,
+        offset: images.length,
+      };
+    }
+
+    const { data, error, response } = await get('/api/v1/images/', {
+      params: {
+        query,
+      },
+      querySerializer: (q) => queryString.stringify(q, { arrayFormat: 'none' }),
+    });
+
+    if (error) {
+      return rejectWithValue({ arg, error });
+    }
+
+    return data;
   }
-
-  const { data, error, response } = await get('/api/v1/images/', {
-    params: {
-      query,
-    },
-    querySerializer: (q) => queryString.stringify(q, { arrayFormat: 'none' }),
-  });
-
-  if (error) {
-    return rejectWithValue({ arg, error });
-  }
-
-  return data;
-});
+);

invokeai/frontend/web/src/services/api/types.d.ts

@@ -10,6 +10,7 @@ type TypeReq<T> = O.Required<T, 'type'>;
 
 // App Info
 export type AppVersion = components['schemas']['AppVersion'];
+export type AppConfig = components['schemas']['AppConfig'];
 
 // Images
 export type ImageDTO = components['schemas']['ImageDTO'];
@@ -19,6 +20,7 @@ export type ImageChanges = components['schemas']['ImageRecordChanges'];
 export type ImageCategory = components['schemas']['ImageCategory'];
 export type ResourceOrigin = components['schemas']['ResourceOrigin'];
 export type ImageField = components['schemas']['ImageField'];
+export type ImageMetadata = components['schemas']['ImageMetadata'];
 export type OffsetPaginatedResults_BoardDTO_ =
   components['schemas']['OffsetPaginatedResults_BoardDTO_'];
 export type OffsetPaginatedResults_ImageDTO_ =
@@ -31,6 +33,7 @@ export type MainModelField = components['schemas']['MainModelField'];
 export type VAEModelField = components['schemas']['VAEModelField'];
 export type LoRAModelField = components['schemas']['LoRAModelField'];
 export type ModelsList = components['schemas']['ModelsList'];
+export type ControlField = components['schemas']['ControlField'];
 
 // Model Configs
 export type LoRAModelConfig = components['schemas']['LoRAModelConfig'];
@@ -108,6 +111,9 @@ export type MainModelLoaderInvocation = TypeReq<
 export type LoraLoaderInvocation = TypeReq<
   components['schemas']['LoraLoaderInvocation']
 >;
+export type MetadataAccumulatorInvocation = TypeReq<
+  components['schemas']['MetadataAccumulatorInvocation']
+>;
 
 // ControlNet Nodes
 export type ControlNetInvocation = TypeReq<