Skip to content

Commit 958d447

Browse files
[python] move toolparsermanager to local imports (deepjavalibrary#2699)
1 parent 89f0fe4 commit 958d447

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

engines/python/setup/djl_python/properties_manager/vllm_rb_properties.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
from pydantic import field_validator, model_validator
1717

1818
from djl_python.properties_manager.properties import Properties
19-
from vllm.entrypoints.openai.tool_parsers import ToolParserManager
2019

2120

2221
class VllmRbProperties(Properties):
@@ -153,9 +152,10 @@ def validate_pipeline_parallel(self):
153152

154153
@model_validator(mode='after')
155154
def validate_tool_call_parser(self):
156-
valid_tool_parses = ToolParserManager.tool_parsers.keys()
157-
if self.enable_auto_tool_choice \
158-
and self.tool_call_parser not in valid_tool_parses:
159-
raise ValueError(
160-
f"Invalid tool call parser: {self.tool_call_parser} "
161-
f"(chose from {{ {','.join(valid_tool_parses)} }})")
155+
if self.enable_auto_tool_choice:
156+
from vllm.entrypoints.openai.tool_parsers import ToolParserManager
157+
valid_tool_parses = ToolParserManager.tool_parsers.keys()
158+
if self.tool_call_parser not in valid_tool_parses:
159+
raise ValueError(
160+
f"Invalid tool call parser: {self.tool_call_parser} "
161+
f"(chose from {{ {','.join(valid_tool_parses)} }})")

engines/python/setup/djl_python/rolling_batch/vllm_rolling_batch.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414

1515
from vllm import LLMEngine, SamplingParams
1616
from vllm.sampling_params import RequestOutputKind
17-
from vllm.entrypoints.openai.tool_parsers import ToolParser, ToolParserManager
18-
from vllm.transformers_utils.tokenizer import AnyTokenizer
1917
from vllm.utils import random_uuid, AtomicCounter
2018

2119
from djl_python.request import Request
@@ -56,8 +54,9 @@ def __init__(self, model_id_or_path: str, properties: dict,
5654
self.lora_id_counter = AtomicCounter(0)
5755
self.lora_requests = {}
5856
self.is_mistral_tokenizer = self.vllm_configs.tokenizer_mode == 'mistral'
59-
self.tool_parser: Optional[Callable[[AnyTokenizer], ToolParser]] = None
57+
self.tool_parser = None
6058
if self.vllm_configs.enable_auto_tool_choice:
59+
from vllm.entrypoints.openai.tool_parsers import ToolParserManager
6160
try:
6261
self.tool_parser = ToolParserManager.get_tool_parser(
6362
self.vllm_configs.tool_call_parser)

0 commit comments

Comments
 (0)