From 5e4485f9a8e82bb14c6ad85be14dd6fece694a99 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Mon, 11 Nov 2024 20:38:44 +0200 Subject: Update (docs/providers-and-models.md g4f/Provider/) --- docs/providers-and-models.md | 1 - g4f/Provider/Chatgpt4Online.py | 78 ------------------------------ g4f/Provider/__init__.py | 1 - g4f/Provider/not_working/Chatgpt4Online.py | 78 ++++++++++++++++++++++++++++++ g4f/Provider/not_working/__init__.py | 1 + 5 files changed, 79 insertions(+), 80 deletions(-) delete mode 100644 g4f/Provider/Chatgpt4Online.py create mode 100644 g4f/Provider/not_working/Chatgpt4Online.py diff --git a/docs/providers-and-models.md b/docs/providers-and-models.md index 17f47378..a305b481 100644 --- a/docs/providers-and-models.md +++ b/docs/providers-and-models.md @@ -28,7 +28,6 @@ This document provides an overview of various AI providers and models, including |[chatgot.one](https://www.chatgot.one/)|`g4f.Provider.ChatGot`|`gemini-pro`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[chatgpt.com](https://chatgpt.com)|`g4f.Provider.ChatGpt`|`?`|`?`|`?`|?|![Unknown](https://img.shields.io/badge/Unknown-grey) |❌| |[chatgpt.es](https://chatgpt.es)|`g4f.Provider.ChatGptEs`|`gpt-4o, gpt-4o-mini`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[chatgpt4online.org](https://chatgpt4online.org)|`g4f.Provider.Chatgpt4Online`|`gpt-4`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[chatify-ai.vercel.app](https://chatify-ai.vercel.app)|`g4f.Provider.ChatifyAI`|`llama-3.1-8b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[playground.ai.cloudflare.com](https://playground.ai.cloudflare.com)|`g4f.Provider.Cloudflare`|`gemma-7b, llama-2-7b, llama-3-8b, llama-3.1-8b, llama-3.2-1b, phi-2, qwen-1.5-0-5b, qwen-1.5-8b, qwen-1.5-14b, qwen-1.5-7b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[darkai.foundation/chat](https://darkai.foundation/chat)|`g4f.Provider.DarkAI`|`gpt-4o, gpt-3.5-turbo, llama-3-70b, llama-3-405b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| diff --git a/g4f/Provider/Chatgpt4Online.py b/g4f/Provider/Chatgpt4Online.py deleted file mode 100644 index 627facf6..00000000 --- a/g4f/Provider/Chatgpt4Online.py +++ /dev/null @@ -1,78 +0,0 @@ -from __future__ import annotations - -import json -from aiohttp import ClientSession - -from ..typing import AsyncResult, Messages -from .base_provider import AsyncGeneratorProvider -from .helper import format_prompt - - -class Chatgpt4Online(AsyncGeneratorProvider): - url = "https://chatgpt4online.org" - 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, - model: str, - messages: Messages, - proxy: str = None, - **kwargs - ) -> AsyncResult: - headers = { - "accept": "text/event-stream", - "accept-language": "en-US,en;q=0.9", - "content-type": "application/json", - "dnt": "1", - "origin": cls.url, - "priority": "u=1, i", - "referer": f"{cls.url}/", - "sec-ch-ua": '"Not/A)Brand";v="8", "Chromium";v="126"', - "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/126.0.0.0 Safari/537.36", - } - headers['x-wp-nonce'] = await cls.get_nonce(headers) - async with ClientSession(headers=headers) as session: - prompt = format_prompt(messages) - data = { - "botId": "default", - "newMessage": prompt, - "stream": True, - } - - async with session.post(f"{cls.url}{cls.api_endpoint}", json=data, proxy=proxy) as response: - response.raise_for_status() - full_response = "" - - async for chunk in response.content.iter_any(): - if chunk: - try: - # Extract the JSON object from the chunk - for line in chunk.decode().splitlines(): - if line.startswith("data: "): - json_data = json.loads(line[6:]) - if json_data["type"] == "live": - full_response += json_data["data"] - elif json_data["type"] == "end": - final_data = json.loads(json_data["data"]) - full_response = final_data["reply"] - break - except json.JSONDecodeError: - continue - - yield full_response - diff --git a/g4f/Provider/__init__.py b/g4f/Provider/__init__.py index 60942581..6b9f131f 100644 --- a/g4f/Provider/__init__.py +++ b/g4f/Provider/__init__.py @@ -17,7 +17,6 @@ from .Airforce import Airforce from .Bing import Bing from .Blackbox import Blackbox from .ChatGpt import ChatGpt -from .Chatgpt4Online import Chatgpt4Online from .ChatGptEs import ChatGptEs from .ChatifyAI import ChatifyAI from .Cloudflare import Cloudflare diff --git a/g4f/Provider/not_working/Chatgpt4Online.py b/g4f/Provider/not_working/Chatgpt4Online.py new file mode 100644 index 00000000..b0552e45 --- /dev/null +++ b/g4f/Provider/not_working/Chatgpt4Online.py @@ -0,0 +1,78 @@ +from __future__ import annotations + +import json +from aiohttp import ClientSession + +from ...typing import AsyncResult, Messages +from ..base_provider import AsyncGeneratorProvider +from ..helper import format_prompt + + +class Chatgpt4Online(AsyncGeneratorProvider): + url = "https://chatgpt4online.org" + api_endpoint = "/wp-json/mwai-ui/v1/chats/submit" + working = False + + 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, + model: str, + messages: Messages, + proxy: str = None, + **kwargs + ) -> AsyncResult: + headers = { + "accept": "text/event-stream", + "accept-language": "en-US,en;q=0.9", + "content-type": "application/json", + "dnt": "1", + "origin": cls.url, + "priority": "u=1, i", + "referer": f"{cls.url}/", + "sec-ch-ua": '"Not/A)Brand";v="8", "Chromium";v="126"', + "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/126.0.0.0 Safari/537.36", + } + headers['x-wp-nonce'] = await cls.get_nonce(headers) + async with ClientSession(headers=headers) as session: + prompt = format_prompt(messages) + data = { + "botId": "default", + "newMessage": prompt, + "stream": True, + } + + async with session.post(f"{cls.url}{cls.api_endpoint}", json=data, proxy=proxy) as response: + response.raise_for_status() + full_response = "" + + async for chunk in response.content.iter_any(): + if chunk: + try: + # Extract the JSON object from the chunk + for line in chunk.decode().splitlines(): + if line.startswith("data: "): + json_data = json.loads(line[6:]) + if json_data["type"] == "live": + full_response += json_data["data"] + elif json_data["type"] == "end": + final_data = json.loads(json_data["data"]) + full_response = final_data["reply"] + break + except json.JSONDecodeError: + continue + + yield full_response + diff --git a/g4f/Provider/not_working/__init__.py b/g4f/Provider/not_working/__init__.py index e1da3032..051d3486 100644 --- a/g4f/Provider/not_working/__init__.py +++ b/g4f/Provider/not_working/__init__.py @@ -12,3 +12,4 @@ from .FreeNetfly import FreeNetfly from .GPROChat import GPROChat from .Koala import Koala from .MyShell import MyShell +from .Chatgpt4Online import Chatgpt4Online -- cgit v1.2.3