返回提交历史
Modified
g4f/__init__.py
+7
-1
Modified
g4f/api/__init__.py
+5
-5
XFEstudio/gpt4free
Set default values for generation config Set a list of providers
6b3be02d
代码差异
2 个文件
+12
-6
@@ -10,6 +10,7 @@ from .cookies import get_cookies, set_cookies
10
10
from . import debug, version
11
11
from .providers.types import BaseRetryProvider, ProviderType
12
12
from .providers.base_provider import ProviderModelMixin
13
from .providers.retry_provider import RetryProvider
13
14
14
15
def get_model_and_provider(model : Union[Model, str],
15
16
provider : Union[ProviderType, str, None],
@@ -43,7 +44,12 @@ def get_model_and_provider(model : Union[Model, str],
43
44
version.utils.check_version()
44
45
45
46
if isinstance(provider, str):
46
if provider in ProviderUtils.convert:
47
if " " in provider:
48
provider_list = [ProviderUtils.convert[p] for p in provider.split() if p in ProviderUtils.convert]
49
if not provider_list:
50
raise ProviderNotFoundError(f'Providers not found: {provider}')
51
provider = RetryProvider(provider_list, False)
52
elif provider in ProviderUtils.convert:
47
53
provider = ProviderUtils.convert[provider]
48
54
else:
49
55
raise ProviderNotFoundError(f'Provider not found: {provider}')
@@ -16,12 +16,12 @@ from g4f.typing import Messages
16
16
class ChatCompletionsConfig(BaseModel):
17
17
messages: Messages
18
18
model: str
19
provider: Union[str, None]
19
provider: Union[str, None] = None
20
20
stream: bool = False
21
temperature: Union[float, None]
22
max_tokens: int = None
23
stop: Union[list[str], str, None]
24
api_key: Union[str, None]
21
temperature: Union[float, None] = None
22
max_tokens: Union[int, None] = None
23
stop: Union[list[str], str, None] = None
24
api_key: Union[str, None] = None
25
25
26
26
class Api:
27
27
def __init__(self, engine: g4f, debug: bool = True, sentry: bool = False,