Scheduler refactor [scheduler]: constraints, objects, and strategies

src/guidellm/__init__.py

@@ -20,7 +20,8 @@
     hf_logging.set_verbosity_error()
     logging.getLogger("transformers").setLevel(logging.ERROR)
 
-from .config import (
+from .logger import configure_logger, logger
+from .settings import (
     DatasetSettings,
     Environment,
     LoggingSettings,
@@ -30,7 +31,6 @@
     reload_settings,
     settings,
 )
-from .logger import configure_logger, logger
 
 __all__ = [
     "DatasetSettings",

src/guidellm/__main__.py

@@ -13,9 +13,9 @@
 )
 from guidellm.benchmark.entrypoints import benchmark_with_scenario
 from guidellm.benchmark.scenario import GenerativeTextScenario, get_builtin_scenarios
-from guidellm.config import print_config
 from guidellm.preprocess.dataset import ShortPromptStrategy, process_dataset
 from guidellm.scheduler import StrategyType
+from guidellm.settings import print_config
 from guidellm.utils import DefaultGroupHandler
 from guidellm.utils import cli as cli_tools
 

src/guidellm/backend/backend.py

@@ -7,7 +7,7 @@
 from PIL import Image
 
 from guidellm.backend.response import ResponseSummary, StreamingTextResponse
-from guidellm.config import settings
+from guidellm.settings import settings
 
 __all__ = [
     "Backend",

src/guidellm/backend/openai.py

@@ -16,7 +16,7 @@
     ResponseSummary,
     StreamingTextResponse,
 )
-from guidellm.config import settings
+from guidellm.settings import settings
 
 __all__ = [
     "CHAT_COMPLETIONS",

src/guidellm/backend/response.py

@@ -2,7 +2,7 @@
 
 from pydantic import computed_field
 
-from guidellm.config import settings
+from guidellm.settings import settings
 from guidellm.utils import StandardBaseModel
 
 __all__ = [

src/guidellm/benchmark/aggregator.py

@@ -21,7 +21,6 @@
     GenerativeTextErrorStats,
     GenerativeTextResponseStats,
 )
-from guidellm.config import settings
 from guidellm.request import (
     GenerationRequest,
     GenerativeRequestLoaderDescription,
@@ -34,6 +33,7 @@
     SchedulerRequestResult,
     WorkerDescription,
 )
+from guidellm.settings import settings
 from guidellm.utils import (
     RunningStats,
     StandardBaseModel,

src/guidellm/benchmark/output.py

@@ -20,10 +20,10 @@
     SweepProfile,
     ThroughputProfile,
 )
-from guidellm.config import settings
 from guidellm.presentation import UIDataBuilder
 from guidellm.presentation.injector import create_report
 from guidellm.scheduler import strategy_display_str
+from guidellm.settings import settings
 from guidellm.utils import (
     Colors,
     DistributionSummary,

src/guidellm/benchmark/profile.py

@@ -4,7 +4,6 @@
 import numpy as np
 from pydantic import Field, computed_field
 
-from guidellm.config import settings
 from guidellm.scheduler import (
     AsyncConstantStrategy,
     AsyncPoissonStrategy,
@@ -14,6 +13,7 @@
     SynchronousStrategy,
     ThroughputStrategy,
 )
+from guidellm.settings import settings
 from guidellm.utils import StandardBaseModel
 
 __all__ = [

src/guidellm/logger.py

@@ -41,7 +41,7 @@
 
 from loguru import logger
 
-from guidellm.config import LoggingSettings, settings
+from guidellm.settings import LoggingSettings, settings
 
 __all__ = ["configure_logger", "logger"]
 

src/guidellm/presentation/injector.py

@@ -4,7 +4,7 @@
 
 from loguru import logger
 
-from guidellm.config import settings
+from guidellm.settings import settings
 from guidellm.utils.text import load_text
 
 

src/guidellm/request/loader.py

@@ -11,9 +11,9 @@
 from datasets import Dataset, DatasetDict, IterableDataset, IterableDatasetDict
 from transformers import PreTrainedTokenizerBase  # type: ignore[import]
 
-from guidellm.config import settings
 from guidellm.dataset import ColumnInputTypes, load_dataset
 from guidellm.request.request import GenerationRequest
+from guidellm.settings import settings
 from guidellm.utils import StandardBaseModel
 
 __all__ = [

src/guidellm/scheduler/__init__.py

@@ -1,21 +1,46 @@
-from .result import (
-    SchedulerRequestInfo,
-    SchedulerRequestResult,
-    SchedulerResult,
-    SchedulerRunInfo,
+from .constraints import (
+    Constraint,
+    ConstraintInitializer,
+    ConstraintsInitializerFactory,
+    MaxDurationConstraint,
+    MaxErrorRateConstraint,
+    MaxErrorsConstraint,
+    MaxGlobalErrorRateConstraint,
+    MaxNumberConstraint,
+    PydanticConstraintInitializer,
+    SerializableConstraintInitializer,
+    UnserializableConstraintInitializer,
+)
+from .objects import (
+    BackendInterface,
+    BackendT,
+    MeasuredRequestTimings,
+    MeasuredRequestTimingsT,
+    MultiTurnRequestT,
+    RequestSchedulerTimings,
+    RequestT,
+    ResponseT,
+    ScheduledRequestInfo,
+    SchedulerState,
+    SchedulerUpdateAction,
+    SchedulerUpdateActionProgress,
 )
 from .scheduler import Scheduler
 from .strategy import (
     AsyncConstantStrategy,
     AsyncPoissonStrategy,
     ConcurrentStrategy,
+    ConstantRateRequestTimings,
+    LastCompletionRequestTimings,
+    NoDelayRequestTimings,
+    PoissonRateRequestTimings,
+    ScheduledRequestTimings,
     SchedulingStrategy,
+    StrategyT,
     StrategyType,
     SynchronousStrategy,
     ThroughputStrategy,
-    strategy_display_str,
 )
-from .types import RequestT, ResponseT
 from .worker import (
     GenerativeRequestsWorker,
     GenerativeRequestsWorkerDescription,
@@ -29,24 +54,46 @@
 __all__ = [
     "AsyncConstantStrategy",
     "AsyncPoissonStrategy",
+    "BackendInterface",
+    "BackendT",
     "ConcurrentStrategy",
+    "ConstantRateRequestTimings",
+    "Constraint",
+    "ConstraintInitializer",
+    "ConstraintsInitializerFactory",
     "GenerativeRequestsWorker",
     "GenerativeRequestsWorkerDescription",
+    "LastCompletionRequestTimings",
+    "MaxDurationConstraint",
+    "MaxErrorRateConstraint",
+    "MaxErrorsConstraint",
+    "MaxGlobalErrorRateConstraint",
+    "MaxNumberConstraint",
+    "MeasuredRequestTimings",
+    "MeasuredRequestTimingsT",
+    "MultiTurnRequestT",
+    "NoDelayRequestTimings",
+    "PoissonRateRequestTimings",
+    "PydanticConstraintInitializer",
+    "RequestSchedulerTimings",
     "RequestT",
     "RequestsWorker",
     "ResolveStatus",
     "ResponseT",
+    "ScheduledRequestInfo",
+    "ScheduledRequestTimings",
     "Scheduler",
-    "SchedulerRequestInfo",
-    "SchedulerRequestResult",
-    "SchedulerResult",
-    "SchedulerRunInfo",
+    "SchedulerState",
+    "SchedulerUpdateAction",
+    "SchedulerUpdateActionProgress",
     "SchedulingStrategy",
+    "SerializableConstraintInitializer",
+    "StrategyT",
     "StrategyType",
     "SynchronousStrategy",
     "ThroughputStrategy",
+    "UnserializableConstraintInitializer",
     "WorkerDescription",
     "WorkerProcessRequest",
     "WorkerProcessResult",
-    "strategy_display_str",
 ]