26 - Adding final changes before merging with dev

Signed-off-by: julianbollig <[email protected]>
TNG · Nov 26, 2024 · 8ad22a0 · 8ad22a0
1 parent d12a89f
commit 8ad22a0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 23 deletions.
diff --git a/WebUI/src/components/AddLLMDialog.vue b/WebUI/src/components/AddLLMDialog.vue
@@ -18,7 +18,7 @@
 <script setup lang="ts">
 import { useGlobalSetup } from '@/assets/js/store/globalSetup';
 import { useI18N } from '@/assets/js/store/i18n';
-import { useModels, userModels , ModelType} from '@/assets/js/store/models';
+import { useModels, userModels } from '@/assets/js/store/models';
 
 
 const i18nState = useI18N().state;
@@ -62,9 +62,15 @@ async function addModel() {
       addModelError.value = false
       const is_llm = await isLLM(modelRequest.value);
       if (!is_llm) {
-        emits("showWarning", i18nState.WARNING_MODEL_TYPE_WRONG, () => {performDownload()});
+        emits("showWarning", i18nState.WARNING_MODEL_TYPE_WRONG, async() => {
+          await registerModel();
+          emits("callCheckModel");
+          closeAdd();
+        });
       } else {
-        await performDownload()
+        await registerModel()
+        emits("callCheckModel");
+        closeAdd();
       }
     } else {
         globalSetup.modelSettings.llm_model = previousModel
@@ -78,16 +84,14 @@ async function addModel() {
   }
 }
 
-async function performDownload() {
+async function registerModel() {
   userModels.push({name: modelRequest.value, type: 'llm', downloaded: false})
   await models.refreshModels()
   globalSetup.modelSettings.llm_model = modelRequest.value;
-  emits("callCheckModel");
-  closeAdd()
 }
 
 async function urlExists(repo_id: string) {
-  const response = await fetch(`${globalSetup.apiHost}/api/checkURLExists?repo_id=${repo_id}`)
+  const response = await fetch(`${globalSetup.apiHost}/api/checkHFRepoExists?repo_id=${repo_id}`)
   const data = await response.json()
   return data.exists;
 }
@@ -99,17 +103,12 @@ async function isLLM(repo_id: string) {
 }
 
 function closeAdd() {
+  addModelErrorMessage.value = "";
   addModelError.value = false;
   modelRequest.value = "";
   emits("close");
 }
 
 defineExpose({ onShow });
 
-</script>
-<style scoped>
-table {
-    border-collapse: separate;
-    border-spacing: 10px;
-}
-</style>
+</script>
diff --git a/WebUI/src/components/WarningDialog.vue b/WebUI/src/components/WarningDialog.vue
@@ -38,10 +38,4 @@ function onShow(){
 
 defineExpose({warningMessage, confirmFunction, onShow });
 
-</script>
-<style scoped>
-table {
-    border-collapse: separate;
-    border-spacing: 10px;
-}
-</style>
+</script>
diff --git a/service/web_api.py b/service/web_api.py
@@ -195,8 +195,8 @@ def check_model_exist():
     return jsonify({"code": 0, "message": "success", "exists": result_list})
 
 
-@app.route("/api/checkURLExists", methods=["GET"])
-def check_url_exists():
+@app.route("/api/checkHFRepoExists", methods=["GET"])
+def check_if_huggingface_repo_exists():
     repo_id = request.args.get('repo_id')
     downloader = HFPlaygroundDownloader()
     exists = downloader.hf_url_exists(repo_id)