返回提交历史
Modified
g4f/Provider/base_provider.py
+18
-5
Modified
g4f/__init__.py
+51
-29
Modified
testing/test_chat_completion.py
+18
-5
XFEstudio/gpt4free
Add check_running_loop requirement Add create_async function in ChatCompletion Use SelectorEventLoop on windows
55577031
代码差异
3 个文件
+87
-39
@@ -25,6 +25,7 @@ class BaseProvider(ABC):
25
25
26
26
raise NotImplementedError()
27
27
28
28
29
@classmethod
29
30
@property
30
31
def params(cls):
@@ -46,6 +47,8 @@ class AsyncProvider(BaseProvider):
46
47
stream: bool = False,
47
48
**kwargs
48
49
) -> CreateResult:
50
check_running_loop()
51
49
52
yield asyncio.run(cls.create_async(model, messages, **kwargs))
50
53
51
54
@staticmethod
@@ -67,10 +70,17 @@ class AsyncGeneratorProvider(AsyncProvider):
67
70
stream: bool = True,
68
71
**kwargs
69
72
) -> CreateResult:
70
loop = asyncio.new_event_loop()
73
check_running_loop()
74
75
# Force use selector event loop on windows
76
loop = asyncio.SelectorEventLoop()
71
77
try:
72
asyncio.set_event_loop(loop)
73
generator = cls.create_async_generator(model, messages, stream=stream, **kwargs)
78
generator = cls.create_async_generator(
79
model,
80
messages,
81
stream=stream,
82
**kwargs
83
)
74
84
gen = generator.__aiter__()
75
85
while True:
76
86
try:
@@ -78,10 +88,8 @@ class AsyncGeneratorProvider(AsyncProvider):
78
88
except StopAsyncIteration:
79
89
break
80
90
finally:
81
asyncio.set_event_loop(None)
82
91
loop.close()
83
92
84
85
93
@classmethod
86
94
async def create_async(
87
95
cls,
@@ -100,6 +108,11 @@ class AsyncGeneratorProvider(AsyncProvider):
100
108
) -> AsyncGenerator:
101
109
raise NotImplementedError()
102
110
111
# Don't create a new loop in a running loop
112
def check_running_loop():
113
if asyncio.events._get_running_loop() is not None:
114
raise RuntimeError(
115
'Use "create_async" instead of "create" function in a async loop.')
103
116
104
117
_cookies = {}
105
118
@@ -1,11 +1,42 @@
1
1
from __future__ import annotations
2
2
from g4f import models
3
from .Provider import BaseProvider
3
from .Provider import BaseProvider, AsyncProvider
4
4
from .typing import Any, CreateResult, Union
5
5
import random
6
6
7
7
logging = False
8
8
9
def get_model_and_provider(model: Union[models.Model, str], provider: type[BaseProvider], stream: bool):
10
if isinstance(model, str):
11
if model in models.ModelUtils.convert:
12
model = models.ModelUtils.convert[model]
13
else:
14
raise Exception(f'The model: {model} does not exist')
15
16
if not provider:
17
if isinstance(model.best_provider, list):
18
if stream:
19
provider = random.choice([p for p in model.best_provider if p.supports_stream])
20
else:
21
provider = random.choice(model.best_provider)
22
else:
23
provider = model.best_provider
24
25
if not provider:
26
raise Exception(f'No provider found for model: {model}')
27
28
if not provider.working:
29
raise Exception(f'{provider.__name__} is not working')
30
31
if not provider.supports_stream and stream:
32
raise Exception(
33
f'ValueError: {provider.__name__} does not support "stream" argument')
34
35
if logging:
36
print(f'Using {provider.__name__} provider')
37
38
return model, provider
39
9
40
class ChatCompletion:
10
41
@staticmethod
11
42
def create(
@@ -13,28 +44,11 @@ class ChatCompletion:
13
44
messages : list[dict[str, str]],
14
45
provider : Union[type[BaseProvider], None] = None,
15
46
stream : bool = False,
16
auth : Union[str, None] = None, **kwargs: Any) -> Union[CreateResult, str]:
47
auth : Union[str, None] = None,
48
**kwargs
49
) -> Union[CreateResult, str]:
17
50
18
if isinstance(model, str):
19
if model in models.ModelUtils.convert:
20
model = models.ModelUtils.convert[model]
21
else:
22
raise Exception(f'The model: {model} does not exist')
23
24
if not provider:
25
if isinstance(model.best_provider, list):
26
if stream:
27
provider = random.choice([p for p in model.best_provider if p.supports_stream])
28
else:
29
provider = random.choice(model.best_provider)
30
else:
31
provider = model.best_provider
32
33
if not provider:
34
raise Exception(f'No provider found')
35
36
if not provider.working:
37
raise Exception(f'{provider.__name__} is not working')
51
model, provider = get_model_and_provider(model, provider, stream)
38
52
39
53
if provider.needs_auth and not auth:
40
54
raise Exception(
@@ -43,12 +57,20 @@ class ChatCompletion:
43
57
if provider.needs_auth:
44
58
kwargs['auth'] = auth
45
59
46
if not provider.supports_stream and stream:
47
raise Exception(
48
f'ValueError: {provider.__name__} does not support "stream" argument')
49
50
if logging:
51
print(f'Using {provider.__name__} provider')
52
53
60
result = provider.create_completion(model.name, messages, stream, **kwargs)
54
61
return result if stream else ''.join(result)
62
63
@staticmethod
64
async def create_async(
65
model : Union[models.Model, str],
66
messages : list[dict[str, str]],
67
provider : Union[type[BaseProvider], None] = None,
68
**kwargs
69
) -> str:
70
71
model, provider = get_model_and_provider(model, provider, False)
72
73
if not issubclass(provider, AsyncProvider):
74
raise Exception(f"Provider: {provider.__name__} doesn't support create_async")
75
76
return await provider.create_async(model.name, messages, **kwargs)
@@ -3,10 +3,23 @@ from pathlib import Path
3
3
4
4
sys.path.append(str(Path(__file__).parent.parent))
5
5
6
import g4f
6
import g4f, asyncio
7
7
8
response = g4f.ChatCompletion.create(
8
print("create:", end=" ", flush=True)
9
for response in g4f.ChatCompletion.create(
9
10
model=g4f.models.gpt_35_turbo,
10
messages=[{"role": "user", "content": "hello, are you GPT 4?"}]
11
)
12
print(response)
11
provider=g4f.Provider.GptGo,
12
messages=[{"role": "user", "content": "hello!"}],
13
):
14
print(response, end="", flush=True)
15
print()
16
17
async def run_async():
18
response = await g4f.ChatCompletion.create_async(
19
model=g4f.models.gpt_35_turbo,
20
provider=g4f.Provider.GptGo,
21
messages=[{"role": "user", "content": "hello!"}],
22
)
23
print("create_async:", response)
24
25
asyncio.run(run_async())