revert: remove misc changes

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>

Author: aarnphm

tests/v1/core/test_scheduler.py

@@ -112,8 +112,7 @@ def create_scheduler(
         vllm_config=vllm_config,
         kv_cache_config=kv_cache_config,
         log_stats=True,
-        structured_output_manager=StructuredOutputManager(
-            vllm_config=vllm_config),
+        structured_output_manager=StructuredOutputManager(vllm_config),
     )
 
 

tests/v1/kv_connector/unit/utils.py

@@ -107,8 +107,7 @@ def create_scheduler(
         vllm_config=vllm_config,
         kv_cache_config=kv_cache_config,
         log_stats=True,
-        structured_output_manager=StructuredOutputManager(
-            vllm_config=vllm_config),
+        structured_output_manager=StructuredOutputManager(vllm_config),
     )
 
 

vllm/v1/core/sched/scheduler.py

@@ -7,7 +7,7 @@
 import time
 from collections import defaultdict
 from collections.abc import Iterable
-from typing import TYPE_CHECKING, Any, Optional, Union
+from typing import Any, Optional, Union
 
 from vllm.config import VllmConfig
 from vllm.distributed.kv_events import EventPublisherFactory, KVEventBatch
@@ -33,9 +33,7 @@
 from vllm.v1.outputs import ModelRunnerOutput
 from vllm.v1.request import Request, RequestStatus
 from vllm.v1.spec_decode.metrics import SpecDecodingStats
-
-if TYPE_CHECKING:
-    from vllm.v1.structured_output import StructuredOutputManager
+from vllm.v1.structured_output import StructuredOutputManager
 
 logger = init_logger(__name__)
 

vllm/v1/engine/core.py

@@ -86,8 +86,7 @@ def __init__(self,
         self.collective_rpc("initialize_cache",
                             args=(num_gpu_blocks, num_cpu_blocks))
 
-        self.structured_output_manager = StructuredOutputManager(
-            vllm_config=vllm_config)
+        self.structured_output_manager = StructuredOutputManager(vllm_config)
 
         # Setup scheduler.
         if isinstance(vllm_config.scheduler_config.scheduler_cls, str):