[CI] Ignore ruff D209, rejoin the docstrings it split, and silence incompatible-rule warnings (#57212)
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com> Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5
parent
1085b64425
commit
651a88c09a
@@ -54,8 +54,7 @@ def test_audio_media_io_load_base64(dummy_audio_bytes):
|
||||
def test_audio_media_io_load_base64_rejects_malformed(dummy_audio_bytes):
|
||||
"""Malformed base64 must surface as a ValueError so the server answers 400.
|
||||
Without strict decoding the bad characters are dropped, the garbage reaches
|
||||
libsndfile, and the client gets a 500 instead.
|
||||
"""
|
||||
libsndfile, and the client gets a 500 instead."""
|
||||
encoded = base64.b64encode(dummy_audio_bytes).decode("utf-8")
|
||||
malformed = encoded[:8] + "!!!@@@###" + encoded[8:]
|
||||
|
||||
@@ -134,8 +133,7 @@ def test_small_file_passes_memory_guard():
|
||||
|
||||
def test_memory_guard_rejects_large_allocation():
|
||||
"""A file whose frames*channels*4 exceeds the byte limit must be
|
||||
rejected before allocating the buffer.
|
||||
"""
|
||||
rejected before allocating the buffer."""
|
||||
# 100_000 frames * 8 channels * 4 bytes = 3.2 MB
|
||||
payload = _make_flac_bytes(frames=100_000, channels=8, samplerate=48000)
|
||||
# Set limit to 1 MiB — should reject
|
||||
@@ -150,8 +148,7 @@ def test_memory_guard_rejects_large_allocation():
|
||||
|
||||
def test_forged_samplerate_rejected_by_memory_guard():
|
||||
"""The PoC scenario: high sample rate fools the duration guard but
|
||||
the memory guard catches the large frame*channel allocation.
|
||||
"""
|
||||
the memory guard catches the large frame*channel allocation."""
|
||||
# Forged high sample rate: 655350 Hz, 8 channels, 1M frames
|
||||
# Duration guard sees: 1_000_000 / 655_350 = 1.5s → passes
|
||||
# Memory: 1_000_000 * 8 * 4 = 32 MB
|
||||
@@ -212,8 +209,7 @@ def test_load_audio_unknown_backend_rejected(dummy_audio_bytes):
|
||||
|
||||
def test_load_audio_auto_falls_back_without_torchcodec(dummy_audio_bytes):
|
||||
"""`auto` must fall back to the soundfile → PyAV chain when torchcodec
|
||||
is not importable.
|
||||
"""
|
||||
is not importable."""
|
||||
ref_audio, ref_sr = load_audio_soundfile(BytesIO(dummy_audio_bytes), sr=None)
|
||||
with patch.object(audio_module, "load_audio_torchcodec", side_effect=ImportError):
|
||||
audio, sr = load_audio(BytesIO(dummy_audio_bytes), sr=None, backend="auto")
|
||||
@@ -223,8 +219,7 @@ def test_load_audio_auto_falls_back_without_torchcodec(dummy_audio_bytes):
|
||||
|
||||
def test_load_audio_auto_falls_back_without_ffmpeg(dummy_audio_bytes):
|
||||
"""Torchcodec installed but system ffmpeg missing (`AudioDecoder is None`)
|
||||
must surface as ImportError so `auto` falls back to soundfile → PyAV.
|
||||
"""
|
||||
must surface as ImportError so `auto` falls back to soundfile → PyAV."""
|
||||
ref_audio, ref_sr = load_audio_soundfile(BytesIO(dummy_audio_bytes), sr=None)
|
||||
with patch.object(audio_module, "AudioDecoder", None):
|
||||
with pytest.raises(ImportError, match="torchcodec audio backend"):
|
||||
@@ -239,8 +234,7 @@ def test_load_audio_auto_falls_back_when_libtorchcodec_unloadable(
|
||||
):
|
||||
"""Torchcodec loads its ffmpeg-backed core lazily at decoder construction;
|
||||
a "Could not load libtorchcodec" RuntimeError there (no system ffmpeg)
|
||||
must also surface as ImportError so `auto` falls back.
|
||||
"""
|
||||
must also surface as ImportError so `auto` falls back."""
|
||||
|
||||
class _UnloadableDecoder:
|
||||
def __init__(self, *args, **kwargs):
|
||||
|
||||
@@ -228,8 +228,7 @@ async def test_fetch_image_local_files_with_space_in_name(image_url: str):
|
||||
@pytest.mark.asyncio
|
||||
async def test_fetch_image_data_url_with_params():
|
||||
"""RFC 2397 allows parameters between the mediatype and the base64
|
||||
marker; they must not be rejected or leak into the media type.
|
||||
"""
|
||||
marker; they must not be rejected or leak into the media type."""
|
||||
connector = MediaConnector()
|
||||
|
||||
image = Image.new("RGB", (4, 4), color=(255, 0, 0))
|
||||
|
||||
@@ -398,8 +398,7 @@ def test_pynvvideocodec_unrelated_error_propagates(
|
||||
|
||||
class TestMergeKwargsGpuBackendPolicy:
|
||||
"""Verify that merge_kwargs blocks request-level GPU backend selection
|
||||
when the static (engine-level) config did not configure that backend.
|
||||
"""
|
||||
when the static (engine-level) config did not configure that backend."""
|
||||
|
||||
def test_pynvvideocodec_requires_gpu(self):
|
||||
assert VIDEO_LOADER_REGISTRY.backend_requires_gpu(PYNVVIDEOCODEC_VIDEO_BACKEND)
|
||||
@@ -492,8 +491,7 @@ class TestMergeKwargsGpuBackendPolicy:
|
||||
|
||||
def test_static_pynv_with_different_runtime_gpu_backend(self):
|
||||
"""If static sets pynv via video_backend but runtime tries to set it
|
||||
via the codec-level 'backend' key (without a static match), strip it.
|
||||
"""
|
||||
via the codec-level 'backend' key (without a static match), strip it."""
|
||||
result = VideoMediaIO.merge_kwargs(
|
||||
default_kwargs={"video_backend": "pynvvideocodec"},
|
||||
runtime_kwargs={"backend": "pynvvideocodec"},
|
||||
@@ -532,8 +530,7 @@ class TestMergeKwargsGpuBackendPolicy:
|
||||
def test_strips_request_level_device(self):
|
||||
"""The decode device is a startup-only knob: a request must not move
|
||||
decoding onto the GPU when the startup config did not opt in, nor off
|
||||
it when it did.
|
||||
"""
|
||||
it when it did."""
|
||||
result = VideoMediaIO.merge_kwargs(
|
||||
default_kwargs={"backend": "torchcodec"},
|
||||
runtime_kwargs={"device": "cuda"},
|
||||
@@ -558,8 +555,7 @@ class TestMergeKwargsGpuBackendPolicy:
|
||||
def test_switching_backend_drops_stale_codec_options(default_kwargs):
|
||||
"""Codec-specific options from the static config must not leak into a
|
||||
different codec backend selected per-request, where they would fail the
|
||||
new backend's option validation.
|
||||
"""
|
||||
new backend's option validation."""
|
||||
result = VideoMediaIO.merge_kwargs(
|
||||
default_kwargs={**default_kwargs, "num_frames": 8},
|
||||
runtime_kwargs={"backend": "opencv"},
|
||||
@@ -581,8 +577,7 @@ def test_pynvvc_frames_normalized_to_nhwc(layout: str):
|
||||
"""PyNvVideoCodec frame batches are normalized to NHWC regardless of the
|
||||
per-frame layout the decoder emits (it has varied across versions), so the
|
||||
HF video processors (which materialize a PIL image per frame) receive the
|
||||
same NHWC shape as every other video backend.
|
||||
"""
|
||||
same NHWC shape as every other video backend."""
|
||||
torch = pytest.importorskip("torch")
|
||||
|
||||
n, h, w, c = 4, 5, 6, 3
|
||||
|
||||
@@ -141,8 +141,7 @@ def test_hash_collision_video_num_frames():
|
||||
|
||||
def test_hash_video_tensor_frames():
|
||||
"""Videos holding tensor frames (e.g. NVDEC-decoded) hash like
|
||||
array-framed ones, from the original bytes without a D2H copy.
|
||||
"""
|
||||
array-framed ones, from the original bytes without a D2H copy."""
|
||||
source = b"x" * 100
|
||||
|
||||
def item_for_hash(frames):
|
||||
|
||||
@@ -80,8 +80,7 @@ def test_l_mode_no_trns_to_rgb():
|
||||
|
||||
def test_exif_transpose_normalizes_orientation():
|
||||
"""Image with EXIF orientation 3 (180-degree rotation) should be
|
||||
normalized so pixel data matches visual display.
|
||||
"""
|
||||
normalized so pixel data matches visual display."""
|
||||
# Built synthetically because the existing assets are PNGs which
|
||||
# don't carry EXIF orientation metadata; we need a JPEG with an
|
||||
# injected EXIF orientation=3 tag.
|
||||
|
||||
@@ -59,8 +59,7 @@ def test_frame_size_hwc_chw(frame):
|
||||
def test_video_with_metadata_tensor_passthrough():
|
||||
"""Tensor frames pass through unchanged regardless of device: HF video
|
||||
processors accept tensors, and device-resident frames (e.g. NVDEC-decoded)
|
||||
must not be copied back to host.
|
||||
"""
|
||||
must not be copied back to host."""
|
||||
frames = torch.zeros((4, H, W, 3), dtype=torch.uint8)
|
||||
video, metadata = MultiModalDataParser()._get_video_with_metadata(frames)
|
||||
|
||||
@@ -71,8 +70,7 @@ def test_video_with_metadata_tensor_passthrough():
|
||||
@pytest.mark.skipif(not torch.cuda.is_available(), reason="Requires CUDA")
|
||||
def test_video_with_metadata_keeps_device_tensor():
|
||||
"""Device-resident frames (e.g. NVDEC-decoded) pass through as tensors,
|
||||
so a device-side HF processor can consume them without a D2H copy.
|
||||
"""
|
||||
so a device-side HF processor can consume them without a D2H copy."""
|
||||
frames = torch.zeros((4, H, W, 3), dtype=torch.uint8, device="cuda")
|
||||
video, metadata = MultiModalDataParser()._get_video_with_metadata(frames)
|
||||
|
||||
|
||||
@@ -57,8 +57,7 @@ def test_dummy_inputs_scheduler_budget(
|
||||
@pytest.mark.core_model
|
||||
def test_supports_multimodal_inputs(model_id, limit_mm_per_prompt, expected):
|
||||
"""Test supports_multimodal_inputs returns correct boolean for various
|
||||
configs.
|
||||
"""
|
||||
configs."""
|
||||
ctx = build_model_context(
|
||||
model_id,
|
||||
limit_mm_per_prompt=limit_mm_per_prompt,
|
||||
|
||||
@@ -231,8 +231,7 @@ def test_group_and_batch_mm_items_splits_shared_data_by_dtype():
|
||||
|
||||
def test_encode_image_url_uncommon_format_has_valid_mimetype():
|
||||
"""A format missing from mimetypes.types_map must still produce a
|
||||
well-formed type/subtype media type, not a bare 'image'.
|
||||
"""
|
||||
well-formed type/subtype media type, not a bare 'image'."""
|
||||
# ".tga" is not registered in mimetypes.types_map, so it exercises the
|
||||
# fallback path; Pillow can still encode it.
|
||||
url = encode_image_url(Image.new("RGB", (2, 2)), format="TGA")
|
||||
|
||||
@@ -1214,8 +1214,7 @@ def test_torchcodec_backend_rejects_frame_recovery(dummy_video_path):
|
||||
@pytest.mark.skipif(not current_platform.is_cuda(), reason="Requires CUDA")
|
||||
def test_torchcodec_backend_cuda_decodes_on_gpu(dummy_video_path):
|
||||
"""With device="cuda", torchcodec decodes via NVDEC and keeps the frames
|
||||
on the GPU instead of returning a host-side numpy array.
|
||||
"""
|
||||
on the GPU instead of returning a host-side numpy array."""
|
||||
pytest.importorskip("torchcodec")
|
||||
|
||||
with open(dummy_video_path, "rb") as f:
|
||||
@@ -1508,8 +1507,7 @@ def test_glm46v_duration_estimation_from_fps():
|
||||
class TestGLMGASamplingCaps:
|
||||
"""Regression tests for GHSA-58v5-2m8f-94pr: request-controlled fps
|
||||
and max_frames must not create intermediate allocations larger than
|
||||
the actual frame count.
|
||||
"""
|
||||
the actual frame count."""
|
||||
|
||||
@staticmethod
|
||||
def _source(
|
||||
@@ -1563,8 +1561,7 @@ def test_glm5next_backend_selected_for_processor():
|
||||
"""Glm5NextVideoProcessor maps to the glm5next loader so only the
|
||||
sampled frames are decoded instead of the whole container. Both the
|
||||
borrowed-config spelling and the dedicated Glm5next class name (landing
|
||||
with the new checkpoint) must resolve.
|
||||
"""
|
||||
with the new checkpoint) must resolve."""
|
||||
for name in ("Glm5NextVideoProcessor", "Glm5nextVideoProcessor"):
|
||||
assert VIDEO_LOADER_REGISTRY.get_backend_for_video_processor(name) == "glm5next"
|
||||
|
||||
@@ -1586,8 +1583,7 @@ def test_glm5next_backend_indices_match_sampler(
|
||||
total_frames, original_fps, duration, fps, max_frames
|
||||
):
|
||||
"""The loader must select exactly the frames the processor's sampler
|
||||
would, with target.fps mapping onto the raw-fps override.
|
||||
"""
|
||||
would, with target.fps mapping onto the raw-fps override."""
|
||||
from vllm.transformers_utils.processors.glm5next import (
|
||||
glm_sample_frame_indices,
|
||||
)
|
||||
@@ -1615,8 +1611,7 @@ def test_glm5next_backend_indices_match_sampler(
|
||||
|
||||
def test_glm5next_backend_metadata_contract():
|
||||
"""create_hf_metadata reports the subset so the processor skips
|
||||
re-sampling (do_sample_frames=False) and keeps the original totals.
|
||||
"""
|
||||
re-sampling (do_sample_frames=False) and keeps the original totals."""
|
||||
source = VideoSourceMetadata(total_frames_num=900, original_fps=30.0, duration=30.0)
|
||||
target = VideoTargetMetadata(num_frames=-1, fps=-1, max_duration=-1)
|
||||
indices = Glm5NextVideoBackend.compute_frames_index_to_sample(source, target)
|
||||
@@ -1645,8 +1640,7 @@ def test_glm5next_backend_metadata_contract():
|
||||
|
||||
def _write_gray_video(tmp_path, total_frames, fps, size=(32, 32)):
|
||||
"""Synthetic clip whose frame i is flat gray level i (near-lossless under
|
||||
mp4v), so a decoded frame's level maps back to its source index.
|
||||
"""
|
||||
mp4v), so a decoded frame's level maps back to its source index."""
|
||||
cv2 = pytest.importorskip("cv2")
|
||||
|
||||
path = tmp_path / f"gray_{total_frames}_{fps}.mp4"
|
||||
@@ -1687,8 +1681,7 @@ class _CountingCap:
|
||||
def test_glm5next_backend_codec_parity(tmp_path, backend):
|
||||
"""Every codec samples the same GLM indices and decodes the same
|
||||
frames; the OpenCV seek reader and torchcodec batched index-exact decode
|
||||
must agree.
|
||||
"""
|
||||
must agree."""
|
||||
if backend == "torchcodec":
|
||||
pytest.importorskip("torchcodec")
|
||||
|
||||
@@ -1718,8 +1711,7 @@ def test_glm5next_backend_codec_parity(tmp_path, backend):
|
||||
|
||||
def test_glm5next_backend_decodes_only_sampled_frames(tmp_path):
|
||||
"""End to end over a synthetic clip: load_bytes returns exactly the
|
||||
sampler's frame count, with the right frame content at each index.
|
||||
"""
|
||||
sampler's frame count, with the right frame content at each index."""
|
||||
pytest.importorskip("cv2")
|
||||
|
||||
total_frames, fps = 60, 10
|
||||
@@ -1745,8 +1737,7 @@ def test_glm5next_backend_decodes_only_sampled_frames(tmp_path):
|
||||
|
||||
def test_glm5next_read_frames_seeks_past_large_gaps(tmp_path):
|
||||
"""Sparse targets must not walk the container: the stock reader grabs
|
||||
every frame up to the last index; the GLM reader seeks instead.
|
||||
"""
|
||||
every frame up to the last index; the GLM reader seeks instead."""
|
||||
cv2 = pytest.importorskip("cv2")
|
||||
|
||||
total_frames, fps = 200, 10
|
||||
@@ -1773,8 +1764,7 @@ def test_glm5next_read_frames_seeks_past_large_gaps(tmp_path):
|
||||
|
||||
def test_glm5next_read_frames_dense_walk_matches_stock(tmp_path):
|
||||
"""Dense targets keep the sequential walk (seeking would be slower) and
|
||||
return the same frames as the stock reader.
|
||||
"""
|
||||
return the same frames as the stock reader."""
|
||||
cv2 = pytest.importorskip("cv2")
|
||||
|
||||
total_frames, fps = 120, 10
|
||||
|
||||
Reference in New Issue
Block a user