update

swift/llm/dataset/dataset/llm.py

@@ -744,11 +744,6 @@ def preprocess(self, row: Dict[str, Any]) -> Optional[Dict[str, Any]]:
         messages = res['messages']
         if messages[0]['role'] == 'system':
             messages.pop(0)
-        for message in messages:
-            if message['role'] == 'function-call':
-                message['role'] = 'tool_call'
-            elif message['role'] == 'function-response':
-                message['role'] = 'tool_response'
         return res
 
 

swift/llm/dataset/preprocessor/core.py

@@ -401,6 +401,8 @@ def __init__(
         self.content_keys = ['content', 'value'] if content_key is None else [content_key]
         self.user_roles = ['user', 'human'] if user_role is None else [user_role]
         self.assistant_roles = ['assistant', 'gpt', 'bot'] if assistant_role is None else [assistant_role]
+        self.tool_call_roles = ['function_call']
+        self.tool_response_roles = ['function_response', 'observation', 'observations']
 
         self.system_role = system_role
         self.repair_messages = repair_messages
@@ -446,6 +448,10 @@ def to_std_messages(self, messages: List[Dict[str, str]], system: Optional[str])
                 message['role'] = 'user'
             elif role in self.assistant_roles:
                 message['role'] = 'assistant'
+            elif role.replace('-', '_') in self.tool_call_roles:
+                message['role'] = 'tool_call'
+            elif role.replace('-', '_') in self.tool_response_roles:
+                message['role'] = 'tool_response'
 
     @staticmethod
     def _to_std_key(messages: List[Dict[str, str]], std_key: str, optional_keys: List[str]) -> None: