From 5b82cdc25ff90707a95fdf8fcc04fb0cadd6c0fe Mon Sep 17 00:00:00 2001
From: kqlio67 <kqlio67@users.noreply.github.com>
Date: Fri, 6 Sep 2024 01:30:21 +0300
Subject: Updated g4f/Provider/FluxAirforce.py

---
 g4f/Provider/FluxAirforce-copy2.py | 61 ++++++++++++++++++++++++++++++++++++++
 g4f/Provider/FluxAirforce.py       | 43 +++++++++++++++++----------
 2 files changed, 89 insertions(+), 15 deletions(-)
 create mode 100644 g4f/Provider/FluxAirforce-copy2.py

(limited to 'g4f')

diff --git a/g4f/Provider/FluxAirforce-copy2.py b/g4f/Provider/FluxAirforce-copy2.py
new file mode 100644
index 00000000..b6cf4055
--- /dev/null
+++ b/g4f/Provider/FluxAirforce-copy2.py
@@ -0,0 +1,61 @@
+from __future__ import annotations
+
+from aiohttp import ClientSession
+from urllib.parse import urlencode
+
+from ..typing import AsyncResult, Messages
+from .base_provider import AsyncGeneratorProvider, ProviderModelMixin
+from ..image import ImageResponse
+
+class FluxAirforce(AsyncGeneratorProvider, ProviderModelMixin):
+    url = "https://flux.api.airforce/"
+    api_endpoint = "https://api.airforce/v1/imagine2"
+    working = True
+    default_model = 'flux-realism'
+    models = [
+        'flux',
+        'flux-realism',
+        'flux-anime',
+        'flux-3d',
+        'flux-disney'
+    ]
+
+    @classmethod
+    async def create_async_generator(
+        cls,
+        model: str,
+        messages: Messages,
+        proxy: str = None,
+        **kwargs
+    ) -> AsyncResult:
+        headers = {
+            "accept": "*/*",
+            "accept-language": "en-US,en;q=0.9",
+            "origin": "https://flux.api.airforce",
+            "priority": "u=1, i",
+            "referer": "https://flux.api.airforce/",
+            "sec-ch-ua": '"Chromium";v="127", "Not)A;Brand";v="99"',
+            "sec-ch-ua-mobile": "?0",
+            "sec-ch-ua-platform": '"Linux"',
+            "sec-fetch-dest": "empty",
+            "sec-fetch-mode": "cors",
+            "sec-fetch-site": "same-site",
+            "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36"
+        }
+
+        prompt = messages[-1]['content'] if messages else ""
+
+        params = {
+            "prompt": prompt,
+            "size": kwargs.get("size", "1:1"),
+            "seed": kwargs.get("seed"),
+            "model": model
+        }
+
+        params = {k: v for k, v in params.items() if v is not None}
+
+        async with ClientSession(headers=headers) as session:
+            async with session.get(f"{cls.api_endpoint}", params=params, proxy=proxy) as response:
+                response.raise_for_status()
+                image_url = str(response.url)
+                yield ImageResponse(image_url, prompt)
diff --git a/g4f/Provider/FluxAirforce.py b/g4f/Provider/FluxAirforce.py
index 139e6c5e..fe003a61 100644
--- a/g4f/Provider/FluxAirforce.py
+++ b/g4f/Provider/FluxAirforce.py
@@ -1,11 +1,12 @@
 from __future__ import annotations
 
-from aiohttp import ClientSession
+from aiohttp import ClientSession, ClientResponseError
 from urllib.parse import urlencode
+import io
 
 from ..typing import AsyncResult, Messages
 from .base_provider import AsyncGeneratorProvider, ProviderModelMixin
-from ..image import ImageResponse
+from ..image import ImageResponse, is_accepted_format
 
 class FluxAirforce(AsyncGeneratorProvider, ProviderModelMixin):
     url = "https://flux.api.airforce/"
@@ -43,7 +44,6 @@ class FluxAirforce(AsyncGeneratorProvider, ProviderModelMixin):
             "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36"
         }
 
-        # Assume the last message in the messages list is the prompt
         prompt = messages[-1]['content'] if messages else ""
 
         params = {
@@ -53,17 +53,30 @@ class FluxAirforce(AsyncGeneratorProvider, ProviderModelMixin):
             "model": model
         }
 
-        # Remove None values from params
         params = {k: v for k, v in params.items() if v is not None}
 
-        async with ClientSession(headers=headers) as session:
-            async with session.get(f"{cls.api_endpoint}", params=params, proxy=proxy) as response:
-                response.raise_for_status()
-                
-                # Get the URL of the generated image
-                image_url = str(response.url)
-                
-                # Create an ImageResponse object
-                image_response = ImageResponse(image_url, prompt)
-                
-                yield image_response
+        try:
+            async with ClientSession(headers=headers) as session:
+                async with session.get(f"{cls.api_endpoint}", params=params, proxy=proxy) as response:
+                    response.raise_for_status()
+                    
+                    content = await response.read()
+                    
+                    if response.content_type.startswith('image/'):
+                        image_url = str(response.url)
+                        yield ImageResponse(image_url, prompt)
+                    else:
+                        try:
+                            text = content.decode('utf-8', errors='ignore')
+                            yield f"Error: {text}"
+                        except Exception as decode_error:
+                            yield f"Error: Unable to decode response - {str(decode_error)}"
+
+        except ClientResponseError as e:
+            yield f"Error: HTTP {e.status}: {e.message}"
+        except Exception as e:
+            yield f"Unexpected error: {str(e)}"
+
+        finally:
+            if not session.closed:
+                await session.close()
-- 
cgit v1.2.3