返回提交历史
Modified
g4f/Provider/Copilot.py
+1
-1
Modified
g4f/Provider/CopilotSession.py
+2
-2
Modified
g4f/Provider/EasyChat.py
+1
-1
Modified
g4f/Provider/Qwen.py
+2
-2
Modified
g4f/Provider/needs_auth/Gemini.py
+1
-1
Modified
g4f/Provider/needs_auth/Grok.py
+1
-1
Modified
g4f/Provider/needs_auth/LMArena.py
+2
-2
Modified
g4f/Provider/needs_auth/OpenaiChat.py
+1
-1
Modified
g4f/Provider/needs_auth/Video.py
+2
-2
Modified
g4f/api/__init__.py
+1
-1
Modified
g4f/requests/__init__.py
+5
-5
XFEstudio/gpt4free
refactor: replace nodriver imports with zendriver across multiple provider files
a9546175
代码差异
11 个文件
+19
-19
@@ -17,7 +17,7 @@ try:
17
17
except ImportError:
18
18
has_curl_cffi = False
19
19
try:
20
import nodriver
20
import zendriver as nodriver
21
21
has_nodriver = True
22
22
except ImportError:
23
23
has_nodriver = False
@@ -6,8 +6,8 @@ import base64
6
6
from typing import AsyncIterator
7
7
8
8
try:
9
import nodriver
10
from nodriver import cdp
9
import zendriver as nodriver
10
from zendriver import cdp
11
11
has_nodriver = True
12
12
except ImportError:
13
13
has_nodriver = False
@@ -5,7 +5,7 @@ import asyncio
5
5
import requests
6
6
import json
7
7
try:
8
import nodriver
8
import zendriver as nodriver
9
9
except ImportError:
10
10
pass
11
11
@@ -31,11 +31,11 @@ try:
31
31
except ImportError:
32
32
has_curl_cffi = False
33
33
try:
34
import nodriver
35
34
import zendriver as nodriver
36
35
has_nodriver = True
37
36
except ImportError:
38
37
has_nodriver = False
38
39
39
# Global variables to manage Qwen Image Cache
40
40
ImagesCache: Dict[str, dict] = {}
41
41
@@ -13,7 +13,7 @@ from pathlib import Path
13
13
from aiohttp import ClientSession, BaseConnector
14
14
15
15
try:
16
import nodriver
16
import zendriver as nodriver
17
17
has_nodriver = True
18
18
except ImportError:
19
19
has_nodriver = False
@@ -8,7 +8,7 @@ import uuid
8
8
from typing import Dict, Any, AsyncIterator
9
9
10
10
try:
11
import nodriver
11
import zendriver as nodriver
12
12
except ImportError:
13
13
pass
14
14
@@ -22,8 +22,8 @@ except ImportError:
22
22
has_curl_cffi = False
23
23
24
24
try:
25
import nodriver
26
from nodriver import cdp
25
import zendriver as nodriver
26
from zendriver import cdp
27
27
has_nodriver = True
28
28
except ImportError:
29
29
has_nodriver = False
@@ -15,7 +15,7 @@ from typing import AsyncIterator, Iterator, Optional, Generator, Dict, Union, Li
15
15
from ...requests.curl_cffi import AsyncSession
16
16
17
17
try:
18
import nodriver
18
import zendriver as nodriver
19
19
20
20
has_nodriver = True
21
21
except ImportError:
@@ -9,8 +9,8 @@ from urllib.parse import quote, quote_plus
9
9
from aiohttp import ClientSession
10
10
11
11
try:
12
import nodriver
13
from nodriver.core.connection import ProtocolException
12
import zendriver as nodriver
13
from zendriver.core.connection import ProtocolException
14
14
has_nodriver = True
15
15
except:
16
16
has_nodriver = False
@@ -53,7 +53,7 @@ except ImportError:
53
53
class Annotated:
54
54
pass
55
55
try:
56
from nodriver import util
56
from zendriver import util
57
57
has_nodriver = True
58
58
except ImportError:
59
59
has_nodriver = False
@@ -28,10 +28,10 @@ try:
28
28
except ImportError:
29
29
has_webview = False
30
30
try:
31
import nodriver
32
from nodriver.cdp.network import CookieParam
33
from nodriver.core.config import find_chrome_executable
34
from nodriver import Browser, Tab, util
31
import zendriver as nodriver
32
from zendriver.cdp.network import CookieParam
33
from zendriver.core.config import find_chrome_executable
34
from zendriver import Browser, Tab, util
35
35
36
36
has_nodriver = True
37
37
except ImportError:
@@ -166,7 +166,7 @@ async def get_nodriver(
166
166
) -> tuple[Browser, callable]:
167
167
if not has_nodriver:
168
168
raise MissingRequirementsError(
169
'Install "nodriver" and "platformdirs" package | pip install -U nodriver platformdirs')
169
'Install "nodriver" and "platformdirs" package | pip install -U zendriver platformdirs')
170
170
user_data_dir = user_config_dir(f"g4f-{user_data_dir}") if user_data_dir and has_platformdirs else None
171
171
if browser_executable_path is None:
172
172
browser_executable_path = BrowserConfig.browser_executable_path