Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/guidellm/backend/response.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 1 addition & 3 deletions src/guidellm/benchmark/aggregator.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
from guidellm.config import settings
from guidellm.objects import (
RunningStats,
StandardBaseModel,
StatusBreakdown,
TimeRunningStats,
)
from guidellm.request import (
Expand All @@ -40,7 +38,7 @@
SchedulerRequestResult,
WorkerDescription,
)
from guidellm.utils import check_load_processor
from guidellm.utils import StandardBaseModel, StatusBreakdown, check_load_processor

__all__ = [
"AggregatorT",
Expand Down
3 changes: 1 addition & 2 deletions src/guidellm/benchmark/benchmark.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
ThroughputProfile,
)
from guidellm.objects import (
StandardBaseModel,
StatusBreakdown,
StatusDistributionSummary,
)
from guidellm.request import (
Expand All @@ -32,6 +30,7 @@
ThroughputStrategy,
WorkerDescription,
)
from guidellm.utils import StandardBaseModel, StatusBreakdown

__all__ = [
"Benchmark",
Expand Down
2 changes: 1 addition & 1 deletion src/guidellm/benchmark/benchmarker.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -37,6 +36,7 @@
SchedulerRequestResult,
SchedulingStrategy,
)
from guidellm.utils import StandardBaseModel

__all__ = ["Benchmarker", "BenchmarkerResult", "GenerativeBenchmarker"]

Expand Down
3 changes: 1 addition & 2 deletions src/guidellm/benchmark/output.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,12 @@
from guidellm.config import settings
from guidellm.objects import (
DistributionSummary,
StandardBaseModel,
StatusDistributionSummary,
)
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
from guidellm.utils import Colors, StandardBaseModel, split_text_list_by_length

__all__ = [
"GenerativeBenchmarksConsole",
Expand Down
2 changes: 1 addition & 1 deletion src/guidellm/benchmark/profile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -15,6 +14,7 @@
SynchronousStrategy,
ThroughputStrategy,
)
from guidellm.utils import StandardBaseModel

__all__ = [
"AsyncProfile",
Expand Down
2 changes: 1 addition & 1 deletion src/guidellm/benchmark/scenario.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand Down
3 changes: 0 additions & 3 deletions src/guidellm/objects/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from .pydantic import StandardBaseModel, StatusBreakdown
from .statistics import (
DistributionSummary,
Percentiles,
Expand All @@ -11,8 +10,6 @@
"DistributionSummary",
"Percentiles",
"RunningStats",
"StandardBaseModel",
"StatusBreakdown",
"StatusDistributionSummary",
"TimeRunningStats",
]
89 changes: 0 additions & 89 deletions src/guidellm/objects/pydantic.py

This file was deleted.

2 changes: 1 addition & 1 deletion src/guidellm/objects/statistics.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import numpy as np
from pydantic import Field, computed_field

from guidellm.objects.pydantic import StandardBaseModel, StatusBreakdown
from guidellm.utils import StandardBaseModel, StatusBreakdown

__all__ = [
"DistributionSummary",
Expand Down
2 changes: 1 addition & 1 deletion src/guidellm/request/loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/guidellm/request/request.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from pydantic import Field

from guidellm.objects.pydantic import StandardBaseModel
from guidellm.utils import StandardBaseModel

__all__ = ["GenerationRequest"]

Expand Down
2 changes: 1 addition & 1 deletion src/guidellm/scheduler/result.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/guidellm/scheduler/strategy.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/guidellm/scheduler/worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
19 changes: 19 additions & 0 deletions src/guidellm/utils/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from .auto_importer import AutoImporterMixin
from .colors import Colors
from .default_group import DefaultGroupHandler
from .hf_datasets import (
Expand All @@ -7,7 +8,16 @@
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 .text import (
EndlessTextCreator,
clean_text,
Expand All @@ -20,10 +30,19 @@

__all__ = [
"SUPPORTED_TYPES",
"AutoImporterMixin",
"Colors",
"DefaultGroupHandler",
"EndlessTextCreator",
"IntegerRangeSampler",
"PydanticClassRegistryMixin",
"RegistryMixin",
"ReloadableBaseModel",
"SingletonMixin",
"StandardBaseDict",
"StandardBaseModel",
"StatusBreakdown",
"ThreadSafeSingletonMixin",
"check_load_processor",
"clean_text",
"filter_text",
Expand Down
Loading
Loading