Scheduler refactor: base/main PR for final merge

pyproject.toml

@@ -37,6 +37,7 @@ keywords = [
     "inference",
     "language-models",
     "large-language-model",
+    "load-generation",
     "llm",
     "machine-learning",
     "model-benchmark",

src/guidellm/backend/response.py

@@ -3,7 +3,7 @@
 from pydantic import computed_field
 
 from guidellm.config import settings
-from guidellm.objects.pydantic import StandardBaseModel
+from guidellm.utils import StandardBaseModel
 
 __all__ = [
     "RequestArgs",

src/guidellm/benchmark/aggregator.py

@@ -22,12 +22,6 @@
     GenerativeTextResponseStats,
 )
 from guidellm.config import settings
-from guidellm.objects import (
-    RunningStats,
-    StandardBaseModel,
-    StatusBreakdown,
-    TimeRunningStats,
-)
 from guidellm.request import (
     GenerationRequest,
     GenerativeRequestLoaderDescription,
@@ -40,7 +34,13 @@
     SchedulerRequestResult,
     WorkerDescription,
 )
-from guidellm.utils import check_load_processor
+from guidellm.utils import (
+    RunningStats,
+    StandardBaseModel,
+    StatusBreakdown,
+    TimeRunningStats,
+    check_load_processor,
+)
 
 __all__ = [
     "AggregatorT",

src/guidellm/benchmark/benchmark.py

@@ -12,11 +12,6 @@
     SynchronousProfile,
     ThroughputProfile,
 )
-from guidellm.objects import (
-    StandardBaseModel,
-    StatusBreakdown,
-    StatusDistributionSummary,
-)
 from guidellm.request import (
     GenerativeRequestLoaderDescription,
     RequestLoaderDescription,
@@ -32,6 +27,11 @@
     ThroughputStrategy,
     WorkerDescription,
 )
+from guidellm.utils import (
+    StandardBaseModel,
+    StatusBreakdown,
+    StatusDistributionSummary,
+)
 
 __all__ = [
     "Benchmark",

src/guidellm/benchmark/benchmarker.py

@@ -22,7 +22,6 @@
 )
 from guidellm.benchmark.benchmark import BenchmarkArgs, GenerativeBenchmark
 from guidellm.benchmark.profile import Profile
-from guidellm.objects import StandardBaseModel
 from guidellm.request import (
     GenerationRequest,
     GenerativeRequestLoaderDescription,
@@ -37,6 +36,7 @@
     SchedulerRequestResult,
     SchedulingStrategy,
 )
+from guidellm.utils import StandardBaseModel
 
 __all__ = ["Benchmarker", "BenchmarkerResult", "GenerativeBenchmarker"]
 

src/guidellm/benchmark/output.py

@@ -21,15 +21,16 @@
     ThroughputProfile,
 )
 from guidellm.config import settings
-from guidellm.objects import (
+from guidellm.presentation import UIDataBuilder
+from guidellm.presentation.injector import create_report
+from guidellm.scheduler import strategy_display_str
+from guidellm.utils import (
+    Colors,
     DistributionSummary,
     StandardBaseModel,
     StatusDistributionSummary,
+    split_text_list_by_length,
 )
-from guidellm.presentation import UIDataBuilder
-from guidellm.presentation.injector import create_report
-from guidellm.scheduler import strategy_display_str
-from guidellm.utils import Colors, split_text_list_by_length
 
 __all__ = [
     "GenerativeBenchmarksConsole",

src/guidellm/benchmark/profile.py

@@ -5,7 +5,6 @@
 from pydantic import Field, computed_field
 
 from guidellm.config import settings
-from guidellm.objects import StandardBaseModel
 from guidellm.scheduler import (
     AsyncConstantStrategy,
     AsyncPoissonStrategy,
@@ -15,6 +14,7 @@
     SynchronousStrategy,
     ThroughputStrategy,
 )
+from guidellm.utils import StandardBaseModel
 
 __all__ = [
     "AsyncProfile",

src/guidellm/benchmark/scenario.py

@@ -11,8 +11,8 @@
 
 from guidellm.backend.backend import BackendType
 from guidellm.benchmark.profile import ProfileType
-from guidellm.objects.pydantic import StandardBaseModel
 from guidellm.scheduler.strategy import StrategyType
+from guidellm.utils import StandardBaseModel
 
 __ALL__ = ["Scenario", "GenerativeTextScenario", "get_builtin_scenarios"]
 

src/guidellm/presentation/data_models.py

@@ -8,7 +8,7 @@
 if TYPE_CHECKING:
     from guidellm.benchmark.benchmark import GenerativeBenchmark
 
-from guidellm.objects.statistics import DistributionSummary
+from guidellm.utils.statistics import DistributionSummary
 
 
 class Bucket(BaseModel):

src/guidellm/request/loader.py

@@ -13,8 +13,8 @@
 
 from guidellm.config import settings
 from guidellm.dataset import ColumnInputTypes, load_dataset
-from guidellm.objects import StandardBaseModel
 from guidellm.request.request import GenerationRequest
+from guidellm.utils import StandardBaseModel
 
 __all__ = [
     "GenerativeRequestLoader",

src/guidellm/request/request.py

@@ -3,7 +3,7 @@
 
 from pydantic import Field
 
-from guidellm.objects.pydantic import StandardBaseModel
+from guidellm.utils import StandardBaseModel
 
 __all__ = ["GenerationRequest"]
 

src/guidellm/scheduler/result.py

@@ -4,9 +4,9 @@
     Optional,
 )
 
-from guidellm.objects import StandardBaseModel
 from guidellm.scheduler.strategy import SchedulingStrategy
 from guidellm.scheduler.types import RequestT, ResponseT
+from guidellm.utils import StandardBaseModel
 
 __all__ = [
     "SchedulerRequestInfo",

src/guidellm/scheduler/strategy.py

@@ -12,7 +12,7 @@
 from pydantic import Field
 
 from guidellm.config import settings
-from guidellm.objects import StandardBaseModel
+from guidellm.utils import StandardBaseModel
 
 __all__ = [
     "AsyncConstantStrategy",

src/guidellm/scheduler/worker.py

@@ -24,10 +24,10 @@
     ResponseSummary,
     StreamingTextResponse,
 )
-from guidellm.objects import StandardBaseModel
 from guidellm.request import GenerationRequest
 from guidellm.scheduler.result import SchedulerRequestInfo
 from guidellm.scheduler.types import RequestT, ResponseT
+from guidellm.utils import StandardBaseModel
 
 __all__ = [
     "GenerativeRequestsWorker",

src/guidellm/utils/__init__.py

@@ -1,34 +1,79 @@
+from .auto_importer import AutoImporterMixin
 from .colors import Colors
 from .default_group import DefaultGroupHandler
+from .functions import (
+    all_defined,
+    safe_add,
+    safe_divide,
+    safe_format_timestamp,
+    safe_getattr,
+    safe_multiply,
+)
 from .hf_datasets import (
     SUPPORTED_TYPES,
     save_dataset_to_file,
 )
 from .hf_transformers import (
     check_load_processor,
 )
+from .pydantic_utils import (
+    PydanticClassRegistryMixin,
+    ReloadableBaseModel,
+    StandardBaseDict,
+    StandardBaseModel,
+    StatusBreakdown,
+)
 from .random import IntegerRangeSampler
+from .registry import RegistryMixin
+from .singleton import SingletonMixin, ThreadSafeSingletonMixin
+from .statistics import (
+    DistributionSummary,
+    Percentiles,
+    RunningStats,
+    StatusDistributionSummary,
+    TimeRunningStats,
+)
 from .text import (
     EndlessTextCreator,
     clean_text,
     filter_text,
-    is_puncutation,
+    is_punctuation,
     load_text,
     split_text,
     split_text_list_by_length,
 )
 
 __all__ = [
     "SUPPORTED_TYPES",
+    "AutoImporterMixin",
     "Colors",
     "DefaultGroupHandler",
+    "DistributionSummary",
     "EndlessTextCreator",
     "IntegerRangeSampler",
+    "Percentiles",
+    "PydanticClassRegistryMixin",
+    "RegistryMixin",
+    "ReloadableBaseModel",
+    "RunningStats",
+    "SingletonMixin",
+    "StandardBaseDict",
+    "StandardBaseModel",
+    "StatusBreakdown",
+    "StatusDistributionSummary",
+    "ThreadSafeSingletonMixin",
+    "TimeRunningStats",
+    "all_defined",
     "check_load_processor",
     "clean_text",
     "filter_text",
-    "is_puncutation",
+    "is_punctuation",
     "load_text",
+    "safe_add",
+    "safe_divide",
+    "safe_format_timestamp",
+    "safe_getattr",
+    "safe_multiply",
     "save_dataset_to_file",
     "split_text",
     "split_text_list_by_length",