Merge afc branch into dev, prioritizing afc changes and migrating database async modifications from dev

src/schedule/database.py

@@ -301,4 +301,4 @@ async def has_active_plans(month: str) -> bool:
             return result.scalar_one() > 0
         except Exception as e:
             logger.error(f"检查 {month} 的有效月度计划时发生错误: {e}")
-            return False
+            return False

src/schedule/llm_generator.py

@@ -226,4 +226,4 @@ class MonthlyPlanLLMGenerator:
             return plans
         except Exception as e:
             logger.error(f"解析月度计划响应时发生错误: {e}")
-            return []
+            return []

src/schedule/plan_manager.py

@@ -28,20 +28,20 @@ class PlanManager:
         if target_month is None:
             target_month = datetime.now().strftime("%Y-%m")
 
-        if not await has_active_plans(target_month):
+        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 = await get_active_plans_for_month(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]
-                await delete_plans_by_ids(delete_ids)  # type: ignore
-                plans = await get_active_plans_for_month(target_month)
+                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)])
@@ -64,11 +64,11 @@ class PlanManager:
                 return False
 
             last_month = self._get_previous_month(target_month)
-            archived_plans = await get_archived_plans_for_month(last_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:
-                await add_new_plans(plans, target_month)
+                add_new_plans(plans, target_month)
                 logger.info(f"成功为 {target_month} 生成并保存了 {len(plans)} 条月度计划。")
                 return True
             else:
@@ -80,8 +80,7 @@ class PlanManager:
         finally:
             self.generation_running = False
 
-    @staticmethod
-    def _get_previous_month(current_month: str) -> str:
+    def _get_previous_month(self, current_month: str) -> str:
         try:
             year, month = map(int, current_month.split("-"))
             if month == 1:
@@ -91,18 +90,16 @@ class PlanManager:
         except Exception:
             return "1900-01"
 
-    @staticmethod
-    async def archive_current_month_plans(target_month: Optional[str] = None):
+    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 = await archive_active_plans_for_month(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}")
 
-    @staticmethod
-    async def get_plans_for_schedule(month: str, max_count: int) -> List:
+    def get_plans_for_schedule(self, month: str, max_count: int) -> List:
         avoid_days = global_config.planning_system.avoid_repetition_days
-        return await get_smart_plans_for_daily_schedule(month, max_count=max_count, avoid_days=avoid_days)
+        return get_smart_plans_for_daily_schedule(month, max_count=max_count, avoid_days=avoid_days)

src/schedule/schemas.py

@@ -96,4 +96,4 @@ class ScheduleData(BaseModel):
                     covered[i] = True
 
         # 检查是否所有分钟都被覆盖
-        return all(covered)
+        return all(covered)