Move rate string parsing into scenario

Author: sjmonson

src/guidellm/__main__.py

@@ -29,20 +29,6 @@ def parse_json(ctx, param, value):  # noqa: ARG001
         raise click.BadParameter(f"{param.name} must be a valid JSON string.") from err
 
 
-def parse_number_str(ctx, param, value):  # noqa: ARG001
-    if value is None:
-        return None
-
-    values = value.split(",") if "," in value else [value]
-
-    try:
-        return [float(val) for val in values]
-    except ValueError as err:
-        raise click.BadParameter(
-            f"{param.name} must be a number or comma-separated list of numbers."
-        ) from err
-
-
 def set_if_not_default(ctx: click.Context, **kwargs):
     """
     Set the value of a click option if it is not the default value.
@@ -159,7 +145,6 @@ def cli():
 @click.option(
     "--rate",
     default=GenerativeTextScenario.model_fields["rate"].default,
-    callback=parse_number_str,
     help=(
         "The rates to run the benchmark at. "
         "Can be a single number or a comma-separated list of numbers. "

src/guidellm/benchmark/scenario.py

@@ -1,11 +1,12 @@
 import json
 from collections.abc import Iterable
 from pathlib import Path
-from typing import Any, Literal, Optional, TypeVar, Union
+from typing import Annotated, Any, Literal, Optional, TypeVar, Union
 
 import yaml
 from datasets import Dataset, DatasetDict, IterableDataset, IterableDatasetDict
 from loguru import logger
+from pydantic import BeforeValidator
 from transformers.tokenization_utils_base import (  # type: ignore[import]
     PreTrainedTokenizerBase,
 )
@@ -17,6 +18,23 @@
 
 __ALL__ = ["Scenario", "GenerativeTextScenario"]
 
+
+def parse_float_list(value: Union[str, float, list[float]]) -> list[float]:
+    if isinstance(value, (int, float)):
+        return [value]
+    elif isinstance(value, list):
+        return value
+
+    values = value.split(",") if "," in value else [value]
+
+    try:
+        return [float(val) for val in values]
+    except ValueError as err:
+        raise ValueError(
+            "must be a number or comma-separated list of numbers."
+        ) from err
+
+
 T = TypeVar("T", bound="Scenario")
 
 
@@ -63,7 +81,7 @@ class Config:
     data_args: Optional[dict[str, Any]] = None
     data_sampler: Optional[Literal["random"]] = None
     rate_type: Union[StrategyType, ProfileType]
-    rate: Optional[Union[float, list[float]]] = None
+    rate: Annotated[Optional[list[float]], BeforeValidator(parse_float_list)] = None
     max_seconds: Optional[float] = None
     max_requests: Optional[int] = None
     warmup_percent: Optional[float] = None