[Misc][Harmony] Move Responses API only harmony utils to responses/harmony.py (#35339)
Signed-off-by: sfeng33 <4florafeng@gmail.com>
This commit is contained in:
@@ -58,15 +58,11 @@ from vllm.entrypoints.openai.engine.serving import (
|
||||
)
|
||||
from vllm.entrypoints.openai.models.serving import OpenAIServingModels
|
||||
from vllm.entrypoints.openai.parser.harmony_utils import (
|
||||
construct_harmony_previous_input_messages,
|
||||
get_developer_message,
|
||||
get_stop_tokens_for_assistant_actions,
|
||||
get_system_message,
|
||||
get_user_message,
|
||||
has_custom_tools,
|
||||
parse_output_message,
|
||||
parse_remaining_state,
|
||||
parse_response_input,
|
||||
render_for_completion,
|
||||
)
|
||||
from vllm.entrypoints.openai.responses.context import (
|
||||
@@ -76,6 +72,12 @@ from vllm.entrypoints.openai.responses.context import (
|
||||
SimpleContext,
|
||||
StreamingHarmonyContext,
|
||||
)
|
||||
from vllm.entrypoints.openai.responses.harmony import (
|
||||
construct_harmony_previous_input_messages,
|
||||
harmony_to_response_output,
|
||||
parser_state_to_response_output,
|
||||
response_input_to_harmony,
|
||||
)
|
||||
from vllm.entrypoints.openai.responses.protocol import (
|
||||
InputTokensDetails,
|
||||
OutputTokensDetails,
|
||||
@@ -954,9 +956,9 @@ class OpenAIServingResponses(OpenAIServing):
|
||||
output_items: list[ResponseOutputItem] = []
|
||||
num_init_messages = context.num_init_messages
|
||||
for msg in context.messages[num_init_messages:]:
|
||||
output_items.extend(parse_output_message(msg))
|
||||
output_items.extend(harmony_to_response_output(msg))
|
||||
# Handle the generation stopped in the middle (if any).
|
||||
last_items = parse_remaining_state(context.parser)
|
||||
last_items = parser_state_to_response_output(context.parser)
|
||||
if last_items:
|
||||
output_items.extend(last_items)
|
||||
return output_items
|
||||
@@ -1103,13 +1105,13 @@ class OpenAIServingResponses(OpenAIServing):
|
||||
else:
|
||||
prev_outputs = []
|
||||
for response_msg in request.input:
|
||||
new_msg = parse_response_input(response_msg, prev_outputs)
|
||||
new_msg = response_input_to_harmony(response_msg, prev_outputs)
|
||||
if new_msg.author.role != "system":
|
||||
messages.append(new_msg)
|
||||
|
||||
# User passes in a tool call request and its output. We need
|
||||
# to add the tool call request to prev_outputs so that the
|
||||
# parse_response_input can find the tool call request when
|
||||
# to add the tool call request to prev_outputs so that
|
||||
# response_input_to_harmony can find the tool call request when
|
||||
# parsing the tool call output.
|
||||
if isinstance(response_msg, ResponseFunctionToolCall):
|
||||
prev_outputs.append(response_msg)
|
||||
|
||||
Reference in New Issue
Block a user