From 995fbc78c8c44a3312e46b45f009f1ceed57b11b Mon Sep 17 00:00:00 2001
From: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com>
Date: Fri, 27 Jan 2023 12:44:12 +1300
Subject: [PATCH] Diffusers Model Manager Fixes

---
 frontend/public/locales/modelmanager/en.json  |  2 +-
 .../ModelManager/AddDiffusersModel.tsx        | 15 ++++-----------
 .../ModelManager/DiffusersModelEdit.tsx       | 19 +++++++++++++++++--
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/frontend/public/locales/modelmanager/en.json b/frontend/public/locales/modelmanager/en.json
index c5c5eda054..ad320d0969 100644
--- a/frontend/public/locales/modelmanager/en.json
+++ b/frontend/public/locales/modelmanager/en.json
@@ -22,7 +22,7 @@
   "config": "Config",
   "configValidationMsg": "Path to the config file of your model.",
   "modelLocation": "Model Location",
-  "modelLocationValidationMsg": "Path to where your model is located.",
+  "modelLocationValidationMsg": "Path to where your model is located locally.",
   "repo_id": "Repo ID",
   "repoIDValidationMsg": "Online repository of your model",
   "vaeLocation": "VAE Location",
diff --git a/frontend/src/features/system/components/ModelManager/AddDiffusersModel.tsx b/frontend/src/features/system/components/ModelManager/AddDiffusersModel.tsx
index 91ebaf8715..2afb80c046 100644
--- a/frontend/src/features/system/components/ModelManager/AddDiffusersModel.tsx
+++ b/frontend/src/features/system/components/ModelManager/AddDiffusersModel.tsx
@@ -77,17 +77,10 @@ export default function AddDiffusersModel() {
   ) => {
     const diffusersModelToAdd = values;
 
-    if (values.path === '') diffusersModelToAdd['path'] = undefined;
-    if (values.repo_id === '') diffusersModelToAdd['repo_id'] = undefined;
-    if (values.vae.path === '') {
-      if (values.path === undefined) {
-        diffusersModelToAdd['vae']['path'] = undefined;
-      } else {
-        diffusersModelToAdd['vae']['path'] = values.path + '/vae';
-      }
-    }
-    if (values.vae.repo_id === '')
-      diffusersModelToAdd['vae']['repo_id'] = undefined;
+    if (values.path === '') delete diffusersModelToAdd.path;
+    if (values.repo_id === '') delete diffusersModelToAdd.repo_id;
+    if (values.vae.path === '') delete diffusersModelToAdd.vae.path;
+    if (values.vae.repo_id === '') delete diffusersModelToAdd.vae.repo_id;
 
     dispatch(addNewModel(diffusersModelToAdd));
     dispatch(setAddNewModelUIOption(null));
diff --git a/frontend/src/features/system/components/ModelManager/DiffusersModelEdit.tsx b/frontend/src/features/system/components/ModelManager/DiffusersModelEdit.tsx
index 3989815691..1ece901972 100644
--- a/frontend/src/features/system/components/ModelManager/DiffusersModelEdit.tsx
+++ b/frontend/src/features/system/components/ModelManager/DiffusersModelEdit.tsx
@@ -72,8 +72,16 @@ export default function DiffusersModelEdit() {
       setEditModelFormValues({
         name: openModel,
         description: retrievedModel[openModel]?.description,
-        path: retrievedModel[openModel]?.path,
-        repo_id: retrievedModel[openModel]?.repo_id,
+        path:
+          retrievedModel[openModel]?.path &&
+          retrievedModel[openModel]?.path !== 'None'
+            ? retrievedModel[openModel]?.path
+            : '',
+        repo_id:
+          retrievedModel[openModel]?.repo_id &&
+          retrievedModel[openModel]?.repo_id !== 'None'
+            ? retrievedModel[openModel]?.repo_id
+            : '',
         vae: {
           repo_id: retrievedModel[openModel]?.vae?.repo_id
             ? retrievedModel[openModel]?.vae?.repo_id
@@ -91,6 +99,13 @@ export default function DiffusersModelEdit() {
   const editModelFormSubmitHandler = (
     values: InvokeDiffusersModelConfigProps
   ) => {
+    const diffusersModelToEdit = values;
+
+    if (values.path === '') delete diffusersModelToEdit.path;
+    if (values.repo_id === '') delete diffusersModelToEdit.repo_id;
+    if (values.vae.path === '') delete diffusersModelToEdit.vae.path;
+    if (values.vae.repo_id === '') delete diffusersModelToEdit.vae.repo_id;
+
     dispatch(addNewModel(values));
   };