From ae8dae82cffb07eeeecc5b07ffc9b502e92bfe62 Mon Sep 17 00:00:00 2001
From: abc <98614666+xtekky@users.noreply.github.com>
Date: Sat, 21 Oct 2023 00:52:19 +0100
Subject: ~ | g4f `v-0.1.7.2`

patch / unpatch providers
---
 g4f/Provider/Aichat.py | 59 +++++++++++++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 25 deletions(-)

(limited to 'g4f/Provider/Aichat.py')

diff --git a/g4f/Provider/Aichat.py b/g4f/Provider/Aichat.py
index ddc9eb1d..d32c99e1 100644
--- a/g4f/Provider/Aichat.py
+++ b/g4f/Provider/Aichat.py
@@ -4,7 +4,8 @@ from aiohttp import ClientSession
 
 from ..typing import Messages
 from .base_provider import AsyncProvider, format_prompt
-
+from .helper import get_cookies
+from ..requests import StreamSession
 
 class Aichat(AsyncProvider):
     url                   = "https://chat-gpt.org/chat"
@@ -15,27 +16,34 @@ class Aichat(AsyncProvider):
     async def create_async(
         model: str,
         messages: Messages,
-        proxy: str = None,
-        **kwargs
-    ) -> str:
+        proxy: str = None, **kwargs) -> str:
+        
+        cookies = get_cookies('chat-gpt.org') if not kwargs.get('cookies') else kwargs.get('cookies')
+        if not cookies:
+            raise RuntimeError(f"g4f.provider.Aichat requires cookies, [refresh https://chat-gpt.org on chrome]")
+        
         headers = {
-            "authority": "chat-gpt.org",
-            "accept": "*/*",
-            "cache-control": "no-cache",
-            "content-type": "application/json",
-            "origin": "https://chat-gpt.org",
-            "pragma": "no-cache",
-            "referer": "https://chat-gpt.org/chat",
-            "sec-ch-ua-mobile": "?0",
-            "sec-ch-ua-platform": '"macOS"',
-            "sec-fetch-dest": "empty",
-            "sec-fetch-mode": "cors",
-            "sec-fetch-site": "same-origin",
-            "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36",
+            'authority': 'chat-gpt.org',
+            'accept': '*/*',
+            'accept-language': 'en,fr-FR;q=0.9,fr;q=0.8,es-ES;q=0.7,es;q=0.6,en-US;q=0.5,am;q=0.4,de;q=0.3',
+            'content-type': 'application/json',
+            'origin': 'https://chat-gpt.org',
+            'referer': 'https://chat-gpt.org/chat',
+            'sec-ch-ua': '"Chromium";v="118", "Google Chrome";v="118", "Not=A?Brand";v="99"',
+            'sec-ch-ua-mobile': '?0',
+            'sec-ch-ua-platform': '"macOS"',
+            'sec-fetch-dest': 'empty',
+            'sec-fetch-mode': 'cors',
+            'sec-fetch-site': 'same-origin',
+            'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36',
         }
-        async with ClientSession(
-            headers=headers
-        ) as session:
+        
+        async with StreamSession(headers=headers,
+                                    cookies=cookies,
+                                    timeout=6,
+                                    proxies={"https": proxy} if proxy else None,
+                                    impersonate="chrome110", verify=False) as session:
+            
             json_data = {
                 "message": format_prompt(messages),
                 "temperature": kwargs.get('temperature', 0.5),
@@ -43,13 +51,14 @@ class Aichat(AsyncProvider):
                 "top_p": kwargs.get('top_p', 1),
                 "frequency_penalty": 0,
             }
-            async with session.post(
-                "https://chat-gpt.org/api/text",
-                proxy=proxy,
-                json=json_data
-            ) as response:
+            
+            async with session.post("https://chat-gpt.org/api/text",
+                                    json=json_data) as response:
+                
                 response.raise_for_status()
                 result = await response.json()
+                
                 if not result['response']:
                     raise Exception(f"Error Response: {result}")
+                
                 return result["message"]
-- 
cgit v1.2.3