From 00951eb79114adf74ad1a3f1ce596e9e0fa932bf Mon Sep 17 00:00:00 2001
From: H Lohaus <hlohaus@users.noreply.github.com>
Date: Wed, 10 Apr 2024 08:14:50 +0200
Subject: Add OpenRouter and DeepInfraImage Provider (#1814)

---
 g4f/gui/client/index.html           |  8 ++++++++
 g4f/gui/client/static/css/style.css | 10 +++++++---
 g4f/gui/client/static/js/chat.v1.js | 32 ++++++++++++++++++--------------
 g4f/gui/server/api.py               |  4 ++--
 4 files changed, 35 insertions(+), 19 deletions(-)

(limited to 'g4f/gui')

diff --git a/g4f/gui/client/index.html b/g4f/gui/client/index.html
index d6ad5241..463eb650 100644
--- a/g4f/gui/client/index.html
+++ b/g4f/gui/client/index.html
@@ -132,10 +132,18 @@
                 <label for="GeminiPro-api_key" class="label" title="">GeminiPro: api_key</label>
                 <textarea id="GeminiPro-api_key" name="GeminiPro[api_key]" placeholder="..."></textarea>
             </div>
+            <div class="field box">
+                <label for="OpenRouter-api_key" class="label" title="">OpenRouter: api_key</label>
+                <textarea id="OpenRouter-api_key" name="OpenRouter[api_key]" placeholder="..."></textarea>
+            </div>
             <div class="field box">
                 <label for="HuggingFace-api_key" class="label" title="">HuggingFace: api_key</label>
                 <textarea id="HuggingFace-api_key" name="HuggingFace[api_key]" placeholder="..."></textarea>
             </div>
+            <div class="field box">
+                <label for="DeepInfra-api_key" class="label" title="">DeepInfra: api_key</label>
+                <textarea id="DeepInfra-api_key" name="DeepInfra[api_key]" placeholder="..."></textarea>
+            </div>
             </div>
             <div class="bottom_buttons">
                 <button onclick="delete_conversations()">
diff --git a/g4f/gui/client/static/css/style.css b/g4f/gui/client/static/css/style.css
index 32fff3db..8e967806 100644
--- a/g4f/gui/client/static/css/style.css
+++ b/g4f/gui/client/static/css/style.css
@@ -109,7 +109,7 @@ body {
 }
 
 .conversations {
-    max-width: 280px;
+    max-width: 300px;
     padding: var(--section-gap);
     overflow: auto;
     flex-shrink: 0;
@@ -207,9 +207,9 @@ body {
     gap: 4px;
 }
 
-.conversations .convo .fa-trash {
+.conversations .convo .fa-ellipsis-vertical {
     position: absolute;
-    right: 8px;
+    right: 14px;
 }
 
 .conversations .convo .choise {
@@ -1075,6 +1075,10 @@ a:-webkit-any-link {
     resize: vertical;
 }
 
+.settings textarea {
+    height: 51px;
+}
+
 .settings {
     width: 100%;
     display: flex;
diff --git a/g4f/gui/client/static/js/chat.v1.js b/g4f/gui/client/static/js/chat.v1.js
index 5036a93b..628d0682 100644
--- a/g4f/gui/client/static/js/chat.v1.js
+++ b/g4f/gui/client/static/js/chat.v1.js
@@ -42,7 +42,7 @@ appStorage = window.localStorage || {
 const markdown = window.markdownit();
 const markdown_render = (content) => {
     return markdown.render(content
-        .replaceAll(/<!-- generated images start -->[\s\S]+<!-- generated images end -->/gm, "")
+        .replaceAll(/<!-- generated images start -->|<!-- generated images end -->/gm, "")
         .replaceAll(/<img data-prompt="[^>]+">/gm, "")
     )
         .replaceAll("<a href=", '<a target="_blank" href=')
@@ -127,9 +127,6 @@ const register_message_buttons = async () => {
                         sound.controls = 'controls';
                         sound.src = url;
                         sound.type = 'audio/wav';
-                        if (ended && !stopped) {
-                            sound.autoplay = true;
-                        }
                         sound.onended = function() {
                             ended = true;
                         };
@@ -140,6 +137,9 @@ const register_message_buttons = async () => {
                         container.classList.add("audio");
                         container.appendChild(sound);
                         content_el.appendChild(container);
+                        if (ended && !stopped) {
+                            sound.play();
+                        }
                     }
                     if (lines.length < 1 || stopped) {
                         el.classList.remove("active");
@@ -608,12 +608,11 @@ async function get_messages(conversation_id) {
 }
 
 async function add_conversation(conversation_id, content) {
-    if (content.length > 17) {
-        title = content.substring(0, 17) + '...'
+    if (content.length > 18) {
+        title = content.substring(0, 18) + '...'
     } else {
-        title = content + '&nbsp;'.repeat(19 - content.length)
+        title = content + '&nbsp;'.repeat(20 - content.length)
     }
-
     if (appStorage.getItem(`conversation:${conversation_id}`) == null) {
         await save_conversation(conversation_id, {
             id: conversation_id,
@@ -623,7 +622,6 @@ async function add_conversation(conversation_id, content) {
             items: [],
         });
     }
-
     history.pushState({}, null, `/chat/${conversation_id}`);
 }
 
@@ -695,27 +693,31 @@ const load_conversations = async () => {
 
     await clear_conversations();
 
-    for (conversation of conversations) {
+    conversations.sort((a, b) => (b.updated||0)-(a.updated||0));
+
+    let html = "";
+    conversations.forEach((conversation) => {
         let updated = "";
         if (conversation.updated) {
             const date = new Date(conversation.updated);
             updated = date.toLocaleString('en-GB', {dateStyle: 'short', timeStyle: 'short', monthStyle: 'short'});
             updated = updated.replace("/" + date.getFullYear(), "")
         }
-        box_conversations.innerHTML += `
+        html += `
             <div class="convo" id="convo-${conversation.id}">
                 <div class="left" onclick="set_conversation('${conversation.id}')">
                     <i class="fa-regular fa-comments"></i>
                     <span class="convo-title"><span class="datetime">${updated}</span> ${conversation.title}</span>
                 </div>
-                <i onclick="show_option('${conversation.id}')" class="fa-regular fa-trash" id="conv-${conversation.id}"></i>
+                <i onclick="show_option('${conversation.id}')" class="fa-solid fa-ellipsis-vertical" id="conv-${conversation.id}"></i>
                 <div id="cho-${conversation.id}" class="choise" style="display:none;">
-                    <i onclick="delete_conversation('${conversation.id}')" class="fa-regular fa-check"></i>
+                    <i onclick="delete_conversation('${conversation.id}')" class="fa-regular fa-trash"></i>
                     <i onclick="hide_option('${conversation.id}')" class="fa-regular fa-x"></i>
                 </div>
             </div>
         `;
-    }
+    });
+    box_conversations.innerHTML = html;
 };
 
 document.getElementById("cancelButton").addEventListener("click", async () => {
@@ -804,6 +806,7 @@ const register_settings_storage = async () => {
                         appStorage.setItem(element.id, element.selectedIndex);
                         break;
                     case "text":
+                    case "number":
                         appStorage.setItem(element.id, element.value);
                         break;
                     default:
@@ -828,6 +831,7 @@ const load_settings_storage = async () => {
                     element.selectedIndex = parseInt(value);
                     break;
                 case "text":
+                case "number":
                 case "textarea":
                     element.value = value;
                     break;
diff --git a/g4f/gui/server/api.py b/g4f/gui/server/api.py
index 2b3f2fb6..bbae6066 100644
--- a/g4f/gui/server/api.py
+++ b/g4f/gui/server/api.py
@@ -8,7 +8,7 @@ from g4f import version, models
 from g4f import get_last_provider, ChatCompletion
 from g4f.errors import VersionNotFoundError
 from g4f.Provider import ProviderType, __providers__, __map__
-from g4f.providers.base_provider import ProviderModelMixin
+from g4f.providers.base_provider import ProviderModelMixin, FinishReason
 from g4f.providers.conversation import BaseConversation
 
 conversations: dict[dict[str, BaseConversation]] = {}
@@ -134,7 +134,7 @@ class Api():
                 elif isinstance(chunk, Exception):
                     logging.exception(chunk)
                     yield self._format_json("message", get_error_message(chunk))
-                else:
+                elif not isinstance(chunk, FinishReason):
                     yield self._format_json("content", str(chunk))
         except Exception as e:
             logging.exception(e)
-- 
cgit v1.2.3