Skip to content

Fix: Resolve issue #5814 by adjusting function call prompt order in messages #5882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+31 −26
Open

Fix: Resolve issue #5814 by adjusting function call prompt order in messages #5882

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b8cb28
fix: resolve issue #5814 by set function call part at the end of mess…
Frank-Jie Apr 29, 2025
477ebf5
Merge provided system message and place it at the beginning of the me…
Frank-Jie Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions python/sglang/srt/openai_api/adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -948,6 +948,22 @@ def v1_chat_generate_request(

if chat_template_name is None:
openai_compatible_messages = []

for message in request.messages:
if message.content is None:
message.content = ""
if isinstance(message.content, str):
openai_compatible_messages.append(
{"role": message.role, "content": message.content}
)
else:
content_list = message.dict()["content"]
for content in content_list:
if content["type"] == "text":
openai_compatible_messages.append(
{"role": message.role, "content": content["text"]}
)

if (
tools
and tokenizer_manager.server_args.tool_call_parser == "deepseekv3"
Expand All @@ -974,21 +990,6 @@ def v1_chat_generate_request(
),
}
)

for message in request.messages:
if message.content is None:
message.content = ""
if isinstance(message.content, str):
openai_compatible_messages.append(
{"role": message.role, "content": message.content}
)
else:
content_list = message.dict()["content"]
for content in content_list:
if content["type"] == "text":
openai_compatible_messages.append(
{"role": message.role, "content": content["text"]}
)
if (
openai_compatible_messages
and openai_compatible_messages[-1]["role"] == "assistant"
Expand Down
Loading