From 1e8bbaaaa9750f74a2446ea069c9508cc8fc6eac Mon Sep 17 00:00:00 2001 From: Heiner Lohaus Date: Thu, 12 Oct 2023 20:28:54 +0200 Subject: [PATCH 1/2] Add ChatgptLogin, ChatgptFree and GptChatly Provider --- README.md | 1 + g4f/Provider/ChatgptFree.py | 66 ++++++++++++++++++++++ g4f/Provider/ChatgptLogin.py | 71 ++++++++++++++++++++++++ g4f/Provider/GptChatly.py | 49 ++++++++++++++++ g4f/Provider/__init__.py | 9 ++- g4f/Provider/deprecated/ChatgptLogin.py | 74 ------------------------- g4f/Provider/deprecated/Opchatgpts.py | 73 +++++++++++++++++++++++- g4f/Provider/deprecated/__init__.py | 1 - g4f/Provider/unfinished/ChatAiGpt.py | 64 +++++++++++++++++++++ g4f/Provider/unfinished/TalkAi.py | 60 ++++++++++++++++++++ g4f/Provider/unfinished/__init__.py | 4 +- 11 files changed, 392 insertions(+), 80 deletions(-) create mode 100644 g4f/Provider/ChatgptFree.py create mode 100644 g4f/Provider/ChatgptLogin.py create mode 100644 g4f/Provider/GptChatly.py delete mode 100644 g4f/Provider/deprecated/ChatgptLogin.py create mode 100644 g4f/Provider/unfinished/ChatAiGpt.py create mode 100644 g4f/Provider/unfinished/TalkAi.py diff --git a/README.md b/README.md index 1718e29e..2b013b32 100644 --- a/README.md +++ b/README.md @@ -222,6 +222,7 @@ print(response) ##### Providers: ```py import g4f + from g4f.Provider import ( AItianhu, Acytoo, diff --git a/g4f/Provider/ChatgptFree.py b/g4f/Provider/ChatgptFree.py new file mode 100644 index 00000000..7dee1e64 --- /dev/null +++ b/g4f/Provider/ChatgptFree.py @@ -0,0 +1,66 @@ +from __future__ import annotations + +import re +from aiohttp import ClientSession + +from ..typing import Messages +from .base_provider import AsyncProvider +from .helper import format_prompt + + +class ChatgptFree(AsyncProvider): + url = "https://chatgptfree.ai" + supports_gpt_35_turbo = True + working = True + _post_id = None + _nonce = None + + @classmethod + async def create_async( + cls, + model: str, + messages: Messages, + proxy: str = None, + **kwargs + ) -> str: + headers = { + "User-Agent": "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/118.0", + "Accept": "*/*", + "Accept-Language": "de,en-US;q=0.7,en;q=0.3", + "Accept-Encoding": "gzip, deflate, br", + "Origin": cls.url, + "Alt-Used": "chatgptfree.ai", + "Connection": "keep-alive", + "Referer": f"{cls.url}/", + "Sec-Fetch-Dest": "empty", + "Sec-Fetch-Mode": "cors", + "Sec-Fetch-Site": "same-origin", + "Pragma": "no-cache", + "Cache-Control": "no-cache", + "TE": "trailers" + } + async with ClientSession(headers=headers) as session: + if not cls._nonce: + async with session.get(f"{cls.url}/", proxy=proxy) as response: + response.raise_for_status() + response = await response.text() + result = re.search(r'data-post-id="([0-9]+)"', response) + if not result: + raise RuntimeError("No post id found") + cls._post_id = result.group(1) + result = re.search(r'data-nonce="(.*?)"', response) + if not result: + raise RuntimeError("No nonce found") + cls._nonce = result.group(1) + prompt = format_prompt(messages) + data = { + "_wpnonce": cls._nonce, + "post_id": cls._post_id, + "url": cls.url, + "action": "wpaicg_chat_shortcode_message", + "message": prompt, + "bot_id": "0" + } + async with session.post(cls.url + "/wp-admin/admin-ajax.php", data=data, proxy=proxy) as response: + response.raise_for_status() + return (await response.json())["data"] \ No newline at end of file diff --git a/g4f/Provider/ChatgptLogin.py b/g4f/Provider/ChatgptLogin.py new file mode 100644 index 00000000..1cf0698b --- /dev/null +++ b/g4f/Provider/ChatgptLogin.py @@ -0,0 +1,71 @@ +from __future__ import annotations + +import re +import time +import json +from aiohttp import ClientSession + +from ..typing import AsyncResult, Messages +from .base_provider import AsyncGeneratorProvider +from .helper import format_prompt + + +class ChatgptLogin(AsyncGeneratorProvider): + url = "https://chatgptlogin.ai" + supports_gpt_35_turbo = True + working = True + _user_id = None + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + proxy: str = None, + **kwargs + ) -> AsyncResult: + headers = { + "User-Agent": "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/118.0", + "Accept": "*/*", + "Accept-Language": "de,en-US;q=0.7,en;q=0.3", + "Accept-Encoding": "gzip, deflate, br", + "Referer": f"{cls.url}/chat/", + "Content-Type": "application/json", + "Origin": cls.url, + "Alt-Used": "chatgptlogin.ai", + "Connection": "keep-alive", + "Sec-Fetch-Dest": "empty", + "Sec-Fetch-Mode": "cors", + "Sec-Fetch-Site": "same-origin", + "Pragma": "no-cache", + "Cache-Control": "no-cache" + } + async with ClientSession(headers=headers) as session: + if not cls._user_id: + async with session.get(f"{cls.url}/chat/", proxy=proxy) as response: + response.raise_for_status() + response = await response.text() + result = re.search(r'