Multiple request rates

Makefile

@@ -15,8 +15,8 @@ style:
 	isort src tests
 	flake8 src tests --max-line-length 88
 
-# test:
-#     pytest tests
+test:
+	python -m pytest -s -vvv --cache-clear tests/
 
 build:
 	python setup.py sdist bdist_wheel

setup.py

@@ -25,6 +25,7 @@ def _setup_long_description() -> Tuple[str, str]:
         'openai',
         'requests',
         'transformers',
+        'click'
     ],
     extras_require={
         'dev': [

src/guidellm/executor/__init__.py

@@ -3,7 +3,7 @@
     Profile,
     ProfileGenerationModes,
     ProfileGenerator,
-    SingleProfileGenerator,
+    FixedRateProfileGenerator,
     SweepProfileGenerator,
 )
 
@@ -12,6 +12,6 @@
     "ProfileGenerationModes",
     "Profile",
     "ProfileGenerator",
-    "SingleProfileGenerator",
+    "FixedRateProfileGenerator",
     "SweepProfileGenerator",
 ]

src/guidellm/executor/executor.py

@@ -14,13 +14,16 @@ def __init__(
         self,
         request_generator: RequestGenerator,
         backend: Backend,
-        profile_mode: Union[str, ProfileGenerationModes] = "single",
+        rate_type: str = "sweep",
         profile_args: Optional[Dict[str, Any]] = None,
         max_requests: Optional[int] = None,
         max_duration: Optional[float] = None,
     ):
         self.request_generator = request_generator
         self.backend = backend
+        profile_mode = "sweep"
+        if rate_type in {"synchronous", "constant", "poisson"}:
+            profile_mode = "fixed_rate"
         self.profile = ProfileGenerator.create_generator(
             profile_mode, **(profile_args or {})
         )

src/guidellm/executor/profile_generator.py

@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
 from enum import Enum
-from typing import Optional, Union
+from typing import List, Optional, Union
 
 import numpy
 
@@ -12,13 +12,17 @@
     "ProfileGenerationModes",
     "Profile",
     "ProfileGenerator",
-    "SingleProfileGenerator",
+    "FixedRateProfileGenerator",
     "SweepProfileGenerator",
 ]
 
+RateTypeLoadGenModeMap = {
+    "constant": LoadGenerationModes.CONSTANT,
+    "poisson": LoadGenerationModes.POISSON,
+}
 
 class ProfileGenerationModes(Enum):
-    SINGLE = "single"
+    FIXED = "fixed_rate"
     SWEEP = "sweep"
 
 
@@ -43,9 +47,11 @@ def inner_wrapper(wrapped_class):
     def create_generator(
         mode: Union[str, ProfileGenerationModes], **kwargs
     ) -> "ProfileGenerator":
-        if isinstance(mode, str):
-            mode = ProfileGenerationModes(mode)
-
+        mode_is_invalid = not isinstance(mode, str) or mode not in [m.value for m in ProfileGenerationModes]
+        if mode_is_invalid:
+            raise ValueError(f"Invalid profile generation mode: {mode}")
+        mode = ProfileGenerationModes(mode)
+
         if mode not in ProfileGenerator._registry:
             raise ValueError(f"Invalid profile generation mode: {mode}")
 
@@ -61,35 +67,41 @@ def next_profile(
         pass
 
 
-@ProfileGenerator.register_generator(ProfileGenerationModes.SINGLE)
-class SingleProfileGenerator(ProfileGenerator):
-    def __init__(self, rate: float, rate_type: str, **kwargs):
-        super().__init__(ProfileGenerationModes.SINGLE)
-        self._rate = rate
-        self._rate_type = rate_type
+@ProfileGenerator.register_generator(ProfileGenerationModes.FIXED)
+class FixedRateProfileGenerator(ProfileGenerator):
+    def __init__(self, rate_type: str, rate: Optional[List[float]] = None, **kwargs):
+        super().__init__(ProfileGenerationModes.FIXED)
+        if rate_type == "synchronous" and rate and len(rate) > 0:
+            raise ValueError("custom rates are not supported in synchronous mode")
+        self._rates = rate
+        self._rate_index = 0
         self._generated = False
+        self._rate_type = rate_type
 
     def next_profile(
         self, current_report: TextGenerationBenchmarkReport
     ) -> Optional[Profile]:
-        if self._generated:
-            return None
-
-        self._generated = True
-
-        if self._rate_type == "constant":
-            return Profile(
-                load_gen_mode=LoadGenerationModes.CONSTANT, load_gen_rate=self._rate
-            )
-
         if self._rate_type == "synchronous":
+            if self._generated:
+                return None
+
+            self._generated = True
+
             return Profile(
                 load_gen_mode=LoadGenerationModes.SYNCHRONOUS, load_gen_rate=None
             )
-
-        if self._rate_type == "poisson":
+
+        if self._rate_type in {"constant", "poisson"}:
+            if self._rate_index >= len(self._rates):
+                return None
+
+            current_rate = self._rates[self._rate_index]
+            self._rate_index += 1
+
+            load_gen_mode = RateTypeLoadGenModeMap[self._rate_type]
+
             return Profile(
-                load_gen_mode=LoadGenerationModes.POISSON, load_gen_rate=self._rate
+                load_gen_mode=load_gen_mode, load_gen_rate=current_rate
             )
 
         raise ValueError(f"Invalid rate type: {self._rate_type}")
@@ -151,4 +163,4 @@ def next_profile(
                 load_gen_mode=LoadGenerationModes.CONSTANT, load_gen_rate=rate
             )
 
-        return None
+        return None

src/guidellm/main.py

@@ -46,8 +46,9 @@
 @click.option(
     "--rate",
     type=float,
-    default="1.0",
+    default=[1.0],
     help="Rate to use for constant and poisson rate types",
+    multiple=True,
 )
 @click.option(
     "--num-seconds",
@@ -109,7 +110,7 @@ def main(
     executor = Executor(
         request_generator=request_generator,
         backend=backend,
-        profile_mode=rate_type,
+        rate_type=rate_type,
         profile_args={"rate_type": rate_type, "rate": rate},
         max_requests=num_requests,
         max_duration=num_seconds,

tests/unit/executor/test_executor.py

@@ -0,0 +1,17 @@
+from unittest.mock import MagicMock
+from src.guidellm.backend.base import Backend
+from src.guidellm.executor.executor import Executor
+from src.guidellm.request.base import RequestGenerator
+
+def test_executor_creation():
+  mock_request_generator = MagicMock(spec=RequestGenerator)
+  mock_backend = MagicMock(spec=Backend)
+  rate_type = "sweep"
+  profile_args = None
+  max_requests = None,
+  max_duration = None,
+  executor = Executor(mock_request_generator, mock_backend, rate_type, profile_args, max_requests, max_duration);
+  assert executor.request_generator == mock_request_generator
+  assert executor.backend == mock_backend
+  assert executor.max_requests == max_requests
+  assert executor.max_duration == max_duration

tests/unit/executor/test_profile_generator.py

@@ -0,0 +1,56 @@
+import pytest
+from unittest.mock import MagicMock
+from guidellm.executor import (ProfileGenerator, FixedRateProfileGenerator, SweepProfileGenerator)
+from src.guidellm.core.result import TextGenerationBenchmarkReport
+from src.guidellm.scheduler.load_generator import LoadGenerationModes
+
+def test_invalid_profile_generation_mode_error():
+  rate = [1]
+  rate_type = "constant"
+  profile_mode = "burst"
+  with pytest.raises(ValueError, match=f"Invalid profile generation mode: {profile_mode}"):
+    ProfileGenerator.create_generator(profile_mode, **({ "rate": rate, "rate_type": rate_type}))
+
+def test_sweep_profile_generator_creation():
+  profile_generator = ProfileGenerator.create_generator("sweep", **({}))
+  assert isinstance(profile_generator, SweepProfileGenerator)
+  assert profile_generator._sync_run == False
+  assert profile_generator._max_found == False
+  assert profile_generator._pending_rates == None
+  assert profile_generator._pending_rates == None
+
+def test_fixed_rate_profile_generator_creation():
+  rate = [1]
+  rate_type = "constant"
+  profile_generator = ProfileGenerator.create_generator("fixed_rate", **({ "rate": rate, "rate_type": rate_type}))
+  assert isinstance(profile_generator, FixedRateProfileGenerator)
+  assert profile_generator._rates == rate
+  assert profile_generator._rate_type == rate_type
+  assert profile_generator._rate_index == 0
+  assert profile_generator._rate_index == 0
+
+def test_synchronous_mode_rate_list_error():
+  rate = [1]
+  rate_type = "synchronous"
+  with pytest.raises(ValueError, match="custom rates are not supported in synchronous mode"):
+    ProfileGenerator.create_generator("fixed_rate", **({ "rate": rate, "rate_type": rate_type}))
+
+def test_next_profile_with_multiple_rates():
+  rates = [1, 2]
+  rate_type = "constant"
+  profile_generator = ProfileGenerator.create_generator("fixed_rate", **({ "rate": rates, "rate_type": rate_type}))
+  mock_report = MagicMock(spec=TextGenerationBenchmarkReport)
+  for rate in rates:
+    current_profile = profile_generator.next_profile(mock_report)
+    assert current_profile.load_gen_rate == rate
+    assert current_profile.load_gen_mode.name == LoadGenerationModes.CONSTANT.name
+  assert profile_generator.next_profile(mock_report) == None
+
+def test_next_profile_with_sync_mode():
+  rate_type = "synchronous"
+  profile_generator = ProfileGenerator.create_generator("fixed_rate", **({ "rate_type": rate_type}))
+  mock_report = MagicMock(spec=TextGenerationBenchmarkReport)
+  current_profile = profile_generator.next_profile(mock_report)
+  assert current_profile.load_gen_rate == None
+  assert current_profile.load_gen_mode.name == LoadGenerationModes.SYNCHRONOUS.name
+  assert profile_generator.next_profile(mock_report) == None