Refactor Dockerfile.ci to use precompiled VLLM installation and remove unused parse.py file. Update serving_chat.py to streamline rendering logic and enhance compatibility with new API. Modify OmniInputPreprocessor to directly handle SingletonDictPrompt, improving input processing efficiency.

Signed-off-by: tzhouam <tzhouam@connect.ust.hk>

vllm_omni/inputs/preprocess.py

@@ -1,10 +1,11 @@
 from typing import Any
 
 from typing_extensions import assert_never
-from vllm.inputs.data import EmbedsInputs, SingletonInputs, SingletonPrompt, TextPrompt
+from vllm.inputs.data import EmbedsInputs, SingletonInputs
 from vllm.inputs.preprocess import InputPreprocessor
 from vllm.logger import init_logger
 from vllm.multimodal.inputs import MultiModalInputs, MultiModalUUIDDict
+from vllm.renderers.inputs import SingletonDictPrompt
 
 from vllm_omni.inputs.data import (
     OmniEmbedsPrompt,
@@ -13,7 +14,6 @@ from vllm_omni.inputs.data import (
     OmniTokensPrompt,
     token_inputs_omni,
 )
-from vllm_omni.inputs.parse import parse_singleton_prompt_omni
 
 logger = init_logger(__name__)
 
@@ -123,7 +123,7 @@ class OmniInputPreprocessor(InputPreprocessor):
 
     def _prompt_to_llm_inputs(
         self,
-        prompt: SingletonPrompt,
+        prompt: SingletonDictPrompt,
         tokenization_kwargs: dict[str, Any] | None = None,
         *,
         mm_uuids: MultiModalUUIDDict | None = None,
@@ -139,28 +139,20 @@ class OmniInputPreprocessor(InputPreprocessor):
 
         * [`SingletonInputs`][vllm.inputs.data.SingletonInputs] instance
         """
-        parsed = parse_singleton_prompt_omni(prompt)
-
-        # Note: omni parsing prioritizes tokens path when both tokens and embeds
-        # exist, keeping both for pipeline stage transfer
-        if parsed["type"] == "embeds":
-            return self._process_embeds(parsed["content"])
-        if parsed["type"] == "tokens":
+        if "prompt_token_ids" in prompt:
             return self._process_tokens(
-                parsed["content"],
+                prompt,  # type: ignore[arg-type]
                 mm_uuids=mm_uuids,
             )
-        if parsed["type"] == "text":
+
+        if "prompt_embeds" in prompt:
+            return self._process_embeds(prompt)  # type: ignore[arg-type]
+
+        if "prompt" in prompt:
             return self._process_text(
-                parsed["content"],
-                tokenization_kwargs=tokenization_kwargs,
-                mm_uuids=mm_uuids,
-            )
-        if parsed["type"] == "str":
-            return self._process_text(
-                TextPrompt(prompt=parsed["content"]),
+                prompt,  # type: ignore[arg-type]
                 tokenization_kwargs=tokenization_kwargs,
                 mm_uuids=mm_uuids,
             )
 
-        assert_never(parsed)
+        assert_never(prompt)  # type: ignore[arg-type]