Minimax v2 (#49)

* add minimaxv2 --------- Co-authored-by: wangyuxin <[email protected]>
wangyuxinwhy · Mar 8, 2024 · de517e9 · de517e9
1 parent bad31e1
commit de517e9
Show file tree

Hide file tree

Showing 20 changed files with 350 additions and 178 deletions.
diff --git a/generate/__init__.py b/generate/__init__.py
@@ -19,6 +19,8 @@
     HunyuanChatParameters,
     MinimaxChat,
     MinimaxChatParameters,
+    MinimaxLegacyChat,
+    MinimaxLegacyChatParameters,
     MinimaxProChat,
     MinimaxProChatParameters,
     MoonshotChat,
@@ -93,10 +95,12 @@
     'AzureChat',
     'OpenAIChat',
     'OpenAIChatParameters',
-    'MinimaxProChat',
-    'MinimaxProChatParameters',
     'MinimaxChat',
     'MinimaxChatParameters',
+    'MinimaxProChat',
+    'MinimaxProChatParameters',
+    'MinimaxLegacyChat',
+    'MinimaxLegacyChatParameters',
     'ZhipuChat',
     'ZhipuChatParameters',
     'ZhipuCharacterChat',

diff --git a/generate/chat_completion/__init__.py b/generate/chat_completion/__init__.py
@@ -32,6 +32,8 @@
     HunyuanChatParameters,
     MinimaxChat,
     MinimaxChatParameters,
+    MinimaxLegacyChat,
+    MinimaxLegacyChatParameters,
     MinimaxProChat,
     MinimaxProChatParameters,
     MoonshotChat,
@@ -55,8 +57,9 @@
     (AzureChat, OpenAIChatParameters),
     (AnthropicChat, AnthropicChatParameters),
     (OpenAIChat, OpenAIChatParameters),
+    (MinimaxChat, MinimaxChatParameters),
     (MinimaxProChat, MinimaxProChatParameters),
-    (MinimaxChat, MinimaxProChatParameters),
+    (MinimaxLegacyChat, MinimaxProChatParameters),
     (ZhipuChat, ZhipuChatParameters),
     (ZhipuCharacterChat, ZhipuCharacterChatParameters),
     (WenxinChat, WenxinChatParameters),
@@ -82,10 +85,12 @@
     'ChatCompletionStreamOutput',
     'ModelParameters',
     'AzureChat',
-    'MinimaxProChat',
-    'MinimaxProChatParameters',
     'MinimaxChat',
     'MinimaxChatParameters',
+    'MinimaxProChat',
+    'MinimaxProChatParameters',
+    'MinimaxLegacyChat',
+    'MinimaxLegacyChatParameters',
     'OpenAIChat',
     'OpenAIChatParameters',
     'ZhipuChat',

diff --git a/generate/chat_completion/base.py b/generate/chat_completion/base.py
@@ -69,7 +69,7 @@ def hook(self, **kwargs: Unpack['HookModelKwargs']) -> 'HookChatCompletionModel'
 class RemoteChatCompletionModel(ChatCompletionModel, ABC):
     settings: PlatformSettings
     http_client: HttpClient
-    avaliable_models: ClassVar[List[str]] = []
+    available_models: ClassVar[List[str]] = []
 
     def __init__(
         self,

diff --git a/generate/chat_completion/cost_caculator.py b/generate/chat_completion/cost_caculator.py
@@ -7,6 +7,11 @@
         'moonshot-v1-32k': (0.024, 0.024),
         'moonshot-v1-128k': (0.06, 0.06),
     },
+    'minimax': {
+        'abab5.5-chat': (0.015, 0.015),
+        'abab5.5s-chat': (0.005, 0.005),
+        'abab6-chat': (0.1, 0.1),
+    },
 }
 
 

diff --git a/generate/chat_completion/models/__init__.py b/generate/chat_completion/models/__init__.py
@@ -16,6 +16,7 @@
 from generate.chat_completion.models.deepseek import DeepSeekChat, DeepSeekChatParameters
 from generate.chat_completion.models.hunyuan import HunyuanChat, HunyuanChatParameters
 from generate.chat_completion.models.minimax import MinimaxChat, MinimaxChatParameters
+from generate.chat_completion.models.minimax_legacy import MinimaxLegacyChat, MinimaxLegacyChatParameters
 from generate.chat_completion.models.minimax_pro import MinimaxProChat, MinimaxProChatParameters
 from generate.chat_completion.models.moonshot import MoonshotChat, MoonshotChatParameters
 from generate.chat_completion.models.openai import OpenAIChat, OpenAIChatParameters
@@ -38,10 +39,12 @@
     'BailianChatParameters',
     'HunyuanChat',
     'HunyuanChatParameters',
-    'MinimaxChat',
-    'MinimaxChatParameters',
+    'MinimaxLegacyChat',
+    'MinimaxLegacyChatParameters',
     'MinimaxProChat',
     'MinimaxProChatParameters',
+    'MinimaxChat',
+    'MinimaxChatParameters',
     'OpenAIChat',
     'OpenAIChatParameters',
     'WenxinChat',

diff --git a/generate/chat_completion/models/anthropic.py b/generate/chat_completion/models/anthropic.py
@@ -56,7 +56,7 @@ class AnthropicParametersDict(RemoteModelParametersDict, total=False):
 
 class AnthropicChat(RemoteChatCompletionModel):
     model_type: ClassVar[str] = 'anthropic'
-    avaliable_models: ClassVar[List[str]] = ['claude-2.1', 'claude-2.0', 'claude-instant-1.2']
+    available_models: ClassVar[List[str]] = ['claude-2.1', 'claude-2.0', 'claude-instant-1.2']
 
     parameters: AnthropicChatParameters
     settings: AnthropicSettings

diff --git a/generate/chat_completion/models/baichuan.py b/generate/chat_completion/models/baichuan.py
@@ -52,7 +52,7 @@ class BaichuanChatParametersDict(RemoteModelParametersDict, total=False):
 
 class BaichuanChat(RemoteChatCompletionModel):
     model_type: ClassVar[str] = 'baichuan'
-    avaliable_models: ClassVar[List[str]] = ['Baichuan2-Turbo', 'Baichuan2-53B', 'Baichuan2-Turbo-192k']
+    available_models: ClassVar[List[str]] = ['Baichuan2-Turbo', 'Baichuan2-53B', 'Baichuan2-Turbo-192k']
 
     parameters: BaichuanChatParameters
     settings: BaichuanSettings

diff --git a/generate/chat_completion/models/dashscope.py b/generate/chat_completion/models/dashscope.py
@@ -57,7 +57,7 @@ class DashScopeChatParametersDict(RemoteModelParametersDict, total=False):
 
 class DashScopeChat(RemoteChatCompletionModel):
     model_type: ClassVar[str] = 'dashscope'
-    avaliable_models: ClassVar[List[str]] = ['qwen-turbo', 'qwen-plus', 'qwen-max', 'qwen-max-1201', 'qwen-max-longcontext']
+    available_models: ClassVar[List[str]] = ['qwen-turbo', 'qwen-plus', 'qwen-max', 'qwen-max-1201', 'qwen-max-longcontext']
 
     parameters: DashScopeChatParameters
     settings: DashScopeSettings

diff --git a/generate/chat_completion/models/dashscope_multimodal.py b/generate/chat_completion/models/dashscope_multimodal.py
@@ -54,7 +54,7 @@ class DashScopeMultiModalMessage(TypedDict):
 
 class DashScopeMultiModalChat(RemoteChatCompletionModel):
     model_type: ClassVar[str] = 'dashscope_multimodal'
-    avaliable_models: ClassVar[List[str]] = ['qwen-vl-max', 'qwen-vl-plus']
+    available_models: ClassVar[List[str]] = ['qwen-vl-max', 'qwen-vl-plus']
 
     parameters: DashScopeMultiModalChatParameters
     settings: DashScopeSettings

diff --git a/generate/chat_completion/models/deepseek.py b/generate/chat_completion/models/deepseek.py
@@ -34,7 +34,7 @@ class DeepSeekParametersDict(RemoteModelParametersDict, total=False):
 
 class DeepSeekChat(OpenAILikeChat):
     model_type: ClassVar[str] = 'deepseek'
-    avaliable_models: ClassVar[List[str]] = ['deepseek-chat', 'deepseek-coder']
+    available_models: ClassVar[List[str]] = ['deepseek-chat', 'deepseek-coder']
 
     parameters: DeepSeekChatParameters
     settings: DeepSeekSettings
@@ -68,5 +68,5 @@ def stream_generate(self, prompt: Prompt, **kwargs: Unpack[DeepSeekParametersDic
     async def async_stream_generate(
         self, prompt: Prompt, **kwargs: Unpack[DeepSeekParametersDict]
     ) -> AsyncIterator[ChatCompletionStreamOutput]:
-        async for i in super().async_stream_generate(prompt, **kwargs):
-            yield i
+        async for stream_output in super().async_stream_generate(prompt, **kwargs):
+            yield stream_output