From 50b796e8fe6989315ad29f2aca26659125268112 Mon Sep 17 00:00:00 2001 From: Heiner Lohaus Date: Mon, 1 Jan 2024 01:51:49 +0100 Subject: Add _puid cookie, save access_token in cookies in OpenaiChat --- g4f/Provider/needs_auth/OpenaiChat.py | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'g4f/Provider/needs_auth') diff --git a/g4f/Provider/needs_auth/OpenaiChat.py b/g4f/Provider/needs_auth/OpenaiChat.py index 818c163f..4651955c 100644 --- a/g4f/Provider/needs_auth/OpenaiChat.py +++ b/g4f/Provider/needs_auth/OpenaiChat.py @@ -7,9 +7,9 @@ from async_property import async_cached_property from selenium.webdriver.common.by import By from selenium.webdriver.support.ui import WebDriverWait from selenium.webdriver.support import expected_conditions as EC - + from ..base_provider import AsyncGeneratorProvider -from ..helper import get_event_loop, format_prompt +from ..helper import get_event_loop, format_prompt, get_cookies from ...webdriver import get_browser from ...typing import AsyncResult, Messages from ...requests import StreamSession @@ -27,7 +27,7 @@ class OpenaiChat(AsyncGeneratorProvider): needs_auth = True supports_gpt_35_turbo = True supports_gpt_4 = True - _access_token: str = None + _cookies: dict = {} @classmethod async def create( @@ -72,6 +72,7 @@ class OpenaiChat(AsyncGeneratorProvider): proxy: str = None, timeout: int = 120, access_token: str = None, + cookies: dict = None, auto_continue: bool = False, history_disabled: bool = True, action: str = "next", @@ -86,13 +87,18 @@ class OpenaiChat(AsyncGeneratorProvider): raise ValueError(f"Model are not supported: {model}") if not parent_id: parent_id = str(uuid.uuid4()) + if not cookies: + cookies = cls._cookies if not access_token: - access_token = cls._access_token + if not cookies: + cls._cookies = cookies = get_cookies("chat.openai.com") + if "access_token" in cookies: + access_token = cookies["access_token"] if not access_token: login_url = os.environ.get("G4F_LOGIN_URL") if login_url: yield f"Please login: [ChatGPT]({login_url})\n\n" - access_token = cls._access_token = await cls.browse_access_token(proxy) + cls._cookies["access_token"] = access_token = await cls.browse_access_token(proxy) headers = { "Accept": "text/event-stream", "Authorization": f"Bearer {access_token}", @@ -101,7 +107,8 @@ class OpenaiChat(AsyncGeneratorProvider): proxies={"https": proxy}, impersonate="chrome110", headers=headers, - timeout=timeout + timeout=timeout, + cookies=dict([(name, value) for name, value in cookies.items() if name == "_puid"]) ) as session: end_turn = EndTurn() while not end_turn.is_end: @@ -170,7 +177,12 @@ class OpenaiChat(AsyncGeneratorProvider): WebDriverWait(driver, 1200).until( EC.presence_of_element_located((By.ID, "prompt-textarea")) ) - javascript = "return (await (await fetch('/api/auth/session')).json())['accessToken']" + javascript = """ +access_token = (await (await fetch('/api/auth/session')).json())['accessToken']; +expires = new Date(); expires.setTime(expires.getTime() + 60 * 60 * 24 * 7); // One week +document.cookie = 'access_token=' + access_token + ';expires=' + expires.toUTCString() + ';path=/'; +return access_token; +""" return driver.execute_script(javascript) finally: driver.quit() -- cgit v1.2.3