fix testing issues

docs/requirements-docs.txt

@@ -12,4 +12,4 @@ torch
 py-cpuinfo
 transformers
 mistral_common >= 1.3.4
-openai # Required by docs/source/serving/openai_compatible_server.md's vllm.entrypoints.openai.cli_args
+openai # Required by docs/source/serving/openai_compatible_server.md's vllm.entrypoints.openai.cli_args

requirements-common.txt

@@ -26,4 +26,4 @@ librosa # Required for audio processing
 soundfile # Required for audio processing
 gguf == 0.9.1
 importlib_metadata
-mistral_common >= 1.3.4
+mistral_common >= 1.3.4

tests/entrypoints/openai/test_serving_engine.py

@@ -1,4 +1,3 @@
-import asyncio
 from http import HTTPStatus
 from unittest.mock import MagicMock
 

vllm/entrypoints/openai/serving_engine.py

@@ -34,6 +34,7 @@
 from vllm.sampling_params import LogitsProcessor, SamplingParams
 from vllm.sequence import Logprob
 from vllm.transformers_utils.tokenizer import AnyTokenizer
+from vllm.utils import AtomicCounter
 
 logger = init_logger(__name__)
 
@@ -80,6 +81,7 @@ def __init__(
 
         self.served_model_names = served_model_names
 
+        self.lora_id_counter = AtomicCounter(0)
         self.lora_requests = []
         if lora_modules is not None:
             self.lora_requests = [
@@ -457,7 +459,7 @@ async def load_lora_adapter(
             return error_check_ret
 
         lora_name, lora_path = request.lora_name, request.lora_path
-        unique_id = len(self.lora_requests) + 1
+        unique_id = self.lora_id_counter.inc(1)
         self.lora_requests.append(
             LoRARequest(lora_name=lora_name,
                         lora_int_id=unique_id,

vllm/utils.py

@@ -1123,3 +1123,28 @@ async def _run_task_with_lock(task: Callable, lock: asyncio.Lock, *args,
 def supports_dynamo() -> bool:
     base_torch_version = Version(Version(torch.__version__).base_version)
     return base_torch_version >= Version("2.4.0")
+
+
+class AtomicCounter:
+    """An atomic, thread-safe counter"""
+
+    def __init__(self, initial=0):
+        """Initialize a new atomic counter to given initial value"""
+        self._value = initial
+        self._lock = threading.Lock()
+
+    def inc(self, num=1):
+        """Atomically increment the counter by num and return the new value"""
+        with self._lock:
+            self._value += num
+            return self._value
+
+    def dec(self, num=1):
+        """Atomically decrement the counter by num and return the new value"""
+        with self._lock:
+            self._value -= num
+            return self._value
+
+    @property
+    def value(self):
+        return self._value