jack 3 months ago
parent
commit
4d1f17ead4
1 changed files with 11 additions and 9 deletions
  1. 11 9
      app/core/runner/thread_runner.py

+ 11 - 9
app/core/runner/thread_runner.py

@@ -327,6 +327,7 @@ class ThreadRunner:
             role = message.role
             if role == "user":
                 message_content = []
+                """
                 if message.file_ids:
                     files = FileService.get_file_list_by_ids(
                         session=self.session, file_ids=message.file_ids
@@ -339,14 +340,15 @@ class ThreadRunner:
                             )
                         )
                 else:
-                    for content in message.content:
-                        if content["type"] == "text":
-                            message_content.append(
-                                {"type": "text", "text": content["text"]["value"]}
-                            )
-                        elif content["type"] == "image_url":
-                            message_content.append(content)
-                    chat_messages.append(msg_util.new_message(role, message_content))
+                """
+                for content in message.content:
+                    if content["type"] == "text":
+                        message_content.append(
+                            {"type": "text", "text": content["text"]["value"]}
+                        )
+                    elif content["type"] == "image_url":
+                        message_content.append(content)
+                chat_messages.append(msg_util.new_message(role, message_content))
             elif role == "assistant":
                 message_content = ""
                 for content in message.content:
@@ -354,7 +356,7 @@ class ThreadRunner:
                         message_content += content["text"]["value"]
                 chat_messages.append(msg_util.new_message(role, message_content))
 
-        return chat_messages
+        return chat_messages[:10]  ### 暂时只支持10条消息,后续正价token上限
 
     def __convert_assistant_tool_calls_to_chat_messages(self, run_step: RunStep):
         """