diff options
author | kqlio67 <kqlio67@users.noreply.github.com> | 2024-10-22 11:19:42 +0200 |
---|---|---|
committer | kqlio67 <kqlio67@users.noreply.github.com> | 2024-10-22 11:19:42 +0200 |
commit | dc4305e2f9bf00f84dae02a469f6b19e73449ae4 (patch) | |
tree | bb33c246426e5ec113c071be2cc265a31c01b018 /g4f/Provider | |
parent | feat(g4f/gui/server/api.py): improve image handling and response streaming (diff) | |
download | gpt4free-dc4305e2f9bf00f84dae02a469f6b19e73449ae4.tar gpt4free-dc4305e2f9bf00f84dae02a469f6b19e73449ae4.tar.gz gpt4free-dc4305e2f9bf00f84dae02a469f6b19e73449ae4.tar.bz2 gpt4free-dc4305e2f9bf00f84dae02a469f6b19e73449ae4.tar.lz gpt4free-dc4305e2f9bf00f84dae02a469f6b19e73449ae4.tar.xz gpt4free-dc4305e2f9bf00f84dae02a469f6b19e73449ae4.tar.zst gpt4free-dc4305e2f9bf00f84dae02a469f6b19e73449ae4.zip |
Diffstat (limited to 'g4f/Provider')
-rw-r--r-- | g4f/Provider/nexra/NexraDallE.py | 75 |
1 files changed, 35 insertions, 40 deletions
diff --git a/g4f/Provider/nexra/NexraDallE.py b/g4f/Provider/nexra/NexraDallE.py index 26db0729..9505a076 100644 --- a/g4f/Provider/nexra/NexraDallE.py +++ b/g4f/Provider/nexra/NexraDallE.py @@ -1,66 +1,61 @@ from __future__ import annotations -from aiohttp import ClientSession import json - -from ...typing import AsyncResult, Messages -from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin +import requests +from ...typing import CreateResult, Messages +from ..base_provider import ProviderModelMixin, AbstractProvider from ...image import ImageResponse - -class NexraDallE(AsyncGeneratorProvider, ProviderModelMixin): +class NexraDallE(AbstractProvider, ProviderModelMixin): label = "Nexra DALL-E" url = "https://nexra.aryahcr.cc/documentation/dall-e/en" api_endpoint = "https://nexra.aryahcr.cc/api/image/complements" - working = False - - default_model = 'dalle' + working = True + + default_model = "dalle" models = [default_model] @classmethod def get_model(cls, model: str) -> str: return cls.default_model - + @classmethod - async def create_async_generator( + def create_completion( cls, model: str, messages: Messages, - proxy: str = None, - response: str = "url", # base64 or url **kwargs - ) -> AsyncResult: - # Retrieve the correct model to use + ) -> CreateResult: model = cls.get_model(model) - # Format the prompt from the messages - prompt = messages[0]['content'] - headers = { - "Content-Type": "application/json" + 'Content-Type': 'application/json' } - payload = { - "prompt": prompt, + + data = { + "prompt": messages[-1]["content"], "model": model, - "response": response + "response": "url" } + + response = requests.post(cls.api_endpoint, headers=headers, json=data) - async with ClientSession(headers=headers) as session: - async with session.post(cls.api_endpoint, json=payload, proxy=proxy) as response: - response.raise_for_status() - text_data = await response.text() + result = cls.process_response(response) + yield result # Повертаємо результат як генератор - try: - # Parse the JSON response - json_start = text_data.find('{') - json_data = text_data[json_start:] - data = json.loads(json_data) - - # Check if the response contains images - if 'images' in data and len(data['images']) > 0: - image_url = data['images'][0] - yield ImageResponse(image_url, prompt) - else: - yield ImageResponse("No images found in the response.", prompt) - except json.JSONDecodeError: - yield ImageResponse("Failed to parse JSON. Response might not be in JSON format.", prompt) + @classmethod + def process_response(cls, response): + if response.status_code == 200: + try: + content = response.text.strip() + content = content.lstrip('_') + data = json.loads(content) + if data.get('status') and data.get('images'): + image_url = data['images'][0] + return ImageResponse(images=[image_url], alt="Generated Image") + else: + return "Error: No image URL found in the response" + except json.JSONDecodeError as e: + return f"Error: Unable to decode JSON response. Details: {str(e)}" + else: + return f"Error: {response.status_code}, Response: {response.text}" |