模型覆盖支持?更新&?模型覆盖指向不存在的模型???

binary-husky · binary-husky · May 17, 2024 · Apr 13, 2024 · Apr 14, 2024 · Apr 14, 2024
commit fc69bbb0e7848e67d779ced73930f47aa9152e7a
diff --git a/request_llms/bridge_all.py b/request_llms/bridge_all.py
@@ -947,8 +947,9 @@ def mutex_manager(window_mutex, observe_window):
         res = '<br/><br/>\n\n---\n\n'.join(return_string_collect)
         return res
 
-from core_functional import get_core_functions
-functional = get_core_functions()
+import core_functional
+import importlib
+
 def predict(inputs:str, llm_kwargs:dict, plugin_kwargs:dict, chatbot,
             history:list=[], system_prompt:str='', stream:bool=True, additional_fn:str=None):
     """
@@ -971,10 +972,14 @@ def predict(inputs:str, llm_kwargs:dict, plugin_kwargs:dict, chatbot,
     inputs = apply_gpt_academic_string_mask(inputs, mode="show_llm")
     method = model_info[llm_kwargs['llm_model']]["fn_with_ui"]  # 如果?里??，??config中的AVAIL_LLM_MODELS??
 
+    importlib.reload(core_functional)    # ?更新prompt
+    functional = core_functional.get_core_functions()
     if 'ModelOverride' in functional[additional_fn]:
         model_override = functional[additional_fn]['ModelOverride']
+        if model_override not in model_info:
+            raise ValueError(f"模型覆盖?? '{model_override}' 指向一??不支持的模型，???配置文件。")
         method = model_info[model_override]["fn_with_ui"]
-        llm_kwargs['llm_model'] = 
functional[additional_fn]['ModelOverride']
+        llm_kwargs['llm_model'] = 
model_override
 
     yield from method(inputs, llm_kwargs, plugin_kwargs, chatbot, history, system_prompt, stream, additional_fn)