@@ -2071,14 +2071,14 @@ chatPrompt.addEventListener("input", function() {
});
window.addEventListener('load', async function() {
- if (!window.chat_id) {
+ if (!window.share_id) {
return await load_conversation(JSON.parse(appStorage.getItem(`conversation:${window.conversation_id}`)));
}
if (!window.conversation_id) {
- window.conversation_id = window.chat_id;
+ window.conversation_id = window.share_id;
}
- const response = await fetch(`${window.share_url}/backend-api/v2/chat/${window.chat_id ? window.chat_id : window.conversation_id}`, {
- headers: {'accept': 'application/json'},
+ const response = await fetch(`${window.share_url}/backend-api/v2/chat/${window.share_id}`, {
+ headers: {'accept': 'application/json', 'x-conversation-id': window.conversation_id},
});
if (!response.ok) {
return await load_conversation(JSON.parse(appStorage.getItem(`conversation:${window.conversation_id}`)));
@@ -2087,10 +2087,7 @@ window.addEventListener('load', async function() {
if (!window.conversation_id || conversation.id == window.conversation_id) {
window.conversation_id = conversation.id;
await load_conversation(conversation);
- appStorage.setItem(
- `conversation:${conversation.id}`,
- JSON.stringify(conversation)
- );
+ await save_conversation(window.conversation_id, JSON.stringify(conversation));
await load_conversations();
let refreshOnHide = true;
document.addEventListener("visibilitychange", () => {
@@ -2101,7 +2098,7 @@ window.addEventListener('load', async function() {
}
});
var refreshIntervalId = setInterval(async () => {
- if (!window.chat_id) {
+ if (!window.share_id) {
clearInterval(refreshIntervalId);
return;
}
@@ -2111,7 +2108,7 @@ window.addEventListener('load', async function() {
if (window.conversation_id != window.start_id) {
return;
}
- const response = await fetch(`${window.share_url}/backend-api/v2/chat/${window.chat_id}`, {
+ const response = await fetch(`${window.share_url}/backend-api/v2/chat/${window.share_id}`, {
headers: {
'accept': 'application/json',
'if-none-match': conversation.updated,
diff --git a/g4f/gui/client/static/js/photoswipe.js b/g4f/gui/client/static/js/photoswipe.js
index 003719ca..a079b403 100644
--- a/g4f/gui/client/static/js/photoswipe.js
+++ b/g4f/gui/client/static/js/photoswipe.js
@@ -4,7 +4,7 @@ import PhotoSwipeAutoHideUI from "https://cdn.jsdelivr.net/gh/arnowelzel/photosw
import PhotoSwipeSlideshow from "https://cdn.jsdelivr.net/gh/dpet23/photoswipe-slideshow@v2.0.0/photoswipe-slideshow.esm.min.js";
const lightbox = new PhotoSwipeLightbox({
- gallery: '#messages',
+ gallery: '#chatBody',
children: 'a:has(img)',
initialZoomLevel: 'fill',
secondaryZoomLevel: 1,
diff --git a/g4f/gui/server/backend_api.py b/g4f/gui/server/backend_api.py
index d265bb13..4ba080ea 100644
--- a/g4f/gui/server/backend_api.py
+++ b/g4f/gui/server/backend_api.py
@@ -371,6 +371,8 @@ class Backend_Api(Api):
match_files = [file for file, count in match_files.items() if count >= request.args.get("min", len(search))]
if int(request.args.get("skip", 0)) >= len(match_files):
return jsonify({"error": {"message": "Not found"}}), 404
+ if (request.args.get("random", False)):
+ return redirect(f"/media/{random.choice(match_files)}"), 302
return redirect(f"/media/{match_files[int(request.args.get("skip", 0))]}"), 302
@app.route('/backend-api/v2/upload_cookies', methods=['POST'])
@@ -386,12 +388,12 @@ class Backend_Api(Api):
return "File saved", 200
return 'Not supported file', 400
- @self.app.route('/backend-api/v2/chat/', methods=['GET'])
- def get_chat(chat_id: str) -> str:
- chat_id = secure_filename(chat_id)
- if self.chat_cache.get(chat_id, 0) == request.headers.get("if-none-match", 0):
+ @self.app.route('/backend-api/v2/chat/', methods=['GET'])
+ def get_chat(share_id: str) -> str:
+ share_id = secure_filename(share_id)
+ if self.chat_cache.get(share_id, 0) == request.headers.get("if-none-match", 0):
return jsonify({"error": {"message": "Not modified"}}), 304
- bucket_dir = get_bucket_dir(chat_id)
+ bucket_dir = get_bucket_dir(share_id)
file = os.path.join(bucket_dir, "chat.json")
if not os.path.isfile(file):
return jsonify({"error": {"message": "Not found"}}), 404
@@ -399,23 +401,23 @@ class Backend_Api(Api):
chat_data = json.load(f)
if chat_data.get("updated", 0) == request.headers.get("if-none-match", 0):
return jsonify({"error": {"message": "Not modified"}}), 304
- self.chat_cache[chat_id] = chat_data.get("updated", 0)
+ self.chat_cache[share_id] = chat_data.get("updated", 0)
return jsonify(chat_data), 200
- @self.app.route('/backend-api/v2/chat/', methods=['POST'])
- def upload_chat(chat_id: str) -> dict:
+ @self.app.route('/backend-api/v2/chat/', methods=['POST'])
+ def upload_chat(share_id: str) -> dict:
chat_data = {**request.json}
updated = chat_data.get("updated", 0)
- cache_value = self.chat_cache.get(chat_id, 0)
+ cache_value = self.chat_cache.get(share_id, 0)
if updated == cache_value:
return jsonify({"error": {"message": "invalid date"}}), 400
- chat_id = secure_filename(chat_id)
- bucket_dir = get_bucket_dir(chat_id)
+ share_id = secure_filename(share_id)
+ bucket_dir = get_bucket_dir(share_id)
os.makedirs(bucket_dir, exist_ok=True)
with open(os.path.join(bucket_dir, "chat.json"), 'w') as f:
json.dump(chat_data, f)
- self.chat_cache[chat_id] = updated
- return {"chat_id": chat_id}
+ self.chat_cache[share_id] = updated
+ return {"share_id": share_id}
def handle_synthesize(self, provider: str):
try:
diff --git a/g4f/gui/server/website.py b/g4f/gui/server/website.py
index 88155838..d2c30cab 100644
--- a/g4f/gui/server/website.py
+++ b/g4f/gui/server/website.py
@@ -19,12 +19,12 @@ class Website:
'function': self._chat,
'methods': ['GET', 'POST']
},
- '/chat//': {
- 'function': self._chat_id,
+ '/chat//': {
+ 'function': self._share_id,
'methods': ['GET', 'POST']
},
- '/chat//': {
- 'function': self._chat_id,
+ '/chat//': {
+ 'function': self._share_id,
'methods': ['GET', 'POST']
},
'/chat/menu/': {
@@ -50,9 +50,9 @@ class Website:
return render_template('index.html', conversation_id=str(uuid.uuid4()))
return render_template('index.html', conversation_id=conversation_id)
- def _chat_id(self, chat_id, conversation_id: str = ""):
+ def _share_id(self, share_id, conversation_id: str = ""):
share_url = os.environ.get("G4F_SHARE_URL", "")
- return render_template('index.html', share_url=share_url, chat_id=chat_id, conversation_id=conversation_id)
+ return render_template('index.html', share_url=share_url, share_id=share_id, conversation_id=conversation_id)
def _index(self):
return render_template('index.html', conversation_id=str(uuid.uuid4()))
diff --git a/g4f/image/copy_images.py b/g4f/image/copy_images.py
index c14cd6d4..01a55c75 100644
--- a/g4f/image/copy_images.py
+++ b/g4f/image/copy_images.py
@@ -25,8 +25,10 @@ def get_media_extension(media: str) -> str:
"""Extract media file extension from URL or filename"""
match = re.search(r"\.(j?[a-z]{3})(?:\?|$)", media, re.IGNORECASE)
extension = match.group(1).lower() if match else ""
+ if not extension:
+ return ""
if extension not in EXTENSIONS_MAP:
- raise ValueError(f"Unsupported media extension: {extension}")
+ raise ValueError(f"Unsupported media extension: {extension} in: {media}")
return f".{extension}"
def ensure_images_dir():
diff --git a/g4f/requests/__init__.py b/g4f/requests/__init__.py
index 3005220f..9db0ff7f 100644
--- a/g4f/requests/__init__.py
+++ b/g4f/requests/__init__.py
@@ -154,6 +154,7 @@ async def get_nodriver(
if not os.path.exists(browser_executable_path):
browser_executable_path = None
lock_file = Path(get_cookies_dir()) / ".nodriver_is_open"
+ lock_file.parent.mkdir(exist_ok=True)
# Implement a short delay (milliseconds) to prevent race conditions.
await asyncio.sleep(0.1 * random.randint(0, 50))
if lock_file.exists():