Move Generic request types to avoid circular import

Author: sjmonson

src/guidellm/benchmark/aggregator.py

@@ -32,11 +32,11 @@
     GenerationRequest,
     GenerativeRequestLoaderDescription,
     RequestLoaderDescription,
+    RequestT,
+    ResponseT,
 )
 from guidellm.scheduler import (
     GenerativeRequestsWorkerDescription,
-    RequestT,
-    ResponseT,
     SchedulerRequestResult,
     WorkerDescription,
 )

src/guidellm/benchmark/benchmarker.py

@@ -27,12 +27,12 @@
     GenerationRequest,
     GenerativeRequestLoaderDescription,
     RequestLoaderDescription,
+    RequestT,
+    ResponseT,
 )
 from guidellm.scheduler import (
     GenerativeRequestsWorker,
     RequestsWorker,
-    RequestT,
-    ResponseT,
     Scheduler,
     SchedulerRequestResult,
     SchedulingStrategy,

src/guidellm/request/__init__.py

@@ -5,11 +5,17 @@
     RequestLoaderDescription,
 )
 from .request import GenerationRequest
+from .session import GenerativeRequestSession, RequestSession
+from .types import RequestT, ResponseT
 
 __all__ = [
     "GenerationRequest",
     "GenerativeRequestLoader",
     "GenerativeRequestLoaderDescription",
+    "GenerativeRequestSession",
     "RequestLoader",
     "RequestLoaderDescription",
+    "RequestSession",
+    "RequestT",
+    "ResponseT",
 ]

src/guidellm/scheduler/types.py renamed to src/guidellm/request/types.py

@@ -15,7 +15,6 @@
     ThroughputStrategy,
     strategy_display_str,
 )
-from .types import RequestT, ResponseT
 from .worker import (
     GenerativeRequestsWorker,
     GenerativeRequestsWorkerDescription,
@@ -31,10 +30,8 @@
     "ConcurrentStrategy",
     "GenerativeRequestsWorker",
     "GenerativeRequestsWorkerDescription",
-    "RequestT",
     "RequestsWorker",
     "ResolveStatus",
-    "ResponseT",
     "Scheduler",
     "SchedulerRequestInfo",
     "SchedulerRequestResult",

src/guidellm/scheduler/__init__.py

@@ -8,8 +8,8 @@
 
 from guidellm.objects import StandardBaseModel
 from guidellm.request.session import RequestSession
+from guidellm.request.types import RequestT, ResponseT
 from guidellm.scheduler.strategy import SchedulingStrategy
-from guidellm.scheduler.types import RequestT, ResponseT
 
 __all__ = [
     "MPQueues",

src/guidellm/scheduler/result.py

@@ -18,6 +18,10 @@
 
 from guidellm.config import settings
 from guidellm.request.session import RequestSession
+from guidellm.request.types import (
+    RequestT,
+    ResponseT,
+)
 from guidellm.scheduler.result import (
     MPQueues,
     SchedulerRequestResult,
@@ -27,10 +31,6 @@
     WorkerProcessResult,
 )
 from guidellm.scheduler.strategy import SchedulingStrategy
-from guidellm.scheduler.types import (
-    RequestT,
-    ResponseT,
-)
 from guidellm.scheduler.worker import (
     RequestsWorker,
 )

src/guidellm/scheduler/scheduler.py

@@ -28,12 +28,12 @@
 from guidellm.objects import StandardBaseModel
 from guidellm.request import GenerationRequest
 from guidellm.request.session import RequestSession
+from guidellm.request.types import RequestT, ResponseT
 from guidellm.scheduler.result import (
     MPQueues,
     SchedulerRequestInfo,
     WorkerProcessResult,
 )
-from guidellm.scheduler.types import RequestT, ResponseT
 
 __all__ = [
     "GenerativeRequestsWorker",