diff options
author | kqlio67 <kqlio67@users.noreply.github.com> | 2024-10-15 11:28:03 +0200 |
---|---|---|
committer | kqlio67 <kqlio67@users.noreply.github.com> | 2024-10-15 11:28:03 +0200 |
commit | 3e8dcaf13c145d8ef6ca8694aac5082e263a8f01 (patch) | |
tree | 36ed460074f95322b44ca8e9ae27910bf460d00d /g4f/gui/server | |
parent | feat(g4f/client/async_client.py, g4f/client/async_client.py): enhance async and sync handling in client (diff) | |
download | gpt4free-3e8dcaf13c145d8ef6ca8694aac5082e263a8f01.tar gpt4free-3e8dcaf13c145d8ef6ca8694aac5082e263a8f01.tar.gz gpt4free-3e8dcaf13c145d8ef6ca8694aac5082e263a8f01.tar.bz2 gpt4free-3e8dcaf13c145d8ef6ca8694aac5082e263a8f01.tar.lz gpt4free-3e8dcaf13c145d8ef6ca8694aac5082e263a8f01.tar.xz gpt4free-3e8dcaf13c145d8ef6ca8694aac5082e263a8f01.tar.zst gpt4free-3e8dcaf13c145d8ef6ca8694aac5082e263a8f01.zip |
Diffstat (limited to 'g4f/gui/server')
-rw-r--r-- | g4f/gui/server/api.py | 41 |
1 files changed, 13 insertions, 28 deletions
diff --git a/g4f/gui/server/api.py b/g4f/gui/server/api.py index bb5d0b5a..3da0fe17 100644 --- a/g4f/gui/server/api.py +++ b/g4f/gui/server/api.py @@ -6,7 +6,6 @@ import os.path import uuid import asyncio import time -import base64 from aiohttp import ClientSession from typing import Iterator, Optional from flask import send_from_directory @@ -196,32 +195,18 @@ class Api(): cookies=cookies ) as session: async def copy_image(image): - if image.startswith("data:"): - # Processing the data URL - data_uri_parts = image.split(",") - if len(data_uri_parts) == 2: - content_type, base64_data = data_uri_parts - extension = content_type.split("/")[-1].split(";")[0] - target = os.path.join(images_dir, f"{int(time.time())}_{str(uuid.uuid4())}.{extension}") - with open(target, "wb") as f: - f.write(base64.b64decode(base64_data)) - return f"/images/{os.path.basename(target)}" - else: - return None - else: - # Processing a regular URL - async with session.get(image) as response: - target = os.path.join(images_dir, f"{int(time.time())}_{str(uuid.uuid4())}") - with open(target, "wb") as f: - async for chunk in response.content.iter_any(): - f.write(chunk) - 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) - return f"/images/{os.path.basename(new_target)}" - return await asyncio.gather(*[copy_image(image) for image in images]) + async with session.get(image) as response: + target = os.path.join(images_dir, f"{int(time.time())}_{str(uuid.uuid4())}") + with open(target, "wb") as f: + async for chunk in response.content.iter_any(): + f.write(chunk) + 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) + return f"/images/{os.path.basename(new_target)}" + return await asyncio.gather(*[copy_image(image) for image in images]) images = asyncio.run(copy_images(chunk.get_list(), chunk.options.get("cookies"))) yield self._format_json("content", str(ImageResponse(images, chunk.alt))) elif not isinstance(chunk, FinishReason): @@ -260,4 +245,4 @@ def get_error_message(exception: Exception) -> str: provider = get_last_provider() if provider is None: return message - return f"{provider.__name__}: {message}" + return f"{provider.__name__}: {message}"
\ No newline at end of file |