From 76c1acbabb08ea8ca1c3af3a046db5e8608edfb9 Mon Sep 17 00:00:00 2001
From: shaohuzhang1 <80892890+shaohuzhang1@users.noreply.github.com>
Date: Fri, 2 Aug 2024 10:39:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=AF=E9=A3=9E?=
 =?UTF-8?q?=E6=98=9F=E7=81=AB=E6=A8=A1=E5=9E=8B=E5=A4=9A=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E6=8F=90=E9=97=AE=E5=90=8E=EF=BC=8C=E5=9B=9E?=
 =?UTF-8?q?=E7=AD=94=E5=86=85=E5=AE=B9=E4=BC=9A=E9=94=99=E4=B9=B1=20#917?=
 =?UTF-8?q?=20(#920)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/common/config/embedding_config.py                        | 2 +-
 apps/setting/models_provider/base_model_provider.py           | 4 ++++
 .../models_provider/impl/xf_model_provider/model/llm.py       | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/common/config/embedding_config.py b/apps/common/config/embedding_config.py
index b33dd83a1..5938797c3 100644
--- a/apps/common/config/embedding_config.py
+++ b/apps/common/config/embedding_config.py
@@ -18,7 +18,7 @@ class ModelManage:
     @staticmethod
     def get_model(_id, get_model):
         model_instance = ModelManage.cache.get(_id)
-        if model_instance is None:
+        if model_instance is None or not model_instance.is_cache_model():
             model_instance = get_model(_id)
             ModelManage.cache.set(_id, model_instance, timeout=60 * 30)
             return model_instance
diff --git a/apps/setting/models_provider/base_model_provider.py b/apps/setting/models_provider/base_model_provider.py
index 8a9ab5e2b..022cf92e3 100644
--- a/apps/setting/models_provider/base_model_provider.py
+++ b/apps/setting/models_provider/base_model_provider.py
@@ -89,6 +89,10 @@ class MaxKBBaseModel(ABC):
     def new_instance(model_type, model_name, model_credential: Dict[str, object], **model_kwargs):
         pass
 
+    @staticmethod
+    def is_cache_model():
+        return True
+
 
 class BaseModelCredential(ABC):
 
diff --git a/apps/setting/models_provider/impl/xf_model_provider/model/llm.py b/apps/setting/models_provider/impl/xf_model_provider/model/llm.py
index a9e41dbc4..a58941286 100644
--- a/apps/setting/models_provider/impl/xf_model_provider/model/llm.py
+++ b/apps/setting/models_provider/impl/xf_model_provider/model/llm.py
@@ -20,6 +20,9 @@ from setting.models_provider.base_model_provider import MaxKBBaseModel
 
 
 class XFChatSparkLLM(MaxKBBaseModel, ChatSparkLLM):
+    @staticmethod
+    def is_cache_model():
+        return False
 
     @staticmethod
     def new_instance(model_type, model_name, model_credential: Dict[str, object], **model_kwargs):