summaryrefslogtreecommitdiffstats
path: root/g4f/Provider/deprecated
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--g4f/Provider/deprecated/ChatForAi.py (renamed from g4f/Provider/ChatForAi.py)9
-rw-r--r--g4f/Provider/deprecated/ChatgptLogin.py74
-rw-r--r--g4f/Provider/deprecated/Opchatgpts.py73
-rw-r--r--g4f/Provider/deprecated/__init__.py2
4 files changed, 76 insertions, 82 deletions
diff --git a/g4f/Provider/ChatForAi.py b/g4f/Provider/deprecated/ChatForAi.py
index f2fe0335..ab4cd89c 100644
--- a/g4f/Provider/ChatForAi.py
+++ b/g4f/Provider/deprecated/ChatForAi.py
@@ -1,14 +1,13 @@
from __future__ import annotations
-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 ChatForAi(AsyncGeneratorProvider):
url = "https://chatforai.com"
supports_gpt_35_turbo = True
- working = True
@classmethod
async def create_async_generator(
@@ -40,6 +39,8 @@ class ChatForAi(AsyncGeneratorProvider):
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
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 20:32:20 +0100