diff options
Diffstat (limited to '')
| -rw-r--r-- | g4f/Provider/ChatForAi.py (renamed from g4f/Provider/deprecated/ChatForAi.py) | 33 | ||||
| -rw-r--r-- | g4f/Provider/deprecated/Aivvm.py (renamed from g4f/Provider/Aivvm.py) | 6 | ||||
| -rw-r--r-- | g4f/Provider/deprecated/Opchatgpts.py | 74 | ||||
| -rw-r--r-- | g4f/Provider/deprecated/Vitalentum.py (renamed from g4f/Provider/Vitalentum.py) | 5 | ||||
| -rw-r--r-- | g4f/Provider/deprecated/__init__.py | 4 |
5 files changed, 32 insertions, 90 deletions
diff --git a/g4f/Provider/deprecated/ChatForAi.py b/g4f/Provider/ChatForAi.py index ab4cd89c..c93e76ee 100644 --- a/g4f/Provider/deprecated/ChatForAi.py +++ b/g4f/Provider/ChatForAi.py @@ -1,12 +1,16 @@ from __future__ import annotations -from ...typing import AsyncResult, Messages -from ...requests import StreamSession -from ..base_provider import AsyncGeneratorProvider +import time +import hashlib + +from ..typing import AsyncResult, Messages +from ..requests import StreamSession +from .base_provider import AsyncGeneratorProvider class ChatForAi(AsyncGeneratorProvider): - url = "https://chatforai.com" + url = "https://chatforai.store" + working = True supports_gpt_35_turbo = True @classmethod @@ -18,10 +22,17 @@ class ChatForAi(AsyncGeneratorProvider): timeout: int = 120, **kwargs ) -> AsyncResult: - async with StreamSession(impersonate="chrome107", proxies={"https": proxy}, timeout=timeout) as session: + headers = { + "Content-Type": "text/plain;charset=UTF-8", + "Origin": cls.url, + "Referer": f"{cls.url}/?r=b", + } + async with StreamSession(impersonate="chrome107", headers=headers, proxies={"https": proxy}, timeout=timeout) as session: prompt = messages[-1]["content"] + timestamp = int(time.time() * 1e3) + conversation_id = f"id_{timestamp-123}" data = { - "conversationId": "temp", + "conversationId": conversation_id, "conversationType": "chat_continuous", "botId": "chat_continuous", "globalSettings":{ @@ -33,8 +44,10 @@ class ChatForAi(AsyncGeneratorProvider): **kwargs }, "botSettings": {}, - "prompt": prompt, + "prompt": prompt, "messages": messages, + "timestamp": timestamp, + "sign": generate_signature(timestamp, prompt, conversation_id) } async with session.post(f"{cls.url}/api/handle/provider-openai", json=data) as response: response.raise_for_status() @@ -52,4 +65,8 @@ class ChatForAi(AsyncGeneratorProvider): ("stream", "bool"), ] param = ", ".join([": ".join(p) for p in params]) - return f"g4f.provider.{cls.__name__} supports: ({param})"
\ No newline at end of file + return f"g4f.provider.{cls.__name__} supports: ({param})" + +def generate_signature(timestamp: int, message: str, id: str): + buffer = f"{timestamp}:{id}:{message}:7YN8z6d6" + return hashlib.sha256(buffer.encode()).hexdigest()
\ No newline at end of file diff --git a/g4f/Provider/Aivvm.py b/g4f/Provider/deprecated/Aivvm.py index 214eb638..12fd387d 100644 --- a/g4f/Provider/Aivvm.py +++ b/g4f/Provider/deprecated/Aivvm.py @@ -1,8 +1,8 @@ from __future__ import annotations import requests -from .base_provider import BaseProvider -from ..typing import CreateResult +from ..base_provider import BaseProvider +from ...typing import CreateResult, Messages from json import dumps # to recreate this easily, send a post request to https://chat.aivvm.com/api/models @@ -27,7 +27,7 @@ class Aivvm(BaseProvider): @classmethod def create_completion(cls, model: str, - messages: list[dict[str, str]], + messages: Messages, stream: bool, **kwargs ) -> CreateResult: diff --git a/g4f/Provider/deprecated/Opchatgpts.py b/g4f/Provider/deprecated/Opchatgpts.py deleted file mode 100644 index cc6a133c..00000000 --- a/g4f/Provider/deprecated/Opchatgpts.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 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/Vitalentum.py b/g4f/Provider/deprecated/Vitalentum.py index 37e259b2..8deb1f50 100644 --- a/g4f/Provider/Vitalentum.py +++ b/g4f/Provider/deprecated/Vitalentum.py @@ -3,12 +3,11 @@ from __future__ import annotations import json from aiohttp import ClientSession -from .base_provider import AsyncGeneratorProvider -from ..typing import AsyncResult, Messages +from ..base_provider import AsyncGeneratorProvider +from ...typing import AsyncResult, Messages class Vitalentum(AsyncGeneratorProvider): url = "https://app.vitalentum.io" - working = True supports_gpt_35_turbo = True diff --git a/g4f/Provider/deprecated/__init__.py b/g4f/Provider/deprecated/__init__.py index 0644dc52..b37b7edd 100644 --- a/g4f/Provider/deprecated/__init__.py +++ b/g4f/Provider/deprecated/__init__.py @@ -4,11 +4,11 @@ from .DfeHub import DfeHub from .EasyChat import EasyChat from .Forefront import Forefront from .GetGpt import GetGpt -from .Opchatgpts import Opchatgpts from .Lockchat import Lockchat from .Wewordle import Wewordle from .Equing import Equing from .Wuguokai import Wuguokai from .V50 import V50 from .FastGpt import FastGpt -from .ChatForAi import ChatForAi
\ No newline at end of file +from .Aivvm import Aivvm +from .Vitalentum import Vitalentum
\ No newline at end of file |