summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkqlio67 <kqlio67@users.noreply.github.com>2024-10-20 19:33:14 +0200
committerkqlio67 <kqlio67@users.noreply.github.com>2024-10-20 19:33:14 +0200
commit8f85553a5949d35e9e3a0f0fe77d9d131c825b23 (patch)
treee1a104833fa1f0fa57e3f7c098dd9ab20c79f5c8
parentAdd files via upload (diff)
downloadgpt4free-8f85553a5949d35e9e3a0f0fe77d9d131c825b23.tar
gpt4free-8f85553a5949d35e9e3a0f0fe77d9d131c825b23.tar.gz
gpt4free-8f85553a5949d35e9e3a0f0fe77d9d131c825b23.tar.bz2
gpt4free-8f85553a5949d35e9e3a0f0fe77d9d131c825b23.tar.lz
gpt4free-8f85553a5949d35e9e3a0f0fe77d9d131c825b23.tar.xz
gpt4free-8f85553a5949d35e9e3a0f0fe77d9d131c825b23.tar.zst
gpt4free-8f85553a5949d35e9e3a0f0fe77d9d131c825b23.zip
-rw-r--r--g4f/Provider/Ai4Chat.py71
-rw-r--r--g4f/Provider/Chatgpt4Online.py5
-rw-r--r--g4f/models.py3
3 files changed, 50 insertions, 29 deletions
diff --git a/g4f/Provider/Ai4Chat.py b/g4f/Provider/Ai4Chat.py
index 4daf1b4a..1096279d 100644
--- a/g4f/Provider/Ai4Chat.py
+++ b/g4f/Provider/Ai4Chat.py
@@ -1,7 +1,9 @@
from __future__ import annotations
-from aiohttp import ClientSession
+import json
import re
+import logging
+from aiohttp import ClientSession
from ..typing import AsyncResult, Messages
from .base_provider import AsyncGeneratorProvider, ProviderModelMixin
@@ -9,18 +11,27 @@ from .helper import format_prompt
class Ai4Chat(AsyncGeneratorProvider, ProviderModelMixin):
+ label = "AI4Chat"
url = "https://www.ai4chat.co"
api_endpoint = "https://www.ai4chat.co/generate-response"
working = True
- supports_stream = False
+ supports_stream = True
supports_system_message = True
supports_message_history = True
default_model = 'gpt-4'
+ models = [default_model]
+
+ model_aliases = {}
@classmethod
def get_model(cls, model: str) -> str:
- return cls.default_model
+ if model in cls.models:
+ return model
+ elif model in cls.model_aliases:
+ return cls.model_aliases[model]
+ else:
+ return cls.default_model
@classmethod
async def create_async_generator(
@@ -33,26 +44,25 @@ class Ai4Chat(AsyncGeneratorProvider, ProviderModelMixin):
model = cls.get_model(model)
headers = {
- 'accept': '*/*',
- 'accept-language': 'en-US,en;q=0.9',
- 'cache-control': 'no-cache',
- 'content-type': 'application/json',
- 'cookie': 'messageCount=2',
- 'origin': 'https://www.ai4chat.co',
- 'pragma': 'no-cache',
- 'priority': 'u=1, i',
- 'referer': 'https://www.ai4chat.co/gpt/talkdirtytome',
- 'sec-ch-ua': '"Chromium";v="129", "Not=A?Brand";v="8"',
- 'sec-ch-ua-mobile': '?0',
- 'sec-ch-ua-platform': '"Linux"',
- 'sec-fetch-dest': 'empty',
- 'sec-fetch-mode': 'cors',
- 'sec-fetch-site': 'same-origin',
- 'user-agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36'
+ "accept": "*/*",
+ "accept-language": "en-US,en;q=0.9",
+ "cache-control": "no-cache",
+ "content-type": "application/json",
+ "origin": "https://www.ai4chat.co",
+ "pragma": "no-cache",
+ "priority": "u=1, i",
+ "referer": "https://www.ai4chat.co/gpt/talkdirtytome",
+ "sec-ch-ua": '"Chromium";v="129", "Not=A?Brand";v="8"',
+ "sec-ch-ua-mobile": "?0",
+ "sec-ch-ua-platform": '"Linux"',
+ "sec-fetch-dest": "empty",
+ "sec-fetch-mode": "cors",
+ "sec-fetch-site": "same-origin",
+ "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36"
}
async with ClientSession(headers=headers) as session:
- payload = {
+ data = {
"messages": [
{
"role": "user",
@@ -61,9 +71,18 @@ class Ai4Chat(AsyncGeneratorProvider, ProviderModelMixin):
]
}
- async with session.post(cls.api_endpoint, json=payload, proxy=proxy) as response:
- response.raise_for_status()
- response_data = await response.json()
- message = response_data.get('message', '')
- clean_message = re.sub('<[^<]+?>', '', message).strip()
- yield clean_message
+ try:
+ async with session.post(cls.api_endpoint, json=data, proxy=proxy) as response:
+ response.raise_for_status()
+ result = await response.text()
+
+ json_result = json.loads(result)
+
+ message = json_result.get("message", "")
+
+ clean_message = re.sub(r'<[^>]+>', '', message)
+
+ yield clean_message
+ except Exception as e:
+ logging.exception("Error while calling AI 4Chat API: %s", e)
+ yield f"Error: {e}"
diff --git a/g4f/Provider/Chatgpt4Online.py b/g4f/Provider/Chatgpt4Online.py
index 74241253..627facf6 100644
--- a/g4f/Provider/Chatgpt4Online.py
+++ b/g4f/Provider/Chatgpt4Online.py
@@ -13,11 +13,14 @@ class Chatgpt4Online(AsyncGeneratorProvider):
api_endpoint = "/wp-json/mwai-ui/v1/chats/submit"
working = True
+ default_model = 'gpt-4'
+ models = [default_model]
+
async def get_nonce(headers: dict) -> str:
async with ClientSession(headers=headers) as session:
async with session.post(f"https://chatgpt4online.org/wp-json/mwai/v1/start_session") as response:
return (await response.json())["restNonce"]
-
+
@classmethod
async def create_async_generator(
cls,
diff --git a/g4f/models.py b/g4f/models.py
index 9b73d475..d7800c76 100644
--- a/g4f/models.py
+++ b/g4f/models.py
@@ -104,7 +104,6 @@ default = Model(
AmigoChat,
ChatifyAI,
Cloudflare,
- Ai4Chat,
Editee,
AiMathGPT,
])
@@ -151,7 +150,7 @@ gpt_4_turbo = Model(
gpt_4 = Model(
name = 'gpt-4',
base_provider = 'OpenAI',
- best_provider = IterListProvider([NexraChatGPT, NexraChatGptV2, NexraChatGptWeb, Ai4Chat, Airforce, Chatgpt4Online, Bing, OpenaiChat, gpt_4_turbo.best_provider, gpt_4o.best_provider, gpt_4o_mini.best_provider])
+ best_provider = IterListProvider([Chatgpt4Online, Ai4Chat, NexraChatGPT, NexraChatGptV2, NexraChatGptWeb, Airforce, Bing, OpenaiChat, gpt_4_turbo.best_provider, gpt_4o.best_provider, gpt_4o_mini.best_provider])
)
# o1