返回提交历史
Modified
g4f/Provider/Yupp.py
+5
-4
Modified
g4f/cookies.py
+3
-1
XFEstudio/gpt4free
refactor: enhance Yupp class API key retrieval and improve cookie loading error handling
f90978a3
代码差异
2 个文件
+8
-5
@@ -370,13 +370,14 @@ class Yupp(AsyncGeneratorProvider, ProviderModelMixin):
370
370
if not api_key:
371
371
api_key = AuthManager.load_api_key(cls)
372
372
if not api_key:
373
api_key = get_cookies("yupp.ai", False).get(
374
"__Secure-yupp.session-token"
375
)
376
if not api_key:
373
api_key = get_cookie_tokens()
374
if api_key:
375
load_yupp_accounts(api_key)
376
else:
377
377
raise MissingAuthError(
378
378
"No Yupp accounts configured. Set YUPP_API_KEY environment variable."
379
379
)
380
api_key = YUPP_ACCOUNTS[0]["token"] if YUPP_ACCOUNTS else None
380
381
manager = YuppModelManager(session=create_scraper(), api_key=api_key)
381
382
models = manager.client.fetch_models()
382
383
if models:
@@ -129,6 +129,8 @@ def load_cookies_from_browsers(domain_name: str,
129
129
for cookie_fn in BROWSERS:
130
130
if domain_name in CookiesConfig.cookies:
131
131
all_cookies[cookie_fn.__name__] = {"config": CookiesConfig.cookies.get(domain_name, {})}
132
else:
133
all_cookies[cookie_fn.__name__] = {}
132
134
try:
133
135
cookie_jar = cookie_fn(domain_name=domain_name)
134
136
for cookie in cookie_jar:
@@ -145,7 +147,7 @@ def load_cookies_from_browsers(domain_name: str,
145
147
debug.error("Cookie loading interrupted by user.")
146
148
break
147
149
except Exception as e:
148
debug.error(f"Error reading cookies from {cookie_fn.__name__} for {domain_name}: {e}")
150
debug.error(f"Error reading cookies from {cookie_fn.__name__} for {domain_name}: {type(e).__name__}: {e}")
149
151
if single_browser == "all":
150
152
return all_cookies
151
153
return cookies