From 7a13dad5d88d034e60e7da37513a1d8b74029cde Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Sun, 20 Oct 2024 16:42:10 +0300 Subject: All nexra providers are temporarily disabled --- g4f/Provider/nexra/NexraFluxPro.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g4f/Provider/nexra/NexraFluxPro.py') diff --git a/g4f/Provider/nexra/NexraFluxPro.py b/g4f/Provider/nexra/NexraFluxPro.py index 1dbab633..101ed95e 100644 --- a/g4f/Provider/nexra/NexraFluxPro.py +++ b/g4f/Provider/nexra/NexraFluxPro.py @@ -12,7 +12,7 @@ class NexraFluxPro(AsyncGeneratorProvider, ProviderModelMixin): label = "Nexra Flux PRO" url = "https://nexra.aryahcr.cc/documentation/flux-pro/en" api_endpoint = "https://nexra.aryahcr.cc/api/image/complements" - working = True + working = False default_model = 'flux' models = [default_model] -- cgit v1.2.3 From e9d6ac56d475a2c8033b935afbb6bb5b40a2b736 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Tue, 22 Oct 2024 13:09:09 +0300 Subject: Restored provider (g4f/Provider/nexra/NexraFluxPro.py) --- g4f/Provider/nexra/NexraFluxPro.py | 71 ++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 38 deletions(-) (limited to 'g4f/Provider/nexra/NexraFluxPro.py') diff --git a/g4f/Provider/nexra/NexraFluxPro.py b/g4f/Provider/nexra/NexraFluxPro.py index 101ed95e..a6ee3d7e 100644 --- a/g4f/Provider/nexra/NexraFluxPro.py +++ b/g4f/Provider/nexra/NexraFluxPro.py @@ -1,19 +1,16 @@ 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 NexraFluxPro(AsyncGeneratorProvider, ProviderModelMixin): - label = "Nexra Flux PRO" +class NexraFluxPro(AbstractProvider, ProviderModelMixin): url = "https://nexra.aryahcr.cc/documentation/flux-pro/en" api_endpoint = "https://nexra.aryahcr.cc/api/image/complements" - working = False - + working = True + default_model = 'flux' models = [default_model] model_aliases = { @@ -28,47 +25,45 @@ class NexraFluxPro(AsyncGeneratorProvider, ProviderModelMixin): return cls.model_aliases[model] else: 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 = 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}" -- cgit v1.2.3 From 533954201e7bc974898985cd0374b8bb89924a77 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Tue, 22 Oct 2024 13:46:36 +0300 Subject: Updated (g4f/Provider/nexra/) --- g4f/Provider/nexra/NexraFluxPro.py | 1 + 1 file changed, 1 insertion(+) (limited to 'g4f/Provider/nexra/NexraFluxPro.py') diff --git a/g4f/Provider/nexra/NexraFluxPro.py b/g4f/Provider/nexra/NexraFluxPro.py index a6ee3d7e..cfb26385 100644 --- a/g4f/Provider/nexra/NexraFluxPro.py +++ b/g4f/Provider/nexra/NexraFluxPro.py @@ -31,6 +31,7 @@ class NexraFluxPro(AbstractProvider, ProviderModelMixin): cls, model: str, messages: Messages, + proxy: str = None, response: str = "url", # base64 or url **kwargs ) -> CreateResult: -- cgit v1.2.3