From ba60296677cdddb622fad71f957ecf1e442a0fca Mon Sep 17 00:00:00 2001
From: hlohaus <983577+hlohaus@users.noreply.github.com>
Date: Sat, 22 Feb 2025 13:19:52 +0100
Subject: Fix unittest, update model lists

---
 g4f/Provider/PollinationsAI.py         |   5 +-
 g4f/Provider/PollinationsImage.py      |   1 -
 g4f/Provider/needs_auth/Gemini.py      |  38 +++++++++++--
 g4f/gui/client/index.html              |  46 +--------------
 g4f/gui/client/static/css/style.css    |  14 +++++
 g4f/gui/client/static/js/chat.v1.js    | 101 ++++++++++++++++++++-------------
 g4f/gui/client/static/js/photoswipe.js |  63 ++++++++++++++++++++
 g4f/gui/server/api.py                  |   4 ++
 g4f/gui/server/backend_api.py          |   8 +--
 g4f/models.py                          |   2 +-
 g4f/requests/curl_cffi.py              |   1 +
 g4f/tools/files.py                     |   4 +-
 12 files changed, 187 insertions(+), 100 deletions(-)
 create mode 100644 g4f/gui/client/static/js/photoswipe.js

(limited to 'g4f')

diff --git a/g4f/Provider/PollinationsAI.py b/g4f/Provider/PollinationsAI.py
index 43f7a934..10242ff4 100644
--- a/g4f/Provider/PollinationsAI.py
+++ b/g4f/Provider/PollinationsAI.py
@@ -39,7 +39,7 @@ class PollinationsAI(AsyncGeneratorProvider, ProviderModelMixin):
     default_model = "openai"
     default_image_model = "flux"
     default_vision_model = "gpt-4o"
-    extra_image_models = ["flux-pro", "flux-dev", "flux-schnell", "midjourney", "dall-e-3"]
+    image_models = ["flux-pro", "flux-dev", "flux-schnell", "midjourney", "dall-e-3", "turbo"]
     vision_models = [default_vision_model, "gpt-4o-mini"]
     extra_text_models = ["claude", "claude-email", "deepseek-reasoner", "deepseek-r1"] + vision_models
     model_aliases = {
@@ -67,7 +67,6 @@ class PollinationsAI(AsyncGeneratorProvider, ProviderModelMixin):
         "sdxl-turbo": "turbo",
     }
     text_models = []
-    image_models = []
 
     @classmethod
     def get_models(cls, **kwargs):
@@ -76,7 +75,7 @@ class PollinationsAI(AsyncGeneratorProvider, ProviderModelMixin):
                 image_response = requests.get("https://image.pollinations.ai/models")
                 image_response.raise_for_status()
                 new_image_models = image_response.json()
-                cls.image_models = list(dict.fromkeys([*cls.extra_image_models, *new_image_models]))
+                cls.image_models = list(dict.fromkeys([*cls.image_models, *new_image_models]))
                 
                 text_response = requests.get("https://text.pollinations.ai/models")
                 text_response.raise_for_status()
diff --git a/g4f/Provider/PollinationsImage.py b/g4f/Provider/PollinationsImage.py
index bdbc2035..591de7e7 100644
--- a/g4f/Provider/PollinationsImage.py
+++ b/g4f/Provider/PollinationsImage.py
@@ -10,7 +10,6 @@ class PollinationsImage(PollinationsAI):
     default_model = "flux"
     default_vision_model = None
     default_image_model = default_model
-    image_models = [default_image_model]
 
     @classmethod
     def get_models(cls, **kwargs):
diff --git a/g4f/Provider/needs_auth/Gemini.py b/g4f/Provider/needs_auth/Gemini.py
index 1e954183..077fa927 100644
--- a/g4f/Provider/needs_auth/Gemini.py
+++ b/g4f/Provider/needs_auth/Gemini.py
@@ -19,7 +19,7 @@ from ... import debug
 from ...typing import Messages, Cookies, ImagesType, AsyncResult, AsyncIterator
 from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin
 from ..helper import format_prompt, get_cookies
-from ...providers.response import JsonConversation, SynthesizeData, RequestLogin, ImageResponse
+from ...providers.response import JsonConversation, Reasoning, RequestLogin, ImageResponse
 from ...requests.raise_for_status import raise_for_status
 from ...requests.aiohttp import get_connector
 from ...requests import get_nodriver
@@ -53,6 +53,17 @@ UPLOAD_IMAGE_HEADERS = {
     "x-tenant-id": "bard-storage",
 }
 
+models = {
+    "gemini-2.0-flash": {"x-goog-ext-525001261-jspb": '[null,null,null,null,"f299729663a2343f"]'},
+    "gemini-2.0-flash-exp": {"x-goog-ext-525001261-jspb": '[null,null,null,null,"f299729663a2343f"]'},
+    "gemini-2.0-flash-thinking": {"x-goog-ext-525001261-jspb": '[null,null,null,null,"9c17b1863f581b8a"]'},
+    "gemini-2.0-flash-thinking-with-apps": {"x-goog-ext-525001261-jspb": '[null,null,null,null,"f8f8f5ea629f5d37"]'},
+    "gemini-2.0-exp-advanced": {"x-goog-ext-525001261-jspb": '[null,null,null,null,"b1e46a6037e6aa9f"]'},
+    "gemini-1.5-flash": {"x-goog-ext-525001261-jspb": '[null,null,null,null,"418ab5ea040b5c43"]'},
+    "gemini-1.5-pro": {"x-goog-ext-525001261-jspb": '[null,null,null,null,"9d60dfae93c9ff1f"]'},
+    "gemini-1.5-pro-research": {"x-goog-ext-525001261-jspb": '[null,null,null,null,"e5a44cb1dae2b489"]'},
+}
+
 class Gemini(AsyncGeneratorProvider, ProviderModelMixin):
     label = "Google Gemini"
     url = "https://gemini.google.com"
@@ -61,11 +72,14 @@ class Gemini(AsyncGeneratorProvider, ProviderModelMixin):
     working = True
     use_nodriver = True
     
-    default_model = 'gemini'
+    default_model = ""
     default_image_model = default_model
     default_vision_model = default_model
     image_models = [default_image_model]
-    models = [default_model, "gemini-2.0"]
+    models = [
+        default_model, *models.keys()
+    ]
+    model_aliases = {"gemini-2.0": ""}
 
     synthesize_content_type = "audio/vnd.wav"
     
@@ -131,7 +145,6 @@ class Gemini(AsyncGeneratorProvider, ProviderModelMixin):
             if not cls._snlm0e:
                 raise RuntimeError("Invalid cookies. SNlM0e not found")
 
-            yield SynthesizeData(cls.__name__, {"text": messages[-1]["content"]})
             images = await cls.upload_images(base_connector, images) if images else None
             async with ClientSession(
                 cookies=cls._cookies,
@@ -158,6 +171,7 @@ class Gemini(AsyncGeneratorProvider, ProviderModelMixin):
                     REQUEST_URL,
                     data=data,
                     params=params,
+                    headers=models[model] if model in models else None
                 ) as response:
                     await raise_for_status(response)
                     image_prompt = response_part = None
@@ -177,7 +191,23 @@ class Gemini(AsyncGeneratorProvider, ProviderModelMixin):
                                 continue
                             if return_conversation:
                                 yield Conversation(response_part[1][0], response_part[1][1], response_part[4][0][0])
+                            def read_recusive(data):
+                                for item in data:
+                                    if isinstance(item, list):
+                                        yield from read_recusive(item)
+                                    elif isinstance(item, str) and not item.startswith("rc_"):
+                                        yield item
+                            def first_str(data, skip=0):
+                                for item in read_recusive(data):
+                                    if skip > 0:
+                                        skip -= 1
+                                        continue
+                                    yield item
+                            reasoning = "".join(first_str(response_part[4][0], 3))
                             content = response_part[4][0][1][0]
+                            if reasoning:
+                                yield Reasoning(status="🤔")
+                                yield Reasoning(reasoning)
                         except (ValueError, KeyError, TypeError, IndexError) as e:
                             debug.error(f"{cls.__name__} {type(e).__name__}: {e}")
                             continue
diff --git a/g4f/gui/client/index.html b/g4f/gui/client/index.html
index a0def867..f007a084 100644
--- a/g4f/gui/client/index.html
+++ b/g4f/gui/client/index.html
@@ -49,51 +49,7 @@
             document.head.appendChild(template.content);
         }
     </script>
-    <script type="module" async>
-        import PhotoSwipeLightbox from 'https://cdn.jsdelivr.net/npm/photoswipe/dist/photoswipe-lightbox.esm.js';
-        const lightbox = new PhotoSwipeLightbox({
-            gallery: '#messages',
-            children: 'a:has(img)',
-            secondaryZoomLevel: 2,
-            allowPanToNext: true,
-            pswpModule: () => import('https://cdn.jsdelivr.net/npm/photoswipe'),
-        });
-        lightbox.addFilter('itemData', (itemData, index) => {
-            const img = itemData.element.querySelector('img');
-            itemData.width = img.naturalWidth || 1024;
-            itemData.height = img.naturalHeight || 1024;
-            return itemData;
-        });
-        lightbox.on('uiRegister', function() {
-            lightbox.pswp.ui.registerElement({
-                name: 'custom-caption',
-                order: 9,
-                isButton: false,
-                appendTo: 'root',
-                html: 'Caption text',
-                onInit: (el, pswp) => {
-                    lightbox.pswp.on('change', () => {
-                        const currSlideElement = lightbox.pswp.currSlide.data.element;
-                        if (currSlideElement) {
-                            const img = currSlideElement.querySelector('img');
-                            const download = document.createElement("a");
-                            download.setAttribute("href", img.getAttribute('src'));
-                            let extension = img.getAttribute('src').includes(".webp") ? ".webp" : ".jpg";
-                            download.setAttribute("download", `${img.getAttribute('alt')} ${lightbox.pswp.currSlide.index}${extension}`);
-                            download.style.float = "right";
-                            download.innerHTML = '<i class="fa-solid fa-download"></i>';
-                            let span = document.createElement("span");
-                            span.innerText = img.getAttribute('alt');
-                            el.innerHTML = '';
-                            el.appendChild(download);
-                            el.appendChild(span);
-                        }
-                    });
-                }
-            });
-        });
-        lightbox.init();
-    </script>
+    <script type="module" src="/static/js/photoswipe.js" async></script>
     <script>
         const user_image = '<img src="/static/img/user.png" alt="your avatar">';
         const gpt_image = '<img src="/static/img/gpt.png" alt="your avatar">';
diff --git a/g4f/gui/client/static/css/style.css b/g4f/gui/client/static/css/style.css
index e1c9b835..3bc5b2c5 100644
--- a/g4f/gui/client/static/css/style.css
+++ b/g4f/gui/client/static/css/style.css
@@ -942,6 +942,20 @@ input.model:hover
     color: #fff;
     text-decoration: underline;
 }
+.pswp__button--playpause-button {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    margin-left: 6px;
+}
+.pswp__progress-bar {
+    position: fixed;
+    bottom: 0;
+
+    /* default position is "top", from the `progressBarPosition` option,
+        need to reset it for this example */
+    top: auto !important;
+}
 
 .slide-systemPrompt {
     position: absolute;
diff --git a/g4f/gui/client/static/js/chat.v1.js b/g4f/gui/client/static/js/chat.v1.js
index 089160b1..f08e38d7 100644
--- a/g4f/gui/client/static/js/chat.v1.js
+++ b/g4f/gui/client/static/js/chat.v1.js
@@ -23,6 +23,7 @@ const album             = document.querySelector(".images");
 const log_storage       = document.querySelector(".log");
 const switchInput       = document.getElementById("switch");
 const searchButton      = document.getElementById("search");
+const paperclip         = document.querySelector(".user-input .fa-paperclip");
 
 const optionElementsSelector = ".settings input, .settings textarea, #model, #model2, #provider";
 
@@ -400,6 +401,23 @@ const handle_ask = async (do_ask_gpt = true) => {
     await count_input()
     await add_conversation(window.conversation_id);
 
+    // Is message a url?
+    const expression = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)/gi;
+    const regex = new RegExp(expression);
+    if (message.match(regex)) {
+        paperclip.classList.add("blink");
+        const blob = new Blob([JSON.stringify([{url: message}])], { type: 'application/json' });
+        const file = new File([blob], 'downloads.json', { type: 'application/json' }); // Create File object
+        let formData = new FormData();
+        formData.append('files', file); // Append as a file
+        const bucket_id = uuid();
+        await fetch(`/backend-api/v2/files/${bucket_id}`, {
+            method: 'POST',
+            body: formData
+        });
+        connectToSSE(`/backend-api/v2/files/${bucket_id}`, false, bucket_id); //Retrieve and refine
+        return;
+    }
     let message_index = await add_message(window.conversation_id, "user", message);
     let message_id = get_message_id();
 
@@ -1990,6 +2008,7 @@ async function on_api() {
         providerSelect.innerHTML = `
             <option value="" selected="selected">Demo Mode</option>
             <option value="Feature">Feature Provider</option>
+            <option value="PollinationsAI">Pollinations AI</option>
             <option value="G4F">G4F framework</option>
             <option value="HuggingFace">HuggingFace</option>
             <option value="HuggingSpace">HuggingSpace</option>
@@ -2248,14 +2267,51 @@ function formatFileSize(bytes) {
     return `${bytes.toFixed(2)} ${units[unitIndex]}`;
 }
 
+function connectToSSE(url, do_refine, bucket_id) {
+    const eventSource = new EventSource(url);
+    eventSource.onmessage = (event) => {
+        const data = JSON.parse(event.data);
+        if (data.error) {
+            inputCount.innerText = `Error: ${data.error.message}`;
+            paperclip.classList.remove("blink");
+            fileInput.value = "";
+        } else if (data.action == "load") {
+            inputCount.innerText = `Read data: ${formatFileSize(data.size)}`;
+        } else if (data.action == "refine") {
+            inputCount.innerText = `Refine data: ${formatFileSize(data.size)}`;
+        } else if (data.action == "download") {
+            inputCount.innerText = `Download: ${data.count} files`;
+        } else if (data.action == "done") {
+            if (do_refine) {
+                do_refine = false;
+                connectToSSE(`/backend-api/v2/files/${bucket_id}?refine_chunks_with_spacy=true`, do_refine, bucket_id);
+                return;
+            }
+            appStorage.setItem(`bucket:${bucket_id}`, data.size);
+            inputCount.innerText = "Files are loaded successfully";
+            if (!messageInput.value) {
+                messageInput.value = JSON.stringify({bucket_id: bucket_id});
+                handle_ask(false);
+            } else {
+                messageInput.value += (messageInput.value ? "\n" : "") + JSON.stringify({bucket_id: bucket_id}) + "\n";
+                paperclip.classList.remove("blink");
+                fileInput.value = "";
+            }
+        }
+    };
+    eventSource.onerror = (event) => {
+        eventSource.close();
+        paperclip.classList.remove("blink");
+    }
+}
+
 async function upload_files(fileInput) {
-    const paperclip = document.querySelector(".user-input .fa-paperclip");
     const bucket_id = uuid();
     paperclip.classList.add("blink");
 
     const formData = new FormData();
     Array.from(fileInput.files).forEach(file => {
-        formData.append('files[]', file);
+        formData.append('files', file);
     });
     await fetch("/backend-api/v2/files/" + bucket_id, {
         method: 'POST',
@@ -2263,44 +2319,7 @@ async function upload_files(fileInput) {
     });
 
     let do_refine = document.getElementById("refine")?.checked;
-    function connectToSSE(url) {
-        const eventSource = new EventSource(url);
-        eventSource.onmessage = (event) => {
-            const data = JSON.parse(event.data);
-            if (data.error) {
-                inputCount.innerText = `Error: ${data.error.message}`;
-                paperclip.classList.remove("blink");
-                fileInput.value = "";
-            } else if (data.action == "load") {
-                inputCount.innerText = `Read data: ${formatFileSize(data.size)}`;
-            } else if (data.action == "refine") {
-                inputCount.innerText = `Refine data: ${formatFileSize(data.size)}`;
-            } else if (data.action == "download") {
-                inputCount.innerText = `Download: ${data.count} files`;
-            } else if (data.action == "done") {
-                if (do_refine) {
-                    do_refine = false;
-                    connectToSSE(`/backend-api/v2/files/${bucket_id}?refine_chunks_with_spacy=true`);
-                    return;
-                }
-                appStorage.setItem(`bucket:${bucket_id}`, data.size);
-                inputCount.innerText = "Files are loaded successfully";
-                if (!messageInput.value) {
-                    messageInput.value = JSON.stringify({bucket_id: bucket_id});
-                    handle_ask(false);
-                } else {
-                    messageInput.value += (messageInput.value ? "\n" : "") + JSON.stringify({bucket_id: bucket_id}) + "\n";
-                    paperclip.classList.remove("blink");
-                    fileInput.value = "";
-                }
-            }
-        };
-        eventSource.onerror = (event) => {
-            eventSource.close();
-            paperclip.classList.remove("blink");
-        }
-    }
-    connectToSSE(`/backend-api/v2/files/${bucket_id}`);
+    connectToSSE(`/backend-api/v2/files/${bucket_id}`, do_refine, bucket_id);
 }
 
 fileInput.addEventListener('change', async (event) => {
@@ -2416,7 +2435,7 @@ async function api(ressource, args=null, files=null, message_id=null, scroll=tru
         if (files !== null) {
             const formData = new FormData();
             for (const file of files) {
-                formData.append('files[]', file)
+                formData.append('files', file)
             }
             formData.append('json', body);
             body = formData;
diff --git a/g4f/gui/client/static/js/photoswipe.js b/g4f/gui/client/static/js/photoswipe.js
new file mode 100644
index 00000000..003719ca
--- /dev/null
+++ b/g4f/gui/client/static/js/photoswipe.js
@@ -0,0 +1,63 @@
+import PhotoSwipeLightbox from "https://cdn.jsdelivr.net/npm/photoswipe@5.3.8/dist/photoswipe-lightbox.esm.min.js";
+import PhotoSwipeVideoPlugin from "https://cdn.jsdelivr.net/gh/dimsemenov/photoswipe-video-plugin@5e32d6589df53df2887900bcd55267d72aee57a6/dist/photoswipe-video-plugin.esm.min.js";
+import PhotoSwipeAutoHideUI from "https://cdn.jsdelivr.net/gh/arnowelzel/photoswipe-auto-hide-ui@1.0.1/photoswipe-auto-hide-ui.esm.min.js";
+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',
+    children: 'a:has(img)',
+    initialZoomLevel: 'fill',
+    secondaryZoomLevel: 1,
+    maxZoomLevel: 2,
+    allowPanToNext: true,
+    doubleTapAction: 'close',
+    pswpModule: () => import('https://cdn.jsdelivr.net/npm/photoswipe'),
+});
+lightbox.addFilter('itemData', (itemData, index) => {
+    const img = itemData.element.querySelector('img');
+    itemData.width = img.naturalWidth || 1024;
+    itemData.height = img.naturalHeight || 1024;
+    return itemData;
+});
+lightbox.on('uiRegister', function() {
+    lightbox.pswp.ui.registerElement({
+        name: 'custom-caption',
+        order: 9,
+        isButton: false,
+        appendTo: 'root',
+        html: 'Caption text',
+        onInit: (el, pswp) => {
+            lightbox.pswp.on('change', () => {
+                const currSlideElement = lightbox.pswp.currSlide.data.element;
+                if (currSlideElement) {
+                    const img = currSlideElement.querySelector('img');
+                    const download = document.createElement("a");
+                    download.setAttribute("href", img.getAttribute('src'));
+                    let extension = img.getAttribute('src').includes(".webp") ? ".webp" : ".jpg";
+                    download.setAttribute("download", `${img.getAttribute('alt')} ${lightbox.pswp.currSlide.index}${extension}`);
+                    download.style.float = "right";
+                    download.innerHTML = '<i class="fa-solid fa-download"></i>';
+                    let span = document.createElement("span");
+                    span.innerText = img.getAttribute('alt');
+                    el.innerHTML = '';
+                    el.appendChild(download);
+                    el.appendChild(span);
+                }
+            });
+        }
+    });
+});
+// Add a slideshow to the PhotoSwipe gallery.
+const _slideshowPlugin = new PhotoSwipeSlideshow(lightbox, {
+    defaultDelayMs: 7000,
+    restartOnSlideChange: true,
+    progressBarPosition: "top",
+    autoHideProgressBar: false
+});
+
+// Plugin to display video.
+const _videoPlugin = new PhotoSwipeVideoPlugin(lightbox, {});
+
+// Hide the PhotoSwipe UI after some time of inactivity.
+const _autoHideUI = new PhotoSwipeAutoHideUI(lightbox, {});
+lightbox.init();
\ No newline at end of file
diff --git a/g4f/gui/server/api.py b/g4f/gui/server/api.py
index f8e81700..23ad2691 100644
--- a/g4f/gui/server/api.py
+++ b/g4f/gui/server/api.py
@@ -19,6 +19,8 @@ from ... import version, models
 from ... import ChatCompletion, get_model_and_provider
 from ... import debug
 
+logger = logging.getLogger(__name__)
+
 conversations: dict[dict[str, BaseConversation]] = {}
 
 class Api:
@@ -184,6 +186,7 @@ class Api:
                         else:
                             yield self._format_json("conversation_id", conversation_id)
                 elif isinstance(chunk, Exception):
+                    logger.exception(chunk)
                     debug.error(chunk)
                     yield self._format_json('message', get_error_message(chunk), error=type(chunk).__name__)
                 elif isinstance(chunk, PreviewResponse):
@@ -219,6 +222,7 @@ class Api:
                     yield self._format_json("content", str(chunk))
                 yield from self._yield_logs()
         except Exception as e:
+            logger.exception(e)
             debug.error(e)
             yield from self._yield_logs()
             yield self._format_json('error', type(e).__name__, message=get_error_message(e))
diff --git a/g4f/gui/server/backend_api.py b/g4f/gui/server/backend_api.py
index 287e728b..28c74251 100644
--- a/g4f/gui/server/backend_api.py
+++ b/g4f/gui/server/backend_api.py
@@ -124,9 +124,9 @@ class Backend_Api(Api):
                 Response: A Flask response object for streaming.
             """
             kwargs = {}
-            if "files[]" in request.files:
+            if "files" in request.files:
                 images = []
-                for file in request.files.getlist('files[]'):
+                for file in request.files.getlist('files'):
                     if file.filename != '' and is_allowed_extension(file.filename):
                         images.append((to_image(file.stream, file.filename.endswith('.svg')), file.filename))
                 kwargs['images'] = images
@@ -135,7 +135,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"]:
+            if app.demo and json_data.get("provider") not in ["Custom", "Feature", "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])
@@ -329,7 +329,7 @@ class Backend_Api(Api):
             bucket_dir = get_bucket_dir(bucket_id)
             os.makedirs(bucket_dir, exist_ok=True)
             filenames = []
-            for file in request.files.getlist('files[]'):
+            for file in request.files.getlist('files'):
                 try:
                     filename = secure_filename(file.filename)
                     if supports_filename(filename):
diff --git a/g4f/models.py b/g4f/models.py
index 4ff756a6..ee969168 100644
--- a/g4f/models.py
+++ b/g4f/models.py
@@ -625,7 +625,7 @@ flux = ImageModel(
 flux_pro = ImageModel(
     name = 'flux-pro',
     base_provider = 'Black Forest Labs',
-    best_provider = PollinationsAI
+    best_provider = PollinationsImage
 )
 
 flux_dev = ImageModel(
diff --git a/g4f/requests/curl_cffi.py b/g4f/requests/curl_cffi.py
index c0e00e90..ff770396 100644
--- a/g4f/requests/curl_cffi.py
+++ b/g4f/requests/curl_cffi.py
@@ -51,6 +51,7 @@ class StreamResponse:
         """Asynchronously enter the runtime context for the response object."""
         inner: Response = await self.inner
         self.inner = inner
+        self.url = inner.url
         self.request = inner.request
         self.status: int = inner.status_code
         self.reason: str = inner.reason
diff --git a/g4f/tools/files.py b/g4f/tools/files.py
index 49113133..6d6d2206 100644
--- a/g4f/tools/files.py
+++ b/g4f/tools/files.py
@@ -157,7 +157,7 @@ def get_filenames(bucket_dir: Path):
 def stream_read_files(bucket_dir: Path, filenames: list, delete_files: bool = False) -> Iterator[str]:
     for filename in filenames:
         file_path: Path = bucket_dir / filename
-        if not file_path.exists() and 0 > file_path.lstat().st_size:
+        if not file_path.exists() or file_path.lstat().st_size <= 0:
             continue
         extension = os.path.splitext(filename)[1][1:]
         if filename.endswith(".zip"):
@@ -453,6 +453,8 @@ async def download_urls(
                         async for chunk in response.content.iter_chunked(4096):
                             if b'<link rel="canonical"' not in chunk:
                                 f.write(chunk.replace(b'</head>', f'<link rel="canonical" href="{response.url}">\n</head>'.encode()))
+                            else:
+                                f.write(chunk)
                     return filename
             except (ClientError, asyncio.TimeoutError) as e:
                 debug.log(f"Download failed: {e.__class__.__name__}: {e}")
-- 
cgit v1.2.3