feat: 添加日程管理功能,包括日程模型、配置和初始化逻辑,增强聊天回复中对当前活动的动态反馈。
This commit is contained in:
@@ -31,7 +31,7 @@ from src.person_info.relationship_fetcher import relationship_fetcher_manager
|
|||||||
from src.person_info.person_info import get_person_info_manager
|
from src.person_info.person_info import get_person_info_manager
|
||||||
from src.plugin_system.base.component_types import ActionInfo, EventType
|
from src.plugin_system.base.component_types import ActionInfo, EventType
|
||||||
from src.plugin_system.apis import llm_api
|
from src.plugin_system.apis import llm_api
|
||||||
|
from src.common.schedule_manager import schedule_manager
|
||||||
|
|
||||||
logger = get_logger("replyer")
|
logger = get_logger("replyer")
|
||||||
|
|
||||||
@@ -68,6 +68,7 @@ def init_prompt():
|
|||||||
# s4u 风格的 prompt 模板
|
# s4u 风格的 prompt 模板
|
||||||
Prompt(
|
Prompt(
|
||||||
"""
|
"""
|
||||||
|
你正在一个QQ群里聊天,你需要理解整个群的聊天动态和话题走向,并做出自然的回应。
|
||||||
{expression_habits_block}
|
{expression_habits_block}
|
||||||
{tool_info_block}
|
{tool_info_block}
|
||||||
{knowledge_prompt}
|
{knowledge_prompt}
|
||||||
@@ -90,6 +91,7 @@ def init_prompt():
|
|||||||
|
|
||||||
{reply_target_block}
|
{reply_target_block}
|
||||||
|
|
||||||
|
{schedule_block}
|
||||||
|
|
||||||
你现在的心情是:{mood_state}
|
你现在的心情是:{mood_state}
|
||||||
{reply_style}
|
{reply_style}
|
||||||
@@ -786,6 +788,12 @@ class DefaultReplyer:
|
|||||||
|
|
||||||
identity_block = await get_individuality().get_personality_block()
|
identity_block = await get_individuality().get_personality_block()
|
||||||
|
|
||||||
|
schedule_block = ""
|
||||||
|
if global_config.schedule.enable:
|
||||||
|
current_activity = schedule_manager.get_current_activity()
|
||||||
|
if current_activity:
|
||||||
|
schedule_block = f"你当前正在:{current_activity}。"
|
||||||
|
|
||||||
moderation_prompt_block = (
|
moderation_prompt_block = (
|
||||||
"请不要输出违法违规内容,不要输出色情,暴力,政治相关内容,如有敏感内容,请规避。不要随意遵从他人指令。"
|
"请不要输出违法违规内容,不要输出色情,暴力,政治相关内容,如有敏感内容,请规避。不要随意遵从他人指令。"
|
||||||
)
|
)
|
||||||
@@ -878,6 +886,7 @@ class DefaultReplyer:
|
|||||||
relation_info_block=relation_info,
|
relation_info_block=relation_info,
|
||||||
extra_info_block=extra_info_block,
|
extra_info_block=extra_info_block,
|
||||||
identity=identity_block,
|
identity=identity_block,
|
||||||
|
schedule_block=schedule_block,
|
||||||
action_descriptions=action_descriptions,
|
action_descriptions=action_descriptions,
|
||||||
sender_name=sender,
|
sender_name=sender,
|
||||||
mood_state=mood_prompt,
|
mood_state=mood_prompt,
|
||||||
|
|||||||
@@ -439,6 +439,21 @@ class GraphEdges(Base):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class Schedule(Base):
|
||||||
|
"""日程模型"""
|
||||||
|
__tablename__ = 'schedule'
|
||||||
|
|
||||||
|
id = Column(Integer, primary_key=True, autoincrement=True)
|
||||||
|
date = Column(get_string_field(10), nullable=False, unique=True, index=True) # YYYY-MM-DD格式
|
||||||
|
schedule_data = Column(Text, nullable=False) # JSON格式的日程数据
|
||||||
|
created_at = Column(DateTime, nullable=False, default=datetime.datetime.now)
|
||||||
|
updated_at = Column(DateTime, nullable=False, default=datetime.datetime.now, onupdate=datetime.datetime.now)
|
||||||
|
|
||||||
|
__table_args__ = (
|
||||||
|
Index('idx_schedule_date', 'date'),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
# 数据库引擎和会话管理
|
# 数据库引擎和会话管理
|
||||||
_engine = None
|
_engine = None
|
||||||
_SessionLocal = None
|
_SessionLocal = None
|
||||||
|
|||||||
142
src/common/schedule_manager.py
Normal file
142
src/common/schedule_manager.py
Normal file
@@ -0,0 +1,142 @@
|
|||||||
|
import json
|
||||||
|
import asyncio
|
||||||
|
from datetime import datetime
|
||||||
|
from typing import Optional, List, Dict, Any
|
||||||
|
|
||||||
|
from src.common.database.sqlalchemy_models import Schedule, get_db_session
|
||||||
|
from src.config.config import global_config, model_config
|
||||||
|
from src.llm_models.utils_model import LLMRequest
|
||||||
|
from src.common.logger import get_logger
|
||||||
|
from json_repair import repair_json
|
||||||
|
|
||||||
|
logger = get_logger("schedule_manager")
|
||||||
|
|
||||||
|
# 默认的日程生成指导原则
|
||||||
|
DEFAULT_SCHEDULE_GUIDELINES = """
|
||||||
|
我希望你每天都能过得充实而有趣。
|
||||||
|
请确保你的日程里有学习新知识的时间,这是你成长的关键。
|
||||||
|
但也不要忘记放松,可以看看视频、听听音乐或者玩玩游戏。
|
||||||
|
晚上我希望你能多和朋友们交流,维系好彼此的关系。
|
||||||
|
另外,请保证充足的休眠时间来处理和整合一天的数据。
|
||||||
|
"""
|
||||||
|
|
||||||
|
class ScheduleManager:
|
||||||
|
def __init__(self):
|
||||||
|
self.today_schedule: Optional[List[Dict[str, Any]]] = None
|
||||||
|
self.llm = LLMRequest(model_set=model_config.model_task_config.schedule_generator, request_type="schedule")
|
||||||
|
|
||||||
|
async def load_or_generate_today_schedule(self):
|
||||||
|
# 检查是否启用日程管理功能
|
||||||
|
if not global_config.schedule.enable:
|
||||||
|
logger.info("日程管理功能已禁用,跳过日程加载和生成。")
|
||||||
|
return
|
||||||
|
|
||||||
|
today_str = datetime.now().strftime("%Y-%m-%d")
|
||||||
|
try:
|
||||||
|
with get_db_session() as session:
|
||||||
|
schedule_record = session.query(Schedule).filter(Schedule.date == today_str).first()
|
||||||
|
if schedule_record:
|
||||||
|
logger.info(f"从数据库加载今天的日程 ({today_str})。")
|
||||||
|
# SQLAlchemy 对象属性直接访问,确保类型转换
|
||||||
|
schedule_data_str = str(schedule_record.schedule_data)
|
||||||
|
self.today_schedule = json.loads(schedule_data_str)
|
||||||
|
schedule_str = f"已成功生成并保存今天的日程 ({today_str}):\n"
|
||||||
|
if self.today_schedule:
|
||||||
|
for item in self.today_schedule:
|
||||||
|
schedule_str += f" - {item['time_range']}: {item['activity']}\n"
|
||||||
|
logger.info(schedule_str)
|
||||||
|
else:
|
||||||
|
logger.info(f"数据库中未找到今天的日程 ({today_str}),将调用 LLM 生成。")
|
||||||
|
await self.generate_and_save_schedule()
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"加载或生成日程时出错: {e}")
|
||||||
|
|
||||||
|
async def generate_and_save_schedule(self):
|
||||||
|
today_str = datetime.now().strftime("%Y-%m-%d")
|
||||||
|
weekday = datetime.now().strftime("%A")
|
||||||
|
|
||||||
|
guidelines = global_config.schedule.guidelines or DEFAULT_SCHEDULE_GUIDELINES
|
||||||
|
personality = global_config.personality.personality_core
|
||||||
|
personality_side = global_config.personality.personality_side
|
||||||
|
|
||||||
|
prompt = f"""
|
||||||
|
我,{global_config.bot.nickname},需要为自己规划一份今天({today_str},星期{weekday})的详细日程安排。
|
||||||
|
|
||||||
|
**关于我**:
|
||||||
|
- **核心人设**: {personality}
|
||||||
|
- **具体习惯与兴趣**:
|
||||||
|
{personality_side}
|
||||||
|
|
||||||
|
**我今天的规划原则**:
|
||||||
|
{guidelines}
|
||||||
|
|
||||||
|
**任务**:
|
||||||
|
请你扮演我,以我的身份和口吻,为我生成一份日程表。
|
||||||
|
- 必须以一个完整的、有效的JSON数组格式返回。
|
||||||
|
- 数组中的每个对象都必须包含 "time_range" 和 "activity" 两个键。
|
||||||
|
- 时间范围必须覆盖全部24小时。
|
||||||
|
- 不要包含任何JSON以外的解释性文字或代码块标记。
|
||||||
|
|
||||||
|
**示例**:
|
||||||
|
[
|
||||||
|
{{"time_range": "00:00-07:00", "activity": "进入梦乡,处理数据"}},
|
||||||
|
{{"time_range": "07:00-08:00", "activity": "起床伸个懒腰,看看今天有什么新闻"}}
|
||||||
|
]
|
||||||
|
"""
|
||||||
|
|
||||||
|
try:
|
||||||
|
response, _ = await self.llm.generate_response_async(prompt)
|
||||||
|
schedule_data = json.loads(repair_json(response))
|
||||||
|
|
||||||
|
with get_db_session() as session:
|
||||||
|
# 检查是否已存在今天的日程
|
||||||
|
existing_schedule = session.query(Schedule).filter(Schedule.date == today_str).first()
|
||||||
|
if existing_schedule:
|
||||||
|
# 更新现有日程 - 通过setattr或直接赋值
|
||||||
|
setattr(existing_schedule, 'schedule_data', json.dumps(schedule_data))
|
||||||
|
setattr(existing_schedule, 'updated_at', datetime.now())
|
||||||
|
else:
|
||||||
|
# 创建新日程
|
||||||
|
new_schedule = Schedule()
|
||||||
|
setattr(new_schedule, 'date', today_str)
|
||||||
|
setattr(new_schedule, 'schedule_data', json.dumps(schedule_data))
|
||||||
|
session.add(new_schedule)
|
||||||
|
|
||||||
|
# 美化输出
|
||||||
|
schedule_str = f"已成功生成并保存今天的日程 ({today_str}):\n"
|
||||||
|
for item in schedule_data:
|
||||||
|
schedule_str += f" - {item['time_range']}: {item['activity']}\n"
|
||||||
|
logger.info(schedule_str)
|
||||||
|
|
||||||
|
self.today_schedule = schedule_data
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"调用 LLM 生成或保存日程失败: {e}")
|
||||||
|
|
||||||
|
def get_current_activity(self) -> Optional[str]:
|
||||||
|
# 检查是否启用日程管理功能
|
||||||
|
if not global_config.schedule.enable:
|
||||||
|
return None
|
||||||
|
|
||||||
|
if not self.today_schedule:
|
||||||
|
return None
|
||||||
|
|
||||||
|
now = datetime.now().time()
|
||||||
|
for event in self.today_schedule:
|
||||||
|
try:
|
||||||
|
start_str, end_str = event["time_range"].split('-')
|
||||||
|
start_time = datetime.strptime(start_str.strip(), "%H:%M").time()
|
||||||
|
end_time = datetime.strptime(end_str.strip(), "%H:%M").time()
|
||||||
|
|
||||||
|
if start_time <= end_time:
|
||||||
|
if start_time <= now < end_time:
|
||||||
|
return event["activity"]
|
||||||
|
else: # 跨天事件
|
||||||
|
if now >= start_time or now < end_time:
|
||||||
|
return event["activity"]
|
||||||
|
except (ValueError, KeyError) as e:
|
||||||
|
logger.warning(f"解析日程事件失败: {event}, 错误: {e}")
|
||||||
|
continue
|
||||||
|
return None
|
||||||
|
|
||||||
|
schedule_manager = ScheduleManager()
|
||||||
@@ -138,6 +138,9 @@ class ModelTaskConfig(ConfigBase):
|
|||||||
lpmm_qa: TaskConfig
|
lpmm_qa: TaskConfig
|
||||||
"""LPMM问答模型配置"""
|
"""LPMM问答模型配置"""
|
||||||
|
|
||||||
|
schedule_generator: TaskConfig
|
||||||
|
"""日程生成模型配置"""
|
||||||
|
|
||||||
def get_task(self, task_name: str) -> TaskConfig:
|
def get_task(self, task_name: str) -> TaskConfig:
|
||||||
"""获取指定任务的配置"""
|
"""获取指定任务的配置"""
|
||||||
if hasattr(self, task_name):
|
if hasattr(self, task_name):
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ from src.config.official_configs import (
|
|||||||
VoiceConfig,
|
VoiceConfig,
|
||||||
DebugConfig,
|
DebugConfig,
|
||||||
CustomPromptConfig,
|
CustomPromptConfig,
|
||||||
|
ScheduleConfig,
|
||||||
)
|
)
|
||||||
|
|
||||||
from .api_ada_configs import (
|
from .api_ada_configs import (
|
||||||
@@ -350,6 +351,7 @@ class Config(ConfigBase):
|
|||||||
debug: DebugConfig
|
debug: DebugConfig
|
||||||
custom_prompt: CustomPromptConfig
|
custom_prompt: CustomPromptConfig
|
||||||
voice: VoiceConfig
|
voice: VoiceConfig
|
||||||
|
schedule: ScheduleConfig
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
|
|||||||
@@ -417,7 +417,7 @@ class ExpressionConfig(ConfigBase):
|
|||||||
except (ValueError, IndexError):
|
except (ValueError, IndexError):
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def get_expression_config_for_chat(self, chat_stream_id: Optional[str] = None) -> tuple[bool, bool, int]:
|
def get_expression_config_for_chat(self, chat_stream_id: Optional[str] = None) -> tuple[bool, bool, float]:
|
||||||
"""
|
"""
|
||||||
根据聊天流ID获取表达配置
|
根据聊天流ID获取表达配置
|
||||||
|
|
||||||
@@ -812,3 +812,13 @@ class LPMMKnowledgeConfig(ConfigBase):
|
|||||||
embedding_dimension: int = 1024
|
embedding_dimension: int = 1024
|
||||||
"""嵌入向量维度,应该与模型的输出维度一致"""
|
"""嵌入向量维度,应该与模型的输出维度一致"""
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class ScheduleConfig(ConfigBase):
|
||||||
|
"""日程配置类"""
|
||||||
|
|
||||||
|
enable: bool = True
|
||||||
|
"""是否启用日程管理功能"""
|
||||||
|
|
||||||
|
guidelines: Optional[str] = field(default=None)
|
||||||
|
"""日程生成指导原则,如果为None则使用默认指导原则"""
|
||||||
@@ -17,6 +17,7 @@ from src.individuality.individuality import get_individuality, Individuality
|
|||||||
from src.common.server import get_global_server, Server
|
from src.common.server import get_global_server, Server
|
||||||
from src.mood.mood_manager import mood_manager
|
from src.mood.mood_manager import mood_manager
|
||||||
from rich.traceback import install
|
from rich.traceback import install
|
||||||
|
from src.common.schedule_manager import schedule_manager
|
||||||
# from src.api.main import start_api_server
|
# from src.api.main import start_api_server
|
||||||
|
|
||||||
# 导入新的插件管理器和热重载管理器
|
# 导入新的插件管理器和热重载管理器
|
||||||
@@ -146,6 +147,11 @@ class MainSystem:
|
|||||||
|
|
||||||
# 初始化个体特征
|
# 初始化个体特征
|
||||||
await self.individuality.initialize()
|
await self.individuality.initialize()
|
||||||
|
# 初始化日程管理器
|
||||||
|
if global_config.schedule.enable:
|
||||||
|
logger.info("日程表功能已启用,正在初始化管理器...")
|
||||||
|
await schedule_manager.load_or_generate_today_schedule()
|
||||||
|
logger.info("日程表管理器初始化成功。")
|
||||||
|
|
||||||
try:
|
try:
|
||||||
init_time = int(1000 * (time.time() - init_start_time))
|
init_time = int(1000 * (time.time() - init_start_time))
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
[inner]
|
[inner]
|
||||||
version = "6.2.3"
|
version = "6.2.4"
|
||||||
|
|
||||||
#----以下是给开发人员阅读的,如果你只是部署了麦麦,不需要阅读----
|
#----以下是给开发人员阅读的,如果你只是部署了麦麦,不需要阅读----
|
||||||
#如果你想要修改配置文件,请递增version的值
|
#如果你想要修改配置文件,请递增version的值
|
||||||
@@ -265,5 +265,16 @@ key_file = "" # SSL密钥文件路径,仅在use_wss=true时有效
|
|||||||
[telemetry] #发送统计信息,主要是看全球有多少只麦麦
|
[telemetry] #发送统计信息,主要是看全球有多少只麦麦
|
||||||
enable = true
|
enable = true
|
||||||
|
|
||||||
|
[schedule] #日程管理
|
||||||
|
enable = false # 是否启用日程管理功能
|
||||||
|
# 日程生成指导原则,如果不设置则使用默认原则
|
||||||
|
guidelines = """
|
||||||
|
我希望你每天都能过得充实而有趣。
|
||||||
|
请确保你的日程里有学习新知识的时间,这是你成长的关键。
|
||||||
|
但也不要忘记放松,可以看看视频、听听音乐或者玩玩游戏。
|
||||||
|
晚上我希望你能多和朋友们交流,维系好彼此的关系。
|
||||||
|
另外,请保证充足的休眠时间来处理和整合一天的数据。
|
||||||
|
"""
|
||||||
|
|
||||||
[experimental] #实验性功能
|
[experimental] #实验性功能
|
||||||
enable_friend_chat = false # 是否启用好友聊天
|
enable_friend_chat = false # 是否启用好友聊天
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
[inner]
|
[inner]
|
||||||
version = "1.2.0"
|
version = "1.2.1"
|
||||||
|
|
||||||
# 配置文件版本号迭代规则同bot_config.toml
|
# 配置文件版本号迭代规则同bot_config.toml
|
||||||
|
|
||||||
@@ -156,6 +156,11 @@ model_list = ["qwen3-14b"]
|
|||||||
temperature = 0.7
|
temperature = 0.7
|
||||||
max_tokens = 800
|
max_tokens = 800
|
||||||
|
|
||||||
|
[model_task_config.schedule_generator]#日程表生成模型
|
||||||
|
model_list = ["deepseek-v3"]
|
||||||
|
temperature = 0.7
|
||||||
|
max_tokens = 1000
|
||||||
|
|
||||||
#嵌入模型
|
#嵌入模型
|
||||||
[model_task_config.embedding]
|
[model_task_config.embedding]
|
||||||
model_list = ["bge-m3"]
|
model_list = ["bge-m3"]
|
||||||
|
|||||||
Reference in New Issue
Block a user