perf: model manage (#3226)

apps/common/config/embedding_config.py

@@ -6,40 +6,56 @@
     @date：2023/10/23 16:03
     @desc:
 """
+
 import threading
 import time
 
 from common.cache.mem_cache import MemCache
 
-lock = threading.Lock()
+_lock = threading.Lock()
+locks = {}
 
 
 class ModelManage:
     cache = MemCache('model', {})
     up_clear_time = time.time()
 
+    @staticmethod
+    def _get_lock(_id):
+        lock = locks.get(_id)
+        if lock is None:
+            with _lock:
+                lock = locks.get(_id)
+                if lock is None:
+                    lock = threading.Lock()
+                    locks[_id] = lock
+
+        return lock
+
     @staticmethod
     def get_model(_id, get_model):
-        # 获取锁
-        lock.acquire()
-        try:
-            model_instance = ModelManage.cache.get(_id)
-            if model_instance is None or not model_instance.is_cache_model():
+        model_instance = ModelManage.cache.get(_id)
+        if model_instance is None:
+            lock = ModelManage._get_lock(_id)
+            with lock:
+                model_instance = ModelManage.cache.get(_id)
+                if model_instance is None:
+                    model_instance = get_model(_id)
+                    ModelManage.cache.set(_id, model_instance, timeout=60 * 60 * 8)
+        else:
+            if model_instance.is_cache_model():
+                ModelManage.cache.touch(_id, timeout=60 * 60 * 8)
+            else:
                 model_instance = get_model(_id)
-                ModelManage.cache.set(_id, model_instance, timeout=60 * 30)
-                return model_instance
-            # 续期
-            ModelManage.cache.touch(_id, timeout=60 * 30)
-            ModelManage.clear_timeout_cache()
-            return model_instance
-        finally:
-            # 释放锁
-            lock.release()
+                ModelManage.cache.set(_id, model_instance, timeout=60 * 60 * 8)
+        ModelManage.clear_timeout_cache()
+        return model_instance
 
     @staticmethod
     def clear_timeout_cache():
-        if time.time() - ModelManage.up_clear_time > 60:
-            ModelManage.cache.clear_timeout_data()
+        if time.time() - ModelManage.up_clear_time > 60 * 60:
+            threading.Thread(target=lambda: ModelManage.cache.clear_timeout_data()).start()
+            ModelManage.up_clear_time = time.time()
 
     @staticmethod
     def delete_key(_id):

apps/common/utils/rsa_util.py

@@ -40,15 +40,12 @@ def generate():
 def get_key_pair():
     rsa_value = rsa_cache.get(cache_key)
     if rsa_value is None:
-        lock.acquire()
-        rsa_value = rsa_cache.get(cache_key)
-        if rsa_value is not None:
-            return rsa_value
-        try:
+        with lock:
+            rsa_value = rsa_cache.get(cache_key)
+            if rsa_value is not None:
+                return rsa_value
             rsa_value = get_key_pair_by_sql()
             rsa_cache.set(cache_key, rsa_value)
-        finally:
-            lock.release()
     return rsa_value