gpt4free

公开

关注 0 Fork 0 Star 1

返回提交历史

XFEstudio/gpt4free

Fix unittests

6390fcca

Heiner Lohaus <hlohaus@users.noreply.github.com>

提交于 2024-12-18 13:04

父提交 af67771

代码差异

3 个文件 +10 -9

Modified g4f/Provider/Cloudflare.py +3 -7

@@ -3,15 +3,9 @@ from __future__ import annotations

3 3 import asyncio

4 4 import json

5 5

6 try:

7 import nodriver

8 has_nodriver = True

9 except ImportError:

10 has_nodriver = False

12 6 from ..typing import AsyncResult, Messages, Cookies

13 7 from .base_provider import AsyncGeneratorProvider, ProviderModelMixin, get_running_loop

14 from ..requests import Session, StreamSession, get_args_from_nodriver, raise_for_status, merge_cookies, DEFAULT_HEADERS

from ..requests import Session, StreamSession, get_args_from_nodriver, raise_for_status, merge_cookies, DEFAULT_HEADERS, has_nodriver, has_curl_cffi

15 9 from ..errors import ResponseStatusError

16 10

17 11 class Cloudflare(AsyncGeneratorProvider, ProviderModelMixin):

@@ -45,6 +39,8 @@ class Cloudflare(AsyncGeneratorProvider, ProviderModelMixin):

45 39 get_running_loop(check_nested=True)

46 40 args = get_args_from_nodriver(cls.url)

47 41 cls._args = asyncio.run(args)

42 elif not has_curl_cffi:

43 return cls.models

48 44 else:

49 45 cls._args = {"headers": DEFAULT_HEADERS, "cookies": {}}

50 46 with Session(**cls._args) as session:

Modified g4f/Provider/needs_auth/OpenaiChat.py +1 -1

@@ -637,7 +637,7 @@ class Conversation(BaseConversation):

637 637 def get_cookies(

638 638 urls: list[str] = None

639 639 ):

640 params = dict()

640 params = {}

641 641 if urls is not None:

642 642 params['urls'] = [i for i in urls]

643 643 cmd_dict = {

Modified g4f/requests/__init__.py +6 -1

@@ -8,7 +8,7 @@ try:

8 8 from .curl_cffi import StreamResponse, StreamSession, FormData

9 9 has_curl_cffi = True

10 10 except ImportError:

11 from typing import Type as Session, Type as Response

11 from typing import Type as Response

12 12 from .aiohttp import StreamResponse, StreamSession, FormData

13 13 has_curl_cffi = False

14 14 try:

@@ -38,6 +38,11 @@ from ..errors import MissingRequirementsError

38 38 from ..typing import Cookies

39 39 from .defaults import DEFAULT_HEADERS, WEBVIEW_HAEDERS

40 40

41 if not has_curl_cffi:

42 class Session:

43 def __init__(self, **kwargs):

44 raise MissingRequirementsError('Install "curl_cffi" package | pip install -U curl_cffi')

41 46 async def get_args_from_webview(url: str) -> dict:

42 47 if not has_webview:

43 48 raise MissingRequirementsError('Install "webview" package')