fix

xorbitsai · Sep 2, 2024 · 3987c51 · 3987c51
1 parent 3e99a96
commit 3987c51
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/xinference/api/restful_api.py b/xinference/api/restful_api.py
@@ -206,7 +206,7 @@ async def _get_supervisor_ref(self) -> xo.ActorRefType[SupervisorActor]:
     async def _get_event_collector_ref(self) -> xo.ActorRefType[EventCollectorActor]:
         if self._event_collector_ref is None:
             self._event_collector_ref = await xo.actor_ref(
-                address=self._supervisor_address, uid=EventCollectorActor.uid()
+                address=self._supervisor_address, uid=EventCollectorActor.default_uid()
             )
         return self._event_collector_ref
 

diff --git a/xinference/core/cache_tracker.py b/xinference/core/cache_tracker.py
@@ -25,7 +25,7 @@ def __init__(self):
         self._model_name_to_version_info: Dict[str, List[Dict]] = {}  # type: ignore
 
     @classmethod
-    def uid(cls) -> str:
+    def default_uid(cls) -> str:
         return "cache_tracker"
 
     @staticmethod

diff --git a/xinference/core/event.py b/xinference/core/event.py
@@ -41,7 +41,7 @@ def __init__(self):
         )
 
     @classmethod
-    def uid(cls) -> str:
+    def default_uid(cls) -> str:
         return "event_collector"
 
     def get_model_events(self, model_uid: str) -> List[Dict]:

diff --git a/xinference/core/status_guard.py b/xinference/core/status_guard.py
@@ -51,7 +51,7 @@ def __init__(self):
         self._model_uid_to_info: Dict[str, InstanceInfo] = {}  # type: ignore
 
     @classmethod
-    def uid(cls) -> str:
+    def default_uid(cls) -> str:
         return "status_guard"
 
     @staticmethod

diff --git a/xinference/core/supervisor.py b/xinference/core/supervisor.py
@@ -135,20 +135,22 @@ async def __post_create__(self):
         self._status_guard_ref: xo.ActorRefType[  # type: ignore
             "StatusGuardActor"
         ] = await xo.create_actor(
-            StatusGuardActor, address=self.address, uid=StatusGuardActor.uid()
+            StatusGuardActor, address=self.address, uid=StatusGuardActor.default_uid()
         )
         self._cache_tracker_ref: xo.ActorRefType[  # type: ignore
             "CacheTrackerActor"
         ] = await xo.create_actor(
-            CacheTrackerActor, address=self.address, uid=CacheTrackerActor.uid()
+            CacheTrackerActor, address=self.address, uid=CacheTrackerActor.default_uid()
         )
 
         from .event import EventCollectorActor
 
         self._event_collector_ref: xo.ActorRefType[  # type: ignore
             EventCollectorActor
         ] = await xo.create_actor(
-            EventCollectorActor, address=self.address, uid=EventCollectorActor.uid()
+            EventCollectorActor,
+            address=self.address,
+            uid=EventCollectorActor.default_uid(),
         )
 
         from ..model.audio import (

diff --git a/xinference/core/worker.py b/xinference/core/worker.py
@@ -336,13 +336,13 @@ async def get_supervisor_ref(self, add_worker: bool = True) -> xo.ActorRefType:
             logger.info("Connected to supervisor as a fresh worker")
 
         self._status_guard_ref = await xo.actor_ref(
-            address=self._supervisor_address, uid=StatusGuardActor.uid()
+            address=self._supervisor_address, uid=StatusGuardActor.default_uid()
         )
         self._event_collector_ref = await xo.actor_ref(
-            address=self._supervisor_address, uid=EventCollectorActor.uid()
+            address=self._supervisor_address, uid=EventCollectorActor.default_uid()
         )
         self._cache_tracker_ref = await xo.actor_ref(
-            address=self._supervisor_address, uid=CacheTrackerActor.uid()
+            address=self._supervisor_address, uid=CacheTrackerActor.default_uid()
         )
         # cache_tracker is on supervisor
         from ..model.audio import get_audio_model_descriptions