Skip to content

[serve.llm][Fix] retry with model_config arg #52991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 15, 2025
Merged

[serve.llm][Fix] retry with model_config arg #52991

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fd1cb0
retry with model_config arg
lk-chen May 14, 2025
b68a36b
use helper func
lk-chen May 15, 2025
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
22 changes: 20 additions & 2 deletions python/ray/llm/_internal/serve/deployments/llm/vllm/vllm_engine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ async def start(self):
self.model_config = await self.engine.get_model_config()

self._tokenizer = await self.engine.get_tokenizer()
self._resolved_content_format = resolve_chat_template_content_format(
_resolve_chat_template_content_kwargs = dict(
# Use HF to get the chat template so set it to None here.
chat_template=None,
# Default to None, change when it's needed.
Expand All @@ -257,6 +257,17 @@ async def start(self):
tokenizer=self._tokenizer,
trust_remote_code=self.model_config.trust_remote_code,
)
try:
self._resolved_content_format = resolve_chat_template_content_format(
**_resolve_chat_template_content_kwargs
)
except TypeError:
# vLLM 0.9.0 changes API (#52975)
_resolve_chat_template_content_kwargs.pop("trust_remote_code")
_resolve_chat_template_content_kwargs["model_config"] = self.model_config
self._resolved_content_format = resolve_chat_template_content_format(
**_resolve_chat_template_content_kwargs
)

logger.info("Started vLLM engine.")

Expand Down Expand Up @@ -504,7 +515,7 @@ async def prepare_request(
)
mm_data = await mm_futures

prompt_text = apply_hf_chat_template(
_apply_hf_chat_template_kwargs = dict(
tokenizer=self._tokenizer,
conversation=conversation,
chat_template=None,
Expand All @@ -515,6 +526,13 @@ async def prepare_request(
add_generation_prompt=True,
continue_final_message=False,
)
try:
prompt_text = apply_hf_chat_template(**_apply_hf_chat_template_kwargs)
except TypeError:
# vLLM 0.9.0 changes API (#52975)
_apply_hf_chat_template_kwargs.pop("trust_remote_code")
_apply_hf_chat_template_kwargs["model_config"] = model_config
prompt_text = apply_hf_chat_template(**_apply_hf_chat_template_kwargs)
else:
prompt_text = prompt.prompt

Expand Down