From 9994bb67a1cc1a09f4c5eba70dfbd77c96d0ed76 Mon Sep 17 00:00:00 2001
From: hlohaus <983577+hlohaus@users.noreply.github.com>
Date: Wed, 5 Feb 2025 17:07:20 +0100
Subject: Add zerogpu_uuid to demo

---
 g4f/Provider/CablyAI.py                 |  3 +--
 g4f/Provider/hf_space/G4F.py            | 18 +++++++++++++++---
 g4f/Provider/hf_space/Janus_Pro_7B.py   |  5 ++++-
 g4f/Provider/template/OpenaiTemplate.py |  3 ++-
 g4f/gui/client/demo.html                | 12 ++++++++++++
 g4f/gui/client/static/js/chat.v1.js     |  5 +----
 g4f/tools/files.py                      |  4 ++--
 7 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/g4f/Provider/CablyAI.py b/g4f/Provider/CablyAI.py
index 1ccc343d..c9bd0cc2 100644
--- a/g4f/Provider/CablyAI.py
+++ b/g4f/Provider/CablyAI.py
@@ -26,7 +26,6 @@ class CablyAI(OpenaiTemplate):
     ] + reasoning_models
     
     model_aliases = {
-        "searchgpt": "searchgpt (free)",
         "gpt-4o-mini": "searchgpt",
         "llama-3.1-8b": "llama-3.1-8b-instruct",
         "deepseek-r1": "deepseek-r1-uncensored",
@@ -43,6 +42,6 @@ class CablyAI(OpenaiTemplate):
             model = super().get_model(model, **kwargs)
             return model.split(" (free)")[0]
         except ModelNotSupportedError:
-            if f"f{model} (free)" in cls.models:
+            if f"{model} (free)" in cls.models:
                 return model
             raise
\ No newline at end of file
diff --git a/g4f/Provider/hf_space/G4F.py b/g4f/Provider/hf_space/G4F.py
index 1cff0097..9f16d789 100644
--- a/g4f/Provider/hf_space/G4F.py
+++ b/g4f/Provider/hf_space/G4F.py
@@ -34,10 +34,21 @@ class G4F(Janus_Pro_7B):
         height: int = 1024,
         seed: int = None,
         cookies: dict = None,
+        zerogpu_token: str = None,
+        zerogpu_uuid: str = None,
         **kwargs
     ) -> AsyncResult:
         if cls.default_model not in model:
-            async for chunk in super().create_async_generator(model, messages, prompt=prompt, seed=seed, cookies=cookies, **kwargs):
+            async for chunk in super().create_async_generator(
+                model, messages,
+                proxy=proxy,
+                prompt=prompt,
+                seed=seed,
+                cookies=cookies, 
+                zerogpu_token=zerogpu_token,
+                zerogpu_uuid=zerogpu_uuid,
+                **kwargs
+            ):
                 yield chunk
             return
 
@@ -64,8 +75,9 @@ class G4F(Janus_Pro_7B):
             "trigger_id": 10
         }
         async with ClientSession() as session:
-            yield Reasoning(status="Acquiring GPU Token")
-            zerogpu_uuid, zerogpu_token = await get_zerogpu_token(cls.space, session, JsonConversation(), cookies)
+            if zerogpu_token is None:
+                yield Reasoning(status="Acquiring GPU Token")
+                zerogpu_uuid, zerogpu_token = await get_zerogpu_token(cls.space, session, JsonConversation(), cookies)
             headers = {
                 "x-zerogpu-token": zerogpu_token,
                 "x-zerogpu-uuid": zerogpu_uuid,
diff --git a/g4f/Provider/hf_space/Janus_Pro_7B.py b/g4f/Provider/hf_space/Janus_Pro_7B.py
index 0484316b..69708f13 100644
--- a/g4f/Provider/hf_space/Janus_Pro_7B.py
+++ b/g4f/Provider/hf_space/Janus_Pro_7B.py
@@ -70,6 +70,8 @@ class Janus_Pro_7B(AsyncGeneratorProvider, ProviderModelMixin):
         prompt: str = None,
         proxy: str = None,
         cookies: Cookies = None,
+        zerogpu_token: str = None,
+        zerogpu_uuid: str = None,
         return_conversation: bool = False,
         conversation: JsonConversation = None,
         seed: int = None,
@@ -90,7 +92,8 @@ class Janus_Pro_7B(AsyncGeneratorProvider, ProviderModelMixin):
         session_hash = generate_session_hash() if conversation is None else getattr(conversation, "session_hash")
         async with StreamSession(proxy=proxy, impersonate="chrome") as session:
             session_hash = generate_session_hash() if conversation is None else getattr(conversation, "session_hash")
-            zerogpu_uuid, zerogpu_token = await get_zerogpu_token(cls.space, session, conversation, cookies)
+            if zerogpu_token is None:
+                zerogpu_uuid, zerogpu_token = await get_zerogpu_token(cls.space, session, conversation, cookies)
             if conversation is None or not hasattr(conversation, "session_hash"):
                 conversation = JsonConversation(session_hash=session_hash, zerogpu_token=zerogpu_token, zerogpu_uuid=zerogpu_uuid)
             conversation.zerogpu_token = zerogpu_token
diff --git a/g4f/Provider/template/OpenaiTemplate.py b/g4f/Provider/template/OpenaiTemplate.py
index 85086ccd..54938286 100644
--- a/g4f/Provider/template/OpenaiTemplate.py
+++ b/g4f/Provider/template/OpenaiTemplate.py
@@ -85,8 +85,9 @@ class OpenaiTemplate(AsyncGeneratorProvider, ProviderModelMixin, RaiseErrorMixin
 
             # Proxy for image generation feature
             if model and model in cls.image_models:
+                prompt = format_image_prompt(messages, prompt)
                 data = {
-                    "prompt": format_image_prompt(messages, prompt),
+                    "prompt": prompt,
                     "model": model,
                 }
                 async with session.post(f"{api_base.rstrip('/')}/images/generations", json=data, ssl=cls.ssl) as response:
diff --git a/g4f/gui/client/demo.html b/g4f/gui/client/demo.html
index 61e565ea..16189f48 100644
--- a/g4f/gui/client/demo.html
+++ b/g4f/gui/client/demo.html
@@ -198,6 +198,15 @@
                 <a href="https://huggingface.co/settings/tokens" target="_blank">Get Access Token</a>
             </p>
         </form>
+        <script>
+            (async () => {
+                let chat_url = new URL(window.location.href)
+                let chat_params = new URLSearchParams(chat_url.search);
+                if (chat_params.get("__sign")) {
+                    localStorage.setItem("zerogpu_token", chat_params.get("__sign"));
+                }
+            })();
+        </script>
         <script type="module">
             import * as hub from "@huggingface/hub";
 
@@ -205,6 +214,9 @@
             const input = document.querySelector('form input[name="token"]');
             async function check_access_token() {
                 const accessToken = input.value || localStorage.getItem("HuggingFace-api_key");
+                if (!accessToken) {
+                    return;
+                }
                 let user;
                 try {
                     user = await hub.whoAmI({accessToken: accessToken});
diff --git a/g4f/gui/client/static/js/chat.v1.js b/g4f/gui/client/static/js/chat.v1.js
index fcc884a2..a429556f 100644
--- a/g4f/gui/client/static/js/chat.v1.js
+++ b/g4f/gui/client/static/js/chat.v1.js
@@ -1056,6 +1056,7 @@ const ask_gpt = async (message_id, message_index = -1, regenerate = false, provi
             api_key: api_key,
             api_base: api_base,
             ignored: ignored,
+            zerogpu_token: localStorage.getItem("zerogpu_token")
         }, files, message_id, scroll, finish_message);
     } catch (e) {
         console.error(e);
@@ -1898,10 +1899,6 @@ async function on_load() {
         load_conversation(window.conversation_id);
     } else {
         chatPrompt.value = document.getElementById("systemPrompt")?.value || "";
-        example = document.getElementById("systemPrompt")?.dataset.example || ""
-        if (chatPrompt.value == example) {
-            messageInput.value = "";
-        }
         let chat_url = new URL(window.location.href)
         let chat_params = new URLSearchParams(chat_url.search);
         if (chat_params.get("prompt")) {
diff --git a/g4f/tools/files.py b/g4f/tools/files.py
index 350bc45e..20eb15c8 100644
--- a/g4f/tools/files.py
+++ b/g4f/tools/files.py
@@ -431,7 +431,7 @@ async def download_urls(
         connector=get_connector(proxy=proxy),
         timeout=ClientTimeout(timeout)
     ) as session:
-        async def download_url(url: str) -> str:
+        async def download_url(url: str, max_depth: int) -> str:
             try:
                 async with session.get(url) as response:
                     response.raise_for_status()
@@ -457,7 +457,7 @@ async def download_urls(
             except (ClientError, asyncio.TimeoutError) as e:
                 debug.log(f"Download failed: {e.__class__.__name__}: {e}")
             return None
-        for filename in await asyncio.gather(*[download_url(url) for url in urls]):
+        for filename in await asyncio.gather(*[download_url(url, max_depth) for url in urls]):
             if filename:
                 yield filename
             else:
-- 
cgit v1.2.3


From cbd663511cf72268d078ea70b86b3079fcf83864 Mon Sep 17 00:00:00 2001
From: hlohaus <983577+hlohaus@users.noreply.github.com>
Date: Wed, 5 Feb 2025 17:22:34 +0100
Subject: Check for exception in generate of G4F

---
 g4f/Provider/hf_space/G4F.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/g4f/Provider/hf_space/G4F.py b/g4f/Provider/hf_space/G4F.py
index 9f16d789..bac40182 100644
--- a/g4f/Provider/hf_space/G4F.py
+++ b/g4f/Provider/hf_space/G4F.py
@@ -83,11 +83,14 @@ class G4F(Janus_Pro_7B):
                 "x-zerogpu-uuid": zerogpu_uuid,
             }
             async def generate():
-                async with session.post(cls.url_flux, json=payload, proxy=proxy, headers=headers) as response:
-                    await raise_for_status(response)
-                    response_data = await response.json()
-                    image_url = response_data["data"][0]['url']
-                    return ImageResponse(images=[image_url], alt=prompt)
+                try:
+                    async with session.post(cls.url_flux, json=payload, proxy=proxy, headers=headers) as response:
+                        await raise_for_status(response)
+                        response_data = await response.json()
+                        image_url = response_data["data"][0]['url']
+                        return ImageResponse(images=[image_url], alt=prompt)
+                except Exception as e:
+                    return Reasoning(status=f"Error: {e.__class__.__name__}: {e}")
             background_tasks = set()
             started = time.time()
             task = asyncio.create_task(generate())
@@ -95,6 +98,6 @@ class G4F(Janus_Pro_7B):
             task.add_done_callback(background_tasks.discard)
             while background_tasks:
                 yield Reasoning(status=f"Generating {time.time() - started:.2f}s")
-                await asyncio.sleep(0.2)
+                await asyncio.sleep(0.5)
             yield await task
             yield Reasoning(status=f"Finished {time.time() - started:.2f}s")
\ No newline at end of file
-- 
cgit v1.2.3


From fb58feae87d62056af08ac0ea481f39f389b04ef Mon Sep 17 00:00:00 2001
From: hlohaus <983577+hlohaus@users.noreply.github.com>
Date: Wed, 5 Feb 2025 19:30:47 +0100
Subject: Check for exception in generate of G4F

---
 g4f/Provider/hf_space/G4F.py  | 13 +++++--------
 g4f/gui/server/backend_api.py |  2 ++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/g4f/Provider/hf_space/G4F.py b/g4f/Provider/hf_space/G4F.py
index bac40182..2c16c032 100644
--- a/g4f/Provider/hf_space/G4F.py
+++ b/g4f/Provider/hf_space/G4F.py
@@ -83,14 +83,11 @@ class G4F(Janus_Pro_7B):
                 "x-zerogpu-uuid": zerogpu_uuid,
             }
             async def generate():
-                try:
-                    async with session.post(cls.url_flux, json=payload, proxy=proxy, headers=headers) as response:
-                        await raise_for_status(response)
-                        response_data = await response.json()
-                        image_url = response_data["data"][0]['url']
-                        return ImageResponse(images=[image_url], alt=prompt)
-                except Exception as e:
-                    return Reasoning(status=f"Error: {e.__class__.__name__}: {e}")
+                async with session.post(cls.url_flux, json=payload, proxy=proxy, headers=headers) as response:
+                    await raise_for_status(response)
+                    response_data = await response.json()
+                    image_url = response_data["data"][0]['url']
+                    return ImageResponse(images=[image_url], alt=prompt)
             background_tasks = set()
             started = time.time()
             task = asyncio.create_task(generate())
diff --git a/g4f/gui/server/backend_api.py b/g4f/gui/server/backend_api.py
index 4b499408..b293a839 100644
--- a/g4f/gui/server/backend_api.py
+++ b/g4f/gui/server/backend_api.py
@@ -147,6 +147,8 @@ class Backend_Api(Api):
                 limiter_check()
             if "images" in json_data:
                 kwargs["images"] = json_data["images"]
+            if "zerogpu_token" in json_data:
+                kwargs["zerogpu_token"] = json_data["zerogpu_token"]
             kwargs = self._prepare_conversation_kwargs(json_data, kwargs)
             return self.app.response_class(
                 self._create_response_stream(
-- 
cgit v1.2.3


From e20830359844918d2b31aaf4b76c10bf30f805d2 Mon Sep 17 00:00:00 2001
From: hlohaus <983577+hlohaus@users.noreply.github.com>
Date: Wed, 5 Feb 2025 19:33:15 +0100
Subject: Check for exception in generate of G4F

---
 g4f/Provider/hf_space/G4F.py          | 2 +-
 g4f/Provider/hf_space/Janus_Pro_7B.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/g4f/Provider/hf_space/G4F.py b/g4f/Provider/hf_space/G4F.py
index 2c16c032..111d0f56 100644
--- a/g4f/Provider/hf_space/G4F.py
+++ b/g4f/Provider/hf_space/G4F.py
@@ -35,7 +35,7 @@ class G4F(Janus_Pro_7B):
         seed: int = None,
         cookies: dict = None,
         zerogpu_token: str = None,
-        zerogpu_uuid: str = None,
+        zerogpu_uuid: str = "[object Object]",
         **kwargs
     ) -> AsyncResult:
         if cls.default_model not in model:
diff --git a/g4f/Provider/hf_space/Janus_Pro_7B.py b/g4f/Provider/hf_space/Janus_Pro_7B.py
index 69708f13..604c6547 100644
--- a/g4f/Provider/hf_space/Janus_Pro_7B.py
+++ b/g4f/Provider/hf_space/Janus_Pro_7B.py
@@ -71,7 +71,7 @@ class Janus_Pro_7B(AsyncGeneratorProvider, ProviderModelMixin):
         proxy: str = None,
         cookies: Cookies = None,
         zerogpu_token: str = None,
-        zerogpu_uuid: str = None,
+        zerogpu_uuid: str = "[object Object]",
         return_conversation: bool = False,
         conversation: JsonConversation = None,
         seed: int = None,
-- 
cgit v1.2.3


From ead25d33e9450013e537c232ce015b7573abde05 Mon Sep 17 00:00:00 2001
From: hlohaus <983577+hlohaus@users.noreply.github.com>
Date: Wed, 5 Feb 2025 19:37:11 +0100
Subject: Check for exception in generate of G4F

---
 g4f/Provider/hf_space/G4F.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/g4f/Provider/hf_space/G4F.py b/g4f/Provider/hf_space/G4F.py
index 111d0f56..53bec3f4 100644
--- a/g4f/Provider/hf_space/G4F.py
+++ b/g4f/Provider/hf_space/G4F.py
@@ -82,6 +82,7 @@ class G4F(Janus_Pro_7B):
                 "x-zerogpu-token": zerogpu_token,
                 "x-zerogpu-uuid": zerogpu_uuid,
             }
+            headers = {k: v for k, v in headers.items() if v is not None}
             async def generate():
                 async with session.post(cls.url_flux, json=payload, proxy=proxy, headers=headers) as response:
                     await raise_for_status(response)
-- 
cgit v1.2.3


From 31a4812d7a2bf03043219463a7dcecf4be051a1b Mon Sep 17 00:00:00 2001
From: hlohaus <983577+hlohaus@users.noreply.github.com>
Date: Wed, 5 Feb 2025 22:11:19 +0100
Subject: Improve copy_images api Update share target support Improve search
 enabled hightlight

---
 g4f/api/__init__.py                        | 29 +++++++---------
 g4f/gui/client/index.html                  |  4 +--
 g4f/gui/client/static/css/style.css        |  6 +++-
 g4f/gui/client/static/img/site.webmanifest |  4 +--
 g4f/gui/server/website.py                  |  2 ++
 g4f/image/copy_images.py                   | 54 ++++++++++++++----------------
 6 files changed, 48 insertions(+), 51 deletions(-)

diff --git a/g4f/api/__init__.py b/g4f/api/__init__.py
index c22edccf..b209f0ec 100644
--- a/g4f/api/__init__.py
+++ b/g4f/api/__init__.py
@@ -40,7 +40,7 @@ from g4f.client import AsyncClient, ChatCompletion, ImagesResponse, convert_to_p
 from g4f.providers.response import BaseConversation, JsonConversation
 from g4f.client.helper import filter_none
 from g4f.image import is_data_uri_an_image
-from g4f.image.copy_images import images_dir, copy_images
+from g4f.image.copy_images import images_dir, copy_images, get_source_url
 from g4f.errors import ProviderNotFoundError, ModelNotFoundError, MissingAuthError, NoValidHarFileError
 from g4f.cookies import read_cookie_files, get_cookies_dir
 from g4f.Provider import ProviderType, ProviderUtils, __providers__
@@ -298,11 +298,9 @@ class Api:
         })
         async def chat_completions(
             config: ChatCompletionsConfig,
-            credentials: Annotated[HTTPAuthorizationCredentials, Depends(Api.security)] = None,
-            provider: str = None
+            credentials: Annotated[HTTPAuthorizationCredentials, Depends(Api.security)] = None
         ):
             try:
-                config.provider = provider if config.provider is None else config.provider
                 if config.provider is None:
                     config.provider = AppConfig.provider
                 if credentials is not None:
@@ -582,19 +580,16 @@ class Api:
             except KeyError:
                 pass
             if not os.path.isfile(target):
-                source_url = str(request.query_params).split("url=", 1)
-                if len(source_url) > 1:
-                    source_url = source_url[1]
-                    source_url = source_url.replace("%2F", "/").replace("%3A", ":").replace("%3F", "?").replace("%3D", "=")
-                    if source_url.startswith("https://"):
-                        try:
-                            await copy_images(
-                                [source_url],
-                                target=target)
-                            debug.log(f"Image copied from {source_url}")
-                        except Exception as e:
-                            debug.log(f"{type(e).__name__}: Download failed:  {source_url}\n{e}")
-                            return RedirectResponse(url=source_url)
+                source_url = get_source_url(str(request.query_params))
+                if source_url is not None:
+                    try:
+                        await copy_images(
+                            [source_url],
+                            target=target)
+                        debug.log(f"Image copied from {source_url}")
+                    except Exception as e:
+                        debug.log(f"{type(e).__name__}: Download failed:  {source_url}\n{e}")
+                        return RedirectResponse(url=source_url)
             if not os.path.isfile(target):
                 return ErrorResponse.from_message("File not found", HTTP_404_NOT_FOUND)
             async def stream():
diff --git a/g4f/gui/client/index.html b/g4f/gui/client/index.html
index 4a1963d4..8c889012 100644
--- a/g4f/gui/client/index.html
+++ b/g4f/gui/client/index.html
@@ -288,9 +288,7 @@
             <div class="buttons">
                 <div class="field">
                     <button id="search">
-                        <a href="" onclick="return false;" title="Enable Web Access">
-                            <i class="fa-solid fa-search"></i>
-                        </a>
+                        <i class="fa-solid fa-search"></i>
                     </button>
                 </div>
                <div class="field">
diff --git a/g4f/gui/client/static/css/style.css b/g4f/gui/client/static/css/style.css
index f3bebf31..0c827b4d 100644
--- a/g4f/gui/client/static/css/style.css
+++ b/g4f/gui/client/static/css/style.css
@@ -684,10 +684,14 @@ input-count .text {
 .file-label:has(> input:valid),
 .file-label.selected,
 .micro-label.recognition,
-#search.active a i {
+#search.active i {
     color: var(--accent);
 }
 
+#search.active {
+    border-color: var(--accent);
+}
+
 label[for="image"] {
     top: 32px;
 }
diff --git a/g4f/gui/client/static/img/site.webmanifest b/g4f/gui/client/static/img/site.webmanifest
index 7756f2a4..eb9fc8e6 100644
--- a/g4f/gui/client/static/img/site.webmanifest
+++ b/g4f/gui/client/static/img/site.webmanifest
@@ -21,9 +21,9 @@
         "method": "GET",
         "enctype": "application/x-www-form-urlencoded",
         "params": {
-            "title": "title",
+            "title": "name",
             "text": "prompt",
-            "url": "url"
+            "url": "link"
         }
     }
 }
\ No newline at end of file
diff --git a/g4f/gui/server/website.py b/g4f/gui/server/website.py
index d89902da..407fc706 100644
--- a/g4f/gui/server/website.py
+++ b/g4f/gui/server/website.py
@@ -31,6 +31,8 @@ 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)
diff --git a/g4f/image/copy_images.py b/g4f/image/copy_images.py
index 6afa446c..4794b584 100644
--- a/g4f/image/copy_images.py
+++ b/g4f/image/copy_images.py
@@ -58,36 +58,34 @@ async def copy_images(
         async def copy_image(image: str, target: str = None, headers: dict = headers, ssl: bool = ssl) -> str:
             if target is None or len(images) > 1:
                 hash = hashlib.sha256(image.encode()).hexdigest()
-                target = f"{quote_plus('+'.join(alt.split()[:10])[:100], '')}_{hash}" if alt else str(uuid.uuid4())
+                target = f"{quote_plus('+'.join(alt.split()[:10]), '')[:100]}_{hash[:16]}" if alt else str(uuid.uuid4())
                 target = f"{int(time.time())}_{target}{get_image_extension(image)}"
                 target = os.path.join(images_dir, target)
-            try:
-                if image.startswith("data:"):
-                    with open(target, "wb") as f:
-                        f.write(extract_data_uri(image))
-                else:
-                    try:
-                        if BackendApi.working and image.startswith(BackendApi.url) and headers is None:
-                            headers = BackendApi.headers
-                            ssl = BackendApi.ssl
-                        async with session.get(image, ssl=ssl, headers=headers) as response:
-                            response.raise_for_status()
-                            with open(target, "wb") as f:
-                                async for chunk in response.content.iter_chunked(4096):
-                                    f.write(chunk)
-                    except ClientError as e:
-                        debug.log(f"copy_images failed: {e.__class__.__name__}: {e}")
-                        return get_source_url(image, image)
-                if "." not in target:
-                    with open(target, "rb") as f:
-                        extension = is_accepted_format(f.read(12)).split("/")[-1]
-                        extension = "jpg" if extension == "jpeg" else extension
-                        new_target = f"{target}.{extension}"
-                        os.rename(target, new_target)
-                        target = new_target
-            finally:
-                if "." not in target and os.path.exists(target):
-                    os.unlink(target)
+            if image.startswith("data:"):
+                with open(target, "wb") as f:
+                    f.write(extract_data_uri(image))
+            else:
+                try:
+                    if BackendApi.working and image.startswith(BackendApi.url) and headers is None:
+                        headers = BackendApi.headers
+                        ssl = BackendApi.ssl
+                    async with session.get(image, ssl=ssl, headers=headers) as response:
+                        response.raise_for_status()
+                        with open(target, "wb") as f:
+                            async for chunk in response.content.iter_chunked(4096):
+                                f.write(chunk)
+                except ClientError as e:
+                    debug.log(f"copy_images failed: {e.__class__.__name__}: {e}")
+                    if os.path.exists(target):
+                        os.unlink(target)
+                    return get_source_url(image, image)
+            if "." not in target:
+                with open(target, "rb") as f:
+                    extension = is_accepted_format(f.read(12)).split("/")[-1]
+                    extension = "jpg" if extension == "jpeg" else extension
+                new_target = f"{target}.{extension}"
+                os.rename(target, new_target)
+                target = new_target
             return f"/images/{os.path.basename(target)}{'?url=' + image if add_url and not image.startswith('data:') else ''}"
 
         return await asyncio.gather(*[copy_image(image, target) for image in images])
-- 
cgit v1.2.3


From 035daa225be058447a946b8e8b9ad1ef9b1e9a1f Mon Sep 17 00:00:00 2001
From: hlohaus <983577+hlohaus@users.noreply.github.com>
Date: Thu, 6 Feb 2025 21:24:59 +0100
Subject: Add FluxDev to G4F provider Improve image preview in FluxDev Add
 zerogpu_token to FluxDev Add HuggingSpace header in Demo Add new window
 button in Demo

---
 g4f/Provider/hf_space/BlackForestLabsFlux1Dev.py   | 24 +++++++---
 .../hf_space/BlackForestLabsFlux1Schnell.py        | 10 ++--
 g4f/Provider/hf_space/G4F.py                       | 30 ++++++++++--
 g4f/Provider/hf_space/Janus_Pro_7B.py              | 17 +++++--
 g4f/Provider/hf_space/raise_for_status.py          | 24 ++++++++++
 g4f/gui/client/demo.html                           | 54 +++++++++++++++++-----
 g4f/gui/client/static/js/chat.v1.js                |  6 ++-
 7 files changed, 128 insertions(+), 37 deletions(-)
 create mode 100644 g4f/Provider/hf_space/raise_for_status.py

diff --git a/g4f/Provider/hf_space/BlackForestLabsFlux1Dev.py b/g4f/Provider/hf_space/BlackForestLabsFlux1Dev.py
index 60e6820d..dbd9fa0a 100644
--- a/g4f/Provider/hf_space/BlackForestLabsFlux1Dev.py
+++ b/g4f/Provider/hf_space/BlackForestLabsFlux1Dev.py
@@ -4,13 +4,16 @@ import json
 from aiohttp import ClientSession
 
 from ...typing import AsyncResult, Messages
-from ...providers.response import ImageResponse, ImagePreview
+from ...providers.response import ImageResponse, ImagePreview, JsonConversation
 from ...errors import ResponseError
 from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin
 from ..helper import format_image_prompt
+from .Janus_Pro_7B import get_zerogpu_token
+from .raise_for_status import raise_for_status
 
 class BlackForestLabsFlux1Dev(AsyncGeneratorProvider, ProviderModelMixin):
     url = "https://black-forest-labs-flux-1-dev.hf.space"
+    space = "black-forest-labs/FLUX.1-dev"
     api_endpoint = "/gradio_api/call/infer"
 
     working = True
@@ -27,7 +30,6 @@ class BlackForestLabsFlux1Dev(AsyncGeneratorProvider, ProviderModelMixin):
         model: str, 
         messages: Messages,
         prompt: str = None,
-        api_key: str = None, 
         proxy: str = None,
         width: int = 1024,
         height: int = 1024,
@@ -35,6 +37,9 @@ class BlackForestLabsFlux1Dev(AsyncGeneratorProvider, ProviderModelMixin):
         num_inference_steps: int = 28,
         seed: int = 0,
         randomize_seed: bool = True,
+        cookies: dict = None,
+        zerogpu_token: str = None,
+        zerogpu_uuid: str = "[object Object]",
         **kwargs
     ) -> AsyncResult:
         model = cls.get_model(model)
@@ -42,18 +47,23 @@ class BlackForestLabsFlux1Dev(AsyncGeneratorProvider, ProviderModelMixin):
             "Content-Type": "application/json",
             "Accept": "application/json",
         }
-        if api_key is not None:
-            headers["Authorization"] = f"Bearer {api_key}"
         async with ClientSession(headers=headers) as session:
             prompt = format_image_prompt(messages, prompt)
             data = {
                 "data": [prompt, seed, randomize_seed, width, height, guidance_scale, num_inference_steps]
             }
-            async with session.post(f"{cls.url}{cls.api_endpoint}", json=data, proxy=proxy) as response:
-                response.raise_for_status()
+            if zerogpu_token is None:
+                zerogpu_uuid, zerogpu_token = await get_zerogpu_token(cls.space, session, JsonConversation(), cookies)
+            headers = {
+                "x-zerogpu-token": zerogpu_token,
+                "x-zerogpu-uuid": zerogpu_uuid,
+            }
+            headers = {k: v for k, v in headers.items() if v is not None}
+            async with session.post(f"{cls.url}{cls.api_endpoint}", json=data, proxy=proxy, headers=headers) as response:
+                await raise_for_status(response)
                 event_id = (await response.json()).get("event_id")
                 async with session.get(f"{cls.url}{cls.api_endpoint}/{event_id}") as event_response:
-                    event_response.raise_for_status()
+                    await raise_for_status(event_response)
                     event = None
                     async for chunk in event_response.content:
                         if chunk.startswith(b"event: "):
diff --git a/g4f/Provider/hf_space/BlackForestLabsFlux1Schnell.py b/g4f/Provider/hf_space/BlackForestLabsFlux1Schnell.py
index 1f051bf7..4e313ae1 100644
--- a/g4f/Provider/hf_space/BlackForestLabsFlux1Schnell.py
+++ b/g4f/Provider/hf_space/BlackForestLabsFlux1Schnell.py
@@ -6,9 +6,9 @@ import json
 from ...typing import AsyncResult, Messages
 from ...providers.response import ImageResponse
 from ...errors import ResponseError
-from ...requests.raise_for_status import raise_for_status
 from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin
 from ..helper import format_image_prompt
+from .raise_for_status import raise_for_status
 
 class BlackForestLabsFlux1Schnell(AsyncGeneratorProvider, ProviderModelMixin):
     url = "https://black-forest-labs-flux-1-schnell.hf.space"
@@ -38,13 +38,9 @@ class BlackForestLabsFlux1Schnell(AsyncGeneratorProvider, ProviderModelMixin):
     ) -> AsyncResult:
 
         model = cls.get_model(model)
-        
         width = max(32, width - (width % 8))
         height = max(32, height - (height % 8))
-
-        if prompt is None:
-            prompt = format_image_prompt(messages)
-
+        prompt = format_image_prompt(messages, prompt)
         payload = {
             "data": [
                 prompt,
@@ -72,7 +68,7 @@ class BlackForestLabsFlux1Schnell(AsyncGeneratorProvider, ProviderModelMixin):
                                 event_type = event_parts[0].split(b': ')[1]
                                 data = event_parts[1]
                                 if event_type == b'error':
-                                    raise ResponseError(f"Error generating image: {data}")
+                                    raise ResponseError(f"Error generating image: {data.decode(errors='ignore')}")
                                 elif event_type == b'complete':
                                     json_data = json.loads(data)
                                     image_url = json_data[0]['url']
diff --git a/g4f/Provider/hf_space/G4F.py b/g4f/Provider/hf_space/G4F.py
index 53bec3f4..e8cd8017 100644
--- a/g4f/Provider/hf_space/G4F.py
+++ b/g4f/Provider/hf_space/G4F.py
@@ -6,9 +6,14 @@ import asyncio
 
 from ...typing import AsyncResult, Messages
 from ...providers.response import ImageResponse, Reasoning
-from ...requests.raise_for_status import raise_for_status
 from ..helper import format_image_prompt, get_random_string
-from .Janus_Pro_7B import Janus_Pro_7B, JsonConversation, get_zerogpu_token
+from .Janus_Pro_7B import Janus_Pro_7B, get_zerogpu_token
+from .BlackForestLabsFlux1Dev import BlackForestLabsFlux1Dev
+from .raise_for_status import raise_for_status
+
+class FluxDev(BlackForestLabsFlux1Dev):
+    url = "https://roxky-flux-1-dev.hf.space"
+    space = "roxky/FLUX.1-dev"
 
 class G4F(Janus_Pro_7B):
     label = "G4F framework"
@@ -19,8 +24,8 @@ class G4F(Janus_Pro_7B):
     referer = f"{api_url}?__theme=light"
 
     default_model = "flux"
-    model_aliases = {"flux-schnell": default_model, "flux-dev": default_model}
-    image_models = [Janus_Pro_7B.default_image_model, default_model, *model_aliases.keys()]
+    model_aliases = {"flux-schnell": default_model}
+    image_models = [Janus_Pro_7B.default_image_model, default_model, "flux-dev", *model_aliases.keys()]
     models = [Janus_Pro_7B.default_model, *image_models]
 
     @classmethod
@@ -38,6 +43,21 @@ class G4F(Janus_Pro_7B):
         zerogpu_uuid: str = "[object Object]",
         **kwargs
     ) -> AsyncResult:
+        if model == "flux-dev":
+            async for chunk in FluxDev.create_async_generator(
+                model, messages,
+                proxy=proxy,
+                prompt=prompt,
+                width=width,
+                height=height,
+                seed=seed,
+                cookies=cookies,
+                zerogpu_token=zerogpu_token,
+                zerogpu_uuid=zerogpu_uuid,
+                **kwargs
+            ):
+                yield chunk
+            return
         if cls.default_model not in model:
             async for chunk in super().create_async_generator(
                 model, messages,
@@ -96,6 +116,6 @@ class G4F(Janus_Pro_7B):
             task.add_done_callback(background_tasks.discard)
             while background_tasks:
                 yield Reasoning(status=f"Generating {time.time() - started:.2f}s")
-                await asyncio.sleep(0.5)
+                await asyncio.sleep(0.2)
             yield await task
             yield Reasoning(status=f"Finished {time.time() - started:.2f}s")
\ No newline at end of file
diff --git a/g4f/Provider/hf_space/Janus_Pro_7B.py b/g4f/Provider/hf_space/Janus_Pro_7B.py
index 604c6547..49b4f5bb 100644
--- a/g4f/Provider/hf_space/Janus_Pro_7B.py
+++ b/g4f/Provider/hf_space/Janus_Pro_7B.py
@@ -17,6 +17,7 @@ from ...image import to_bytes, is_accepted_format
 from ...cookies import get_cookies
 from ...errors import ResponseError
 from ... import debug
+from .raise_for_status import raise_for_status
 
 class Janus_Pro_7B(AsyncGeneratorProvider, ProviderModelMixin):
     space = "deepseek-ai/Janus-Pro-7B"
@@ -125,6 +126,7 @@ class Janus_Pro_7B(AsyncGeneratorProvider, ProviderModelMixin):
 
             async with cls.run("get", session, prompt, conversation, None, seed) as response:
                 response: StreamResponse = response
+                counter = 3
                 async for line in response.iter_lines():
                     decoded_line = line.decode(errors="replace")
                     if decoded_line.startswith('data: '):
@@ -134,11 +136,18 @@ class Janus_Pro_7B(AsyncGeneratorProvider, ProviderModelMixin):
                                 yield Reasoning(status=json_data["log"])
 
                             if json_data.get('msg') == 'progress':
-                                if 'progress_data' in json_data and json_data['progress_data']:
-                                    progress = json_data['progress_data'][0]
-                                    yield Reasoning(status=f"{progress['desc']} {progress['index']}/{progress['length']}")
+                                if 'progress_data' in json_data:
+                                    if json_data['progress_data']:
+                                        progress = json_data['progress_data'][0]
+                                        yield Reasoning(status=f"{progress['desc']} {progress['index']}/{progress['length']}")
+                                    else:
+                                        yield Reasoning(status=f"Generating")
+
+                            elif json_data.get('msg') == 'heartbeat':
+                                yield Reasoning(status=f"Generating{''.join(['.' for i in range(counter)])}")
+                                counter  += 1
 
-                            if json_data.get('msg') == 'process_completed':
+                            elif json_data.get('msg') == 'process_completed':
                                 if 'output' in json_data and 'error' in json_data['output']:
                                     json_data['output']['error'] = json_data['output']['error'].split(" <a ")[0]
                                     raise ResponseError("Missing images input" if json_data['output']['error'] and "AttributeError" in json_data['output']['error'] else json_data['output']['error'])
diff --git a/g4f/Provider/hf_space/raise_for_status.py b/g4f/Provider/hf_space/raise_for_status.py
new file mode 100644
index 00000000..064d09db
--- /dev/null
+++ b/g4f/Provider/hf_space/raise_for_status.py
@@ -0,0 +1,24 @@
+from __future__ import annotations
+
+from typing import Union
+from aiohttp import ClientResponse
+
+from ...errors import ResponseStatusError
+from ...requests import StreamResponse
+
+async def raise_for_status(response: Union[StreamResponse, ClientResponse], message: str = None):
+    if response.ok:
+        return
+    content_type = response.headers.get("content-type", "")
+    if content_type.startswith("application/json"):
+        try:
+            data = await response.json()
+            message = data.get("error", data.get("message", message))
+            message = message.split(" <a ")[0]
+        except Exception:
+            pass
+    if not message:
+        text = await response.text()
+        is_html = response.headers.get("content-type", "").startswith("text/html") or text.startswith("<!DOCTYPE")
+        message = "HTML content" if is_html else text
+    raise ResponseStatusError(f"Response {response.status}: {message}")
\ No newline at end of file
diff --git a/g4f/gui/client/demo.html b/g4f/gui/client/demo.html
index 16189f48..d94ad864 100644
--- a/g4f/gui/client/demo.html
+++ b/g4f/gui/client/demo.html
@@ -107,7 +107,7 @@
             z-index: -1;
         }
 
-        .description, form a {
+        .description, form p a {
             font-size: 1.2rem;
             margin-bottom: 30px;
             color: var(--colour-2);
@@ -143,18 +143,31 @@
             width: 100%;
             max-width: 400px;
             font-weight: bold;
+            text-decoration: none;
+            white-space: nowrap;
         }
 
         .button:hover {
             background-color: #7a2ccd;
         }
 
+        .button-container {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            gap: 10px;
+        }
+
         .footer {
             margin-top: 30px;
             font-size: 0.9rem;
             color: var(--colour-2);
         }
 
+        .hidden {
+            display: none;
+        }
+
         /* Animation for the gradient circle */
         @keyframes zoom_gradient {
             0% {
@@ -165,11 +178,29 @@
             }
         }
     </style>
+    <script>
+        (async () => {
+            const isIframe = window.self !== window.top;
+            const button = document.querySelector('form a.button');
+            let url = new URL(window.location.href)
+            let params = new URLSearchParams(url.search);
+            if (params.get("__sign")) {
+                localStorage.setItem("zerogpu_token", params.get("__sign"));
+                if (!isIframe) {
+                    window.location.replace("/");
+                }
+            }
+            if (isIframe) {
+                button.classList.remove('hidden');
+            }
+        })();
+    </script>
     <script src="https://unpkg.com/es-module-shims@1.7.0/dist/es-module-shims.js"></script>
     <script type="importmap">
         {
             "imports": {
-                "@huggingface/hub": "https://cdn.jsdelivr.net/npm/@huggingface/hub@0.21.0/+esm"
+                "@huggingface/hub": "https://cdn.jsdelivr.net/npm/@huggingface/hub@0.21.0/+esm",
+                "@huggingface/space-header": "https://cdn.jsdelivr.net/npm/@huggingface/space-header/+esm"
             }
         }
     </script>
@@ -193,22 +224,21 @@
         <!-- Input and Button -->
         <form action="/chat/">
             <input type="text" name="token" class="input-field" placeholder="Enter an Access Token..." autocomplete="off">
-            <button class="button">Submit</button>
+            <div class="button-container">
+                <a href="" class="button hidden" target="_blank">New Window</a>
+                <button class="button">Submit</button>
+            </div>
             <p>
                 <a href="https://huggingface.co/settings/tokens" target="_blank">Get Access Token</a>
             </p>
         </form>
-        <script>
-            (async () => {
-                let chat_url = new URL(window.location.href)
-                let chat_params = new URLSearchParams(chat_url.search);
-                if (chat_params.get("__sign")) {
-                    localStorage.setItem("zerogpu_token", chat_params.get("__sign"));
-                }
-            })();
-        </script>
         <script type="module">
             import * as hub from "@huggingface/hub";
+            import { init } from "@huggingface/space-header";
+
+            if (window.self === window.top) {
+                init("roxky/g4f-space");
+            }
 
             const form = document.querySelector("form");
             const input = document.querySelector('form input[name="token"]');
diff --git a/g4f/gui/client/static/js/chat.v1.js b/g4f/gui/client/static/js/chat.v1.js
index a429556f..320a8e98 100644
--- a/g4f/gui/client/static/js/chat.v1.js
+++ b/g4f/gui/client/static/js/chat.v1.js
@@ -816,8 +816,10 @@ async function add_message_chunk(message, message_id, provider, scroll, finish_m
         if (img = content_map.inner.querySelector("img"))
             if (!img.complete)
                 return;
-        content_map.inner.innerHTML = markdown_render(message.preview);
-        await register_message_images();
+            else
+                img.src = message.images;
+        else
+           content_map.inner.innerHTML = markdown_render(message.preview);
     } else if (message.type == "content") {
         message_storage[message_id] += message.content;
         update_message(content_map, message_id, null, scroll);
-- 
cgit v1.2.3


From 383ec53927bae6236592ae922f51eea573228329 Mon Sep 17 00:00:00 2001
From: hlohaus <983577+hlohaus@users.noreply.github.com>
Date: Thu, 6 Feb 2025 21:41:32 +0100
Subject: Update Webmanifest

---
 g4f/gui/client/static/img/site.webmanifest | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/g4f/gui/client/static/img/site.webmanifest b/g4f/gui/client/static/img/site.webmanifest
index eb9fc8e6..d5157480 100644
--- a/g4f/gui/client/static/img/site.webmanifest
+++ b/g4f/gui/client/static/img/site.webmanifest
@@ -1,6 +1,6 @@
 {
     "name": "",
-    "short_name": "",
+    "short_name": "G4F",
     "icons": [
         {
             "src": "/static/img/android-chrome-192x192.png",
@@ -21,9 +21,7 @@
         "method": "GET",
         "enctype": "application/x-www-form-urlencoded",
         "params": {
-            "title": "name",
-            "text": "prompt",
-            "url": "link"
+            "text": "prompt"
         }
     }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 5b454f66260129f35f3088e18caec9b5a815115c Mon Sep 17 00:00:00 2001
From: hlohaus <983577+hlohaus@users.noreply.github.com>
Date: Thu, 6 Feb 2025 21:46:11 +0100
Subject: Add missing import

---
 g4f/Provider/hf_space/G4F.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/g4f/Provider/hf_space/G4F.py b/g4f/Provider/hf_space/G4F.py
index e8cd8017..9a7543c6 100644
--- a/g4f/Provider/hf_space/G4F.py
+++ b/g4f/Provider/hf_space/G4F.py
@@ -5,7 +5,7 @@ import time
 import asyncio
 
 from ...typing import AsyncResult, Messages
-from ...providers.response import ImageResponse, Reasoning
+from ...providers.response import ImageResponse, Reasoning, JsonConversation
 from ..helper import format_image_prompt, get_random_string
 from .Janus_Pro_7B import Janus_Pro_7B, get_zerogpu_token
 from .BlackForestLabsFlux1Dev import BlackForestLabsFlux1Dev
-- 
cgit v1.2.3


From ad5d09fbbecbe0839343f360d8ff895381ba9650 Mon Sep 17 00:00:00 2001
From: hlohaus <983577+hlohaus@users.noreply.github.com>
Date: Fri, 7 Feb 2025 13:13:09 +0100
Subject: Fix show new Window Button

---
 g4f/gui/client/demo.html            | 10 +++++-----
 g4f/gui/client/static/js/chat.v1.js |  9 ++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/g4f/gui/client/demo.html b/g4f/gui/client/demo.html
index d94ad864..4ecdd6d0 100644
--- a/g4f/gui/client/demo.html
+++ b/g4f/gui/client/demo.html
@@ -181,7 +181,6 @@
     <script>
         (async () => {
             const isIframe = window.self !== window.top;
-            const button = document.querySelector('form a.button');
             let url = new URL(window.location.href)
             let params = new URLSearchParams(url.search);
             if (params.get("__sign")) {
@@ -190,9 +189,6 @@
                     window.location.replace("/");
                 }
             }
-            if (isIframe) {
-                button.classList.remove('hidden');
-            }
         })();
     </script>
     <script src="https://unpkg.com/es-module-shims@1.7.0/dist/es-module-shims.js"></script>
@@ -236,7 +232,11 @@
             import * as hub from "@huggingface/hub";
             import { init } from "@huggingface/space-header";
 
-            if (window.self === window.top) {
+            const isIframe = window.self !== window.top;
+            const button = document.querySelector('form a.button');
+            if (isIframe) {
+                button.classList.remove('hidden');
+            } else {
                 init("roxky/g4f-space");
             }
 
diff --git a/g4f/gui/client/static/js/chat.v1.js b/g4f/gui/client/static/js/chat.v1.js
index 320a8e98..7f64a993 100644
--- a/g4f/gui/client/static/js/chat.v1.js
+++ b/g4f/gui/client/static/js/chat.v1.js
@@ -811,19 +811,18 @@ async function add_message_chunk(message, message_id, provider, scroll, finish_m
         log_storage.appendChild(p);
         await api("log", {...message, provider: provider_storage[message_id]});
     } else if (message.type == "preview") {
-        if (content_map.inner.clientHeight > 200)
-            content_map.inner.style.height = content_map.inner.clientHeight + "px";
         if (img = content_map.inner.querySelector("img"))
             if (!img.complete)
                 return;
             else
                 img.src = message.images;
-        else
-           content_map.inner.innerHTML = markdown_render(message.preview);
+        else {
+            content_map.inner.innerHTML = markdown_render(message.preview);
+            await register_message_images();
+        }
     } else if (message.type == "content") {
         message_storage[message_id] += message.content;
         update_message(content_map, message_id, null, scroll);
-        content_map.inner.style.height = "";
     } else if (message.type == "log") {
         let p = document.createElement("p");
         p.innerText = message.log;
-- 
cgit v1.2.3