From e539cf5c28c25e81efebd16c511ebaa1d9a78a73 Mon Sep 17 00:00:00 2001
From: "Timothy J. Baek" <timothyjrbeck@gmail.com>
Date: Sat, 23 Dec 2023 15:38:52 -0800
Subject: [PATCH 1/9] feat: gguf upload

---
 backend/.gitignore                           |   4 +-
 backend/apps/web/main.py                     |   3 +-
 backend/apps/web/routers/utils.py            |  78 ++++
 backend/utils/misc.py                        |   8 +
 src/lib/components/chat/SettingsModal.svelte | 457 +++++++++++++++----
 src/lib/constants.ts                         |   3 +-
 6 files changed, 457 insertions(+), 96 deletions(-)
 create mode 100644 backend/apps/web/routers/utils.py

diff --git a/backend/.gitignore b/backend/.gitignore
index 6d178708..bbb8ba18 100644
--- a/backend/.gitignore
+++ b/backend/.gitignore
@@ -1,2 +1,4 @@
 __pycache__
-.env
\ No newline at end of file
+.env
+_old
+uploads
\ No newline at end of file
diff --git a/backend/apps/web/main.py b/backend/apps/web/main.py
index 0380f0c3..854f1626 100644
--- a/backend/apps/web/main.py
+++ b/backend/apps/web/main.py
@@ -1,7 +1,7 @@
 from fastapi import FastAPI, Request, Depends, HTTPException
 from fastapi.middleware.cors import CORSMiddleware
 
-from apps.web.routers import auths, users
+from apps.web.routers import auths, users, utils
 from config import WEBUI_VERSION, WEBUI_AUTH
 
 app = FastAPI()
@@ -19,6 +19,7 @@ app.add_middleware(
 
 app.include_router(auths.router, prefix="/auths", tags=["auths"])
 app.include_router(users.router, prefix="/users", tags=["users"])
+app.include_router(utils.router, prefix="/utils", tags=["utils"])
 
 
 @app.get("/")
diff --git a/backend/apps/web/routers/utils.py b/backend/apps/web/routers/utils.py
new file mode 100644
index 00000000..8c822f02
--- /dev/null
+++ b/backend/apps/web/routers/utils.py
@@ -0,0 +1,78 @@
+from fastapi import APIRouter, UploadFile, File, BackgroundTasks
+from fastapi import Depends, HTTPException, status
+from starlette.responses import StreamingResponse
+
+from pydantic import BaseModel
+
+from utils.misc import calculate_sha256
+import requests
+
+
+import os
+import asyncio
+import json
+from config import OLLAMA_API_BASE_URL
+
+
+router = APIRouter()
+
+
+class UploadBlobForm(BaseModel):
+    filename: str
+
+
+@router.post("/upload")
+async def upload(file: UploadFile = File(...)):
+    os.makedirs("./uploads", exist_ok=True)
+    file_path = os.path.join("./uploads", file.filename)
+
+    def file_write_stream():
+        total = 0
+        total_size = file.size
+        chunk_size = 1024 * 1024
+
+        done = False
+        try:
+            with open(file_path, "wb") as f:
+                while True:
+                    chunk = file.file.read(chunk_size)
+                    if not chunk:
+                        break
+                    f.write(chunk)
+                    total += len(chunk)
+                    done = total_size == total
+
+                    res = {
+                        "total": total_size,
+                        "uploaded": total,
+                    }
+
+                    yield f"data: {json.dumps(res)}\n\n"
+
+                if done:
+                    with open(file_path, "rb") as f:
+                        hashed = calculate_sha256(f)
+
+                        f.seek(0)
+                        file_data = f.read()
+
+                        url = f"{OLLAMA_API_BASE_URL}/blobs/sha256:{hashed}"
+
+                        response = requests.post(url, data=file_data)
+
+                        if response.ok:
+                            res = {
+                                "done": done,
+                                "blob": f"sha256:{hashed}",
+                            }
+                            os.remove(file_path)
+
+                            yield f"data: {json.dumps(res)}\n\n"
+                        else:
+                            raise "Ollama: Could not create blob, Please try again."
+
+        except Exception as e:
+            res = {"error": str(e)}
+            yield f"data: {json.dumps(res)}\n\n"
+
+    return StreamingResponse(file_write_stream(), media_type="text/event-stream")
diff --git a/backend/utils/misc.py b/backend/utils/misc.py
index e4011b34..c6508487 100644
--- a/backend/utils/misc.py
+++ b/backend/utils/misc.py
@@ -13,3 +13,11 @@ def get_gravatar_url(email):
 
     # Grab the actual image URL
     return f"https://www.gravatar.com/avatar/{hash_hex}?d=mp"
+
+
+def calculate_sha256(file):
+    sha256 = hashlib.sha256()
+    # Read the file in chunks to efficiently handle large files
+    for chunk in iter(lambda: file.read(8192), b""):
+        sha256.update(chunk)
+    return sha256.hexdigest()
diff --git a/src/lib/components/chat/SettingsModal.svelte b/src/lib/components/chat/SettingsModal.svelte
index 5d4334c4..a17c955d 100644
--- a/src/lib/components/chat/SettingsModal.svelte
+++ b/src/lib/components/chat/SettingsModal.svelte
@@ -1,12 +1,18 @@
 <script lang="ts">
 	import Modal from '../common/Modal.svelte';
 
-	import { WEB_UI_VERSION, OLLAMA_API_BASE_URL } from '$lib/constants';
+	import {
+		WEB_UI_VERSION,
+		OLLAMA_API_BASE_URL,
+		WEBUI_API_BASE_URL,
+		WEBUI_BASE_URL
+	} from '$lib/constants';
 	import toast from 'svelte-french-toast';
 	import { onMount } from 'svelte';
 	import { config, info, models, settings, user } from '$lib/stores';
 	import { splitStream, getGravatarURL } from '$lib/utils';
 	import Advanced from './Settings/Advanced.svelte';
+	import { stringify } from 'postcss';
 
 	export let show = false;
 
@@ -45,6 +51,10 @@
 
 	// Models
 	let modelTag = '';
+	let modelInputFile = '';
+	let modelInputFileBlob = '';
+	let modelFileContent = `TEMPLATE """{{ .System }}\nUSER: {{ .Prompt }}\nASSSISTANT: """\nPARAMETER num_ctx 4096\nPARAMETER stop "</s>"\nPARAMETER stop "USER:"\nPARAMETER stop "ASSSISTANT:"`;
+
 	let deleteModelTag = '';
 	let digest = '';
 	let pullProgress = null;
@@ -220,6 +230,170 @@
 		models.set(await getModels());
 	};
 
+	const calculateSHA256 = async (file) => {
+		console.log(file);
+		// Create a FileReader to read the file asynchronously
+		const reader = new FileReader();
+
+		// Define a promise to handle the file reading
+		const readFile = new Promise((resolve, reject) => {
+			reader.onload = () => resolve(reader.result);
+			reader.onerror = reject;
+		});
+
+		// Read the file as an ArrayBuffer
+		reader.readAsArrayBuffer(file);
+
+		try {
+			// Wait for the FileReader to finish reading the file
+			const buffer = await readFile;
+
+			// Convert the ArrayBuffer to a Uint8Array
+			const uint8Array = new Uint8Array(buffer);
+
+			// Calculate the SHA-256 hash using Web Crypto API
+			const hashBuffer = await crypto.subtle.digest('SHA-256', uint8Array);
+
+			// Convert the hash to a hexadecimal string
+			const hashArray = Array.from(new Uint8Array(hashBuffer));
+			const hashHex = hashArray.map((byte) => byte.toString(16).padStart(2, '0')).join('');
+
+			return `sha256:${hashHex}`;
+		} catch (error) {
+			console.error('Error calculating SHA-256 hash:', error);
+			throw error;
+		}
+	};
+
+	const uploadModelHandler = async () => {
+		const file = modelInputFile[0];
+		const formData = new FormData();
+		formData.append('file', file);
+
+		let uploaded = false;
+
+		const res = await fetch(`${WEBUI_API_BASE_URL}/utils/upload`, {
+			method: 'POST',
+			headers: {
+				...($settings.authHeader && { Authorization: $settings.authHeader }),
+				...($user && { Authorization: `Bearer ${localStorage.token}` })
+			},
+			body: formData
+		}).catch((error) => {
+			console.log(error);
+			return null;
+		});
+
+		if (res && res.ok) {
+			const reader = res.body
+				.pipeThrough(new TextDecoderStream())
+				.pipeThrough(splitStream('\n'))
+				.getReader();
+
+			while (true) {
+				const { value, done } = await reader.read();
+				if (done) break;
+
+				try {
+					let lines = value.split('\n');
+
+					for (const line of lines) {
+						if (line !== '') {
+							let data = JSON.parse(line.replace(/^data: /, ''));
+							console.log(data);
+
+							if (data.error) {
+								throw data.error;
+							}
+
+							if (data.done) {
+								modelInputFileBlob = data.blob;
+								uploaded = true;
+							}
+						}
+					}
+				} catch (error) {
+					console.log(error);
+				}
+			}
+		}
+
+		if (uploaded) {
+			const res = await fetch(`${$settings?.API_BASE_URL ?? OLLAMA_API_BASE_URL}/create`, {
+				method: 'POST',
+				headers: {
+					'Content-Type': 'text/event-stream',
+					...($settings.authHeader && { Authorization: $settings.authHeader }),
+					...($user && { Authorization: `Bearer ${localStorage.token}` })
+				},
+				body: JSON.stringify({
+					name: `${file.name}:latest`,
+					modelfile: `FROM @${modelInputFileBlob}\n${modelFileContent}`
+				})
+			}).catch((err) => {
+				console.log(err);
+				return null;
+			});
+
+			if (res && res.ok) {
+				const reader = res.body
+					.pipeThrough(new TextDecoderStream())
+					.pipeThrough(splitStream('\n'))
+					.getReader();
+
+				while (true) {
+					const { value, done } = await reader.read();
+					if (done) break;
+
+					try {
+						let lines = value.split('\n');
+
+						for (const line of lines) {
+							if (line !== '') {
+								console.log(line);
+								let data = JSON.parse(line);
+								console.log(data);
+
+								if (data.error) {
+									throw data.error;
+								}
+								if (data.detail) {
+									throw data.detail;
+								}
+
+								if (data.status) {
+									if (
+										!data.digest &&
+										!data.status.includes('writing') &&
+										!data.status.includes('sha256')
+									) {
+										toast.success(data.status);
+									} else {
+										if (data.digest) {
+											digest = data.digest;
+
+											if (data.completed) {
+												pullProgress = Math.round((data.completed / data.total) * 1000) / 10;
+											} else {
+												pullProgress = 100;
+											}
+										}
+									}
+								}
+							}
+						}
+					} catch (error) {
+						console.log(error);
+						toast.error(error);
+					}
+				}
+			}
+		}
+
+		modelTag = '';
+		models.set(await getModels());
+	};
+
 	const deleteModelHandler = async () => {
 		const res = await fetch(`${API_BASE_URL}/delete`, {
 			method: 'DELETE',
@@ -790,104 +964,201 @@
 						</div>
 					</div>
 				{:else if selectedTab === 'models'}
-					<div class="flex flex-col space-y-3 text-sm mb-10">
-						<div>
-							<div class=" mb-2.5 text-sm font-medium">Pull a model</div>
-							<div class="flex w-full">
-								<div class="flex-1 mr-2">
-									<input
-										class="w-full rounded py-2 px-4 text-sm dark:text-gray-300 dark:bg-gray-800 outline-none"
-										placeholder="Enter model tag (e.g. mistral:7b)"
-										bind:value={modelTag}
-									/>
-								</div>
-								<button
-									class="px-3 text-gray-100 bg-emerald-600 hover:bg-emerald-700 rounded transition"
-									on:click={() => {
-										pullModelHandler();
-									}}
-								>
-									<svg
-										xmlns="http://www.w3.org/2000/svg"
-										viewBox="0 0 20 20"
-										fill="currentColor"
-										class="w-4 h-4"
+					<div class="flex flex-col h-full justify-between text-sm">
+						<div class=" space-y-3 pr-1.5 overflow-y-scroll h-80">
+							<div>
+								<div class=" mb-2.5 text-sm font-medium">Pull a model from Ollama.ai</div>
+								<div class="flex w-full">
+									<div class="flex-1 mr-2">
+										<input
+											class="w-full rounded py-2 px-4 text-sm dark:text-gray-300 dark:bg-gray-800 outline-none"
+											placeholder="Enter model tag (e.g. mistral:7b)"
+											bind:value={modelTag}
+										/>
+									</div>
+									<button
+										class="px-3 text-gray-100 bg-emerald-600 hover:bg-emerald-700 rounded transition"
+										on:click={() => {
+											pullModelHandler();
+										}}
 									>
-										<path
-											d="M10.75 2.75a.75.75 0 00-1.5 0v8.614L6.295 8.235a.75.75 0 10-1.09 1.03l4.25 4.5a.75.75 0 001.09 0l4.25-4.5a.75.75 0 00-1.09-1.03l-2.955 3.129V2.75z"
-										/>
-										<path
-											d="M3.5 12.75a.75.75 0 00-1.5 0v2.5A2.75 2.75 0 004.75 18h10.5A2.75 2.75 0 0018 15.25v-2.5a.75.75 0 00-1.5 0v2.5c0 .69-.56 1.25-1.25 1.25H4.75c-.69 0-1.25-.56-1.25-1.25v-2.5z"
-										/>
-									</svg>
-								</button>
-							</div>
-
-							<div class="mt-2 text-xs text-gray-400 dark:text-gray-500">
-								To access the available model names for downloading, <a
-									class=" text-gray-500 dark:text-gray-300 font-medium"
-									href="https://ollama.ai/library"
-									target="_blank">click here.</a
-								>
-							</div>
-
-							{#if pullProgress !== null}
-								<div class="mt-2">
-									<div class=" mb-2 text-xs">Pull Progress</div>
-									<div class="w-full rounded-full dark:bg-gray-800">
-										<div
-											class="dark:bg-gray-600 text-xs font-medium text-blue-100 text-center p-0.5 leading-none rounded-full"
-											style="width: {Math.max(15, pullProgress ?? 0)}%"
+										<svg
+											xmlns="http://www.w3.org/2000/svg"
+											viewBox="0 0 16 16"
+											fill="currentColor"
+											class="w-4 h-4"
 										>
-											{pullProgress ?? 0}%
+											<path
+												d="M8.75 2.75a.75.75 0 0 0-1.5 0v5.69L5.03 6.22a.75.75 0 0 0-1.06 1.06l3.5 3.5a.75.75 0 0 0 1.06 0l3.5-3.5a.75.75 0 0 0-1.06-1.06L8.75 8.44V2.75Z"
+											/>
+											<path
+												d="M3.5 9.75a.75.75 0 0 0-1.5 0v1.5A2.75 2.75 0 0 0 4.75 14h6.5A2.75 2.75 0 0 0 14 11.25v-1.5a.75.75 0 0 0-1.5 0v1.5c0 .69-.56 1.25-1.25 1.25h-6.5c-.69 0-1.25-.56-1.25-1.25v-1.5Z"
+											/>
+										</svg>
+									</button>
+								</div>
+
+								<div class="mt-2 text-xs text-gray-400 dark:text-gray-500">
+									To access the available model names for downloading, <a
+										class=" text-gray-500 dark:text-gray-300 font-medium"
+										href="https://ollama.ai/library"
+										target="_blank">click here.</a
+									>
+								</div>
+
+								{#if pullProgress !== null}
+									<div class="mt-2">
+										<div class=" mb-2 text-xs">Pull Progress</div>
+										<div class="w-full rounded-full dark:bg-gray-800">
+											<div
+												class="dark:bg-gray-600 text-xs font-medium text-blue-100 text-center p-0.5 leading-none rounded-full"
+												style="width: {Math.max(15, pullProgress ?? 0)}%"
+											>
+												{pullProgress ?? 0}%
+											</div>
+										</div>
+										<div class="mt-1 text-xs dark:text-gray-500" style="font-size: 0.5rem;">
+											{digest}
 										</div>
 									</div>
-									<div class="mt-1 text-xs dark:text-gray-500" style="font-size: 0.5rem;">
-										{digest}
-									</div>
-								</div>
-							{/if}
-						</div>
-						<hr class=" dark:border-gray-700" />
+								{/if}
+							</div>
+							<hr class=" dark:border-gray-700" />
 
-						<div>
-							<div class=" mb-2.5 text-sm font-medium">Delete a model</div>
-							<div class="flex w-full">
-								<div class="flex-1 mr-2">
-									<select
-										class="w-full rounded py-2 px-4 text-sm dark:text-gray-300 dark:bg-gray-800 outline-none"
-										bind:value={deleteModelTag}
-										placeholder="Select a model"
-									>
-										{#if !deleteModelTag}
-											<option value="" disabled selected>Select a model</option>
-										{/if}
-										{#each $models.filter((m) => m.size != null) as model}
-											<option value={model.name} class="bg-gray-100 dark:bg-gray-700"
-												>{model.name + ' (' + (model.size / 1024 ** 3).toFixed(1) + ' GB)'}</option
-											>
-										{/each}
-									</select>
-								</div>
-								<button
-									class="px-3 bg-red-700 hover:bg-red-800 text-gray-100 rounded transition"
-									on:click={() => {
-										deleteModelHandler();
-									}}
-								>
-									<svg
-										xmlns="http://www.w3.org/2000/svg"
-										viewBox="0 0 20 20"
-										fill="currentColor"
-										class="w-4 h-4"
-									>
-										<path
-											fill-rule="evenodd"
-											d="M8.75 1A2.75 2.75 0 006 3.75v.443c-.795.077-1.584.176-2.365.298a.75.75 0 10.23 1.482l.149-.022.841 10.518A2.75 2.75 0 007.596 19h4.807a2.75 2.75 0 002.742-2.53l.841-10.52.149.023a.75.75 0 00.23-1.482A41.03 41.03 0 0014 4.193V3.75A2.75 2.75 0 0011.25 1h-2.5zM10 4c.84 0 1.673.025 2.5.075V3.75c0-.69-.56-1.25-1.25-1.25h-2.5c-.69 0-1.25.56-1.25 1.25v.325C8.327 4.025 9.16 4 10 4zM8.58 7.72a.75.75 0 00-1.5.06l.3 7.5a.75.75 0 101.5-.06l-.3-7.5zm4.34.06a.75.75 0 10-1.5-.06l-.3 7.5a.75.75 0 101.5.06l.3-7.5z"
-											clip-rule="evenodd"
+							<div>
+								<div class=" mb-2.5 text-sm font-medium">Upload a GGUF model</div>
+								<div class="flex w-full mb-1.5">
+									<div class="flex-1 {modelInputFile && modelInputFile.length > 0 ? 'mr-2' : ''}">
+										<input
+											id="model-upload-input"
+											type="file"
+											bind:files={modelInputFile}
+											on:change={() => {
+												console.log(modelInputFile);
+											}}
+											hidden
 										/>
-									</svg>
-								</button>
+
+										<button
+											type="button"
+											class="w-full rounded text-left py-2 px-4 dark:text-gray-300 dark:bg-gray-800"
+											on:click={() => {
+												document.getElementById('model-upload-input').click();
+											}}
+										>
+											{#if modelInputFile && modelInputFile.length > 0}
+												{modelInputFile[0].name}
+											{:else}
+												Click here to select
+											{/if}
+										</button>
+									</div>
+
+									{#if modelInputFile && modelInputFile.length > 0}
+										<button
+											class="px-3 text-gray-100 bg-emerald-600 hover:bg-emerald-700 rounded transition"
+											on:click={() => {
+												uploadModelHandler();
+											}}
+										>
+											<svg
+												xmlns="http://www.w3.org/2000/svg"
+												viewBox="0 0 16 16"
+												fill="currentColor"
+												class="w-4 h-4"
+											>
+												<path
+													d="M7.25 10.25a.75.75 0 0 0 1.5 0V4.56l2.22 2.22a.75.75 0 1 0 1.06-1.06l-3.5-3.5a.75.75 0 0 0-1.06 0l-3.5 3.5a.75.75 0 0 0 1.06 1.06l2.22-2.22v5.69Z"
+												/>
+												<path
+													d="M3.5 9.75a.75.75 0 0 0-1.5 0v1.5A2.75 2.75 0 0 0 4.75 14h6.5A2.75 2.75 0 0 0 14 11.25v-1.5a.75.75 0 0 0-1.5 0v1.5c0 .69-.56 1.25-1.25 1.25h-6.5c-.69 0-1.25-.56-1.25-1.25v-1.5Z"
+												/>
+											</svg>
+										</button>
+									{/if}
+								</div>
+
+								{#if modelInputFile && modelInputFile.length > 0}
+									<div>
+										<div>
+											<div class=" my-2.5 text-sm font-medium">Modelfile Content</div>
+											<textarea
+												bind:value={modelFileContent}
+												class="w-full rounded py-2 px-4 text-sm dark:text-gray-300 dark:bg-gray-800 outline-none resize-none"
+												rows="6"
+											/>
+										</div>
+									</div>
+								{/if}
+								<div class=" mt-1 text-xs text-gray-400 dark:text-gray-500">
+									To access the GGUF models available for downloading, <a
+										class=" text-gray-500 dark:text-gray-300 font-medium"
+										href="https://huggingface.co/models?search=gguf"
+										target="_blank">click here.</a
+									>
+								</div>
+
+								{#if pullProgress !== null}
+									<div class="mt-2">
+										<div class=" mb-2 text-xs">Pull Progress</div>
+										<div class="w-full rounded-full dark:bg-gray-800">
+											<div
+												class="dark:bg-gray-600 text-xs font-medium text-blue-100 text-center p-0.5 leading-none rounded-full"
+												style="width: {Math.max(15, pullProgress ?? 0)}%"
+											>
+												{pullProgress ?? 0}%
+											</div>
+										</div>
+										<div class="mt-1 text-xs dark:text-gray-500" style="font-size: 0.5rem;">
+											{digest}
+										</div>
+									</div>
+								{/if}
+							</div>
+							<hr class=" dark:border-gray-700" />
+
+							<div>
+								<div class=" mb-2.5 text-sm font-medium">Delete a model</div>
+								<div class="flex w-full">
+									<div class="flex-1 mr-2">
+										<select
+											class="w-full rounded py-2 px-4 text-sm dark:text-gray-300 dark:bg-gray-800 outline-none"
+											bind:value={deleteModelTag}
+											placeholder="Select a model"
+										>
+											{#if !deleteModelTag}
+												<option value="" disabled selected>Select a model</option>
+											{/if}
+											{#each $models.filter((m) => m.size != null) as model}
+												<option value={model.name} class="bg-gray-100 dark:bg-gray-700"
+													>{model.name +
+														' (' +
+														(model.size / 1024 ** 3).toFixed(1) +
+														' GB)'}</option
+												>
+											{/each}
+										</select>
+									</div>
+									<button
+										class="px-3 bg-red-700 hover:bg-red-800 text-gray-100 rounded transition"
+										on:click={() => {
+											deleteModelHandler();
+										}}
+									>
+										<svg
+											xmlns="http://www.w3.org/2000/svg"
+											viewBox="0 0 16 16"
+											fill="currentColor"
+											class="w-4 h-4"
+										>
+											<path
+												fill-rule="evenodd"
+												d="M5 3.25V4H2.75a.75.75 0 0 0 0 1.5h.3l.815 8.15A1.5 1.5 0 0 0 5.357 15h5.285a1.5 1.5 0 0 0 1.493-1.35l.815-8.15h.3a.75.75 0 0 0 0-1.5H11v-.75A2.25 2.25 0 0 0 8.75 1h-1.5A2.25 2.25 0 0 0 5 3.25Zm2.25-.75a.75.75 0 0 0-.75.75V4h3v-.75a.75.75 0 0 0-.75-.75h-1.5ZM6.05 6a.75.75 0 0 1 .787.713l.275 5.5a.75.75 0 0 1-1.498.075l-.275-5.5A.75.75 0 0 1 6.05 6Zm3.9 0a.75.75 0 0 1 .712.787l-.275 5.5a.75.75 0 0 1-1.498-.075l.275-5.5a.75.75 0 0 1 .786-.711Z"
+												clip-rule="evenodd"
+											/>
+										</svg>
+									</button>
+								</div>
 							</div>
 						</div>
 					</div>
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index e2f21a7a..90a78bcd 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -8,7 +8,8 @@ export const OLLAMA_API_BASE_URL =
 			: `http://localhost:11434/api`
 		: PUBLIC_API_BASE_URL;
 
-export const WEBUI_API_BASE_URL = dev ? `http://${location.hostname}:8080/api/v1` : `/api/v1`;
+export const WEBUI_BASE_URL = dev ? `http://${location.hostname}:8080` : ``;
+export const WEBUI_API_BASE_URL = `${WEBUI_BASE_URL}/api/v1`;
 
 export const WEB_UI_VERSION = 'v1.0.0-alpha-static';
 

From a640652a9bf9f0d10848a812bd2b3ada8562dcdc Mon Sep 17 00:00:00 2001
From: "Timothy J. Baek" <timothyjrbeck@gmail.com>
Date: Sat, 23 Dec 2023 23:05:52 -0800
Subject: [PATCH 2/9] fix: large file upload issue

---
 backend/apps/web/routers/utils.py | 90 ++++++++++++++++++++++++-------
 1 file changed, 71 insertions(+), 19 deletions(-)

diff --git a/backend/apps/web/routers/utils.py b/backend/apps/web/routers/utils.py
index 8c822f02..ee125975 100644
--- a/backend/apps/web/routers/utils.py
+++ b/backend/apps/web/routers/utils.py
@@ -21,19 +21,74 @@ class UploadBlobForm(BaseModel):
     filename: str
 
 
+from urllib.parse import urlparse
+
+
+def parse_huggingface_url(hf_url):
+    # Parse the URL
+    parsed_url = urlparse(hf_url)
+
+    # Get the path and split it into components
+    path_components = parsed_url.path.split("/")
+
+    # Extract the desired output
+    user_repo = "/".join(path_components[1:3])
+    model_file = path_components[-1]
+
+    return [user_repo, model_file]
+
+
+def download_file_stream(url, file_path, chunk_size=1024 * 1024):
+    done = False
+
+    if os.path.exists(file_path):
+        current_size = os.path.getsize(file_path)
+    else:
+        current_size = 0
+
+    headers = {"Range": f"bytes={current_size}-"} if current_size > 0 else {}
+
+    with requests.get(url, headers=headers, stream=True) as response:
+        total_size = int(response.headers.get("content-length", 0)) + current_size
+
+        with open(file_path, "ab") as file:
+            for data in response.iter_content(chunk_size=chunk_size):
+                current_size += len(data)
+                file.write(data)
+
+                done = current_size == total_size
+
+                progress = round((current_size / total_size) * 100, 2)
+                yield f'data: {{"progress": {progress}, "current": {current_size}, "total": {total_size}}}\n\n'
+
+
+@router.get("/download")
+async def download(
+    url: str = "https://huggingface.co/TheBloke/stablelm-zephyr-3b-GGUF/resolve/main/stablelm-zephyr-3b.Q2_K.gguf",
+):
+    user_repo, model_file = parse_huggingface_url(url)
+
+    os.makedirs("./uploads", exist_ok=True)
+    file_path = os.path.join("./uploads", f"{model_file}")
+
+    return StreamingResponse(
+        download_file_stream(url, file_path), media_type="text/event-stream"
+    )
+
+
 @router.post("/upload")
 async def upload(file: UploadFile = File(...)):
     os.makedirs("./uploads", exist_ok=True)
     file_path = os.path.join("./uploads", file.filename)
 
-    def file_write_stream():
+    async def file_write_stream():
         total = 0
         total_size = file.size
         chunk_size = 1024 * 1024
 
         done = False
         try:
-            with open(file_path, "wb") as f:
+            with open(file_path, "wb+") as f:
                 while True:
                     chunk = file.file.read(chunk_size)
                     if not chunk:
@@ -50,26 +105,23 @@ async def upload(file: UploadFile = File(...)):
                     yield f"data: {json.dumps(res)}\n\n"
 
                 if done:
-                    with open(file_path, "rb") as f:
-                        hashed = calculate_sha256(f)
+                    f.seek(0)
+                    hashed = calculate_sha256(f)
+                    f.seek(0)
 
-                        f.seek(0)
-                        file_data = f.read()
+                    url = f"{OLLAMA_API_BASE_URL}/blobs/sha256:{hashed}"
+                    response = requests.post(url, data=f)
 
-                        url = f"{OLLAMA_API_BASE_URL}/blobs/sha256:{hashed}"
+                    if response.ok:
+                        res = {
+                            "done": done,
+                            "blob": f"sha256:{hashed}",
+                        }
+                        os.remove(file_path)
 
-                        response = requests.post(url, data=file_data)
-
-                        if response.ok:
-                            res = {
-                                "done": done,
-                                "blob": f"sha256:{hashed}",
-                            }
-                            os.remove(file_path)
-
-                            yield f"data: {json.dumps(res)}\n\n"
-                        else:
-                            raise "Ollama: Could not create blob, Please try again."
+                        yield f"data: {json.dumps(res)}\n\n"
+                    else:
+                        raise "Ollama: Could not create blob, Please try again."
 
         except Exception as e:
             res = {"error": str(e)}

From bc5f9c01a9b4a3c506bf71e99df2b5ef4932efd0 Mon Sep 17 00:00:00 2001
From: "Timothy J. Baek" <timothyjrbeck@gmail.com>
Date: Sat, 23 Dec 2023 23:33:37 -0800
Subject: [PATCH 3/9] chore: version update

---
 backend/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/config.py b/backend/config.py
index c5a79f57..cf9eae02 100644
--- a/backend/config.py
+++ b/backend/config.py
@@ -30,7 +30,7 @@ if ENV == "prod":
 # WEBUI_VERSION
 ####################################
 
-WEBUI_VERSION = os.environ.get("WEBUI_VERSION", "v1.0.0-alpha.35")
+WEBUI_VERSION = os.environ.get("WEBUI_VERSION", "v1.0.0-alpha.40")
 
 ####################################
 # WEBUI_AUTH

From 0fe7d89f0bd2db2d7ffd6b1e94829307abe51527 Mon Sep 17 00:00:00 2001
From: "Timothy J. Baek" <timothyjrbeck@gmail.com>
Date: Sat, 23 Dec 2023 23:40:14 -0800
Subject: [PATCH 4/9] feat: create blob from huggingface url

---
 backend/apps/web/routers/utils.py | 50 ++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/backend/apps/web/routers/utils.py b/backend/apps/web/routers/utils.py
index ee125975..4a16b5bb 100644
--- a/backend/apps/web/routers/utils.py
+++ b/backend/apps/web/routers/utils.py
@@ -4,13 +4,14 @@ from starlette.responses import StreamingResponse
 
 from pydantic import BaseModel
 
-from utils.misc import calculate_sha256
 import requests
-
-
 import os
-import asyncio
+import aiohttp
 import json
+
+
+from utils.misc import calculate_sha256
+
 from config import OLLAMA_API_BASE_URL
 
 
@@ -38,7 +39,7 @@ def parse_huggingface_url(hf_url):
     return [user_repo, model_file]
 
 
-def download_file_stream(url, file_path, chunk_size=1024 * 1024):
+async def download_file_stream(url, file_path, chunk_size=1024 * 1024):
     done = False
 
     if os.path.exists(file_path):
@@ -48,18 +49,39 @@ def download_file_stream(url, file_path, chunk_size=1024 * 1024):
 
     headers = {"Range": f"bytes={current_size}-"} if current_size > 0 else {}
 
-    with requests.get(url, headers=headers, stream=True) as response:
-        total_size = int(response.headers.get("content-length", 0)) + current_size
+    timeout = aiohttp.ClientTimeout(total=60)  # Set the timeout
 
-        with open(file_path, "ab") as file:
-            for data in response.iter_content(chunk_size=chunk_size):
-                current_size += len(data)
-                file.write(data)
+    async with aiohttp.ClientSession(timeout=timeout) as session:
+        async with session.get(url, headers=headers) as response:
+            total_size = int(response.headers.get("content-length", 0)) + current_size
 
-                done = current_size == total_size
+            with open(file_path, "ab+") as file:
+                async for data in response.content.iter_chunked(chunk_size):
+                    current_size += len(data)
+                    file.write(data)
 
-                progress = round((current_size / total_size) * 100, 2)
-                yield f'data: {{"progress": {progress}, "current": {current_size}, "total": {total_size}}}\n\n'
+                    done = current_size == total_size
+                    progress = round((current_size / total_size) * 100, 2)
+                    yield f'data: {{"progress": {progress}, "current": {current_size}, "total": {total_size}}}\n\n'
+
+                if done:
+                    file.seek(0)
+                    hashed = calculate_sha256(file)
+                    file.seek(0)
+
+                    url = f"{OLLAMA_API_BASE_URL}/blobs/sha256:{hashed}"
+                    response = requests.post(url, data=file)
+
+                    if response.ok:
+                        res = {
+                            "done": done,
+                            "blob": f"sha256:{hashed}",
+                        }
+                        os.remove(file_path)
+
+                        yield f"data: {json.dumps(res)}\n\n"
+                    else:
+                        raise "Ollama: Could not create blob, Please try again."
 
 
 @router.get("/download")

From 232401a042de697d4833cb5b25246e8a876700f9 Mon Sep 17 00:00:00 2001
From: "Timothy J. Baek" <timothyjrbeck@gmail.com>
Date: Sun, 24 Dec 2023 00:27:04 -0800
Subject: [PATCH 5/9] feat: gguf file upload status

---
 backend/apps/web/routers/utils.py            |  47 +--
 backend/requirements.txt                     |   1 +
 src/lib/components/chat/SettingsModal.svelte | 319 +++++++++++++------
 3 files changed, 256 insertions(+), 111 deletions(-)

diff --git a/backend/apps/web/routers/utils.py b/backend/apps/web/routers/utils.py
index 4a16b5bb..d8b876c9 100644
--- a/backend/apps/web/routers/utils.py
+++ b/backend/apps/web/routers/utils.py
@@ -26,17 +26,20 @@ from urllib.parse import urlparse
 
 
 def parse_huggingface_url(hf_url):
-    # Parse the URL
-    parsed_url = urlparse(hf_url)
+    try:
+        # Parse the URL
+        parsed_url = urlparse(hf_url)
 
-    # Get the path and split it into components
-    path_components = parsed_url.path.split("/")
+        # Get the path and split it into components
+        path_components = parsed_url.path.split("/")
 
-    # Extract the desired output
-    user_repo = "/".join(path_components[1:3])
-    model_file = path_components[-1]
+        # Extract the desired output
+        user_repo = "/".join(path_components[1:3])
+        model_file = path_components[-1]
 
-    return [user_repo, model_file]
+        return model_file
+    except ValueError:
+        return None
 
 
 async def download_file_stream(url, file_path, chunk_size=1024 * 1024):
@@ -49,7 +52,7 @@ async def download_file_stream(url, file_path, chunk_size=1024 * 1024):
 
     headers = {"Range": f"bytes={current_size}-"} if current_size > 0 else {}
 
-    timeout = aiohttp.ClientTimeout(total=60)  # Set the timeout
+    timeout = aiohttp.ClientTimeout(total=600)  # Set the timeout
 
     async with aiohttp.ClientSession(timeout=timeout) as session:
         async with session.get(url, headers=headers) as response:
@@ -62,7 +65,7 @@ async def download_file_stream(url, file_path, chunk_size=1024 * 1024):
 
                     done = current_size == total_size
                     progress = round((current_size / total_size) * 100, 2)
-                    yield f'data: {{"progress": {progress}, "current": {current_size}, "total": {total_size}}}\n\n'
+                    yield f'data: {{"progress": {progress}, "completed": {current_size}, "total": {total_size}}}\n\n'
 
                 if done:
                     file.seek(0)
@@ -76,6 +79,7 @@ async def download_file_stream(url, file_path, chunk_size=1024 * 1024):
                         res = {
                             "done": done,
                             "blob": f"sha256:{hashed}",
+                            "name": file.name,
                         }
                         os.remove(file_path)
 
@@ -86,16 +90,20 @@ async def download_file_stream(url, file_path, chunk_size=1024 * 1024):
 
 @router.get("/download")
 async def download(
-    url: str = "https://huggingface.co/TheBloke/stablelm-zephyr-3b-GGUF/resolve/main/stablelm-zephyr-3b.Q2_K.gguf",
+    url: str,
 ):
-    user_repo, model_file = parse_huggingface_url(url)
+    # url = "https://huggingface.co/TheBloke/stablelm-zephyr-3b-GGUF/resolve/main/stablelm-zephyr-3b.Q2_K.gguf"
+    model_file = parse_huggingface_url(url)
 
-    os.makedirs("./uploads", exist_ok=True)
-    file_path = os.path.join("./uploads", f"{model_file}")
+    if model_file:
+        os.makedirs("./uploads", exist_ok=True)
+        file_path = os.path.join("./uploads", f"{model_file}")
 
-    return StreamingResponse(
-        download_file_stream(url, file_path), media_type="text/event-stream"
-    )
+        return StreamingResponse(
+            download_file_stream(url, file_path), media_type="text/event-stream"
+        )
+    else:
+        return None
 
 
 @router.post("/upload")
@@ -118,10 +126,12 @@ async def upload(file: UploadFile = File(...)):
                     f.write(chunk)
                     total += len(chunk)
                     done = total_size == total
+                    progress = round((total / total_size) * 100, 2)
 
                     res = {
+                        "progress": progress,
                         "total": total_size,
-                        "uploaded": total,
+                        "completed": total,
                     }
 
                     yield f"data: {json.dumps(res)}\n\n"
@@ -138,6 +148,7 @@ async def upload(file: UploadFile = File(...)):
                         res = {
                             "done": done,
                             "blob": f"sha256:{hashed}",
+                            "name": file.filename,
                         }
                         os.remove(file_path)
 
diff --git a/backend/requirements.txt b/backend/requirements.txt
index 1c69fffc..1568f7bb 100644
--- a/backend/requirements.txt
+++ b/backend/requirements.txt
@@ -12,6 +12,7 @@ passlib[bcrypt]
 uuid
 
 requests
+aiohttp
 pymongo
 bcrypt
 
diff --git a/src/lib/components/chat/SettingsModal.svelte b/src/lib/components/chat/SettingsModal.svelte
index a17c955d..ea8f2cde 100644
--- a/src/lib/components/chat/SettingsModal.svelte
+++ b/src/lib/components/chat/SettingsModal.svelte
@@ -50,15 +50,21 @@
 	};
 
 	// Models
-	let modelTag = '';
-	let modelInputFile = '';
-	let modelInputFileBlob = '';
-	let modelFileContent = `TEMPLATE """{{ .System }}\nUSER: {{ .Prompt }}\nASSSISTANT: """\nPARAMETER num_ctx 4096\nPARAMETER stop "</s>"\nPARAMETER stop "USER:"\nPARAMETER stop "ASSSISTANT:"`;
+	let modelTransferring = false;
 
-	let deleteModelTag = '';
+	let modelTag = '';
 	let digest = '';
 	let pullProgress = null;
 
+	let modelUploadMode = 'file';
+	let modelInputFile = '';
+	let modelFileUrl = '';
+	let modelFileContent = `TEMPLATE """{{ .System }}\nUSER: {{ .Prompt }}\nASSSISTANT: """\nPARAMETER num_ctx 4096\nPARAMETER stop "</s>"\nPARAMETER stop "USER:"\nPARAMETER stop "ASSSISTANT:"`;
+	let modelFileDigest = '';
+	let uploadProgress = null;
+
+	let deleteModelTag = '';
+
 	// Addons
 	let titleAutoGenerate = true;
 	let speechAutoSend = false;
@@ -162,6 +168,7 @@
 	};
 
 	const pullModelHandler = async () => {
+		modelTransferring = true;
 		const res = await fetch(`${API_BASE_URL}/pull`, {
 			method: 'POST',
 			headers: {
@@ -227,6 +234,8 @@
 		}
 
 		modelTag = '';
+		modelTransferring = false;
+
 		models.set(await getModels());
 	};
 
@@ -266,26 +275,42 @@
 	};
 
 	const uploadModelHandler = async () => {
-		const file = modelInputFile[0];
-		const formData = new FormData();
-		formData.append('file', file);
-
+		modelTransferring = true;
 		let uploaded = false;
+		let fileResponse = null;
+		let name = '';
 
-		const res = await fetch(`${WEBUI_API_BASE_URL}/utils/upload`, {
-			method: 'POST',
-			headers: {
-				...($settings.authHeader && { Authorization: $settings.authHeader }),
-				...($user && { Authorization: `Bearer ${localStorage.token}` })
-			},
-			body: formData
-		}).catch((error) => {
-			console.log(error);
-			return null;
-		});
+		if (modelUploadMode === 'file') {
+			const file = modelInputFile[0];
+			const formData = new FormData();
+			formData.append('file', file);
 
-		if (res && res.ok) {
-			const reader = res.body
+			fileResponse = await fetch(`${WEBUI_API_BASE_URL}/utils/upload`, {
+				method: 'POST',
+				headers: {
+					...($settings.authHeader && { Authorization: $settings.authHeader }),
+					...($user && { Authorization: `Bearer ${localStorage.token}` })
+				},
+				body: formData
+			}).catch((error) => {
+				console.log(error);
+				return null;
+			});
+		} else {
+			fileResponse = await fetch(`${WEBUI_API_BASE_URL}/utils/download?url=${modelFileUrl}`, {
+				method: 'GET',
+				headers: {
+					...($settings.authHeader && { Authorization: $settings.authHeader }),
+					...($user && { Authorization: `Bearer ${localStorage.token}` })
+				}
+			}).catch((error) => {
+				console.log(error);
+				return null;
+			});
+		}
+
+		if (fileResponse && fileResponse.ok) {
+			const reader = fileResponse.body
 				.pipeThrough(new TextDecoderStream())
 				.pipeThrough(splitStream('\n'))
 				.getReader();
@@ -300,14 +325,18 @@
 					for (const line of lines) {
 						if (line !== '') {
 							let data = JSON.parse(line.replace(/^data: /, ''));
-							console.log(data);
+
+							if (data.progress) {
+								uploadProgress = data.progress;
+							}
 
 							if (data.error) {
 								throw data.error;
 							}
 
 							if (data.done) {
-								modelInputFileBlob = data.blob;
+								modelFileDigest = data.blob;
+								name = data.name;
 								uploaded = true;
 							}
 						}
@@ -327,8 +356,8 @@
 					...($user && { Authorization: `Bearer ${localStorage.token}` })
 				},
 				body: JSON.stringify({
-					name: `${file.name}:latest`,
-					modelfile: `FROM @${modelInputFileBlob}\n${modelFileContent}`
+					name: `${name}:latest`,
+					modelfile: `FROM @${modelFileDigest}\n${modelFileContent}`
 				})
 			}).catch((err) => {
 				console.log(err);
@@ -390,7 +419,9 @@
 			}
 		}
 
-		modelTag = '';
+		modelFileUrl = '';
+		modelInputFile = '';
+		modelTransferring = false;
 		models.set(await getModels());
 	};
 
@@ -977,24 +1008,53 @@
 										/>
 									</div>
 									<button
-										class="px-3 text-gray-100 bg-emerald-600 hover:bg-emerald-700 rounded transition"
+										class="px-3 text-gray-100 bg-emerald-600 hover:bg-emerald-700 disabled:bg-gray-700 disabled:cursor-not-allowed rounded transition"
 										on:click={() => {
 											pullModelHandler();
 										}}
+										disabled={modelTransferring}
 									>
-										<svg
-											xmlns="http://www.w3.org/2000/svg"
-											viewBox="0 0 16 16"
-											fill="currentColor"
-											class="w-4 h-4"
-										>
-											<path
-												d="M8.75 2.75a.75.75 0 0 0-1.5 0v5.69L5.03 6.22a.75.75 0 0 0-1.06 1.06l3.5 3.5a.75.75 0 0 0 1.06 0l3.5-3.5a.75.75 0 0 0-1.06-1.06L8.75 8.44V2.75Z"
-											/>
-											<path
-												d="M3.5 9.75a.75.75 0 0 0-1.5 0v1.5A2.75 2.75 0 0 0 4.75 14h6.5A2.75 2.75 0 0 0 14 11.25v-1.5a.75.75 0 0 0-1.5 0v1.5c0 .69-.56 1.25-1.25 1.25h-6.5c-.69 0-1.25-.56-1.25-1.25v-1.5Z"
-											/>
-										</svg>
+										{#if modelTransferring}
+											<div class="self-center">
+												<svg
+													class=" w-4 h-4"
+													viewBox="0 0 24 24"
+													fill="currentColor"
+													xmlns="http://www.w3.org/2000/svg"
+													><style>
+														.spinner_ajPY {
+															transform-origin: center;
+															animation: spinner_AtaB 0.75s infinite linear;
+														}
+														@keyframes spinner_AtaB {
+															100% {
+																transform: rotate(360deg);
+															}
+														}
+													</style><path
+														d="M12,1A11,11,0,1,0,23,12,11,11,0,0,0,12,1Zm0,19a8,8,0,1,1,8-8A8,8,0,0,1,12,20Z"
+														opacity=".25"
+													/><path
+														d="M10.14,1.16a11,11,0,0,0-9,8.92A1.59,1.59,0,0,0,2.46,12,1.52,1.52,0,0,0,4.11,10.7a8,8,0,0,1,6.66-6.61A1.42,1.42,0,0,0,12,2.69h0A1.57,1.57,0,0,0,10.14,1.16Z"
+														class="spinner_ajPY"
+													/></svg
+												>
+											</div>
+										{:else}
+											<svg
+												xmlns="http://www.w3.org/2000/svg"
+												viewBox="0 0 16 16"
+												fill="currentColor"
+												class="w-4 h-4"
+											>
+												<path
+													d="M8.75 2.75a.75.75 0 0 0-1.5 0v5.69L5.03 6.22a.75.75 0 0 0-1.06 1.06l3.5 3.5a.75.75 0 0 0 1.06 0l3.5-3.5a.75.75 0 0 0-1.06-1.06L8.75 8.44V2.75Z"
+												/>
+												<path
+													d="M3.5 9.75a.75.75 0 0 0-1.5 0v1.5A2.75 2.75 0 0 0 4.75 14h6.5A2.75 2.75 0 0 0 14 11.25v-1.5a.75.75 0 0 0-1.5 0v1.5c0 .69-.56 1.25-1.25 1.25h-6.5c-.69 0-1.25-.56-1.25-1.25v-1.5Z"
+												/>
+											</svg>
+										{/if}
 									</button>
 								</div>
 
@@ -1025,67 +1085,140 @@
 							</div>
 							<hr class=" dark:border-gray-700" />
 
-							<div>
-								<div class=" mb-2.5 text-sm font-medium">Upload a GGUF model</div>
-								<div class="flex w-full mb-1.5">
-									<div class="flex-1 {modelInputFile && modelInputFile.length > 0 ? 'mr-2' : ''}">
-										<input
-											id="model-upload-input"
-											type="file"
-											bind:files={modelInputFile}
-											on:change={() => {
-												console.log(modelInputFile);
-											}}
-											hidden
-										/>
+							<form
+								on:submit|preventDefault={() => {
+									uploadModelHandler();
+								}}
+							>
+								<div class=" mb-2 flex w-full justify-between">
+									<div class="  text-sm font-medium">Upload a GGUF model</div>
 
-										<button
-											type="button"
-											class="w-full rounded text-left py-2 px-4 dark:text-gray-300 dark:bg-gray-800"
-											on:click={() => {
-												document.getElementById('model-upload-input').click();
-											}}
-										>
-											{#if modelInputFile && modelInputFile.length > 0}
-												{modelInputFile[0].name}
-											{:else}
-												Click here to select
-											{/if}
-										</button>
+									<button
+										class="p-1 px-3 text-xs flex rounded transition"
+										on:click={() => {
+											if (modelUploadMode === 'file') {
+												modelUploadMode = 'url';
+											} else {
+												modelUploadMode = 'file';
+											}
+										}}
+										type="button"
+									>
+										{#if modelUploadMode === 'file'}
+											<span class="ml-2 self-center">File Mode</span>
+										{:else}
+											<span class="ml-2 self-center">URL Mode</span>
+										{/if}
+									</button>
+								</div>
+
+								<div class="flex w-full mb-1.5">
+									<div class="flex flex-col w-full">
+										{#if modelUploadMode === 'file'}
+											<div
+												class="flex-1 {modelInputFile && modelInputFile.length > 0 ? 'mr-2' : ''}"
+											>
+												<input
+													id="model-upload-input"
+													type="file"
+													bind:files={modelInputFile}
+													on:change={() => {
+														console.log(modelInputFile);
+													}}
+													accept=".gguf"
+													required
+													hidden
+												/>
+
+												<button
+													type="button"
+													class="w-full rounded text-left py-2 px-4 dark:text-gray-300 dark:bg-gray-800"
+													on:click={() => {
+														document.getElementById('model-upload-input').click();
+													}}
+												>
+													{#if modelInputFile && modelInputFile.length > 0}
+														{modelInputFile[0].name}
+													{:else}
+														Click here to select
+													{/if}
+												</button>
+											</div>
+										{:else}
+											<div class="flex-1 {modelFileUrl !== '' ? 'mr-2' : ''}">
+												<input
+													class="w-full rounded text-left py-2 px-4 dark:text-gray-300 dark:bg-gray-800 outline-none {modelFileUrl !==
+													''
+														? 'mr-2'
+														: ''}"
+													type="url"
+													required
+													bind:value={modelFileUrl}
+													placeholder="Type HuggingFace Resolve (Download) URL"
+												/>
+											</div>
+										{/if}
 									</div>
 
-									{#if modelInputFile && modelInputFile.length > 0}
+									{#if (modelUploadMode === 'file' && modelInputFile && modelInputFile.length > 0) || (modelUploadMode === 'url' && modelFileUrl !== '')}
 										<button
-											class="px-3 text-gray-100 bg-emerald-600 hover:bg-emerald-700 rounded transition"
-											on:click={() => {
-												uploadModelHandler();
-											}}
+											class="px-3 text-gray-100 bg-emerald-600 hover:bg-emerald-700 disabled:bg-gray-700 disabled:cursor-not-allowed rounded transition"
+											type="submit"
+											disabled={modelTransferring}
 										>
-											<svg
-												xmlns="http://www.w3.org/2000/svg"
-												viewBox="0 0 16 16"
-												fill="currentColor"
-												class="w-4 h-4"
-											>
-												<path
-													d="M7.25 10.25a.75.75 0 0 0 1.5 0V4.56l2.22 2.22a.75.75 0 1 0 1.06-1.06l-3.5-3.5a.75.75 0 0 0-1.06 0l-3.5 3.5a.75.75 0 0 0 1.06 1.06l2.22-2.22v5.69Z"
-												/>
-												<path
-													d="M3.5 9.75a.75.75 0 0 0-1.5 0v1.5A2.75 2.75 0 0 0 4.75 14h6.5A2.75 2.75 0 0 0 14 11.25v-1.5a.75.75 0 0 0-1.5 0v1.5c0 .69-.56 1.25-1.25 1.25h-6.5c-.69 0-1.25-.56-1.25-1.25v-1.5Z"
-												/>
-											</svg>
+											{#if modelTransferring}
+												<div class="self-center">
+													<svg
+														class=" w-4 h-4"
+														viewBox="0 0 24 24"
+														fill="currentColor"
+														xmlns="http://www.w3.org/2000/svg"
+														><style>
+															.spinner_ajPY {
+																transform-origin: center;
+																animation: spinner_AtaB 0.75s infinite linear;
+															}
+															@keyframes spinner_AtaB {
+																100% {
+																	transform: rotate(360deg);
+																}
+															}
+														</style><path
+															d="M12,1A11,11,0,1,0,23,12,11,11,0,0,0,12,1Zm0,19a8,8,0,1,1,8-8A8,8,0,0,1,12,20Z"
+															opacity=".25"
+														/><path
+															d="M10.14,1.16a11,11,0,0,0-9,8.92A1.59,1.59,0,0,0,2.46,12,1.52,1.52,0,0,0,4.11,10.7a8,8,0,0,1,6.66-6.61A1.42,1.42,0,0,0,12,2.69h0A1.57,1.57,0,0,0,10.14,1.16Z"
+															class="spinner_ajPY"
+														/></svg
+													>
+												</div>
+											{:else}
+												<svg
+													xmlns="http://www.w3.org/2000/svg"
+													viewBox="0 0 16 16"
+													fill="currentColor"
+													class="w-4 h-4"
+												>
+													<path
+														d="M7.25 10.25a.75.75 0 0 0 1.5 0V4.56l2.22 2.22a.75.75 0 1 0 1.06-1.06l-3.5-3.5a.75.75 0 0 0-1.06 0l-3.5 3.5a.75.75 0 0 0 1.06 1.06l2.22-2.22v5.69Z"
+													/>
+													<path
+														d="M3.5 9.75a.75.75 0 0 0-1.5 0v1.5A2.75 2.75 0 0 0 4.75 14h6.5A2.75 2.75 0 0 0 14 11.25v-1.5a.75.75 0 0 0-1.5 0v1.5c0 .69-.56 1.25-1.25 1.25h-6.5c-.69 0-1.25-.56-1.25-1.25v-1.5Z"
+													/>
+												</svg>
+											{/if}
 										</button>
 									{/if}
 								</div>
 
-								{#if modelInputFile && modelInputFile.length > 0}
+								{#if (modelUploadMode === 'file' && modelInputFile && modelInputFile.length > 0) || (modelUploadMode === 'url' && modelFileUrl !== '')}
 									<div>
 										<div>
 											<div class=" my-2.5 text-sm font-medium">Modelfile Content</div>
 											<textarea
 												bind:value={modelFileContent}
 												class="w-full rounded py-2 px-4 text-sm dark:text-gray-300 dark:bg-gray-800 outline-none resize-none"
-												rows="6"
+												rows="8"
 											/>
 										</div>
 									</div>
@@ -1098,23 +1231,23 @@
 									>
 								</div>
 
-								{#if pullProgress !== null}
+								{#if uploadProgress !== null}
 									<div class="mt-2">
-										<div class=" mb-2 text-xs">Pull Progress</div>
+										<div class=" mb-2 text-xs">Upload Progress</div>
 										<div class="w-full rounded-full dark:bg-gray-800">
 											<div
 												class="dark:bg-gray-600 text-xs font-medium text-blue-100 text-center p-0.5 leading-none rounded-full"
-												style="width: {Math.max(15, pullProgress ?? 0)}%"
+												style="width: {Math.max(15, uploadProgress ?? 0)}%"
 											>
-												{pullProgress ?? 0}%
+												{uploadProgress ?? 0}%
 											</div>
 										</div>
 										<div class="mt-1 text-xs dark:text-gray-500" style="font-size: 0.5rem;">
-											{digest}
+											{modelFileDigest}
 										</div>
 									</div>
 								{/if}
-							</div>
+							</form>
 							<hr class=" dark:border-gray-700" />
 
 							<div>

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 6/9] 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 d8b876c9..e9986bab 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 ea8f2cde..493be1a9 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());
 	};
 

From 892591f89444182f704f63805a75624af448482e Mon Sep 17 00:00:00 2001
From: "Timothy J. Baek" <timothyjrbeck@gmail.com>
Date: Sun, 24 Dec 2023 00:47:31 -0800
Subject: [PATCH 7/9] feat: no text response error message

---
 src/routes/(app)/+page.svelte        | 7 +++++++
 src/routes/(app)/c/[id]/+page.svelte | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/src/routes/(app)/+page.svelte b/src/routes/(app)/+page.svelte
index c0885d19..0d1055f9 100644
--- a/src/routes/(app)/+page.svelte
+++ b/src/routes/(app)/+page.svelte
@@ -245,6 +245,13 @@
 								}
 							} else {
 								responseMessage.done = true;
+
+								if (responseMessage.content == '') {
+									responseMessage.error = true;
+									responseMessage.content =
+										'Oops! No text generated from Ollama, Please try again.';
+								}
+
 								responseMessage.context = data.context ?? null;
 								responseMessage.info = {
 									total_duration: data.total_duration,
diff --git a/src/routes/(app)/c/[id]/+page.svelte b/src/routes/(app)/c/[id]/+page.svelte
index 6ff95cd5..1b2c7053 100644
--- a/src/routes/(app)/c/[id]/+page.svelte
+++ b/src/routes/(app)/c/[id]/+page.svelte
@@ -259,6 +259,13 @@
 								}
 							} else {
 								responseMessage.done = true;
+
+								if (responseMessage.content == '') {
+									responseMessage.error = true;
+									responseMessage.content =
+										'Oops! No text generated from Ollama, Please try again.';
+								}
+
 								responseMessage.context = data.context ?? null;
 								responseMessage.info = {
 									total_duration: data.total_duration,

From b05ad1fda1e6db019b2a986674f926c3d13b3187 Mon Sep 17 00:00:00 2001
From: "Timothy J. Baek" <timothyjrbeck@gmail.com>
Date: Sun, 24 Dec 2023 01:02:31 -0800
Subject: [PATCH 8/9] chore: doc update

---
 README.md                                    | 4 +++-
 src/lib/components/chat/SettingsModal.svelte | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 93cafc00..ad29e7b1 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
 
 ChatGPT-Style Web Interface for Ollama 🦙
 
-**Disclaimer:** *ollama-webui is a community-driven project and is not affiliated with the Ollama team in any way. This initiative is independent, and any inquiries or feedback should be directed to [our community on Discord](https://discord.gg/5rJgQTnV4s). We kindly request users to refrain from contacting or harassing the Ollama team regarding this project.*
+**Disclaimer:** _ollama-webui is a community-driven project and is not affiliated with the Ollama team in any way. This initiative is independent, and any inquiries or feedback should be directed to [our community on Discord](https://discord.gg/5rJgQTnV4s). We kindly request users to refrain from contacting or harassing the Ollama team regarding this project._
 
 ![Ollama Web UI Demo](./demo.gif)
 
@@ -35,6 +35,8 @@ Also check our sibling project, [OllamaHub](https://ollamahub.com/), where you c
 
 - 📥🗑️ **Download/Delete Models**: Easily download or remove models directly from the web UI.
 
+- ⬆️ **GGUF File Model Creation**: Upload or download GGUF file from HuggingFace seamlessly within the web UI for convenient Ollama GGUF file model creation.
+
 - 🤖 **Multiple Model Support**: Seamlessly switch between different chat models for diverse interactions.
 
 - 🔄 **Multi-Modal Support**: Seamlessly engage with models that support multimodal interactions, including images (e.g., LLava).
diff --git a/src/lib/components/chat/SettingsModal.svelte b/src/lib/components/chat/SettingsModal.svelte
index 493be1a9..4baf6c91 100644
--- a/src/lib/components/chat/SettingsModal.svelte
+++ b/src/lib/components/chat/SettingsModal.svelte
@@ -277,6 +277,7 @@
 	const uploadModelHandler = async () => {
 		modelTransferring = true;
 		uploadProgress = 0;
+
 		let uploaded = false;
 		let fileResponse = null;
 		let name = '';
@@ -1221,7 +1222,7 @@
 											<textarea
 												bind:value={modelFileContent}
 												class="w-full rounded py-2 px-4 text-sm dark:text-gray-300 dark:bg-gray-800 outline-none resize-none"
-												rows="8"
+												rows="6"
 											/>
 										</div>
 									</div>

From a0181d956f01c3dd8bbdb20c6398ad7978cea886 Mon Sep 17 00:00:00 2001
From: "Timothy J. Baek" <timothyjrbeck@gmail.com>
Date: Sun, 24 Dec 2023 01:04:16 -0800
Subject: [PATCH 9/9] doc: features update

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ad29e7b1..de950ef8 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Also check our sibling project, [OllamaHub](https://ollamahub.com/), where you c
 
 - 📥🗑️ **Download/Delete Models**: Easily download or remove models directly from the web UI.
 
-- ⬆️ **GGUF File Model Creation**: Upload or download GGUF file from HuggingFace seamlessly within the web UI for convenient Ollama GGUF file model creation.
+- ⬆️ **GGUF File Model Creation**: Effortlessly create Ollama models by uploading GGUF files directly from the web UI. Streamlined process with options to upload from your machine or download GGUF files from Hugging Face.
 
 - 🤖 **Multiple Model Support**: Seamlessly switch between different chat models for diverse interactions.