Revert "refactor vllm/inputs/data.py to use newly defined functions"

This reverts commit 5986992.

Signed-off-by: Tobias Pitters <[email protected]>

Author: CloseChoice

vllm/inputs/data.py

@@ -268,7 +268,7 @@ class SingletonInputsAdapter:
     def prompt(self) -> Optional[str]:
         inputs = self.inputs
 
-        if is_token_inputs(inputs) or is_multimodal_inputs(inputs):
+        if inputs["type"] == "token" or inputs["type"] == "multimodal":
             return inputs.get("prompt")
 
         assert_never(inputs)  # type: ignore[arg-type]
@@ -277,7 +277,7 @@ def prompt(self) -> Optional[str]:
     def prompt_token_ids(self) -> List[int]:
         inputs = self.inputs
 
-        if is_token_inputs(inputs) or is_multimodal_inputs(inputs):
+        if inputs["type"] == "token" or inputs["type"] == "multimodal":
             return inputs.get("prompt_token_ids", [])
 
         assert_never(inputs)  # type: ignore[arg-type]
@@ -286,7 +286,7 @@ def prompt_token_ids(self) -> List[int]:
     def token_type_ids(self) -> List[int]:
         inputs = self.inputs
 
-        if is_token_inputs(inputs) or is_multimodal_inputs(inputs):
+        if inputs["type"] == "token" or inputs["type"] == "multimodal":
             return inputs.get("token_type_ids", [])
 
         assert_never(inputs)  # type: ignore[arg-type]
@@ -295,7 +295,7 @@ def token_type_ids(self) -> List[int]:
     def prompt_embeds(self) -> Optional[torch.Tensor]:
         inputs = self.inputs
 
-        if is_token_inputs(inputs) or is_multimodal_inputs(inputs):
+        if inputs["type"] == "token" or inputs["type"] == "multimodal":
             return None
 
         assert_never(inputs)  # type: ignore[arg-type]
@@ -304,9 +304,10 @@ def prompt_embeds(self) -> Optional[torch.Tensor]:
     def multi_modal_data(self) -> "MultiModalDataDict":
         inputs = self.inputs
 
-        if is_token_inputs(inputs):
+        if inputs["type"] == "token":
             return inputs.get("multi_modal_data", {})
-        elif is_multimodal_inputs(inputs):
+
+        if inputs["type"] == "multimodal":
             return inputs.get("mm_kwargs", {})
 
         assert_never(inputs)  # type: ignore[arg-type]
@@ -315,9 +316,10 @@ def multi_modal_data(self) -> "MultiModalDataDict":
     def multi_modal_inputs(self) -> Union[Dict, "MultiModalKwargs"]:
         inputs = self.inputs
 
-        if is_token_inputs(inputs):
+        if inputs["type"] == "token":
             return inputs.get("multi_modal_inputs", {})
-        elif is_multimodal_inputs(inputs):
+
+        if inputs["type"] == "multimodal":
             return inputs.get("mm_kwargs", {})
 
         assert_never(inputs)  # type: ignore[arg-type]
@@ -329,6 +331,7 @@ def multi_modal_hashes(self) -> List[str]:
         if is_token_inputs(inputs):
             return inputs.get("multi_modal_hashes", [])
         elif is_multimodal_inputs(inputs):
+            # only the case when we use MultiModalInputsV2
             return inputs.get("mm_hashes", [])
 
         assert_never(inputs)  # type: ignore[arg-type]
@@ -337,9 +340,10 @@ def multi_modal_hashes(self) -> List[str]:
     def multi_modal_placeholders(self) -> "MultiModalPlaceholderDict":
         inputs = self.inputs
 
-        if is_token_inputs(inputs):
+        if inputs["type"] == "token":
             return inputs.get("multi_modal_placeholders", {})
-        elif is_multimodal_inputs(inputs):
+
+        if inputs["type"] == "multimodal":
             return inputs.get("mm_placeholders", {})
 
         assert_never(inputs)  # type: ignore[arg-type]
@@ -348,9 +352,10 @@ def multi_modal_placeholders(self) -> "MultiModalPlaceholderDict":
     def mm_processor_kwargs(self) -> Dict[str, Any]:
         inputs = self.inputs
 
-        if is_token_inputs(inputs):
+        if inputs["type"] == "token":
             return inputs.get("mm_processor_kwargs", {})
-        elif is_multimodal_inputs(inputs):
+
+        if inputs["type"] == "multimodal":
             return {}
 
         assert_never(inputs)  # type: ignore[arg-type]