From ee83791596355acf4cd1b7ff3b5d34fb77808455 Mon Sep 17 00:00:00 2001
From: "Timothy J. Baek" <timothyjrbeck@gmail.com>
Date: Sun, 24 Dec 2023 00:40:59 -0800
Subject: [PATCH] feat: return file_name for model name

---
 backend/apps/web/routers/utils.py            | 13 +++++++------
 src/lib/components/chat/SettingsModal.svelte |  3 +++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/backend/apps/web/routers/utils.py b/backend/apps/web/routers/utils.py
index d8b876c9e..e9986bab4 100644
--- a/backend/apps/web/routers/utils.py
+++ b/backend/apps/web/routers/utils.py
@@ -42,7 +42,7 @@ def parse_huggingface_url(hf_url):
         return None
 
 
-async def download_file_stream(url, file_path, chunk_size=1024 * 1024):
+async def download_file_stream(url, file_path, file_name, chunk_size=1024 * 1024):
     done = False
 
     if os.path.exists(file_path):
@@ -79,7 +79,7 @@ async def download_file_stream(url, file_path, chunk_size=1024 * 1024):
                         res = {
                             "done": done,
                             "blob": f"sha256:{hashed}",
-                            "name": file.name,
+                            "name": file_name,
                         }
                         os.remove(file_path)
 
@@ -93,14 +93,15 @@ async def download(
     url: str,
 ):
     # url = "https://huggingface.co/TheBloke/stablelm-zephyr-3b-GGUF/resolve/main/stablelm-zephyr-3b.Q2_K.gguf"
-    model_file = parse_huggingface_url(url)
+    file_name = parse_huggingface_url(url)
 
-    if model_file:
+    if file_name:
         os.makedirs("./uploads", exist_ok=True)
-        file_path = os.path.join("./uploads", f"{model_file}")
+        file_path = os.path.join("./uploads", f"{file_name}")
 
         return StreamingResponse(
-            download_file_stream(url, file_path), media_type="text/event-stream"
+            download_file_stream(url, file_path, file_name),
+            media_type="text/event-stream",
         )
     else:
         return None
diff --git a/src/lib/components/chat/SettingsModal.svelte b/src/lib/components/chat/SettingsModal.svelte
index ea8f2cde1..493be1a94 100644
--- a/src/lib/components/chat/SettingsModal.svelte
+++ b/src/lib/components/chat/SettingsModal.svelte
@@ -276,6 +276,7 @@
 
 	const uploadModelHandler = async () => {
 		modelTransferring = true;
+		uploadProgress = 0;
 		let uploaded = false;
 		let fileResponse = null;
 		let name = '';
@@ -422,6 +423,8 @@
 		modelFileUrl = '';
 		modelInputFile = '';
 		modelTransferring = false;
+		uploadProgress = null;
+
 		models.set(await getModels());
 	};