gardel/Mofox-Core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(schedule): 使计划管理器适配异步数据库操作

Browse Source 
底层的计划数据访问函数已更改为异步实现。为确保正确的异步执行流程，本次提交对 PlanManager 中的所有相关调用进行了更新，添加了 await 关键字，并将 get_plans_for_schedule 方法声明为 async。
This commit is contained in:
tt-P607
2025-10-01 00:44:44 +08:00
parent 9dbc108298
commit c71d91b2a8
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/schedule/plan_manager.py
View File

@@ -28,20 +28,20 @@ class PlanManager:
if target_month is None: if target_month is None:
target_month = datetime.now().strftime("%Y-%m") target_month = datetime.now().strftime("%Y-%m")
if not has_active_plans(target_month): if not await has_active_plans(target_month):
logger.info(f" {target_month} 没有任何有效的月度计划，将触发同步生成。") logger.info(f" {target_month} 没有任何有效的月度计划，将触发同步生成。")
generation_successful = await self._generate_monthly_plans_logic(target_month) generation_successful = await self._generate_monthly_plans_logic(target_month)
return generation_successful return generation_successful
else: else:
logger.info(f"{target_month} 已存在有效的月度计划。") logger.info(f"{target_month} 已存在有效的月度计划。")
plans = get_active_plans_for_month(target_month) plans = await get_active_plans_for_month(target_month)
max_plans = global_config.planning_system.max_plans_per_month max_plans = global_config.planning_system.max_plans_per_month
if len(plans) > max_plans: if len(plans) > max_plans:
logger.warning(f"当前月度计划数量 ({len(plans)}) 超出上限 ({max_plans})，将自动删除多余的计划。") logger.warning(f"当前月度计划数量 ({len(plans)}) 超出上限 ({max_plans})，将自动删除多余的计划。")
plans_to_delete = plans[: len(plans) - max_plans] plans_to_delete = plans[: len(plans) - max_plans]
delete_ids = [p.id for p in plans_to_delete] delete_ids = [p.id for p in plans_to_delete]
delete_plans_by_ids(delete_ids) # type: ignore await delete_plans_by_ids(delete_ids) # type: ignore
plans = get_active_plans_for_month(target_month) plans = await get_active_plans_for_month(target_month)
if plans: if plans:
plan_texts = "\n".join([f" {i + 1}. {plan.plan_text}" for i, plan in enumerate(plans)]) plan_texts = "\n".join([f" {i + 1}. {plan.plan_text}" for i, plan in enumerate(plans)])
@@ -64,11 +64,11 @@ class PlanManager:
return False return False
last_month = self._get_previous_month(target_month) last_month = self._get_previous_month(target_month)
archived_plans = get_archived_plans_for_month(last_month) archived_plans = await get_archived_plans_for_month(last_month)
plans = await self.llm_generator.generate_plans_with_llm(target_month, archived_plans) plans = await self.llm_generator.generate_plans_with_llm(target_month, archived_plans)
if plans: if plans:
add_new_plans(plans, target_month) await add_new_plans(plans, target_month)
logger.info(f"成功为 {target_month} 生成并保存了 {len(plans)} 条月度计划。") logger.info(f"成功为 {target_month} 生成并保存了 {len(plans)} 条月度计划。")
return True return True
else: else:
@@ -95,11 +95,11 @@ class PlanManager:
if target_month is None: if target_month is None:
target_month = datetime.now().strftime("%Y-%m") target_month = datetime.now().strftime("%Y-%m")
logger.info(f" 开始归档 {target_month} 的活跃月度计划...") logger.info(f" 开始归档 {target_month} 的活跃月度计划...")
archived_count = archive_active_plans_for_month(target_month) archived_count = await archive_active_plans_for_month(target_month)
logger.info(f" 成功归档了 {archived_count} 条 {target_month} 的月度计划。") logger.info(f" 成功归档了 {archived_count} 条 {target_month} 的月度计划。")
except Exception as e: except Exception as e:
logger.error(f" 归档 {target_month} 月度计划时发生错误: {e}") logger.error(f" 归档 {target_month} 月度计划时发生错误: {e}")
def get_plans_for_schedule(self, month: str, max_count: int) -> List: async def get_plans_for_schedule(self, month: str, max_count: int) -> List:
avoid_days = global_config.planning_system.avoid_repetition_days 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) return await get_smart_plans_for_daily_schedule(month, max_count=max_count, avoid_days=avoid_days)