Skip to content

Commit 421125d

Browse files
qandrewAndrew Xia
andauthored
[ez] move harmony utils to parser folder (#30117)
Signed-off-by: Andrew Xia <axia@fb.com> Co-authored-by: Andrew Xia <axia@fb.com>
1 parent 671427e commit 421125d

File tree

9 files changed

+9
-9
lines changed

9 files changed

+9
-9
lines changed

tests/entrypoints/openai/parser/__init__.py

Whitespace-only changes.

tests/entrypoints/test_harmony_utils.py renamed to tests/entrypoints/openai/parser/test_harmony_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from openai.types.responses import ResponseFunctionToolCall, ResponseReasoningItem
55
from openai_harmony import Author, Message, Role, TextContent
66

7-
from vllm.entrypoints.harmony_utils import (
7+
from vllm.entrypoints.openai.parser.harmony_utils import (
88
has_custom_tools,
99
parse_input_to_harmony_message,
1010
parse_output_message,

tests/entrypoints/openai/test_response_api_with_harmony.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ async def test_function_calling_required(client: OpenAI, model_name: str):
726726
@pytest.mark.asyncio
727727
@pytest.mark.parametrize("model_name", [MODEL_NAME])
728728
async def test_system_message_with_tools(client: OpenAI, model_name: str):
729-
from vllm.entrypoints.harmony_utils import get_system_message
729+
from vllm.entrypoints.openai.parser.harmony_utils import get_system_message
730730

731731
# Test with custom tools enabled - commentary channel should be available
732732
sys_msg = get_system_message(with_custom_tools=True)

vllm/entrypoints/context.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from vllm.entrypoints.chat_utils import (
2020
ChatTemplateContentFormatOption,
2121
)
22-
from vllm.entrypoints.harmony_utils import (
22+
from vllm.entrypoints.openai.parser.harmony_utils import (
2323
get_encoding,
2424
get_streamable_parser_for_assistant,
2525
render_for_completion,

vllm/entrypoints/openai/serving_chat.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
get_history_tool_calls_cnt,
2222
make_tool_call_id,
2323
)
24-
from vllm.entrypoints.harmony_utils import (
24+
from vllm.entrypoints.logger import RequestLogger
25+
from vllm.entrypoints.openai.parser.harmony_utils import (
2526
get_developer_message,
2627
get_stop_tokens_for_assistant_actions,
2728
get_streamable_parser_for_assistant,
@@ -30,7 +31,6 @@
3031
parse_input_to_harmony_message,
3132
render_for_completion,
3233
)
33-
from vllm.entrypoints.logger import RequestLogger
3434
from vllm.entrypoints.openai.protocol import (
3535
ChatCompletionLogProb,
3636
ChatCompletionLogProbs,

vllm/entrypoints/openai/serving_responses.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@
6464
SimpleContext,
6565
StreamingHarmonyContext,
6666
)
67-
from vllm.entrypoints.harmony_utils import (
67+
from vllm.entrypoints.logger import RequestLogger
68+
from vllm.entrypoints.openai.parser.harmony_utils import (
6869
construct_harmony_previous_input_messages,
6970
get_developer_message,
7071
get_stop_tokens_for_assistant_actions,
@@ -76,7 +77,6 @@
7677
parse_response_input,
7778
render_for_completion,
7879
)
79-
from vllm.entrypoints.logger import RequestLogger
8080
from vllm.entrypoints.openai.protocol import (
8181
DeltaMessage,
8282
ErrorResponse,

vllm/entrypoints/openai/tool_parsers/openai_tool_parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from collections.abc import Sequence
55
from typing import TYPE_CHECKING
66

7-
from vllm.entrypoints.harmony_utils import parse_output_into_messages
7+
from vllm.entrypoints.openai.parser.harmony_utils import parse_output_into_messages
88
from vllm.entrypoints.openai.protocol import (
99
ChatCompletionRequest,
1010
DeltaMessage,

vllm/reasoning/gptoss_reasoning_parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from transformers import PreTrainedTokenizerBase
77

8-
from vllm.entrypoints.harmony_utils import parse_chat_output
8+
from vllm.entrypoints.openai.parser.harmony_utils import parse_chat_output
99
from vllm.entrypoints.openai.protocol import ChatCompletionRequest, DeltaMessage
1010
from vllm.entrypoints.tool_server import ToolServer
1111
from vllm.logger import init_logger

0 commit comments

Comments
 (0)