Merge pull request #1247 from hlohaus/pi

Fix Chatgpt4Online Provider

g4f/Provider/AiAsk.py

@@ -8,7 +8,7 @@ class AiAsk(AsyncGeneratorProvider):
     url = "https://e.aiask.me"
     supports_message_history = True
     supports_gpt_35_turbo = True
-    working = True
+    working = False
 
     @classmethod
     async def create_async_generator(

g4f/Provider/Aichat.py

@@ -8,8 +8,8 @@ from .helper import get_cookies
 from ..requests import StreamSession
 
 class Aichat(AsyncProvider):
-    url                   = "https://chat-gpt.org/chat"
-    working               = True
+    url = "https://chat-gpt.org/chat"
+    working = False
     supports_gpt_35_turbo = True
 
     @staticmethod

g4f/Provider/Chatgpt4Online.py

@@ -1,42 +1,44 @@
 from __future__ import annotations
 
-import json
+import re
 from aiohttp import ClientSession
 
-from ..typing       import AsyncResult, Messages
-from .base_provider import AsyncGeneratorProvider
+from ..typing import Messages
+from .base_provider import AsyncProvider
+from .helper import format_prompt
 
-
-class Chatgpt4Online(AsyncGeneratorProvider):
+class Chatgpt4Online(AsyncProvider):
     url = "https://chatgpt4online.org"
     supports_message_history = True
     supports_gpt_35_turbo = True
-    working = False
+    working = True
+    _wpnonce = None
 
     @classmethod
-    async def create_async_generator(
+    async def create_async(
         cls,
         model: str,
         messages: Messages,
         proxy: str = None,
         **kwargs
-    ) -> AsyncResult:
+    ) -> str:
         async with ClientSession() as session:
+            if not cls._wpnonce:
+                async with session.get(f"{cls.url}/", proxy=proxy) as response:
+                    response.raise_for_status()
+                    response = await response.text()
+                    if result := re.search(r'data-nonce="(.*?)"', response):
+                        cls._wpnonce = result.group(1)
+                    else:
+                        raise RuntimeError("No nonce found")
             data = {
-                "botId": "default",
-                "customId": None,
-                "session": "N/A",
-                "chatId": "",
-                "contextId": 58,
-                "messages": messages,
-                "newMessage": messages[-1]["content"],
-                "stream": True
+                "_wpnonce": cls._wpnonce,
+                "post_id": 58,
+                "url": "https://chatgpt4online.org",
+                "action": "wpaicg_chat_shortcode_message",
+                "message": format_prompt(messages),
+                "bot_id": 3405
             }
-
-            async with session.post(f"{cls.url}/wp-json/mwai-ui/v1/chats/submit", json=data, proxy=proxy) as response:
+            async with session.post(f"{cls.url}/rizq", data=data, proxy=proxy) as response:
                 response.raise_for_status()
-                async for line in response.content:
-                    if line.startswith(b"data: "):
-                        line = json.loads(line[6:])
-                        if line["type"] == "live":
-                            yield line["data"]
+                return (await response.json())["data"]

g4f/Provider/FreeGpt.py

@@ -12,7 +12,7 @@ domains = [
 
 class FreeGpt(AsyncGeneratorProvider):
     url = "https://freegpts1.aifree.site/"
-    working = True
+    working = False
     supports_message_history = True
     supports_gpt_35_turbo = True
 

g4f/Provider/__init__.py

@@ -1,9 +1,6 @@
 from __future__       import annotations
-from .Acytoo          import Acytoo
 from .AiAsk           import AiAsk
-from .Aibn            import Aibn
 from .Aichat          import Aichat
-from .Ails            import Ails
 from .AItianhu        import AItianhu
 from .AItianhuSpace   import AItianhuSpace
 from .Berlin          import Berlin
@@ -13,11 +10,9 @@ from .ChatForAi       import ChatForAi
 from .Chatgpt4Online  import Chatgpt4Online
 from .ChatgptAi       import ChatgptAi
 from .ChatgptDemo     import ChatgptDemo
-from .ChatgptDuo      import ChatgptDuo
 from .ChatgptFree     import ChatgptFree
 from .ChatgptLogin    import ChatgptLogin
 from .ChatgptX        import ChatgptX
-from .Cromicle        import Cromicle
 from .DeepInfra       import DeepInfra
 from .FakeGpt         import FakeGpt
 from .FreeGpt         import FreeGpt

g4f/Provider/deprecated/Acytoo.py

@@ -2,8 +2,8 @@ from __future__ import annotations
 
 from aiohttp import ClientSession
 
-from ..typing import AsyncResult, Messages
-from .base_provider import AsyncGeneratorProvider
+from ...typing import AsyncResult, Messages
+from ..base_provider import AsyncGeneratorProvider
 
 
 class Acytoo(AsyncGeneratorProvider):

g4f/Provider/deprecated/Aibn.py

@@ -3,9 +3,9 @@ from __future__ import annotations
 import time
 import hashlib
 
-from ..typing import AsyncResult, Messages
-from ..requests import StreamSession
-from .base_provider import AsyncGeneratorProvider
+from ...typing import AsyncResult, Messages
+from ...requests import StreamSession
+from ..base_provider import AsyncGeneratorProvider
 
 
 class Aibn(AsyncGeneratorProvider):

g4f/Provider/deprecated/Ails.py

@@ -7,8 +7,8 @@ import json
 from datetime import datetime
 from aiohttp import ClientSession
 
-from ..typing import SHA256, AsyncResult, Messages
-from .base_provider import AsyncGeneratorProvider
+from ...typing import SHA256, AsyncResult, Messages
+from ..base_provider import AsyncGeneratorProvider
 
 
 class Ails(AsyncGeneratorProvider):

g4f/Provider/deprecated/ChatgptDuo.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
-from ..typing import Messages
+from ...typing import Messages
 from curl_cffi.requests import AsyncSession
-from .base_provider import AsyncProvider, format_prompt
+from ..base_provider import AsyncProvider, format_prompt
 
 
 class ChatgptDuo(AsyncProvider):

g4f/Provider/deprecated/Cromicle.py

@@ -2,10 +2,10 @@ from __future__ import annotations
 
 from aiohttp import ClientSession
 from hashlib import sha256
-from ..typing import AsyncResult, Messages, Dict
+from ...typing import AsyncResult, Messages, Dict
 
-from .base_provider import AsyncGeneratorProvider
-from .helper import format_prompt
+from ..base_provider import AsyncGeneratorProvider
+from ..helper import format_prompt
 
 
 class Cromicle(AsyncGeneratorProvider):

g4f/Provider/deprecated/__init__.py

@@ -13,4 +13,9 @@ from .FastGpt       import FastGpt
 from .Aivvm         import Aivvm
 from .Vitalentum    import Vitalentum
 from .H2o           import H2o
-from .Myshell       import Myshell
+from .Myshell       import Myshell
+from .Acytoo        import Acytoo
+from .Aibn          import Aibn
+from .Ails          import Ails 
+from .ChatgptDuo    import ChatgptDuo
+from .Cromicle      import Cromicle

g4f/models.py

@@ -15,10 +15,8 @@ from .Provider   import (
     Berlin,
     Llama2,
     Vercel, 
-    Aichat,
     GPTalk,
     Koala,
-    AiAsk,
     GptGo,
     Phind,
     Bard, 
@@ -42,7 +40,7 @@ default = Model(
     base_provider = "",
     best_provider = RetryProvider([
         Bing,         # Not fully GPT 3 or 4
-        AiAsk, Aichat, ChatgptAi, FreeGpt, GptGo, GeekGpt,
+        ChatgptAi, GptGo, GeekGpt,
         Phind, You
     ])
 )