chore(ui): regen api client

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

@@ -42,7 +42,6 @@ export type { ImagePasteInvocation } from './models/ImagePasteInvocation';
 export type { ImageRecordChanges } from './models/ImageRecordChanges';
 export type { ImageToImageInvocation } from './models/ImageToImageInvocation';
 export type { ImageToLatentsInvocation } from './models/ImageToLatentsInvocation';
-export type { ImageType } from './models/ImageType';
 export type { ImageUrlsDTO } from './models/ImageUrlsDTO';
 export type { InfillColorInvocation } from './models/InfillColorInvocation';
 export type { InfillPatchMatchInvocation } from './models/InfillPatchMatchInvocation';
@@ -72,6 +71,7 @@ export type { RandomRangeInvocation } from './models/RandomRangeInvocation';
 export type { RangeInvocation } from './models/RangeInvocation';
 export type { RangeOfSizeInvocation } from './models/RangeOfSizeInvocation';
 export type { ResizeLatentsInvocation } from './models/ResizeLatentsInvocation';
+export type { ResourceOrigin } from './models/ResourceOrigin';
 export type { RestoreFaceInvocation } from './models/RestoreFaceInvocation';
 export type { ScaleLatentsInvocation } from './models/ScaleLatentsInvocation';
 export type { ShowImageInvocation } from './models/ShowImageInvocation';

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

@@ -3,6 +3,12 @@
 /* eslint-disable */
 
 /**
- * The category of an image. Use ImageCategory.OTHER for non-default categories.
+ * The category of an image.
+ *
+ * - GENERAL: The image is an output, init image, or otherwise an image without a specialized purpose.
+ * - MASK: The image is a mask image.
+ * - CONTROL: The image is a ControlNet control image.
+ * - USER: The image is a user-provide image.
+ * - OTHER: The image is some other type of image with a specialized purpose. To be used by external nodes.
  */
-export type ImageCategory = 'general' | 'control' | 'mask' | 'other';
+export type ImageCategory = 'general' | 'mask' | 'control' | 'user' | 'other';

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

@@ -4,7 +4,7 @@
 
 import type { ImageCategory } from './ImageCategory';
 import type { ImageMetadata } from './ImageMetadata';
-import type { ImageType } from './ImageType';
+import type { ResourceOrigin } from './ResourceOrigin';
 
 /**
  * Deserialized image record, enriched for the frontend with URLs.
@@ -17,7 +17,7 @@ export type ImageDTO = {
   /**
    * The type of the image.
    */
-  image_type: ImageType;
+  image_origin: ResourceOrigin;
   /**
    * The URL of the image.
    */
@@ -54,10 +54,6 @@ export type ImageDTO = {
    * Whether this is an intermediate image.
    */
   is_intermediate: boolean;
-  /**
-   * Whether this image should be shown in the gallery.
-   */
-  show_in_gallery: boolean;
   /**
    * The session ID that generated this image, if it is a generated image.
    */

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

@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import type { ImageType } from './ImageType';
+import type { ResourceOrigin } from './ResourceOrigin';
 
 /**
  * An image field used for passing image objects between invocations
@@ -11,7 +11,7 @@ export type ImageField = {
   /**
    * The type of the image
    */
-  image_type: ImageType;
+  image_origin: ResourceOrigin;
   /**
    * The name of the image
    */

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

@@ -1,8 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-/**
- * The type of an image.
- */
-export type ImageType = 'results' | 'uploads';

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

@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import type { ImageType } from './ImageType';
+import type { ResourceOrigin } from './ResourceOrigin';
 
 /**
  * The URLs for an image and its thumbnail.
@@ -15,7 +15,7 @@ export type ImageUrlsDTO = {
   /**
    * The type of the image.
    */
-  image_type: ImageType;
+  image_origin: ResourceOrigin;
   /**
    * The URL of the image.
    */

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

@@ -0,0 +1,12 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+/**
+ * The origin of a resource (eg image).
+ *
+ * - INTERNAL: The resource was created by the application.
+ * - EXTERNAL: The resource was not created by the application.
+ * This may be a user-initiated upload, or an internal application upload (eg Canvas init image).
+ */
+export type ResourceOrigin = 'internal' | 'external';

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

@@ -5,9 +5,9 @@ import type { Body_upload_image } from '../models/Body_upload_image';
 import type { ImageCategory } from '../models/ImageCategory';
 import type { ImageDTO } from '../models/ImageDTO';
 import type { ImageRecordChanges } from '../models/ImageRecordChanges';
-import type { ImageType } from '../models/ImageType';
 import type { ImageUrlsDTO } from '../models/ImageUrlsDTO';
 import type { PaginatedResults_ImageDTO_ } from '../models/PaginatedResults_ImageDTO_';
+import type { ResourceOrigin } from '../models/ResourceOrigin';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -22,29 +22,29 @@ export class ImagesService {
    * @throws ApiError
    */
   public static listImagesWithMetadata({
-    imageType,
+    imageOrigin,
-    imageCategory,
+    includeCategories,
+    excludeCategories,
     isIntermediate,
-    showInGallery,
     page,
     perPage = 10,
   }: {
     /**
-     * The type of images to list
+     * The origin of images to list
      */
-    imageType?: ImageType,
+    imageOrigin?: ResourceOrigin,
     /**
-     * The kind of images to list
+     * The categories of image to include
      */
-    imageCategory?: ImageCategory,
+    includeCategories?: Array<ImageCategory>,
+    /**
+     * The categories of image to exclude
+     */
+    excludeCategories?: Array<ImageCategory>,
     /**
      * Whether to list intermediate images
      */
     isIntermediate?: boolean,
-    /**
-     * Whether to list images that show in the gallery
-     */
-    showInGallery?: boolean,
     /**
      * The page of images to get
      */
@@ -58,10 +58,10 @@ export class ImagesService {
       method: 'GET',
       url: '/api/v1/images/',
       query: {
-        'image_type': imageType,
+        'image_origin': imageOrigin,
-        'image_category': imageCategory,
+        'include_categories': includeCategories,
+        'exclude_categories': excludeCategories,
         'is_intermediate': isIntermediate,
-        'show_in_gallery': showInGallery,
         'page': page,
         'per_page': perPage,
       },
@@ -80,7 +80,6 @@ export class ImagesService {
   public static uploadImage({
     imageCategory,
     isIntermediate,
-    showInGallery,
     formData,
     sessionId,
   }: {
@@ -92,10 +91,6 @@ export class ImagesService {
      * Whether this is an intermediate image
      */
     isIntermediate: boolean,
-    /**
-     * Whether this image should be shown in the gallery
-     */
-    showInGallery: boolean,
     formData: Body_upload_image,
     /**
      * The session ID associated with this upload, if any
@@ -108,7 +103,6 @@ export class ImagesService {
       query: {
         'image_category': imageCategory,
         'is_intermediate': isIntermediate,
-        'show_in_gallery': showInGallery,
         'session_id': sessionId,
       },
       formData: formData,
@@ -127,13 +121,13 @@ export class ImagesService {
    * @throws ApiError
    */
   public static getImageFull({
-    imageType,
+    imageOrigin,
     imageName,
   }: {
     /**
      * The type of full-resolution image file to get
      */
-    imageType: ImageType,
+    imageOrigin: ResourceOrigin,
     /**
      * The name of full-resolution image file to get
      */
@@ -141,9 +135,9 @@ export class ImagesService {
   }): CancelablePromise<any> {
     return __request(OpenAPI, {
       method: 'GET',
-      url: '/api/v1/images/{image_type}/{image_name}',
+      url: '/api/v1/images/{image_origin}/{image_name}',
       path: {
-        'image_type': imageType,
+        'image_origin': imageOrigin,
         'image_name': imageName,
       },
       errors: {
@@ -160,13 +154,13 @@ export class ImagesService {
    * @throws ApiError
    */
   public static deleteImage({
-    imageType,
+    imageOrigin,
     imageName,
   }: {
     /**
-     * The type of image to delete
+     * The origin of image to delete
      */
-    imageType: ImageType,
+    imageOrigin: ResourceOrigin,
     /**
      * The name of the image to delete
      */
@@ -174,9 +168,9 @@ export class ImagesService {
   }): CancelablePromise<any> {
     return __request(OpenAPI, {
       method: 'DELETE',
-      url: '/api/v1/images/{image_type}/{image_name}',
+      url: '/api/v1/images/{image_origin}/{image_name}',
       path: {
-        'image_type': imageType,
+        'image_origin': imageOrigin,
         'image_name': imageName,
       },
       errors: {
@@ -192,14 +186,14 @@ export class ImagesService {
    * @throws ApiError
    */
   public static updateImage({
-    imageType,
+    imageOrigin,
     imageName,
     requestBody,
   }: {
     /**
-     * The type of image to update
+     * The origin of image to update
      */
-    imageType: ImageType,
+    imageOrigin: ResourceOrigin,
     /**
      * The name of the image to update
      */
@@ -208,9 +202,9 @@ export class ImagesService {
   }): CancelablePromise<ImageDTO> {
     return __request(OpenAPI, {
       method: 'PATCH',
-      url: '/api/v1/images/{image_type}/{image_name}',
+      url: '/api/v1/images/{image_origin}/{image_name}',
       path: {
-        'image_type': imageType,
+        'image_origin': imageOrigin,
         'image_name': imageName,
       },
       body: requestBody,
@@ -228,13 +222,13 @@ export class ImagesService {
    * @throws ApiError
    */
   public static getImageMetadata({
-    imageType,
+    imageOrigin,
     imageName,
   }: {
     /**
-     * The type of image to get
+     * The origin of image to get
      */
-    imageType: ImageType,
+    imageOrigin: ResourceOrigin,
     /**
      * The name of image to get
      */
@@ -242,9 +236,9 @@ export class ImagesService {
   }): CancelablePromise<ImageDTO> {
     return __request(OpenAPI, {
       method: 'GET',
-      url: '/api/v1/images/{image_type}/{image_name}/metadata',
+      url: '/api/v1/images/{image_origin}/{image_name}/metadata',
       path: {
-        'image_type': imageType,
+        'image_origin': imageOrigin,
         'image_name': imageName,
       },
       errors: {
@@ -260,13 +254,13 @@ export class ImagesService {
    * @throws ApiError
    */
   public static getImageThumbnail({
-    imageType,
+    imageOrigin,
     imageName,
   }: {
     /**
-     * The type of thumbnail image file to get
+     * The origin of thumbnail image file to get
      */
-    imageType: ImageType,
+    imageOrigin: ResourceOrigin,
     /**
      * The name of thumbnail image file to get
      */
@@ -274,9 +268,9 @@ export class ImagesService {
   }): CancelablePromise<any> {
     return __request(OpenAPI, {
       method: 'GET',
-      url: '/api/v1/images/{image_type}/{image_name}/thumbnail',
+      url: '/api/v1/images/{image_origin}/{image_name}/thumbnail',
       path: {
-        'image_type': imageType,
+        'image_origin': imageOrigin,
         'image_name': imageName,
       },
       errors: {
@@ -293,13 +287,13 @@ export class ImagesService {
    * @throws ApiError
    */
   public static getImageUrls({
-    imageType,
+    imageOrigin,
     imageName,
   }: {
     /**
-     * The type of the image whose URL to get
+     * The origin of the image whose URL to get
      */
-    imageType: ImageType,
+    imageOrigin: ResourceOrigin,
     /**
      * The name of the image whose URL to get
      */
@@ -307,9 +301,9 @@ export class ImagesService {
   }): CancelablePromise<ImageUrlsDTO> {
     return __request(OpenAPI, {
       method: 'GET',
-      url: '/api/v1/images/{image_type}/{image_name}/urls',
+      url: '/api/v1/images/{image_origin}/{image_name}/urls',
       path: {
-        'image_type': imageType,
+        'image_origin': imageOrigin,
         'image_name': imageName,
       },
       errors: {