From 99407c899fff64501d4391337de33009276fda15 Mon Sep 17 00:00:00 2001
From: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Tue, 5 Mar 2024 19:04:13 +1100
Subject: [PATCH] feat(ui): update UI to use new model config backend

- Update all queries
- Remove Advanced Add
- Removed un-editable, internal-only model attributes from model edit UI (e.g. format, repo variant, model type)
- Update model tags so the list refreshes when a model installs
- Rename some queries, components, variables, types to match backend
- Fix divide-by-zero in install queue
---
 .../listeners/setDefaultSettings.ts           |    6 +-
 .../listeners/socketio/socketModelInstall.ts  |    8 +-
 .../AddModelPanel/AdvancedImport.tsx          |  228 --
 ...{SimpleImport.tsx => InstallModelForm.tsx} |    2 +-
 .../ModelInstallQueue.tsx}                    |   25 +-
 .../ModelInstallQueueBadge.tsx}               |   13 +-
 .../ModelInstallQueueItem.tsx}                |   59 +-
 .../ScanFolderForm.tsx}                       |   14 +-
 .../ScanFolderResultItem.tsx}                 |    0
 .../ScanFolderResults.tsx}                    |    2 +-
 .../{ImportModels.tsx => InstallModels.tsx}   |   17 +-
 .../ModelManagerPanel/ModelTypeFilter.tsx     |    2 +-
 .../modelManagerV2/subpanels/ModelPane.tsx    |    4 +-
 .../subpanels/ModelPanel/DefaultSettings.tsx  |    4 +-
 .../DefaultSettings/DefaultSettingsForm.tsx   |    8 +-
 .../ModelPanel/Fields/BaseModelSelect.tsx     |   12 +-
 .../ModelPanel/Fields/BooleanSelect.tsx       |   27 -
 .../ModelPanel/Fields/ModelFormatSelect.tsx   |   47 -
 .../ModelPanel/Fields/ModelTypeSelect.tsx     |   32 -
 .../ModelPanel/Fields/ModelVariantSelect.tsx  |   12 +-
 .../Fields/PredictionTypeSelect.tsx           |   12 +-
 .../ModelPanel/Fields/RepoVariantSelect.tsx   |   27 -
 .../ModelPanel/Metadata/ModelMetadata.tsx     |    6 +-
 .../subpanels/ModelPanel/ModelConvert.tsx     |    4 +-
 .../subpanels/ModelPanel/ModelEdit.tsx        |  165 +-
 .../subpanels/ModelPanel/ModelView.tsx        |   33 +-
 .../web/src/services/api/endpoints/models.ts  |  179 +-
 .../frontend/web/src/services/api/index.ts    |    2 +-
 .../frontend/web/src/services/api/schema.ts   | 1858 +++++++----------
 .../frontend/web/src/services/api/types.ts    |    9 +-
 30 files changed, 993 insertions(+), 1824 deletions(-)
 delete mode 100644 invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/AdvancedImport.tsx
 rename invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/{SimpleImport.tsx => InstallModelForm.tsx} (98%)
 rename invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/{ImportQueue/ImportQueue.tsx => ModelInstallQueue/ModelInstallQueue.tsx} (67%)
 rename invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/{ImportQueue/ImportQueueBadge.tsx => ModelInstallQueue/ModelInstallQueueBadge.tsx} (76%)
 rename invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/{ImportQueue/ImportQueueItem.tsx => ModelInstallQueue/ModelInstallQueueItem.tsx} (60%)
 rename invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/{ScanModels/ScanModelsForm.tsx => ScanFolder/ScanFolderForm.tsx} (76%)
 rename invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/{ScanModels/ScanModelResultItem.tsx => ScanFolder/ScanFolderResultItem.tsx} (100%)
 rename invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/{ScanModels/ScanModelsResults.tsx => ScanFolder/ScanFolderResults.tsx} (98%)
 rename invokeai/frontend/web/src/features/modelManagerV2/subpanels/{ImportModels.tsx => InstallModels.tsx} (66%)
 delete mode 100644 invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/BooleanSelect.tsx
 delete mode 100644 invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/ModelFormatSelect.tsx
 delete mode 100644 invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/ModelTypeSelect.tsx
 delete mode 100644 invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/RepoVariantSelect.tsx

diff --git a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/setDefaultSettings.ts b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/setDefaultSettings.ts
index cd4c574be4..da7cf6b6fe 100644
--- a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/setDefaultSettings.ts
+++ b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/setDefaultSettings.ts
@@ -34,13 +34,13 @@ export const addSetDefaultSettingsListener = (startAppListening: AppStartListeni
         return;
       }
 
-      const metadata = await dispatch(modelsApi.endpoints.getModelMetadata.initiate(currentModel.key)).unwrap();
+      const modelConfig = await dispatch(modelsApi.endpoints.getModelConfig.initiate(currentModel.key)).unwrap();
 
-      if (!metadata || !metadata.default_settings) {
+      if (!modelConfig || !modelConfig.default_settings) {
         return;
       }
 
-      const { vae, vae_precision, cfg_scale, cfg_rescale_multiplier, steps, scheduler } = metadata.default_settings;
+      const { vae, vae_precision, cfg_scale, cfg_rescale_multiplier, steps, scheduler } = modelConfig.default_settings;
 
       if (vae) {
         // we store this as "default" within default settings
diff --git a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketModelInstall.ts b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketModelInstall.ts
index 9faedc64d7..59c88bf2a8 100644
--- a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketModelInstall.ts
+++ b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketModelInstall.ts
@@ -14,7 +14,7 @@ export const addModelInstallEventListener = (startAppListening: AppStartListenin
       const { bytes, total_bytes, id } = action.payload.data;
 
       dispatch(
-        modelsApi.util.updateQueryData('getModelImports', undefined, (draft) => {
+        modelsApi.util.updateQueryData('listModelInstalls', undefined, (draft) => {
           const modelImport = draft.find((m) => m.id === id);
           if (modelImport) {
             modelImport.bytes = bytes;
@@ -33,7 +33,7 @@ export const addModelInstallEventListener = (startAppListening: AppStartListenin
       const { id } = action.payload.data;
 
       dispatch(
-        modelsApi.util.updateQueryData('getModelImports', undefined, (draft) => {
+        modelsApi.util.updateQueryData('listModelInstalls', undefined, (draft) => {
           const modelImport = draft.find((m) => m.id === id);
           if (modelImport) {
             modelImport.status = 'completed';
@@ -41,7 +41,7 @@ export const addModelInstallEventListener = (startAppListening: AppStartListenin
           return draft;
         })
       );
-      dispatch(api.util.invalidateTags([{ type: 'ModelConfig' }]));
+      dispatch(api.util.invalidateTags(['Model']));
     },
   });
 
@@ -51,7 +51,7 @@ export const addModelInstallEventListener = (startAppListening: AppStartListenin
       const { id, error, error_type } = action.payload.data;
 
       dispatch(
-        modelsApi.util.updateQueryData('getModelImports', undefined, (draft) => {
+        modelsApi.util.updateQueryData('listModelInstalls', undefined, (draft) => {
           const modelImport = draft.find((m) => m.id === id);
           if (modelImport) {
             modelImport.status = 'error';
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/AdvancedImport.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/AdvancedImport.tsx
deleted file mode 100644
index 56abf7b09a..0000000000
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/AdvancedImport.tsx
+++ /dev/null
@@ -1,228 +0,0 @@
-import { Button, Flex, FormControl, FormErrorMessage, FormLabel, Input, Text, Textarea } from '@invoke-ai/ui-library';
-import { useAppDispatch } from 'app/store/storeHooks';
-import ScrollableContent from 'common/components/OverlayScrollbars/ScrollableContent';
-import BaseModelSelect from 'features/modelManagerV2/subpanels/ModelPanel/Fields/BaseModelSelect';
-import BooleanSelect from 'features/modelManagerV2/subpanels/ModelPanel/Fields/BooleanSelect';
-import ModelFormatSelect from 'features/modelManagerV2/subpanels/ModelPanel/Fields/ModelFormatSelect';
-import ModelTypeSelect from 'features/modelManagerV2/subpanels/ModelPanel/Fields/ModelTypeSelect';
-import ModelVariantSelect from 'features/modelManagerV2/subpanels/ModelPanel/Fields/ModelVariantSelect';
-import PredictionTypeSelect from 'features/modelManagerV2/subpanels/ModelPanel/Fields/PredictionTypeSelect';
-import RepoVariantSelect from 'features/modelManagerV2/subpanels/ModelPanel/Fields/RepoVariantSelect';
-import { addToast } from 'features/system/store/systemSlice';
-import { makeToast } from 'features/system/util/makeToast';
-import { isNil, omitBy } from 'lodash-es';
-import { useCallback, useEffect } from 'react';
-import type { SubmitHandler } from 'react-hook-form';
-import { useForm } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
-import { useInstallModelMutation } from 'services/api/endpoints/models';
-import type { AnyModelConfig } from 'services/api/types';
-
-export const AdvancedImport = () => {
-  const dispatch = useAppDispatch();
-
-  const [installModel] = useInstallModelMutation();
-
-  const { t } = useTranslation();
-
-  const {
-    register,
-    handleSubmit,
-    control,
-    formState: { errors },
-    setValue,
-    resetField,
-    reset,
-    watch,
-  } = useForm<AnyModelConfig>({
-    defaultValues: {
-      name: '',
-      base: 'sd-1',
-      type: 'main',
-      path: '',
-      description: '',
-      format: 'diffusers',
-      vae: '',
-      variant: 'normal',
-    },
-    mode: 'onChange',
-  });
-
-  const onSubmit = useCallback<SubmitHandler<AnyModelConfig>>(
-    (values) => {
-      installModel({
-        source: values.path,
-        config: omitBy(values, isNil),
-      })
-        .unwrap()
-        .then((_) => {
-          dispatch(
-            addToast(
-              makeToast({
-                title: t('modelManager.modelAdded', {
-                  modelName: values.name,
-                }),
-                status: 'success',
-              })
-            )
-          );
-          reset();
-        })
-        .catch((error) => {
-          if (error) {
-            dispatch(
-              addToast(
-                makeToast({
-                  title: t('toast.modelAddFailed'),
-                  status: 'error',
-                })
-              )
-            );
-          }
-        });
-    },
-    [installModel, dispatch, t, reset]
-  );
-
-  const watchedModelType = watch('type');
-  const watchedModelFormat = watch('format');
-
-  useEffect(() => {
-    if (watchedModelType === 'main') {
-      setValue('format', 'diffusers');
-      setValue('repo_variant', '');
-      setValue('variant', 'normal');
-    }
-    if (watchedModelType === 'lora') {
-      setValue('format', 'lycoris');
-    } else if (watchedModelType === 'embedding') {
-      setValue('format', 'embedding_file');
-    } else if (watchedModelType === 'ip_adapter') {
-      setValue('format', 'invokeai');
-    } else {
-      setValue('format', 'diffusers');
-    }
-    resetField('upcast_attention');
-    resetField('ztsnr_training');
-    resetField('vae');
-    resetField('config');
-    resetField('prediction_type');
-    resetField('image_encoder_model_id');
-  }, [watchedModelType, resetField, setValue]);
-
-  return (
-    <ScrollableContent>
-      <form onSubmit={handleSubmit(onSubmit)}>
-        <Flex flexDirection="column" gap={4} width="100%" pb={10}>
-          <Flex alignItems="flex-end" gap="4">
-            <FormControl flexDir="column" alignItems="flex-start" gap={1}>
-              <FormLabel>{t('modelManager.modelType')}</FormLabel>
-              <ModelTypeSelect<AnyModelConfig> control={control} name="type" />
-            </FormControl>
-            <Text px="2" fontSize="xs" textAlign="center">
-              {t('modelManager.advancedImportInfo')}
-            </Text>
-          </Flex>
-
-          <Flex p={4} borderRadius={4} bg="base.850" height="100%" direction="column" gap="3">
-            <FormControl isInvalid={Boolean(errors.name)}>
-              <Flex direction="column" width="full">
-                <FormLabel>{t('modelManager.name')}</FormLabel>
-                <Input
-                  {...register('name', {
-                    validate: (value) => value.trim().length >= 3 || 'Must be at least 3 characters',
-                  })}
-                />
-                {errors.name?.message && <FormErrorMessage>{errors.name?.message}</FormErrorMessage>}
-              </Flex>
-            </FormControl>
-            <Flex>
-              <FormControl>
-                <Flex direction="column" width="full">
-                  <FormLabel>{t('modelManager.description')}</FormLabel>
-                  <Textarea size="sm" {...register('description')} />
-                  {errors.name?.message && <FormErrorMessage>{errors.name?.message}</FormErrorMessage>}
-                </Flex>
-              </FormControl>
-            </Flex>
-            <Flex gap={4}>
-              <FormControl flexDir="column" alignItems="flex-start" gap={1}>
-                <FormLabel>{t('modelManager.baseModel')}</FormLabel>
-                <BaseModelSelect control={control} name="base" />
-              </FormControl>
-              <FormControl flexDir="column" alignItems="flex-start" gap={1}>
-                <FormLabel>{t('common.format')}</FormLabel>
-                <ModelFormatSelect control={control} name="format" />
-              </FormControl>
-            </Flex>
-            <Flex gap={4}>
-              <FormControl flexDir="column" alignItems="flex-start" gap={1} isInvalid={Boolean(errors.path)}>
-                <FormLabel>{t('modelManager.path')}</FormLabel>
-                <Input
-                  {...register('path', {
-                    validate: (value) => value.trim().length > 0 || 'Must provide a path',
-                  })}
-                />
-                {errors.path?.message && <FormErrorMessage>{errors.path?.message}</FormErrorMessage>}
-              </FormControl>
-            </Flex>
-            {watchedModelType === 'main' && (
-              <>
-                <Flex gap={4}>
-                  {watchedModelFormat === 'diffusers' && (
-                    <FormControl flexDir="column" alignItems="flex-start" gap={1}>
-                      <FormLabel>{t('modelManager.repoVariant')}</FormLabel>
-                      <RepoVariantSelect<AnyModelConfig> control={control} name="repo_variant" />
-                    </FormControl>
-                  )}
-                  {watchedModelFormat === 'checkpoint' && (
-                    <FormControl flexDir="column" alignItems="flex-start" gap={1}>
-                      <FormLabel>{t('modelManager.pathToConfig')}</FormLabel>
-                      <Input {...register('config')} />
-                    </FormControl>
-                  )}
-
-                  <FormControl flexDir="column" alignItems="flex-start" gap={1}>
-                    <FormLabel>{t('modelManager.variant')}</FormLabel>
-                    <ModelVariantSelect<AnyModelConfig> control={control} name="variant" />
-                  </FormControl>
-                </Flex>
-                <Flex gap={4}>
-                  <FormControl flexDir="column" alignItems="flex-start" gap={1}>
-                    <FormLabel>{t('modelManager.predictionType')}</FormLabel>
-                    <PredictionTypeSelect<AnyModelConfig> control={control} name="prediction_type" />
-                  </FormControl>
-                  <FormControl flexDir="column" alignItems="flex-start" gap={1}>
-                    <FormLabel>{t('modelManager.upcastAttention')}</FormLabel>
-                    <BooleanSelect<AnyModelConfig> control={control} name="upcast_attention" />
-                  </FormControl>
-                </Flex>
-                <Flex gap={4}>
-                  <FormControl flexDir="column" alignItems="flex-start" gap={1}>
-                    <FormLabel>{t('modelManager.ztsnrTraining')}</FormLabel>
-                    <BooleanSelect<AnyModelConfig> control={control} name="ztsnr_training" />
-                  </FormControl>
-                  <FormControl flexDir="column" alignItems="flex-start" gap={1}>
-                    <FormLabel>{t('modelManager.vaeLocation')}</FormLabel>
-                    <Input {...register('vae')} />
-                  </FormControl>
-                </Flex>
-              </>
-            )}
-            {watchedModelType === 'ip_adapter' && (
-              <Flex gap={4}>
-                <FormControl flexDir="column" alignItems="flex-start" gap={1}>
-                  <FormLabel>{t('modelManager.imageEncoderModelId')}</FormLabel>
-                  <Input {...register('image_encoder_model_id')} />
-                </FormControl>
-              </Flex>
-            )}
-            <Button mt={2} type="submit">
-              {t('modelManager.addModel')}
-            </Button>
-          </Flex>
-        </Flex>
-      </form>
-    </ScrollableContent>
-  );
-};
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/SimpleImport.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/InstallModelForm.tsx
similarity index 98%
rename from invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/SimpleImport.tsx
rename to invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/InstallModelForm.tsx
index 6f704abf4f..ffa4beb305 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/SimpleImport.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/InstallModelForm.tsx
@@ -12,7 +12,7 @@ type SimpleImportModelConfig = {
   location: string;
 };
 
-export const SimpleImport = () => {
+export const InstallModelForm = () => {
   const dispatch = useAppDispatch();
 
   const [installModel, { isLoading }] = useInstallModelMutation();
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ImportQueue/ImportQueue.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ModelInstallQueue/ModelInstallQueue.tsx
similarity index 67%
rename from invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ImportQueue/ImportQueue.tsx
rename to invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ModelInstallQueue/ModelInstallQueue.tsx
index cf45f2c913..ffe2a7a28c 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ImportQueue/ImportQueue.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ModelInstallQueue/ModelInstallQueue.tsx
@@ -5,19 +5,19 @@ import { addToast } from 'features/system/store/systemSlice';
 import { makeToast } from 'features/system/util/makeToast';
 import { t } from 'i18next';
 import { useCallback, useMemo } from 'react';
-import { useGetModelImportsQuery, usePruneModelImportsMutation } from 'services/api/endpoints/models';
+import { useListModelInstallsQuery, usePruneCompletedModelInstallsMutation } from 'services/api/endpoints/models';
 
-import { ImportQueueItem } from './ImportQueueItem';
+import { ModelInstallQueueItem } from './ModelInstallQueueItem';
 
-export const ImportQueue = () => {
+export const ModelInstallQueue = () => {
   const dispatch = useAppDispatch();
 
-  const { data } = useGetModelImportsQuery();
+  const { data } = useListModelInstallsQuery();
 
-  const [pruneModelImports] = usePruneModelImportsMutation();
+  const [_pruneCompletedModelInstalls] = usePruneCompletedModelInstallsMutation();
 
-  const pruneQueue = useCallback(() => {
-    pruneModelImports()
+  const pruneCompletedModelInstalls = useCallback(() => {
+    _pruneCompletedModelInstalls()
       .unwrap()
       .then((_) => {
         dispatch(
@@ -41,7 +41,7 @@ export const ImportQueue = () => {
           );
         }
       });
-  }, [pruneModelImports, dispatch]);
+  }, [_pruneCompletedModelInstalls, dispatch]);
 
   const pruneAvailable = useMemo(() => {
     return data?.some(
@@ -53,14 +53,19 @@ export const ImportQueue = () => {
     <Flex flexDir="column" p={3} h="full">
       <Flex justifyContent="space-between" alignItems="center">
         <Text>{t('modelManager.importQueue')}</Text>
-        <Button size="sm" isDisabled={!pruneAvailable} onClick={pruneQueue} tooltip={t('modelManager.pruneTooltip')}>
+        <Button
+          size="sm"
+          isDisabled={!pruneAvailable}
+          onClick={pruneCompletedModelInstalls}
+          tooltip={t('modelManager.pruneTooltip')}
+        >
           {t('modelManager.prune')}
         </Button>
       </Flex>
       <Box mt={3} layerStyle="first" p={3} borderRadius="base" w="full" h="full">
         <ScrollableContent>
           <Flex flexDir="column-reverse" gap="2">
-            {data?.map((model) => <ImportQueueItem key={model.id} model={model} />)}
+            {data?.map((model) => <ModelInstallQueueItem key={model.id} installJob={model} />)}
           </Flex>
         </ScrollableContent>
       </Box>
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ImportQueue/ImportQueueBadge.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ModelInstallQueue/ModelInstallQueueBadge.tsx
similarity index 76%
rename from invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ImportQueue/ImportQueueBadge.tsx
rename to invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ModelInstallQueue/ModelInstallQueueBadge.tsx
index bbd0421d37..84989be514 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ImportQueue/ImportQueueBadge.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ModelInstallQueue/ModelInstallQueueBadge.tsx
@@ -6,17 +6,24 @@ import type { ModelInstallStatus } from 'services/api/types';
 const STATUSES = {
   waiting: { colorScheme: 'cyan', translationKey: 'queue.pending' },
   downloading: { colorScheme: 'yellow', translationKey: 'queue.in_progress' },
+  downloads_done: { colorScheme: 'yellow', translationKey: 'queue.in_progress' },
   running: { colorScheme: 'yellow', translationKey: 'queue.in_progress' },
   completed: { colorScheme: 'green', translationKey: 'queue.completed' },
   error: { colorScheme: 'red', translationKey: 'queue.failed' },
   cancelled: { colorScheme: 'orange', translationKey: 'queue.canceled' },
 };
 
-const ImportQueueBadge = ({ status, errorReason }: { status?: ModelInstallStatus; errorReason?: string | null }) => {
+const ModelInstallQueueBadge = ({
+  status,
+  errorReason,
+}: {
+  status?: ModelInstallStatus;
+  errorReason?: string | null;
+}) => {
   const { t } = useTranslation();
 
   if (!status || !Object.keys(STATUSES).includes(status)) {
-    return <></>;
+    return null;
   }
 
   return (
@@ -25,4 +32,4 @@ const ImportQueueBadge = ({ status, errorReason }: { status?: ModelInstallStatus
     </Tooltip>
   );
 };
-export default memo(ImportQueueBadge);
+export default memo(ModelInstallQueueBadge);
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ImportQueue/ImportQueueItem.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ModelInstallQueue/ModelInstallQueueItem.tsx
similarity index 60%
rename from invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ImportQueue/ImportQueueItem.tsx
rename to invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ModelInstallQueue/ModelInstallQueueItem.tsx
index 14bbe7daeb..8ab0e4ff6f 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ImportQueue/ImportQueueItem.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ModelInstallQueue/ModelInstallQueueItem.tsx
@@ -3,15 +3,16 @@ import { useAppDispatch } from 'app/store/storeHooks';
 import { addToast } from 'features/system/store/systemSlice';
 import { makeToast } from 'features/system/util/makeToast';
 import { t } from 'i18next';
+import { isNil } from 'lodash-es';
 import { useCallback, useMemo } from 'react';
 import { PiXBold } from 'react-icons/pi';
-import { useDeleteModelImportMutation } from 'services/api/endpoints/models';
+import { useCancelModelInstallMutation } from 'services/api/endpoints/models';
 import type { HFModelSource, LocalModelSource, ModelInstallJob, URLModelSource } from 'services/api/types';
 
-import ImportQueueBadge from './ImportQueueBadge';
+import ModelInstallQueueBadge from './ModelInstallQueueBadge';
 
 type ModelListItemProps = {
-  model: ModelInstallJob;
+  installJob: ModelInstallJob;
 };
 
 const formatBytes = (bytes: number) => {
@@ -26,26 +27,26 @@ const formatBytes = (bytes: number) => {
   return `${bytes.toFixed(2)} ${units[i]}`;
 };
 
-export const ImportQueueItem = (props: ModelListItemProps) => {
-  const { model } = props;
+export const ModelInstallQueueItem = (props: ModelListItemProps) => {
+  const { installJob } = props;
   const dispatch = useAppDispatch();
 
-  const [deleteImportModel] = useDeleteModelImportMutation();
+  const [deleteImportModel] = useCancelModelInstallMutation();
 
   const source = useMemo(() => {
-    if (model.source.type === 'hf') {
-      return model.source as HFModelSource;
-    } else if (model.source.type === 'local') {
-      return model.source as LocalModelSource;
-    } else if (model.source.type === 'url') {
-      return model.source as URLModelSource;
+    if (installJob.source.type === 'hf') {
+      return installJob.source as HFModelSource;
+    } else if (installJob.source.type === 'local') {
+      return installJob.source as LocalModelSource;
+    } else if (installJob.source.type === 'url') {
+      return installJob.source as URLModelSource;
     } else {
-      return model.source as LocalModelSource;
+      return installJob.source as LocalModelSource;
     }
-  }, [model.source]);
+  }, [installJob.source]);
 
   const handleDeleteModelImport = useCallback(() => {
-    deleteImportModel(model.id)
+    deleteImportModel(installJob.id)
       .unwrap()
       .then((_) => {
         dispatch(
@@ -69,7 +70,7 @@ export const ImportQueueItem = (props: ModelListItemProps) => {
           );
         }
       });
-  }, [deleteImportModel, model, dispatch]);
+  }, [deleteImportModel, installJob, dispatch]);
 
   const modelName = useMemo(() => {
     switch (source.type) {
@@ -85,19 +86,23 @@ export const ImportQueueItem = (props: ModelListItemProps) => {
   }, [source]);
 
   const progressValue = useMemo(() => {
-    if (model.bytes === undefined || model.total_bytes === undefined) {
+    if (isNil(installJob.bytes) || isNil(installJob.total_bytes)) {
+      return null;
+    }
+
+    if (installJob.total_bytes === 0) {
       return 0;
     }
 
-    return (model.bytes / model.total_bytes) * 100;
-  }, [model.bytes, model.total_bytes]);
+    return (installJob.bytes / installJob.total_bytes) * 100;
+  }, [installJob.bytes, installJob.total_bytes]);
 
   const progressString = useMemo(() => {
-    if (model.status !== 'downloading' || model.bytes === undefined || model.total_bytes === undefined) {
+    if (installJob.status !== 'downloading' || installJob.bytes === undefined || installJob.total_bytes === undefined) {
       return '';
     }
-    return `${formatBytes(model.bytes)} / ${formatBytes(model.total_bytes)}`;
-  }, [model.bytes, model.total_bytes, model.status]);
+    return `${formatBytes(installJob.bytes)} / ${formatBytes(installJob.total_bytes)}`;
+  }, [installJob.bytes, installJob.total_bytes, installJob.status]);
 
   return (
     <Flex gap="2" w="full" alignItems="center">
@@ -109,19 +114,21 @@ export const ImportQueueItem = (props: ModelListItemProps) => {
       <Flex flexDir="column" flex={1}>
         <Tooltip label={progressString}>
           <Progress
-            value={progressValue}
-            isIndeterminate={progressValue === undefined}
+            value={progressValue ?? 0}
+            isIndeterminate={progressValue === null}
             aria-label={t('accessibility.invokeProgressBar')}
             h={2}
           />
         </Tooltip>
       </Flex>
       <Box minW="100px" textAlign="center">
-        <ImportQueueBadge status={model.status} errorReason={model.error_reason} />
+        <ModelInstallQueueBadge status={installJob.status} errorReason={installJob.error_reason} />
       </Box>
 
       <Box minW="20px">
-        {(model.status === 'downloading' || model.status === 'waiting' || model.status === 'running') && (
+        {(installJob.status === 'downloading' ||
+          installJob.status === 'waiting' ||
+          installJob.status === 'running') && (
           <IconButton
             isRound={true}
             size="xs"
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ScanModels/ScanModelsForm.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ScanFolder/ScanFolderForm.tsx
similarity index 76%
rename from invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ScanModels/ScanModelsForm.tsx
rename to invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ScanFolder/ScanFolderForm.tsx
index 63b879c63b..fe9b99ee81 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ScanModels/ScanModelsForm.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ScanFolder/ScanFolderForm.tsx
@@ -2,24 +2,24 @@ import { Button, Flex, FormControl, FormErrorMessage, FormLabel, Input } from '@
 import type { ChangeEventHandler } from 'react';
 import { useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useLazyScanModelsQuery } from 'services/api/endpoints/models';
+import { useLazyScanFolderQuery } from 'services/api/endpoints/models';
 
-import { ScanModelsResults } from './ScanModelsResults';
+import { ScanModelsResults } from './ScanFolderResults';
 
 export const ScanModelsForm = () => {
   const [scanPath, setScanPath] = useState('');
   const [errorMessage, setErrorMessage] = useState('');
   const { t } = useTranslation();
 
-  const [_scanModels, { isLoading, data }] = useLazyScanModelsQuery();
+  const [_scanFolder, { isLoading, data }] = useLazyScanFolderQuery();
 
-  const handleSubmitScan = useCallback(async () => {
-    _scanModels({ scan_path: scanPath }).catch((error) => {
+  const scanFolder = useCallback(async () => {
+    _scanFolder({ scan_path: scanPath }).catch((error) => {
       if (error) {
         setErrorMessage(error.data.detail);
       }
     });
-  }, [_scanModels, scanPath]);
+  }, [_scanFolder, scanPath]);
 
   const handleSetScanPath: ChangeEventHandler<HTMLInputElement> = useCallback((e) => {
     setScanPath(e.target.value);
@@ -36,7 +36,7 @@ export const ScanModelsForm = () => {
               <Input value={scanPath} onChange={handleSetScanPath} />
             </Flex>
 
-            <Button onClick={handleSubmitScan} isLoading={isLoading} isDisabled={scanPath.length === 0}>
+            <Button onClick={scanFolder} isLoading={isLoading} isDisabled={scanPath.length === 0}>
               {t('modelManager.scanFolder')}
             </Button>
           </Flex>
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ScanModels/ScanModelResultItem.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ScanFolder/ScanFolderResultItem.tsx
similarity index 100%
rename from invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ScanModels/ScanModelResultItem.tsx
rename to invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ScanFolder/ScanFolderResultItem.tsx
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ScanModels/ScanModelsResults.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ScanFolder/ScanFolderResults.tsx
similarity index 98%
rename from invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ScanModels/ScanModelsResults.tsx
rename to invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ScanFolder/ScanFolderResults.tsx
index 960e00c2a6..f8801f44d4 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ScanModels/ScanModelsResults.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ScanFolder/ScanFolderResults.tsx
@@ -18,7 +18,7 @@ import { useTranslation } from 'react-i18next';
 import { PiXBold } from 'react-icons/pi';
 import { type ScanFolderResponse, useInstallModelMutation } from 'services/api/endpoints/models';
 
-import { ScanModelResultItem } from './ScanModelResultItem';
+import { ScanModelResultItem } from './ScanFolderResultItem';
 
 type ScanModelResultsProps = {
   results: ScanFolderResponse;
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ImportModels.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/InstallModels.tsx
similarity index 66%
rename from invokeai/frontend/web/src/features/modelManagerV2/subpanels/ImportModels.tsx
rename to invokeai/frontend/web/src/features/modelManagerV2/subpanels/InstallModels.tsx
index a5e01d1490..9eb8d5185f 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ImportModels.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/InstallModels.tsx
@@ -1,12 +1,11 @@
 import { Box, Flex, Heading, Tab, TabList, TabPanel, TabPanels, Tabs } from '@invoke-ai/ui-library';
 import { useTranslation } from 'react-i18next';
 
-import { AdvancedImport } from './AddModelPanel/AdvancedImport';
-import { ImportQueue } from './AddModelPanel/ImportQueue/ImportQueue';
-import { ScanModelsForm } from './AddModelPanel/ScanModels/ScanModelsForm';
-import { SimpleImport } from './AddModelPanel/SimpleImport';
+import { InstallModelForm } from './AddModelPanel/InstallModelForm';
+import { ModelInstallQueue } from './AddModelPanel/ModelInstallQueue/ModelInstallQueue';
+import { ScanModelsForm } from './AddModelPanel/ScanFolder/ScanFolderForm';
 
-export const ImportModels = () => {
+export const InstallModels = () => {
   const { t } = useTranslation();
   return (
     <Flex layerStyle="first" p={3} borderRadius="base" w="full" h="full" flexDir="column" gap={2}>
@@ -17,15 +16,11 @@ export const ImportModels = () => {
         <Tabs variant="collapse" height="100%">
           <TabList>
             <Tab>{t('common.simple')}</Tab>
-            <Tab>{t('modelManager.advanced')}</Tab>
             <Tab>{t('modelManager.scan')}</Tab>
           </TabList>
           <TabPanels p={3} height="100%">
             <TabPanel>
-              <SimpleImport />
-            </TabPanel>
-            <TabPanel height="100%">
-              <AdvancedImport />
+              <InstallModelForm />
             </TabPanel>
             <TabPanel height="100%">
               <ScanModelsForm />
@@ -34,7 +29,7 @@ export const ImportModels = () => {
         </Tabs>
       </Box>
       <Box layerStyle="second" borderRadius="base" w="full" h="50%">
-        <ImportQueue />
+        <ModelInstallQueue />
       </Box>
     </Flex>
   );
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelManagerPanel/ModelTypeFilter.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelManagerPanel/ModelTypeFilter.tsx
index 71606b4096..4208366a5b 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelManagerPanel/ModelTypeFilter.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelManagerPanel/ModelTypeFilter.tsx
@@ -5,7 +5,7 @@ import { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { IoFilter } from 'react-icons/io5';
 
-export const MODEL_TYPE_LABELS: { [key: string]: string } = {
+const MODEL_TYPE_LABELS: { [key: string]: string } = {
   main: 'Main',
   lora: 'LoRA',
   embedding: 'Textual Inversion',
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPane.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPane.tsx
index c19aceda11..32cca86ea3 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPane.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPane.tsx
@@ -1,14 +1,14 @@
 import { Box } from '@invoke-ai/ui-library';
 import { useAppSelector } from 'app/store/storeHooks';
 
-import { ImportModels } from './ImportModels';
+import { InstallModels } from './InstallModels';
 import { Model } from './ModelPanel/Model';
 
 export const ModelPane = () => {
   const selectedModelKey = useAppSelector((s) => s.modelmanagerV2.selectedModelKey);
   return (
     <Box layerStyle="first" p={2} borderRadius="base" w="50%" h="full">
-      {selectedModelKey ? <Model key={selectedModelKey} /> : <ImportModels />}
+      {selectedModelKey ? <Model key={selectedModelKey} /> : <InstallModels />}
     </Box>
   );
 };
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings.tsx
index d45f33e390..1ea1221d93 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings.tsx
@@ -5,7 +5,7 @@ import Loading from 'common/components/Loading/Loading';
 import { selectConfigSlice } from 'features/system/store/configSlice';
 import { isNil } from 'lodash-es';
 import { useMemo } from 'react';
-import { useGetModelMetadataQuery } from 'services/api/endpoints/models';
+import { useGetModelConfigQuery } from 'services/api/endpoints/models';
 
 import { DefaultSettingsForm } from './DefaultSettings/DefaultSettingsForm';
 
@@ -24,7 +24,7 @@ const initialStatesSelector = createMemoizedSelector(selectConfigSlice, (config)
 export const DefaultSettings = () => {
   const selectedModelKey = useAppSelector((s) => s.modelmanagerV2.selectedModelKey);
 
-  const { data, isLoading } = useGetModelMetadataQuery(selectedModelKey ?? skipToken);
+  const { data, isLoading } = useGetModelConfigQuery(selectedModelKey ?? skipToken);
   const { initialSteps, initialCfg, initialScheduler, initialCfgRescaleMultiplier, initialVaePrecision } =
     useAppSelector(initialStatesSelector);
 
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultSettingsForm.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultSettingsForm.tsx
index 699e3e3445..8a63bdb99b 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultSettingsForm.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultSettingsForm.tsx
@@ -8,7 +8,7 @@ import type { SubmitHandler } from 'react-hook-form';
 import { useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { IoPencil } from 'react-icons/io5';
-import { useUpdateModelMetadataMutation } from 'services/api/endpoints/models';
+import { useUpdateModelMutation } from 'services/api/endpoints/models';
 
 import { DefaultCfgRescaleMultiplier } from './DefaultCfgRescaleMultiplier';
 import { DefaultCfgScale } from './DefaultCfgScale';
@@ -41,7 +41,7 @@ export const DefaultSettingsForm = ({
   const { t } = useTranslation();
   const selectedModelKey = useAppSelector((s) => s.modelmanagerV2.selectedModelKey);
 
-  const [editModelMetadata, { isLoading }] = useUpdateModelMetadataMutation();
+  const [updateModel, { isLoading }] = useUpdateModelMutation();
 
   const { handleSubmit, control, formState } = useForm<DefaultSettingsFormData>({
     defaultValues: defaultSettingsDefaults,
@@ -62,7 +62,7 @@ export const DefaultSettingsForm = ({
         scheduler: data.scheduler.isEnabled ? data.scheduler.value : null,
       };
 
-      editModelMetadata({
+      updateModel({
         key: selectedModelKey,
         body: { default_settings: body },
       })
@@ -90,7 +90,7 @@ export const DefaultSettingsForm = ({
           }
         });
     },
-    [selectedModelKey, dispatch, editModelMetadata, t]
+    [selectedModelKey, dispatch, updateModel, t]
   );
 
   return (
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/BaseModelSelect.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/BaseModelSelect.tsx
index f11b436044..e07714a827 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/BaseModelSelect.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/BaseModelSelect.tsx
@@ -3,9 +3,9 @@ import { Combobox } from '@invoke-ai/ui-library';
 import { typedMemo } from 'common/util/typedMemo';
 import { MODEL_TYPE_MAP } from 'features/parameters/types/constants';
 import { useCallback, useMemo } from 'react';
-import type { UseControllerProps } from 'react-hook-form';
+import type { Control } from 'react-hook-form';
 import { useController } from 'react-hook-form';
-import type { AnyModelConfig } from 'services/api/types';
+import type { UpdateModelArg } from 'services/api/endpoints/models';
 
 const options: ComboboxOption[] = [
   { value: 'sd-1', label: MODEL_TYPE_MAP['sd-1'] },
@@ -14,8 +14,12 @@ const options: ComboboxOption[] = [
   { value: 'sdxl-refiner', label: MODEL_TYPE_MAP['sdxl-refiner'] },
 ];
 
-const BaseModelSelect = (props: UseControllerProps<AnyModelConfig>) => {
-  const { field } = useController(props);
+type Props = {
+  control: Control<UpdateModelArg['body']>;
+};
+
+const BaseModelSelect = ({ control }: Props) => {
+  const { field } = useController({ control, name: 'base' });
   const value = useMemo(() => options.find((o) => o.value === field.value), [field.value]);
   const onChange = useCallback<ComboboxOnChange>(
     (v) => {
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/BooleanSelect.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/BooleanSelect.tsx
deleted file mode 100644
index 48c515d1ee..0000000000
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/BooleanSelect.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { ComboboxOnChange, ComboboxOption } from '@invoke-ai/ui-library';
-import { Combobox } from '@invoke-ai/ui-library';
-import { typedMemo } from 'common/util/typedMemo';
-import { useCallback, useMemo } from 'react';
-import type { UseControllerProps } from 'react-hook-form';
-import { useController } from 'react-hook-form';
-import type { AnyModelConfig } from 'services/api/types';
-
-const options: ComboboxOption[] = [
-  { value: 'none', label: '-' },
-  { value: 'true', label: 'True' },
-  { value: 'false', label: 'False' },
-];
-
-const BooleanSelect = <T extends AnyModelConfig>(props: UseControllerProps<T>) => {
-  const { field } = useController(props);
-  const value = useMemo(() => options.find((o) => o.value === field.value), [field.value]);
-  const onChange = useCallback<ComboboxOnChange>(
-    (v) => {
-      v?.value === 'none' ? field.onChange(undefined) : field.onChange(v?.value === 'true');
-    },
-    [field]
-  );
-  return <Combobox value={value} options={options} onChange={onChange} />;
-};
-
-export default typedMemo(BooleanSelect);
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/ModelFormatSelect.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/ModelFormatSelect.tsx
deleted file mode 100644
index 298dc012f0..0000000000
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/ModelFormatSelect.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import type { ComboboxOnChange, ComboboxOption } from '@invoke-ai/ui-library';
-import { Combobox } from '@invoke-ai/ui-library';
-import { typedMemo } from 'common/util/typedMemo';
-import { useCallback, useMemo } from 'react';
-import type { UseControllerProps } from 'react-hook-form';
-import { useController, useWatch } from 'react-hook-form';
-import type { AnyModelConfig } from 'services/api/types';
-
-const ModelFormatSelect = (props: UseControllerProps<AnyModelConfig>) => {
-  const { field, formState } = useController(props);
-  const type = useWatch({ control: props.control, name: 'type' });
-
-  const onChange = useCallback<ComboboxOnChange>(
-    (v) => {
-      field.onChange(v?.value);
-    },
-    [field]
-  );
-
-  const options: ComboboxOption[] = useMemo(() => {
-    const modelType = type || formState.defaultValues?.type;
-    if (modelType === 'lora') {
-      return [
-        { value: 'lycoris', label: 'LyCORIS' },
-        { value: 'diffusers', label: 'Diffusers' },
-      ];
-    } else if (modelType === 'embedding') {
-      return [
-        { value: 'embedding_file', label: 'Embedding File' },
-        { value: 'embedding_folder', label: 'Embedding Folder' },
-      ];
-    } else if (modelType === 'ip_adapter') {
-      return [{ value: 'invokeai', label: 'invokeai' }];
-    } else {
-      return [
-        { value: 'diffusers', label: 'Diffusers' },
-        { value: 'checkpoint', label: 'Checkpoint' },
-      ];
-    }
-  }, [type, formState.defaultValues?.type]);
-
-  const value = useMemo(() => options.find((o) => o.value === field.value), [options, field.value]);
-
-  return <Combobox value={value} options={options} onChange={onChange} />;
-};
-
-export default typedMemo(ModelFormatSelect);
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/ModelTypeSelect.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/ModelTypeSelect.tsx
deleted file mode 100644
index a995ddc511..0000000000
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/ModelTypeSelect.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import type { ComboboxOnChange, ComboboxOption } from '@invoke-ai/ui-library';
-import { Combobox } from '@invoke-ai/ui-library';
-import { typedMemo } from 'common/util/typedMemo';
-import { MODEL_TYPE_LABELS } from 'features/modelManagerV2/subpanels/ModelManagerPanel/ModelTypeFilter';
-import { useCallback, useMemo } from 'react';
-import type { UseControllerProps } from 'react-hook-form';
-import { useController } from 'react-hook-form';
-import type { AnyModelConfig } from 'services/api/types';
-
-const options: ComboboxOption[] = [
-  { value: 'main', label: MODEL_TYPE_LABELS['main'] as string },
-  { value: 'lora', label: MODEL_TYPE_LABELS['lora'] as string },
-  { value: 'embedding', label: MODEL_TYPE_LABELS['embedding'] as string },
-  { value: 'vae', label: MODEL_TYPE_LABELS['vae'] as string },
-  { value: 'controlnet', label: MODEL_TYPE_LABELS['controlnet'] as string },
-  { value: 'ip_adapter', label: MODEL_TYPE_LABELS['ip_adapter'] as string },
-  { value: 't2i_adapater', label: MODEL_TYPE_LABELS['t2i_adapter'] as string },
-] as const;
-
-const ModelTypeSelect = <T extends AnyModelConfig>(props: UseControllerProps<T>) => {
-  const { field } = useController(props);
-  const value = useMemo(() => options.find((o) => o.value === field.value), [field.value]);
-  const onChange = useCallback<ComboboxOnChange>(
-    (v) => {
-      field.onChange(v?.value);
-    },
-    [field]
-  );
-  return <Combobox value={value} options={options} onChange={onChange} />;
-};
-
-export default typedMemo(ModelTypeSelect);
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/ModelVariantSelect.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/ModelVariantSelect.tsx
index cde4d63ef9..6686cc4336 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/ModelVariantSelect.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/ModelVariantSelect.tsx
@@ -2,9 +2,9 @@ import type { ComboboxOnChange, ComboboxOption } from '@invoke-ai/ui-library';
 import { Combobox } from '@invoke-ai/ui-library';
 import { typedMemo } from 'common/util/typedMemo';
 import { useCallback, useMemo } from 'react';
-import type { UseControllerProps } from 'react-hook-form';
+import type { Control } from 'react-hook-form';
 import { useController } from 'react-hook-form';
-import type { AnyModelConfig } from 'services/api/types';
+import type { UpdateModelArg } from 'services/api/endpoints/models';
 
 const options: ComboboxOption[] = [
   { value: 'normal', label: 'Normal' },
@@ -12,8 +12,12 @@ const options: ComboboxOption[] = [
   { value: 'depth', label: 'Depth' },
 ];
 
-const ModelVariantSelect = <T extends AnyModelConfig>(props: UseControllerProps<T>) => {
-  const { field } = useController(props);
+type Props = {
+  control: Control<UpdateModelArg['body']>;
+};
+
+const ModelVariantSelect = ({ control }: Props) => {
+  const { field } = useController({ control, name: 'variant' });
   const value = useMemo(() => options.find((o) => o.value === field.value), [field.value]);
   const onChange = useCallback<ComboboxOnChange>(
     (v) => {
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/PredictionTypeSelect.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/PredictionTypeSelect.tsx
index 20667ab5bc..c75f14ce45 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/PredictionTypeSelect.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/PredictionTypeSelect.tsx
@@ -2,9 +2,9 @@ import type { ComboboxOnChange, ComboboxOption } from '@invoke-ai/ui-library';
 import { Combobox } from '@invoke-ai/ui-library';
 import { typedMemo } from 'common/util/typedMemo';
 import { useCallback, useMemo } from 'react';
-import type { UseControllerProps } from 'react-hook-form';
+import type { Control } from 'react-hook-form';
 import { useController } from 'react-hook-form';
-import type { AnyModelConfig } from 'services/api/types';
+import type { UpdateModelArg } from 'services/api/endpoints/models';
 
 const options: ComboboxOption[] = [
   { value: 'none', label: '-' },
@@ -13,8 +13,12 @@ const options: ComboboxOption[] = [
   { value: 'sample', label: 'sample' },
 ];
 
-const PredictionTypeSelect = <T extends AnyModelConfig>(props: UseControllerProps<T>) => {
-  const { field } = useController(props);
+type Props = {
+  control: Control<UpdateModelArg['body']>;
+};
+
+const PredictionTypeSelect = ({ control }: Props) => {
+  const { field } = useController({ control, name: 'prediction_type' });
   const value = useMemo(() => options.find((o) => o.value === field.value), [field.value]);
   const onChange = useCallback<ComboboxOnChange>(
     (v) => {
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/RepoVariantSelect.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/RepoVariantSelect.tsx
deleted file mode 100644
index 66134dbfc0..0000000000
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Fields/RepoVariantSelect.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { ComboboxOnChange, ComboboxOption } from '@invoke-ai/ui-library';
-import { Combobox } from '@invoke-ai/ui-library';
-import { typedMemo } from 'common/util/typedMemo';
-import { useCallback, useMemo } from 'react';
-import type { UseControllerProps } from 'react-hook-form';
-import { useController } from 'react-hook-form';
-import type { AnyModelConfig } from 'services/api/types';
-
-const options: ComboboxOption[] = [
-  { value: 'none', label: '-' },
-  { value: 'fp16', label: 'fp16' },
-  { value: 'fp32', label: 'fp32' },
-];
-
-const RepoVariantSelect = <T extends AnyModelConfig>(props: UseControllerProps<T>) => {
-  const { field } = useController(props);
-  const value = useMemo(() => options.find((o) => o.value === field.value), [field.value]);
-  const onChange = useCallback<ComboboxOnChange>(
-    (v) => {
-      v?.value === 'none' ? field.onChange(undefined) : field.onChange(v?.value);
-    },
-    [field]
-  );
-  return <Combobox value={value} options={options} onChange={onChange} />;
-};
-
-export default typedMemo(RepoVariantSelect);
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Metadata/ModelMetadata.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Metadata/ModelMetadata.tsx
index 7dc3c0bf62..1c08928663 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Metadata/ModelMetadata.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/Metadata/ModelMetadata.tsx
@@ -2,16 +2,16 @@ import { Flex } from '@invoke-ai/ui-library';
 import { skipToken } from '@reduxjs/toolkit/query';
 import { useAppSelector } from 'app/store/storeHooks';
 import DataViewer from 'features/gallery/components/ImageMetadataViewer/DataViewer';
-import { useGetModelMetadataQuery } from 'services/api/endpoints/models';
+import { useGetModelConfigQuery } from 'services/api/endpoints/models';
 
 export const ModelMetadata = () => {
   const selectedModelKey = useAppSelector((s) => s.modelmanagerV2.selectedModelKey);
-  const { data: metadata } = useGetModelMetadataQuery(selectedModelKey ?? skipToken);
+  const { data } = useGetModelConfigQuery(selectedModelKey ?? skipToken);
 
   return (
     <>
       <Flex flexDir="column" height="full" gap="3">
-        <DataViewer label="metadata" data={metadata || {}} />
+        <DataViewer label="metadata" data={data?.source_api_response || {}} />
       </Flex>
     </>
   );
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/ModelConvert.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/ModelConvert.tsx
index 25038b4985..de64e295f0 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/ModelConvert.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/ModelConvert.tsx
@@ -13,7 +13,7 @@ import { addToast } from 'features/system/store/systemSlice';
 import { makeToast } from 'features/system/util/makeToast';
 import { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useConvertMainModelsMutation } from 'services/api/endpoints/models';
+import { useConvertModelMutation } from 'services/api/endpoints/models';
 import type { CheckpointModelConfig } from 'services/api/types';
 
 interface ModelConvertProps {
@@ -24,7 +24,7 @@ export const ModelConvert = (props: ModelConvertProps) => {
   const { model } = props;
   const dispatch = useAppDispatch();
   const { t } = useTranslation();
-  const [convertModel, { isLoading }] = useConvertMainModelsMutation();
+  const [convertModel, { isLoading }] = useConvertModelMutation();
   const { isOpen, onOpen, onClose } = useDisclosure();
 
   const modelConvertHandler = useCallback(() => {
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/ModelEdit.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/ModelEdit.tsx
index 5025271b8a..d3d4216c3e 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/ModelEdit.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/ModelEdit.tsx
@@ -1,5 +1,6 @@
 import {
   Button,
+  Checkbox,
   Flex,
   FormControl,
   FormErrorMessage,
@@ -19,66 +20,27 @@ import type { SubmitHandler } from 'react-hook-form';
 import { useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import type { UpdateModelArg } from 'services/api/endpoints/models';
-import { useGetModelConfigQuery, useUpdateModelsMutation } from 'services/api/endpoints/models';
-import type { AnyModelConfig } from 'services/api/types';
+import { useGetModelConfigQuery, useUpdateModelMutation } from 'services/api/endpoints/models';
 
 import BaseModelSelect from './Fields/BaseModelSelect';
-import BooleanSelect from './Fields/BooleanSelect';
-import ModelFormatSelect from './Fields/ModelFormatSelect';
-import ModelTypeSelect from './Fields/ModelTypeSelect';
 import ModelVariantSelect from './Fields/ModelVariantSelect';
 import PredictionTypeSelect from './Fields/PredictionTypeSelect';
-import RepoVariantSelect from './Fields/RepoVariantSelect';
 
 export const ModelEdit = () => {
   const dispatch = useAppDispatch();
   const selectedModelKey = useAppSelector((s) => s.modelmanagerV2.selectedModelKey);
   const { data, isLoading } = useGetModelConfigQuery(selectedModelKey ?? skipToken);
 
-  const [updateModel, { isLoading: isSubmitting }] = useUpdateModelsMutation();
+  const [updateModel, { isLoading: isSubmitting }] = useUpdateModelMutation();
 
   const { t } = useTranslation();
 
-  // const modelData = useMemo(() => {
-  //   if (!data) {
-  //     return null;
-  //   }
-  //   const modelFormat = data.format;
-  //   const modelType = data.type;
-
-  //   if (modelType === 'main') {
-  //     if (modelFormat === 'diffusers') {
-  //       return data as DiffusersModelConfig;
-  //     } else if (modelFormat === 'checkpoint') {
-  //       return data as CheckpointModelConfig;
-  //     }
-  //   }
-
-  //   switch (modelType) {
-  //     case 'lora':
-  //       return data as LoRAModelConfig;
-  //     case 'embedding':
-  //       return data as TextualInversionModelConfig;
-  //     case 't2i_adapter':
-  //       return data as T2IAdapterModelConfig;
-  //     case 'ip_adapter':
-  //       return data as IPAdapterModelConfig;
-  //     case 'controlnet':
-  //       return data as ControlNetModelConfig;
-  //     case 'vae':
-  //       return data as VAEModelConfig;
-  //     default:
-  //       return null;
-  //   }
-  // }, [data]);
-
   const {
     register,
     handleSubmit,
     control,
     formState: { errors },
     reset,
-    watch,
   } = useForm<UpdateModelArg['body']>({
     defaultValues: {
       ...data,
@@ -86,10 +48,7 @@ export const ModelEdit = () => {
     mode: 'onChange',
   });
 
-  const watchedModelType = watch('type');
-  const watchedModelFormat = watch('format');
-
-  const onSubmit = useCallback<SubmitHandler<AnyModelConfig>>(
+  const onSubmit = useCallback<SubmitHandler<UpdateModelArg['body']>>(
     (values) => {
       if (!data?.key) {
         return;
@@ -143,33 +102,31 @@ export const ModelEdit = () => {
   return (
     <Flex flexDir="column" h="full">
       <form onSubmit={handleSubmit(onSubmit)}>
-        <FormControl flexDir="column" alignItems="flex-start" gap={1} isInvalid={Boolean(errors.name)}>
-          <Flex w="full" justifyContent="space-between" gap={4} alignItems="center">
+        <Flex w="full" justifyContent="space-between" gap={4} alignItems="center">
+          <FormControl flexDir="column" alignItems="flex-start" gap={1} isInvalid={Boolean(errors.name)}>
             <FormLabel hidden={true}>{t('modelManager.modelName')}</FormLabel>
             <Input
               {...register('name', {
-                validate: (value) => value.trim().length > 3 || 'Must be at least 3 characters',
+                validate: (value) => (value && value.trim().length > 3) || 'Must be at least 3 characters',
               })}
               size="lg"
             />
 
-            <Flex gap={2}>
-              <Button size="sm" onClick={handleClickCancel}>
-                {t('common.cancel')}
-              </Button>
-              <Button
-                size="sm"
-                colorScheme="invokeYellow"
-                onClick={handleSubmit(onSubmit)}
-                isLoading={isSubmitting}
-                isDisabled={Boolean(Object.keys(errors).length)}
-              >
-                {t('common.save')}
-              </Button>
-            </Flex>
-          </Flex>
-          {errors.name?.message && <FormErrorMessage>{errors.name?.message}</FormErrorMessage>}
-        </FormControl>
+            {errors.name?.message && <FormErrorMessage>{errors.name?.message}</FormErrorMessage>}
+          </FormControl>
+          <Button size="sm" onClick={handleClickCancel}>
+            {t('common.cancel')}
+          </Button>
+          <Button
+            size="sm"
+            colorScheme="invokeYellow"
+            onClick={handleSubmit(onSubmit)}
+            isLoading={isSubmitting}
+            isDisabled={Boolean(Object.keys(errors).length)}
+          >
+            {t('common.save')}
+          </Button>
+        </Flex>
 
         <Flex flexDir="column" gap={3} mt="4">
           <Flex>
@@ -184,76 +141,22 @@ export const ModelEdit = () => {
           <Flex gap={4}>
             <FormControl flexDir="column" alignItems="flex-start" gap={1}>
               <FormLabel>{t('modelManager.baseModel')}</FormLabel>
-              <BaseModelSelect control={control} name="base" />
-            </FormControl>
-            <FormControl flexDir="column" alignItems="flex-start" gap={1}>
-              <FormLabel>{t('modelManager.modelType')}</FormLabel>
-              <ModelTypeSelect<AnyModelConfig> control={control} name="type" />
+              <BaseModelSelect control={control} />
             </FormControl>
           </Flex>
-          <Flex gap={4}>
-            <FormControl flexDir="column" alignItems="flex-start" gap={1}>
-              <FormLabel>{t('common.format')}</FormLabel>
-              <ModelFormatSelect control={control} name="format" />
-            </FormControl>
-            <FormControl flexDir="column" alignItems="flex-start" gap={1} isInvalid={Boolean(errors.path)}>
-              <FormLabel>{t('modelManager.path')}</FormLabel>
-              <Input
-                {...register('path', {
-                  validate: (value) => value.trim().length > 0 || 'Must provide a path',
-                })}
-              />
-              {errors.path?.message && <FormErrorMessage>{errors.path?.message}</FormErrorMessage>}
-            </FormControl>
-          </Flex>
-          {watchedModelType === 'main' && (
-            <>
-              <Flex gap={4}>
-                {watchedModelFormat === 'diffusers' && (
-                  <FormControl flexDir="column" alignItems="flex-start" gap={1}>
-                    <FormLabel>{t('modelManager.repoVariant')}</FormLabel>
-                    <RepoVariantSelect<AnyModelConfig> control={control} name="repo_variant" />
-                  </FormControl>
-                )}
-                {watchedModelFormat === 'checkpoint' && (
-                  <FormControl flexDir="column" alignItems="flex-start" gap={1}>
-                    <FormLabel>{t('modelManager.pathToConfig')}</FormLabel>
-                    <Input {...register('config')} />
-                  </FormControl>
-                )}
-
-                <FormControl flexDir="column" alignItems="flex-start" gap={1}>
-                  <FormLabel>{t('modelManager.variant')}</FormLabel>
-                  <ModelVariantSelect<AnyModelConfig> control={control} name="variant" />
-                </FormControl>
-              </Flex>
-              <Flex gap={4}>
-                <FormControl flexDir="column" alignItems="flex-start" gap={1}>
-                  <FormLabel>{t('modelManager.predictionType')}</FormLabel>
-                  <PredictionTypeSelect<AnyModelConfig> control={control} name="prediction_type" />
-                </FormControl>
-                <FormControl flexDir="column" alignItems="flex-start" gap={1}>
-                  <FormLabel>{t('modelManager.upcastAttention')}</FormLabel>
-                  <BooleanSelect<AnyModelConfig> control={control} name="upcast_attention" />
-                </FormControl>
-              </Flex>
-              <Flex gap={4}>
-                <FormControl flexDir="column" alignItems="flex-start" gap={1}>
-                  <FormLabel>{t('modelManager.ztsnrTraining')}</FormLabel>
-                  <BooleanSelect<AnyModelConfig> control={control} name="ztsnr_training" />
-                </FormControl>
-                <FormControl flexDir="column" alignItems="flex-start" gap={1}>
-                  <FormLabel>{t('modelManager.vaeLocation')}</FormLabel>
-                  <Input {...register('vae')} />
-                </FormControl>
-              </Flex>
-            </>
-          )}
-          {watchedModelType === 'ip_adapter' && (
+          {data.type === 'main' && data.format === 'checkpoint' && (
             <Flex gap={4}>
               <FormControl flexDir="column" alignItems="flex-start" gap={1}>
-                <FormLabel>{t('modelManager.imageEncoderModelId')}</FormLabel>
-                <Input {...register('image_encoder_model_id')} />
+                <FormLabel>{t('modelManager.variant')}</FormLabel>
+                <ModelVariantSelect control={control} />
+              </FormControl>
+              <FormControl flexDir="column" alignItems="flex-start" gap={1}>
+                <FormLabel>{t('modelManager.predictionType')}</FormLabel>
+                <PredictionTypeSelect control={control} />
+              </FormControl>
+              <FormControl flexDir="column" alignItems="flex-start" gap={1}>
+                <FormLabel>{t('modelManager.upcastAttention')}</FormLabel>
+                <Checkbox {...register('upcast_attention')} />
               </FormControl>
             </Flex>
           )}
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/ModelView.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/ModelView.tsx
index 0b25e5fdc7..b5c87d3adb 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/ModelView.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/ModelView.tsx
@@ -91,26 +91,19 @@ export const ModelView = () => {
             <ModelAttrView label={t('modelManager.path')} value={modelData.path} />
           </Flex>
           {modelData.type === 'main' && (
-            <>
-              <Flex gap={2}>
-                {modelData.format === 'diffusers' && (
-                  <ModelAttrView label={t('modelManager.repoVariant')} value={modelData.repo_variant} />
-                )}
-                {modelData.format === 'checkpoint' && (
-                  <ModelAttrView label={t('modelManager.pathToConfig')} value={modelData.config} />
-                )}
-
-                <ModelAttrView label={t('modelManager.variant')} value={modelData.variant} />
-              </Flex>
-              <Flex gap={2}>
-                <ModelAttrView label={t('modelManager.predictionType')} value={modelData.prediction_type} />
-                <ModelAttrView label={t('modelManager.upcastAttention')} value={`${modelData.upcast_attention}`} />
-              </Flex>
-              <Flex gap={2}>
-                <ModelAttrView label={t('modelManager.ztsnrTraining')} value={`${modelData.ztsnr_training}`} />
-                <ModelAttrView label={t('modelManager.vae')} value={modelData.vae} />
-              </Flex>
-            </>
+            <Flex gap={2}>
+              {modelData.format === 'diffusers' && modelData.repo_variant && (
+                <ModelAttrView label={t('modelManager.repoVariant')} value={modelData.repo_variant} />
+              )}
+              {modelData.format === 'checkpoint' && (
+                <>
+                  <ModelAttrView label={t('modelManager.pathToConfig')} value={modelData.config_path} />
+                  <ModelAttrView label={t('modelManager.variant')} value={modelData.variant} />
+                  <ModelAttrView label={t('modelManager.predictionType')} value={modelData.prediction_type} />
+                  <ModelAttrView label={t('modelManager.upcastAttention')} value={`${modelData.upcast_attention}`} />
+                </>
+              )}
+            </Flex>
           )}
           {modelData.type === 'ip_adapter' && (
             <Flex gap={2}>
diff --git a/invokeai/frontend/web/src/services/api/endpoints/models.ts b/invokeai/frontend/web/src/services/api/endpoints/models.ts
index dac6594255..ae43408f13 100644
--- a/invokeai/frontend/web/src/services/api/endpoints/models.ts
+++ b/invokeai/frontend/web/src/services/api/endpoints/models.ts
@@ -1,7 +1,6 @@
 import type { EntityAdapter, EntityState, ThunkDispatch, UnknownAction } from '@reduxjs/toolkit';
 import { createEntityAdapter } from '@reduxjs/toolkit';
 import { getSelectorsOptions } from 'app/store/createMemoizedSelector';
-import type { JSONObject } from 'common/types';
 import queryString from 'query-string';
 import type { operations, paths } from 'services/api/schema';
 import type {
@@ -24,49 +23,33 @@ export type UpdateModelArg = {
   body: paths['/api/v2/models/i/{key}']['patch']['requestBody']['content']['application/json'];
 };
 
-type UpdateModelMetadataArg = {
-  key: paths['/api/v2/models/i/{key}/metadata']['patch']['parameters']['path']['key'];
-  body: paths['/api/v2/models/i/{key}/metadata']['patch']['requestBody']['content']['application/json'];
-};
-
 type UpdateModelResponse = paths['/api/v2/models/i/{key}']['patch']['responses']['200']['content']['application/json'];
-type UpdateModelMetadataResponse =
-  paths['/api/v2/models/i/{key}/metadata']['patch']['responses']['200']['content']['application/json'];
 
 type GetModelConfigResponse = paths['/api/v2/models/i/{key}']['get']['responses']['200']['content']['application/json'];
 
-type GetModelMetadataResponse =
-  paths['/api/v2/models/i/{key}/metadata']['get']['responses']['200']['content']['application/json'];
-
 type ListModelsArg = NonNullable<paths['/api/v2/models/']['get']['parameters']['query']>;
 
-type DeleteMainModelArg = {
+type DeleteModelArg = {
   key: string;
 };
-
-type DeleteMainModelResponse = void;
+type DeleteModelResponse = void;
 
 type ConvertMainModelResponse =
   paths['/api/v2/models/convert/{key}']['put']['responses']['200']['content']['application/json'];
 
 type InstallModelArg = {
   source: paths['/api/v2/models/install']['post']['parameters']['query']['source'];
-  access_token?: paths['/api/v2/models/install']['post']['parameters']['query']['access_token'];
-  // TODO(MM2): This is typed as `Optional[Dict[str, Any]]` in backend...
-  config?: JSONObject;
-  // config: NonNullable<paths['/api/v2/models/install']['post']['requestBody']>['content']['application/json'];
 };
-
 type InstallModelResponse = paths['/api/v2/models/install']['post']['responses']['201']['content']['application/json'];
 
-type ListImportModelsResponse =
-  paths['/api/v2/models/import']['get']['responses']['200']['content']['application/json'];
+type ListModelInstallsResponse =
+  paths['/api/v2/models/install']['get']['responses']['200']['content']['application/json'];
 
-type DeleteImportModelsResponse =
-  paths['/api/v2/models/import/{id}']['delete']['responses']['201']['content']['application/json'];
+type CancelModelInstallResponse =
+  paths['/api/v2/models/install/{id}']['delete']['responses']['201']['content']['application/json'];
 
-type PruneModelImportsResponse =
-  paths['/api/v2/models/import']['patch']['responses']['200']['content']['application/json'];
+type PruneCompletedModelInstallsResponse =
+  paths['/api/v2/models/install']['delete']['responses']['200']['content']['application/json'];
 
 export type ScanFolderResponse =
   paths['/api/v2/models/scan_folder']['get']['responses']['200']['content']['application/json'];
@@ -146,31 +129,7 @@ const buildModelsUrl = (path: string = '') => buildV2Url(`models/${path}`);
 
 export const modelsApi = api.injectEndpoints({
   endpoints: (build) => ({
-    getMainModels: build.query<EntityState<MainModelConfig, string>, BaseModelType[]>({
-      query: (base_models) => {
-        const params: ListModelsArg = {
-          model_type: 'main',
-          base_models,
-        };
-
-        const query = queryString.stringify(params, { arrayFormat: 'none' });
-        return buildModelsUrl(`?${query}`);
-      },
-      providesTags: buildProvidesTags<MainModelConfig>('MainModel'),
-      transformResponse: buildTransformResponse<MainModelConfig>(mainModelsAdapter),
-      onQueryStarted: async (_, { dispatch, queryFulfilled }) => {
-        queryFulfilled.then(({ data }) => {
-          upsertModelConfigs(data, dispatch);
-        });
-      },
-    }),
-    getModelMetadata: build.query<GetModelMetadataResponse, string>({
-      query: (key) => {
-        return buildModelsUrl(`i/${key}/metadata`);
-      },
-      providesTags: ['Model'],
-    }),
-    updateModels: build.mutation<UpdateModelResponse, UpdateModelArg>({
+    updateModel: build.mutation<UpdateModelResponse, UpdateModelArg>({
       query: ({ key, body }) => {
         return {
           url: buildModelsUrl(`i/${key}`),
@@ -180,28 +139,17 @@ export const modelsApi = api.injectEndpoints({
       },
       invalidatesTags: ['Model'],
     }),
-    updateModelMetadata: build.mutation<UpdateModelMetadataResponse, UpdateModelMetadataArg>({
-      query: ({ key, body }) => {
-        return {
-          url: buildModelsUrl(`i/${key}/metadata`),
-          method: 'PATCH',
-          body: body,
-        };
-      },
-      invalidatesTags: ['Model'],
-    }),
     installModel: build.mutation<InstallModelResponse, InstallModelArg>({
-      query: ({ source, config, access_token }) => {
+      query: ({ source }) => {
         return {
           url: buildModelsUrl('install'),
-          params: { source, access_token },
+          params: { source },
           method: 'POST',
-          body: config,
         };
       },
-      invalidatesTags: ['Model', 'ModelImports'],
+      invalidatesTags: ['Model', 'ModelInstalls'],
     }),
-    deleteModels: build.mutation<DeleteMainModelResponse, DeleteMainModelArg>({
+    deleteModels: build.mutation<DeleteModelResponse, DeleteModelArg>({
       query: ({ key }) => {
         return {
           url: buildModelsUrl(`i/${key}`),
@@ -210,7 +158,7 @@ export const modelsApi = api.injectEndpoints({
       },
       invalidatesTags: ['Model'],
     }),
-    convertMainModels: build.mutation<ConvertMainModelResponse, string>({
+    convertModel: build.mutation<ConvertMainModelResponse, string>({
       query: (key) => {
         return {
           url: buildModelsUrl(`convert/${key}`),
@@ -253,6 +201,57 @@ export const modelsApi = api.injectEndpoints({
       },
       invalidatesTags: ['Model'],
     }),
+    scanFolder: build.query<ScanFolderResponse, ScanFolderArg>({
+      query: (arg) => {
+        const folderQueryStr = arg ? queryString.stringify(arg, {}) : '';
+        return {
+          url: buildModelsUrl(`scan_folder?${folderQueryStr}`),
+        };
+      },
+    }),
+    listModelInstalls: build.query<ListModelInstallsResponse, void>({
+      query: () => {
+        return {
+          url: buildModelsUrl('install'),
+        };
+      },
+      providesTags: ['ModelInstalls'],
+    }),
+    cancelModelInstall: build.mutation<CancelModelInstallResponse, number>({
+      query: (id) => {
+        return {
+          url: buildModelsUrl(`install/${id}`),
+          method: 'DELETE',
+        };
+      },
+      invalidatesTags: ['ModelInstalls'],
+    }),
+    pruneCompletedModelInstalls: build.mutation<PruneCompletedModelInstallsResponse, void>({
+      query: () => {
+        return {
+          url: buildModelsUrl('install'),
+          method: 'DELETE',
+        };
+      },
+      invalidatesTags: ['ModelInstalls'],
+    }),
+    getMainModels: build.query<EntityState<MainModelConfig, string>, BaseModelType[]>({
+      query: (base_models) => {
+        const params: ListModelsArg = {
+          model_type: 'main',
+          base_models,
+        };
+        const query = queryString.stringify(params, { arrayFormat: 'none' });
+        return buildModelsUrl(`?${query}`);
+      },
+      providesTags: buildProvidesTags<MainModelConfig>('MainModel'),
+      transformResponse: buildTransformResponse<MainModelConfig>(mainModelsAdapter),
+      onQueryStarted: async (_, { dispatch, queryFulfilled }) => {
+        queryFulfilled.then(({ data }) => {
+          upsertModelConfigs(data, dispatch);
+        });
+      },
+    }),
     getLoRAModels: build.query<EntityState<LoRAModelConfig, string>, void>({
       query: () => ({ url: buildModelsUrl(), params: { model_type: 'lora' } }),
       providesTags: buildProvidesTags<LoRAModelConfig>('LoRAModel'),
@@ -313,40 +312,6 @@ export const modelsApi = api.injectEndpoints({
         });
       },
     }),
-    scanModels: build.query<ScanFolderResponse, ScanFolderArg>({
-      query: (arg) => {
-        const folderQueryStr = arg ? queryString.stringify(arg, {}) : '';
-        return {
-          url: buildModelsUrl(`scan_folder?${folderQueryStr}`),
-        };
-      },
-    }),
-    getModelImports: build.query<ListImportModelsResponse, void>({
-      query: () => {
-        return {
-          url: buildModelsUrl(`import`),
-        };
-      },
-      providesTags: ['ModelImports'],
-    }),
-    deleteModelImport: build.mutation<DeleteImportModelsResponse, number>({
-      query: (id) => {
-        return {
-          url: buildModelsUrl(`import/${id}`),
-          method: 'DELETE',
-        };
-      },
-      invalidatesTags: ['ModelImports'],
-    }),
-    pruneModelImports: build.mutation<PruneModelImportsResponse, void>({
-      query: () => {
-        return {
-          url: buildModelsUrl('import'),
-          method: 'PATCH',
-        };
-      },
-      invalidatesTags: ['ModelImports'],
-    }),
   }),
 });
 
@@ -360,16 +325,14 @@ export const {
   useGetTextualInversionModelsQuery,
   useGetVaeModelsQuery,
   useDeleteModelsMutation,
-  useUpdateModelsMutation,
+  useUpdateModelMutation,
   useInstallModelMutation,
-  useConvertMainModelsMutation,
+  useConvertModelMutation,
   useSyncModelsMutation,
-  useLazyScanModelsQuery,
-  useGetModelImportsQuery,
-  useGetModelMetadataQuery,
-  useDeleteModelImportMutation,
-  usePruneModelImportsMutation,
-  useUpdateModelMetadataMutation,
+  useLazyScanFolderQuery,
+  useListModelInstallsQuery,
+  useCancelModelInstallMutation,
+  usePruneCompletedModelInstallsMutation,
 } = modelsApi;
 
 const upsertModelConfigs = (
diff --git a/invokeai/frontend/web/src/services/api/index.ts b/invokeai/frontend/web/src/services/api/index.ts
index 4c2770d817..35e7826c30 100644
--- a/invokeai/frontend/web/src/services/api/index.ts
+++ b/invokeai/frontend/web/src/services/api/index.ts
@@ -28,7 +28,7 @@ export const tagTypes = [
   'InvocationCacheStatus',
   'Model',
   'ModelConfig',
-  'ModelImports',
+  'ModelInstalls',
   'T2IAdapterModel',
   'MainModel',
   'VaeModel',
diff --git a/invokeai/frontend/web/src/services/api/schema.ts b/invokeai/frontend/web/src/services/api/schema.ts
index 560feb93ba..16b142519f 100644
--- a/invokeai/frontend/web/src/services/api/schema.ts
+++ b/invokeai/frontend/web/src/services/api/schema.ts
@@ -34,64 +34,45 @@ export type paths = {
      */
     get: operations["get_model_record"];
     /**
-     * Del Model Record
+     * Delete Model
      * @description Delete model record from database.
      *
      * The configuration record will be removed. The corresponding weights files will be
      * deleted as well if they reside within the InvokeAI "models" directory.
      */
-    delete: operations["del_model_record"];
+    delete: operations["delete_model"];
     /**
      * Update Model Record
-     * @description Update model contents with a new config. If the model name or base fields are changed, then the model is renamed.
+     * @description Update a model's config.
      */
     patch: operations["update_model_record"];
   };
-  "/api/v2/models/summary": {
-    /**
-     * List Model Summary
-     * @description Gets a page of model summary data.
-     */
-    get: operations["list_model_summary"];
-  };
-  "/api/v2/models/i/{key}/metadata": {
-    /**
-     * Get Model Metadata
-     * @description Get a model metadata object.
-     */
-    get: operations["get_model_metadata"];
-    /**
-     * Update Model Metadata
-     * @description Updates or creates a model metadata object.
-     */
-    patch: operations["update_model_metadata"];
-  };
-  "/api/v2/models/tags": {
-    /**
-     * List Tags
-     * @description Get a unique set of all the model tags.
-     */
-    get: operations["list_tags"];
-  };
   "/api/v2/models/scan_folder": {
     /** Scan For Models */
     get: operations["scan_for_models"];
   };
-  "/api/v2/models/tags/search": {
-    /**
-     * Search By Metadata Tags
-     * @description Get a list of models.
-     */
-    get: operations["search_by_metadata_tags"];
-  };
-  "/api/v2/models/i/": {
-    /**
-     * Add Model Record
-     * @description Add a model using the configuration information appropriate for its type.
-     */
-    post: operations["add_model_record"];
-  };
   "/api/v2/models/install": {
+    /**
+     * List Model Installs
+     * @description Return the list of model install jobs.
+     *
+     * Install jobs have a numeric `id`, a `status`, and other fields that provide information on
+     * the nature of the job and its progress. The `status` is one of:
+     *
+     * * "waiting" -- Job is waiting in the queue to run
+     * * "downloading" -- Model file(s) are downloading
+     * * "running" -- Model has downloaded and the model probing and registration process is running
+     * * "completed" -- Installation completed successfully
+     * * "error" -- An error occurred. Details will be in the "error_type" and "error" fields.
+     * * "cancelled" -- Job was cancelled before completion.
+     *
+     * Once completed, information about the model such as its size, base
+     * model and type can be retrieved from the `config_out` field. For multi-file models such as diffusers,
+     * information on individual files can be retrieved from `download_parts`.
+     *
+     * See the example and schema below for more information.
+     */
+    get: operations["list_model_installs"];
     /**
      * Install Model
      * @description Install a model using a string identifier.
@@ -121,37 +102,13 @@ export type paths = {
      * interpreting the job information returned by this route.
      */
     post: operations["install_model"];
-  };
-  "/api/v2/models/import": {
-    /**
-     * List Model Install Jobs
-     * @description Return the list of model install jobs.
-     *
-     * Install jobs have a numeric `id`, a `status`, and other fields that provide information on
-     * the nature of the job and its progress. The `status` is one of:
-     *
-     * * "waiting" -- Job is waiting in the queue to run
-     * * "downloading" -- Model file(s) are downloading
-     * * "running" -- Model has downloaded and the model probing and registration process is running
-     * * "completed" -- Installation completed successfully
-     * * "error" -- An error occurred. Details will be in the "error_type" and "error" fields.
-     * * "cancelled" -- Job was cancelled before completion.
-     *
-     * Once completed, information about the model such as its size, base
-     * model, type, and metadata can be retrieved from the `config_out`
-     * field. For multi-file models such as diffusers, information on individual files
-     * can be retrieved from `download_parts`.
-     *
-     * See the example and schema below for more information.
-     */
-    get: operations["list_model_install_jobs"];
     /**
      * Prune Model Install Jobs
      * @description Prune all completed and errored jobs from the install job list.
      */
-    patch: operations["prune_model_install_jobs"];
+    delete: operations["prune_model_install_jobs"];
   };
-  "/api/v2/models/import/{id}": {
+  "/api/v2/models/install/{id}": {
     /**
      * Get Model Install Job
      * @description Return model install job corresponding to the given source. See the documentation for 'List Model Install Jobs'
@@ -183,23 +140,6 @@ export type paths = {
      */
     put: operations["convert_model"];
   };
-  "/api/v2/models/merge": {
-    /**
-     * Merge
-     * @description Merge diffusers models. The process is controlled by a set parameters provided in the body of the request.
-     * ```
-     * Argument                Description [default]
-     * --------               ----------------------
-     * keys                   List of 2-3 model keys to merge together. All models must use the same base type.
-     * merged_model_name      Name for the merged model [Concat model names]
-     * alpha                  Alpha value (0.0-1.0). Higher values give more weight to the second model [0.5]
-     * force                  If true, force the merge even if the models were generated by different versions of the diffusers library [False]
-     * interp                 Interpolation method. One of "weighted_sum", "sigmoid", "inv_sigmoid" or "add_difference" [weighted_sum]
-     * merge_dest_directory   Specify a directory to store the merged model in [models directory]
-     * ```
-     */
-    put: operations["merge"];
-  };
   "/api/v1/download_queue/": {
     /**
      * List Downloads
@@ -577,7 +517,7 @@ export type paths = {
   };
 };
 
-type webhooks = Record<string, never>;
+export type webhooks = Record<string, never>;
 
 export type components = {
   schemas: {
@@ -753,23 +693,6 @@ export type components = {
        * @description model's name
        */
       name: string;
-      /**
-       * Author
-       * @description model's author
-       */
-      author: string;
-      /**
-       * Tags
-       * @description tags provided by model source
-       */
-      tags?: string[] | null;
-      /**
-       * Trigger Phrases
-       * @description trigger phrases for this model
-       */
-      trigger_phrases?: string[] | null;
-      /** @description default settings for this model */
-      default_settings?: components["schemas"]["ModelDefaultSettings"] | null;
       /**
        * Type
        * @default basemetadata
@@ -1129,38 +1052,6 @@ export type components = {
        */
       prepend?: boolean;
     };
-    /** Body_merge */
-    Body_merge: {
-      /**
-       * Keys
-       * @description Keys for two to three models to merge
-       */
-      keys: string[];
-      /**
-       * Merged Model Name
-       * @description Name of destination model
-       */
-      merged_model_name?: string | null;
-      /**
-       * Alpha
-       * @description Alpha weighting strength to apply to 2d and 3d models
-       * @default 0.5
-       */
-      alpha?: number;
-      /**
-       * Force
-       * @description Force merging of models created with different versions of diffusers
-       * @default false
-       */
-      force?: boolean;
-      /** @description Interpolation method */
-      interp?: components["schemas"]["MergeInterpolationMethod"] | null;
-      /**
-       * Merge Dest Directory
-       * @description Save the merged model to the designated directory (with 'merged_model_name' appended)
-       */
-      merge_dest_directory?: string | null;
-    };
     /** Body_parse_dynamicprompts */
     Body_parse_dynamicprompts: {
       /**
@@ -1352,18 +1243,52 @@ export type components = {
      * @description Model config for ClipVision.
      */
     CLIPVisionDiffusersConfig: {
+      /**
+       * Key
+       * @description A unique key for this model.
+       */
+      key: string;
+      /**
+       * Hash
+       * @description The hash of the model file(s).
+       */
+      hash: string;
       /**
        * Path
-       * @description filesystem path to the model file or directory
+       * @description Path to the model on the filesystem. Relative paths are relative to the Invoke root directory.
        */
       path: string;
       /**
        * Name
-       * @description model name
+       * @description Name of the model.
        */
       name: string;
-      /** @description base model */
+      /** @description The base model. */
       base: components["schemas"]["BaseModelType"];
+      /**
+       * Description
+       * @description Model description
+       */
+      description?: string | null;
+      /**
+       * Source
+       * @description The original source of the model (path, URL or repo_id).
+       */
+      source: string;
+      /** @description The type of source */
+      source_type: components["schemas"]["ModelSourceType"];
+      /**
+       * Source Api Response
+       * @description The original API response from the source, as stringified JSON.
+       */
+      source_api_response?: string | null;
+      /**
+       * Trigger Phrases
+       * @description Set of trigger phrases for this model
+       */
+      trigger_phrases?: string[] | null;
+      /** @description Default settings for this model */
+      default_settings?: components["schemas"]["ModelDefaultSettings"] | null;
       /**
        * Type
        * @default clip_vision
@@ -1375,37 +1300,6 @@ export type components = {
        * @constant
        */
       format: "diffusers";
-      /**
-       * Key
-       * @description unique key for model
-       * @default <NOKEY>
-       */
-      key: string;
-      /**
-       * Original Hash
-       * @description original fasthash of model contents
-       */
-      original_hash: string | null;
-      /**
-       * Current Hash
-       * @description current fasthash of model contents
-       */
-      current_hash: string | null;
-      /**
-       * Description
-       * @description human readable description of the model
-       */
-      description?: string | null;
-      /**
-       * Source
-       * @description model original source (path, URL or repo_id)
-       */
-      source: string | null;
-      /**
-       * Last Modified
-       * @description timestamp for modification time
-       */
-      last_modified: number | null;
     };
     /** CLIPVisionModelField */
     CLIPVisionModelField: {
@@ -1809,23 +1703,6 @@ export type components = {
        * @description model's name
        */
       name: string;
-      /**
-       * Author
-       * @description model's author
-       */
-      author: string;
-      /**
-       * Tags
-       * @description tags provided by model source
-       */
-      tags?: string[] | null;
-      /**
-       * Trigger Phrases
-       * @description trigger phrases for this model
-       */
-      trigger_phrases?: string[] | null;
-      /** @description default settings for this model */
-      default_settings?: components["schemas"]["ModelDefaultSettings"] | null;
       /**
        * Files
        * @description model files and their sizes
@@ -1838,86 +1715,15 @@ export type components = {
        */
       type?: "civitai";
       /**
-       * Id
-       * @description Civitai version identifier
+       * Trigger Phrases
+       * @description Trigger phrases extracted from the API response
        */
-      id: number;
+      trigger_phrases: string[];
       /**
-       * Version Name
-       * @description Version identifier, such as 'V2-alpha'
+       * Api Response
+       * @description Response from the Civitai API as stringified JSON
        */
-      version_name: string;
-      /**
-       * Version Id
-       * @description Civitai model version identifier
-       */
-      version_id: number;
-      /**
-       * Created
-       * Format: date-time
-       * @description date the model was created
-       */
-      created: string;
-      /**
-       * Updated
-       * Format: date-time
-       * @description date the model was last modified
-       */
-      updated: string;
-      /**
-       * Published
-       * Format: date-time
-       * @description date the model was published to Civitai
-       */
-      published: string;
-      /**
-       * Description
-       * @description text description of model; may contain HTML
-       */
-      description: string;
-      /**
-       * Version Description
-       * @description text description of the model's reversion; usually change history; may contain HTML
-       */
-      version_description: string;
-      /**
-       * Nsfw
-       * @description whether the model tends to generate NSFW content
-       * @default false
-       */
-      nsfw?: boolean;
-      /** @description license terms */
-      restrictions?: components["schemas"]["LicenseRestrictions"];
-      /**
-       * Trained Words
-       * @description words to trigger the model
-       */
-      trained_words?: string[];
-      /**
-       * Download Url
-       * Format: uri
-       * @description download URL for this model
-       */
-      download_url: string;
-      /**
-       * Base Model Trained On
-       * @description base model on which this model was trained (currently not an enum)
-       */
-      base_model_trained_on: string;
-      /**
-       * Thumbnail Url
-       * @description a thumbnail image for this model
-       */
-      thumbnail_url?: string | null;
-      /**
-       * Weight Minmax
-       * @description minimum and maximum slider values for a LoRA or other secondary model
-       * @default [
-       *   -1,
-       *   2
-       * ]
-       */
-      weight_minmax?: [number, number];
+      api_response?: string | null;
     };
     /**
      * CivitaiModelSource
@@ -2259,12 +2065,6 @@ export type components = {
        */
       type: "color_output";
     };
-    /**
-     * CommercialUsage
-     * @description Type of commercial usage allowed.
-     * @enum {string}
-     */
-    CommercialUsage: "None" | "Image" | "Rent" | "RentCivit" | "Sell";
     /**
      * Prompt
      * @description Parse prompt using compel package to conditioning.
@@ -2522,24 +2322,52 @@ export type components = {
      * @description Model config for ControlNet models (diffusers version).
      */
     ControlNetCheckpointConfig: {
+      /**
+       * Key
+       * @description A unique key for this model.
+       */
+      key: string;
+      /**
+       * Hash
+       * @description The hash of the model file(s).
+       */
+      hash: string;
       /**
        * Path
-       * @description filesystem path to the model file or directory
+       * @description Path to the model on the filesystem. Relative paths are relative to the Invoke root directory.
        */
       path: string;
       /**
        * Name
-       * @description model name
+       * @description Name of the model.
        */
       name: string;
-      /** @description base model */
+      /** @description The base model. */
       base: components["schemas"]["BaseModelType"];
       /**
-       * Type
-       * @default controlnet
-       * @constant
+       * Description
+       * @description Model description
        */
-      type: "controlnet";
+      description?: string | null;
+      /**
+       * Source
+       * @description The original source of the model (path, URL or repo_id).
+       */
+      source: string;
+      /** @description The type of source */
+      source_type: components["schemas"]["ModelSourceType"];
+      /**
+       * Source Api Response
+       * @description The original API response from the source, as stringified JSON.
+       */
+      source_api_response?: string | null;
+      /**
+       * Trigger Phrases
+       * @description Set of trigger phrases for this model
+       */
+      trigger_phrases?: string[] | null;
+      /** @description Default settings for this model */
+      default_settings?: components["schemas"]["ModelDefaultSettings"] | null;
       /**
        * Format
        * @default checkpoint
@@ -2547,104 +2375,87 @@ export type components = {
        */
       format: "checkpoint";
       /**
-       * Key
-       * @description unique key for model
-       * @default <NOKEY>
-       */
-      key: string;
-      /**
-       * Original Hash
-       * @description original fasthash of model contents
-       */
-      original_hash: string | null;
-      /**
-       * Current Hash
-       * @description current fasthash of model contents
-       */
-      current_hash: string | null;
-      /**
-       * Description
-       * @description human readable description of the model
-       */
-      description?: string | null;
-      /**
-       * Source
-       * @description model original source (path, URL or repo_id)
-       */
-      source: string | null;
-      /**
-       * Last Modified
-       * @description timestamp for modification time
-       */
-      last_modified: number | null;
-      /**
-       * Config
+       * Config Path
        * @description path to the checkpoint model config file
        */
-      config: string;
+      config_path: string;
+      /**
+       * Converted At
+       * @description When this model was last converted to diffusers
+       */
+      converted_at?: number | null;
+      /**
+       * Type
+       * @default controlnet
+       * @constant
+       */
+      type: "controlnet";
     };
     /**
      * ControlNetDiffusersConfig
      * @description Model config for ControlNet models (diffusers version).
      */
     ControlNetDiffusersConfig: {
+      /**
+       * Key
+       * @description A unique key for this model.
+       */
+      key: string;
+      /**
+       * Hash
+       * @description The hash of the model file(s).
+       */
+      hash: string;
       /**
        * Path
-       * @description filesystem path to the model file or directory
+       * @description Path to the model on the filesystem. Relative paths are relative to the Invoke root directory.
        */
       path: string;
       /**
        * Name
-       * @description model name
+       * @description Name of the model.
        */
       name: string;
-      /** @description base model */
+      /** @description The base model. */
       base: components["schemas"]["BaseModelType"];
       /**
-       * Type
-       * @default controlnet
-       * @constant
+       * Description
+       * @description Model description
        */
-      type: "controlnet";
+      description?: string | null;
+      /**
+       * Source
+       * @description The original source of the model (path, URL or repo_id).
+       */
+      source: string;
+      /** @description The type of source */
+      source_type: components["schemas"]["ModelSourceType"];
+      /**
+       * Source Api Response
+       * @description The original API response from the source, as stringified JSON.
+       */
+      source_api_response?: string | null;
+      /**
+       * Trigger Phrases
+       * @description Set of trigger phrases for this model
+       */
+      trigger_phrases?: string[] | null;
+      /** @description Default settings for this model */
+      default_settings?: components["schemas"]["ModelDefaultSettings"] | null;
       /**
        * Format
        * @default diffusers
        * @constant
        */
       format: "diffusers";
-      /**
-       * Key
-       * @description unique key for model
-       * @default <NOKEY>
-       */
-      key: string;
-      /**
-       * Original Hash
-       * @description original fasthash of model contents
-       */
-      original_hash: string | null;
-      /**
-       * Current Hash
-       * @description current fasthash of model contents
-       */
-      current_hash: string | null;
-      /**
-       * Description
-       * @description human readable description of the model
-       */
-      description?: string | null;
-      /**
-       * Source
-       * @description model original source (path, URL or repo_id)
-       */
-      source: string | null;
-      /**
-       * Last Modified
-       * @description timestamp for modification time
-       */
-      last_modified: number | null;
       /** @default */
       repo_variant?: components["schemas"]["ModelRepoVariant"] | null;
+      /**
+       * Type
+       * @default controlnet
+       * @constant
+       */
+      type: "controlnet";
     };
     /**
      * ControlNet
@@ -4271,6 +4082,22 @@ export type components = {
        */
       type: "freeu";
     };
+    /**
+     * GradientMaskOutput
+     * @description Outputs a denoise mask and an image representing the total gradient of the mask.
+     */
+    GradientMaskOutput: {
+      /** @description Mask for denoise model run */
+      denoise_mask: components["schemas"]["DenoiseMaskField"];
+      /** @description Image representing the total gradient area of the mask. For paste-back purposes. */
+      expanded_mask_area: components["schemas"]["ImageField"];
+      /**
+       * type
+       * @default gradient_mask_output
+       * @constant
+       */
+      type: "gradient_mask_output";
+    };
     /** Graph */
     Graph: {
       /**
@@ -4283,7 +4110,7 @@ export type components = {
        * @description The nodes in this graph
        */
       nodes: {
-        [key: string]: components["schemas"]["SeamlessModeInvocation"] | components["schemas"]["MergeMetadataInvocation"] | components["schemas"]["ColorCorrectInvocation"] | components["schemas"]["LatentsToImageInvocation"] | components["schemas"]["MaskEdgeInvocation"] | components["schemas"]["PidiImageProcessorInvocation"] | components["schemas"]["FreeUInvocation"] | components["schemas"]["MergeTilesToImageInvocation"] | components["schemas"]["CanvasPasteBackInvocation"] | components["schemas"]["IntegerMathInvocation"] | components["schemas"]["ImageCropInvocation"] | components["schemas"]["ImageMultiplyInvocation"] | components["schemas"]["LineartImageProcessorInvocation"] | components["schemas"]["ScaleLatentsInvocation"] | components["schemas"]["FaceMaskInvocation"] | components["schemas"]["ESRGANInvocation"] | components["schemas"]["BooleanInvocation"] | components["schemas"]["FloatMathInvocation"] | components["schemas"]["VaeLoaderInvocation"] | components["schemas"]["MetadataItemInvocation"] | components["schemas"]["FloatLinearRangeInvocation"] | components["schemas"]["LatentsCollectionInvocation"] | components["schemas"]["NormalbaeImageProcessorInvocation"] | components["schemas"]["IdealSizeInvocation"] | components["schemas"]["CvInpaintInvocation"] | components["schemas"]["StringCollectionInvocation"] | components["schemas"]["ContentShuffleImageProcessorInvocation"] | components["schemas"]["StringJoinThreeInvocation"] | components["schemas"]["ColorMapImageProcessorInvocation"] | components["schemas"]["FaceOffInvocation"] | components["schemas"]["UnsharpMaskInvocation"] | components["schemas"]["FloatCollectionInvocation"] | components["schemas"]["MidasDepthImageProcessorInvocation"] | components["schemas"]["ImageChannelOffsetInvocation"] | components["schemas"]["InfillPatchMatchInvocation"] | components["schemas"]["DynamicPromptInvocation"] | components["schemas"]["CannyImageProcessorInvocation"] | components["schemas"]["InfillColorInvocation"] | components["schemas"]["NoiseInvocation"] | components["schemas"]["ImageToLatentsInvocation"] | components["schemas"]["InfillTileInvocation"] | components["schemas"]["LatentsInvocation"] | components["schemas"]["ConditioningInvocation"] | components["schemas"]["DepthAnythingImageProcessorInvocation"] | components["schemas"]["MultiplyInvocation"] | components["schemas"]["LoraLoaderInvocation"] | components["schemas"]["StringReplaceInvocation"] | components["schemas"]["CompelInvocation"] | components["schemas"]["CalculateImageTilesMinimumOverlapInvocation"] | components["schemas"]["IntegerInvocation"] | components["schemas"]["ResizeLatentsInvocation"] | components["schemas"]["LeresImageProcessorInvocation"] | components["schemas"]["SDXLModelLoaderInvocation"] | components["schemas"]["ImageWatermarkInvocation"] | components["schemas"]["CreateGradientMaskInvocation"] | components["schemas"]["RangeInvocation"] | components["schemas"]["ImagePasteInvocation"] | components["schemas"]["SDXLRefinerModelLoaderInvocation"] | components["schemas"]["ImageScaleInvocation"] | components["schemas"]["ZoeDepthImageProcessorInvocation"] | components["schemas"]["FloatToIntegerInvocation"] | components["schemas"]["PairTileImageInvocation"] | components["schemas"]["T2IAdapterInvocation"] | components["schemas"]["BooleanCollectionInvocation"] | components["schemas"]["RandomRangeInvocation"] | components["schemas"]["RoundInvocation"] | components["schemas"]["PromptsFromFileInvocation"] | components["schemas"]["LaMaInfillInvocation"] | components["schemas"]["StepParamEasingInvocation"] | components["schemas"]["CenterPadCropInvocation"] | components["schemas"]["CropLatentsCoreInvocation"] | components["schemas"]["SubtractInvocation"] | components["schemas"]["MaskCombineInvocation"] | components["schemas"]["IntegerCollectionInvocation"] | components["schemas"]["ControlNetInvocation"] | components["schemas"]["SDXLLoraLoaderInvocation"] | components["schemas"]["TileResamplerProcessorInvocation"] | components["schemas"]["CV2InfillInvocation"] | components["schemas"]["CollectInvocation"] | components["schemas"]["ImageInvocation"] | components["schemas"]["DWOpenposeImageProcessorInvocation"] | components["schemas"]["FaceIdentifierInvocation"] | components["schemas"]["ImageBlurInvocation"] | components["schemas"]["ImageChannelMultiplyInvocation"] | components["schemas"]["AddInvocation"] | components["schemas"]["SDXLCompelPromptInvocation"] | components["schemas"]["IterateInvocation"] | components["schemas"]["CalculateImageTilesInvocation"] | components["schemas"]["SDXLRefinerCompelPromptInvocation"] | components["schemas"]["ImageResizeInvocation"] | components["schemas"]["SchedulerInvocation"] | components["schemas"]["ImageCollectionInvocation"] | components["schemas"]["ShowImageInvocation"] | components["schemas"]["RandomFloatInvocation"] | components["schemas"]["StringSplitNegInvocation"] | components["schemas"]["StringSplitInvocation"] | components["schemas"]["ColorInvocation"] | components["schemas"]["ImageConvertInvocation"] | components["schemas"]["BlendLatentsInvocation"] | components["schemas"]["MediapipeFaceProcessorInvocation"] | components["schemas"]["CalculateImageTilesEvenSplitInvocation"] | components["schemas"]["CreateDenoiseMaskInvocation"] | components["schemas"]["ConditioningCollectionInvocation"] | components["schemas"]["SegmentAnythingProcessorInvocation"] | components["schemas"]["StringInvocation"] | components["schemas"]["DenoiseLatentsInvocation"] | components["schemas"]["RangeOfSizeInvocation"] | components["schemas"]["DivideInvocation"] | components["schemas"]["ImageLerpInvocation"] | components["schemas"]["FloatInvocation"] | components["schemas"]["MainModelLoaderInvocation"] | components["schemas"]["BlankImageInvocation"] | components["schemas"]["StringJoinInvocation"] | components["schemas"]["ClipSkipInvocation"] | components["schemas"]["ImageChannelInvocation"] | components["schemas"]["TileToPropertiesInvocation"] | components["schemas"]["ImageHueAdjustmentInvocation"] | components["schemas"]["HedImageProcessorInvocation"] | components["schemas"]["MetadataInvocation"] | components["schemas"]["IPAdapterInvocation"] | components["schemas"]["RandomIntInvocation"] | components["schemas"]["MaskFromAlphaInvocation"] | components["schemas"]["ImageNSFWBlurInvocation"] | components["schemas"]["MlsdImageProcessorInvocation"] | components["schemas"]["ImageInverseLerpInvocation"] | components["schemas"]["SaveImageInvocation"] | components["schemas"]["LineartAnimeImageProcessorInvocation"] | components["schemas"]["CoreMetadataInvocation"];
+        [key: string]: components["schemas"]["CannyImageProcessorInvocation"] | components["schemas"]["IntegerMathInvocation"] | components["schemas"]["CanvasPasteBackInvocation"] | components["schemas"]["BooleanInvocation"] | components["schemas"]["MainModelLoaderInvocation"] | components["schemas"]["ControlNetInvocation"] | components["schemas"]["AddInvocation"] | components["schemas"]["MergeMetadataInvocation"] | components["schemas"]["ColorMapImageProcessorInvocation"] | components["schemas"]["ZoeDepthImageProcessorInvocation"] | components["schemas"]["StringCollectionInvocation"] | components["schemas"]["StringJoinInvocation"] | components["schemas"]["CoreMetadataInvocation"] | components["schemas"]["BlendLatentsInvocation"] | components["schemas"]["ColorCorrectInvocation"] | components["schemas"]["StepParamEasingInvocation"] | components["schemas"]["FloatLinearRangeInvocation"] | components["schemas"]["MetadataInvocation"] | components["schemas"]["MidasDepthImageProcessorInvocation"] | components["schemas"]["FloatCollectionInvocation"] | components["schemas"]["LaMaInfillInvocation"] | components["schemas"]["FaceMaskInvocation"] | components["schemas"]["CollectInvocation"] | components["schemas"]["FaceOffInvocation"] | components["schemas"]["TileResamplerProcessorInvocation"] | components["schemas"]["FaceIdentifierInvocation"] | components["schemas"]["ImageResizeInvocation"] | components["schemas"]["T2IAdapterInvocation"] | components["schemas"]["ColorInvocation"] | components["schemas"]["InfillColorInvocation"] | components["schemas"]["CalculateImageTilesEvenSplitInvocation"] | components["schemas"]["InfillTileInvocation"] | components["schemas"]["FloatMathInvocation"] | components["schemas"]["DenoiseLatentsInvocation"] | components["schemas"]["ImageCropInvocation"] | components["schemas"]["ImageHueAdjustmentInvocation"] | components["schemas"]["PidiImageProcessorInvocation"] | components["schemas"]["FreeUInvocation"] | components["schemas"]["SDXLRefinerModelLoaderInvocation"] | components["schemas"]["ImageLerpInvocation"] | components["schemas"]["LineartImageProcessorInvocation"] | components["schemas"]["ESRGANInvocation"] | components["schemas"]["RangeInvocation"] | components["schemas"]["FloatToIntegerInvocation"] | components["schemas"]["CvInpaintInvocation"] | components["schemas"]["UnsharpMaskInvocation"] | components["schemas"]["DynamicPromptInvocation"] | components["schemas"]["MlsdImageProcessorInvocation"] | components["schemas"]["ImageToLatentsInvocation"] | components["schemas"]["VaeLoaderInvocation"] | components["schemas"]["ScaleLatentsInvocation"] | components["schemas"]["LoraLoaderInvocation"] | components["schemas"]["StringJoinThreeInvocation"] | components["schemas"]["ImageConvertInvocation"] | components["schemas"]["RangeOfSizeInvocation"] | components["schemas"]["ImageNSFWBlurInvocation"] | components["schemas"]["IntegerCollectionInvocation"] | components["schemas"]["TileToPropertiesInvocation"] | components["schemas"]["ImageChannelInvocation"] | components["schemas"]["CreateGradientMaskInvocation"] | components["schemas"]["StringSplitNegInvocation"] | components["schemas"]["CenterPadCropInvocation"] | components["schemas"]["ImageMultiplyInvocation"] | components["schemas"]["IPAdapterInvocation"] | components["schemas"]["ResizeLatentsInvocation"] | components["schemas"]["DepthAnythingImageProcessorInvocation"] | components["schemas"]["PairTileImageInvocation"] | components["schemas"]["ContentShuffleImageProcessorInvocation"] | components["schemas"]["IdealSizeInvocation"] | components["schemas"]["ClipSkipInvocation"] | components["schemas"]["RoundInvocation"] | components["schemas"]["DivideInvocation"] | components["schemas"]["RandomRangeInvocation"] | components["schemas"]["NormalbaeImageProcessorInvocation"] | components["schemas"]["StringInvocation"] | components["schemas"]["ImagePasteInvocation"] | components["schemas"]["CreateDenoiseMaskInvocation"] | components["schemas"]["StringSplitInvocation"] | components["schemas"]["CalculateImageTilesInvocation"] | components["schemas"]["DWOpenposeImageProcessorInvocation"] | components["schemas"]["SeamlessModeInvocation"] | components["schemas"]["BooleanCollectionInvocation"] | components["schemas"]["ImageCollectionInvocation"] | components["schemas"]["LatentsToImageInvocation"] | components["schemas"]["ImageInvocation"] | components["schemas"]["FloatInvocation"] | components["schemas"]["SDXLCompelPromptInvocation"] | components["schemas"]["ImageInverseLerpInvocation"] | components["schemas"]["ConditioningInvocation"] | components["schemas"]["CropLatentsCoreInvocation"] | components["schemas"]["IterateInvocation"] | components["schemas"]["CV2InfillInvocation"] | components["schemas"]["SaveImageInvocation"] | components["schemas"]["RandomIntInvocation"] | components["schemas"]["MaskEdgeInvocation"] | components["schemas"]["SDXLLoraLoaderInvocation"] | components["schemas"]["CalculateImageTilesMinimumOverlapInvocation"] | components["schemas"]["SegmentAnythingProcessorInvocation"] | components["schemas"]["SDXLModelLoaderInvocation"] | components["schemas"]["ImageScaleInvocation"] | components["schemas"]["MultiplyInvocation"] | components["schemas"]["BlankImageInvocation"] | components["schemas"]["MergeTilesToImageInvocation"] | components["schemas"]["IntegerInvocation"] | components["schemas"]["LatentsInvocation"] | components["schemas"]["MediapipeFaceProcessorInvocation"] | components["schemas"]["NoiseInvocation"] | components["schemas"]["InfillPatchMatchInvocation"] | components["schemas"]["ShowImageInvocation"] | components["schemas"]["SubtractInvocation"] | components["schemas"]["PromptsFromFileInvocation"] | components["schemas"]["LeresImageProcessorInvocation"] | components["schemas"]["ImageBlurInvocation"] | components["schemas"]["ImageChannelOffsetInvocation"] | components["schemas"]["SchedulerInvocation"] | components["schemas"]["LineartAnimeImageProcessorInvocation"] | components["schemas"]["ImageWatermarkInvocation"] | components["schemas"]["MaskFromAlphaInvocation"] | components["schemas"]["ConditioningCollectionInvocation"] | components["schemas"]["SDXLRefinerCompelPromptInvocation"] | components["schemas"]["ImageChannelMultiplyInvocation"] | components["schemas"]["StringReplaceInvocation"] | components["schemas"]["RandomFloatInvocation"] | components["schemas"]["MaskCombineInvocation"] | components["schemas"]["LatentsCollectionInvocation"] | components["schemas"]["MetadataItemInvocation"] | components["schemas"]["HedImageProcessorInvocation"] | components["schemas"]["CompelInvocation"];
       };
       /**
        * Edges
@@ -4320,7 +4147,7 @@ export type components = {
        * @description The results of node executions
        */
       results: {
-        [key: string]: components["schemas"]["BooleanOutput"] | components["schemas"]["SDXLRefinerModelLoaderOutput"] | components["schemas"]["PairTileImageOutput"] | components["schemas"]["ColorCollectionOutput"] | components["schemas"]["IdealSizeOutput"] | components["schemas"]["String2Output"] | components["schemas"]["FloatCollectionOutput"] | components["schemas"]["ColorOutput"] | components["schemas"]["IPAdapterOutput"] | components["schemas"]["MetadataItemOutput"] | components["schemas"]["ConditioningCollectionOutput"] | components["schemas"]["NoiseOutput"] | components["schemas"]["ClipSkipInvocationOutput"] | components["schemas"]["ImageOutput"] | components["schemas"]["VAEOutput"] | components["schemas"]["MetadataOutput"] | components["schemas"]["StringCollectionOutput"] | components["schemas"]["ControlOutput"] | components["schemas"]["FaceOffOutput"] | components["schemas"]["StringOutput"] | components["schemas"]["SchedulerOutput"] | components["schemas"]["ImageCollectionOutput"] | components["schemas"]["TileToPropertiesOutput"] | components["schemas"]["LoraLoaderOutput"] | components["schemas"]["StringPosNegOutput"] | components["schemas"]["CollectInvocationOutput"] | components["schemas"]["ModelLoaderOutput"] | components["schemas"]["DenoiseMaskOutput"] | components["schemas"]["ConditioningOutput"] | components["schemas"]["CalculateImageTilesOutput"] | components["schemas"]["FaceMaskOutput"] | components["schemas"]["IntegerCollectionOutput"] | components["schemas"]["BooleanCollectionOutput"] | components["schemas"]["IntegerOutput"] | components["schemas"]["FloatOutput"] | components["schemas"]["CLIPOutput"] | components["schemas"]["SeamlessModeOutput"] | components["schemas"]["T2IAdapterOutput"] | components["schemas"]["UNetOutput"] | components["schemas"]["IterateInvocationOutput"] | components["schemas"]["SDXLModelLoaderOutput"] | components["schemas"]["LatentsOutput"] | components["schemas"]["SDXLLoraLoaderOutput"] | components["schemas"]["LatentsCollectionOutput"];
+        [key: string]: components["schemas"]["FloatOutput"] | components["schemas"]["LatentsCollectionOutput"] | components["schemas"]["DenoiseMaskOutput"] | components["schemas"]["ConditioningCollectionOutput"] | components["schemas"]["ControlOutput"] | components["schemas"]["CalculateImageTilesOutput"] | components["schemas"]["String2Output"] | components["schemas"]["CLIPOutput"] | components["schemas"]["LoraLoaderOutput"] | components["schemas"]["VAEOutput"] | components["schemas"]["SDXLRefinerModelLoaderOutput"] | components["schemas"]["ClipSkipInvocationOutput"] | components["schemas"]["SDXLLoraLoaderOutput"] | components["schemas"]["StringPosNegOutput"] | components["schemas"]["IterateInvocationOutput"] | components["schemas"]["CollectInvocationOutput"] | components["schemas"]["FaceOffOutput"] | components["schemas"]["BooleanCollectionOutput"] | components["schemas"]["FloatCollectionOutput"] | components["schemas"]["SeamlessModeOutput"] | components["schemas"]["IPAdapterOutput"] | components["schemas"]["IdealSizeOutput"] | components["schemas"]["T2IAdapterOutput"] | components["schemas"]["TileToPropertiesOutput"] | components["schemas"]["ImageCollectionOutput"] | components["schemas"]["LatentsOutput"] | components["schemas"]["UNetOutput"] | components["schemas"]["MetadataOutput"] | components["schemas"]["ConditioningOutput"] | components["schemas"]["SDXLModelLoaderOutput"] | components["schemas"]["FaceMaskOutput"] | components["schemas"]["StringCollectionOutput"] | components["schemas"]["PairTileImageOutput"] | components["schemas"]["ColorCollectionOutput"] | components["schemas"]["SchedulerOutput"] | components["schemas"]["StringOutput"] | components["schemas"]["ImageOutput"] | components["schemas"]["ModelLoaderOutput"] | components["schemas"]["NoiseOutput"] | components["schemas"]["BooleanOutput"] | components["schemas"]["IntegerOutput"] | components["schemas"]["IntegerCollectionOutput"] | components["schemas"]["GradientMaskOutput"] | components["schemas"]["ColorOutput"] | components["schemas"]["MetadataItemOutput"];
       };
       /**
        * Errors
@@ -4434,23 +4261,6 @@ export type components = {
        * @description model's name
        */
       name: string;
-      /**
-       * Author
-       * @description model's author
-       */
-      author: string;
-      /**
-       * Tags
-       * @description tags provided by model source
-       */
-      tags?: string[] | null;
-      /**
-       * Trigger Phrases
-       * @description trigger phrases for this model
-       */
-      trigger_phrases?: string[] | null;
-      /** @description default settings for this model */
-      default_settings?: components["schemas"]["ModelDefaultSettings"] | null;
       /**
        * Files
        * @description model files and their sizes
@@ -4464,79 +4274,79 @@ export type components = {
       type?: "huggingface";
       /**
        * Id
-       * @description huggingface model id
+       * @description The HF model id
        */
       id: string;
-      /** Tag Dict */
-      tag_dict: Record<string, never>;
       /**
-       * Last Modified
-       * Format: date-time
-       * @description date of last commit to repo
+       * Api Response
+       * @description Response from the HF API as stringified JSON
        */
-      last_modified: string;
+      api_response?: string | null;
     };
     /**
      * IPAdapterConfig
      * @description Model config for IP Adaptor format models.
      */
     IPAdapterConfig: {
+      /**
+       * Key
+       * @description A unique key for this model.
+       */
+      key: string;
+      /**
+       * Hash
+       * @description The hash of the model file(s).
+       */
+      hash: string;
       /**
        * Path
-       * @description filesystem path to the model file or directory
+       * @description Path to the model on the filesystem. Relative paths are relative to the Invoke root directory.
        */
       path: string;
       /**
        * Name
-       * @description model name
+       * @description Name of the model.
        */
       name: string;
-      /** @description base model */
+      /** @description The base model. */
       base: components["schemas"]["BaseModelType"];
+      /**
+       * Description
+       * @description Model description
+       */
+      description?: string | null;
+      /**
+       * Source
+       * @description The original source of the model (path, URL or repo_id).
+       */
+      source: string;
+      /** @description The type of source */
+      source_type: components["schemas"]["ModelSourceType"];
+      /**
+       * Source Api Response
+       * @description The original API response from the source, as stringified JSON.
+       */
+      source_api_response?: string | null;
+      /**
+       * Trigger Phrases
+       * @description Set of trigger phrases for this model
+       */
+      trigger_phrases?: string[] | null;
+      /** @description Default settings for this model */
+      default_settings?: components["schemas"]["ModelDefaultSettings"] | null;
       /**
        * Type
        * @default ip_adapter
        * @constant
        */
       type: "ip_adapter";
+      /** Image Encoder Model Id */
+      image_encoder_model_id: string;
       /**
        * Format
        * @constant
        */
       format: "invokeai";
-      /**
-       * Key
-       * @description unique key for model
-       * @default <NOKEY>
-       */
-      key: string;
-      /**
-       * Original Hash
-       * @description original fasthash of model contents
-       */
-      original_hash: string | null;
-      /**
-       * Current Hash
-       * @description current fasthash of model contents
-       */
-      current_hash: string | null;
-      /**
-       * Description
-       * @description human readable description of the model
-       */
-      description?: string | null;
-      /**
-       * Source
-       * @description model original source (path, URL or repo_id)
-       */
-      source: string | null;
-      /**
-       * Last Modified
-       * @description timestamp for modification time
-       */
-      last_modified: number | null;
-      /** Image Encoder Model Id */
-      image_encoder_model_id: string;
     };
     /** IPAdapterField */
     IPAdapterField: {
@@ -5912,7 +5722,7 @@ export type components = {
      * @description State of an install job running in the background.
      * @enum {string}
      */
-    InstallStatus: "waiting" | "downloading" | "running" | "completed" | "error" | "cancelled";
+    InstallStatus: "waiting" | "downloading" | "downloads_done" | "running" | "completed" | "error" | "cancelled";
     /**
      * Integer Collection Primitive
      * @description A collection of integer primitive values
@@ -6434,32 +6244,6 @@ export type components = {
        */
       type: "leres_image_processor";
     };
-    /**
-     * LicenseRestrictions
-     * @description Broad categories of licensing restrictions.
-     */
-    LicenseRestrictions: {
-      /**
-       * Allownocredit
-       * @description if true, model can be redistributed without crediting author
-       * @default false
-       */
-      AllowNoCredit?: boolean;
-      /**
-       * Allowderivatives
-       * @description if true, derivatives of this model can be redistributed
-       * @default false
-       */
-      AllowDerivatives?: boolean;
-      /**
-       * Allowdifferentlicense
-       * @description if true, derivatives of this model be redistributed under a different license
-       * @default false
-       */
-      AllowDifferentLicense?: boolean;
-      /** @description Type of commercial use allowed or 'No' if no commercial use is allowed. */
-      AllowCommercialUse?: components["schemas"]["CommercialUsage"] | null;
-    };
     /**
      * Lineart Anime Processor
      * @description Applies line art anime processing to image
@@ -6561,22 +6345,56 @@ export type components = {
       type: "lineart_image_processor";
     };
     /**
-     * LoRAConfig
-     * @description Model config for LoRA/Lycoris models.
+     * LoRADiffusersConfig
+     * @description Model config for LoRA/Diffusers models.
      */
-    LoRAConfig: {
+    LoRADiffusersConfig: {
+      /**
+       * Key
+       * @description A unique key for this model.
+       */
+      key: string;
+      /**
+       * Hash
+       * @description The hash of the model file(s).
+       */
+      hash: string;
       /**
        * Path
-       * @description filesystem path to the model file or directory
+       * @description Path to the model on the filesystem. Relative paths are relative to the Invoke root directory.
        */
       path: string;
       /**
        * Name
-       * @description model name
+       * @description Name of the model.
        */
       name: string;
-      /** @description base model */
+      /** @description The base model. */
       base: components["schemas"]["BaseModelType"];
+      /**
+       * Description
+       * @description Model description
+       */
+      description?: string | null;
+      /**
+       * Source
+       * @description The original source of the model (path, URL or repo_id).
+       */
+      source: string;
+      /** @description The type of source */
+      source_type: components["schemas"]["ModelSourceType"];
+      /**
+       * Source Api Response
+       * @description The original API response from the source, as stringified JSON.
+       */
+      source_api_response?: string | null;
+      /**
+       * Trigger Phrases
+       * @description Set of trigger phrases for this model
+       */
+      trigger_phrases?: string[] | null;
+      /** @description Default settings for this model */
+      default_settings?: components["schemas"]["ModelDefaultSettings"] | null;
       /**
        * Type
        * @default lora
@@ -6585,40 +6403,74 @@ export type components = {
       type: "lora";
       /**
        * Format
-       * @enum {string}
+       * @default diffusers
+       * @constant
        */
-      format: "lycoris" | "diffusers";
+      format: "diffusers";
+    };
+    /**
+     * LoRALyCORISConfig
+     * @description Model config for LoRA/Lycoris models.
+     */
+    LoRALyCORISConfig: {
       /**
        * Key
-       * @description unique key for model
-       * @default <NOKEY>
+       * @description A unique key for this model.
        */
       key: string;
       /**
-       * Original Hash
-       * @description original fasthash of model contents
+       * Hash
+       * @description The hash of the model file(s).
        */
-      original_hash: string | null;
+      hash: string;
       /**
-       * Current Hash
-       * @description current fasthash of model contents
+       * Path
+       * @description Path to the model on the filesystem. Relative paths are relative to the Invoke root directory.
        */
-      current_hash: string | null;
+      path: string;
+      /**
+       * Name
+       * @description Name of the model.
+       */
+      name: string;
+      /** @description The base model. */
+      base: components["schemas"]["BaseModelType"];
       /**
        * Description
-       * @description human readable description of the model
+       * @description Model description
        */
       description?: string | null;
       /**
        * Source
-       * @description model original source (path, URL or repo_id)
+       * @description The original source of the model (path, URL or repo_id).
        */
-      source: string | null;
+      source: string;
+      /** @description The type of source */
+      source_type: components["schemas"]["ModelSourceType"];
       /**
-       * Last Modified
-       * @description timestamp for modification time
+       * Source Api Response
+       * @description The original API response from the source, as stringified JSON.
        */
-      last_modified: number | null;
+      source_api_response?: string | null;
+      /**
+       * Trigger Phrases
+       * @description Set of trigger phrases for this model
+       */
+      trigger_phrases?: string[] | null;
+      /** @description Default settings for this model */
+      default_settings?: components["schemas"]["ModelDefaultSettings"] | null;
+      /**
+       * Type
+       * @default lora
+       * @constant
+       */
+      type: "lora";
+      /**
+       * Format
+       * @default lycoris
+       * @constant
+       */
+      format: "lycoris";
     };
     /**
      * LoRAMetadataField
@@ -6765,24 +6617,52 @@ export type components = {
      * @description Model config for main checkpoint models.
      */
     MainCheckpointConfig: {
+      /**
+       * Key
+       * @description A unique key for this model.
+       */
+      key: string;
+      /**
+       * Hash
+       * @description The hash of the model file(s).
+       */
+      hash: string;
       /**
        * Path
-       * @description filesystem path to the model file or directory
+       * @description Path to the model on the filesystem. Relative paths are relative to the Invoke root directory.
        */
       path: string;
       /**
        * Name
-       * @description model name
+       * @description Name of the model.
        */
       name: string;
-      /** @description base model */
+      /** @description The base model. */
       base: components["schemas"]["BaseModelType"];
       /**
-       * Type
-       * @default main
-       * @constant
+       * Description
+       * @description Model description
        */
-      type: "main";
+      description?: string | null;
+      /**
+       * Source
+       * @description The original source of the model (path, URL or repo_id).
+       */
+      source: string;
+      /** @description The type of source */
+      source_type: components["schemas"]["ModelSourceType"];
+      /**
+       * Source Api Response
+       * @description The original API response from the source, as stringified JSON.
+       */
+      source_api_response?: string | null;
+      /**
+       * Trigger Phrases
+       * @description Set of trigger phrases for this model
+       */
+      trigger_phrases?: string[] | null;
+      /** @description Default settings for this model */
+      default_settings?: components["schemas"]["ModelDefaultSettings"] | null;
       /**
        * Format
        * @default checkpoint
@@ -6790,38 +6670,21 @@ export type components = {
        */
       format: "checkpoint";
       /**
-       * Key
-       * @description unique key for model
-       * @default <NOKEY>
+       * Config Path
+       * @description path to the checkpoint model config file
        */
-      key: string;
+      config_path: string;
       /**
-       * Original Hash
-       * @description original fasthash of model contents
+       * Converted At
+       * @description When this model was last converted to diffusers
        */
-      original_hash: string | null;
+      converted_at?: number | null;
       /**
-       * Current Hash
-       * @description current fasthash of model contents
+       * Type
+       * @default main
+       * @constant
        */
-      current_hash: string | null;
-      /**
-       * Description
-       * @description human readable description of the model
-       */
-      description?: string | null;
-      /**
-       * Source
-       * @description model original source (path, URL or repo_id)
-       */
-      source: string | null;
-      /**
-       * Last Modified
-       * @description timestamp for modification time
-       */
-      last_modified: number | null;
-      /** Vae */
-      vae?: string | null;
+      type: "main";
       /** @default normal */
       variant?: components["schemas"]["ModelVariantType"];
       /** @default epsilon */
@@ -6831,95 +6694,72 @@ export type components = {
        * @default false
        */
       upcast_attention?: boolean;
-      /**
-       * Ztsnr Training
-       * @default false
-       */
-      ztsnr_training?: boolean;
-      /**
-       * Config
-       * @description path to the checkpoint model config file
-       */
-      config: string;
     };
     /**
      * MainDiffusersConfig
      * @description Model config for main diffusers models.
      */
     MainDiffusersConfig: {
+      /**
+       * Key
+       * @description A unique key for this model.
+       */
+      key: string;
+      /**
+       * Hash
+       * @description The hash of the model file(s).
+       */
+      hash: string;
       /**
        * Path
-       * @description filesystem path to the model file or directory
+       * @description Path to the model on the filesystem. Relative paths are relative to the Invoke root directory.
        */
       path: string;
       /**
        * Name
-       * @description model name
+       * @description Name of the model.
        */
       name: string;
-      /** @description base model */
+      /** @description The base model. */
       base: components["schemas"]["BaseModelType"];
       /**
-       * Type
-       * @default main
-       * @constant
+       * Description
+       * @description Model description
        */
-      type: "main";
+      description?: string | null;
+      /**
+       * Source
+       * @description The original source of the model (path, URL or repo_id).
+       */
+      source: string;
+      /** @description The type of source */
+      source_type: components["schemas"]["ModelSourceType"];
+      /**
+       * Source Api Response
+       * @description The original API response from the source, as stringified JSON.
+       */
+      source_api_response?: string | null;
+      /**
+       * Trigger Phrases
+       * @description Set of trigger phrases for this model
+       */
+      trigger_phrases?: string[] | null;
+      /** @description Default settings for this model */
+      default_settings?: components["schemas"]["ModelDefaultSettings"] | null;
       /**
        * Format
        * @default diffusers
        * @constant
        */
       format: "diffusers";
-      /**
-       * Key
-       * @description unique key for model
-       * @default <NOKEY>
-       */
-      key: string;
-      /**
-       * Original Hash
-       * @description original fasthash of model contents
-       */
-      original_hash: string | null;
-      /**
-       * Current Hash
-       * @description current fasthash of model contents
-       */
-      current_hash: string | null;
-      /**
-       * Description
-       * @description human readable description of the model
-       */
-      description?: string | null;
-      /**
-       * Source
-       * @description model original source (path, URL or repo_id)
-       */
-      source: string | null;
-      /**
-       * Last Modified
-       * @description timestamp for modification time
-       */
-      last_modified: number | null;
-      /** Vae */
-      vae?: string | null;
-      /** @default normal */
-      variant?: components["schemas"]["ModelVariantType"];
-      /** @default epsilon */
-      prediction_type?: components["schemas"]["SchedulerPredictionType"];
-      /**
-       * Upcast Attention
-       * @default false
-       */
-      upcast_attention?: boolean;
-      /**
-       * Ztsnr Training
-       * @default false
-       */
-      ztsnr_training?: boolean;
       /** @default */
       repo_variant?: components["schemas"]["ModelRepoVariant"] | null;
+      /**
+       * Type
+       * @default main
+       * @constant
+       */
+      type: "main";
     };
     /**
      * MainModelField
@@ -7143,11 +6983,6 @@ export type components = {
        */
       type: "mediapipe_face_processor";
     };
-    /**
-     * MergeInterpolationMethod
-     * @enum {string}
-     */
-    MergeInterpolationMethod: "weighted_sum" | "sigmoid" | "inv_sigmoid" | "add_difference";
     /**
      * Metadata Merge
      * @description Merged a collection of MetadataDict into a single MetadataDict.
@@ -7519,7 +7354,7 @@ export type components = {
        * Config Out
        * @description After successful installation, this will hold the configuration object.
        */
-      config_out?: (components["schemas"]["MainDiffusersConfig"] | components["schemas"]["MainCheckpointConfig"]) | (components["schemas"]["VaeDiffusersConfig"] | components["schemas"]["VaeCheckpointConfig"]) | (components["schemas"]["ControlNetDiffusersConfig"] | components["schemas"]["ControlNetCheckpointConfig"]) | components["schemas"]["LoRAConfig"] | components["schemas"]["TextualInversionConfig"] | components["schemas"]["IPAdapterConfig"] | components["schemas"]["CLIPVisionDiffusersConfig"] | components["schemas"]["T2IConfig"] | null;
+      config_out?: (components["schemas"]["MainDiffusersConfig"] | components["schemas"]["MainCheckpointConfig"] | components["schemas"]["VAEDiffusersConfig"] | components["schemas"]["VAECheckpointConfig"] | components["schemas"]["ControlNetDiffusersConfig"] | components["schemas"]["ControlNetCheckpointConfig"] | components["schemas"]["LoRALyCORISConfig"] | components["schemas"]["LoRADiffusersConfig"] | components["schemas"]["TextualInversionFileConfig"] | components["schemas"]["TextualInversionFolderConfig"] | components["schemas"]["IPAdapterConfig"] | components["schemas"]["T2IAdapterConfig"] | components["schemas"]["CLIPVisionDiffusersConfig"]) | null;
       /**
        * Inplace
        * @description Leave model in its current location; otherwise install under models directory
@@ -7598,29 +7433,39 @@ export type components = {
       unet: components["schemas"]["UNetField"];
     };
     /**
-     * ModelMetadataChanges
-     * @description A set of changes to apply to model metadata.
-     *
-     * Only limited changes are valid:
-     *   - `trigger_phrases`: the list of trigger phrases for this model
-     *   - `default_settings`: the user-configured default settings for this model
+     * ModelRecordChanges
+     * @description A set of changes to apply to a model.
      */
-    ModelMetadataChanges: {
+    ModelRecordChanges: {
+      /**
+       * Name
+       * @description Name of the model.
+       */
+      name?: string | null;
+      /**
+       * Description
+       * @description Model description
+       */
+      description?: string | null;
+      /** @description The base model. */
+      base?: components["schemas"]["BaseModelType"] | null;
       /**
        * Trigger Phrases
-       * @description The model's list of trigger phrases
+       * @description Set of trigger phrases for this model
        */
       trigger_phrases?: string[] | null;
-      /** @description The user-configured default settings for this model */
+      /** @description Default settings for this model */
       default_settings?: components["schemas"]["ModelDefaultSettings"] | null;
-      [key: string]: unknown;
+      /** @description The variant of the model. */
+      variant?: components["schemas"]["ModelVariantType"] | null;
+      /** @description The prediction type of the model. */
+      prediction_type?: components["schemas"]["SchedulerPredictionType"] | null;
+      /**
+       * Upcast Attention
+       * @description Whether to upcast attention.
+       */
+      upcast_attention?: boolean | null;
     };
-    /**
-     * ModelRecordOrderBy
-     * @description The order in which to return model summaries.
-     * @enum {string}
-     */
-    ModelRecordOrderBy: "default" | "type" | "base" | "name" | "format";
     /**
      * ModelRepoVariant
      * @description Various hugging face variants on the diffusers format.
@@ -7628,37 +7473,11 @@ export type components = {
      */
     ModelRepoVariant: "" | "fp16" | "fp32" | "onnx" | "openvino" | "flax";
     /**
-     * ModelSummary
-     * @description A short summary of models for UI listing purposes.
+     * ModelSourceType
+     * @description Model source type.
+     * @enum {string}
      */
-    ModelSummary: {
-      /**
-       * Key
-       * @description model key
-       */
-      key: string;
-      /** @description model type */
-      type: components["schemas"]["ModelType"];
-      /** @description base model */
-      base: components["schemas"]["BaseModelType"];
-      /** @description model format */
-      format: components["schemas"]["ModelFormat"];
-      /**
-       * Name
-       * @description model name
-       */
-      name: string;
-      /**
-       * Description
-       * @description short description of model
-       */
-      description: string;
-      /**
-       * Tags
-       * @description tags associated with model
-       */
-      tags: string[];
-    };
+    ModelSourceType: "path" | "url" | "hf_repo_id" | "civitai";
     /**
      * ModelType
      * @description Model type.
@@ -7677,7 +7496,7 @@ export type components = {
      */
     ModelsList: {
       /** Models */
-      models: ((components["schemas"]["MainDiffusersConfig"] | components["schemas"]["MainCheckpointConfig"]) | (components["schemas"]["VaeDiffusersConfig"] | components["schemas"]["VaeCheckpointConfig"]) | (components["schemas"]["ControlNetDiffusersConfig"] | components["schemas"]["ControlNetCheckpointConfig"]) | components["schemas"]["LoRAConfig"] | components["schemas"]["TextualInversionConfig"] | components["schemas"]["IPAdapterConfig"] | components["schemas"]["CLIPVisionDiffusersConfig"] | components["schemas"]["T2IConfig"])[];
+      models: (components["schemas"]["MainDiffusersConfig"] | components["schemas"]["MainCheckpointConfig"] | components["schemas"]["VAEDiffusersConfig"] | components["schemas"]["VAECheckpointConfig"] | components["schemas"]["ControlNetDiffusersConfig"] | components["schemas"]["ControlNetCheckpointConfig"] | components["schemas"]["LoRALyCORISConfig"] | components["schemas"]["LoRADiffusersConfig"] | components["schemas"]["TextualInversionFileConfig"] | components["schemas"]["TextualInversionFolderConfig"] | components["schemas"]["IPAdapterConfig"] | components["schemas"]["T2IAdapterConfig"] | components["schemas"]["CLIPVisionDiffusersConfig"])[];
     };
     /**
      * Multiply Integers
@@ -7908,34 +7727,6 @@ export type components = {
        */
       items: components["schemas"]["ImageDTO"][];
     };
-    /** PaginatedResults[ModelSummary] */
-    PaginatedResults_ModelSummary_: {
-      /**
-       * Page
-       * @description Current Page
-       */
-      page: number;
-      /**
-       * Pages
-       * @description Total number of pages
-       */
-      pages: number;
-      /**
-       * Per Page
-       * @description Number of items per page
-       */
-      per_page: number;
-      /**
-       * Total
-       * @description Total number of items in result
-       */
-      total: number;
-      /**
-       * Items
-       * @description Items
-       */
-      items: components["schemas"]["ModelSummary"][];
-    };
     /** PaginatedResults[WorkflowRecordListItemDTO] */
     PaginatedResults_WorkflowRecordListItemDTO_: {
       /**
@@ -9857,6 +9648,69 @@ export type components = {
        */
       type: "sub";
     };
+    /**
+     * T2IAdapterConfig
+     * @description Model config for T2I.
+     */
+    T2IAdapterConfig: {
+      /**
+       * Key
+       * @description A unique key for this model.
+       */
+      key: string;
+      /**
+       * Hash
+       * @description The hash of the model file(s).
+       */
+      hash: string;
+      /**
+       * Path
+       * @description Path to the model on the filesystem. Relative paths are relative to the Invoke root directory.
+       */
+      path: string;
+      /**
+       * Name
+       * @description Name of the model.
+       */
+      name: string;
+      /** @description The base model. */
+      base: components["schemas"]["BaseModelType"];
+      /**
+       * Description
+       * @description Model description
+       */
+      description?: string | null;
+      /**
+       * Source
+       * @description The original source of the model (path, URL or repo_id).
+       */
+      source: string;
+      /** @description The type of source */
+      source_type: components["schemas"]["ModelSourceType"];
+      /**
+       * Source Api Response
+       * @description The original API response from the source, as stringified JSON.
+       */
+      source_api_response?: string | null;
+      /**
+       * Trigger Phrases
+       * @description Set of trigger phrases for this model
+       */
+      trigger_phrases?: string[] | null;
+      /** @description Default settings for this model */
+      default_settings?: components["schemas"]["ModelDefaultSettings"] | null;
+      /**
+       * Type
+       * @default t2i_adapter
+       * @constant
+       */
+      type: "t2i_adapter";
+      /**
+       * Format
+       * @constant
+       */
+      format: "diffusers";
+    };
     /** T2IAdapterField */
     T2IAdapterField: {
       /** @description The T2I-Adapter image prompt. */
@@ -9972,66 +9826,6 @@ export type components = {
        */
       type: "t2i_adapter_output";
     };
-    /**
-     * T2IConfig
-     * @description Model config for T2I.
-     */
-    T2IConfig: {
-      /**
-       * Path
-       * @description filesystem path to the model file or directory
-       */
-      path: string;
-      /**
-       * Name
-       * @description model name
-       */
-      name: string;
-      /** @description base model */
-      base: components["schemas"]["BaseModelType"];
-      /**
-       * Type
-       * @default t2i_adapter
-       * @constant
-       */
-      type: "t2i_adapter";
-      /**
-       * Format
-       * @constant
-       */
-      format: "diffusers";
-      /**
-       * Key
-       * @description unique key for model
-       * @default <NOKEY>
-       */
-      key: string;
-      /**
-       * Original Hash
-       * @description original fasthash of model contents
-       */
-      original_hash: string | null;
-      /**
-       * Current Hash
-       * @description current fasthash of model contents
-       */
-      current_hash: string | null;
-      /**
-       * Description
-       * @description human readable description of the model
-       */
-      description?: string | null;
-      /**
-       * Source
-       * @description model original source (path, URL or repo_id)
-       */
-      source: string | null;
-      /**
-       * Last Modified
-       * @description timestamp for modification time
-       */
-      last_modified: number | null;
-    };
     /** TBLR */
     TBLR: {
       /** Top */
@@ -10044,22 +9838,56 @@ export type components = {
       right: number;
     };
     /**
-     * TextualInversionConfig
+     * TextualInversionFileConfig
      * @description Model config for textual inversion embeddings.
      */
-    TextualInversionConfig: {
+    TextualInversionFileConfig: {
+      /**
+       * Key
+       * @description A unique key for this model.
+       */
+      key: string;
+      /**
+       * Hash
+       * @description The hash of the model file(s).
+       */
+      hash: string;
       /**
        * Path
-       * @description filesystem path to the model file or directory
+       * @description Path to the model on the filesystem. Relative paths are relative to the Invoke root directory.
        */
       path: string;
       /**
        * Name
-       * @description model name
+       * @description Name of the model.
        */
       name: string;
-      /** @description base model */
+      /** @description The base model. */
       base: components["schemas"]["BaseModelType"];
+      /**
+       * Description
+       * @description Model description
+       */
+      description?: string | null;
+      /**
+       * Source
+       * @description The original source of the model (path, URL or repo_id).
+       */
+      source: string;
+      /** @description The type of source */
+      source_type: components["schemas"]["ModelSourceType"];
+      /**
+       * Source Api Response
+       * @description The original API response from the source, as stringified JSON.
+       */
+      source_api_response?: string | null;
+      /**
+       * Trigger Phrases
+       * @description Set of trigger phrases for this model
+       */
+      trigger_phrases?: string[] | null;
+      /** @description Default settings for this model */
+      default_settings?: components["schemas"]["ModelDefaultSettings"] | null;
       /**
        * Type
        * @default embedding
@@ -10068,40 +9896,74 @@ export type components = {
       type: "embedding";
       /**
        * Format
-       * @enum {string}
+       * @default embedding_file
+       * @constant
        */
-      format: "embedding_file" | "embedding_folder";
+      format: "embedding_file";
+    };
+    /**
+     * TextualInversionFolderConfig
+     * @description Model config for textual inversion embeddings.
+     */
+    TextualInversionFolderConfig: {
       /**
        * Key
-       * @description unique key for model
-       * @default <NOKEY>
+       * @description A unique key for this model.
        */
       key: string;
       /**
-       * Original Hash
-       * @description original fasthash of model contents
+       * Hash
+       * @description The hash of the model file(s).
        */
-      original_hash: string | null;
+      hash: string;
       /**
-       * Current Hash
-       * @description current fasthash of model contents
+       * Path
+       * @description Path to the model on the filesystem. Relative paths are relative to the Invoke root directory.
        */
-      current_hash: string | null;
+      path: string;
+      /**
+       * Name
+       * @description Name of the model.
+       */
+      name: string;
+      /** @description The base model. */
+      base: components["schemas"]["BaseModelType"];
       /**
        * Description
-       * @description human readable description of the model
+       * @description Model description
        */
       description?: string | null;
       /**
        * Source
-       * @description model original source (path, URL or repo_id)
+       * @description The original source of the model (path, URL or repo_id).
        */
-      source: string | null;
+      source: string;
+      /** @description The type of source */
+      source_type: components["schemas"]["ModelSourceType"];
       /**
-       * Last Modified
-       * @description timestamp for modification time
+       * Source Api Response
+       * @description The original API response from the source, as stringified JSON.
        */
-      last_modified: number | null;
+      source_api_response?: string | null;
+      /**
+       * Trigger Phrases
+       * @description Set of trigger phrases for this model
+       */
+      trigger_phrases?: string[] | null;
+      /** @description Default settings for this model */
+      default_settings?: components["schemas"]["ModelDefaultSettings"] | null;
+      /**
+       * Type
+       * @default embedding
+       * @constant
+       */
+      type: "embedding";
+      /**
+       * Format
+       * @default embedding_folder
+       * @constant
+       */
+      format: "embedding_folder";
     };
     /** Tile */
     Tile: {
@@ -10364,6 +10226,144 @@ export type components = {
        */
       upscaling_models: string[];
     };
+    /**
+     * VAECheckpointConfig
+     * @description Model config for standalone VAE models.
+     */
+    VAECheckpointConfig: {
+      /**
+       * Key
+       * @description A unique key for this model.
+       */
+      key: string;
+      /**
+       * Hash
+       * @description The hash of the model file(s).
+       */
+      hash: string;
+      /**
+       * Path
+       * @description Path to the model on the filesystem. Relative paths are relative to the Invoke root directory.
+       */
+      path: string;
+      /**
+       * Name
+       * @description Name of the model.
+       */
+      name: string;
+      /** @description The base model. */
+      base: components["schemas"]["BaseModelType"];
+      /**
+       * Description
+       * @description Model description
+       */
+      description?: string | null;
+      /**
+       * Source
+       * @description The original source of the model (path, URL or repo_id).
+       */
+      source: string;
+      /** @description The type of source */
+      source_type: components["schemas"]["ModelSourceType"];
+      /**
+       * Source Api Response
+       * @description The original API response from the source, as stringified JSON.
+       */
+      source_api_response?: string | null;
+      /**
+       * Trigger Phrases
+       * @description Set of trigger phrases for this model
+       */
+      trigger_phrases?: string[] | null;
+      /** @description Default settings for this model */
+      default_settings?: components["schemas"]["ModelDefaultSettings"] | null;
+      /**
+       * Format
+       * @default checkpoint
+       * @constant
+       */
+      format: "checkpoint";
+      /**
+       * Config Path
+       * @description path to the checkpoint model config file
+       */
+      config_path: string;
+      /**
+       * Converted At
+       * @description When this model was last converted to diffusers
+       */
+      converted_at?: number | null;
+      /**
+       * Type
+       * @default vae
+       * @constant
+       */
+      type: "vae";
+    };
+    /**
+     * VAEDiffusersConfig
+     * @description Model config for standalone VAE models (diffusers version).
+     */
+    VAEDiffusersConfig: {
+      /**
+       * Key
+       * @description A unique key for this model.
+       */
+      key: string;
+      /**
+       * Hash
+       * @description The hash of the model file(s).
+       */
+      hash: string;
+      /**
+       * Path
+       * @description Path to the model on the filesystem. Relative paths are relative to the Invoke root directory.
+       */
+      path: string;
+      /**
+       * Name
+       * @description Name of the model.
+       */
+      name: string;
+      /** @description The base model. */
+      base: components["schemas"]["BaseModelType"];
+      /**
+       * Description
+       * @description Model description
+       */
+      description?: string | null;
+      /**
+       * Source
+       * @description The original source of the model (path, URL or repo_id).
+       */
+      source: string;
+      /** @description The type of source */
+      source_type: components["schemas"]["ModelSourceType"];
+      /**
+       * Source Api Response
+       * @description The original API response from the source, as stringified JSON.
+       */
+      source_api_response?: string | null;
+      /**
+       * Trigger Phrases
+       * @description Set of trigger phrases for this model
+       */
+      trigger_phrases?: string[] | null;
+      /** @description Default settings for this model */
+      default_settings?: components["schemas"]["ModelDefaultSettings"] | null;
+      /**
+       * Type
+       * @default vae
+       * @constant
+       */
+      type: "vae";
+      /**
+       * Format
+       * @default diffusers
+       * @constant
+       */
+      format: "diffusers";
+    };
     /**
      * VAEModelField
      * @description Vae model field
@@ -10392,128 +10392,6 @@ export type components = {
        */
       type: "vae_output";
     };
-    /**
-     * VaeCheckpointConfig
-     * @description Model config for standalone VAE models.
-     */
-    VaeCheckpointConfig: {
-      /**
-       * Path
-       * @description filesystem path to the model file or directory
-       */
-      path: string;
-      /**
-       * Name
-       * @description model name
-       */
-      name: string;
-      /** @description base model */
-      base: components["schemas"]["BaseModelType"];
-      /**
-       * Type
-       * @default vae
-       * @constant
-       */
-      type: "vae";
-      /**
-       * Format
-       * @default checkpoint
-       * @constant
-       */
-      format: "checkpoint";
-      /**
-       * Key
-       * @description unique key for model
-       * @default <NOKEY>
-       */
-      key: string;
-      /**
-       * Original Hash
-       * @description original fasthash of model contents
-       */
-      original_hash: string | null;
-      /**
-       * Current Hash
-       * @description current fasthash of model contents
-       */
-      current_hash: string | null;
-      /**
-       * Description
-       * @description human readable description of the model
-       */
-      description?: string | null;
-      /**
-       * Source
-       * @description model original source (path, URL or repo_id)
-       */
-      source: string | null;
-      /**
-       * Last Modified
-       * @description timestamp for modification time
-       */
-      last_modified: number | null;
-    };
-    /**
-     * VaeDiffusersConfig
-     * @description Model config for standalone VAE models (diffusers version).
-     */
-    VaeDiffusersConfig: {
-      /**
-       * Path
-       * @description filesystem path to the model file or directory
-       */
-      path: string;
-      /**
-       * Name
-       * @description model name
-       */
-      name: string;
-      /** @description base model */
-      base: components["schemas"]["BaseModelType"];
-      /**
-       * Type
-       * @default vae
-       * @constant
-       */
-      type: "vae";
-      /**
-       * Format
-       * @default diffusers
-       * @constant
-       */
-      format: "diffusers";
-      /**
-       * Key
-       * @description unique key for model
-       * @default <NOKEY>
-       */
-      key: string;
-      /**
-       * Original Hash
-       * @description original fasthash of model contents
-       */
-      original_hash: string | null;
-      /**
-       * Current Hash
-       * @description current fasthash of model contents
-       */
-      current_hash: string | null;
-      /**
-       * Description
-       * @description human readable description of the model
-       */
-      description?: string | null;
-      /**
-       * Source
-       * @description model original source (path, URL or repo_id)
-       */
-      source: string | null;
-      /**
-       * Last Modified
-       * @description timestamp for modification time
-       */
-      last_modified: number | null;
-    };
     /** VaeField */
     VaeField: {
       /** @description Info to load vae submodel */
@@ -10988,9 +10866,9 @@ export type components = {
   pathItems: never;
 };
 
-type $defs = Record<string, never>;
+export type $defs = Record<string, never>;
 
-type external = Record<string, never>;
+export type external = Record<string, never>;
 
 export type operations = {
 
@@ -11071,7 +10949,7 @@ export type operations = {
       /** @description Successful Response */
       200: {
         content: {
-          "application/json": (components["schemas"]["MainDiffusersConfig"] | components["schemas"]["MainCheckpointConfig"]) | (components["schemas"]["VaeDiffusersConfig"] | components["schemas"]["VaeCheckpointConfig"]) | (components["schemas"]["ControlNetDiffusersConfig"] | components["schemas"]["ControlNetCheckpointConfig"]) | components["schemas"]["LoRAConfig"] | components["schemas"]["TextualInversionConfig"] | components["schemas"]["IPAdapterConfig"] | components["schemas"]["CLIPVisionDiffusersConfig"] | components["schemas"]["T2IConfig"];
+          "application/json": components["schemas"]["MainDiffusersConfig"] | components["schemas"]["MainCheckpointConfig"] | components["schemas"]["VAEDiffusersConfig"] | components["schemas"]["VAECheckpointConfig"] | components["schemas"]["ControlNetDiffusersConfig"] | components["schemas"]["ControlNetCheckpointConfig"] | components["schemas"]["LoRALyCORISConfig"] | components["schemas"]["LoRADiffusersConfig"] | components["schemas"]["TextualInversionFileConfig"] | components["schemas"]["TextualInversionFolderConfig"] | components["schemas"]["IPAdapterConfig"] | components["schemas"]["T2IAdapterConfig"] | components["schemas"]["CLIPVisionDiffusersConfig"];
         };
       };
       /** @description Validation Error */
@@ -11097,7 +10975,7 @@ export type operations = {
       /** @description The model configuration was retrieved successfully */
       200: {
         content: {
-          "application/json": (components["schemas"]["MainDiffusersConfig"] | components["schemas"]["MainCheckpointConfig"]) | (components["schemas"]["VaeDiffusersConfig"] | components["schemas"]["VaeCheckpointConfig"]) | (components["schemas"]["ControlNetDiffusersConfig"] | components["schemas"]["ControlNetCheckpointConfig"]) | components["schemas"]["LoRAConfig"] | components["schemas"]["TextualInversionConfig"] | components["schemas"]["IPAdapterConfig"] | components["schemas"]["CLIPVisionDiffusersConfig"] | components["schemas"]["T2IConfig"];
+          "application/json": components["schemas"]["MainDiffusersConfig"] | components["schemas"]["MainCheckpointConfig"] | components["schemas"]["VAEDiffusersConfig"] | components["schemas"]["VAECheckpointConfig"] | components["schemas"]["ControlNetDiffusersConfig"] | components["schemas"]["ControlNetCheckpointConfig"] | components["schemas"]["LoRALyCORISConfig"] | components["schemas"]["LoRADiffusersConfig"] | components["schemas"]["TextualInversionFileConfig"] | components["schemas"]["TextualInversionFolderConfig"] | components["schemas"]["IPAdapterConfig"] | components["schemas"]["T2IAdapterConfig"] | components["schemas"]["CLIPVisionDiffusersConfig"];
         };
       };
       /** @description Bad request */
@@ -11117,13 +10995,13 @@ export type operations = {
     };
   };
   /**
-   * Del Model Record
+   * Delete Model
    * @description Delete model record from database.
    *
    * The configuration record will be removed. The corresponding weights files will be
    * deleted as well if they reside within the InvokeAI "models" directory.
    */
-  del_model_record: {
+  delete_model: {
     parameters: {
       path: {
         /** @description Unique key of model to remove from model registry. */
@@ -11149,7 +11027,7 @@ export type operations = {
   };
   /**
    * Update Model Record
-   * @description Update model contents with a new config. If the model name or base fields are changed, then the model is renamed.
+   * @description Update a model's config.
    */
   update_model_record: {
     parameters: {
@@ -11167,19 +11045,19 @@ export type operations = {
          *   "base": "sd-1",
          *   "type": "main",
          *   "format": "checkpoint",
-         *   "config": "configs/stable-diffusion/v1-inference.yaml",
+         *   "config_path": "configs/stable-diffusion/v1-inference.yaml",
          *   "description": "Model description",
          *   "variant": "normal"
          * }
          */
-        "application/json": (components["schemas"]["MainDiffusersConfig"] | components["schemas"]["MainCheckpointConfig"]) | (components["schemas"]["VaeDiffusersConfig"] | components["schemas"]["VaeCheckpointConfig"]) | (components["schemas"]["ControlNetDiffusersConfig"] | components["schemas"]["ControlNetCheckpointConfig"]) | components["schemas"]["LoRAConfig"] | components["schemas"]["TextualInversionConfig"] | components["schemas"]["IPAdapterConfig"] | components["schemas"]["CLIPVisionDiffusersConfig"] | components["schemas"]["T2IConfig"];
+        "application/json": components["schemas"]["ModelRecordChanges"];
       };
     };
     responses: {
       /** @description The model was updated successfully */
       200: {
         content: {
-          "application/json": (components["schemas"]["MainDiffusersConfig"] | components["schemas"]["MainCheckpointConfig"]) | (components["schemas"]["VaeDiffusersConfig"] | components["schemas"]["VaeCheckpointConfig"]) | (components["schemas"]["ControlNetDiffusersConfig"] | components["schemas"]["ControlNetCheckpointConfig"]) | components["schemas"]["LoRAConfig"] | components["schemas"]["TextualInversionConfig"] | components["schemas"]["IPAdapterConfig"] | components["schemas"]["CLIPVisionDiffusersConfig"] | components["schemas"]["T2IConfig"];
+          "application/json": components["schemas"]["MainDiffusersConfig"] | components["schemas"]["MainCheckpointConfig"] | components["schemas"]["VAEDiffusersConfig"] | components["schemas"]["VAECheckpointConfig"] | components["schemas"]["ControlNetDiffusersConfig"] | components["schemas"]["ControlNetCheckpointConfig"] | components["schemas"]["LoRALyCORISConfig"] | components["schemas"]["LoRADiffusersConfig"] | components["schemas"]["TextualInversionFileConfig"] | components["schemas"]["TextualInversionFolderConfig"] | components["schemas"]["IPAdapterConfig"] | components["schemas"]["T2IAdapterConfig"] | components["schemas"]["CLIPVisionDiffusersConfig"];
         };
       };
       /** @description Bad request */
@@ -11202,121 +11080,6 @@ export type operations = {
       };
     };
   };
-  /**
-   * List Model Summary
-   * @description Gets a page of model summary data.
-   */
-  list_model_summary: {
-    parameters: {
-      query?: {
-        /** @description The page to get */
-        page?: number;
-        /** @description The number of models per page */
-        per_page?: number;
-        /** @description The attribute to order by */
-        order_by?: components["schemas"]["ModelRecordOrderBy"];
-      };
-    };
-    responses: {
-      /** @description Successful Response */
-      200: {
-        content: {
-          "application/json": components["schemas"]["PaginatedResults_ModelSummary_"];
-        };
-      };
-      /** @description Validation Error */
-      422: {
-        content: {
-          "application/json": components["schemas"]["HTTPValidationError"];
-        };
-      };
-    };
-  };
-  /**
-   * Get Model Metadata
-   * @description Get a model metadata object.
-   */
-  get_model_metadata: {
-    parameters: {
-      path: {
-        /** @description Key of the model repo metadata to fetch. */
-        key: string;
-      };
-    };
-    responses: {
-      /** @description The model metadata was retrieved successfully */
-      200: {
-        content: {
-          "application/json": (components["schemas"]["BaseMetadata"] | components["schemas"]["HuggingFaceMetadata"] | components["schemas"]["CivitaiMetadata"]) | null;
-        };
-      };
-      /** @description Bad request */
-      400: {
-        content: never;
-      };
-      /** @description Validation Error */
-      422: {
-        content: {
-          "application/json": components["schemas"]["HTTPValidationError"];
-        };
-      };
-    };
-  };
-  /**
-   * Update Model Metadata
-   * @description Updates or creates a model metadata object.
-   */
-  update_model_metadata: {
-    parameters: {
-      path: {
-        /** @description Key of the model repo metadata to fetch. */
-        key: string;
-      };
-    };
-    requestBody: {
-      content: {
-        "application/json": components["schemas"]["ModelMetadataChanges"];
-      };
-    };
-    responses: {
-      /** @description Successful Response */
-      200: {
-        content: {
-          "application/json": (components["schemas"]["BaseMetadata"] | components["schemas"]["HuggingFaceMetadata"] | components["schemas"]["CivitaiMetadata"]) | null;
-        };
-      };
-      /** @description The model metadata was updated successfully */
-      201: {
-        content: {
-          "application/json": unknown;
-        };
-      };
-      /** @description Bad request */
-      400: {
-        content: never;
-      };
-      /** @description Validation Error */
-      422: {
-        content: {
-          "application/json": components["schemas"]["HTTPValidationError"];
-        };
-      };
-    };
-  };
-  /**
-   * List Tags
-   * @description Get a unique set of all the model tags.
-   */
-  list_tags: {
-    responses: {
-      /** @description Successful Response */
-      200: {
-        content: {
-          "application/json": string[];
-        };
-      };
-    };
-  };
   /** Scan For Models */
   scan_for_models: {
     parameters: {
@@ -11345,72 +11108,31 @@ export type operations = {
     };
   };
   /**
-   * Search By Metadata Tags
-   * @description Get a list of models.
+   * List Model Installs
+   * @description Return the list of model install jobs.
+   *
+   * Install jobs have a numeric `id`, a `status`, and other fields that provide information on
+   * the nature of the job and its progress. The `status` is one of:
+   *
+   * * "waiting" -- Job is waiting in the queue to run
+   * * "downloading" -- Model file(s) are downloading
+   * * "running" -- Model has downloaded and the model probing and registration process is running
+   * * "completed" -- Installation completed successfully
+   * * "error" -- An error occurred. Details will be in the "error_type" and "error" fields.
+   * * "cancelled" -- Job was cancelled before completion.
+   *
+   * Once completed, information about the model such as its size, base
+   * model and type can be retrieved from the `config_out` field. For multi-file models such as diffusers,
+   * information on individual files can be retrieved from `download_parts`.
+   *
+   * See the example and schema below for more information.
    */
-  search_by_metadata_tags: {
-    parameters: {
-      query?: {
-        /** @description Tags to search for */
-        tags?: string[];
-      };
-    };
+  list_model_installs: {
     responses: {
       /** @description Successful Response */
       200: {
         content: {
-          "application/json": components["schemas"]["ModelsList"];
-        };
-      };
-      /** @description Validation Error */
-      422: {
-        content: {
-          "application/json": components["schemas"]["HTTPValidationError"];
-        };
-      };
-    };
-  };
-  /**
-   * Add Model Record
-   * @description Add a model using the configuration information appropriate for its type.
-   */
-  add_model_record: {
-    requestBody: {
-      content: {
-        /**
-         * @example {
-         *   "path": "/path/to/model",
-         *   "name": "model_name",
-         *   "base": "sd-1",
-         *   "type": "main",
-         *   "format": "checkpoint",
-         *   "config": "configs/stable-diffusion/v1-inference.yaml",
-         *   "description": "Model description",
-         *   "variant": "normal"
-         * }
-         */
-        "application/json": (components["schemas"]["MainDiffusersConfig"] | components["schemas"]["MainCheckpointConfig"]) | (components["schemas"]["VaeDiffusersConfig"] | components["schemas"]["VaeCheckpointConfig"]) | (components["schemas"]["ControlNetDiffusersConfig"] | components["schemas"]["ControlNetCheckpointConfig"]) | components["schemas"]["LoRAConfig"] | components["schemas"]["TextualInversionConfig"] | components["schemas"]["IPAdapterConfig"] | components["schemas"]["CLIPVisionDiffusersConfig"] | components["schemas"]["T2IConfig"];
-      };
-    };
-    responses: {
-      /** @description The model added successfully */
-      201: {
-        content: {
-          "application/json": (components["schemas"]["MainDiffusersConfig"] | components["schemas"]["MainCheckpointConfig"]) | (components["schemas"]["VaeDiffusersConfig"] | components["schemas"]["VaeCheckpointConfig"]) | (components["schemas"]["ControlNetDiffusersConfig"] | components["schemas"]["ControlNetCheckpointConfig"]) | components["schemas"]["LoRAConfig"] | components["schemas"]["TextualInversionConfig"] | components["schemas"]["IPAdapterConfig"] | components["schemas"]["CLIPVisionDiffusersConfig"] | components["schemas"]["T2IConfig"];
-        };
-      };
-      /** @description There is already a model corresponding to this path or repo_id */
-      409: {
-        content: never;
-      };
-      /** @description Unrecognized file/folder format */
-      415: {
-        content: never;
-      };
-      /** @description Validation Error */
-      422: {
-        content: {
-          "application/json": components["schemas"]["HTTPValidationError"];
+          "application/json": components["schemas"]["ModelInstallJob"][];
         };
       };
     };
@@ -11448,6 +11170,8 @@ export type operations = {
       query: {
         /** @description Model source to install, can be a local path, repo_id, or remote URL */
         source: string;
+        /** @description Whether or not to install a local model in place */
+        inplace?: boolean | null;
         access_token?: string | null;
       };
     };
@@ -11489,37 +11213,6 @@ export type operations = {
       };
     };
   };
-  /**
-   * List Model Install Jobs
-   * @description Return the list of model install jobs.
-   *
-   * Install jobs have a numeric `id`, a `status`, and other fields that provide information on
-   * the nature of the job and its progress. The `status` is one of:
-   *
-   * * "waiting" -- Job is waiting in the queue to run
-   * * "downloading" -- Model file(s) are downloading
-   * * "running" -- Model has downloaded and the model probing and registration process is running
-   * * "completed" -- Installation completed successfully
-   * * "error" -- An error occurred. Details will be in the "error_type" and "error" fields.
-   * * "cancelled" -- Job was cancelled before completion.
-   *
-   * Once completed, information about the model such as its size, base
-   * model, type, and metadata can be retrieved from the `config_out`
-   * field. For multi-file models such as diffusers, information on individual files
-   * can be retrieved from `download_parts`.
-   *
-   * See the example and schema below for more information.
-   */
-  list_model_install_jobs: {
-    responses: {
-      /** @description Successful Response */
-      200: {
-        content: {
-          "application/json": components["schemas"]["ModelInstallJob"][];
-        };
-      };
-    };
-  };
   /**
    * Prune Model Install Jobs
    * @description Prune all completed and errored jobs from the install job list.
@@ -11645,54 +11338,7 @@ export type operations = {
       /** @description Model converted successfully */
       200: {
         content: {
-          "application/json": (components["schemas"]["MainDiffusersConfig"] | components["schemas"]["MainCheckpointConfig"]) | (components["schemas"]["VaeDiffusersConfig"] | components["schemas"]["VaeCheckpointConfig"]) | (components["schemas"]["ControlNetDiffusersConfig"] | components["schemas"]["ControlNetCheckpointConfig"]) | components["schemas"]["LoRAConfig"] | components["schemas"]["TextualInversionConfig"] | components["schemas"]["IPAdapterConfig"] | components["schemas"]["CLIPVisionDiffusersConfig"] | components["schemas"]["T2IConfig"];
-        };
-      };
-      /** @description Bad request */
-      400: {
-        content: never;
-      };
-      /** @description Model not found */
-      404: {
-        content: never;
-      };
-      /** @description There is already a model registered at this location */
-      409: {
-        content: never;
-      };
-      /** @description Validation Error */
-      422: {
-        content: {
-          "application/json": components["schemas"]["HTTPValidationError"];
-        };
-      };
-    };
-  };
-  /**
-   * Merge
-   * @description Merge diffusers models. The process is controlled by a set parameters provided in the body of the request.
-   * ```
-   * Argument                Description [default]
-   * --------               ----------------------
-   * keys                   List of 2-3 model keys to merge together. All models must use the same base type.
-   * merged_model_name      Name for the merged model [Concat model names]
-   * alpha                  Alpha value (0.0-1.0). Higher values give more weight to the second model [0.5]
-   * force                  If true, force the merge even if the models were generated by different versions of the diffusers library [False]
-   * interp                 Interpolation method. One of "weighted_sum", "sigmoid", "inv_sigmoid" or "add_difference" [weighted_sum]
-   * merge_dest_directory   Specify a directory to store the merged model in [models directory]
-   * ```
-   */
-  merge: {
-    requestBody: {
-      content: {
-        "application/json": components["schemas"]["Body_merge"];
-      };
-    };
-    responses: {
-      /** @description Model converted successfully */
-      200: {
-        content: {
-          "application/json": (components["schemas"]["MainDiffusersConfig"] | components["schemas"]["MainCheckpointConfig"]) | (components["schemas"]["VaeDiffusersConfig"] | components["schemas"]["VaeCheckpointConfig"]) | (components["schemas"]["ControlNetDiffusersConfig"] | components["schemas"]["ControlNetCheckpointConfig"]) | components["schemas"]["LoRAConfig"] | components["schemas"]["TextualInversionConfig"] | components["schemas"]["IPAdapterConfig"] | components["schemas"]["CLIPVisionDiffusersConfig"] | components["schemas"]["T2IConfig"];
+          "application/json": components["schemas"]["MainDiffusersConfig"] | components["schemas"]["MainCheckpointConfig"] | components["schemas"]["VAEDiffusersConfig"] | components["schemas"]["VAECheckpointConfig"] | components["schemas"]["ControlNetDiffusersConfig"] | components["schemas"]["ControlNetCheckpointConfig"] | components["schemas"]["LoRALyCORISConfig"] | components["schemas"]["LoRADiffusersConfig"] | components["schemas"]["TextualInversionFileConfig"] | components["schemas"]["TextualInversionFolderConfig"] | components["schemas"]["IPAdapterConfig"] | components["schemas"]["T2IAdapterConfig"] | components["schemas"]["CLIPVisionDiffusersConfig"];
         };
       };
       /** @description Bad request */
diff --git a/invokeai/frontend/web/src/services/api/types.ts b/invokeai/frontend/web/src/services/api/types.ts
index e28c8bdae6..3adc140383 100644
--- a/invokeai/frontend/web/src/services/api/types.ts
+++ b/invokeai/frontend/web/src/services/api/types.ts
@@ -43,14 +43,13 @@ export type ControlField = S['ControlField'];
 // Model Configs
 
 // TODO(MM2): Can we make key required in the pydantic model?
-export type LoRAModelConfig = S['LoRAConfig'];
+export type LoRAModelConfig = S['LoRADiffusersConfig'] | S['LoRALyCORISConfig'];
 // TODO(MM2): Can we rename this from Vae -> VAE
-export type VAEModelConfig = S['VaeCheckpointConfig'] | S['VaeDiffusersConfig'];
+export type VAEModelConfig = S['VAECheckpointConfig'] | S['VAEDiffusersConfig'];
 export type ControlNetModelConfig = S['ControlNetDiffusersConfig'] | S['ControlNetCheckpointConfig'];
 export type IPAdapterModelConfig = S['IPAdapterConfig'];
-// TODO(MM2): Can we rename this to T2IAdapterConfig
-export type T2IAdapterModelConfig = S['T2IConfig'];
-export type TextualInversionModelConfig = S['TextualInversionConfig'];
+export type T2IAdapterModelConfig = S['T2IAdapterConfig'];
+export type TextualInversionModelConfig = S['TextualInversionFileConfig'] | S['TextualInversionFolderConfig'];
 export type DiffusersModelConfig = S['MainDiffusersConfig'];
 export type CheckpointModelConfig = S['MainCheckpointConfig'];
 type CLIPVisionDiffusersConfig = S['CLIPVisionDiffusersConfig'];