refactor: rename chat response token IDs (#35225)
This commit is contained in:
@@ -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")
|
||||
@@ -1127,8 +1127,8 @@ class ChatCompletionResponseChoice(BaseModel):
|
||||
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
|
||||
|
||||
@@ -1877,7 +1877,7 @@ class OpenAIServingChat(OpenAIServingBase):
|
||||
),
|
||||
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)
|
||||
|
||||
@@ -213,7 +213,7 @@ class TestSamplingMask(SamplingMaskTestMixin, CustomTestCase):
|
||||
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"]
|
||||
|
||||
@@ -603,7 +603,7 @@ class TestModelSerialization(unittest.TestCase):
|
||||
)
|
||||
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(
|
||||
@@ -611,12 +611,13 @@ class TestModelSerialization(unittest.TestCase):
|
||||
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})
|
||||
|
||||
|
||||
|
||||
@@ -2337,11 +2337,11 @@ class ServingChatTestCase(unittest.TestCase):
|
||||
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):
|
||||
|
||||
Reference in New Issue
Block a user