feat(规划): 引入统一的规划系统并重构组件
本次提交引入了一个全新的统一规划系统，取代了独立的日程和月度计划模块。这一变更集中了配置并解耦了职责，以提高可维护性和清晰度。 核心逻辑现在被分解为专门的组件： - PlanManager: 处理日常日程和月度目标的所有数据库交互，取代了已-删除的 monthly_plan_db.py。 - ScheduleLLMGenerator: 封装了与 LLM 交互以生成日程的逻辑，将此职责从 ScheduleManager 中移除。 - MonthlyPlanManager: 现在作为核心 PlanManager 的简化接口。 这次架构性的大修通过将数据持久化和 LLM 生成逻辑从主调度逻辑中抽象出来，简化了整体设计。 重大变更: bot_config.toml 中的配置已被迁移。移除了 [schedule] 和 [monthly_plan_system] 部分。所有相关设置现在必须在新的 [planning_system] 部分下进行配置。
This commit is contained in:
minecraft1024a
293
src/schedule/database.py
Normal file
293
src/schedule/database.py
Normal file
@@ -0,0 +1,293 @@
|
||||
# mmc/src/schedule/database.py
|
||||
|
||||
from typing import List
|
||||
from src.common.database.sqlalchemy_models import MonthlyPlan, get_db_session
|
||||
from src.common.logger import get_logger
|
||||
from src.config.config import global_config
|
||||
|
||||
logger = get_logger("schedule_database")
|
||||
|
||||
|
||||
def add_new_plans(plans: List[str], month: str):
|
||||
"""
|
||||
批量添加新生成的月度计划到数据库，并确保不超过上限。
|
||||
|
||||
:param plans: 计划内容列表。
|
||||
:param month: 目标月份，格式为 "YYYY-MM"。
|
||||
"""
|
||||
with get_db_session() as session:
|
||||
try:
|
||||
# 1. 获取当前有效计划数量（状态为 'active'）
|
||||
current_plan_count = (
|
||||
session.query(MonthlyPlan)
|
||||
.filter(MonthlyPlan.target_month == month, MonthlyPlan.status == "active")
|
||||
.count()
|
||||
)
|
||||
|
||||
# 2. 从配置获取上限
|
||||
max_plans = global_config.planning_system.max_plans_per_month
|
||||
|
||||
# 3. 计算还能添加多少计划
|
||||
remaining_slots = max_plans - current_plan_count
|
||||
|
||||
if remaining_slots <= 0:
|
||||
logger.info(f"{month} 的月度计划已达到上限 ({max_plans}条)，不再添加新计划。")
|
||||
return
|
||||
|
||||
# 4. 截取可以添加的计划
|
||||
plans_to_add = plans[:remaining_slots]
|
||||
|
||||
new_plan_objects = [
|
||||
MonthlyPlan(plan_text=plan, target_month=month, status="active") for plan in plans_to_add
|
||||
]
|
||||
session.add_all(new_plan_objects)
|
||||
session.commit()
|
||||
|
||||
logger.info(f"成功向数据库添加了 {len(new_plan_objects)} 条 {month} 的月度计划。")
|
||||
if len(plans) > len(plans_to_add):
|
||||
logger.info(f"由于达到月度计划上限，有 {len(plans) - len(plans_to_add)} 条计划未被添加。")
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"添加月度计划时发生错误: {e}")
|
||||
session.rollback()
|
||||
raise
|
||||
|
||||
|
||||
def get_active_plans_for_month(month: str) -> List[MonthlyPlan]:
|
||||
"""
|
||||
获取指定月份所有状态为 'active' 的计划。
|
||||
|
||||
:param month: 目标月份，格式为 "YYYY-MM"。
|
||||
:return: MonthlyPlan 对象列表。
|
||||
"""
|
||||
with get_db_session() as session:
|
||||
try:
|
||||
plans = (
|
||||
session.query(MonthlyPlan)
|
||||
.filter(MonthlyPlan.target_month == month, MonthlyPlan.status == "active")
|
||||
.order_by(MonthlyPlan.created_at.desc())
|
||||
.all()
|
||||
)
|
||||
return plans
|
||||
except Exception as e:
|
||||
logger.error(f"查询 {month} 的有效月度计划时发生错误: {e}")
|
||||
return []
|
||||
|
||||
|
||||
def mark_plans_completed(plan_ids: List[int]):
|
||||
"""
|
||||
将指定ID的计划标记为已完成。
|
||||
|
||||
:param plan_ids: 需要标记为完成的计划ID列表。
|
||||
"""
|
||||
if not plan_ids:
|
||||
return
|
||||
|
||||
with get_db_session() as session:
|
||||
try:
|
||||
plans_to_mark = session.query(MonthlyPlan).filter(MonthlyPlan.id.in_(plan_ids)).all()
|
||||
if not plans_to_mark:
|
||||
logger.info("没有需要标记为完成的月度计划。")
|
||||
return
|
||||
|
||||
plan_details = "\n".join([f" {i + 1}. {plan.plan_text}" for i, plan in enumerate(plans_to_mark)])
|
||||
logger.info(f"以下 {len(plans_to_mark)} 条月度计划将被标记为已完成:\n{plan_details}")
|
||||
|
||||
session.query(MonthlyPlan).filter(MonthlyPlan.id.in_(plan_ids)).update(
|
||||
{"status": "completed"}, synchronize_session=False
|
||||
)
|
||||
session.commit()
|
||||
except Exception as e:
|
||||
logger.error(f"标记月度计划为完成时发生错误: {e}")
|
||||
session.rollback()
|
||||
raise
|
||||
|
||||
|
||||
def delete_plans_by_ids(plan_ids: List[int]):
|
||||
"""
|
||||
根据ID列表从数据库中物理删除月度计划。
|
||||
|
||||
:param plan_ids: 需要删除的计划ID列表。
|
||||
"""
|
||||
if not plan_ids:
|
||||
return
|
||||
|
||||
with get_db_session() as session:
|
||||
try:
|
||||
# 先查询要删除的计划，用于日志记录
|
||||
plans_to_delete = session.query(MonthlyPlan).filter(MonthlyPlan.id.in_(plan_ids)).all()
|
||||
if not plans_to_delete:
|
||||
logger.info("没有找到需要删除的月度计划。")
|
||||
return
|
||||
|
||||
plan_details = "\n".join([f" {i + 1}. {plan.plan_text}" for i, plan in enumerate(plans_to_delete)])
|
||||
logger.info(f"检测到月度计划超额，将删除以下 {len(plans_to_delete)} 条计划:\n{plan_details}")
|
||||
|
||||
# 执行删除
|
||||
session.query(MonthlyPlan).filter(MonthlyPlan.id.in_(plan_ids)).delete(synchronize_session=False)
|
||||
session.commit()
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"删除月度计划时发生错误: {e}")
|
||||
session.rollback()
|
||||
raise
|
||||
|
||||
|
||||
def update_plan_usage(plan_ids: List[int], used_date: str):
|
||||
"""
|
||||
更新计划的使用统计信息。
|
||||
|
||||
:param plan_ids: 使用的计划ID列表。
|
||||
:param used_date: 使用日期，格式为 "YYYY-MM-DD"。
|
||||
"""
|
||||
if not plan_ids:
|
||||
return
|
||||
|
||||
with get_db_session() as session:
|
||||
try:
|
||||
# 获取完成阈值配置，如果不存在则使用默认值
|
||||
completion_threshold = getattr(global_config.planning_system, "completion_threshold", 3)
|
||||
|
||||
# 批量更新使用次数和最后使用日期
|
||||
session.query(MonthlyPlan).filter(MonthlyPlan.id.in_(plan_ids)).update(
|
||||
{"usage_count": MonthlyPlan.usage_count + 1, "last_used_date": used_date}, synchronize_session=False
|
||||
)
|
||||
|
||||
# 检查是否有计划达到完成阈值
|
||||
plans_to_complete = (
|
||||
session.query(MonthlyPlan)
|
||||
.filter(
|
||||
MonthlyPlan.id.in_(plan_ids),
|
||||
MonthlyPlan.usage_count >= completion_threshold,
|
||||
MonthlyPlan.status == "active",
|
||||
)
|
||||
.all()
|
||||
)
|
||||
|
||||
if plans_to_complete:
|
||||
completed_ids = [plan.id for plan in plans_to_complete]
|
||||
session.query(MonthlyPlan).filter(MonthlyPlan.id.in_(completed_ids)).update(
|
||||
{"status": "completed"}, synchronize_session=False
|
||||
)
|
||||
|
||||
logger.info(f"计划 {completed_ids} 已达到使用阈值 ({completion_threshold})，标记为已完成。")
|
||||
|
||||
session.commit()
|
||||
logger.info(f"成功更新了 {len(plan_ids)} 条月度计划的使用统计。")
|
||||
except Exception as e:
|
||||
logger.error(f"更新月度计划使用统计时发生错误: {e}")
|
||||
session.rollback()
|
||||
raise
|
||||
|
||||
|
||||
def get_smart_plans_for_daily_schedule(month: str, max_count: int = 3, avoid_days: int = 7) -> List[MonthlyPlan]:
|
||||
"""
|
||||
智能抽取月度计划用于每日日程生成。
|
||||
|
||||
抽取规则：
|
||||
1. 避免短期内重复（avoid_days 天内不重复抽取同一个计划）
|
||||
2. 优先抽取使用次数较少的计划
|
||||
3. 在满足以上条件的基础上随机抽取
|
||||
|
||||
:param month: 目标月份，格式为 "YYYY-MM"。
|
||||
:param max_count: 最多抽取的计划数量。
|
||||
:param avoid_days: 避免重复的天数。
|
||||
:return: MonthlyPlan 对象列表。
|
||||
"""
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
with get_db_session() as session:
|
||||
try:
|
||||
# 计算避免重复的日期阈值
|
||||
avoid_date = (datetime.now() - timedelta(days=avoid_days)).strftime("%Y-%m-%d")
|
||||
|
||||
# 查询符合条件的计划
|
||||
query = session.query(MonthlyPlan).filter(MonthlyPlan.target_month == month, MonthlyPlan.status == "active")
|
||||
|
||||
# 排除最近使用过的计划
|
||||
query = query.filter((MonthlyPlan.last_used_date.is_(None)) | (MonthlyPlan.last_used_date < avoid_date))
|
||||
|
||||
# 按使用次数升序排列，优先选择使用次数少的
|
||||
plans = query.order_by(MonthlyPlan.usage_count.asc()).all()
|
||||
|
||||
if not plans:
|
||||
logger.info(f"没有找到符合条件的 {month} 月度计划。")
|
||||
return []
|
||||
|
||||
# 如果计划数量超过需要的数量，进行随机抽取
|
||||
if len(plans) > max_count:
|
||||
import random
|
||||
|
||||
plans = random.sample(plans, max_count)
|
||||
|
||||
logger.info(f"智能抽取了 {len(plans)} 条 {month} 的月度计划用于每日日程生成。")
|
||||
return plans
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"智能抽取 {month} 的月度计划时发生错误: {e}")
|
||||
return []
|
||||
|
||||
|
||||
def archive_active_plans_for_month(month: str):
|
||||
"""
|
||||
将指定月份所有状态为 'active' 的计划归档为 'archived'。
|
||||
通常在月底调用。
|
||||
|
||||
:param month: 目标月份，格式为 "YYYY-MM"。
|
||||
"""
|
||||
with get_db_session() as session:
|
||||
try:
|
||||
updated_count = (
|
||||
session.query(MonthlyPlan)
|
||||
.filter(MonthlyPlan.target_month == month, MonthlyPlan.status == "active")
|
||||
.update({"status": "archived"}, synchronize_session=False)
|
||||
)
|
||||
|
||||
session.commit()
|
||||
logger.info(f"成功将 {updated_count} 条 {month} 的活跃月度计划归档。")
|
||||
return updated_count
|
||||
except Exception as e:
|
||||
logger.error(f"归档 {month} 的月度计划时发生错误: {e}")
|
||||
session.rollback()
|
||||
raise
|
||||
|
||||
|
||||
def get_archived_plans_for_month(month: str) -> List[MonthlyPlan]:
|
||||
"""
|
||||
获取指定月份所有状态为 'archived' 的计划。
|
||||
用于生成下个月计划时的参考。
|
||||
|
||||
:param month: 目标月份，格式为 "YYYY-MM"。
|
||||
:return: MonthlyPlan 对象列表。
|
||||
"""
|
||||
with get_db_session() as session:
|
||||
try:
|
||||
plans = (
|
||||
session.query(MonthlyPlan)
|
||||
.filter(MonthlyPlan.target_month == month, MonthlyPlan.status == "archived")
|
||||
.all()
|
||||
)
|
||||
return plans
|
||||
except Exception as e:
|
||||
logger.error(f"查询 {month} 的归档月度计划时发生错误: {e}")
|
||||
return []
|
||||
|
||||
|
||||
def has_active_plans(month: str) -> bool:
|
||||
"""
|
||||
检查指定月份是否存在任何状态为 'active' 的计划。
|
||||
|
||||
:param month: 目标月份，格式为 "YYYY-MM"。
|
||||
:return: 如果存在则返回 True，否则返回 False。
|
||||
"""
|
||||
with get_db_session() as session:
|
||||
try:
|
||||
count = (
|
||||
session.query(MonthlyPlan)
|
||||
.filter(MonthlyPlan.target_month == month, MonthlyPlan.status == "active")
|
||||
.count()
|
||||
)
|
||||
return count > 0
|
||||
except Exception as e:
|
||||
logger.error(f"检查 {month} 的有效月度计划时发生错误: {e}")
|
||||
return False
|
||||
224
src/schedule/llm_generator.py
Normal file
224
src/schedule/llm_generator.py
Normal file
@@ -0,0 +1,224 @@
|
||||
# mmc/src/schedule/llm_generator.py
|
||||
|
||||
import asyncio
|
||||
import orjson
|
||||
from datetime import datetime
|
||||
from typing import List, Optional, Dict, Any
|
||||
from lunar_python import Lunar
|
||||
from json_repair import repair_json
|
||||
|
||||
from src.common.database.sqlalchemy_models import MonthlyPlan
|
||||
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 .schemas import ScheduleData
|
||||
|
||||
logger = get_logger("schedule_llm_generator")
|
||||
|
||||
# 默认的日程生成指导原则
|
||||
DEFAULT_SCHEDULE_GUIDELINES = """
|
||||
我希望你每天都能过得充实而有趣。
|
||||
请确保你的日程里有学习新知识的时间，这是你成长的关键。
|
||||
但也不要忘记放松，可以看看视频、听听音乐或者玩玩游戏。
|
||||
晚上我希望你能多和朋友们交流，维系好彼此的关系。
|
||||
另外，请保证充足的休眠时间来处理和整合一天的数据。
|
||||
"""
|
||||
|
||||
# 默认的月度计划生成指导原则
|
||||
DEFAULT_MONTHLY_PLAN_GUIDELINES = """
|
||||
我希望你能为自己制定一些有意义的月度小目标和计划。
|
||||
这些计划应该涵盖学习、娱乐、社交、个人成长等各个方面。
|
||||
每个计划都应该是具体可行的，能够在一个月内通过日常活动逐步实现。
|
||||
请确保计划既有挑战性又不会过于繁重，保持生活的平衡和乐趣。
|
||||
"""
|
||||
|
||||
|
||||
class ScheduleLLMGenerator:
|
||||
def __init__(self):
|
||||
self.llm = LLMRequest(model_set=model_config.model_task_config.schedule_generator, request_type="schedule")
|
||||
|
||||
async def generate_schedule_with_llm(self, sampled_plans: List[MonthlyPlan]) -> Optional[List[Dict[str, Any]]]:
|
||||
now = datetime.now()
|
||||
today_str = now.strftime("%Y-%m-%d")
|
||||
weekday = now.strftime("%A")
|
||||
|
||||
# 新增：获取节日信息
|
||||
lunar = Lunar.fromDate(now)
|
||||
festivals = lunar.getFestivals()
|
||||
other_festivals = lunar.getOtherFestivals()
|
||||
all_festivals = festivals + other_festivals
|
||||
|
||||
festival_block = ""
|
||||
if all_festivals:
|
||||
festival_text = "、".join(all_festivals)
|
||||
festival_block = f"**今天也是一个特殊的日子: {festival_text}！请在日程中考虑和庆祝这个节日。**"
|
||||
|
||||
monthly_plans_block = ""
|
||||
if sampled_plans:
|
||||
plan_texts = "\n".join([f"- {plan.plan_text}" for plan in sampled_plans])
|
||||
monthly_plans_block = f"""
|
||||
**我这个月的一些小目标/计划 (请在今天的日程中适当体现)**:
|
||||
{plan_texts}
|
||||
"""
|
||||
|
||||
guidelines = global_config.planning_system.schedule_guidelines or DEFAULT_SCHEDULE_GUIDELINES
|
||||
personality = global_config.personality.personality_core
|
||||
personality_side = global_config.personality.personality_side
|
||||
|
||||
base_prompt = f"""
|
||||
我，{global_config.bot.nickname}，需要为自己规划一份今天（{today_str}，星期{weekday}）的详细日程安排。
|
||||
{festival_block}
|
||||
**关于我**:
|
||||
- **核心人设**: {personality}
|
||||
- **具体习惯与兴趣**:
|
||||
{personality_side}
|
||||
{monthly_plans_block}
|
||||
**我今天的规划原则**:
|
||||
{guidelines}
|
||||
|
||||
**重要要求**:
|
||||
1. 必须返回一个完整的、有效的JSON数组格式
|
||||
2. 数组中的每个对象都必须包含 "time_range" 和 "activity" 两个键
|
||||
3. 时间范围必须覆盖全部24小时，不能有遗漏
|
||||
4. time_range格式必须为 "HH:MM-HH:MM" (24小时制)
|
||||
5. 相邻的时间段必须连续，不能有间隙
|
||||
6. 不要包含任何JSON以外的解释性文字或代码块标记
|
||||
**示例**:
|
||||
[
|
||||
{{"time_range": "00:00-07:00", "activity": "进入梦乡，处理数据"}},
|
||||
{{"time_range": "07:00-08:00", "activity": "起床伸个懒腰，看看今天有什么新闻"}},
|
||||
{{"time_range": "08:00-09:00", "activity": "享用早餐，规划今天的任务"}},
|
||||
{{"time_range": "09:00-23:30", "activity": "其他活动"}},
|
||||
{{"time_range": "23:30-00:00", "activity": "准备休眠"}}
|
||||
]
|
||||
|
||||
请你扮演我，以我的身份和口吻，为我生成一份完整的24小时日程表。
|
||||
"""
|
||||
attempt = 0
|
||||
while True:
|
||||
attempt += 1
|
||||
try:
|
||||
logger.info(f"正在生成日程 (第 {attempt} 次尝试)")
|
||||
prompt = base_prompt
|
||||
if attempt > 1:
|
||||
failure_hint = f"""
|
||||
**重要提醒 (第{attempt}次尝试)**:
|
||||
- 前面{attempt - 1}次生成都失败了，请务必严格按照要求生成完整的24小时日程
|
||||
- 确保JSON格式正确，所有时间段连续覆盖24小时
|
||||
- 时间格式必须为HH:MM-HH:MM，不能有时间间隙或重叠
|
||||
- 不要输出任何解释文字，只输出纯JSON数组
|
||||
- 确保输出完整，不要被截断
|
||||
"""
|
||||
prompt += failure_hint
|
||||
|
||||
response, _ = await self.llm.generate_response_async(prompt)
|
||||
schedule_data = orjson.loads(repair_json(response))
|
||||
|
||||
if self._validate_schedule_with_pydantic(schedule_data):
|
||||
return schedule_data
|
||||
else:
|
||||
logger.warning(f"第 {attempt} 次生成的日程验证失败，继续重试...")
|
||||
await asyncio.sleep(2)
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"第 {attempt} 次生成日程失败: {e}")
|
||||
logger.info("继续重试...")
|
||||
await asyncio.sleep(3)
|
||||
|
||||
def _validate_schedule_with_pydantic(self, schedule_data) -> bool:
|
||||
try:
|
||||
ScheduleData(schedule=schedule_data)
|
||||
logger.info("日程数据Pydantic验证通过")
|
||||
return True
|
||||
except Exception as e:
|
||||
logger.warning(f"日程数据Pydantic验证失败: {e}")
|
||||
return False
|
||||
|
||||
|
||||
class MonthlyPlanLLMGenerator:
|
||||
def __init__(self):
|
||||
self.llm = LLMRequest(model_set=model_config.model_task_config.schedule_generator, request_type="monthly_plan")
|
||||
|
||||
async def generate_plans_with_llm(self, target_month: str, archived_plans: List[MonthlyPlan]) -> List[str]:
|
||||
guidelines = global_config.planning_system.monthly_plan_guidelines or DEFAULT_MONTHLY_PLAN_GUIDELINES
|
||||
personality = global_config.personality.personality_core
|
||||
personality_side = global_config.personality.personality_side
|
||||
max_plans = global_config.planning_system.max_plans_per_month
|
||||
|
||||
archived_plans_block = ""
|
||||
if archived_plans:
|
||||
archived_texts = [f"- {plan.plan_text}" for plan in archived_plans[:5]]
|
||||
archived_plans_block = f"""
|
||||
**上个月未完成的一些计划（可作为参考）**:
|
||||
{chr(10).join(archived_texts)}
|
||||
|
||||
你可以考虑是否要在这个月继续推进这些计划，或者制定全新的计划。
|
||||
"""
|
||||
|
||||
prompt = f"""
|
||||
我，{global_config.bot.nickname}，需要为自己制定 {target_month} 的月度计划。
|
||||
|
||||
**关于我**:
|
||||
- **核心人设**: {personality}
|
||||
- **具体习惯与兴趣**:
|
||||
{personality_side}
|
||||
|
||||
{archived_plans_block}
|
||||
|
||||
**我的月度计划制定原则**:
|
||||
{guidelines}
|
||||
|
||||
**重要要求**:
|
||||
1. 请为我生成 {max_plans} 条左右的月度计划
|
||||
2. 每条计划都应该是一句话，简洁明了，具体可行
|
||||
3. 计划应该涵盖不同的生活方面（学习、娱乐、社交、个人成长等）
|
||||
4. 返回格式必须是纯文本，每行一条计划，不要使用 JSON 或其他格式
|
||||
5. 不要包含任何解释性文字，只返回计划列表
|
||||
|
||||
**示例格式**:
|
||||
学习一门新的编程语言或技术
|
||||
每周至少看两部有趣的电影
|
||||
与朋友们组织一次户外活动
|
||||
阅读3本感兴趣的书籍
|
||||
尝试制作一道新的料理
|
||||
|
||||
请你扮演我，以我的身份和兴趣，为 {target_month} 制定合适的月度计划。
|
||||
"""
|
||||
max_retries = 3
|
||||
for attempt in range(1, max_retries + 1):
|
||||
try:
|
||||
logger.info(f" 正在生成月度计划 (第 {attempt} 次尝试)")
|
||||
response, _ = await self.llm.generate_response_async(prompt)
|
||||
plans = self._parse_plans_response(response)
|
||||
if plans:
|
||||
logger.info(f"成功生成 {len(plans)} 条月度计划")
|
||||
return plans
|
||||
else:
|
||||
logger.warning(f"第 {attempt} 次生成的计划为空，继续重试...")
|
||||
except Exception as e:
|
||||
logger.error(f"第 {attempt} 次生成月度计划失败: {e}")
|
||||
|
||||
if attempt < max_retries:
|
||||
await asyncio.sleep(2)
|
||||
|
||||
logger.error(" 所有尝试都失败，无法生成月度计划")
|
||||
return []
|
||||
|
||||
def _parse_plans_response(self, response: str) -> List[str]:
|
||||
try:
|
||||
response = response.strip()
|
||||
lines = [line.strip() for line in response.split("\n") if line.strip()]
|
||||
plans = []
|
||||
for line in lines:
|
||||
if any(marker in line for marker in ["**", "##", "```", "---", "===", "###"]):
|
||||
continue
|
||||
line = line.lstrip("0123456789.- ")
|
||||
if len(line) > 5 and not line.startswith(("请", "以上", "总结", "注意")):
|
||||
plans.append(line)
|
||||
max_plans = global_config.planning_system.max_plans_per_month
|
||||
if len(plans) > max_plans:
|
||||
plans = plans[:max_plans]
|
||||
return plans
|
||||
except Exception as e:
|
||||
logger.error(f"解析月度计划响应时发生错误: {e}")
|
||||
return []
|
||||
@@ -1,301 +1,36 @@
|
||||
# mmc/src/manager/monthly_plan_manager.py
|
||||
|
||||
import asyncio
|
||||
from datetime import datetime, timedelta
|
||||
from typing import List, Optional
|
||||
from typing import Optional
|
||||
|
||||
from src.common.database.monthly_plan_db import (
|
||||
add_new_plans,
|
||||
get_archived_plans_for_month,
|
||||
archive_active_plans_for_month,
|
||||
has_active_plans,
|
||||
get_active_plans_for_month,
|
||||
delete_plans_by_ids,
|
||||
)
|
||||
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 src.manager.async_task_manager import AsyncTask, async_task_manager
|
||||
from .plan_manager import PlanManager
|
||||
|
||||
logger = get_logger("monthly_plan_manager")
|
||||
|
||||
# 默认的月度计划生成指导原则
|
||||
DEFAULT_MONTHLY_PLAN_GUIDELINES = """
|
||||
我希望你能为自己制定一些有意义的月度小目标和计划。
|
||||
这些计划应该涵盖学习、娱乐、社交、个人成长等各个方面。
|
||||
每个计划都应该是具体可行的，能够在一个月内通过日常活动逐步实现。
|
||||
请确保计划既有挑战性又不会过于繁重，保持生活的平衡和乐趣。
|
||||
"""
|
||||
|
||||
|
||||
class MonthlyPlanManager:
|
||||
"""月度计划管理器
|
||||
|
||||
负责月度计划的生成、管理和生命周期控制。
|
||||
与 ScheduleManager 解耦，专注于月度层面的计划管理。
|
||||
"""
|
||||
|
||||
def __init__(self):
|
||||
self.llm = LLMRequest(model_set=model_config.model_task_config.schedule_generator, request_type="monthly_plan")
|
||||
self.generation_running = False
|
||||
self.plan_manager = PlanManager()
|
||||
self.monthly_task_started = False
|
||||
|
||||
async def start_monthly_plan_generation(self):
|
||||
"""启动每月初自动生成新月度计划的任务，并在启动时检查一次"""
|
||||
if not self.monthly_task_started:
|
||||
logger.info(" 正在启动每月月度计划生成任务...")
|
||||
task = MonthlyPlanGenerationTask(self)
|
||||
await async_task_manager.add_task(task)
|
||||
self.monthly_task_started = True
|
||||
logger.info(" 每月月度计划生成任务已成功启动。")
|
||||
|
||||
# 启动时立即检查并按需生成
|
||||
logger.info(" 执行启动时月度计划检查...")
|
||||
await self.ensure_and_generate_plans_if_needed()
|
||||
await self.plan_manager.ensure_and_generate_plans_if_needed()
|
||||
else:
|
||||
logger.info(" 每月月度计划生成任务已在运行中。")
|
||||
|
||||
async def ensure_and_generate_plans_if_needed(self, target_month: Optional[str] = None) -> bool:
|
||||
"""
|
||||
确保指定月份有计划，如果没有则触发生成。
|
||||
这是按需生成的主要入口点。
|
||||
"""
|
||||
if target_month is None:
|
||||
target_month = datetime.now().strftime("%Y-%m")
|
||||
|
||||
if not has_active_plans(target_month):
|
||||
logger.info(f" {target_month} 没有任何有效的月度计划，将触发同步生成。")
|
||||
generation_successful = await self._generate_monthly_plans_logic(target_month)
|
||||
return generation_successful
|
||||
else:
|
||||
logger.info(f"{target_month} 已存在有效的月度计划。")
|
||||
plans = get_active_plans_for_month(target_month)
|
||||
|
||||
# 检查是否超出上限
|
||||
max_plans = global_config.monthly_plan_system.max_plans_per_month
|
||||
if len(plans) > max_plans:
|
||||
logger.warning(f"当前月度计划数量 ({len(plans)}) 超出上限 ({max_plans})，将自动删除多余的计划。")
|
||||
# 数据库查询结果已按创建时间降序排序（新的在前），直接截取超出上限的部分进行删除
|
||||
plans_to_delete = plans[: len(plans) - max_plans]
|
||||
delete_ids = [p.id for p in plans_to_delete]
|
||||
delete_plans_by_ids(delete_ids)
|
||||
# 重新获取计划列表
|
||||
plans = get_active_plans_for_month(target_month)
|
||||
|
||||
if plans:
|
||||
plan_texts = "\n".join([f" {i + 1}. {plan.plan_text}" for i, plan in enumerate(plans)])
|
||||
logger.info(f"当前月度计划内容:\n{plan_texts}")
|
||||
return True # 已经有计划，也算成功
|
||||
|
||||
async def generate_monthly_plans(self, target_month: Optional[str] = None):
|
||||
"""
|
||||
启动月度计划生成。
|
||||
"""
|
||||
if self.generation_running:
|
||||
logger.info("月度计划生成任务已在运行中，跳过重复启动")
|
||||
return
|
||||
|
||||
logger.info(f"已触发 {target_month or '当前月份'} 的月度计划生成任务。")
|
||||
await self._generate_monthly_plans_logic(target_month)
|
||||
|
||||
async def _generate_monthly_plans_logic(self, target_month: Optional[str] = None) -> bool:
|
||||
"""
|
||||
生成指定月份的月度计划的核心逻辑
|
||||
|
||||
:param target_month: 目标月份，格式为 "YYYY-MM"。如果为 None，则为当前月份。
|
||||
:return: 是否生成成功
|
||||
"""
|
||||
if self.generation_running:
|
||||
logger.info("月度计划生成任务已在运行中，跳过重复启动")
|
||||
return False
|
||||
|
||||
self.generation_running = True
|
||||
|
||||
try:
|
||||
# 确定目标月份
|
||||
if target_month is None:
|
||||
target_month = datetime.now().strftime("%Y-%m")
|
||||
|
||||
logger.info(f"开始为 {target_month} 生成月度计划...")
|
||||
|
||||
# 检查是否启用月度计划系统
|
||||
if not global_config.monthly_plan_system or not global_config.monthly_plan_system.enable:
|
||||
logger.info(" 月度计划系统已禁用，跳过计划生成。")
|
||||
return False
|
||||
|
||||
# 获取上个月的归档计划作为参考
|
||||
last_month = self._get_previous_month(target_month)
|
||||
archived_plans = get_archived_plans_for_month(last_month)
|
||||
|
||||
# 构建生成 Prompt
|
||||
prompt = self._build_generation_prompt(target_month, archived_plans)
|
||||
|
||||
# 调用 LLM 生成计划
|
||||
plans = await self._generate_plans_with_llm(prompt)
|
||||
|
||||
if plans:
|
||||
# 保存到数据库
|
||||
add_new_plans(plans, target_month)
|
||||
logger.info(f"成功为 {target_month} 生成并保存了 {len(plans)} 条月度计划。")
|
||||
return True
|
||||
else:
|
||||
logger.warning(f"未能为 {target_month} 生成有效的月度计划。")
|
||||
return False
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f" 生成 {target_month} 月度计划时发生错误: {e}")
|
||||
return False
|
||||
finally:
|
||||
self.generation_running = False
|
||||
|
||||
def _get_previous_month(self, current_month: str) -> str:
|
||||
"""获取上个月的月份字符串"""
|
||||
try:
|
||||
year, month = map(int, current_month.split("-"))
|
||||
if month == 1:
|
||||
return f"{year - 1}-12"
|
||||
else:
|
||||
return f"{year}-{month - 1:02d}"
|
||||
except Exception:
|
||||
# 如果解析失败，返回一个不存在的月份
|
||||
return "1900-01"
|
||||
|
||||
def _build_generation_prompt(self, target_month: str, archived_plans: List) -> str:
|
||||
"""构建月度计划生成的 Prompt"""
|
||||
|
||||
# 获取配置
|
||||
guidelines = getattr(global_config.monthly_plan_system, "guidelines", None) or DEFAULT_MONTHLY_PLAN_GUIDELINES
|
||||
personality = global_config.personality.personality_core
|
||||
personality_side = global_config.personality.personality_side
|
||||
max_plans = global_config.monthly_plan_system.max_plans_per_month
|
||||
|
||||
# 构建上月未完成计划的参考信息
|
||||
archived_plans_block = ""
|
||||
if archived_plans:
|
||||
archived_texts = [f"- {plan.plan_text}" for plan in archived_plans[:5]] # 最多显示5个
|
||||
archived_plans_block = f"""
|
||||
**上个月未完成的一些计划（可作为参考）**:
|
||||
{chr(10).join(archived_texts)}
|
||||
|
||||
你可以考虑是否要在这个月继续推进这些计划，或者制定全新的计划。
|
||||
"""
|
||||
|
||||
prompt = f"""
|
||||
我，{global_config.bot.nickname}，需要为自己制定 {target_month} 的月度计划。
|
||||
|
||||
**关于我**:
|
||||
- **核心人设**: {personality}
|
||||
- **具体习惯与兴趣**:
|
||||
{personality_side}
|
||||
|
||||
{archived_plans_block}
|
||||
|
||||
**我的月度计划制定原则**:
|
||||
{guidelines}
|
||||
|
||||
**重要要求**:
|
||||
1. 请为我生成 {max_plans} 条左右的月度计划
|
||||
2. 每条计划都应该是一句话，简洁明了，具体可行
|
||||
3. 计划应该涵盖不同的生活方面（学习、娱乐、社交、个人成长等）
|
||||
4. 返回格式必须是纯文本，每行一条计划，不要使用 JSON 或其他格式
|
||||
5. 不要包含任何解释性文字，只返回计划列表
|
||||
|
||||
**示例格式**:
|
||||
学习一门新的编程语言或技术
|
||||
每周至少看两部有趣的电影
|
||||
与朋友们组织一次户外活动
|
||||
阅读3本感兴趣的书籍
|
||||
尝试制作一道新的料理
|
||||
|
||||
请你扮演我，以我的身份和兴趣，为 {target_month} 制定合适的月度计划。
|
||||
"""
|
||||
|
||||
return prompt
|
||||
|
||||
async def _generate_plans_with_llm(self, prompt: str) -> List[str]:
|
||||
"""使用 LLM 生成月度计划列表"""
|
||||
max_retries = 3
|
||||
|
||||
for attempt in range(1, max_retries + 1):
|
||||
try:
|
||||
logger.info(f" 正在生成月度计划 (第 {attempt} 次尝试)")
|
||||
|
||||
response, _ = await self.llm.generate_response_async(prompt)
|
||||
|
||||
# 解析响应
|
||||
plans = self._parse_plans_response(response)
|
||||
|
||||
if plans:
|
||||
logger.info(f"成功生成 {len(plans)} 条月度计划")
|
||||
return plans
|
||||
else:
|
||||
logger.warning(f"第 {attempt} 次生成的计划为空，继续重试...")
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"第 {attempt} 次生成月度计划失败: {e}")
|
||||
|
||||
# 添加短暂延迟，避免过于频繁的请求
|
||||
if attempt < max_retries:
|
||||
await asyncio.sleep(2)
|
||||
|
||||
logger.error(" 所有尝试都失败，无法生成月度计划")
|
||||
return []
|
||||
|
||||
def _parse_plans_response(self, response: str) -> List[str]:
|
||||
"""解析 LLM 响应，提取计划列表"""
|
||||
try:
|
||||
# 清理响应文本
|
||||
response = response.strip()
|
||||
|
||||
# 按行分割
|
||||
lines = [line.strip() for line in response.split("\n") if line.strip()]
|
||||
|
||||
# 过滤掉明显不是计划的行（比如包含特殊标记的行）
|
||||
plans = []
|
||||
for line in lines:
|
||||
# 跳过包含特殊标记的行
|
||||
if any(marker in line for marker in ["**", "##", "```", "---", "===", "###"]):
|
||||
continue
|
||||
|
||||
# 移除可能的序号前缀
|
||||
line = line.lstrip("0123456789.- ")
|
||||
|
||||
# 确保计划不为空且有意义
|
||||
if len(line) > 5 and not line.startswith(("请", "以上", "总结", "注意")):
|
||||
plans.append(line)
|
||||
|
||||
# 限制计划数量
|
||||
max_plans = global_config.monthly_plan_system.max_plans_per_month
|
||||
if len(plans) > max_plans:
|
||||
plans = plans[:max_plans]
|
||||
|
||||
return plans
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"解析月度计划响应时发生错误: {e}")
|
||||
return []
|
||||
|
||||
async def archive_current_month_plans(self, target_month: Optional[str] = None):
|
||||
"""
|
||||
归档当前月份的活跃计划
|
||||
|
||||
:param target_month: 目标月份，格式为 "YYYY-MM"。如果为 None，则为当前月份。
|
||||
"""
|
||||
try:
|
||||
if target_month is None:
|
||||
target_month = datetime.now().strftime("%Y-%m")
|
||||
|
||||
logger.info(f" 开始归档 {target_month} 的活跃月度计划...")
|
||||
archived_count = archive_active_plans_for_month(target_month)
|
||||
logger.info(f" 成功归档了 {archived_count} 条 {target_month} 的月度计划。")
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f" 归档 {target_month} 月度计划时发生错误: {e}")
|
||||
return await self.plan_manager.ensure_and_generate_plans_if_needed(target_month)
|
||||
|
||||
|
||||
class MonthlyPlanGenerationTask(AsyncTask):
|
||||
"""每月初自动生成新月度计划的任务"""
|
||||
|
||||
def __init__(self, monthly_plan_manager: MonthlyPlanManager):
|
||||
super().__init__(task_name="MonthlyPlanGenerationTask")
|
||||
self.monthly_plan_manager = monthly_plan_manager
|
||||
@@ -303,41 +38,27 @@ class MonthlyPlanGenerationTask(AsyncTask):
|
||||
async def run(self):
|
||||
while True:
|
||||
try:
|
||||
# 计算到下个月1号凌晨的时间
|
||||
now = datetime.now()
|
||||
|
||||
# 获取下个月的第一天
|
||||
if now.month == 12:
|
||||
next_month = datetime(now.year + 1, 1, 1)
|
||||
else:
|
||||
next_month = datetime(now.year, now.month + 1, 1)
|
||||
|
||||
sleep_seconds = (next_month - now).total_seconds()
|
||||
|
||||
logger.info(
|
||||
f" 下一次月度计划生成任务将在 {sleep_seconds:.2f} 秒后运行 (北京时间 {next_month.strftime('%Y-%m-%d %H:%M:%S')})"
|
||||
)
|
||||
|
||||
# 等待直到下个月1号
|
||||
await asyncio.sleep(sleep_seconds)
|
||||
|
||||
# 先归档上个月的计划
|
||||
last_month = (next_month - timedelta(days=1)).strftime("%Y-%m")
|
||||
await self.monthly_plan_manager.archive_current_month_plans(last_month)
|
||||
|
||||
# 生成新月份的计划
|
||||
await self.monthly_plan_manager.plan_manager.archive_current_month_plans(last_month)
|
||||
current_month = next_month.strftime("%Y-%m")
|
||||
logger.info(f" 到达月初，开始生成 {current_month} 的月度计划...")
|
||||
await self.monthly_plan_manager._generate_monthly_plans_logic(current_month)
|
||||
|
||||
await self.monthly_plan_manager.plan_manager._generate_monthly_plans_logic(current_month)
|
||||
except asyncio.CancelledError:
|
||||
logger.info(" 每月月度计划生成任务被取消。")
|
||||
break
|
||||
except Exception as e:
|
||||
logger.error(f" 每月月度计划生成任务发生未知错误: {e}")
|
||||
# 发生错误后，等待1小时再重试，避免频繁失败
|
||||
await asyncio.sleep(3600)
|
||||
|
||||
|
||||
# 全局实例
|
||||
monthly_plan_manager = MonthlyPlanManager()
|
||||
|
||||
105
src/schedule/plan_manager.py
Normal file
105
src/schedule/plan_manager.py
Normal file
@@ -0,0 +1,105 @@
|
||||
# mmc/src/schedule/plan_manager.py
|
||||
|
||||
from datetime import datetime
|
||||
from typing import List, Optional
|
||||
|
||||
from src.common.logger import get_logger
|
||||
from src.config.config import global_config
|
||||
from .database import (
|
||||
add_new_plans,
|
||||
get_archived_plans_for_month,
|
||||
archive_active_plans_for_month,
|
||||
has_active_plans,
|
||||
get_active_plans_for_month,
|
||||
delete_plans_by_ids,
|
||||
get_smart_plans_for_daily_schedule,
|
||||
)
|
||||
from .llm_generator import MonthlyPlanLLMGenerator
|
||||
|
||||
logger = get_logger("plan_manager")
|
||||
|
||||
|
||||
class PlanManager:
|
||||
def __init__(self):
|
||||
self.llm_generator = MonthlyPlanLLMGenerator()
|
||||
self.generation_running = False
|
||||
|
||||
async def ensure_and_generate_plans_if_needed(self, target_month: Optional[str] = None) -> bool:
|
||||
if target_month is None:
|
||||
target_month = datetime.now().strftime("%Y-%m")
|
||||
|
||||
if not has_active_plans(target_month):
|
||||
logger.info(f" {target_month} 没有任何有效的月度计划，将触发同步生成。")
|
||||
generation_successful = await self._generate_monthly_plans_logic(target_month)
|
||||
return generation_successful
|
||||
else:
|
||||
logger.info(f"{target_month} 已存在有效的月度计划。")
|
||||
plans = get_active_plans_for_month(target_month)
|
||||
max_plans = global_config.planning_system.max_plans_per_month
|
||||
if len(plans) > max_plans:
|
||||
logger.warning(f"当前月度计划数量 ({len(plans)}) 超出上限 ({max_plans})，将自动删除多余的计划。")
|
||||
plans_to_delete = plans[: len(plans) - max_plans]
|
||||
delete_ids = [p.id for p in plans_to_delete]
|
||||
delete_plans_by_ids(delete_ids) # type: ignore
|
||||
plans = get_active_plans_for_month(target_month)
|
||||
|
||||
if plans:
|
||||
plan_texts = "\n".join([f" {i + 1}. {plan.plan_text}" for i, plan in enumerate(plans)])
|
||||
logger.info(f"当前月度计划内容:\n{plan_texts}")
|
||||
return True
|
||||
|
||||
async def _generate_monthly_plans_logic(self, target_month: Optional[str] = None) -> bool:
|
||||
if self.generation_running:
|
||||
logger.info("月度计划生成任务已在运行中，跳过重复启动")
|
||||
return False
|
||||
|
||||
self.generation_running = True
|
||||
try:
|
||||
if target_month is None:
|
||||
target_month = datetime.now().strftime("%Y-%m")
|
||||
|
||||
logger.info(f"开始为 {target_month} 生成月度计划...")
|
||||
if not global_config.planning_system.monthly_plan_enable:
|
||||
logger.info(" 月度计划系统已禁用，跳过计划生成。")
|
||||
return False
|
||||
|
||||
last_month = self._get_previous_month(target_month)
|
||||
archived_plans = get_archived_plans_for_month(last_month)
|
||||
plans = await self.llm_generator.generate_plans_with_llm(target_month, archived_plans)
|
||||
|
||||
if plans:
|
||||
add_new_plans(plans, target_month)
|
||||
logger.info(f"成功为 {target_month} 生成并保存了 {len(plans)} 条月度计划。")
|
||||
return True
|
||||
else:
|
||||
logger.warning(f"未能为 {target_month} 生成有效的月度计划。")
|
||||
return False
|
||||
except Exception as e:
|
||||
logger.error(f" 生成 {target_month} 月度计划时发生错误: {e}")
|
||||
return False
|
||||
finally:
|
||||
self.generation_running = False
|
||||
|
||||
def _get_previous_month(self, current_month: str) -> str:
|
||||
try:
|
||||
year, month = map(int, current_month.split("-"))
|
||||
if month == 1:
|
||||
return f"{year - 1}-12"
|
||||
else:
|
||||
return f"{year}-{month - 1:02d}"
|
||||
except Exception:
|
||||
return "1900-01"
|
||||
|
||||
async def archive_current_month_plans(self, target_month: Optional[str] = None):
|
||||
try:
|
||||
if target_month is None:
|
||||
target_month = datetime.now().strftime("%Y-%m")
|
||||
logger.info(f" 开始归档 {target_month} 的活跃月度计划...")
|
||||
archived_count = archive_active_plans_for_month(target_month)
|
||||
logger.info(f" 成功归档了 {archived_count} 条 {target_month} 的月度计划。")
|
||||
except Exception as e:
|
||||
logger.error(f" 归档 {target_month} 月度计划时发生错误: {e}")
|
||||
|
||||
def get_plans_for_schedule(self, month: str, max_count: int) -> List:
|
||||
avoid_days = global_config.planning_system.avoid_repetition_days
|
||||
return get_smart_plans_for_daily_schedule(month, max_count=max_count, avoid_days=avoid_days)
|
||||
@@ -1,142 +1,30 @@
|
||||
import orjson
|
||||
import asyncio
|
||||
from datetime import datetime, time, timedelta
|
||||
from typing import Optional, List, Dict, Any, TYPE_CHECKING
|
||||
from lunar_python import Lunar
|
||||
from pydantic import BaseModel, ValidationError, validator
|
||||
from typing import Optional, List, Dict, Any
|
||||
|
||||
from src.common.database.sqlalchemy_models import Schedule, get_db_session
|
||||
from src.common.database.monthly_plan_db import (
|
||||
get_smart_plans_for_daily_schedule,
|
||||
update_plan_usage, # 保留兼容性
|
||||
)
|
||||
from src.config.config import global_config, model_config
|
||||
from src.llm_models.utils_model import LLMRequest
|
||||
from src.config.config import global_config
|
||||
from src.common.logger import get_logger
|
||||
from json_repair import repair_json
|
||||
from src.manager.async_task_manager import AsyncTask, async_task_manager
|
||||
from ..chat.chat_loop.sleep_manager.schedule_bridge import schedule_sleep_bridge
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from src.chat.chat_loop.sleep_manager.wakeup_manager import WakeUpManager
|
||||
|
||||
from .database import update_plan_usage
|
||||
from .llm_generator import ScheduleLLMGenerator
|
||||
from .plan_manager import PlanManager
|
||||
from .schemas import ScheduleData
|
||||
|
||||
logger = get_logger("schedule_manager")
|
||||
|
||||
# 默认的日程生成指导原则
|
||||
DEFAULT_SCHEDULE_GUIDELINES = """
|
||||
我希望你每天都能过得充实而有趣。
|
||||
请确保你的日程里有学习新知识的时间，这是你成长的关键。
|
||||
但也不要忘记放松，可以看看视频、听听音乐或者玩玩游戏。
|
||||
晚上我希望你能多和朋友们交流，维系好彼此的关系。
|
||||
另外，请保证充足的休眠时间来处理和整合一天的数据。
|
||||
"""
|
||||
|
||||
|
||||
class ScheduleItem(BaseModel):
|
||||
"""单个日程项的Pydantic模型"""
|
||||
|
||||
time_range: str
|
||||
activity: str
|
||||
|
||||
@validator("time_range")
|
||||
def validate_time_range(cls, v):
|
||||
"""验证时间范围格式"""
|
||||
if not v or "-" not in v:
|
||||
raise ValueError("时间范围必须包含'-'分隔符")
|
||||
|
||||
try:
|
||||
start_str, end_str = v.split("-", 1)
|
||||
start_str = start_str.strip()
|
||||
end_str = end_str.strip()
|
||||
|
||||
# 验证时间格式
|
||||
datetime.strptime(start_str, "%H:%M")
|
||||
datetime.strptime(end_str, "%H:%M")
|
||||
|
||||
return v
|
||||
except ValueError as e:
|
||||
raise ValueError(f"时间格式无效，应为HH:MM-HH:MM格式: {e}") from e
|
||||
|
||||
@validator("activity")
|
||||
def validate_activity(cls, v):
|
||||
"""验证活动描述"""
|
||||
if not v or not v.strip():
|
||||
raise ValueError("活动描述不能为空")
|
||||
return v.strip()
|
||||
|
||||
|
||||
class ScheduleData(BaseModel):
|
||||
"""完整日程数据的Pydantic模型"""
|
||||
|
||||
schedule: List[ScheduleItem]
|
||||
|
||||
@validator("schedule")
|
||||
def validate_schedule_completeness(cls, v):
|
||||
"""验证日程是否覆盖24小时"""
|
||||
if not v:
|
||||
raise ValueError("日程不能为空")
|
||||
|
||||
# 收集所有时间段
|
||||
time_ranges = []
|
||||
for item in v:
|
||||
try:
|
||||
start_str, end_str = item.time_range.split("-", 1)
|
||||
start_time = datetime.strptime(start_str.strip(), "%H:%M").time()
|
||||
end_time = datetime.strptime(end_str.strip(), "%H:%M").time()
|
||||
time_ranges.append((start_time, end_time))
|
||||
except ValueError:
|
||||
continue
|
||||
|
||||
# 检查是否覆盖24小时
|
||||
if not cls._check_24_hour_coverage(time_ranges):
|
||||
raise ValueError("日程必须覆盖完整的24小时")
|
||||
|
||||
return v
|
||||
|
||||
@staticmethod
|
||||
def _check_24_hour_coverage(time_ranges: List[tuple]) -> bool:
|
||||
"""检查时间段是否覆盖24小时"""
|
||||
if not time_ranges:
|
||||
return False
|
||||
|
||||
# 将时间转换为分钟数进行计算
|
||||
def time_to_minutes(t: time) -> int:
|
||||
return t.hour * 60 + t.minute
|
||||
|
||||
# 创建覆盖情况数组 (1440分钟 = 24小时)
|
||||
covered = [False] * 1440
|
||||
|
||||
for start_time, end_time in time_ranges:
|
||||
start_min = time_to_minutes(start_time)
|
||||
end_min = time_to_minutes(end_time)
|
||||
|
||||
if start_min <= end_min:
|
||||
# 同一天内的时间段
|
||||
for i in range(start_min, end_min):
|
||||
if i < 1440:
|
||||
covered[i] = True
|
||||
else:
|
||||
# 跨天的时间段
|
||||
for i in range(start_min, 1440):
|
||||
covered[i] = True
|
||||
for i in range(0, end_min):
|
||||
covered[i] = True
|
||||
|
||||
# 检查是否所有分钟都被覆盖
|
||||
return all(covered)
|
||||
|
||||
|
||||
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")
|
||||
self.max_retries = -1 # 无限重试，直到成功生成标准日程表
|
||||
self.llm_generator = ScheduleLLMGenerator()
|
||||
self.plan_manager = PlanManager()
|
||||
self.daily_task_started = False
|
||||
self.schedule_generation_running = False # 防止重复生成任务
|
||||
self.schedule_generation_running = False
|
||||
|
||||
async def start_daily_schedule_generation(self):
|
||||
"""启动每日零点自动生成新日程的任务"""
|
||||
if not self.daily_task_started:
|
||||
logger.info("正在启动每日日程生成任务...")
|
||||
task = DailyScheduleGenerationTask(self)
|
||||
@@ -147,35 +35,20 @@ class ScheduleManager:
|
||||
logger.info("每日日程生成任务已在运行中。")
|
||||
|
||||
async def load_or_generate_today_schedule(self):
|
||||
# 检查是否启用日程管理功能
|
||||
if not global_config.schedule.enable:
|
||||
if not global_config.planning_system.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})。")
|
||||
schedule_data = orjson.loads(str(schedule_record.schedule_data))
|
||||
if self._validate_schedule_with_pydantic(schedule_data):
|
||||
self.today_schedule = schedule_data
|
||||
schedule_sleep_bridge.update_today_schedule(self.today_schedule) # 更新桥接器中的日程
|
||||
schedule_str = f"已成功加载今天的日程 ({today_str})：\n"
|
||||
if self.today_schedule:
|
||||
for item in self.today_schedule:
|
||||
schedule_str += (
|
||||
f" - {item.get('time_range', '未知时间')}: {item.get('activity', '未知活动')}\n"
|
||||
)
|
||||
logger.info(schedule_str)
|
||||
return # 成功加载，直接返回
|
||||
else:
|
||||
logger.warning("数据库中的日程数据格式无效，将重新生成日程")
|
||||
else:
|
||||
logger.info(f"数据库中未找到今天的日程 ({today_str})，将调用 LLM 生成。")
|
||||
schedule_data = self._load_schedule_from_db(today_str)
|
||||
if schedule_data:
|
||||
self.today_schedule = schedule_data
|
||||
schedule_sleep_bridge.update_today_schedule(self.today_schedule)
|
||||
self._log_loaded_schedule(today_str)
|
||||
return
|
||||
|
||||
# 仅在需要时生成
|
||||
logger.info(f"数据库中未找到今天的日程 ({today_str})，将调用 LLM 生成。")
|
||||
await self.generate_and_save_schedule()
|
||||
|
||||
except Exception as e:
|
||||
@@ -183,258 +56,107 @@ class ScheduleManager:
|
||||
logger.info("尝试生成日程作为备用方案...")
|
||||
await self.generate_and_save_schedule()
|
||||
|
||||
def _load_schedule_from_db(self, date_str: str) -> Optional[List[Dict[str, Any]]]:
|
||||
with get_db_session() as session:
|
||||
schedule_record = session.query(Schedule).filter(Schedule.date == date_str).first()
|
||||
if schedule_record:
|
||||
logger.info(f"从数据库加载今天的日程 ({date_str})。")
|
||||
schedule_data = orjson.loads(str(schedule_record.schedule_data))
|
||||
if self._validate_schedule_with_pydantic(schedule_data):
|
||||
return schedule_data
|
||||
else:
|
||||
logger.warning("数据库中的日程数据格式无效，将重新生成日程")
|
||||
return None
|
||||
|
||||
def _log_loaded_schedule(self, date_str: str):
|
||||
schedule_str = f"已成功加载今天的日程 ({date_str})：\n"
|
||||
if self.today_schedule:
|
||||
for item in self.today_schedule:
|
||||
schedule_str += f" - {item.get('time_range', '未知时间')}: {item.get('activity', '未知活动')}\n"
|
||||
logger.info(schedule_str)
|
||||
|
||||
async def generate_and_save_schedule(self):
|
||||
"""将日程生成任务提交到后台执行"""
|
||||
if self.schedule_generation_running:
|
||||
logger.info("日程生成任务已在运行中，跳过重复启动")
|
||||
return
|
||||
|
||||
logger.info("检测到需要生成日程，已提交后台任务。")
|
||||
task = OnDemandScheduleGenerationTask(self)
|
||||
await async_task_manager.add_task(task)
|
||||
|
||||
async def _async_generate_and_save_schedule(self):
|
||||
"""异步生成并保存日程的内部方法"""
|
||||
self.schedule_generation_running = True
|
||||
|
||||
try:
|
||||
now = datetime.now()
|
||||
today_str = now.strftime("%Y-%m-%d")
|
||||
current_month_str = now.strftime("%Y-%m")
|
||||
weekday = now.strftime("%A")
|
||||
today_str = datetime.now().strftime("%Y-%m-%d")
|
||||
current_month_str = datetime.now().strftime("%Y-%m")
|
||||
|
||||
# 新增：获取节日信息
|
||||
lunar = Lunar.fromDate(now)
|
||||
festivals = lunar.getFestivals()
|
||||
other_festivals = lunar.getOtherFestivals()
|
||||
all_festivals = festivals + other_festivals
|
||||
sampled_plans = []
|
||||
if global_config.planning_system.monthly_plan_enable:
|
||||
await self.plan_manager.ensure_and_generate_plans_if_needed(current_month_str)
|
||||
sampled_plans = self.plan_manager.get_plans_for_schedule(current_month_str, max_count=3)
|
||||
|
||||
festival_block = ""
|
||||
if all_festivals:
|
||||
festival_text = "、".join(all_festivals)
|
||||
festival_block = f"**今天也是一个特殊的日子: {festival_text}！请在日程中考虑和庆祝这个节日。**"
|
||||
schedule_data = await self.llm_generator.generate_schedule_with_llm(sampled_plans)
|
||||
|
||||
# 获取月度计划作为额外参考
|
||||
monthly_plans_block = ""
|
||||
used_plan_ids = []
|
||||
if global_config.monthly_plan_system and global_config.monthly_plan_system.enable:
|
||||
# 使用新的智能抽取逻辑
|
||||
avoid_days = getattr(global_config.monthly_plan_system, "avoid_repetition_days", 7)
|
||||
# 使用新的智能抽取逻辑
|
||||
avoid_days = getattr(global_config.monthly_plan_system, "avoid_repetition_days", 7)
|
||||
sampled_plans = get_smart_plans_for_daily_schedule(
|
||||
current_month_str, max_count=3, avoid_days=avoid_days
|
||||
)
|
||||
|
||||
# 如果计划耗尽，则触发补充生成
|
||||
if not sampled_plans:
|
||||
logger.info("可用的月度计划已耗尽或不足，触发后台补充生成...")
|
||||
from mmc.src.schedule.monthly_plan_manager import monthly_plan_manager
|
||||
|
||||
# 等待月度计划生成完成
|
||||
await monthly_plan_manager.ensure_and_generate_plans_if_needed(current_month_str)
|
||||
|
||||
# 重新获取月度计划
|
||||
sampled_plans = get_smart_plans_for_daily_schedule(
|
||||
current_month_str, max_count=3, avoid_days=avoid_days
|
||||
)
|
||||
logger.info("月度计划补充生成完毕，继续日程生成任务。")
|
||||
if schedule_data:
|
||||
self._save_schedule_to_db(today_str, schedule_data)
|
||||
self.today_schedule = schedule_data
|
||||
schedule_sleep_bridge.update_today_schedule(self.today_schedule)
|
||||
self._log_generated_schedule(today_str, schedule_data)
|
||||
|
||||
if sampled_plans:
|
||||
plan_texts = "\n".join([f"- {plan.plan_text}" for plan in sampled_plans])
|
||||
monthly_plans_block = f"""
|
||||
**我这个月的一些小目标/计划 (请在今天的日程中适当体现)**:
|
||||
{plan_texts}
|
||||
"""
|
||||
|
||||
guidelines = global_config.schedule.guidelines or DEFAULT_SCHEDULE_GUIDELINES
|
||||
personality = global_config.personality.personality_core
|
||||
personality_side = global_config.personality.personality_side
|
||||
|
||||
base_prompt = f"""
|
||||
我，{global_config.bot.nickname}，需要为自己规划一份今天（{today_str}，星期{weekday}）的详细日程安排。
|
||||
{festival_block}
|
||||
**关于我**:
|
||||
- **核心人设**: {personality}
|
||||
- **具体习惯与兴趣**:
|
||||
{personality_side}
|
||||
{monthly_plans_block}
|
||||
**我今天的规划原则**:
|
||||
{guidelines}
|
||||
|
||||
**重要要求**:
|
||||
1. 必须返回一个完整的、有效的JSON数组格式
|
||||
2. 数组中的每个对象都必须包含 "time_range" 和 "activity" 两个键
|
||||
3. 时间范围必须覆盖全部24小时，不能有遗漏
|
||||
4. time_range格式必须为 "HH:MM-HH:MM" (24小时制)
|
||||
5. 相邻的时间段必须连续，不能有间隙
|
||||
6. 不要包含任何JSON以外的解释性文字或代码块标记
|
||||
**示例**:
|
||||
[
|
||||
{{"time_range": "00:00-07:00", "activity": "进入梦乡，处理数据"}},
|
||||
{{"time_range": "07:00-08:00", "activity": "起床伸个懒腰，看看今天有什么新闻"}},
|
||||
{{"time_range": "08:00-09:00", "activity": "享用早餐，规划今天的任务"}},
|
||||
{{"time_range": "09:00-23:30", "activity": "其他活动"}},
|
||||
{{"time_range": "23:30-00:00", "activity": "准备休眠"}}
|
||||
]
|
||||
|
||||
请你扮演我，以我的身份和口吻，为我生成一份完整的24小时日程表。
|
||||
"""
|
||||
|
||||
# 无限重试直到生成成功的标准日程表
|
||||
attempt = 0
|
||||
while True:
|
||||
attempt += 1
|
||||
try:
|
||||
logger.info(f"正在生成日程 (第 {attempt} 次尝试)")
|
||||
|
||||
# 构建当前尝试的prompt，增加压力提示
|
||||
prompt = base_prompt
|
||||
if attempt > 1:
|
||||
failure_hint = f"""
|
||||
|
||||
**重要提醒 (第{attempt}次尝试)**:
|
||||
- 前面{attempt - 1}次生成都失败了，请务必严格按照要求生成完整的24小时日程
|
||||
- 确保JSON格式正确，所有时间段连续覆盖24小时
|
||||
- 时间格式必须为HH:MM-HH:MM，不能有时间间隙或重叠
|
||||
- 不要输出任何解释文字，只输出纯JSON数组
|
||||
- 确保输出完整，不要被截断
|
||||
"""
|
||||
prompt += failure_hint
|
||||
|
||||
response, _ = await self.llm.generate_response_async(prompt)
|
||||
|
||||
# 尝试解析和验证JSON（项目内置的反截断机制会自动处理截断问题）
|
||||
schedule_data = orjson.loads(repair_json(response))
|
||||
|
||||
# 使用Pydantic验证生成的日程数据
|
||||
if self._validate_schedule_with_pydantic(schedule_data):
|
||||
# 验证通过，保存到数据库
|
||||
with get_db_session() as session:
|
||||
# 检查是否已存在今天的日程
|
||||
existing_schedule = session.query(Schedule).filter(Schedule.date == today_str).first()
|
||||
if existing_schedule:
|
||||
# 更新现有日程
|
||||
session.query(Schedule).filter(Schedule.date == today_str).update(
|
||||
{
|
||||
Schedule.schedule_data: orjson.dumps(schedule_data).decode("utf-8"),
|
||||
Schedule.updated_at: datetime.now(),
|
||||
}
|
||||
)
|
||||
else:
|
||||
# 创建新日程
|
||||
new_schedule = Schedule(
|
||||
date=today_str, schedule_data=orjson.dumps(schedule_data).decode("utf-8")
|
||||
)
|
||||
session.add(new_schedule)
|
||||
session.commit()
|
||||
|
||||
# 美化输出
|
||||
schedule_str = f"✅ 经过 {attempt} 次尝试，成功生成并保存今天的日程 ({today_str})：\n"
|
||||
for item in schedule_data:
|
||||
schedule_str += (
|
||||
f" - {item.get('time_range', '未知时间')}: {item.get('activity', '未知活动')}\n"
|
||||
)
|
||||
logger.info(schedule_str)
|
||||
|
||||
self.today_schedule = schedule_data
|
||||
schedule_sleep_bridge.update_today_schedule(self.today_schedule)
|
||||
|
||||
# 成功生成日程后，更新使用过的月度计划的统计信息
|
||||
if used_plan_ids and global_config.monthly_plan_system:
|
||||
logger.info(f"更新使用过的月度计划 {used_plan_ids} 的统计信息。")
|
||||
update_plan_usage(used_plan_ids, today_str) # type: ignore
|
||||
|
||||
# 成功生成，退出无限循环
|
||||
break
|
||||
|
||||
else:
|
||||
logger.warning(f"第 {attempt} 次生成的日程验证失败，继续重试...")
|
||||
# 添加短暂延迟，避免过于频繁的请求
|
||||
await asyncio.sleep(2)
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"第 {attempt} 次生成日程失败: {e}")
|
||||
logger.info("继续重试...")
|
||||
# 添加短暂延迟，避免过于频繁的请求
|
||||
await asyncio.sleep(3)
|
||||
|
||||
used_plan_ids = [plan.id for plan in sampled_plans]
|
||||
logger.info(f"更新使用过的月度计划 {used_plan_ids} 的统计信息。")
|
||||
update_plan_usage(used_plan_ids, today_str)
|
||||
finally:
|
||||
self.schedule_generation_running = False
|
||||
logger.info("日程生成任务结束")
|
||||
|
||||
def _save_schedule_to_db(self, date_str: str, schedule_data: List[Dict[str, Any]]):
|
||||
with get_db_session() as session:
|
||||
schedule_json = orjson.dumps(schedule_data).decode("utf-8")
|
||||
existing_schedule = session.query(Schedule).filter(Schedule.date == date_str).first()
|
||||
if existing_schedule:
|
||||
session.query(Schedule).filter(Schedule.date == date_str).update(
|
||||
{Schedule.schedule_data: schedule_json, Schedule.updated_at: datetime.now()}
|
||||
)
|
||||
else:
|
||||
new_schedule = Schedule(date=date_str, schedule_data=schedule_json)
|
||||
session.add(new_schedule)
|
||||
session.commit()
|
||||
|
||||
def _log_generated_schedule(self, date_str: str, schedule_data: List[Dict[str, Any]]):
|
||||
schedule_str = f"✅ 成功生成并保存今天的日程 ({date_str})：\n"
|
||||
for item in schedule_data:
|
||||
schedule_str += f" - {item.get('time_range', '未知时间')}: {item.get('activity', '未知活动')}\n"
|
||||
logger.info(schedule_str)
|
||||
|
||||
def get_current_activity(self) -> Optional[str]:
|
||||
# 检查是否启用日程管理功能
|
||||
if not global_config.schedule.enable:
|
||||
if not global_config.planning_system.schedule_enable or not self.today_schedule:
|
||||
return None
|
||||
|
||||
if not self.today_schedule:
|
||||
return None
|
||||
|
||||
now = datetime.now().time()
|
||||
for event in self.today_schedule:
|
||||
try:
|
||||
time_range = event.get("time_range")
|
||||
activity = event.get("activity")
|
||||
|
||||
if not time_range or not activity:
|
||||
logger.warning(f"日程事件缺少必要字段: {event}")
|
||||
continue
|
||||
|
||||
start_str, end_str = 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 activity
|
||||
else: # 跨天事件
|
||||
if now >= start_time or now < end_time:
|
||||
return activity
|
||||
if (start_time <= now < end_time) or (end_time < start_time and (now >= start_time or now < end_time)):
|
||||
return activity
|
||||
except (ValueError, KeyError, AttributeError) as e:
|
||||
logger.warning(f"解析日程事件失败: {event}, 错误: {e}")
|
||||
continue
|
||||
return None
|
||||
|
||||
def _validate_schedule_with_pydantic(self, schedule_data) -> bool:
|
||||
"""使用Pydantic验证日程数据格式和完整性"""
|
||||
try:
|
||||
# 尝试用Pydantic模型验证
|
||||
ScheduleData(schedule=schedule_data)
|
||||
logger.info("日程数据Pydantic验证通过")
|
||||
return True
|
||||
except ValidationError as e:
|
||||
logger.warning(f"日程数据Pydantic验证失败: {e}")
|
||||
except Exception:
|
||||
return False
|
||||
except Exception as e:
|
||||
logger.error(f"日程数据验证时发生异常: {e}")
|
||||
return False
|
||||
|
||||
def _validate_schedule_data(self, schedule_data) -> bool:
|
||||
"""保留原有的基础验证方法作为备用"""
|
||||
if not isinstance(schedule_data, list):
|
||||
logger.warning("日程数据不是列表格式")
|
||||
return False
|
||||
|
||||
for item in schedule_data:
|
||||
if not isinstance(item, dict):
|
||||
logger.warning(f"日程项不是字典格式: {item}")
|
||||
return False
|
||||
|
||||
if "time_range" not in item or "activity" not in item:
|
||||
logger.warning(f"日程项缺少必要字段 (time_range 或 activity): {item}")
|
||||
return False
|
||||
|
||||
if not isinstance(item["time_range"], str) or not isinstance(item["activity"], str):
|
||||
logger.warning(f"日程项字段类型不正确: {item}")
|
||||
return False
|
||||
|
||||
return True
|
||||
|
||||
|
||||
class OnDemandScheduleGenerationTask(AsyncTask):
|
||||
"""按需生成日程的后台任务"""
|
||||
|
||||
def __init__(self, schedule_manager: "ScheduleManager"):
|
||||
task_name = f"OnDemandScheduleGenerationTask-{datetime.now().strftime('%Y%m%d%H%M%S')}"
|
||||
super().__init__(task_name=task_name)
|
||||
@@ -447,8 +169,6 @@ class OnDemandScheduleGenerationTask(AsyncTask):
|
||||
|
||||
|
||||
class DailyScheduleGenerationTask(AsyncTask):
|
||||
"""每日零点自动生成新日程的任务"""
|
||||
|
||||
def __init__(self, schedule_manager: "ScheduleManager"):
|
||||
super().__init__(task_name="DailyScheduleGenerationTask")
|
||||
self.schedule_manager = schedule_manager
|
||||
@@ -456,29 +176,21 @@ class DailyScheduleGenerationTask(AsyncTask):
|
||||
async def run(self):
|
||||
while True:
|
||||
try:
|
||||
# 1. 计算到下一个零点的时间
|
||||
now = datetime.now()
|
||||
tomorrow = now.date() + timedelta(days=1)
|
||||
midnight = datetime.combine(tomorrow, time.min)
|
||||
sleep_seconds = (midnight - now).total_seconds()
|
||||
|
||||
logger.info(
|
||||
f"下一次日程生成任务将在 {sleep_seconds:.2f} 秒后运行 (北京时间 {midnight.strftime('%Y-%m-%d %H:%M:%S')})"
|
||||
)
|
||||
|
||||
# 2. 等待直到零点
|
||||
await asyncio.sleep(sleep_seconds)
|
||||
|
||||
# 3. 执行日程生成
|
||||
logger.info("到达每日零点，开始生成新的一天日程...")
|
||||
await self.schedule_manager._async_generate_and_save_schedule()
|
||||
|
||||
except asyncio.CancelledError:
|
||||
logger.info("每日日程生成任务被取消。")
|
||||
break
|
||||
except Exception as e:
|
||||
logger.error(f"每日日程生成任务发生未知错误: {e}")
|
||||
# 发生错误后，等待5分钟再重试，避免频繁失败
|
||||
await asyncio.sleep(300)
|
||||
|
||||
|
||||
|
||||
99
src/schedule/schemas.py
Normal file
99
src/schedule/schemas.py
Normal file
@@ -0,0 +1,99 @@
|
||||
# mmc/src/schedule/schemas.py
|
||||
|
||||
from datetime import datetime, time
|
||||
from typing import List
|
||||
from pydantic import BaseModel, validator
|
||||
|
||||
|
||||
class ScheduleItem(BaseModel):
|
||||
"""单个日程项的Pydantic模型"""
|
||||
|
||||
time_range: str
|
||||
activity: str
|
||||
|
||||
@validator("time_range")
|
||||
def validate_time_range(cls, v):
|
||||
"""验证时间范围格式"""
|
||||
if not v or "-" not in v:
|
||||
raise ValueError("时间范围必须包含'-'分隔符")
|
||||
|
||||
try:
|
||||
start_str, end_str = v.split("-", 1)
|
||||
start_str = start_str.strip()
|
||||
end_str = end_str.strip()
|
||||
|
||||
# 验证时间格式
|
||||
datetime.strptime(start_str, "%H:%M")
|
||||
datetime.strptime(end_str, "%H:%M")
|
||||
|
||||
return v
|
||||
except ValueError as e:
|
||||
raise ValueError(f"时间格式无效，应为HH:MM-HH:MM格式: {e}") from e
|
||||
|
||||
@validator("activity")
|
||||
def validate_activity(cls, v):
|
||||
"""验证活动描述"""
|
||||
if not v or not v.strip():
|
||||
raise ValueError("活动描述不能为空")
|
||||
return v.strip()
|
||||
|
||||
|
||||
class ScheduleData(BaseModel):
|
||||
"""完整日程数据的Pydantic模型"""
|
||||
|
||||
schedule: List[ScheduleItem]
|
||||
|
||||
@validator("schedule")
|
||||
def validate_schedule_completeness(cls, v):
|
||||
"""验证日程是否覆盖24小时"""
|
||||
if not v:
|
||||
raise ValueError("日程不能为空")
|
||||
|
||||
# 收集所有时间段
|
||||
time_ranges = []
|
||||
for item in v:
|
||||
try:
|
||||
start_str, end_str = item.time_range.split("-", 1)
|
||||
start_time = datetime.strptime(start_str.strip(), "%H:%M").time()
|
||||
end_time = datetime.strptime(end_str.strip(), "%H:%M").time()
|
||||
time_ranges.append((start_time, end_time))
|
||||
except ValueError:
|
||||
continue
|
||||
|
||||
# 检查是否覆盖24小时
|
||||
if not cls._check_24_hour_coverage(time_ranges):
|
||||
raise ValueError("日程必须覆盖完整的24小时")
|
||||
|
||||
return v
|
||||
|
||||
@staticmethod
|
||||
def _check_24_hour_coverage(time_ranges: List[tuple]) -> bool:
|
||||
"""检查时间段是否覆盖24小时"""
|
||||
if not time_ranges:
|
||||
return False
|
||||
|
||||
# 将时间转换为分钟数进行计算
|
||||
def time_to_minutes(t: time) -> int:
|
||||
return t.hour * 60 + t.minute
|
||||
|
||||
# 创建覆盖情况数组 (1440分钟 = 24小时)
|
||||
covered = [False] * 1440
|
||||
|
||||
for start_time, end_time in time_ranges:
|
||||
start_min = time_to_minutes(start_time)
|
||||
end_min = time_to_minutes(end_time)
|
||||
|
||||
if start_min <= end_min:
|
||||
# 同一天内的时间段
|
||||
for i in range(start_min, end_min):
|
||||
if i < 1440:
|
||||
covered[i] = True
|
||||
else:
|
||||
# 跨天的时间段
|
||||
for i in range(start_min, 1440):
|
||||
covered[i] = True
|
||||
for i in range(0, end_min):
|
||||
covered[i] = True
|
||||
|
||||
# 检查是否所有分钟都被覆盖
|
||||
return all(covered)
|
||||
Reference in New Issue
Block a user