Skip to content

Commit 1d09d06

Browse files
committed
remove useless unit test
1 parent f3ec66e commit 1d09d06

4 files changed

Lines changed: 14 additions & 101 deletions

File tree

lmdeploy/serve/openai/api_server.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
TopLogprob,
8080
UpdateParamsRequest,
8181
UsageInfo,
82-
build_usage_info,
8382
)
8483
from lmdeploy.serve.openai.responses import create_responses_router
8584
from lmdeploy.serve.openai.utils import maybe_filter_parallel_tool_calls
@@ -585,7 +584,7 @@ async def completion_stream_generator() -> AsyncGenerator[str, None]:
585584
if request.return_logprob:
586585
output_token_logprobs = _create_output_token_logprobs(res.token_ids, res.logprobs)
587586
if res.finish_reason and include_usage:
588-
final_usage = build_usage_info(
587+
final_usage = UsageInfo.build(
589588
prompt_tokens=res.input_token_len,
590589
completion_tokens=res.generate_token_len,
591590
cached_tokens=res.cached_tokens,
@@ -722,7 +721,7 @@ async def completion_stream_generator() -> AsyncGenerator[str, None]:
722721
cache_block_ids = cache_block_ids[0]
723722
remote_token_ids = [remote_token_ids[0][-1]]
724723

725-
usage = build_usage_info(
724+
usage = UsageInfo.build(
726725
prompt_tokens=final_res.input_token_len,
727726
completion_tokens=final_res.generate_token_len,
728727
cached_tokens=final_res.cached_tokens,
@@ -916,7 +915,7 @@ async def completion_stream_generator() -> AsyncGenerator[str, None]:
916915
response_json['remote_token_ids'] = res.token_ids
917916
yield f'data: {json.dumps(response_json)}\n\n'
918917
if include_usage:
919-
final_usage = build_usage_info(
918+
final_usage = UsageInfo.build(
920919
prompt_tokens=prompt_tokens_acc,
921920
completion_tokens=completion_tokens_acc,
922921
cached_tokens=cached_tokens_acc,
@@ -975,7 +974,7 @@ async def _inner_call(i, generator, session):
975974
cached_tokens_acc += final_res.cached_tokens
976975

977976
await asyncio.gather(*[_inner_call(i, generators[i], sessions[i]) for i in range(len(generators))])
978-
usage = build_usage_info(
977+
usage = UsageInfo.build(
979978
prompt_tokens=prompt_tokens_acc,
980979
completion_tokens=completion_tokens_acc,
981980
cached_tokens=cached_tokens_acc,
@@ -1196,7 +1195,7 @@ async def pooling(request: PoolingRequest, raw_request: Request = None):
11961195

11971196
batch_scores = await async_engine.async_get_reward_score(input_ids)
11981197
prompt_tokens = sum(len(ids) for ids in input_ids)
1199-
usage = build_usage_info(prompt_tokens=prompt_tokens, completion_tokens=0, cached_tokens=0)
1198+
usage = UsageInfo.build(prompt_tokens=prompt_tokens, completion_tokens=0, cached_tokens=0)
12001199

12011200
data = []
12021201
for i, score in enumerate(batch_scores):

lmdeploy/serve/openai/protocol.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ class UsageInfo(BaseModel):
6363
completion_tokens: int | None = 0
6464
prompt_tokens_details: PromptTokensDetails | None = None
6565

66-
67-
def build_usage_info(prompt_tokens: int, completion_tokens: int, cached_tokens: int = 0) -> UsageInfo:
68-
"""Build OpenAI-compatible usage with prefix-cache details."""
69-
return UsageInfo(
70-
prompt_tokens=prompt_tokens,
71-
completion_tokens=completion_tokens,
72-
total_tokens=prompt_tokens + completion_tokens,
73-
prompt_tokens_details=PromptTokensDetails(cached_tokens=cached_tokens),
74-
)
66+
@classmethod
67+
def build(cls, prompt_tokens: int, completion_tokens: int, cached_tokens: int = 0) -> 'UsageInfo':
68+
"""Build OpenAI-compatible usage with prefix-cache details."""
69+
return cls(
70+
prompt_tokens=prompt_tokens,
71+
completion_tokens=completion_tokens,
72+
total_tokens=prompt_tokens + completion_tokens,
73+
prompt_tokens_details=PromptTokensDetails(cached_tokens=cached_tokens),
74+
)
7575

7676

7777
class Function(BaseModel):

tests/test_lmdeploy/serve/openai/test_usage_info.py

Lines changed: 0 additions & 20 deletions
This file was deleted.

tests/test_lmdeploy/test_prefix_cache_hit_tokens.py

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)