返回提交历史
Modified
g4f/Provider/ChatgptFree.py
+11
-5
Modified
g4f/Provider/helper.py
+14
-9
XFEstudio/gpt4free
Improve get_cookies helper
3ae90b57
代码差异
2 个文件
+25
-14
@@ -14,7 +14,7 @@ from .helper import format_prompt, get_cookies
14
14
class ChatgptFree(AsyncProvider):
15
15
url = "https://chatgptfree.ai"
16
16
supports_gpt_35_turbo = True
17
working = True
17
working = False
18
18
_post_id = None
19
19
_nonce = None
20
20
@@ -24,6 +24,7 @@ class ChatgptFree(AsyncProvider):
24
24
model: str,
25
25
messages: Messages,
26
26
proxy: str = None,
27
timeout: int = 120,
27
28
cookies: dict = None,
28
29
**kwargs
29
30
) -> str:
@@ -45,14 +46,19 @@ class ChatgptFree(AsyncProvider):
45
46
'sec-fetch-dest': 'empty',
46
47
'sec-fetch-mode': 'cors',
47
48
'sec-fetch-site': 'same-origin',
48
'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',
49
'user-agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36',
49
50
}
50
51
51
async with StreamSession(headers=headers,
52
impersonate="chrome107", proxies={"https": proxy}, timeout=10) as session:
52
async with StreamSession(
53
headers=headers,
54
cookies=cookies,
55
impersonate="chrome107",
56
proxies={"https": proxy},
57
timeout=timeout
58
) as session:
53
59
54
60
if not cls._nonce:
55
async with session.get(f"{cls.url}/", cookies=cookies) as response:
61
async with session.get(f"{cls.url}/") as response:
56
62
57
63
response.raise_for_status()
58
64
response = await response.text()
@@ -3,10 +3,11 @@ from __future__ import annotations
3
3
import sys
4
4
import asyncio
5
5
import webbrowser
6
import http.cookiejar
7
6
8
7
from os import path
9
8
from asyncio import AbstractEventLoop
9
from platformdirs import user_config_dir
10
10
11
from ..typing import Dict, Messages
11
12
from browser_cookie3 import chrome, chromium, opera, opera_gx, brave, edge, vivaldi, firefox, BrowserCookieError
12
13
@@ -72,16 +73,22 @@ def init_cookies():
72
73
# Load cookies for a domain from all supported browsers.
73
74
# Cache the results in the "_cookies" variable.
74
75
def get_cookies(domain_name=''):
75
cj = http.cookiejar.CookieJar()
76
for cookie_fn in [chrome, chromium, opera, opera_gx, brave, edge, vivaldi, firefox]:
76
def g4f(domain_name):
77
user_data_dir = user_config_dir("g4f")
78
cookie_file = path.join(user_data_dir, "Default", "Cookies")
79
if not path.exists(cookie_file):
80
return []
81
return chrome(cookie_file, domain_name)
82
cookie_jar = []
83
for cookie_fn in [g4f, chrome, chromium, opera, opera_gx, brave, edge, vivaldi, firefox]:
77
84
try:
78
for cookie in cookie_fn(domain_name=domain_name):
79
cj.set_cookie(cookie)
85
cookie_jar = cookie_fn(domain_name=domain_name)
86
if len(cookie_jar) > 0:
87
break
80
88
except BrowserCookieError:
81
89
pass
82
90
83
_cookies[domain_name] = {cookie.name: cookie.value for cookie in cj}
84
91
_cookies[domain_name] = {cookie.name: cookie.value for cookie in cookie_jar}
85
92
return _cookies[domain_name]
86
93
87
94
@@ -100,10 +107,8 @@ def format_prompt(messages: Messages, add_special_tokens=False) -> str:
100
107
101
108
def get_browser(user_data_dir: str = None):
102
109
from undetected_chromedriver import Chrome
103
from platformdirs import user_config_dir
104
110
105
111
if not user_data_dir:
106
112
user_data_dir = user_config_dir("g4f")
107
user_data_dir = path.join(user_data_dir, "Default")
108
113
109
114
return Chrome(user_data_dir=user_data_dir)