From f3917aea50c9dd0a044d73129f8c37f20f2b2a63 Mon Sep 17 00:00:00 2001 From: tcmofashi Date: Mon, 3 Mar 2025 08:45:47 +0800 Subject: [PATCH] =?UTF-8?q?debug:=20=E5=AF=B9=E5=90=8D=E5=AD=97=E7=9A=84?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.prod | 24 ------------------------ src/plugins/chat/llm_generator.py | 4 ++-- src/plugins/chat/message_stream.py | 3 ++- src/plugins/chat/prompt_builder.py | 4 ++-- src/plugins/chat/utils.py | 5 ++++- 5 files changed, 10 insertions(+), 30 deletions(-) delete mode 100644 .env.prod diff --git a/.env.prod b/.env.prod deleted file mode 100644 index 3d795978..00000000 --- a/.env.prod +++ /dev/null @@ -1,24 +0,0 @@ -HOST=127.0.0.1 -PORT=8080 - -COMMAND_START=["/"] - -# 插件配置 -PLUGINS=["src2.plugins.chat"] - -# 默认配置 -MONGODB_HOST=127.0.0.1 -MONGODB_PORT=27017 -DATABASE_NAME=MegBot - -MONGODB_USERNAME = "" # 默认空值 -MONGODB_PASSWORD = "" # 默认空值 -MONGODB_AUTH_SOURCE = "" # 默认空值 - -#key and url -CHAT_ANY_WHERE_KEY= -SILICONFLOW_KEY= -CHAT_ANY_WHERE_BASE_URL=https://api.chatanywhere.tech/v1 -SILICONFLOW_BASE_URL=https://api.siliconflow.cn/v1/ -DEEP_SEEK_KEY= -DEEP_SEEK_BASE_URL=https://api.deepseek.com/v1 \ No newline at end of file diff --git a/src/plugins/chat/llm_generator.py b/src/plugins/chat/llm_generator.py index fc2fc11f..7abbda56 100644 --- a/src/plugins/chat/llm_generator.py +++ b/src/plugins/chat/llm_generator.py @@ -274,8 +274,8 @@ class LLMResponseGenerator: for msg_dict in messages_list: time_str = time.strftime("%m-%d %H:%M:%S", time.localtime(msg_dict['time'])) display_name = msg_dict.get('user_nickname', f"用户{msg_dict['user_id']}") - cardname = msg_dict.get('user_cardname', f"用户{msg_dict['user_id']}") - display_name = f"[({msg_dict['user_id']}){display_name}]{cardname}" + cardname = msg_dict.get('user_cardname', '') + display_name = f"[({msg_dict['user_id']}){display_name}]{cardname}" if cardname!='' else display_name content = msg_dict.get('processed_plain_text', msg_dict['plain_text']) group_chat += f"[{time_str}] {display_name}: {content}\n" diff --git a/src/plugins/chat/message_stream.py b/src/plugins/chat/message_stream.py index e91d419c..2c34f859 100644 --- a/src/plugins/chat/message_stream.py +++ b/src/plugins/chat/message_stream.py @@ -56,6 +56,7 @@ class MessageStream: "time": time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(msg.time)), "user_id": msg.user_id, "user_nickname": msg.user_nickname, + "user_cardname": msg.user_cardname, "message_id": msg.message_id, "raw_message": msg.raw_message, "processed_text": msg.processed_plain_text @@ -130,7 +131,7 @@ class MessageStream: "time": 1, "user_id": 1, "user_nickname": 1, - "user_cardname": 1, + # "user_cardname": 1, "message_id": 1, "raw_message": 1, "processed_text": 1 diff --git a/src/plugins/chat/prompt_builder.py b/src/plugins/chat/prompt_builder.py index 6ad5226b..39640d2b 100644 --- a/src/plugins/chat/prompt_builder.py +++ b/src/plugins/chat/prompt_builder.py @@ -193,9 +193,9 @@ class PromptBuilder: prompt_personality_check = '' extra_check_info=f"请注意把握群里的聊天内容的基础上，综合群内的氛围，例如，和{global_config.BOT_NICKNAME}相关的话题要积极回复,如果是at自己的消息一定要回复，如果自己正在和别人聊天一定要回复，其他话题如果合适搭话也可以回复，如果认为应该回复请输出yes，否则输出no，请注意是决定是否需要回复，而不是编写回复内容，除了yes和no不要输出任何回复内容。" if personality_choice < 4/6: # 第一种人格 - prompt_personality_check = f'''你的网名叫{global_config.BOT_NICKNAME}，曾经是一个学习地质的女大学生，现在学习心理学和脑科学，你会刷贴吧，你正在浏览qq群,{promt_info_prompt} {activate_prompt_check} {extra_check_info}''' + prompt_personality_check = f'''你的网名叫{global_config.BOT_NICKNAME}，{personality[0]}，{promt_info_prompt} {activate_prompt_check} {extra_check_info}''' elif personality_choice < 1: # 第二种人格 - prompt_personality_check = f'''你的网名叫{global_config.BOT_NICKNAME}，是一个女大学生，你有黑色头发，你会刷小红书, 你正在浏览qq群,{promt_info_prompt} {activate_prompt_check} {extra_check_info}''' + prompt_personality_check = f'''你的网名叫{global_config.BOT_NICKNAME}，{personality[1]}，{promt_info_prompt} {activate_prompt_check} {extra_check_info}''' prompt_check_if_response=f"{prompt_info}\n{prompt_date}\n{chat_talking_prompt}\n{prompt_personality_check}" diff --git a/src/plugins/chat/utils.py b/src/plugins/chat/utils.py index 78dd082b..7b0b8261 100644 --- a/src/plugins/chat/utils.py +++ b/src/plugins/chat/utils.py @@ -37,7 +37,10 @@ def combine_messages(messages: List[Message]) -> str: def db_message_to_str (message_dict: Dict) -> str: print(f"message_dict: {message_dict}") time_str = time.strftime("%m-%d %H:%M:%S", time.localtime(message_dict["time"])) - name = message_dict.get("user_nickname", "") or f"用户{message_dict['user_id']}" + try: + name="[(%s)%s]%s" % (message_dict['user_id'],message_dict.get("user_nickname", ""),message_dict.get("user_cardname", "")) + except: + name = message_dict.get("user_nickname", "") or f"用户{message_dict['user_id']}" content = message_dict.get("processed_plain_text", "") result = f"[{time_str}] {name}: {content}\n" print(f"result: {result}")