Move queue config to seperate submodule

Author: sjmonson

src/guidellm/request/session.py

@@ -6,12 +6,16 @@
 
 __all__ = ["GenerativeRequestSession", "RequestSession"]
 
-# TODO: Replace with specific types that implement needed features
 RequestT = TypeVar("RequestT")
 ResponseT = TypeVar("ResponseT")
 
 
 class RequestSession(ABC, Generic[RequestT, ResponseT]):
+    """
+    A series of requests that build upon each other to
+    form a conversion between the user and the model.
+    """
+
     @abstractmethod
     def __len__(self) -> int: ...
 
@@ -29,7 +33,6 @@ def push_response(self, response: ResponseT) -> None: ...
     def complete(self) -> bool: ...
 
 
-# TODO: Implement multiturn support
 class GenerativeRequestSession(RequestSession[GenerationRequest, ResponseSummary]):
     def __init__(self, request: GenerationRequest) -> None:
         self.request = request

src/guidellm/scheduler/queues.py

@@ -0,0 +1,25 @@
+"""
+Helper module for importing the correct queue types.
+"""
+
+from dataclasses import dataclass
+from queue import Empty as QueueEmpty
+from queue import Full as QueueFull
+from queue import Queue
+from typing import Generic
+
+from guidellm.request.types import RequestT, ResponseT
+from guidellm.scheduler.result import WorkerProcessRequest, WorkerProcessResult
+
+__all__ = [
+    "MPQueues",
+    "Queue",
+    "QueueEmpty",
+    "QueueFull",
+]
+
+
+@dataclass
+class MPQueues(Generic[RequestT, ResponseT]):
+    requests: Queue[WorkerProcessRequest[RequestT, ResponseT]]
+    responses: Queue[WorkerProcessResult[RequestT, ResponseT]]

src/guidellm/scheduler/result.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from queue import Queue
 from typing import (
     Generic,
     Literal,
@@ -12,7 +11,6 @@
 from guidellm.scheduler.strategy import SchedulingStrategy
 
 __all__ = [
-    "MPQueues",
     "SchedulerRequestInfo",
     "SchedulerRequestResult",
     "SchedulerResult",
@@ -143,9 +141,6 @@ class SchedulerRequestResult(
     response: Optional[ResponseT] = None
 
 
-# TODO: Move dataclasses somewhere else
-
-
 @dataclass
 class WorkerProcessRequest(Generic[RequestT, ResponseT]):
     session: RequestSession[RequestT, ResponseT]
@@ -159,9 +154,3 @@ class WorkerProcessResult(Generic[RequestT, ResponseT]):
     request: RequestT
     response: Optional[ResponseT]
     info: SchedulerRequestInfo
-
-
-@dataclass
-class MPQueues(Generic[RequestT, ResponseT]):
-    requests: Queue[WorkerProcessRequest[RequestT, ResponseT]]
-    responses: Queue[WorkerProcessResult[RequestT, ResponseT]]

src/guidellm/scheduler/scheduler.py

@@ -4,8 +4,6 @@
 from collections.abc import AsyncGenerator, Iterable, Iterator
 from concurrent.futures import ProcessPoolExecutor
 from multiprocessing import Manager
-from queue import Empty as QueueEmpty
-from queue import Queue
 from threading import Event
 from typing import (
     Any,
@@ -21,8 +19,8 @@
     RequestT,
     ResponseT,
 )
+from guidellm.scheduler.queues import MPQueues, Queue, QueueEmpty
 from guidellm.scheduler.result import (
-    MPQueues,
     SchedulerRequestResult,
     SchedulerResult,
     SchedulerRunInfo,

src/guidellm/scheduler/worker.py

@@ -5,8 +5,6 @@
 from collections.abc import AsyncGenerator
 from dataclasses import dataclass
 from itertools import islice
-from queue import Empty as QueueEmpty
-from queue import Queue
 from threading import Event
 from typing import (
     Any,
@@ -29,8 +27,8 @@
 from guidellm.objects import StandardBaseModel
 from guidellm.request import GenerationRequest
 from guidellm.request.types import RequestT, ResponseT
+from guidellm.scheduler.queues import MPQueues, Queue, QueueEmpty
 from guidellm.scheduler.result import (
-    MPQueues,
     SchedulerRequestInfo,
     WorkerProcessRequest,
     WorkerProcessResult,