Skip to content

Commit 7f35502

Browse files
authored
[bugfix] fix rstrip (#5519)
1 parent d586583 commit 7f35502

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

swift/llm/template/base.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,6 +1041,7 @@ def _swift_prepare_inputs(self, inputs: StdTemplateInputs):
10411041
i += 1
10421042
pre_message['content'], tool_content = self.agent_template._format_tool_responses(
10431043
pre_content, messages[i_start:i + 1])
1044+
# where tool_content is a List.
10441045
messages[i_start:i + 1] = [{'role': 'tool', 'content': tool_content}]
10451046
i = i_start + 1
10461047
elif pre_role == 'assistant' and role == 'assistant' or pre_role == 'user' and role == 'user':

swift/llm/template/template/utils.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,10 @@ def _swift_prepare_inputs(self, inputs):
5757
# Delete the content before '</think>' in all assistant turns except the last round.
5858
if message['role'] == 'assistant' and isinstance(message['content'], str) and i != len(messages) - 1:
5959
if self.with_answer:
60-
message['content'] = message['content'].split('<answer>')[-1].rstrip().rstrip(
61-
'</answer>').strip()
60+
message['content'] = message['content'].split('<answer>')[-1].rstrip()
61+
if message['content'].endswith('</answer>'):
62+
message['content'] = message['content'][:-len('</answer>')]
63+
message['content'] = message['content'].strip()
6264
else:
6365
message['content'] = self.history_think_prefix + message['content'].split(
6466
'</think>')[-1].strip()

0 commit comments

Comments
 (0)