From 4bf425521a9e4ed10611b2f6d3b31b212a63d3a5 Mon Sep 17 00:00:00 2001 From: SengokuCola <1026294844@qq.com> Date: Wed, 5 Mar 2025 00:24:46 +0800 Subject: [PATCH] litttel 1 --- src/plugins/chat/message_sender.py | 3 +- src/plugins/chat/willing_manager.py | 4 +-- src/plugins/knowledege/knowledge_library.py | 35 ++++++++++++--------- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/src/plugins/chat/message_sender.py b/src/plugins/chat/message_sender.py index 7ea0b5590..998586943 100644 --- a/src/plugins/chat/message_sender.py +++ b/src/plugins/chat/message_sender.py @@ -145,7 +145,8 @@ class MessageManager: async def process_group_messages(self, group_id: int): """处理群消息""" - print(f"\033[1;34m[调试]\033[0m 开始处理群{group_id}的消息") + # if int(time.time() / 3) == time.time() / 3: + # print(f"\033[1;34m[调试]\033[0m 开始处理群{group_id}的消息") container = self.get_container(group_id) if container.has_messages(): #最早的对象,可能是思考消息,也可能是发送消息 diff --git a/src/plugins/chat/willing_manager.py b/src/plugins/chat/willing_manager.py index 0c4a76316..f90889f77 100644 --- a/src/plugins/chat/willing_manager.py +++ b/src/plugins/chat/willing_manager.py @@ -37,9 +37,9 @@ class WillingManager: current_willing *= 0.15 print(f"表情包, 当前意愿: {current_willing}") - if interested_rate > 0.6: + if interested_rate > 0.65: print(f"兴趣度: {interested_rate}, 当前意愿: {current_willing}") - current_willing += interested_rate-0.45 + current_willing += interested_rate-0.5 self.group_reply_willing[group_id] = min(current_willing, 3.0) diff --git a/src/plugins/knowledege/knowledge_library.py b/src/plugins/knowledege/knowledge_library.py index f8e91039b..cd6122b4c 100644 --- a/src/plugins/knowledege/knowledge_library.py +++ b/src/plugins/knowledege/knowledge_library.py @@ -3,26 +3,28 @@ import sys import numpy as np import requests import time -from nonebot import get_driver - -driver = get_driver() -config = driver.config +from dotenv import load_dotenv # 添加项目根目录到 Python 路径 root_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../..")) sys.path.append(root_path) -from src.common.database import Database -from src.plugins.chat.config import llm_config +# 加载根目录下的env.edv文件 +env_path = os.path.join(root_path, ".env.dev") +if not os.path.exists(env_path): + raise FileNotFoundError(f"配置文件不存在: {env_path}") +load_dotenv(env_path) -# 直接配置数据库连接信息 +from src.common.database import Database + +# 从环境变量获取配置 Database.initialize( - host= config.MONGODB_HOST, - port= int(config.MONGODB_PORT), - db_name= config.DATABASE_NAME, - username= config.MONGODB_USERNAME, - password= config.MONGODB_PASSWORD, - auth_source=config.MONGODB_AUTH_SOURCE + host=os.getenv("MONGODB_HOST", "localhost"), + port=int(os.getenv("MONGODB_PORT", "27017")), + db_name=os.getenv("DATABASE_NAME", "maimai"), + username=os.getenv("MONGODB_USERNAME"), + password=os.getenv("MONGODB_PASSWORD"), + auth_source=os.getenv("MONGODB_AUTH_SOURCE", "admin") ) class KnowledgeLibrary: @@ -30,6 +32,9 @@ class KnowledgeLibrary: self.db = Database.get_instance() self.raw_info_dir = "data/raw_info" self._ensure_dirs() + self.api_key = os.getenv("SILICONFLOW_KEY") + if not self.api_key: + raise ValueError("SILICONFLOW_API_KEY 环境变量未设置") def _ensure_dirs(self): """确保必要的目录存在""" @@ -44,7 +49,7 @@ class KnowledgeLibrary: "encoding_format": "float" } headers = { - "Authorization": f"Bearer {llm_config.SILICONFLOW_API_KEY}", + "Authorization": f"Bearer {self.api_key}", "Content-Type": "application/json" } @@ -74,7 +79,7 @@ class KnowledgeLibrary: content = f.read() # 按1024字符分段 - segments = [content[i:i+300] for i in range(0, len(content), 300)] + segments = [content[i:i+400] for i in range(0, len(content), 400)] # 处理每个分段 for segment in segments: