Merge branch 'feat/model-runtime' into deploy/dev

langgenius · Dec 28, 2023 · e31f6c2 · e31f6c2
2 parents c468061 + b181682
commit e31f6c2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/api/core/model_runtime/model_providers/minimax/llm/chat_completion.py b/api/core/model_runtime/model_providers/minimax/llm/chat_completion.py
@@ -47,7 +47,8 @@ def generate(self, model: str, api_key: str, group_id: str,
             raise BadRequestError('At least one message is required')
 
         if prompt_messages[0].role == MinimaxMessage.Role.SYSTEM.value:
-            prompt = prompt_messages[0].content
+            if prompt_messages[0].content:
+                prompt = prompt_messages[0].content
             prompt_messages = prompt_messages[1:]
 
         # check if there is a user message

diff --git a/api/core/model_runtime/model_providers/minimax/llm/chat_completion_pro.py b/api/core/model_runtime/model_providers/minimax/llm/chat_completion_pro.py
@@ -59,7 +59,8 @@ def generate(self, model: str, api_key: str, group_id: str,
             raise BadRequestError('At least one message is required')
 
         if prompt_messages[0].role == MinimaxMessage.Role.SYSTEM.value:
-            bot_setting['content'] = prompt_messages[0].content
+            if prompt_messages[0].content:
+                bot_setting['content'] = prompt_messages[0].content
             prompt_messages = prompt_messages[1:]
 
         # check if there is a user message