fixes after rebasing

Author: markurtz

src/guidellm/__init__.py

@@ -20,6 +20,7 @@
     hf_logging.set_verbosity_error()
     logging.getLogger("transformers").setLevel(logging.ERROR)
 
+from .logger import configure_logger, logger
 from .settings import (
     DatasetSettings,
     Environment,
@@ -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.settings 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/benchmark/aggregator.py

@@ -21,7 +21,6 @@
     GenerativeTextErrorStats,
     GenerativeTextResponseStats,
 )
-from guidellm.settings 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.settings 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.settings 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/request/loader.py

@@ -11,9 +11,9 @@
 from datasets import Dataset, DatasetDict, IterableDataset, IterableDatasetDict
 from transformers import PreTrainedTokenizerBase  # type: ignore[import]
 
-from guidellm.settings 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/constraints.py

@@ -16,13 +16,13 @@
 
 from pydantic import Field, field_validator
 
-from guidellm.settings import settings
 from guidellm.scheduler.objects import (
     ScheduledRequestInfo,
     SchedulerState,
     SchedulerUpdateAction,
     SchedulerUpdateActionProgress,
 )
+from guidellm.settings import settings
 from guidellm.utils import InfoMixin, RegistryMixin, StandardBaseModel
 
 __all__ = [

src/guidellm/scheduler/scheduler.py

@@ -13,14 +13,14 @@
 
 from loguru import logger
 
-from guidellm.settings import settings
 from guidellm.scheduler.objects import RequestT, ResponseT
 from guidellm.scheduler.strategy import SchedulingStrategy
 from guidellm.scheduler.worker import (
     RequestsWorker,
     WorkerProcessRequest,
     WorkerProcessResult,
 )
+from guidellm.settings import settings
 from guidellm.utils import StandardBaseDict
 
 __all__ = ["Scheduler"]

src/guidellm/utils/__init__.py

@@ -80,13 +80,6 @@
     "RunningStats",
     "SerializationTypesAlias",
     "Serializer",
-    "EndlessTextCreator",
-    "IntegerRangeSampler",
-    "Percentiles",
-    "PydanticClassRegistryMixin",
-    "RegistryMixin",
-    "ReloadableBaseModel",
-    "RunningStats",
     "SingletonMixin",
     "StandardBaseDict",
     "StandardBaseModel",
@@ -95,9 +88,6 @@
     "ThreadSafeSingletonMixin",
     "TimeRunningStats",
     "all_defined",
-    "ThreadSafeSingletonMixin",
-    "TimeRunningStats",
-    "all_defined",
     "check_load_processor",
     "clean_text",
     "filter_text",

tests/unit/presentation/test_injector.py

@@ -3,8 +3,8 @@
 import pytest
 from pydantic import BaseModel
 
-from guidellm.settings import settings
 from guidellm.presentation.injector import create_report, inject_data
+from guidellm.settings import settings
 
 
 class ExampleModel(BaseModel):