From 2df2d6b0cf63fa90b0fe5160a02dade7d161f667 Mon Sep 17 00:00:00 2001
From: Heiner Lohaus <hlohaus@users.noreply.github.com>
Date: Tue, 14 Jan 2025 17:07:39 +0100
Subject: Read FinishReason and Usage from Gemini API Add "Custom Provider":
 Set  API Url in the settings Remove Discord link from result, add them to 
 attr: Jmuz Fix Bug: File content are added to the prompt Changed response
 from /v1/models API Disable Pizzagpt Provider

---
 g4f/gui/client/index.html           | 13 +++++++++----
 g4f/gui/client/static/js/chat.v1.js | 35 +++++++++++++----------------------
 2 files changed, 22 insertions(+), 26 deletions(-)

(limited to 'g4f/gui/client')

diff --git a/g4f/gui/client/index.html b/g4f/gui/client/index.html
index bbf41314..5517eca2 100644
--- a/g4f/gui/client/index.html
+++ b/g4f/gui/client/index.html
@@ -143,7 +143,7 @@
                 <label for="refine" class="toogle" title=""></label>
             </div>
             <div class="field box">
-                <label for="systemPrompt" class="label" title="">Default for System prompt</label>
+                <label for="systemPrompt" class="label" title="">System prompt</label>
                 <textarea id="systemPrompt" placeholder="You are a helpful assistant."></textarea>
             </div>
             <div class="field box">
@@ -157,6 +157,14 @@
                     document.getElementById('recognition-language').placeholder = navigator.language;
                 </script>
             </div>
+            <div class="field box">
+                <label for="Custom-api_base" class="label" title="">Custom Provider (Base Url):</label>
+                <input type="text" id="Custom-api_base" name="Custom[api_base]" placeholder="http://localhost:8080/v1"/>
+            </div>
+            <div class="field box hidden">
+                <label for="Custom-api_key" class="label" title="">Custom Provider:</label>
+                <input type="text" id="Custom-api_key" name="Custom[api_key]" placeholder="api_key"/>
+            </div>
             <div class="field box hidden">
                 <label for="BingCreateImages-api_key" class="label" title="">Microsoft Designer in Bing:</label>
                 <input type="text" id="BingCreateImages-api_key" name="BingCreateImages[api_key]" placeholder="&quot;_U&quot; cookie"/>
@@ -254,10 +262,7 @@
                      <option value="gpt-4o">gpt-4o</option>
                      <option value="gpt-4o-mini">gpt-4o-mini</option>
                      <option value="llama-3.1-70b">llama-3.1-70b</option>
-                     <option value="llama-3.1-405b">llama-3.1-405b</option>
                      <option value="mixtral-8x7b">mixtral-8x7b</option>
-                     <option value="gemini-pro">gemini-pro</option>
-                     <option value="gemini-flash">gemini-flash</option>
                      <option value="claude-3.5-sonnet">claude-3.5-sonnet</option>
                      <option value="flux">flux (Image Generation)</option>
                      <option value="dall-e-3">dall-e-3 (Image Generation)</option>
diff --git a/g4f/gui/client/static/js/chat.v1.js b/g4f/gui/client/static/js/chat.v1.js
index 822f34f5..2c45fefb 100644
--- a/g4f/gui/client/static/js/chat.v1.js
+++ b/g4f/gui/client/static/js/chat.v1.js
@@ -351,11 +351,6 @@ const handle_ask = async () => {
     await count_input()
     await add_conversation(window.conversation_id);
 
-    if ("text" in fileInput.dataset) {
-        message += '\n```' + fileInput.dataset.type + '\n'; 
-        message += fileInput.dataset.text;
-        message += '\n```'
-    }
     let message_index = await add_message(window.conversation_id, "user", message);
     let message_id = get_message_id();
 
@@ -799,6 +794,7 @@ const ask_gpt = async (message_id, message_index = -1, regenerate = false, provi
         const files = input && input.files.length > 0 ? input.files : null;
         const download_images = document.getElementById("download_images")?.checked;
         const api_key = get_api_key_by_provider(provider);
+        const api_base = provider == "Custom" ? document.getElementById(`${provider}-api_base`).value : null;
         const ignored = Array.from(settings.querySelectorAll("input.provider:not(:checked)")).map((el)=>el.value);
         await api("conversation", {
             id: message_id,
@@ -811,6 +807,7 @@ const ask_gpt = async (message_id, message_index = -1, regenerate = false, provi
             action: action,
             download_images: download_images,
             api_key: api_key,
+            api_base: api_base,
             ignored: ignored,
         }, files, message_id, scroll);
         content_map.update_timeouts.forEach((timeoutId)=>clearTimeout(timeoutId));
@@ -1066,7 +1063,7 @@ const load_conversation = async (conversation_id, scroll=true) => {
         }
         buffer = buffer.replace(/ \[aborted\]$/g, "").replace(/ \[error\]$/g, "");
         new_content = item.content.replace(/ \[aborted\]$/g, "").replace(/ \[error\]$/g, "");
-        buffer += merge_messages(buffer, new_content);
+        buffer = merge_messages(buffer, new_content);
         last_model = item.provider?.model;
         providers.push(item.provider?.name);
         let next_i = parseInt(i) + 1;
@@ -1176,9 +1173,6 @@ const load_conversation = async (conversation_id, scroll=true) => {
     if (window.GPTTokenizer_cl100k_base) {
         const filtered = prepare_messages(messages, null, true, false);
         if (filtered.length > 0) {
-            if (GPTTokenizer_o200k_base && last_model?.startsWith("gpt-4o") || last_model?.startsWith("o1")) {
-                return GPTTokenizer_o200k_base?.encodeChat(filtered, last_model).length;
-            }
             last_model = last_model?.startsWith("gpt-3") ? "gpt-3.5-turbo" : "gpt-4"
             let count_total = GPTTokenizer_cl100k_base?.encodeChat(filtered, last_model).length
             if (count_total > 0) {
@@ -1890,7 +1884,6 @@ setTimeout(load_version, 100);
 
 fileInput.addEventListener('click', async (event) => {
     fileInput.value = '';
-    delete fileInput.dataset.text;
 });
 
 async function upload_cookies() {
@@ -1920,7 +1913,6 @@ function formatFileSize(bytes) {
 async function upload_files(fileInput) {
     const paperclip = document.querySelector(".user-input .fa-paperclip");
     const bucket_id = uuid();
-    delete fileInput.dataset.text;
     paperclip.classList.add("blink");
 
     const formData = new FormData();
@@ -1980,8 +1972,7 @@ fileInput.addEventListener('change', async (event) => {
         if (type == "json") {
             const reader = new FileReader();
             reader.addEventListener('load', async (event) => {
-                fileInput.dataset.text = event.target.result;
-                const data = JSON.parse(fileInput.dataset.text);
+                const data = JSON.parse(event.target.result);
                 if (data.options && "g4f" in data.options) {
                     let count = 0;
                     Object.keys(data).forEach(key => {
@@ -1990,7 +1981,6 @@ fileInput.addEventListener('change', async (event) => {
                             count += 1;
                         }
                     });
-                    delete fileInput.dataset.text;
                     await load_conversations();
                     fileInput.value = "";
                     inputCount.innerText = `${count} Conversations were imported successfully`;
@@ -2012,8 +2002,6 @@ fileInput.addEventListener('change', async (event) => {
             });
             reader.readAsText(fileInput.files[0]);
         }
-    } else {
-        delete fileInput.dataset.text;
     }
 });
 
@@ -2033,16 +2021,19 @@ function get_selected_model() {
 }
 
 async function api(ressource, args=null, files=null, message_id=null, scroll=true) {
-    let api_key;
+    const headers = {};
     if (ressource == "models" && args) {
         api_key = get_api_key_by_provider(args);
+        if (api_key) {
+            headers.x_api_key = api_key;
+        }
+        api_base = args == "Custom" ? document.getElementById(`${args}-api_base`).value : null;
+        if (api_base) {
+            headers.x_api_base = api_base;
+        }
         ressource = `${ressource}/${args}`;
     }
     const url = `/backend-api/v2/${ressource}`;
-    const headers = {};
-    if (api_key) {
-        headers.x_api_key = api_key;
-    }
     if (ressource == "conversation") {
         let body = JSON.stringify(args);
         headers.accept = 'text/event-stream';
@@ -2224,7 +2215,7 @@ if (SpeechRecognition) {
     };
     recognition.onend = function() {
         messageInput.value = `${startValue ? startValue + "\n" : ""}${buffer}`;
-        if (!microLabel.classList.contains("recognition")) {
+        if (microLabel.classList.contains("recognition")) {
             recognition.start();
         } else {
             messageInput.readOnly = false;
-- 
cgit v1.2.3