Skip to content

Commit dbc46a1

Browse files
authored
[Fix] update rate type (#1166)
* update rate type * update rate type
1 parent a336e04 commit dbc46a1

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

evalscope/perf/arguments.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class Arguments(BaseArgument):
6060
parallel: Union[int, List[int]] = 1
6161
"""Number of parallel requests."""
6262

63-
rate: int = -1
63+
rate: float = -1
6464
"""Rate limit for requests (default: -1, no limit)."""
6565

6666
sleep_interval: int = 5
@@ -304,7 +304,7 @@ def add_argument(parser: argparse.ArgumentParser):
304304
# Performance and parallelism
305305
parser.add_argument('-n', '--number', type=int, default=1000, nargs='+', help='How many requests to be made')
306306
parser.add_argument('--parallel', type=int, default=1, nargs='+', help='Set number of concurrency requests, default 1') # noqa: E501
307-
parser.add_argument('--rate', type=int, default=-1, help='Number of requests per second. default None')
307+
parser.add_argument('--rate', type=float, default=-1, help='Number of requests per second. default -1 means no rate limit') # noqa: E501
308308
parser.add_argument(
309309
'--sleep-interval', type=int, default=5, help='Sleep interval between performance runs, in seconds. Default 5') # noqa: E501
310310

evalscope/perf/utils/benchmark_util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def is_embedding_or_rerank_api(api_name: str) -> bool:
8383
@dataclass
8484
class BenchmarkMetrics:
8585
concurrency: int = 0
86-
rate: int = 0
86+
rate: float = 0.0
8787
n_succeed_queries: int = 0
8888
n_failed_queries: int = 0
8989
total_first_chunk_latency: float = 0.0

evalscope/perf/utils/rich_display.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def _analyze_results_embedding(all_results):
6868

6969
summary.append([
7070
str(int(concurrency)),
71-
str(int(rate)) if rate != -1 else 'INF',
71+
f'{rate:.2f}' if rate != -1 else 'INF',
7272
f'{rps:.2f}' if rps is not None else 'N/A',
7373
f'{avg_latency:.3f}' if avg_latency is not None else 'N/A',
7474
f'{p99_latency:.3f}' if p99_latency is not None else 'N/A',
@@ -87,7 +87,7 @@ def _analyze_results_embedding(all_results):
8787
continue
8888

8989
if summary:
90-
summary.sort(key=lambda x: (int(x[0]), int(x[1]) if x[1] != 'INF' else float('inf')))
90+
summary.sort(key=lambda x: (float(x[0]), float(x[1]) if x[1] != 'INF' else float('inf')))
9191

9292
return summary, total_tokens, total_time
9393

@@ -129,7 +129,7 @@ def _analyze_results_llm(all_results):
129129

130130
summary.append([
131131
str(int(concurrency)),
132-
str(int(rate)) if rate != -1 else 'INF',
132+
f'{rate:.2f}' if rate != -1 else 'INF',
133133
f'{rps:.2f}' if rps is not None else 'N/A',
134134
f'{avg_latency:.3f}' if avg_latency is not None else 'N/A',
135135
f'{p99_latency:.3f}' if p99_latency is not None else 'N/A',
@@ -150,7 +150,7 @@ def _analyze_results_llm(all_results):
150150
continue
151151

152152
if summary:
153-
summary.sort(key=lambda x: (int(x[0]), int(x[1]) if x[1] != 'INF' else float('inf')))
153+
summary.sort(key=lambda x: (float(x[0]), float(x[1]) if x[1] != 'INF' else float('inf')))
154154

155155
return summary, total_tokens, total_time
156156

0 commit comments

Comments
 (0)