返回提交历史
Modified
g4f/Provider/AllenAI.py
+6
-6
Modified
g4f/Provider/DeepInfraChat.py
+1
-3
XFEstudio/gpt4free
Fix default model in DeepInfraChat, Fix AllenAI provider
c3ba6924
代码差异
2 个文件
+7
-9
@@ -6,7 +6,7 @@ from ..typing import AsyncResult, Messages
6
6
from .base_provider import AsyncGeneratorProvider, ProviderModelMixin
7
7
from ..requests.raise_for_status import raise_for_status
8
8
from ..providers.response import FinishReason, JsonConversation
9
from .helper import format_prompt
9
from .helper import format_prompt, get_last_user_message
10
10
11
11
12
12
class Conversation(JsonConversation):
@@ -58,13 +58,13 @@ class AllenAI(AsyncGeneratorProvider, ProviderModelMixin):
58
58
proxy: str = None,
59
59
host: str = "inferd",
60
60
private: bool = True,
61
parent: str = None,
62
61
top_p: float = None,
63
62
temperature: float = None,
64
63
conversation: Conversation = None,
65
64
return_conversation: bool = False,
66
65
**kwargs
67
66
) -> AsyncResult:
67
prompt = format_prompt(messages) if conversation is None else get_last_user_message(messages)
68
68
# Initialize or update conversation
69
69
if conversation is None:
70
70
conversation = Conversation(model)
@@ -85,13 +85,13 @@ class AllenAI(AsyncGeneratorProvider, ProviderModelMixin):
85
85
# Build multipart form data
86
86
form_data = [
87
87
f'--{boundary}\r\n'
88
f'Content-Disposition: form-data; name="model"\r\n\r\n{model}\r\n',
88
f'Content-Disposition: form-data; name="model"\r\n\r\n{cls.get_model(model)}\r\n',
89
89
90
90
f'--{boundary}\r\n'
91
91
f'Content-Disposition: form-data; name="host"\r\n\r\n{host}\r\n',
92
92
93
93
f'--{boundary}\r\n'
94
f'Content-Disposition: form-data; name="content"\r\n\r\n{format_prompt(messages)}\r\n',
94
f'Content-Disposition: form-data; name="content"\r\n\r\n{prompt}\r\n',
95
95
96
96
f'--{boundary}\r\n'
97
97
f'Content-Disposition: form-data; name="private"\r\n\r\n{str(private).lower()}\r\n'
@@ -165,8 +165,8 @@ class AllenAI(AsyncGeneratorProvider, ProviderModelMixin):
165
165
166
166
# Add a message to the story
167
167
conversation.messages.extend([
168
{"role": "user", "content": format_prompt(messages)},
169
{"role": "assistant", "content": "".join(conversation.messages[-1]["content"] + content if conversation.messages else content)}
168
{"role": "user", "content": prompt},
169
{"role": "assistant", "content": content}
170
170
])
171
171
172
172
if return_conversation:
@@ -9,14 +9,13 @@ class DeepInfraChat(OpenaiTemplate):
9
9
api_base = "https://api.deepinfra.com/v1/openai"
10
10
working = True
11
11
12
default_model = 'deepseek-ai/DeepSeek-V3-Turbo'
12
default_model = 'deepseek-ai/DeepSeek-V3'
13
13
default_vision_model = 'meta-llama/Llama-3.2-90B-Vision-Instruct'
14
14
vision_models = [default_vision_model, 'openbmb/MiniCPM-Llama3-V-2_5']
15
15
models = [
16
16
'meta-llama/Meta-Llama-3.1-8B-Instruct',
17
17
'meta-llama/Llama-3.3-70B-Instruct-Turbo',
18
18
'meta-llama/Llama-3.3-70B-Instruct',
19
'deepseek-ai/DeepSeek-V3',
20
19
default_model,
21
20
'mistralai/Mistral-Small-24B-Instruct-2501',
22
21
'deepseek-ai/DeepSeek-R1',
@@ -41,7 +40,6 @@ class DeepInfraChat(OpenaiTemplate):
41
40
"llama-3.2-90b": "meta-llama/Llama-3.2-90B-Vision-Instruct",
42
41
"llama-3.3-70b": "meta-llama/Llama-3.3-70B-Instruct-Turbo",
43
42
"llama-3.3-70b": "meta-llama/Llama-3.3-70B-Instruct",
44
"deepseek-v3": "deepseek-ai/DeepSeek-V3",
45
43
"deepseek-v3": default_model,
46
44
"mixtral-small-28b": "mistralai/Mistral-Small-24B-Instruct-2501",
47
45
"deepseek-r1": "deepseek-ai/DeepSeek-R1-Turbo",