Skip to content

Commit 1903c0b

Browse files
[Frontend] Show progress bar for adding requests (#17525)
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
1 parent 86a1f67 commit 1903c0b

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

vllm/entrypoints/llm.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -462,10 +462,12 @@ def generate(
462462
self._validate_and_add_requests(
463463
prompts=parsed_prompts,
464464
params=sampling_params,
465+
use_tqdm=use_tqdm,
465466
lora_request=lora_request,
466467
prompt_adapter_request=prompt_adapter_request,
467468
guided_options=guided_options_request,
468-
priority=priority)
469+
priority=priority,
470+
)
469471

470472
outputs = self._run_engine(use_tqdm=use_tqdm)
471473
return self.engine_class.validate_outputs(outputs, RequestOutput)
@@ -957,6 +959,7 @@ def encode(
957959
self._validate_and_add_requests(
958960
prompts=parsed_prompts,
959961
params=pooling_params,
962+
use_tqdm=use_tqdm,
960963
lora_request=lora_request,
961964
tokenization_kwargs=tokenization_kwargs,
962965
prompt_adapter_request=prompt_adapter_request,
@@ -1127,6 +1130,7 @@ def _cross_encoding_score(
11271130
self._validate_and_add_requests(
11281131
prompts=parsed_prompts,
11291132
params=pooling_params,
1133+
use_tqdm=use_tqdm,
11301134
lora_request=lora_request,
11311135
prompt_adapter_request=prompt_adapter_request,
11321136
)
@@ -1332,6 +1336,8 @@ def _validate_and_add_requests(
13321336
prompts: Union[PromptType, Sequence[PromptType]],
13331337
params: Union[SamplingParams, Sequence[SamplingParams], PoolingParams,
13341338
Sequence[PoolingParams]],
1339+
*,
1340+
use_tqdm: bool,
13351341
lora_request: Optional[Union[Sequence[LoRARequest], LoRARequest]],
13361342
prompt_adapter_request: Optional[PromptAdapterRequest],
13371343
tokenization_kwargs: Optional[dict[str, Any]] = None,
@@ -1367,7 +1373,11 @@ def _validate_and_add_requests(
13671373
sp.output_kind = RequestOutputKind.FINAL_ONLY
13681374

13691375
# Add requests to the engine.
1370-
for i, prompt in enumerate(prompts):
1376+
it = prompts
1377+
if use_tqdm:
1378+
it = tqdm(it, desc="Adding requests")
1379+
1380+
for i, prompt in enumerate(it):
13711381
self._add_request(
13721382
prompt,
13731383
params[i] if isinstance(params, Sequence) else params,

0 commit comments

Comments
 (0)