diff --git a/vllm/v1/core/sched/policy/normalized_scorer.py b/vllm/v1/core/sched/policy/normalized_scorer.py index 145bd57ba5329..6929c611d9475 100644 --- a/vllm/v1/core/sched/policy/normalized_scorer.py +++ b/vllm/v1/core/sched/policy/normalized_scorer.py @@ -99,5 +99,6 @@ class TimeAndLengthScorer(NormalizedScorer): ] super().__init__(dim_list) - def score(self, time: float, length: float) -> float: - return super().score(time, length) + def score(self, *dims: float) -> float: + assert len(dims) == 2 + return super().score(*dims) diff --git a/vllm/v1/core/sched/policy/weighted_score_softer.py b/vllm/v1/core/sched/policy/weighted_score_softer.py index b4cd54e30124e..3280a15c7a32b 100644 --- a/vllm/v1/core/sched/policy/weighted_score_softer.py +++ b/vllm/v1/core/sched/policy/weighted_score_softer.py @@ -2,9 +2,9 @@ # SPDX-FileCopyrightText: Copyright contributors to the vLLM project import time from functools import total_ordering +from typing import Any from vllm.v1.core.sched.policy.normalized_scorer import TimeAndLengthScorer -from typing import Optional, List, Any TimeAndLengthScorer_Instance = None @@ -24,7 +24,7 @@ class WeightedScoreSorter: self, request_length: int, request_arrival_time: float, - request_slo_requirement: Optional[List[Any]] = None, + request_slo_requirement: list[Any] | None = None, ): self.request_length = request_length self.request_arrival_time = request_arrival_time diff --git a/vllm/v1/core/sched/request_queue.py b/vllm/v1/core/sched/request_queue.py index 3d28fb3652c54..7cea8a881f0a7 100644 --- a/vllm/v1/core/sched/request_queue.py +++ b/vllm/v1/core/sched/request_queue.py @@ -221,7 +221,7 @@ class SJFRequestQueue(RequestQueue): def add_request(self, request: Request) -> None: """Add a request to the queue according to SJF policy.""" - assert request.prompt_token_ids is not None, "prompt_token_ids cannot be None for SJF scheduling." + assert request.prompt_token_ids is not None heapq.heappush( self._heap, (