From 21fb143718e8312fb251bfda48665153fb129afb Mon Sep 17 00:00:00 2001
From: oobabooga <112222186+oobabooga@users.noreply.github.com>
Date: Tue, 6 Feb 2024 20:00:16 -0800
Subject: [PATCH 1/2] Add API key

---
 public/index.html         |  9 +++++++++
 public/script.js          |  5 +++++
 public/scripts/secrets.js |  2 ++
 src/additional-headers.js | 12 ++++++++++++
 src/endpoints/secrets.js  |  1 +
 5 files changed, 29 insertions(+)

diff --git a/public/index.html b/public/index.html
index 3d317cb69..85a44a8e7 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1916,6 +1916,15 @@
                                         Make sure you run it with <code>--api</code> flag
                                     </span>
                                 </div>
+                                <h4 data-i18n="API key">API key</h4>
+                                <div class="flex-container">
+                                    <input id="api_key_ooba" name="api_key_ooba" class="text_pole flex1 wide100p" maxlength="500" size="35" type="text" autocomplete="off">
+                                    <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_ooba">
+                                    </div>
+                                </div>
+                                <div data-for="api_key_ooba" class="neutral_warning" data-i18n="For privacy reasons, your API key will be hidden after you reload the page.">
+                                    For privacy reasons, your API key will be hidden after you reload the page.
+                                </div>
                                 <div class="flex1">
                                     <h4 data-i18n="Server url">Server URL</h4>
                                     <small data-i18n="Example: http://127.0.0.1:5000 ">Example: http://127.0.0.1:5000</small>
diff --git a/public/script.js b/public/script.js
index de1172b7a..3b28344dc 100644
--- a/public/script.js
+++ b/public/script.js
@@ -8541,6 +8541,11 @@ jQuery(async function () {
             await writeSecret(SECRET_KEYS.TOGETHERAI, togetherKey);
         }
 
+        const oobaKey = String($('#api_key_ooba').val()).trim();
+        if (oobaKey.length) {
+            await writeSecret(SECRET_KEYS.OOBA, oobaKey);
+        }
+
         validateTextGenUrl();
         startStatusLoading();
         main_api = 'textgenerationwebui';
diff --git a/public/scripts/secrets.js b/public/scripts/secrets.js
index 1c1154180..2e96136d3 100644
--- a/public/scripts/secrets.js
+++ b/public/scripts/secrets.js
@@ -17,6 +17,7 @@ export const SECRET_KEYS = {
     MISTRALAI: 'api_key_mistralai',
     TOGETHERAI: 'api_key_togetherai',
     CUSTOM: 'api_key_custom',
+    OOBA: 'api_key_ooba'
 };
 
 const INPUT_MAP = {
@@ -35,6 +36,7 @@ const INPUT_MAP = {
     [SECRET_KEYS.MISTRALAI]: '#api_key_mistralai',
     [SECRET_KEYS.CUSTOM]: '#api_key_custom',
     [SECRET_KEYS.TOGETHERAI]: '#api_key_togetherai',
+    [SECRET_KEYS.OOBA]: '#api_key_ooba',
 };
 
 async function clearSecret() {
diff --git a/src/additional-headers.js b/src/additional-headers.js
index de8b0d91a..bab8e900d 100644
--- a/src/additional-headers.js
+++ b/src/additional-headers.js
@@ -37,6 +37,15 @@ function getTabbyHeaders() {
     }) : {};
 }
 
+function getOobaHeaders() {
+    const apiKey = readSecret(SECRET_KEYS.OOBA);
+    console.log(apiKey);
+
+    return apiKey ? ({
+        'Authorization': `Bearer ${apiKey}`,
+    }) : {};
+}
+
 function getOverrideHeaders(urlHost) {
     const requestOverrides = getConfigValue('requestOverrides', []);
     const overrideHeaders = requestOverrides?.find((e) => e.hosts?.includes(urlHost))?.headers;
@@ -69,6 +78,9 @@ function setAdditionalHeaders(request, args, server) {
         case TEXTGEN_TYPES.TOGETHERAI:
             headers = getTogetherAIHeaders();
             break;
+        case TEXTGEN_TYPES.OOBA:
+            headers = getOobaHeaders();
+            break;
         default:
             headers = server ? getOverrideHeaders((new URL(server))?.host) : {};
             break;
diff --git a/src/endpoints/secrets.js b/src/endpoints/secrets.js
index d7b44ed1e..3236dc3a9 100644
--- a/src/endpoints/secrets.js
+++ b/src/endpoints/secrets.js
@@ -29,6 +29,7 @@ const SECRET_KEYS = {
     TOGETHERAI: 'api_key_togetherai',
     MISTRALAI: 'api_key_mistralai',
     CUSTOM: 'api_key_custom',
+    OOBA: 'api_key_ooba'
 };
 
 /**

From b95cddec1c519d4eb5bf57f5b40f355b40048b8c Mon Sep 17 00:00:00 2001
From: oobabooga <112222186+oobabooga@users.noreply.github.com>
Date: Tue, 6 Feb 2024 20:03:52 -0800
Subject: [PATCH 2/2] Remove debug statement

---
 src/additional-headers.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/additional-headers.js b/src/additional-headers.js
index bab8e900d..bd2116125 100644
--- a/src/additional-headers.js
+++ b/src/additional-headers.js
@@ -39,7 +39,6 @@ function getTabbyHeaders() {
 
 function getOobaHeaders() {
     const apiKey = readSecret(SECRET_KEYS.OOBA);
-    console.log(apiKey);
 
     return apiKey ? ({
         'Authorization': `Bearer ${apiKey}`,