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/ChatgptFree.py | 16 +++++++++++-----
 g4f/Provider/helper.py      | 23 ++++++++++++++---------
 2 files changed, 25 insertions(+), 14 deletions(-)

(limited to 'g4f')

diff --git a/g4f/Provider/ChatgptFree.py b/g4f/Provider/ChatgptFree.py
index 8b7d04c4..806ff7cc 100644
--- a/g4f/Provider/ChatgptFree.py
+++ b/g4f/Provider/ChatgptFree.py
@@ -14,7 +14,7 @@ from .helper import format_prompt, get_cookies
 class ChatgptFree(AsyncProvider):
     url                   = "https://chatgptfree.ai"
     supports_gpt_35_turbo = True
-    working               = True
+    working               = False
     _post_id              = None
     _nonce                = None
 
@@ -24,6 +24,7 @@ class ChatgptFree(AsyncProvider):
         model: str,
         messages: Messages,
         proxy: str = None,
+        timeout: int = 120,
         cookies: dict = None,
         **kwargs
     ) -> str:
@@ -45,14 +46,19 @@ class ChatgptFree(AsyncProvider):
             'sec-fetch-dest': 'empty',
             'sec-fetch-mode': 'cors',
             'sec-fetch-site': 'same-origin',
-            'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36',
+            'user-agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36',
         }
         
-        async with StreamSession(headers=headers,
-            impersonate="chrome107", proxies={"https": proxy}, timeout=10) as session:
+        async with StreamSession(
+            headers=headers,
+            cookies=cookies,
+            impersonate="chrome107",
+            proxies={"https": proxy},
+            timeout=timeout
+        ) as session:
             
             if not cls._nonce:
-                async with session.get(f"{cls.url}/", cookies=cookies) as response:
+                async with session.get(f"{cls.url}/") as response:
                     
                     response.raise_for_status()
                     response = await response.text()
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