Standardize on plural for modules/packages and update from copilot review

Signed-off-by: Mark Kurtz <[email protected]>

Author: markurtz

src/guidellm/benchmark/scenario.py

@@ -12,7 +12,7 @@
 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.scheduler.strategies import StrategyType
 
 __ALL__ = ["Scenario", "GenerativeTextScenario", "get_builtin_scenarios"]
 

src/guidellm/scheduler/__init__.py

@@ -11,7 +11,7 @@
     SerializableConstraintInitializer,
     UnserializableConstraintInitializer,
 )
-from .environment import Environment, NonDistributedEnvironment
+from .environments import Environment, NonDistributedEnvironment
 from .objects import (
     BackendInterface,
     BackendT,
@@ -27,7 +27,7 @@
     SchedulerUpdateActionProgress,
 )
 from .scheduler import Scheduler
-from .strategy import (
+from .strategies import (
     AsyncConstantStrategy,
     AsyncPoissonStrategy,
     ConcurrentStrategy,

src/guidellm/scheduler/environment.py renamed to src/guidellm/scheduler/environments.py

@@ -32,7 +32,7 @@
     ScheduledRequestInfo,
     SchedulerState,
 )
-from guidellm.scheduler.strategy import SchedulingStrategy
+from guidellm.scheduler.strategies import SchedulingStrategy
 from guidellm.settings import settings
 from guidellm.utils import InfoMixin
 

src/guidellm/scheduler/scheduler.py

@@ -17,7 +17,7 @@
     Constraint,
     ConstraintsInitializerFactory,
 )
-from guidellm.scheduler.environment import Environment, NonDistributedEnvironment
+from guidellm.scheduler.environments import Environment, NonDistributedEnvironment
 from guidellm.scheduler.objects import (
     BackendInterface,
     MultiTurnRequestT,
@@ -26,7 +26,7 @@
     ScheduledRequestInfo,
     SchedulerState,
 )
-from guidellm.scheduler.strategy import SchedulingStrategy
+from guidellm.scheduler.strategies import SchedulingStrategy
 from guidellm.scheduler.worker_group import WorkerProcessGroup
 from guidellm.utils.singleton import ThreadSafeSingletonMixin
 

src/guidellm/scheduler/strategy.py renamed to src/guidellm/scheduler/strategies.py

@@ -37,7 +37,7 @@
     ScheduledRequestInfo,
     SchedulerMessagingPydanticRegistry,
 )
-from guidellm.scheduler.strategy import ScheduledRequestTimings
+from guidellm.scheduler.strategies import ScheduledRequestTimings
 from guidellm.utils import (
     InterProcessMessaging,
     wait_for_sync_barrier,

src/guidellm/scheduler/worker.py

@@ -33,7 +33,7 @@
     SchedulerState,
     SchedulerUpdateAction,
 )
-from guidellm.scheduler.strategy import SchedulingStrategy
+from guidellm.scheduler.strategies import SchedulingStrategy
 from guidellm.scheduler.worker import WorkerProcess
 from guidellm.settings import settings
 from guidellm.utils import (

src/guidellm/scheduler/worker_group.py

@@ -286,8 +286,14 @@ def test_create_constraint_raises(self, valid_instances):
     def test_call_raises(self, valid_instances):
         """Test that calling constraint raises RuntimeError."""
         instance, _ = valid_instances
-        state = SchedulerState()
-        request = ScheduledRequestInfo()
+        state = SchedulerState(node_id="test_node", num_processes=1, start_time=0.0)
+        request = ScheduledRequestInfo(
+            request_id="test_request",
+            status="pending",
+            scheduler_node_id="test_node",
+            scheduler_process_id=1,
+            scheduler_start_time=0.0,
+        )
 
         with pytest.raises(
             RuntimeError, match="Cannot invoke unserializable constraint"

tests/unit/scheduler/test_constraints.py

@@ -25,7 +25,7 @@
     SynchronousStrategy,
     ThroughputStrategy,
 )
-from guidellm.scheduler.strategy import (
+from guidellm.scheduler.strategies import (
     _exponential_decay_fraction,
     _exponential_decay_tau,
 )
@@ -35,7 +35,7 @@ def test_strategy_type():
     """Test that StrategyType is defined correctly as a Literal type."""
     # StrategyType is a type alias/literal type, we can't test its runtime value
     # but we can test that it exists and is importable
-    from guidellm.scheduler.strategy import StrategyType
+    from guidellm.scheduler.strategies import StrategyType
 
     assert StrategyType is not None