返回提交历史
Modified
g4f/requests/__init__.py
+4
-2
XFEstudio/gpt4free
Update nodriver function
116a01cd
代码差异
1 个文件
+4
-2
@@ -156,7 +156,7 @@ async def get_nodriver(
156
156
) -> tuple[Browser, callable]:
157
157
if not has_nodriver:
158
158
raise MissingRequirementsError('Install "nodriver" and "platformdirs" package | pip install -U nodriver platformdirs')
159
user_data_dir = user_config_dir(f"g4f-{user_data_dir}") if has_platformdirs else None
159
user_data_dir = user_config_dir(f"g4f-{user_data_dir}") if user_data_dir and has_platformdirs else None
160
160
if browser_executable_path is None:
161
161
browser_executable_path = BrowserConfig.browser_executable_path
162
162
if browser_executable_path is None:
@@ -167,6 +167,7 @@ async def get_nodriver(
167
167
browser_executable_path = "C:\\Program Files (x86)\\Microsoft\\Edge\\Application\\msedge.exe"
168
168
if not os.path.exists(browser_executable_path):
169
169
browser_executable_path = None
170
debug.log(f"Browser executable path: {browser_executable_path}")
170
171
lock_file = Path(get_cookies_dir()) / ".nodriver_is_open"
171
172
lock_file.parent.mkdir(exist_ok=True)
172
173
# Implement a short delay (milliseconds) to prevent race conditions.
@@ -200,8 +201,9 @@ async def get_nodriver(
200
201
)
201
202
except FileNotFoundError as e:
202
203
raise MissingRequirementsError(e)
203
except:
204
except Exception as e:
204
205
if util.get_registered_instances():
206
debug.error(e)
205
207
browser = util.get_registered_instances().pop()
206
208
else:
207
209
raise