4 files changed, 126 insertions, 78 deletions

diff --git a/g4f/Provider/deprecated/ChatForAi.py b/g4f/Provider/deprecated/ChatForAi.py
new file mode 100644
index 00000000..ab4cd89c
--- /dev/null
+++ b/g4f/Provider/deprecated/ChatForAi.py
@@ -0,0 +1,55 @@
+from __future__ import annotations
+
+from ...typing import AsyncResult, Messages
+from ...requests import StreamSession
+from ..base_provider import AsyncGeneratorProvider
+
+
+class ChatForAi(AsyncGeneratorProvider):
+    url                   = "https://chatforai.com"
+    supports_gpt_35_turbo = True
+
+    @classmethod
+    async def create_async_generator(
+        cls,
+        model: str,
+        messages: Messages,
+        proxy: str = None,
+        timeout: int = 120,
+        **kwargs
+    ) -> AsyncResult:
+        async with StreamSession(impersonate="chrome107", proxies={"https": proxy}, timeout=timeout) as session:
+            prompt = messages[-1]["content"]
+            data = {
+                "conversationId": "temp",
+                "conversationType": "chat_continuous",
+                "botId": "chat_continuous",
+                "globalSettings":{
+                    "baseUrl": "https://api.openai.com",
+                    "model": model if model else "gpt-3.5-turbo",
+                    "messageHistorySize": 5,
+                    "temperature": 0.7,
+                    "top_p": 1,
+                    **kwargs
+                },
+                "botSettings": {},
+                "prompt": prompt,
+                "messages": messages,
+            }
+            async with session.post(f"{cls.url}/api/handle/provider-openai", json=data) as response:
+                response.raise_for_status()
+                async for chunk in response.iter_content():
+                    if b"https://chatforai.store" in chunk:
+                        raise RuntimeError(f"Response: {chunk.decode()}")
+                    yield chunk.decode()
+
+    @classmethod
+    @property
+    def params(cls):
+        params = [
+            ("model", "str"),
+            ("messages", "list[dict[str, str]]"),
+            ("stream", "bool"),
+        ]
+        param = ", ".join([": ".join(p) for p in params])
+        return f"g4f.provider.{cls.__name__} supports: ({param})"
\ No newline at end of file
diff --git a/g4f/Provider/deprecated/ChatgptLogin.py b/g4f/Provider/deprecated/ChatgptLogin.py
deleted file mode 100644
index 07f3b914..00000000
--- a/g4f/Provider/deprecated/ChatgptLogin.py
+++ /dev/null
@@ -1,74 +0,0 @@
-from __future__ import annotations
-
-import os, re
-from aiohttp import ClientSession
-
-from ..base_provider import AsyncProvider, format_prompt
-
-
-class ChatgptLogin(AsyncProvider):
-    url                   = "https://opchatgpts.net"
-    supports_gpt_35_turbo = True
-    working               = True
-    _nonce                = None
-
-    @classmethod
-    async def create_async(
-        cls,
-        model: str,
-        messages: list[dict[str, str]],
-        **kwargs
-    ) -> str:
-        headers = {
-            "User-Agent"         : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36",
-            "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",
-            "Origin"             : "https://opchatgpts.net",
-            "Alt-Used"           : "opchatgpts.net",
-            "Referer"            : "https://opchatgpts.net/chatgpt-free-use/",
-            "Sec-Fetch-Dest"     : "empty",
-            "Sec-Fetch-Mode"     : "cors",
-            "Sec-Fetch-Site"     : "same-origin",
-        }
-        async with ClientSession(
-            headers=headers
-        ) as session:
-            if not cls._nonce:
-                async with session.get(
-                    "https://opchatgpts.net/chatgpt-free-use/",
-                    params={"id": os.urandom(6).hex()},
-                ) as response:
-                    result = re.search(r'data-nonce="(.*?)"', await response.text())
-                if not result:
-                    raise RuntimeError("No nonce value")
-                cls._nonce = result.group(1)
-            data = {
-                "_wpnonce": cls._nonce,
-                "post_id": 28,
-                "url": "https://opchatgpts.net/chatgpt-free-use",
-                "action": "wpaicg_chat_shortcode_message",
-                "message": format_prompt(messages),
-                "bot_id": 0
-            }
-            async with session.post("https://opchatgpts.net/wp-admin/admin-ajax.php", data=data) as response:
-                response.raise_for_status()
-                data = await response.json()
-                if "data" in data:
-                    return data["data"]
-                elif "msg" in data:
-                    raise RuntimeError(data["msg"])
-                else:
-                    raise RuntimeError(f"Response: {data}")
-
-
-    @classmethod
-    @property
-    def params(cls):
-        params = [
-            ("model", "str"),
-            ("messages", "list[dict[str, str]]"),
-            ("stream", "bool"),
-            ("temperature", "float"),
-        ]
-        param = ", ".join([": ".join(p) for p in params])
-        return f"g4f.provider.{cls.__name__} supports: ({param})"
\ No newline at end of file
diff --git a/g4f/Provider/deprecated/Opchatgpts.py b/g4f/Provider/deprecated/Opchatgpts.py
index ab0d68c9..cc6a133c 100644
--- a/g4f/Provider/deprecated/Opchatgpts.py
+++ b/g4f/Provider/deprecated/Opchatgpts.py
@@ -1,7 +1,74 @@
 from __future__ import annotations
 
-from .ChatgptLogin import ChatgptLogin
+import os, re
+from aiohttp import ClientSession
 
+from ..base_provider import AsyncProvider, format_prompt
 
-class Opchatgpts(ChatgptLogin):
-    url     = "https://opchatgpts.net"
\ No newline at end of file
+
+class Opchatgpts(AsyncProvider):
+    url                   = "https://opchatgpts.net"
+    supports_gpt_35_turbo = True
+    working               = True
+    _nonce                = None
+
+    @classmethod
+    async def create_async(
+        cls,
+        model: str,
+        messages: list[dict[str, str]],
+        **kwargs
+    ) -> str:
+        headers = {
+            "User-Agent"         : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36",
+            "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",
+            "Origin"             : "https://opchatgpts.net",
+            "Alt-Used"           : "opchatgpts.net",
+            "Referer"            : "https://opchatgpts.net/chatgpt-free-use/",
+            "Sec-Fetch-Dest"     : "empty",
+            "Sec-Fetch-Mode"     : "cors",
+            "Sec-Fetch-Site"     : "same-origin",
+        }
+        async with ClientSession(
+            headers=headers
+        ) as session:
+            if not cls._nonce:
+                async with session.get(
+                    "https://opchatgpts.net/chatgpt-free-use/",
+                    params={"id": os.urandom(6).hex()},
+                ) as response:
+                    result = re.search(r'data-nonce="(.*?)"', await response.text())
+                if not result:
+                    raise RuntimeError("No nonce value")
+                cls._nonce = result.group(1)
+            data = {
+                "_wpnonce": cls._nonce,
+                "post_id": 28,
+                "url": "https://opchatgpts.net/chatgpt-free-use",
+                "action": "wpaicg_chat_shortcode_message",
+                "message": format_prompt(messages),
+                "bot_id": 0
+            }
+            async with session.post("https://opchatgpts.net/wp-admin/admin-ajax.php", data=data) as response:
+                response.raise_for_status()
+                data = await response.json()
+                if "data" in data:
+                    return data["data"]
+                elif "msg" in data:
+                    raise RuntimeError(data["msg"])
+                else:
+                    raise RuntimeError(f"Response: {data}")
+
+
+    @classmethod
+    @property
+    def params(cls):
+        params = [
+            ("model", "str"),
+            ("messages", "list[dict[str, str]]"),
+            ("stream", "bool"),
+            ("temperature", "float"),
+        ]
+        param = ", ".join([": ".join(p) for p in params])
+        return f"g4f.provider.{cls.__name__} supports: ({param})"
\ No newline at end of file
diff --git a/g4f/Provider/deprecated/__init__.py b/g4f/Provider/deprecated/__init__.py
index 5c66c87f..0644dc52 100644
--- a/g4f/Provider/deprecated/__init__.py
+++ b/g4f/Provider/deprecated/__init__.py
@@ -11,4 +11,4 @@ from .Equing        import Equing
 from .Wuguokai      import Wuguokai
 from .V50           import V50
 from .FastGpt       import FastGpt
-from .ChatgptLogin  import ChatgptLogin
\ No newline at end of file
+from .ChatForAi     import ChatForAi
\ No newline at end of file