From 8279078e218833b357f7c5076850e3688714d570 Mon Sep 17 00:00:00 2001
From: Zhuohan Li <zhuohan123@gmail.com>
Date: Sat, 1 Jun 2024 15:40:25 -0700
Subject: [PATCH] [Bugfix] Remove deprecated @abstractproperty (#5174)

---
 vllm/core/evictor_v1.py     | 5 +++--
 vllm/core/evictor_v2.py     | 5 +++--
 vllm/lora/worker_manager.py | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/vllm/core/evictor_v1.py b/vllm/core/evictor_v1.py
index aa51dd693887..5db5a08a5bb6 100644
--- a/vllm/core/evictor_v1.py
+++ b/vllm/core/evictor_v1.py
@@ -1,5 +1,5 @@
 import enum
-from abc import ABC, abstractmethod, abstractproperty
+from abc import ABC, abstractmethod
 from typing import OrderedDict
 
 from vllm.block import PhysicalTokenBlock
@@ -44,7 +44,8 @@ def remove(self, block_hash: int) -> PhysicalTokenBlock:
         """
         pass
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def num_blocks(self) -> int:
         pass
 
diff --git a/vllm/core/evictor_v2.py b/vllm/core/evictor_v2.py
index 57759b29347f..3dd12e2e2513 100644
--- a/vllm/core/evictor_v2.py
+++ b/vllm/core/evictor_v2.py
@@ -1,5 +1,5 @@
 import enum
-from abc import ABC, abstractmethod, abstractproperty
+from abc import ABC, abstractmethod
 from typing import OrderedDict, Tuple
 
 
@@ -46,7 +46,8 @@ def remove(self, block_id: int):
         """Remove a given block id from the cache."""
         pass
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def num_blocks(self) -> int:
         pass
 
diff --git a/vllm/lora/worker_manager.py b/vllm/lora/worker_manager.py
index d67ce67172e3..4657757bd484 100644
--- a/vllm/lora/worker_manager.py
+++ b/vllm/lora/worker_manager.py
@@ -1,4 +1,4 @@
-from abc import ABC, abstractmethod, abstractproperty
+from abc import ABC, abstractmethod
 from contextlib import contextmanager
 from typing import Any, Dict, List, Literal, Optional, Set, Type, Union
 
@@ -42,7 +42,8 @@ def dummy_lora_cache(self):
         yield
         self._cached_dummy_lora = False
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def is_enabled(self) -> bool:
         ...