Move scenario helper methods to base pydantic class

Author: sjmonson

src/guidellm/__main__.py

@@ -290,7 +290,7 @@ def benchmark(
             _scenario = GenerativeTextScenario.model_validate(overrides)
         else:
             # TODO: Support pre-defined scenarios
-            _scenario = GenerativeTextScenario.from_file(scenario, overrides)
+            _scenario = GenerativeTextScenario.from_file(Path(scenario), overrides)
     except ValidationError as e:
         errs = e.errors(include_url=False, include_context=True, include_input=True)
         param_name = "--" + str(errs[0]["loc"][0]).replace("_", "-")

src/guidellm/benchmark/scenario.py

@@ -1,11 +1,8 @@
-import json
 from collections.abc import Iterable
 from pathlib import Path
-from typing import Annotated, Any, Literal, Optional, TypeVar, Union
+from typing import Annotated, Any, Literal, Optional, Union
 
-import yaml
 from datasets import Dataset, DatasetDict, IterableDataset, IterableDatasetDict
-from loguru import logger
 from pydantic import BeforeValidator, Field, NonNegativeInt, PositiveFloat, PositiveInt
 from transformers.tokenization_utils_base import (  # type: ignore[import]
     PreTrainedTokenizerBase,
@@ -35,34 +32,9 @@ def parse_float_list(value: Union[str, float, list[float]]) -> list[float]:
         ) from err
 
 
-T = TypeVar("T", bound="Scenario")
-
-
 class Scenario(StandardBaseModel):
     target: str
 
-    @classmethod
-    def get_default(cls: type[T], field: str) -> Any:
-        """Get default values for model fields"""
-        return cls.model_fields[field].default
-
-    @classmethod
-    def from_file(
-        cls: type[T], filename: Union[str, Path], overrides: Optional[dict] = None
-    ) -> T:
-        try:
-            with open(filename) as f:
-                if str(filename).endswith(".yaml") or str(filename).endswith(".yml"):
-                    data = yaml.safe_load(f)
-                else:  # Assume everything else is json
-                    data = json.load(f)
-        except (json.JSONDecodeError, yaml.YAMLError) as e:
-            logger.error("Failed to parse scenario")
-            raise e
-
-        data.update(overrides)
-        return cls.model_validate(data)
-
 
 class GenerativeTextScenario(Scenario):
     # FIXME: This solves an issue with Pydantic and class types

src/guidellm/objects/pydantic.py

@@ -1,10 +1,14 @@
-from typing import Any, Generic, TypeVar
+import json
+from pathlib import Path
+from typing import Any, Generic, Optional, TypeVar
 
+import yaml
 from loguru import logger
 from pydantic import BaseModel, ConfigDict, Field
 
 __all__ = ["StandardBaseModel", "StatusBreakdown"]
 
+T = TypeVar("T", bound="StandardBaseModel")
 
 class StandardBaseModel(BaseModel):
     """
@@ -27,6 +31,28 @@ def __init__(self, /, **data: Any) -> None:
             data,
         )
 
+    @classmethod
+    def get_default(cls: type[T], field: str) -> Any:
+        """Get default values for model fields"""
+        return cls.model_fields[field].default
+
+    @classmethod
+    def from_file(
+        cls: type[T], filename: Path, overrides: Optional[dict] = None
+    ) -> T:
+        try:
+            with filename.open() as f:
+                if str(filename).endswith((".yaml", ".yml")):
+                    data = yaml.safe_load(f)
+                else:  # Assume everything else is json
+                    data = json.load(f)
+        except (json.JSONDecodeError, yaml.YAMLError) as e:
+            logger.error(f"Failed to parse {filename} as type {cls.__name__}")
+            raise e
+
+        data.update(overrides)
+        return cls.model_validate(data)
+
 
 SuccessfulT = TypeVar("SuccessfulT")
 ErroredT = TypeVar("ErroredT")