+
diff --git a/g4f/gui/client/static/js/chat.v1.js b/g4f/gui/client/static/js/chat.v1.js
index 9537f78c..66845ba7 100644
--- a/g4f/gui/client/static/js/chat.v1.js
+++ b/g4f/gui/client/static/js/chat.v1.js
@@ -39,6 +39,7 @@ let finish_storage = {};
let usage_storage = {};
let reasoning_storage = {};
let generate_storage = {};
+let title_ids_storage = {};
let is_demo = false;
let wakeLock = null;
let countTokensEnabled = true;
@@ -74,6 +75,8 @@ if (window.markdownit) {
)
.replaceAll("
+ ${markdown_render(message)}
+ ${images.map((object)=>`
`).join("")}
-
-
`;
- highlight(message_box);
+ message_box.appendChild(message_el);
+ highlight(message_el);
if (do_ask_gpt) {
const all_pinned = document.querySelectorAll(".buttons button.pinned")
if (all_pinned.length > 0) {
@@ -1012,7 +1019,7 @@ const ask_gpt = async (message_id, message_index = -1, regenerate = false, provi
}
try {
let api_key;
- if (is_demo && provider == "Feature") {
+ if (is_demo && ["OpenaiChat", "DeepSeekAPI", "PollinationsAI"].includes(provider)) {
api_key = localStorage.getItem("user");
} else if (["HuggingSpace", "G4F"].includes(provider)) {
api_key = localStorage.getItem("HuggingSpace-api_key");
@@ -1096,9 +1103,30 @@ const clear_conversation = async () => {
}
};
+var illegalRe = /[\/\?<>\\:\*\|":]/g;
+var controlRe = /[\x00-\x1f\x80-\x9f]/g;
+var reservedRe = /^\.+$/;
+var windowsReservedRe = /^(con|prn|aux|nul|com[0-9]|lpt[0-9])(\..*)?$/i;
+
+function sanitize(input, replacement) {
+ var sanitized = input
+ .replace(illegalRe, replacement)
+ .replace(controlRe, replacement)
+ .replace(reservedRe, replacement)
+ .replace(windowsReservedRe, replacement);
+ return sanitized.replaceAll(/\/|#|\s{2,}/g, replacement).trim();
+}
+
async function set_conversation_title(conversation_id, title) {
conversation = await get_conversation(conversation_id)
conversation.new_title = title;
+ const new_id = sanitize(title, " ");
+ if (new_id && !appStorage.getItem(`conversation:${new_id}`)) {
+ appStorage.removeItem(`conversation:${conversation.id}`);
+ title_ids_storage[conversation_id] = new_id;
+ conversation.id = new_id;
+ add_url_to_history(`/chat/${conversation_id}`);
+ }
appStorage.setItem(
`conversation:${conversation.id}`,
JSON.stringify(conversation)
@@ -1123,6 +1151,7 @@ const show_option = async (conversation_id) => {
input_el.onclick = (e) => e.stopPropagation()
input_el.onfocus = () => trash_el.style.display = "none";
input_el.onchange = () => set_conversation_title(conversation_id, input_el.value);
+ input_el.onblur = () => set_conversation_title(conversation_id, input_el.value);
left_el.removeChild(title_el);
left_el.appendChild(input_el);
}
@@ -1162,6 +1191,9 @@ const delete_conversation = async (conversation_id) => {
};
const set_conversation = async (conversation_id) => {
+ if (title_ids_storage[conversation_id]) {
+ conversation_id = title_ids_storage[conversation_id];
+ }
try {
add_url_to_history(`/chat/${conversation_id}`);
} catch (e) {
@@ -1912,11 +1944,11 @@ async function on_load() {
messageInput.focus();
//await handle_ask();
}
- } else if (/\/chat\/[^?]+/.test(window.location.href)) {
- load_conversation(window.conversation_id);
- } else {
+ } else if (/\/chat\/[?$]/.test(window.location.href)) {
chatPrompt.value = document.getElementById("systemPrompt")?.value || "";
say_hello();
+ } else {
+ load_conversation(window.conversation_id);
}
load_conversations();
}
@@ -2007,7 +2039,8 @@ async function on_api() {
}
providerSelect.innerHTML = `
-
+
+
@@ -2340,7 +2373,6 @@ fileInput.addEventListener('change', async (event) => {
Object.keys(data).forEach(key => {
if (key == "options") {
Object.keys(data[key]).forEach(keyOption => {
- console.log(keyOption, data[key][keyOption]);
appStorage.setItem(keyOption, data[key][keyOption]);
count += 1;
});
diff --git a/g4f/gui/server/backend_api.py b/g4f/gui/server/backend_api.py
index 28c74251..dbbd2e65 100644
--- a/g4f/gui/server/backend_api.py
+++ b/g4f/gui/server/backend_api.py
@@ -14,12 +14,6 @@ from pathlib import Path
from urllib.parse import quote_plus
from hashlib import sha256
from werkzeug.utils import secure_filename
-try:
- from flask_limiter import Limiter
- from flask_limiter.util import get_remote_address
- has_flask_limiter = True
-except ImportError:
- has_flask_limiter = False
from ...image import is_allowed_extension, to_image
from ...client.service import convert_to_provider
@@ -62,19 +56,8 @@ class Backend_Api(Api):
"""
self.app: Flask = app
- if has_flask_limiter and app.demo:
- limiter = Limiter(
- get_remote_address,
- app=app,
- default_limits=["200 per day", "50 per hour"],
- storage_uri="memory://",
- auto_check=False,
- strategy="moving-window",
- )
-
- if has_flask_limiter and app.demo:
+ if app.demo:
@app.route('/', methods=['GET'])
- @limiter.exempt
def home():
return render_template('demo.html', backend_url=os.environ.get("G4F_BACKEND_URL", ""))
else:
@@ -116,7 +99,7 @@ class Backend_Api(Api):
}
for model, providers in models.demo_models.values()]
- def handle_conversation(limiter_check: callable = None):
+ def handle_conversation():
"""
Handles conversation requests and streams responses back.
@@ -135,7 +118,7 @@ class Backend_Api(Api):
else:
json_data = request.json
- if app.demo and json_data.get("provider") not in ["Custom", "Feature", "HuggingFace", "HuggingSpace", "HuggingChat", "G4F", "PollinationsAI"]:
+ if app.demo and json_data.get("provider") not in ["DeepSeekAPI", "OpenaiChat", "HuggingFace", "HuggingSpace", "HuggingChat", "G4F", "PollinationsAI"]:
model = json_data.get("model")
if model != "default" and model in models.demo_models:
json_data["provider"] = random.choice(models.demo_models[model][1])
@@ -143,8 +126,6 @@ class Backend_Api(Api):
if not model or model == "default":
json_data["model"] = models.demo_models["default"][0].name
json_data["provider"] = random.choice(models.demo_models["default"][1])
- if limiter_check is not None and json_data.get("provider") in ["Feature"]:
- limiter_check()
if "images" in json_data:
kwargs["images"] = json_data["images"]
kwargs = self._prepare_conversation_kwargs(json_data, kwargs)
@@ -158,15 +139,9 @@ class Backend_Api(Api):
mimetype='text/event-stream'
)
- if has_flask_limiter and app.demo:
- @app.route('/backend-api/v2/conversation', methods=['POST'])
- @limiter.limit("2 per minute")
- def _handle_conversation():
- return handle_conversation(limiter.check)
- else:
- @app.route('/backend-api/v2/conversation', methods=['POST'])
- def _handle_conversation():
- return handle_conversation()
+ @app.route('/backend-api/v2/conversation', methods=['POST'])
+ def _handle_conversation():
+ return handle_conversation()
@app.route('/backend-api/v2/usage', methods=['POST'])
def add_usage():
diff --git a/g4f/gui/server/website.py b/g4f/gui/server/website.py
index 407fc706..213d4ab9 100644
--- a/g4f/gui/server/website.py
+++ b/g4f/gui/server/website.py
@@ -33,8 +33,6 @@ class Website:
def _chat(self, conversation_id):
if conversation_id == "share":
return render_template('index.html', chat_id=str(uuid.uuid4()))
- if '-' not in conversation_id:
- return redirect_home()
return render_template('index.html', chat_id=conversation_id)
def _index(self):
diff --git a/g4f/providers/retry_provider.py b/g4f/providers/retry_provider.py
index 6b8ca3b0..1c3f2c21 100644
--- a/g4f/providers/retry_provider.py
+++ b/g4f/providers/retry_provider.py
@@ -87,7 +87,7 @@ class IterListProvider(BaseRetryProvider):
for provider in self.get_providers(stream and not ignore_stream, ignored):
self.last_provider = provider
debug.log(f"Using {provider.__name__} provider")
- yield ProviderInfo(**provider.get_dict())
+ yield ProviderInfo(**provider.get_dict(), model=model if model else getattr(provider, "default_model"))
try:
response = provider.get_async_create_function()(model, messages, stream=stream, **kwargs)
if hasattr(response, "__aiter__"):
--
cgit v1.2.3
From ee9e0c38268ae01acce4245782bb306d9cf800e5 Mon Sep 17 00:00:00 2001
From: hlohaus <983577+hlohaus@users.noreply.github.com>
Date: Mon, 24 Feb 2025 15:50:50 +0100
Subject: Add Gemini provider to Demo
---
g4f/gui/client/static/js/chat.v1.js | 3 ++-
g4f/gui/server/backend_api.py | 2 +-
g4f/providers/retry_provider.py | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
(limited to 'g4f')
diff --git a/g4f/gui/client/static/js/chat.v1.js b/g4f/gui/client/static/js/chat.v1.js
index 66845ba7..68641b8e 100644
--- a/g4f/gui/client/static/js/chat.v1.js
+++ b/g4f/gui/client/static/js/chat.v1.js
@@ -1019,7 +1019,7 @@ const ask_gpt = async (message_id, message_index = -1, regenerate = false, provi
}
try {
let api_key;
- if (is_demo && ["OpenaiChat", "DeepSeekAPI", "PollinationsAI"].includes(provider)) {
+ if (is_demo && ["OpenaiChat", "DeepSeekAPI", "PollinationsAI", "Gemini"].includes(provider)) {
api_key = localStorage.getItem("user");
} else if (["HuggingSpace", "G4F"].includes(provider)) {
api_key = localStorage.getItem("HuggingSpace-api_key");
@@ -2043,6 +2043,7 @@ async function on_api() {
+
`;
diff --git a/g4f/gui/server/backend_api.py b/g4f/gui/server/backend_api.py
index dbbd2e65..1dc66223 100644
--- a/g4f/gui/server/backend_api.py
+++ b/g4f/gui/server/backend_api.py
@@ -118,7 +118,7 @@ class Backend_Api(Api):
else:
json_data = request.json
- if app.demo and json_data.get("provider") not in ["DeepSeekAPI", "OpenaiChat", "HuggingFace", "HuggingSpace", "HuggingChat", "G4F", "PollinationsAI"]:
+ if app.demo and not json_data.get("provider"):
model = json_data.get("model")
if model != "default" and model in models.demo_models:
json_data["provider"] = random.choice(models.demo_models[model][1])
diff --git a/g4f/providers/retry_provider.py b/g4f/providers/retry_provider.py
index 1c3f2c21..a85c136c 100644
--- a/g4f/providers/retry_provider.py
+++ b/g4f/providers/retry_provider.py
@@ -59,7 +59,7 @@ class IterListProvider(BaseRetryProvider):
for chunk in response:
if chunk:
yield chunk
- if isinstance(chunk, str) or isinstance(chunk, ImageResponse):
+ if isinstance(chunk, (str, ImageResponse)):
started = True
if started:
return
@@ -94,7 +94,7 @@ class IterListProvider(BaseRetryProvider):
async for chunk in response:
if chunk:
yield chunk
- if isinstance(chunk, str) or isinstance(chunk, ImageResponse):
+ if isinstance(chunk, (str, ImageResponse)):
started = True
elif response:
response = await response
--
cgit v1.2.3
- ${markdown_render(message)}
- ${images.map((object)=>'
').join("")}
-
-
- ${countTokensEnabled ? count_words_and_tokens(message, get_selected_model()?.value) : ""}
-
+
+ ${countTokensEnabled ? count_words_and_tokens(message, get_selected_model()?.value) : ""}