From 3ae90b57edf5ebd2b2f7dc8ad43f0f560edded84 Mon Sep 17 00:00:00 2001
From: Heiner Lohaus <heiner@lohaus.eu>
Date: Sun, 22 Oct 2023 20:01:14 +0200
Subject: Improve get_cookies helper

---
 g4f/Provider/helper.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'g4f/Provider/helper.py')

diff --git a/g4f/Provider/helper.py b/g4f/Provider/helper.py
index 096293b2..20500777 100644
--- a/g4f/Provider/helper.py
+++ b/g4f/Provider/helper.py
@@ -3,10 +3,11 @@ from __future__ import annotations
 import sys
 import asyncio
 import webbrowser
-import http.cookiejar
 
 from os              import path
 from asyncio         import AbstractEventLoop
+from platformdirs    import user_config_dir
+
 from ..typing        import Dict, Messages
 from browser_cookie3 import chrome, chromium, opera, opera_gx, brave, edge, vivaldi, firefox, BrowserCookieError
 
@@ -72,16 +73,22 @@ def init_cookies():
 # Load cookies for a domain from all supported browsers.
 # Cache the results in the "_cookies" variable.
 def get_cookies(domain_name=''):
-    cj = http.cookiejar.CookieJar()
-    for cookie_fn in [chrome, chromium, opera, opera_gx, brave, edge, vivaldi, firefox]:
+    def g4f(domain_name):
+        user_data_dir = user_config_dir("g4f")
+        cookie_file = path.join(user_data_dir, "Default", "Cookies")
+        if not path.exists(cookie_file):
+            return []
+        return chrome(cookie_file, domain_name)
+    cookie_jar = []
+    for cookie_fn in [g4f, chrome, chromium, opera, opera_gx, brave, edge, vivaldi, firefox]:
         try:
-            for cookie in cookie_fn(domain_name=domain_name):
-                cj.set_cookie(cookie)
+            cookie_jar = cookie_fn(domain_name=domain_name)
+            if len(cookie_jar) > 0:
+                break
         except BrowserCookieError:
             pass
     
-    _cookies[domain_name] = {cookie.name: cookie.value for cookie in cj}
-    
+    _cookies[domain_name] = {cookie.name: cookie.value for cookie in cookie_jar}
     return _cookies[domain_name]
 
 
@@ -100,10 +107,8 @@ def format_prompt(messages: Messages, add_special_tokens=False) -> str:
 
 def get_browser(user_data_dir: str = None):
     from undetected_chromedriver import Chrome
-    from platformdirs import user_config_dir
 
     if not user_data_dir:
         user_data_dir = user_config_dir("g4f")
-        user_data_dir = path.join(user_data_dir, "Default")
 
     return Chrome(user_data_dir=user_data_dir)
\ No newline at end of file
-- 
cgit v1.2.3


From 598255fa26e39d57e51fb41957a381a9241cb032 Mon Sep 17 00:00:00 2001
From: Heiner Lohaus <heiner@lohaus.eu>
Date: Sun, 22 Oct 2023 23:53:18 +0200
Subject: Debug logging support Async browse access token

---
 g4f/Provider/helper.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'g4f/Provider/helper.py')

diff --git a/g4f/Provider/helper.py b/g4f/Provider/helper.py
index 20500777..1b00ace5 100644
--- a/g4f/Provider/helper.py
+++ b/g4f/Provider/helper.py
@@ -10,7 +10,7 @@ from platformdirs    import user_config_dir
 
 from ..typing        import Dict, Messages
 from browser_cookie3 import chrome, chromium, opera, opera_gx, brave, edge, vivaldi, firefox, BrowserCookieError
-
+from .. import debug
 
 # Change event loop policy on windows
 if sys.platform == 'win32':
@@ -45,7 +45,6 @@ def get_event_loop() -> AbstractEventLoop:
         )
 
 def init_cookies():
-    
     urls = [
         'https://chat-gpt.org',
         'https://www.aitianhu.com',
@@ -73,22 +72,26 @@ def init_cookies():
 # Load cookies for a domain from all supported browsers.
 # Cache the results in the "_cookies" variable.
 def get_cookies(domain_name=''):
+    if domain_name in _cookies:
+        return _cookies[domain_name]
     def g4f(domain_name):
         user_data_dir = user_config_dir("g4f")
         cookie_file = path.join(user_data_dir, "Default", "Cookies")
         if not path.exists(cookie_file):
             return []
         return chrome(cookie_file, domain_name)
-    cookie_jar = []
+    cookies = {}
     for cookie_fn in [g4f, chrome, chromium, opera, opera_gx, brave, edge, vivaldi, firefox]:
         try:
             cookie_jar = cookie_fn(domain_name=domain_name)
-            if len(cookie_jar) > 0:
-                break
-        except BrowserCookieError:
+            if len(cookie_jar) and debug.logging:
+                print(f"Read cookies from {cookie_fn.__name__} for {domain_name}")
+            for cookie in cookie_jar:
+                if cookie.name not in cookies:
+                    cookies[cookie.name] = cookie.value
+        except BrowserCookieError as e:
             pass
-    
-    _cookies[domain_name] = {cookie.name: cookie.value for cookie in cookie_jar}
+    _cookies[domain_name] = cookies
     return _cookies[domain_name]
 
 
-- 
cgit v1.2.3