Skip to content

Commit e391053

Browse files
author
Kfir Wolfson
committed
fix ruff rejections
Signed-off-by: Kfir Wolfson <kfirw@pliops.com>
1 parent 729b12f commit e391053

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

requirements/test.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1224,7 +1224,6 @@ typeshed-client==2.8.2
12241224
# via jsonargparse
12251225
typing-extensions==4.15.0
12261226
# via
1227-
# aiosignal
12281227
# albumentations
12291228
# alembic
12301229
# chz

tests/v1/core/test_scheduler.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1279,7 +1279,7 @@ def test_cache_hit_threshold(
12791279
# number of blocks hit in external cache per request
12801280
request_external_hit_blocks: list[int],
12811281
# optional cache_hit_threshold for each request
1282-
request_thresholds: list[Optional[float]],
1282+
request_thresholds: list[float | None],
12831283
# bool per request indicating if it is expected to be scheduled
12841284
request_expected_scehduled: list[bool],
12851285
):
@@ -1326,7 +1326,7 @@ def test_cache_hit_threshold(
13261326

13271327
def _create_and_schedule_requests(
13281328
request_num_tokens: list[int],
1329-
request_thresholds: list[Optional[float]],
1329+
request_thresholds: list[float | None],
13301330
scheduler: Scheduler,
13311331
):
13321332
num_requests = len(request_num_tokens)
@@ -1373,7 +1373,7 @@ def _insert_to_local_cache(request_local_hit_blocks, scheduler: Scheduler):
13731373
scheduler.connector.get_num_new_matched_tokens.return_value = (0, False)
13741374

13751375
# set threshold to 0.0 to ensure all are scheduled
1376-
zero_thresholds: list[Optional[float]] = [0.0] * num_total_requests
1376+
zero_thresholds: list[float | None] = [0.0] * num_total_requests
13771377

13781378
# Only requests with local hits should run and populate the cache
13791379
# We create all requests to make sure the correct tokens are cached

vllm/entrypoints/logger.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ def log_inputs(
4646
)
4747

4848
logger.info(
49-
"Received request %s: params: %s, "
50-
"lora_request: %s ",
49+
"Received request %s: params: %s, lora_request: %s ",
5150
"cache_hit_threshold: %s.",
5251
request_id,
5352
params,

vllm/entrypoints/openai/protocol.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1308,7 +1308,7 @@ class CompletionRequest(OpenAIBaseModel):
13081308
default=None,
13091309
description="Minimum required KV-cache hit ratio to process the request.",
13101310
)
1311-
1311+
13121312
vllm_xargs: dict[str, str | int | float] | None = Field(
13131313
default=None,
13141314
description=(

vllm/v1/core/sched/scheduler.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,10 +428,11 @@ def schedule(self) -> SchedulerOutput:
428428
num_new_local_computed_tokens + num_external_computed_tokens
429429
)
430430
# Cache hit threshold in request overrides global setting
431+
scheduler_config = self.vllm_config.scheduler_config
431432
cache_hit_threshold = (
432433
request.cache_hit_threshold
433434
if request.cache_hit_threshold is not None
434-
else self.vllm_config.scheduler_config.global_cache_hit_threshold # noqa: E501
435+
else scheduler_config.global_cache_hit_threshold
435436
)
436437

437438
# Check if cache hit is above threshold

0 commit comments

Comments
 (0)