[bugfix] fix rstrip

[Jintao-Huang]

No description provided.

[Jintao-Huang]

#5518

[gemini-code-assist]

Summary of Changes

Hello @Jintao-Huang, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses a bug related to string manipulation within the LLM template system. The primary change involves refining how the </answer> tag is processed and removed from assistant messages, ensuring more robust and accurate parsing. A minor clarification comment was also added to another file for improved code readability.

Highlights

• Improved rstrip logic for </answer> tag: The logic for removing the </answer> tag from assistant message content has been improved. Previously, rstrip().rstrip('</answer>') could lead to incorrect parsing if trailing spaces were present. The updated code now explicitly checks if the content endswith('</answer>') after an initial rstrip(), ensuring accurate removal.
• Added code clarity: A new comment was added in swift/llm/template/base.py to clarify that the tool_content variable is expected to be a list.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature	Command	Description
Code Review	/gemini review	Performs a code review for the current pull request in its current state.
Pull Request Summary	/gemini summary	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in issue comments and review comments.
Help	/gemini help	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

[gemini-code-assist]

Code Review

This pull request aims to fix a bug related to rstrip. The change in swift/llm/template/template/utils.py correctly replaces a faulty rstrip(chars) call with a check for endswith() to remove a specific suffix. This is a good fix for the original problem. However, this change introduces a regression where surrounding whitespace is no longer stripped in all cases, which was the behavior of the original code. I've provided a suggestion to correct this while keeping the main bugfix. The other change in swift/llm/template/base.py is a minor comment addition which is acceptable.

[gemini-code-assist]

While this change correctly fixes the issue with rstrip('</answer>'), it introduces a potential regression. The .strip() method is now only called if the content ends with </answer>. If it doesn't, any leading or trailing whitespace will be preserved, which was not the case in the original implementation which had an unconditional .strip() at the end.

To ensure consistent behavior and match the original intent of stripping whitespace in all cases, the .strip() call should be unconditional.

if message['content'].endswith('</answer>'):
    message['content'] = message['content'][:-len('</answer>')]
message['content'] = message['content'].strip()