From dbfe9c04917930cd10b64643bdce75a411cc491f Mon Sep 17 00:00:00 2001 From: tcmofashi Date: Thu, 6 Mar 2025 02:23:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=B8=BAlog=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0modelname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/models/utils_model.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/models/utils_model.py b/src/plugins/models/utils_model.py index 11d7e2b72..3e1a825a4 100644 --- a/src/plugins/models/utils_model.py +++ b/src/plugins/models/utils_model.py @@ -41,7 +41,7 @@ class LLM_request: # 发送请求到完整的chat/completions端点 api_url = f"{self.base_url.rstrip('/')}/chat/completions" - logger.info(f"发送请求到URL: {api_url}") # 记录请求的URL + logger.info(f"发送请求到URL: {api_url}+{self.model_name}") # 记录请求的URL max_retries = 3 base_wait_time = 15 @@ -122,7 +122,7 @@ class LLM_request: # 发送请求到完整的chat/completions端点 api_url = f"{self.base_url.rstrip('/')}/chat/completions" - logger.info(f"发送请求到URL: {api_url}") # 记录请求的URL + logger.info(f"发送请求到URL: {api_url}+{self.model_name}") # 记录请求的URL max_retries = 3 base_wait_time = 15 @@ -264,7 +264,7 @@ class LLM_request: # 发送请求到完整的chat/completions端点 api_url = f"{self.base_url.rstrip('/')}/chat/completions" - logger.info(f"发送请求到URL: {api_url}") # 记录请求的URL + logger.info(f"发送请求到URL: {api_url}+{self.model_name}") # 记录请求的URL max_retries = 2 base_wait_time = 6 @@ -329,7 +329,7 @@ class LLM_request: } api_url = f"{self.base_url.rstrip('/')}/embeddings" - logger.info(f"发送请求到URL: {api_url}") # 记录请求的URL + logger.info(f"发送请求到URL: {api_url}+{self.model_name}") # 记录请求的URL max_retries = 2 base_wait_time = 6 @@ -385,7 +385,7 @@ class LLM_request: } api_url = f"{self.base_url.rstrip('/')}/embeddings" - logger.info(f"发送请求到URL: {api_url}") # 记录请求的URL + logger.info(f"发送请求到URL: {api_url}+{self.model_name}") # 记录请求的URL max_retries = 3 base_wait_time = 15 From 3897c9787a59ba241138df7528ce0e03575006dc Mon Sep 17 00:00:00 2001 From: tcmofashi Date: Thu, 6 Mar 2025 06:45:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E5=90=8E=E7=BD=AEemotion=E7=94=9F?= =?UTF-8?q?=E6=88=90=EF=BC=8C=E5=A4=A7=E5=B9=85=E6=8F=90=E9=AB=98=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/chat/bot.py | 9 ++++++++- src/plugins/chat/llm_generator.py | 15 +++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/plugins/chat/bot.py b/src/plugins/chat/bot.py index e3525b3bb..398cb37e3 100644 --- a/src/plugins/chat/bot.py +++ b/src/plugins/chat/bot.py @@ -119,7 +119,7 @@ class ChatBot: willing_manager.change_reply_willing_sent(thinking_message.group_id) - response, emotion = await self.gpt.generate_response(message) + response,raw_content = await self.gpt.generate_response(message) # if response is None: # thinking_message.interupt=True @@ -171,6 +171,13 @@ class ChatBot: message_manager.add_message(message_set) bot_response_time = tinking_time_point + emotion = await self.gpt._get_emotion_tags(raw_content) + print(f"为 '{response}' 获取到的情感标签为：{emotion}") + valuedict={ + 'happy':0.5,'angry':-1,'sad':-0.5,'surprised':0.5,'disgusted':-1.5,'fearful':-0.25,'neutral':0.25 + } + await relationship_manager.update_relationship_value(message.user_id, relationship_value=valuedict[emotion[0]]) + if random() < global_config.emoji_chance: emoji_path = await emoji_manager.get_emoji_for_emotion(emotion) if emoji_path: diff --git a/src/plugins/chat/llm_generator.py b/src/plugins/chat/llm_generator.py index 04f2e73ad..ab0f4e12c 100644 --- a/src/plugins/chat/llm_generator.py +++ b/src/plugins/chat/llm_generator.py @@ -44,19 +44,15 @@ class ResponseGenerator: print(f"+++++++++++++++++{global_config.BOT_NICKNAME}{self.current_model_type}思考中+++++++++++++++++") model_response = await self._generate_response_with_model(message, current_model) + raw_content=model_response if model_response: print(f'{global_config.BOT_NICKNAME}的回复是：{model_response}') - model_response, emotion = await self._process_response(model_response) + model_response = await self._process_response(model_response) if model_response: - print(f"为 '{model_response}' 获取到的情感标签为：{emotion}") - valuedict={ - 'happy':0.5,'angry':-1,'sad':-0.5,'surprised':0.5,'disgusted':-1.5,'fearful':-0.25,'neutral':0.25 - } - await relationship_manager.update_relationship_value(message.user_id, relationship_value=valuedict[emotion[0]]) - return model_response, emotion - return None, [] + return model_response ,raw_content + return None,raw_content async def _generate_response_with_model(self, message: Message, model: LLM_request) -> Optional[str]: """使用指定的模型生成回复""" @@ -158,10 +154,9 @@ class ResponseGenerator: if not content: return None, [] - emotion_tags = await self._get_emotion_tags(content) processed_response = process_llm_response(content) - return processed_response, emotion_tags + return processed_response class InitiativeMessageGenerate: From 7c3fb28f10bb41499c910b3087aa698512cc8782 Mon Sep 17 00:00:00 2001 From: tcmofashi Date: Thu, 6 Mar 2025 08:18:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/models/utils_model.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/models/utils_model.py b/src/plugins/models/utils_model.py index 3e1a825a4..88fd831b8 100644 --- a/src/plugins/models/utils_model.py +++ b/src/plugins/models/utils_model.py @@ -41,7 +41,7 @@ class LLM_request: # 发送请求到完整的chat/completions端点 api_url = f"{self.base_url.rstrip('/')}/chat/completions" - logger.info(f"发送请求到URL: {api_url}+{self.model_name}") # 记录请求的URL + logger.info(f"发送请求到URL: {api_url}{self.model_name}") # 记录请求的URL max_retries = 3 base_wait_time = 15 @@ -122,7 +122,7 @@ class LLM_request: # 发送请求到完整的chat/completions端点 api_url = f"{self.base_url.rstrip('/')}/chat/completions" - logger.info(f"发送请求到URL: {api_url}+{self.model_name}") # 记录请求的URL + logger.info(f"发送请求到URL: {api_url}{self.model_name}") # 记录请求的URL max_retries = 3 base_wait_time = 15 @@ -264,7 +264,7 @@ class LLM_request: # 发送请求到完整的chat/completions端点 api_url = f"{self.base_url.rstrip('/')}/chat/completions" - logger.info(f"发送请求到URL: {api_url}+{self.model_name}") # 记录请求的URL + logger.info(f"发送请求到URL: {api_url}{self.model_name}") # 记录请求的URL max_retries = 2 base_wait_time = 6 @@ -329,7 +329,7 @@ class LLM_request: } api_url = f"{self.base_url.rstrip('/')}/embeddings" - logger.info(f"发送请求到URL: {api_url}+{self.model_name}") # 记录请求的URL + logger.info(f"发送请求到URL: {api_url}{self.model_name}") # 记录请求的URL max_retries = 2 base_wait_time = 6 @@ -385,7 +385,7 @@ class LLM_request: } api_url = f"{self.base_url.rstrip('/')}/embeddings" - logger.info(f"发送请求到URL: {api_url}+{self.model_name}") # 记录请求的URL + logger.info(f"发送请求到URL: {api_url}{self.model_name}") # 记录请求的URL max_retries = 3 base_wait_time = 15