xinyun/vllm
1
0
Fork 0
mirror of https://git.datalinker.icu/vllm-project/vllm.git synced 2025-12-12 22:56:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Misc] Allow fetch_* utils to access local files by default (#29932)

Browse Source 
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
This commit is contained in:
Cyrus Leung 2025-12-03 15:49:34 +08:00 committed by GitHub
parent 0bec63fa31
commit bbfb55c29e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
vllm/multimodal/utils.py
View File

@ -67,8 +67,9 @@ class MediaConnector:
to set num_frames for video, set to set num_frames for video, set
`--media-io-kwargs '{"video":{"num_frames":40}}'` `--media-io-kwargs '{"video":{"num_frames":40}}'`
connection: HTTP connection client to download media contents. connection: HTTP connection client to download media contents.
allowed_local_media_path: A local directory to load media files allowed_local_media_path: A local directory to load media files from.
from. allowed_media_domains: If set, only media URLs that belong to this
domain can be used for multi-modal inputs.
""" """
super().__init__() super().__init__()
@ -123,16 +124,16 @@ class MediaConnector:
"Cannot load local files without `--allowed-local-media-path`." "Cannot load local files without `--allowed-local-media-path`."
) )
filepath = Path(url2pathname(url_spec.path)) filepath = Path(url2pathname(url_spec.netloc + url_spec.path))
if allowed_local_media_path not in filepath.resolve().parents: if allowed_local_media_path not in filepath.resolve().parents:
raise ValueError( raise ValueError(
f"The file path {filepath} must be a subpath " f"The file path {filepath} must be a subpath "
f"of `--allowed-local-media-path` {allowed_local_media_path}." f"of `--allowed-local-media-path {allowed_local_media_path}`."
) )
return media_io.load_file(filepath) return media_io.load_file(filepath)
def _assert_url_in_allowed_media_domains(self, url_spec) -> None: def _assert_url_in_allowed_media_domains(self, url_spec: ParseResult) -> None:
if ( if (
self.allowed_media_domains self.allowed_media_domains
and url_spec.hostname not in self.allowed_media_domains and url_spec.hostname not in self.allowed_media_domains
@ -489,9 +490,16 @@ def fetch_audio(
Args: Args:
audio_url: URL of the audio file to fetch. audio_url: URL of the audio file to fetch.
audio_io_kwargs: Additional kwargs passed to handle audio IO. audio_io_kwargs: Additional kwargs passed to handle audio IO.
Warning:
This method has direct access to local files and is only intended
to be called by user code. Never call this from the online server!
""" """
media_io_kwargs = None if not audio_io_kwargs else {"audio": audio_io_kwargs} media_io_kwargs = None if not audio_io_kwargs else {"audio": audio_io_kwargs}
media_connector = MediaConnector(media_io_kwargs=media_io_kwargs) media_connector = MediaConnector(
media_io_kwargs=media_io_kwargs,
allowed_local_media_path="/",
)
return media_connector.fetch_audio(audio_url) return media_connector.fetch_audio(audio_url)
@ -503,9 +511,16 @@ def fetch_image(
Args: Args:
image_url: URL of the image file to fetch. image_url: URL of the image file to fetch.
image_io_kwargs: Additional kwargs passed to handle image IO. image_io_kwargs: Additional kwargs passed to handle image IO.
Warning:
This method has direct access to local files and is only intended
to be called by user code. Never call this from the online server!
""" """
media_io_kwargs = None if not image_io_kwargs else {"image": image_io_kwargs} media_io_kwargs = None if not image_io_kwargs else {"image": image_io_kwargs}
media_connector = MediaConnector(media_io_kwargs=media_io_kwargs) media_connector = MediaConnector(
media_io_kwargs=media_io_kwargs,
allowed_local_media_path="/",
)
return media_connector.fetch_image(image_url) return media_connector.fetch_image(image_url)
@ -517,7 +532,14 @@ def fetch_video(
Args: Args:
video_url: URL of the video file to fetch. video_url: URL of the video file to fetch.
video_io_kwargs: Additional kwargs passed to handle video IO. video_io_kwargs: Additional kwargs passed to handle video IO.
Warning:
This method has direct access to local files and is only intended
to be called by user code. Never call this from the online server!
""" """
media_io_kwargs = None if not video_io_kwargs else {"video": video_io_kwargs} media_io_kwargs = None if not video_io_kwargs else {"video": video_io_kwargs}
media_connector = MediaConnector(media_io_kwargs=media_io_kwargs) media_connector = MediaConnector(
media_io_kwargs=media_io_kwargs,
allowed_local_media_path="/",
)
return media_connector.fetch_video(video_url) return media_connector.fetch_video(video_url)

2
vllm/multimodal/video.py
View File

@ -267,7 +267,7 @@ class OpenCVDynamicVideoBackend(OpenCVVideoBackend):
return frames, metadata return frames, metadata
class VideoMediaIO(MediaIO[npt.NDArray]): class VideoMediaIO(MediaIO[tuple[npt.NDArray, dict[str, Any]]]):
def __init__( def __init__(
self, self,
image_io: ImageMediaIO, image_io: ImageMediaIO,