feat: webui operates independently from aichat (#527)

sigoden · May 20, 2024 · 1a2a261 · 1a2a261
1 parent 7d7caf7
commit 1a2a261
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 24 deletions.
diff --git a/assets/arena.html b/assets/arena.html
@@ -531,9 +531,10 @@
   <script>
     const QUERY = parseQueryString(location.search);
     const NUM = parseInt(QUERY.num) || 2
-    const API_BASE = QUERY.api_base || ".";
-    const CHAT_COMPLETIONS_URL = API_BASE + "/v1/chat/completions";
-    const MODELS_API = API_BASE + "/v1/models";
+    const API_BASE = QUERY.api_base || "./v1";
+    const API_KEY = QUERY.api_key || "";
+    const CHAT_COMPLETIONS_URL = API_BASE + "/chat/completions";
+    const MODELS_API = API_BASE + "/models";
     const MODEL_IDS_STORAGE_KEY = "__model_ids__";
 
     document.addEventListener("alpine:init", () => {
@@ -566,7 +567,8 @@
             const models = await fetchJSON(MODELS_API);
             this.models = models;
           } catch (err) {
-            console.error(err);
+            toast("No available model");
+            console.error("Failed to load models", err);
           }
           let model_ids = []
           try {
@@ -695,6 +697,7 @@
           if (event.shiftKey) {
             return;
           }
+          event.preventDefault();
           this.handleAsk();
         },
 
@@ -765,7 +768,7 @@
           chat.askAbortController = new AbortController();
           chat.shouldScrollChatBodyToBottom = true;
           this.$nextTick(() => {
-              this.autoScrollChatBodyToBottom(index);
+            this.autoScrollChatBodyToBottom(index);
           });
           const lastMessage = chat.messages[chat.messages.length - 1];
           const body = this.buildBody(index);
@@ -831,7 +834,7 @@
     }
 
     async function fetchJSON(url) {
-      const res = await fetch(url);
+      const res = await fetch(url, { headers: getHeaders() });
       const data = await res.json()
       return data.data;
     }
@@ -841,9 +844,7 @@
       const response = await fetch(url, {
         method: "POST",
         signal,
-        headers: {
-          "content-type": "application/json",
-        },
+        headers: getHeaders(),
         body: JSON.stringify(body),
       });
 
@@ -891,6 +892,16 @@
       }
     }
 
+    function getHeaders() {
+      const headers = {
+        "content-type": "application/json",
+      };
+      if (API_KEY) {
+        headers["authorization"] = `Bearer ${API_KEY}`;
+      }
+      return headers
+    }
+
     function retrieveModel(models, id) {
       const model = models.find(model => model.id === id);
       if (!model) return {};

diff --git a/assets/playground.html b/assets/playground.html
@@ -687,10 +687,11 @@
   </div>
   <script>
     const QUERY = parseQueryString(location.search);
-    const API_BASE = QUERY.api_base || ".";
-    const CHAT_COMPLETIONS_URL = API_BASE + "/v1/chat/completions";
-    const MODELS_API = API_BASE + "/v1/models";
-    const ROLES_API = API_BASE + "/v1/roles";
+    const API_BASE = QUERY.api_base || "./v1";
+    const API_KEY = QUERY.api_key || "";
+    const CHAT_COMPLETIONS_URL = API_BASE + "/chat/completions";
+    const MODELS_API = API_BASE + "/models";
+    const ROLES_API = API_BASE + "/roles";
     const SETTINGS_STORAGE_KEY = "__settings__";
 
     document.addEventListener("alpine:init", () => {
@@ -739,13 +740,17 @@
         settings: defaultSettings,
 
         async init() {
-          try {
-            const [models, roles] = await Promise.all([MODELS_API, ROLES_API].map(url => fetchJSON(url)));
-            this.models = models;
-            this.roles.push(...roles);
-          } catch (err) {
-            console.error(err);
-          }
+          await Promise.all([
+            fetchJSON(MODELS_API).then(models => {
+              this.models = models;
+            }).catch(err => {
+              toast("No model available");
+              console.error("Failed to load models", err);
+            }),
+            fetchJSON(ROLES_API).then(roles => {
+              this.roles.push(...roles.filter(v => !!v.prompt));
+            }).catch(() => { }),
+          ])
           this.$watch("input", () => this.autosizeInput(this.$refs.input));
           this.$watch("settings", () => {
             localStorage.setItem(SETTINGS_STORAGE_KEY, JSON.stringify(this.settings));
@@ -857,6 +862,7 @@
           if (event.shiftKey) {
             return;
           }
+          event.preventDefault();
           this.handleAsk();
         },
 
@@ -1038,7 +1044,7 @@
     }
 
     async function fetchJSON(url) {
-      const res = await fetch(url);
+      const res = await fetch(url, { headers: getHeaders() });
       const data = await res.json()
       return data.data;
     }
@@ -1048,9 +1054,7 @@
       const response = await fetch(url, {
         method: "POST",
         signal,
-        headers: {
-          "content-type": "application/json",
-        },
+        headers: getHeaders(),
         body: JSON.stringify(body),
       });
 
@@ -1098,6 +1102,16 @@
       }
     }
 
+    function getHeaders() {
+      const headers = {
+        "content-type": "application/json",
+      };
+      if (API_KEY) {
+        headers["authorization"] = `Bearer ${API_KEY}`;
+      }
+      return headers
+    }
+
     function retrieveModel(models, id) {
       const model = models.find(model => model.id === id);
       if (!model) return {};