XFE Git
XFE Studio Git
Git 首页 全局搜索
XFE 主站 文档 NuGet
公开
关注 0 Fork 0 Star 0
返回提交历史

XFEstudio/gpt4free

feat: add get_cookie_tokens function for improved session token retrieval and update Yupp class to utilize it

c5139a44
hlohaus <983577+hlohaus@users.noreply.github.com>
提交于

代码差异

2 个文件 +7 -3
Modified g4f/Provider/Yupp.py +5 -2
@@ -299,6 +299,9 @@ async def get_credits(scraper: CloudScraper, account: Dict[str, Any]) -> Optiona
299 299 log_debug(f"Failed to fetch credit balance: {e}")
300 300 return None
301 301
302 def get_cookie_tokens():
303 return [cookies.get("__Secure-yupp.session-token") for cookies in get_cookies("yupp.ai", False, "all").values() if cookies.get("__Secure-yupp.session-token")]
304
302 305 def log_debug(message: str):
303 306 if os.getenv("DEBUG_MODE", "false").lower() == "true":
304 307 print(f"[DEBUG] {message}")
@@ -510,7 +513,7 @@ class Yupp(AsyncGeneratorProvider, ProviderModelMixin):
510 513 if not api_key:
511 514 api_key = AuthManager.load_api_key(cls)
512 515 if not api_key:
513 api_key = get_cookies("yupp.ai", False).get("__Secure-yupp.session-token")
516 api_key = get_cookie_tokens()
514 517 if api_key:
515 518 load_yupp_accounts(api_key)
516 519 else:
@@ -541,7 +544,7 @@ class Yupp(AsyncGeneratorProvider, ProviderModelMixin):
541 544 if not api_key:
542 545 api_key = AuthManager.load_api_key(cls)
543 546 if not api_key:
544 api_key = [cookies.get("__Secure-yupp.session-token") for cookies in get_cookies("yupp.ai", False, "all").values() if cookies.get("__Secure-yupp.session-token")]
547 api_key = get_cookie_tokens()
545 548 if api_key:
546 549 load_yupp_accounts(api_key)
547 550 log_debug(f"Yupp provider initialized with {len(YUPP_ACCOUNTS)} accounts")
Modified g4f/cookies.py +2 -1
@@ -127,7 +127,8 @@ def load_cookies_from_browsers(domain_name: str,
127 127 cookies = {}
128 128 all_cookies = {}
129 129 for cookie_fn in BROWSERS:
130 all_cookies[cookie_fn.__name__] = {}
130 if domain_name in CookiesConfig.cookies:
131 all_cookies[cookie_fn.__name__] = {"config": CookiesConfig.cookies.get(domain_name, {})}
131 132 try:
132 133 cookie_jar = cookie_fn(domain_name=domain_name)
133 134 for cookie in cookie_jar: