summaryrefslogtreecommitdiffstats
path: root/g4f
diff options
context:
space:
mode:
Diffstat (limited to 'g4f')
-rw-r--r--g4f/Provider/ChatForAi.py (renamed from g4f/Provider/deprecated/ChatForAi.py)33
-rw-r--r--g4f/Provider/GptForLove.py13
-rw-r--r--g4f/Provider/Opchatgpts.py76
-rw-r--r--g4f/Provider/__init__.py4
-rw-r--r--g4f/Provider/deprecated/Aivvm.py (renamed from g4f/Provider/Aivvm.py)6
-rw-r--r--g4f/Provider/deprecated/Opchatgpts.py74
-rw-r--r--g4f/Provider/deprecated/Vitalentum.py (renamed from g4f/Provider/Vitalentum.py)5
-rw-r--r--g4f/Provider/deprecated/__init__.py4
-rw-r--r--g4f/Provider/unfinished/ChatAiGpt.py1
-rw-r--r--g4f/Provider/unfinished/TalkAi.py1
-rw-r--r--g4f/models.py10
11 files changed, 121 insertions, 106 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/GptForLove.py b/g4f/Provider/GptForLove.py
index 01cef443..9f7156b2 100644
--- a/g4f/Provider/GptForLove.py
+++ b/g4f/Provider/GptForLove.py
@@ -42,11 +42,10 @@ class GptForLove(AsyncGeneratorProvider):
data = {
"prompt": prompt,
"options": {},
- "systemMessage": "You are ChatGPT, the version is GPT3.5, a large language model trained by OpenAI. Follow the user's instructions carefully. Respond using markdown.",
- "temperature": 0.8,
- "top_p": 1,
+ "systemMessage": kwargs.get("system_message", "You are ChatGPT, the version is GPT3.5, a large language model trained by OpenAI. Follow the user's instructions carefully."),
+ "temperature": kwargs.get("temperature", 0.8),
+ "top_p": kwargs.get("top_p", 1),
"secret": get_secret(),
- **kwargs
}
async with session.post("https://api.gptplus.one/chat-process", json=data, proxy=proxy) as response:
response.raise_for_status()
@@ -67,9 +66,9 @@ class GptForLove(AsyncGeneratorProvider):
def get_secret() -> str:
dir = os.path.dirname(__file__)
- dir += '/npm/node_modules/crypto-js'
+ include = dir + '/npm/node_modules/crypto-js/crypto-js'
source = """
-CryptoJS = require('{dir}/crypto-js')
+CryptoJS = require({include})
var k = '14487141bvirvvG'
, e = Math.floor(new Date().getTime() / 1e3);
var t = CryptoJS.enc.Utf8.parse(e)
@@ -79,5 +78,5 @@ var t = CryptoJS.enc.Utf8.parse(e)
});
return o.toString()
"""
- source = source.replace('{dir}', dir)
+ source = source.replace('{include}', json.dumps(include))
return execjs.compile(source).call('')
diff --git a/g4f/Provider/Opchatgpts.py b/g4f/Provider/Opchatgpts.py
new file mode 100644
index 00000000..fb0b1ac3
--- /dev/null
+++ b/g4f/Provider/Opchatgpts.py
@@ -0,0 +1,76 @@
+from __future__ import annotations
+
+import random, string, json
+from aiohttp import ClientSession
+
+from ..typing import Messages, AsyncResult
+from .base_provider import AsyncGeneratorProvider
+
+
+class Opchatgpts(AsyncGeneratorProvider):
+ url = "https://opchatgpts.net"
+ supports_gpt_35_turbo = True
+ working = True
+
+ @classmethod
+ async def create_async_generator(
+ cls,
+ model: str,
+ messages: Messages,
+ proxy: str = None,
+ **kwargs
+ ) -> AsyncResult:
+ 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" : "de,en-US;q=0.7,en;q=0.3",
+ "Origin" : cls.url,
+ "Alt-Used" : "opchatgpts.net",
+ "Referer" : f"{cls.url}/chatgpt-free-use/",
+ "Sec-Fetch-Dest" : "empty",
+ "Sec-Fetch-Mode" : "cors",
+ "Sec-Fetch-Site" : "same-origin",
+ }
+ async with ClientSession(
+ headers=headers
+ ) as session:
+ data = {
+ "botId": "default",
+ "chatId": random_string(),
+ "contextId": 28,
+ "customId": None,
+ "messages": messages,
+ "newMessage": messages[-1]["content"],
+ "session": "N/A",
+ "stream": True
+ }
+ async with session.post(f"{cls.url}/wp-json/mwai-ui/v1/chats/submit", json=data, proxy=proxy) as response:
+ response.raise_for_status()
+ async for line in response.content:
+ if line.startswith(b"data: "):
+ try:
+ line = json.loads(line[6:])
+ assert "type" in line
+ except:
+ raise RuntimeError(f"Broken line: {line.decode()}")
+ if line["type"] == "live":
+ yield line["data"]
+ elif line["type"] == "end":
+ break
+
+
+ @classmethod
+ @property
+ def params(cls):
+ params = [
+ ("model", "str"),
+ ("messages", "list[dict[str, str]]"),
+ ("stream", "bool"),
+ ("proxy", "str"),
+ ]
+ param = ", ".join([": ".join(p) for p in params])
+ return f"g4f.provider.{cls.__name__} supports: ({param})"
+
+
+def random_string(length: int = 10):
+ return ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(length)) \ No newline at end of file
diff --git a/g4f/Provider/__init__.py b/g4f/Provider/__init__.py
index 4437f563..26f523c7 100644
--- a/g4f/Provider/__init__.py
+++ b/g4f/Provider/__init__.py
@@ -4,11 +4,11 @@ from .AiAsk import AiAsk
from .Aibn import Aibn
from .Aichat import Aichat
from .Ails import Ails
-from .Aivvm import Aivvm
from .AItianhu import AItianhu
from .AItianhuSpace import AItianhuSpace
from .Bing import Bing
from .ChatBase import ChatBase
+from .ChatForAi import ChatForAi
from .Chatgpt4Online import Chatgpt4Online
from .ChatgptAi import ChatgptAi
from .ChatgptDemo import ChatgptDemo
@@ -26,9 +26,9 @@ from .GptGod import GptGod
from .H2o import H2o
from .Liaobots import Liaobots
from .Myshell import Myshell
+from .Opchatgpts import Opchatgpts
from .Phind import Phind
from .Vercel import Vercel
-from .Vitalentum import Vitalentum
from .Ylokh import Ylokh
from .You import You
from .Yqcloud import Yqcloud
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
diff --git a/g4f/Provider/unfinished/ChatAiGpt.py b/g4f/Provider/unfinished/ChatAiGpt.py
index 8ade40c2..c77afb48 100644
--- a/g4f/Provider/unfinished/ChatAiGpt.py
+++ b/g4f/Provider/unfinished/ChatAiGpt.py
@@ -11,7 +11,6 @@ from ..helper import format_prompt
class ChatAiGpt(AsyncGeneratorProvider):
url = "https://chataigpt.org"
supports_gpt_35_turbo = True
- working = True
_nonce = None
_post_id = None
diff --git a/g4f/Provider/unfinished/TalkAi.py b/g4f/Provider/unfinished/TalkAi.py
index a7f1dd84..b27d51c0 100644
--- a/g4f/Provider/unfinished/TalkAi.py
+++ b/g4f/Provider/unfinished/TalkAi.py
@@ -9,7 +9,6 @@ from ..base_provider import AsyncGeneratorProvider
class TalkAi(AsyncGeneratorProvider):
url = "https://talkai.info"
supports_gpt_35_turbo = True
- working = True
@classmethod
async def create_async_generator(
diff --git a/g4f/models.py b/g4f/models.py
index a0f4c429..c2d9b89b 100644
--- a/g4f/models.py
+++ b/g4f/models.py
@@ -7,8 +7,10 @@ from .Provider import (
ChatgptLogin,
ChatgptDemo,
ChatgptDuo,
- Vitalentum,
+ GptForLove,
+ Opchatgpts,
ChatgptAi,
+ GptChatly,
AItianhu,
Liaobots,
Yqcloud,
@@ -17,7 +19,6 @@ from .Provider import (
Vercel,
Aichat,
GPTalk,
- GptGod,
AiAsk,
GptGo,
Ylokh,
@@ -50,9 +51,8 @@ gpt_35_long = Model(
name = 'gpt-3.5-turbo',
base_provider = 'openai',
best_provider = RetryProvider([
- AiAsk, Aibn, Aichat, ChatgptAi, ChatgptDemo, ChatgptDuo,
- FreeGpt, GptGo, Liaobots, Myshell, Vitalentum, Ylokh, You, Yqcloud,
- GPTalk, GptGod
+ AiAsk, Aichat, ChatgptDemo, FreeGpt, GptGo, Liaobots, You,
+ GPTalk, ChatgptLogin, GptChatly, GptForLove, Opchatgpts,
])
)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 09:42:56 +0100