[PD][BugFix]引入包问题

vllm/distributed/kv_transfer/kv_connector/factory.py

@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: Copyright contributors to the vLLM project
 
 import importlib
-import envs
+from vllm import envs
 from collections.abc import Callable
 from typing import TYPE_CHECKING, Optional, cast
 

vllm/distributed/kv_transfer/kv_connector/v1/du/du_swift_connector_dp.py

@@ -20,6 +20,10 @@ from vllm.model_executor.layers.attention.mla_attention import MLACommonMetadata
 from vllm.v1.core.sched.output import SchedulerOutput
 from vllm.distributed.parallel_state import get_pp_group, get_tp_group, get_dp_group
 
+import zmq
+import msgpack
+
+
 if TYPE_CHECKING:
     from vllm.v1.attention.backend import AttentionMetadata
     from vllm.forward_context import ForwardContext

vllm/distributed/kv_transfer/kv_connector/v1/du/du_swift_engine_dp.py

@@ -6,7 +6,7 @@ import os
 import threading
 import time
 import typing
-from collections import deque
+from collections import deque, defaultdict
 from contextlib import contextmanager
 from typing import TYPE_CHECKING, Any, Optional
 
@@ -25,7 +25,7 @@ from vllm.utils.network_utils import get_ip
 from vllm import envs
 from vllm.distributed.parallel_state import get_pp_group, get_tp_group
 
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from vllm.model_executor.models.utils import extract_layer_index
 from vllm.distributed.utils import get_pp_indices
 from vllm.config import ModelConfig

vllm/version.py

-# SPDX-License-Identifier: Apache-2.0
-# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
 
 try:
-    from ._version import __version__, __version_tuple__
+    __version__ = "0.15.1"
+    __version_tuple__ = (0, 15, 1)
+    __hcu_version__ = f'0.15.1+das.opt1.alpha.b40b83e.dtk2604' 
+    
+    from vllm.version import __version__, __version_tuple__, __hcu_version__
 except Exception as e:
     import warnings
 
-    warnings.warn(f"Failed to read commit hash:\n{e}", RuntimeWarning, stacklevel=2)
-
+    warnings.warn(f"Failed to read commit hash:\n + str(e)",
+                  RuntimeWarning,
+                  stacklevel=2)
     __version__ = "dev"
     __version_tuple__ = (0, 0, __version__)
     
     
 def _prev_minor_version_was(version_str):
-    """Check whether a given version matches the previous minor version.
+    '''Check whether a given version matches the previous minor version.
 
     Return True if version_str matches the previous minor version.
 
@@ -21,19 +24,19 @@ def _prev_minor_version_was(version_str):
     supplied version_str is '0.6'.
 
     Used for --show-hidden-metrics-for-version.
-    """
+    '''
     # Match anything if this is a dev tree
     if __version_tuple__[0:2] == (0, 0):
         return True
 
     # Note - this won't do the right thing when we release 1.0!
-    assert __version_tuple__[0] == 0
+    # assert __version_tuple__[0] == 0
     assert isinstance(__version_tuple__[1], int)
     return version_str == f"{__version_tuple__[0]}.{__version_tuple__[1] - 1}"
 
 
 def _prev_minor_version():
-    """For the purpose of testing, return a previous minor version number."""
+    '''For the purpose of testing, return a previous minor version number.'''
     # In dev tree, this will return "0.-1", but that will work fine"
     assert isinstance(__version_tuple__[1], int)
     return f"{__version_tuple__[0]}.{__version_tuple__[1] - 1}"