Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions python/sglang/srt/entrypoints/openai/protocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -1117,7 +1117,7 @@ class ChatCompletionResponseChoice(BaseModel):
matched_stop: Union[None, int, str] = None
hidden_states: Optional[object] = None
prompt_token_ids: Optional[List[int]] = None
token_ids: Optional[List[int]] = None
response_token_ids: Optional[List[int]] = None
meta_info: Optional[Dict[str, Any]] = None

@model_serializer(mode="wrap")
Expand All @@ -1127,8 +1127,8 @@ def _serialize(self, handler):
data.pop("hidden_states", None)
if self.prompt_token_ids is None:
data.pop("prompt_token_ids", None)
if self.token_ids is None:
data.pop("token_ids", None)
if self.response_token_ids is None:
data.pop("response_token_ids", None)
if self.meta_info is None:
data.pop("meta_info", None)
return data
Expand Down
2 changes: 1 addition & 1 deletion python/sglang/srt/entrypoints/openai/serving_chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -1877,7 +1877,7 @@ def _build_chat_response(
),
hidden_states=hidden_states,
prompt_token_ids=choice_prompt_token_ids,
token_ids=choice_token_ids,
response_token_ids=choice_token_ids,
meta_info=choice_meta_info,
)
choices.append(choice_data)
Expand Down
2 changes: 1 addition & 1 deletion test/registered/sampling/test_sampling_mask.py
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ def test_chat_completions_returns_top_p_only_sampling_mask(self):
self.assertEqual(response.status_code, 200, response.text)

choice = response.json()["choices"][0]
output_ids = choice["token_ids"]
output_ids = choice["response_token_ids"]
meta_info = choice["meta_info"]
sampling_masks = meta_info["output_token_sampling_mask"]
sampling_logprobs = meta_info["output_token_sampling_logprobs"]
Expand Down
7 changes: 4 additions & 3 deletions test/registered/unit/entrypoints/openai/test_protocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -603,20 +603,21 @@ def test_prompt_token_ids_and_meta_info_serialization(self):
)
default_data = default_choice.model_dump()
self.assertNotIn("prompt_token_ids", default_data)
self.assertNotIn("token_ids", default_data)
self.assertNotIn("response_token_ids", default_data)
self.assertNotIn("meta_info", default_data)

choice = ChatCompletionResponseChoice(
index=0,
message=ChatMessage(role="assistant", content="Hello"),
finish_reason="stop",
prompt_token_ids=[1, 2, 3],
token_ids=[4, 5],
response_token_ids=[4, 5],
meta_info={"prompt_tokens": 3},
)
data = choice.model_dump()
self.assertEqual(data["prompt_token_ids"], [1, 2, 3])
self.assertEqual(data["token_ids"], [4, 5])
self.assertNotIn("token_ids", data)
self.assertEqual(data["response_token_ids"], [4, 5])
self.assertEqual(data["meta_info"], {"prompt_tokens": 3})


Expand Down
4 changes: 2 additions & 2 deletions test/registered/unit/entrypoints/openai/test_serving_chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -2337,11 +2337,11 @@ def test_non_streaming_chat_response_returns_requested_token_ids_and_meta_info(
choice = response.choices[0]

self.assertEqual(choice.prompt_token_ids, [11, 12, 13])
self.assertEqual(choice.token_ids, [21, 22])
self.assertEqual(choice.response_token_ids, [21, 22])
self.assertEqual(choice.meta_info, ret[0]["meta_info"])
dumped_choice = response.model_dump()["choices"][0]
self.assertEqual(dumped_choice["prompt_token_ids"], [11, 12, 13])
self.assertEqual(dumped_choice["token_ids"], [21, 22])
self.assertEqual(dumped_choice["response_token_ids"], [21, 22])
self.assertEqual(dumped_choice["meta_info"], ret[0]["meta_info"])

def test_streaming_cached_tokens_details_emits_sglext(self):
Expand Down
Loading