From af204c31cb047436f4e1c36199e15692eb271f20 Mon Sep 17 00:00:00 2001 From: Heiner Lohaus Date: Fri, 9 Feb 2024 18:11:35 +0100 Subject: Read cookies from config in Gemini Fixes for OpenaiChat Provider --- g4f/Provider/needs_auth/Gemini.py | 5 +++-- g4f/Provider/needs_auth/OpenaiChat.py | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'g4f/Provider/needs_auth') diff --git a/g4f/Provider/needs_auth/Gemini.py b/g4f/Provider/needs_auth/Gemini.py index 402fc02f..cf739a22 100644 --- a/g4f/Provider/needs_auth/Gemini.py +++ b/g4f/Provider/needs_auth/Gemini.py @@ -66,6 +66,8 @@ class Gemini(AsyncGeneratorProvider): prompt = format_prompt(messages) if not cookies: + cookies = get_cookies(".google.com", False, True) + if "__Secure-1PSID" not in cookies or "__Secure-1PSIDCC" not in cookies: driver = None try: driver = get_browser(proxy=proxy) @@ -88,8 +90,6 @@ class Gemini(AsyncGeneratorProvider): if driver: driver.close() - if not cookies: - cookies = get_cookies(".google.com", False) if "__Secure-1PSID" not in cookies: raise MissingAuthError('Missing "__Secure-1PSID" cookie') @@ -101,6 +101,7 @@ class Gemini(AsyncGeneratorProvider): ) as session: async with session.get(cls.url, proxy=proxy) as response: text = await response.text() + open("test.html", "w").write(text) match = re.search(r'SNlM0e\":\"(.*?)\"', text) if match: snlm0e = match.group(1) diff --git a/g4f/Provider/needs_auth/OpenaiChat.py b/g4f/Provider/needs_auth/OpenaiChat.py index 7c707b5e..b1b267fd 100644 --- a/g4f/Provider/needs_auth/OpenaiChat.py +++ b/g4f/Provider/needs_auth/OpenaiChat.py @@ -38,6 +38,7 @@ class OpenaiChat(AsyncGeneratorProvider, ProviderModelMixin): supports_gpt_4 = True default_model = None models = ["gpt-3.5-turbo", "gpt-4", "gpt-4-gizmo"] + model_aliases = {"text-davinci-002-render-sha": "gpt-3.5-turbo"} _cookies: dict = {} @classmethod @@ -403,7 +404,7 @@ class OpenaiChat(AsyncGeneratorProvider, ProviderModelMixin): if "message_type" not in line["message"]["metadata"]: continue try: - image_response = await cls.get_generated_image(session, headers, line) + image_response = await cls.get_generated_image(session, auth_headers, line) if image_response: yield image_response except Exception as e: -- cgit v1.2.3 From 33b247305c84ee6917ed8d3d2a10873646379730 Mon Sep 17 00:00:00 2001 From: H Lohaus Date: Fri, 9 Feb 2024 18:47:57 +0100 Subject: Update Gemini.py --- g4f/Provider/needs_auth/Gemini.py | 1 - 1 file changed, 1 deletion(-) (limited to 'g4f/Provider/needs_auth') diff --git a/g4f/Provider/needs_auth/Gemini.py b/g4f/Provider/needs_auth/Gemini.py index cf739a22..32510505 100644 --- a/g4f/Provider/needs_auth/Gemini.py +++ b/g4f/Provider/needs_auth/Gemini.py @@ -101,7 +101,6 @@ class Gemini(AsyncGeneratorProvider): ) as session: async with session.get(cls.url, proxy=proxy) as response: text = await response.text() - open("test.html", "w").write(text) match = re.search(r'SNlM0e\":\"(.*?)\"', text) if match: snlm0e = match.group(1) -- cgit v1.2.3