Merge pull request Ikaros-521#242 from Ikaros-521/owner

后置部分GPT_MODEL配置，规避一次性全加载问题；修复 LLM部分GUI板块显隐bug
cjszhj · Aug 17, 2023 · 2f30573 · 2f30573
2 parents 2550902 + 3398b61
commit 2f30573
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -1435,6 +1435,10 @@ cmd运行`npm i docsify-cli -g`
 - 美化logo
 - 简单的初步美化下GUI
 
+### 2023-08-18
+- 后置部分GPT_MODEL配置，规避一次性全加载问题
+- 修复 LLM部分GUI板块显隐bug
+
 </details>
 
 

diff --git a/main.py b/main.py
@@ -2729,7 +2729,7 @@ def oncomboBox_chat_type_IndexChanged(self, index):
             7: (0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0),
             8: (0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0),
             9: (0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0),
-            9: (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1),
+            10: (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1),
         }
 
         visibility_values = visibility_map.get(index, (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0))

diff --git a/utils/gpt_model/claude2.py b/utils/gpt_model/claude2.py
@@ -160,6 +160,7 @@ def send_message(self, prompt, conversation_id, attachment=None):
         completions = []
         for data_string in data_strings:
             json_str = data_string[6:].strip()
+            logging.debug(f"json_str={json_str}")
             data = json.loads(json_str)
             if 'completion' in data:
                 completions.append(data['completion'])
@@ -344,7 +345,7 @@ def get_claude2_resp(self, prompt):
             resp_content = self.send_message(prompt, self.conversation_id)
             return resp_content
         except Exception as e:
-            logging.info(e)
+            logging.error(traceback.format_exc())
             return None
 
 

diff --git a/utils/my_handle.py b/utils/my_handle.py
@@ -112,12 +112,7 @@ def __init__(self, config_path):
         # 设置GPT_Model全局模型列表
         GPT_MODEL.set_model_config("openai", self.openai_config)
         GPT_MODEL.set_model_config("chatgpt", self.chatgpt_config)
-        GPT_MODEL.set_model_config("claude", self.claude_config)
-        GPT_MODEL.set_model_config("claude2", self.claude2_config)
-        GPT_MODEL.set_model_config("chatglm", self.chatglm_config)
-        GPT_MODEL.set_model_config("text_generation_webui", self.text_generation_webui_config)
-        GPT_MODEL.set_model_config("sparkdesk", self.sparkdesk_config)
-        GPT_MODEL.set_model_config("langchain_chatglm", self.langchain_chatglm_config)
+        GPT_MODEL.set_model_config("claude", self.claude_config)        
 
         self.chatgpt = None
         self.claude = None
@@ -140,6 +135,8 @@ def __init__(self, config_path):
             if not self.claude.reset_claude():
                 logging.error("重置Claude会话失败喵~")
         elif self.chat_type == "claude2":
+            GPT_MODEL.set_model_config("claude2", self.claude2_config)
+
             self.claude2 = GPT_MODEL.get(self.chat_type)
 
             # 初次运行 先重置下会话
@@ -156,15 +153,23 @@ def __init__(self, config_path):
                 logging.info(e)
                 exit(0)
         elif self.chat_type == "chatglm":
+            GPT_MODEL.set_model_config("chatglm", self.chatglm_config)
+
             self.chatglm = GPT_MODEL.get(self.chat_type)
         elif self.chat_type == "chat_with_file":
             from utils.chat_with_file.chat_with_file import Chat_with_file
             self.chat_with_file = Chat_with_file(self.chat_with_file_config)
         elif self.chat_type == "text_generation_webui":
+            GPT_MODEL.set_model_config("text_generation_webui", self.text_generation_webui_config)
+
             self.text_generation_webui = GPT_MODEL.get(self.chat_type) 
         elif self.chat_type == "sparkdesk":
+            GPT_MODEL.set_model_config("sparkdesk", self.sparkdesk_config)
+
             self.sparkdesk = GPT_MODEL.get(self.chat_type)
         elif self.chat_type == "langchain_chatglm":
+            GPT_MODEL.set_model_config("langchain_chatglm", self.langchain_chatglm_config)
+
             self.langchain_chatglm = GPT_MODEL.get(self.chat_type)
         elif self.chat_type == "game":
             # from game.game import Game
@@ -843,7 +848,7 @@ def comment_handle(self, data):
                 logging.info(f"[AI回复{user_name}]：{resp_content}")
             else:
                 resp_content = ""
-                logging.warning("警告：claude无返回")
+                logging.warning("警告：claude2无返回")
         elif self.chat_type == "chatterbot":
             # 生成回复
             resp_content = self.bot.get_response(content).text