Update Optional[x] -> x | None and Union[x, y] to x | y (#26633)

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
This commit is contained in:
Harry Mellor
2025-10-12 09:51:31 -07:00
committed by GitHub
parent 9bb38130cb
commit 8fcaaf6a16
944 changed files with 9490 additions and 10121 deletions
+12 -12
View File
@@ -7,7 +7,7 @@ from collections.abc import Iterable
from concurrent.futures import ThreadPoolExecutor
from itertools import groupby
from pathlib import Path
from typing import TYPE_CHECKING, Any, Optional, TypeVar, Union
from typing import TYPE_CHECKING, Any, TypeVar
from urllib.parse import ParseResult, urlparse
from urllib.request import url2pathname
@@ -49,11 +49,11 @@ atexit.register(global_thread_pool.shutdown)
class MediaConnector:
def __init__(
self,
media_io_kwargs: Optional[dict[str, dict[str, Any]]] = None,
media_io_kwargs: dict[str, dict[str, Any]] | None = None,
connection: HTTPConnection = global_http_connection,
*,
allowed_local_media_path: str = "",
allowed_media_domains: Optional[list[str]] = None,
allowed_media_domains: list[str] | None = None,
) -> None:
"""
Args:
@@ -143,7 +143,7 @@ class MediaConnector:
url: str,
media_io: MediaIO[_M],
*,
fetch_timeout: Optional[int] = None,
fetch_timeout: int | None = None,
) -> _M: # type: ignore[type-var]
url_spec = urlparse(url)
@@ -173,7 +173,7 @@ class MediaConnector:
url: str,
media_io: MediaIO[_M],
*,
fetch_timeout: Optional[int] = None,
fetch_timeout: int | None = None,
) -> _M:
url_spec = urlparse(url)
loop = asyncio.get_running_loop()
@@ -207,7 +207,7 @@ class MediaConnector:
def fetch_audio(
self,
audio_url: str,
) -> tuple[np.ndarray, Union[int, float]]:
) -> tuple[np.ndarray, int | float]:
"""
Load audio from a URL.
"""
@@ -222,7 +222,7 @@ class MediaConnector:
async def fetch_audio_async(
self,
audio_url: str,
) -> tuple[np.ndarray, Union[int, float]]:
) -> tuple[np.ndarray, int | float]:
"""
Asynchronously fetch audio from a URL.
"""
@@ -396,7 +396,7 @@ def group_mm_kwargs_by_modality(
*,
device: torch.types.Device = None,
pin_memory: bool = False,
merge_by_field_config: Optional[bool] = None,
merge_by_field_config: bool | None = None,
) -> Iterable[tuple[str, int, BatchedTensorInputs]]:
"""Group consecutive `MultiModalKwargsItem`s from `mm_kwargs` with the same
modality together into the same `MultiModalKwargs` instance.
@@ -452,8 +452,8 @@ def group_mm_kwargs_by_modality(
def fetch_audio(
audio_url: str,
audio_io_kwargs: Optional[dict[str, Any]] = None,
) -> tuple[np.ndarray, Union[int, float]]:
audio_io_kwargs: dict[str, Any] | None = None,
) -> tuple[np.ndarray, int | float]:
"""
Args:
audio_url: URL of the audio file to fetch.
@@ -466,7 +466,7 @@ def fetch_audio(
def fetch_image(
image_url: str,
image_io_kwargs: Optional[dict[str, Any]] = None,
image_io_kwargs: dict[str, Any] | None = None,
) -> Image.Image:
"""
Args:
@@ -480,7 +480,7 @@ def fetch_image(
def fetch_video(
video_url: str,
video_io_kwargs: Optional[dict[str, Any]] = None,
video_io_kwargs: dict[str, Any] | None = None,
) -> tuple[npt.NDArray, dict[str, Any]]:
"""
Args: