From 62397ad11228ee654bd7670feadae121a7347ee1 Mon Sep 17 00:00:00 2001 From: Heiner Lohaus Date: Sun, 10 Dec 2023 23:43:48 +0100 Subject: Remove needs_auth, add proxy support in VoiGpt --- g4f/Provider/VoiGpt.py | 93 +++++++++++++++++++++++++++++++++++++ g4f/Provider/__init__.py | 1 + g4f/Provider/needs_auth/VoiGpt.py | 79 ------------------------------- g4f/Provider/needs_auth/__init__.py | 3 +- 4 files changed, 95 insertions(+), 81 deletions(-) create mode 100644 g4f/Provider/VoiGpt.py delete mode 100644 g4f/Provider/needs_auth/VoiGpt.py diff --git a/g4f/Provider/VoiGpt.py b/g4f/Provider/VoiGpt.py new file mode 100644 index 00000000..33d0d85e --- /dev/null +++ b/g4f/Provider/VoiGpt.py @@ -0,0 +1,93 @@ +from __future__ import annotations + +import json +import requests +from .base_provider import BaseProvider +from ..typing import Messages, CreateResult +from .helper import get_cookies + + + +class VoiGpt(BaseProvider): + """ + VoiGpt - A provider for VoiGpt.com + + **Note** : to use this provider you have to get your csrf token/cookie from the voigpt.com website + + Args: + model: The model to use + messages: The messages to send + stream: Whether to stream the response + proxy: The proxy to use + access_token: The access token to use + **kwargs: Additional keyword arguments + + Returns: + A CreateResult object + """ + url = "https://voigpt.com" + working = True + supports_gpt_35_turbo = True + supports_message_history = True + supports_stream = False + _access_token: str = None + + @classmethod + def create_completion( + cls, + model: str, + messages: Messages, + stream: bool, + proxy: str = None, + access_token: str = None, + **kwargs + ) -> CreateResult: + + if not model: + model = "gpt-3.5-turbo" + if not access_token: + access_token = cls._access_token + if not access_token: + headers = { + "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7", + "accept-language": "de-DE,de;q=0.9,en-DE;q=0.8,en;q=0.7,en-US;q=0.6", + "sec-ch-ua": "\"Google Chrome\";v=\"119\", \"Chromium\";v=\"119\", \"Not?A_Brand\";v=\"24\"", + "sec-ch-ua-mobile": "?0", + "sec-ch-ua-platform": "\"Linux\"", + "sec-fetch-dest": "document", + "sec-fetch-mode": "navigate", + "sec-fetch-site": "none", + "sec-fetch-user": "?1", + "upgrade-insecure-requests": "1", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36", + } + req_response = requests.get(cls.url, headers=headers) + access_token = cls._access_token = req_response.cookies.get("csrftoken") + + headers = { + "Accept-Encoding": "gzip, deflate, br", + "Accept-Language": "de-DE,de;q=0.9,en-DE;q=0.8,en;q=0.7,en-US;q=0.6", + "Cookie": f"csrftoken={access_token};", + "Origin": "https://voigpt.com", + "Referer": "https://voigpt.com/", + "Sec-Ch-Ua": "'Google Chrome';v='119', 'Chromium';v='119', 'Not?A_Brand';v='24'", + "Sec-Ch-Ua-Mobile": "?0", + "Sec-Ch-Ua-Platform": "'Windows'", + "Sec-Fetch-Dest": "empty", + "Sec-Fetch-Mode": "cors", + "Sec-Fetch-Site": "same-origin", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36", + "X-Csrftoken": access_token, + } + + payload = { + "messages": messages, + } + request_url = f"{cls.url}/generate_response/" + req_response = requests.post(request_url, headers=headers, json=payload) + try: + response = json.loads(req_response.text) + yield response["response"] + except: + raise RuntimeError(f"Response: {req_response.text}") + diff --git a/g4f/Provider/__init__.py b/g4f/Provider/__init__.py index efc94613..6ae3db7c 100644 --- a/g4f/Provider/__init__.py +++ b/g4f/Provider/__init__.py @@ -47,6 +47,7 @@ from .Phind import Phind from .Pi import Pi from .TalkAi import TalkAi from .Vercel import Vercel +from .VoiGpt import VoiGpt from .Ylokh import Ylokh from .You import You from .Yqcloud import Yqcloud diff --git a/g4f/Provider/needs_auth/VoiGpt.py b/g4f/Provider/needs_auth/VoiGpt.py deleted file mode 100644 index a7443293..00000000 --- a/g4f/Provider/needs_auth/VoiGpt.py +++ /dev/null @@ -1,79 +0,0 @@ -from __future__ import annotations - -import json -import requests -from ..base_provider import BaseProvider -from ...typing import Messages, CreateResult -from ..helper import get_cookies - - - -class VoiGpt(BaseProvider): - """ - VoiGpt - A provider for VoiGpt.com - - **Note** : to use this provider you have to get your csrf token/cookie from the voigpt.com website - - Args: - model: The model to use - messages: The messages to send - stream: Whether to stream the response - proxy: The proxy to use - access_token: The access token to use - **kwargs: Additional keyword arguments - - Returns: - A CreateResult object - """ - url = "https://voigpt.com" - working = True - supports_gpt_35_turbo = True - supports_message_history = True - supports_stream = False - needs_auth = True - _access_token: str = None - - @classmethod - def create_completion( - cls, - model: str, - messages: Messages, - stream: bool, - proxy: str = None, - access_token: str = None, - **kwargs - ) -> CreateResult: - - if not model: - model = "gpt-3.5-turbo" - if not access_token: - access_token = cls._access_token - - headers = { - "Accept-Encoding": "gzip, deflate, br", - "Accept-Language": "en-IN,en-GB;q=0.9,en-US;q=0.8,en;q=0.7,hi;q=0.6", - "Content-Type": "application/json", - "Cookie": f"csrftoken={access_token};", - "Host": "voigpt.com", - "Origin": "https://voigpt.com", - "Referer": "https://voigpt.com/", - "Sec-Ch-Ua": "'Google Chrome';v='119', 'Chromium';v='119', 'Not?A_Brand';v='24'", - "Sec-Ch-Ua-Mobile": "?0", - "Sec-Ch-Ua-Platform": "'Windows'", - "Sec-Fetch-Dest": "empty", - "Sec-Fetch-Mode": "cors", - "Sec-Fetch-Site": "same-origin", - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36", - "X-Csrftoken": f"{access_token}", - } - - payload = { - "messages": messages, - } - - request_url = cls.url + "/generate_response/" - req_response = requests.post(request_url, headers=headers, json=payload) - - response = json.loads(req_response.text) - return response["response"] - diff --git a/g4f/Provider/needs_auth/__init__.py b/g4f/Provider/needs_auth/__init__.py index e80b0f74..b85cd36a 100644 --- a/g4f/Provider/needs_auth/__init__.py +++ b/g4f/Provider/needs_auth/__init__.py @@ -5,5 +5,4 @@ from .ThebApi import ThebApi from .HuggingChat import HuggingChat from .OpenaiChat import OpenaiChat from .OpenAssistant import OpenAssistant -from .Poe import Poe -from .VoiGpt import VoiGpt \ No newline at end of file +from .Poe import Poe \ No newline at end of file -- cgit v1.2.3