diff --git a/bot_personal_outbox.py b/bot_personal_outbox.py index 29924d8..6cd6395 100644 --- a/bot_personal_outbox.py +++ b/bot_personal_outbox.py @@ -115,7 +115,17 @@ class BotPersonalOutbox: result = self.save() if asyncio.iscoroutine(result) or hasattr(result, "__await__"): if callable(self.background_task): - self.background_task(result, "bot_personal_outbox_save") + try: + task = self.background_task(result, "bot_personal_outbox_save") + except Exception: + closer = getattr(result, "close", None) + if callable(closer): + closer() + raise + if task is None: + closer = getattr(result, "close", None) + if callable(closer): + closer() return try: task = asyncio.create_task(result) diff --git a/config_migration.py b/config_migration.py index bd081e1..e43e27d 100644 --- a/config_migration.py +++ b/config_migration.py @@ -625,6 +625,44 @@ def _coerce_bool(value: Any) -> bool: def _save_config_after_schema_migration(config: Any, *, logger: Any | None = None) -> None: + def schedule(result: Any) -> bool: + if not (asyncio.iscoroutine(result) or hasattr(result, "__await__")): + return False + try: + loop = asyncio.get_running_loop() + except RuntimeError: + close = getattr(result, "close", None) + if callable(close): + close() + if logger is not None: + logger.debug("[PrivateCompanion] config migration async save skipped: no event loop") + return True + tasks = getattr(config, "_private_companion_config_save_tasks", None) + if not isinstance(tasks, set): + tasks = set() + try: + setattr(config, "_private_companion_config_save_tasks", tasks) + except Exception: + tasks = None + task = loop.create_task(result, name="private-companion-config-save") + if isinstance(tasks, set): + tasks.add(task) + + def consume(done_task: asyncio.Task) -> None: + try: + done_task.result() + except asyncio.CancelledError: + pass + except Exception as exc: + if logger is not None: + logger.warning("[PrivateCompanion] config migration async save failed: %s", _single_line(exc, 160)) + finally: + if isinstance(tasks, set): + tasks.discard(done_task) + + task.add_done_callback(consume) + return True + for method_name in ("save_config", "save", "save_conf"): save = getattr(config, method_name, None) if not callable(save): @@ -634,7 +672,7 @@ def _save_config_after_schema_migration(config: Any, *, logger: Any | None = Non result = save() if asyncio.iscoroutine(result) or hasattr(result, "__await__"): try: - asyncio.get_running_loop().create_task(result) + schedule(result) except RuntimeError: close = getattr(result, "close", None) if callable(close): @@ -650,7 +688,7 @@ def _save_config_after_schema_migration(config: Any, *, logger: Any | None = Non result = save() if asyncio.iscoroutine(result) or hasattr(result, "__await__"): try: - asyncio.get_running_loop().create_task(result) + schedule(result) except RuntimeError: close = getattr(result, "close", None) if callable(close): diff --git a/daily_state.py b/daily_state.py index ce829ce..e6fcb81 100644 --- a/daily_state.py +++ b/daily_state.py @@ -7515,12 +7515,38 @@ class DailyStateMixin: if isinstance(current_tasks, dict): current_tasks.pop(scope, None) + operation = _runner() + creator = getattr(self, "_create_lifecycle_background_task", None) try: - task = asyncio.create_task(_runner()) - tasks[scope] = task - self._default_persona_prompt_refresh_task = task + task = ( + creator(operation, label="default_persona_prompt_refresh") + if callable(creator) + else asyncio.create_task(operation, name="private-companion-persona-prompt-refresh") + ) + if task is not None: + tasks[scope] = task + self._default_persona_prompt_refresh_task = task + if not callable(creator): + def consume(done_task: asyncio.Task) -> None: + try: + done_task.result() + except asyncio.CancelledError: + pass + except Exception as exc: + logger.warning( + "[PrivateCompanion] 默认人格后台刷新失败: %s", + _single_line(exc, 160), + ) + + task.add_done_callback(consume) + else: + close = getattr(operation, "close", None) + if callable(close): + close() except RuntimeError: - pass + close = getattr(operation, "close", None) + if callable(close): + close() def _format_plugin_persona_request_injection(self) -> str: specific_id = str(getattr(self, "plugin_specific_persona_id", "") or "").strip() @@ -11281,6 +11307,10 @@ class DailyStateMixin: timer_event.pop("cancel_requested_at", None) return False if task is None: + try: + operation.close() + except Exception: + pass timer_event.pop("cancel_requested_at", None) return False return True diff --git a/news_exploration.py b/news_exploration.py index 154b24c..6e04221 100644 --- a/news_exploration.py +++ b/news_exploration.py @@ -1274,10 +1274,34 @@ class NewsExplorationMixin: ) except Exception as e: logger.debug(f"[PrivateCompanion] 写入 BiliBot 分享记忆失败: {e}") + operation = _record() + creator = getattr(self, "_create_lifecycle_background_task", None) try: - asyncio.create_task(_record()) + if callable(creator): + task = creator(operation, label="bilibili_share_memory") + if task is None: + close = getattr(operation, "close", None) + if callable(close): + close() + else: + task = asyncio.create_task(operation, name="private-companion-bilibili-share-memory") + + def consume(done_task: asyncio.Task) -> None: + try: + done_task.result() + except asyncio.CancelledError: + pass + except Exception as exc: + logger.warning( + "[PrivateCompanion] B站分享记忆后台任务失败: %s", + _single_line(exc, 160), + ) + + task.add_done_callback(consume) except RuntimeError: - pass + close = getattr(operation, "close", None) + if callable(close): + close() def _bot_currently_bored_enough_for_bilibili(self) -> bool: @@ -1320,8 +1344,32 @@ class NewsExplorationMixin: task = getattr(bili, "_proactive_task", None) if task is not None and not task.done(): return + operation = bili._run_proactive(max_watch=1) try: - bili._proactive_task = asyncio.create_task(bili._run_proactive(max_watch=1)) + creator = getattr(self, "_create_lifecycle_background_task", None) + bili._proactive_task = ( + creator(operation, label="bilibili_boredom_watch") + if callable(creator) + else asyncio.create_task(operation, name="private-companion-bilibili-boredom-watch") + ) + if bili._proactive_task is None: + close = getattr(operation, "close", None) + if callable(close): + close() + return False + if not callable(creator): + def consume(done_task: asyncio.Task) -> None: + try: + done_task.result() + except asyncio.CancelledError: + pass + except Exception as exc: + logger.warning( + "[PrivateCompanion] B站无聊刷视频后台任务失败: %s", + _single_line(exc, 160), + ) + + bili._proactive_task.add_done_callback(consume) state["last_boredom_watch_at"] = now state["last_boredom_watch_status"] = "triggered" self._save_data_sync() diff --git a/page_api.py b/page_api.py index cdec17e..78cd888 100644 --- a/page_api.py +++ b/page_api.py @@ -128,6 +128,38 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio self.plugin = plugin self._schema_key_index_cache: dict[str, Any] | None = None + def _create_page_background_task(self, operation: Any, *, label: str) -> asyncio.Task | None: + creator = getattr(self.plugin, "_create_lifecycle_background_task", None) + if callable(creator): + task = creator(operation, label=label) + if task is None: + close = getattr(operation, "close", None) + if callable(close): + close() + return task + try: + task = asyncio.create_task(operation, name=f"private-companion-page-{label}") + except RuntimeError: + close = getattr(operation, "close", None) + if callable(close): + close() + return None + + def consume(done_task: asyncio.Task) -> None: + try: + done_task.result() + except asyncio.CancelledError: + pass + except Exception as exc: + logger.warning( + "[PrivateCompanionPage] background task failed: label=%s error=%s", + label, + self._single_line(exc, 160), + ) + + task.add_done_callback(consume) + return task + def _troubleshooting_proactive_wakeup_tasks(self) -> dict[str, asyncio.Task[Any]]: tasks = getattr(self.plugin, "_troubleshooting_proactive_wakeup_tasks", None) if not isinstance(tasks, dict): @@ -174,10 +206,12 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio if current is asyncio.current_task(): tasks.pop(user_key, None) - task = asyncio.create_task( + task = self._create_page_background_task( wake_when_due(), - name=f"private_companion_troubleshooting_proactive_{user_key[:40]}", + label=f"troubleshooting_proactive_{user_key[:40]}", ) + if task is None: + return None tasks[user_key] = task return task @@ -447,7 +481,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok(payload) except Exception as exc: logger.error(f"[PrivateCompanionPage] 获取总览失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error("获取总览失败") def _token_overview_payload(self, usage: Any, balance_state: Any = None) -> dict[str, Any]: if not isinstance(usage, dict): @@ -788,7 +822,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio ) except Exception as exc: logger.warning("[PrivateCompanionPage] 读取每日穿搭图片失败: %s", self._single_line(exc, 160)) - return self._error("读取每日穿搭图片失败") + return self._exception_error("读取每日穿搭图片失败") def _cache_summary(self, data: dict[str, Any]) -> dict[str, Any]: image_cache = data.get("private_image_vision_cache") if isinstance(data.get("private_image_vision_cache"), dict) else {} @@ -909,7 +943,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio ) except Exception as exc: logger.error(f"[PrivateCompanionPage] 获取图片缓存失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def update_image_cache_item(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -940,7 +974,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok(self._image_cache_item_summary(key, updated)) except Exception as exc: logger.error(f"[PrivateCompanionPage] 更新图片缓存失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) def _image_cache_preview_dir(self) -> Path: return (Path(getattr(self.plugin, "data_dir", "")) / "private_image_cache_previews").resolve() @@ -1048,7 +1082,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio changed = True return changed - async def _resolve_image_cache_preview_for_request(self) -> tuple[str, Path] | dict[str, Any]: + async def _resolve_image_cache_preview_for_request(self) -> tuple[str, Path] | tuple[dict[str, Any], int]: key = self._single_line(request.args.get("key"), 120) if not key: return self._error("缺少缓存 key") @@ -1210,7 +1244,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio }) except Exception as exc: logger.error(f"[PrivateCompanionPage] 获取参考图库失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def get_photo_reference_image_data(self) -> dict[str, Any]: item_id = self._single_line(request.args.get("id"), 80) @@ -1234,7 +1268,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio try: file_size = path.stat().st_size except OSError: - return self._error("无法读取参考图文件大小") + return self._exception_error("无法读取参考图文件大小") if file_size > PHOTO_REFERENCE_PREVIEW_MAX_BYTES: return self._error( f"参考图预览文件过大({file_size} bytes),上限为 {PHOTO_REFERENCE_PREVIEW_MAX_BYTES} bytes" @@ -1251,12 +1285,12 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio ) except Exception as exc: logger.error(f"[PrivateCompanionPage] 获取参考图预览失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def get_image_cache_preview(self) -> Any: try: resolved = await self._resolve_image_cache_preview_for_request() - if isinstance(resolved, dict): + if self._is_http_error_response(resolved): return resolved _key, path = resolved response = await send_file(str(path)) @@ -1264,23 +1298,23 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return response except Exception as exc: logger.error(f"[PrivateCompanionPage] 获取图片缓存预览失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def get_image_cache_preview_data(self) -> dict[str, Any]: try: resolved = await self._resolve_image_cache_preview_for_request() - if isinstance(resolved, dict): + if self._is_http_error_response(resolved): return resolved _key, path = resolved return self._ok(await self._encode_image_cache_file_data_url(path)) except Exception as exc: logger.error(f"[PrivateCompanionPage] 获取图片缓存预览数据失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def get_image_cache_thumbnail_data(self) -> dict[str, Any]: try: resolved = await self._resolve_image_cache_preview_for_request() - if isinstance(resolved, dict): + if self._is_http_error_response(resolved): return resolved key, source = resolved thumbnail = await self._get_or_create_image_cache_thumbnail(key, source) @@ -1289,7 +1323,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok(await self._encode_image_cache_file_data_url(source)) except Exception as exc: logger.error(f"[PrivateCompanionPage] 获取图片缓存缩略图失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def delete_image_cache_item(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -1311,7 +1345,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok({"key": key, "remaining": remaining}) except Exception as exc: logger.error(f"[PrivateCompanionPage] 删除图片缓存失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def bulk_delete_image_cache_items(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -1362,7 +1396,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio ) except Exception as exc: logger.error(f"[PrivateCompanionPage] 批量删除图片缓存失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) def _remove_image_cache_preview_file(self, preview_path: str, key: str = "") -> None: path: Path | None = None @@ -1537,6 +1571,8 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio if changed: config_saved = await self._save_config_if_possible() overview = await self.get_overview() + if self._is_http_error_response(overview): + return overview if overview.get("success"): overview["data"]["changed"] = changed overview["data"]["config_saved"] = config_saved @@ -1553,7 +1589,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return overview except Exception as exc: logger.error(f"[PrivateCompanionPage] 更新设置失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def swap_image_api_settings(self) -> dict[str, Any]: try: @@ -1584,6 +1620,8 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio self._apply_config_value("external_image_api_endpoints", changed) config_saved = await self._save_config_if_possible() overview = await self.get_overview() + if self._is_http_error_response(overview): + return overview if overview.get("success"): data = overview.get("data") if isinstance(overview.get("data"), dict) else {} data["changed"] = {"external_image_api_endpoints": changed} @@ -1638,6 +1676,8 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio self._sync_photo_generation_runtime_config() config_saved = await self._save_config_if_possible() overview = await self.get_overview() + if self._is_http_error_response(overview): + return overview if overview.get("success"): data = overview.get("data") if isinstance(overview.get("data"), dict) else {} data["changed"] = changed @@ -1647,7 +1687,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return overview except Exception as exc: logger.error(f"[PrivateCompanionPage] 切换在线生图 API 失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def export_migration_config(self) -> dict[str, Any]: try: @@ -1655,14 +1695,14 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok(package) except Exception as exc: logger.error(f"[PrivateCompanionPage] 导出配置备份失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def list_migration_backups(self) -> dict[str, Any]: try: return self._ok({"items": self._list_migration_backup_items(limit=8)}) except Exception as exc: logger.error(f"[PrivateCompanionPage] 读取配置备份列表失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def restore_migration_backup(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -1673,6 +1713,8 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio package = self._extract_migration_package(package) normalized = self._normalize_migration_package(package) overview = await self._apply_migration_normalized(normalized, mode="replace", conflict="use_backup") + if self._is_http_error_response(overview): + return overview data = overview.get("data") if isinstance(overview.get("data"), dict) else {} data["message"] = "已从自动备份恢复。" data["restored_from"] = path.name @@ -1680,7 +1722,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return overview except Exception as exc: logger.error(f"[PrivateCompanionPage] 恢复配置备份失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def preview_migration_config_import(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -1695,7 +1737,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok(summary) except Exception as exc: logger.error(f"[PrivateCompanionPage] 预览配置导入失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def apply_migration_config_import(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -1716,7 +1758,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return await self._apply_migration_normalized(normalized, mode=mode, conflict=conflict) except Exception as exc: logger.error(f"[PrivateCompanionPage] 应用配置导入失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def update_proactive_only_unlock(self) -> dict[str, Any]: try: @@ -1741,7 +1783,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio ) except Exception as exc: logger.error(f"[PrivateCompanionPage] 更新主动专用临时放行失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def delete_proactive_candidate(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -1798,7 +1840,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio ) except Exception as exc: logger.error(f"[PrivateCompanionPage] 删除主动候选失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def prune_proactive_candidates(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -1825,7 +1867,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio ) except Exception as exc: logger.error(f"[PrivateCompanionPage] 压缩主动候选失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) def _troubleshooting_warning_type(self, scope: str, *parts: Any) -> str: source = "\x1f".join( @@ -2047,7 +2089,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio ) except Exception as exc: logger.error("[PrivateCompanionPage] 更新排障警告屏蔽失败: %s", self._single_line(exc, 160), exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def get_diagnostics(self) -> dict[str, Any]: try: @@ -2075,7 +2117,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio ) except Exception as exc: logger.error(f"[PrivateCompanionPage] 获取诊断失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def get_troubleshooting(self) -> dict[str, Any]: try: @@ -2191,7 +2233,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio ) except Exception as exc: logger.error(f"[PrivateCompanionPage] 获取排障信息失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def _recover_stale_troubleshooting_proactive_test(self, *, max_age_seconds: int = 120) -> int: recovered = 0 @@ -2462,7 +2504,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio ) except Exception as exc: logger.warning("[PrivateCompanionPage] 获取生图 API 状态失败: %s", self._single_line(exc, 160), exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def test_image_api_endpoint(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -5362,7 +5404,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok(self._token_stats_payload(usage, balance_state)) except Exception as exc: logger.error(f"[PrivateCompanionPage] 获取 Token 统计失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def reset_token_stats(self) -> dict[str, Any]: try: @@ -5373,7 +5415,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok(self._token_stats_payload({}, balance_state)) except Exception as exc: logger.error(f"[PrivateCompanionPage] 重置 Token 统计失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def unlock_bookshelf(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -5388,7 +5430,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok({"bookshelf": await self._bookshelf_summary(data, unlocked=True, access_token=access_token)}) except Exception as exc: logger.error(f"[PrivateCompanionPage] 解锁书柜夹层失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) def _memo_notes_payload(self, data: dict[str, Any]) -> dict[str, Any]: now = time.time() @@ -5433,7 +5475,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok({"memo_notes": self._memo_notes_payload(data)}) except Exception as exc: logger.error(f"[PrivateCompanionPage] 获取备忘便签失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def update_memo_note(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -5451,10 +5493,10 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio result = self._memo_notes_payload(self.plugin.data) return self._ok({"memo_notes": result}) except ValueError as exc: - return self._error(str(exc)) + return self._exception_error(str(exc)) except Exception as exc: logger.error(f"[PrivateCompanionPage] 更新备忘便签失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) @staticmethod def _normalize_bookshelf_password(value: Any) -> str: @@ -5518,7 +5560,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return response except Exception as exc: logger.error(f"[PrivateCompanionPage] 读取书柜图片失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def get_bookshelf_image_data(self) -> dict[str, Any]: if not self._bookshelf_access_token_valid(self._bookshelf_request_token()): @@ -5540,7 +5582,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio ) except Exception as exc: logger.error(f"[PrivateCompanionPage] 读取书柜图片数据失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def _read_file_base64(self, path: Path) -> str: import asyncio @@ -5742,7 +5784,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok({"changed": changed, "bookshelf": await self._bookshelf_summary(data, unlocked=True, access_token=access_token)}) except Exception as exc: logger.error(f"[PrivateCompanionPage] 删除书柜项目失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) def _cleanup_bookshelf_page_files(self, pages: list[dict[str, Any]]) -> None: data_root = Path(str(getattr(self.plugin, "data_dir", ""))).resolve() @@ -5836,7 +5878,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok({"bookshelf": await self._bookshelf_summary(data, unlocked=True, access_token=access_token)}) except Exception as exc: logger.error(f"[PrivateCompanionPage] 更新书柜阅读进度失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def rate_bookshelf_item(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -5885,7 +5927,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok({"bookshelf": await self._bookshelf_summary(data, unlocked=True, access_token=access_token)}) except Exception as exc: logger.error(f"[PrivateCompanionPage] 保存私密阅读评分失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) def _normalize_bookshelf_tag_list(self, value: Any, *, limit: int = 8) -> list[str]: raw_items: list[Any] @@ -5995,7 +6037,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok({"bookshelf": await self._bookshelf_summary(data, unlocked=True, access_token=access_token)}) except Exception as exc: logger.error(f"[PrivateCompanionPage] 保存私密阅读标签失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) def _resolve_bookshelf_data_file(self, value: Any) -> Path | None: path_text = _path_text(value, 1000) @@ -6136,7 +6178,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok({"message": "Bot 已重新读过并更新读后感", "bookshelf": await self._bookshelf_summary(data, unlocked=True, access_token=access_token)}) except Exception as exc: logger.error(f"[PrivateCompanionPage] 更新私密阅读批注失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def import_worldbook(self) -> dict[str, Any]: try: @@ -6147,7 +6189,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok({"changed": changed, "worldbook": self._worldbook_summary(data)}) except Exception as exc: logger.error(f"[PrivateCompanionPage] 导入世界书失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def update_worldbook_member(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -6273,7 +6315,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok(response) except Exception as exc: logger.error(f"[PrivateCompanionPage] 更新关系节点失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def get_worldbook_member_livingmemory(self) -> dict[str, Any]: user_id = self._normalize_worldbook_member_id(self._single_line(request.args.get("user_id"), 80)) @@ -6317,10 +6359,10 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio ) except sqlite3.OperationalError as exc: logger.warning(f"[PrivateCompanionPage] 查询 LivingMemory 失败: {exc}") - return self._error(f"LivingMemory 数据库暂时不可读:{exc}") + return self._exception_error("LivingMemory 数据库暂时不可读") except Exception as exc: logger.error(f"[PrivateCompanionPage] 查询关系节点 LivingMemory 失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error(str(exc)) async def clear_worldbook_pending_observations(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -6354,7 +6396,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok({"message": message, "cleared": cleared, "worldbook": self._worldbook_summary(data)}) except Exception as exc: logger.error(f"[PrivateCompanionPage] 清理待确认观察失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error("清理待确认观察失败") async def update_worldbook_group(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -6408,7 +6450,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok({"message": "已保存群资料", "worldbook": self._worldbook_summary(data)}) except Exception as exc: logger.error(f"[PrivateCompanionPage] 更新群资料失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error("更新群资料失败") async def apply_preset(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -6436,7 +6478,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return overview except Exception as exc: logger.error(f"[PrivateCompanionPage] 应用预设失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error("应用预设失败") async def update_skill_growth(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -6538,7 +6580,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok({"message": "已保存技能", "skill_growth": self._skill_growth_summary(self.plugin.data)}) except Exception as exc: logger.error(f"[PrivateCompanionPage] 更新技能失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error("更新技能失败") async def update_personal_goal(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -6638,7 +6680,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok({"message": "已保存个人目标", "personal_goals": self._personal_goal_summary(self.plugin.data)}) except Exception as exc: logger.error(f"[PrivateCompanionPage] 更新个人目标失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error("更新个人目标失败") @staticmethod def _food_menu_parse_bool(value: Any, default: bool = False) -> bool: @@ -6872,7 +6914,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok({"message": "已保存候选", "food_menu": self._food_menu_summary(self.plugin.data)}) except Exception as exc: logger.error(f"[PrivateCompanionPage] 更新吃什么候选失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error("更新吃什么候选失败") async def bulk_update_food_menu(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -6967,7 +7009,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio ) except Exception as exc: logger.error(f"[PrivateCompanionPage] 批量更新吃什么候选失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error("批量更新吃什么候选失败") async def bulk_delete_food_menu(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -7014,7 +7056,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio ) except Exception as exc: logger.error(f"[PrivateCompanionPage] 批量删除吃什么候选失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error("批量删除吃什么候选失败") async def update_external_ability(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -7052,7 +7094,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok({"message": "已保存外部主动能力", "external_abilities": self._external_ability_summary(data)}) except Exception as exc: logger.error(f"[PrivateCompanionPage] 更新外部主动能力失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error("更新外部主动能力失败") async def list_roleplay_personas(self) -> dict[str, Any]: try: @@ -7350,7 +7392,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio ) except Exception as exc: logger.warning(f"[PrivateCompanionPage] 根据主回复人格生成设定草稿失败: {exc}", exc_info=True) - return self._error(f"生成草稿失败: {self._single_line(exc, 160)}") + return self._exception_error("生成草稿失败") async def apply_setup_guide(self) -> dict[str, Any]: """Persist the first setup guide draft into plugin config and data.""" @@ -7546,6 +7588,8 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio if changed: config_saved = await self._save_config_if_possible() overview = await self.get_overview() + if self._is_http_error_response(overview): + return overview if overview.get("success"): data = overview.get("data") if isinstance(overview.get("data"), dict) else {} data["setup_applied"] = True @@ -7555,7 +7599,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return overview except Exception as exc: logger.error(f"[PrivateCompanionPage] 首次配置落地失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error("首次配置落地失败") def _setup_guide_fallback_daily_plan(self, reason: str = "timeout") -> dict[str, Any]: now = datetime.now().strftime("%Y-%m-%d %H:%M") @@ -7610,7 +7654,9 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return plan if not isinstance(task, asyncio.Task) or task.done(): - task = asyncio.create_task(_runner()) + task = self._create_page_background_task(_runner(), label="setup_daily_plan") + if task is None: + return {}, "unavailable", False def _consume_setup_daily_task(done_task: asyncio.Task) -> None: try: done_task.result() @@ -7695,7 +7741,14 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio detail_refiner = getattr(self.plugin, "_ensure_detail_enhancement", None) if callable(detail_refiner): detail_timeout = max(3, min(60, timeout_seconds)) - detail_task = asyncio.create_task(detail_refiner(force=bool(force_detail))) + detail_task = self._create_page_background_task( + detail_refiner(force=bool(force_detail)), + label="setup_daily_detail", + ) + if detail_task is None: + detail_error = "后台细化任务无法启动" + detail_pending = False + detail_task = None def _consume_setup_detail_task(done_task: asyncio.Task) -> None: try: @@ -7709,8 +7762,11 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio exc_info=True, ) - detail_task.add_done_callback(_consume_setup_detail_task) + if detail_task is not None: + detail_task.add_done_callback(_consume_setup_detail_task) try: + if detail_task is None: + raise RuntimeError("setup detail task unavailable") detail = await asyncio.wait_for(asyncio.shield(detail_task), timeout=detail_timeout) except asyncio.TimeoutError: detail_pending = True @@ -7912,7 +7968,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio else: live_item.pop(field, None) self.plugin._save_data_sync() - return self._error(self._single_line(exc, 180) or "局部重生成失败") + return self._exception_error("局部重生成失败") def _normalize_roleplay_draft_scopes(self, raw: Any) -> list[str]: allowed = {"persona", "world", "user"} @@ -8181,7 +8237,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio ) except Exception as exc: logger.error(f"[PrivateCompanionPage] 人格标准化问卷生成失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error("人格标准化问卷生成失败") async def generate_persona_style_scenarios(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -8372,7 +8428,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio ) except Exception as exc: logger.error(f"[PrivateCompanionPage] 人格风格试答生成失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error("人格风格试答生成失败") async def retry_persona_style_scenario(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -8427,7 +8483,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio ) except Exception as exc: logger.error(f"[PrivateCompanionPage] 人格风格单情景重生成失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error("人格风格单情景重生成失败") async def generate_persona_style_summary(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -8480,7 +8536,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio ) except Exception as exc: logger.error(f"[PrivateCompanionPage] 人格风格规则归纳失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error("人格风格规则归纳失败") def _standardize_persona_provider_id(self) -> str: task_provider = getattr(self.plugin, "_task_provider", None) @@ -9599,7 +9655,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok({"items": items, "total": len(items)}) except Exception as exc: logger.error(f"[PrivateCompanionPage] 获取 Provider 列表失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error("获取 Provider 列表失败") async def test_provider(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -10528,7 +10584,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok(self._expression_library_summary(snapshot)) except Exception as exc: logger.error(f"[PrivateCompanionPage] 获取统一表达学习库失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error("获取统一表达学习库失败") async def update_expression_library(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -10562,7 +10618,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok(result) except Exception as exc: logger.error(f"[PrivateCompanionPage] 清空统一表达待审样本失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error("清空统一表达待审样本失败") if source_type not in {"private", "group"} or not source_id: return self._error("缺少有效的表达样本来源") if action not in { @@ -10600,7 +10656,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._error(str(exc)) except Exception as exc: logger.error(f"[PrivateCompanionPage] 更新统一表达学习库失败: {exc}", exc_info=True) - return self._error(str(exc)) + return self._exception_error("更新统一表达学习库失败") def _apply_expression_profile_action(self, user: dict[str, Any], payload: dict[str, Any]) -> str: profile = user.setdefault("expression_profile", {}) @@ -11972,6 +12028,8 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio self._refresh_migration_runtime_caches(data_payload) overview = await self.get_overview() + if self._is_http_error_response(overview): + return overview data = overview.get("data") if isinstance(overview.get("data"), dict) else {} checks = await self._migration_post_import_checks(config_saved=config_saved) data["message"] = "配置已导入。" @@ -14659,7 +14717,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio kicker = getattr(self.plugin, "_kick_proactive_loop_once", None) if callable(kicker): try: - asyncio.create_task(kicker()) + self._create_page_background_task(kicker(), label="max_daily_messages_wakeup") except RuntimeError: pass return @@ -19322,7 +19380,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio ) except Exception as exc: logger.error("[PrivateCompanionPage] 读取创作封面数据失败: %s", exc, exc_info=True) - return self._error(str(exc)) + return self._exception_error("读取创作封面数据失败") async def get_creative_project(self) -> dict[str, Any]: project_id = str(request.args.get("id", "")).strip() @@ -19338,7 +19396,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok(self._creative_project_payload(snapshot)) except Exception as exc: logger.error("[PrivateCompanionPage] 获取创作项目详情失败: %s", exc, exc_info=True) - return self._error(str(exc)) + return self._exception_error("获取创作项目详情失败") async def update_creative_project(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -19421,7 +19479,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok({"project_id": project_id, "changed": bool(changed_notes), "message": "作品已更新"}) except Exception as exc: logger.error("[PrivateCompanionPage] 更新创作项目失败: %s", exc, exc_info=True) - return self._error(str(exc)) + return self._exception_error("更新创作项目失败") async def update_creative_chunk(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -19444,7 +19502,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok({"project_id": project_id, "chunk_index": chunk_index, "message": "片段已更新"}) except Exception as exc: logger.error("[PrivateCompanionPage] 更新创作片段失败: %s", exc, exc_info=True) - return self._error(str(exc)) + return self._exception_error("更新创作片段失败") async def update_creative_outline(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -19462,7 +19520,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok({"project_id": project_id, "message": "大纲已更新"}) except Exception as exc: logger.error("[PrivateCompanionPage] 更新创作大纲失败: %s", exc, exc_info=True) - return self._error(str(exc)) + return self._exception_error("更新创作大纲失败") async def update_creative_characters(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -19489,7 +19547,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok({"project_id": project_id, "message": "角色已更新"}) except Exception as exc: logger.error("[PrivateCompanionPage] 更新创作角色失败: %s", exc, exc_info=True) - return self._error(str(exc)) + return self._exception_error("更新创作角色失败") async def reanalyze_creative_project(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -19534,7 +19592,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok({"project_id": project_id, "review": review}) except Exception as exc: logger.error("[PrivateCompanionPage] 创作项目质量分析失败: %s", exc, exc_info=True) - return self._error(str(exc)) + return self._exception_error("创作项目质量分析失败") async def rebuild_creative_memory(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -19551,7 +19609,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok(result) except Exception as exc: logger.error("[PrivateCompanionPage] 重建创作记忆失败: %s", exc, exc_info=True) - return self._error(str(exc)) + return self._exception_error("重建创作记忆失败") async def delete_creative_project(self) -> dict[str, Any]: payload = await request.get_json(silent=True) or {} @@ -19570,7 +19628,7 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return self._ok({"project_id": project_id, "removed": removed}) except Exception as exc: logger.error("[PrivateCompanionPage] 删除创作项目失败: %s", exc, exc_info=True) - return self._error(str(exc)) + return self._exception_error("删除创作项目失败") def _creative_summary(self, data: dict[str, Any]) -> dict[str, Any]: projects = data.get("creative_projects") if isinstance(data.get("creative_projects"), list) else [] @@ -20958,5 +21016,47 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiQzoneMixin, PrivateCompanio return {"success": True, "data": data, "ts": int(time.time())} @staticmethod - def _error(message: str) -> dict[str, Any]: - return {"success": False, "error": str(message), "ts": int(time.time())} + def _is_http_error_response(value: Any) -> bool: + return ( + isinstance(value, tuple) + and len(value) == 2 + and isinstance(value[0], dict) + and isinstance(value[1], int) + ) + + @staticmethod + def _safe_error_message(message: Any) -> str: + text = PrivateCompanionPageApi._single_line(message, 220) + if not text: + return "请求失败" + lowered = text.lower() + sensitive_markers = ( + "api_key", + "apikey", + "password", + "authorization", + "cookie", + "credential", + "secret", + "token", + ) + if any(marker in lowered for marker in sensitive_markers): + return "内部操作失败" + if "\\\\" in text or re.search(r"(?:[A-Za-z]:[\\/]|(?:^|[\\s'\"=])/[^\s]+)", text): + return "内部操作失败" + return text + + @staticmethod + def _error(message: str, *, status_code: int = 400) -> tuple[dict[str, Any], int]: + return ( + { + "success": False, + "error": PrivateCompanionPageApi._safe_error_message(message), + "ts": int(time.time()), + }, + int(status_code), + ) + + @staticmethod + def _exception_error(message: str = "内部操作失败") -> tuple[dict[str, Any], int]: + return PrivateCompanionPageApi._error(message, status_code=500) diff --git a/private_image.py b/private_image.py index 7cc86c6..871356a 100644 --- a/private_image.py +++ b/private_image.py @@ -2986,17 +2986,32 @@ class PrivateImageMixin: except Exception: pass return existing_task - task = asyncio.create_task( - self._run_group_image_understanding( - task_key=task_key, - group_id=group_id, - sender_id=sender_id, - text=text, - message_id=message_id, - umo=_single_line(getattr(event, "unified_msg_origin", ""), 160), - sources=sources, - ) + operation = self._run_group_image_understanding( + task_key=task_key, + group_id=group_id, + sender_id=sender_id, + text=text, + message_id=message_id, + umo=_single_line(getattr(event, "unified_msg_origin", ""), 160), + sources=sources, ) + creator = getattr(self, "_create_lifecycle_background_task", None) + try: + task = ( + creator(operation, label="group_image_understanding") + if callable(creator) + else asyncio.create_task(operation, name="private-companion-group-image-understanding") + ) + except RuntimeError: + close = getattr(operation, "close", None) + if callable(close): + close() + return None + if task is None: + close = getattr(operation, "close", None) + if callable(close): + close() + return None store[task_key] = { "task": task, "created_ts": _now_ts(), @@ -4011,9 +4026,33 @@ class PrivateImageMixin: ) task_creator = getattr(self, "_create_lifecycle_background_task", None) if callable(task_creator): - task_creator(remainder, label="private_image_reply_remainder") + task = task_creator(remainder, label="private_image_reply_remainder") + if task is None: + close = getattr(remainder, "close", None) + if callable(close): + close() else: - asyncio.create_task(remainder) + task = asyncio.create_task(remainder, name="private-companion-private-image-remainder") + tasks = getattr(self, "_private_image_background_tasks", None) + if not isinstance(tasks, set): + tasks = set() + self._private_image_background_tasks = tasks + tasks.add(task) + + def consume(done_task: asyncio.Task) -> None: + try: + done_task.result() + except asyncio.CancelledError: + pass + except Exception as exc: + logger.warning( + "[PrivateCompanion] private image remainder task failed: %s", + _single_line(exc, 160), + ) + finally: + tasks.discard(done_task) + + task.add_done_callback(consume) return first_text or self._private_image_context_assistant_message(text) async def _private_image_reply_chain(self, text: str, event: AstrMessageEvent) -> list[Any]: diff --git a/tests/test_c7_concurrency_lifecycle.py b/tests/test_c7_concurrency_lifecycle.py index eeb899f..689584d 100644 --- a/tests/test_c7_concurrency_lifecycle.py +++ b/tests/test_c7_concurrency_lifecycle.py @@ -1,6 +1,7 @@ from __future__ import annotations import asyncio +import inspect from pathlib import Path import sys import types @@ -19,10 +20,11 @@ from c7_companion_test_package.bot_personal_outbox import BotPersonalOutbox class OutboxLifecycleTests(unittest.TestCase): def test_async_save_uses_lifecycle_callback_when_provided(self): labels: list[str] = [] + operations = [] def create_task(operation, label): labels.append(label) - operation.close() + operations.append(operation) return None async def save(): @@ -31,6 +33,8 @@ class OutboxLifecycleTests(unittest.TestCase): outbox = BotPersonalOutbox({}, save=save, background_task=create_task) asyncio.run(asyncio.to_thread(outbox._persist)) self.assertEqual(["bot_personal_outbox_save"], labels) + self.assertEqual(1, len(operations)) + self.assertEqual(inspect.CORO_CLOSED, inspect.getcoroutinestate(operations[0])) class CompanionConcurrencyStaticTests(unittest.TestCase): @@ -51,6 +55,36 @@ class CompanionConcurrencyStaticTests(unittest.TestCase): ): self.assertNotIn(marker, source) + def test_chat_side_background_boundaries_consume_failures_and_keep_http_errors(self): + sources = { + name: (ROOT / name).read_text(encoding="utf-8") + for name in ( + "config_migration.py", + "news_exploration.py", + "page_api.py", + "private_image.py", + "tts_enhancement.py", + "user_memory.py", + ) + } + config_source = sources["config_migration.py"] + self.assertIn("_private_companion_config_save_tasks", config_source) + self.assertIn("done_task.result()", config_source) + self.assertIn("except asyncio.CancelledError", config_source) + for name in ("news_exploration.py", "private_image.py", "tts_enhancement.py", "user_memory.py"): + self.assertIn("_create_lifecycle_background_task", sources[name]) + + page_source = sources["page_api.py"] + self.assertIn("def _exception_error", page_source) + self.assertIn("status_code=500", page_source) + + def test_page_error_response_is_non_success_status_without_changing_success_payload_shape(self): + source = (ROOT / "page_api.py").read_text(encoding="utf-8") + self.assertIn('return {"success": True, "data": data, "ts": int(time.time())}', source) + self.assertIn("def _safe_error_message", source) + self.assertIn('"success": False', source) + self.assertIn("status_code=500", source) + if __name__ == "__main__": unittest.main() diff --git a/tts_enhancement.py b/tts_enhancement.py index f39fb32..aa734f3 100644 --- a/tts_enhancement.py +++ b/tts_enhancement.py @@ -291,6 +291,38 @@ class TtsEnhancementMixin: behavior surface but maps identity and prompts to private_companion concepts. """ + def _create_tts_background_task(self, operation: Any, *, label: str) -> asyncio.Task | None: + creator = getattr(self, "_create_lifecycle_background_task", None) + if callable(creator): + task = creator(operation, label=label) + if task is None: + close = getattr(operation, "close", None) + if callable(close): + close() + return task + try: + task = asyncio.create_task(operation, name=f"private-companion-tts-{label}") + except RuntimeError: + close = getattr(operation, "close", None) + if callable(close): + close() + return None + + def consume(done_task: asyncio.Task) -> None: + try: + done_task.result() + except asyncio.CancelledError: + pass + except Exception as exc: + logger.warning( + "[PrivateCompanion] TTS background task failed: label=%s error=%s", + label, + _single_line(exc, 160), + ) + + task.add_done_callback(consume) + return task + def _load_tts_enhancement_config(self, config: Any) -> None: self.enable_tts_enhancement = self._cfg_bool(config, "enable_tts_enhancement", False) raw_synthesis_backend = self._cfg_str( @@ -2260,9 +2292,13 @@ TTS 朗读文本: ) task_creator = getattr(self, "_create_lifecycle_background_task", None) if callable(task_creator): - task_creator(remainder, label="tts_reply_remainder") + task = task_creator(remainder, label="tts_reply_remainder") + if task is None: + close = getattr(remainder, "close", None) + if callable(close): + close() else: - asyncio.create_task(remainder) + self._create_tts_background_task(remainder, label="tts_reply_remainder") return event.set_result(self._build_result_from_chain(ordered_chunks[0] if ordered_chunks else new_chain)) @@ -3367,7 +3403,10 @@ Provider 规则:{emotion_rule} is_live_reply = source == "bili_live_auto_reply" visible_text = subtitle_text or spoken_text subtitle_task = ( - asyncio.create_task(self._post_tts_live_subtitle(visible_text)) + self._create_tts_background_task( + self._post_tts_live_subtitle(visible_text), + label="tts_live_subtitle", + ) if is_live_reply else None ) @@ -3935,13 +3974,14 @@ Provider 规则:{emotion_rule} return result result["audio_path"] = str(audio_file) - asyncio.create_task( + self._create_tts_background_task( self._after_tts_audio_generated( str(audio_file), sanitized, source=source or "external_realtime", allow_local_playback=play_local, - ) + ), + label="tts_audio_postprocess", ) return result @@ -4045,12 +4085,13 @@ Provider 规则:{emotion_rule} logger.warning("[PrivateCompanion] TTS强化检查语音路径失败: %s", _single_line(exc, 120)) return None final_ref = str(audio_path) - asyncio.create_task( + self._create_tts_background_task( self._after_tts_audio_generated( str(audio_path), sanitized, source=source or "private_companion", - ) + ), + label="tts_audio_postprocess", ) if provider_settings.get("use_file_service", False): callback_api_base = str((config or {}).get("callback_api_base", "") or "").strip() diff --git a/user_memory.py b/user_memory.py index 7a6e259..001b00d 100644 --- a/user_memory.py +++ b/user_memory.py @@ -4311,9 +4311,33 @@ class UserMemoryMixin: if not user_id: return habit["memory_synced_at"] = now + operation = recorder(user=user, user_id=user_id, habit=dict(habit)) try: - asyncio.create_task(recorder(user=user, user_id=user_id, habit=dict(habit))) + creator = getattr(self, "_create_lifecycle_background_task", None) + task = ( + creator(operation, label="user_habit_memory_sync") + if callable(creator) + else asyncio.create_task(operation, name="private-companion-user-habit-memory-sync") + ) + if task is None: + raise RuntimeError("background task unavailable") + if not callable(creator): + def consume(done_task: asyncio.Task) -> None: + try: + done_task.result() + except asyncio.CancelledError: + pass + except Exception as exc: + logger.warning( + "[PrivateCompanion] 用户习惯记忆同步后台任务失败: %s", + _single_line(exc, 160), + ) + + task.add_done_callback(consume) except Exception: + close = getattr(operation, "close", None) + if callable(close): + close() habit["memory_synced_at"] = 0 def _format_user_habit_time(self, minute_value: Any) -> str: @@ -5268,9 +5292,37 @@ Local classifier result: return vent = getattr(self, "_maybe_publish_qzone_emotional_vent", None) if callable(vent): + operation = vent( + user_snapshot=deepcopy(user), + relationship_state=deepcopy(state), + intent=deepcopy(intent), + ) try: - asyncio.create_task(vent(user_snapshot=deepcopy(user), relationship_state=deepcopy(state), intent=deepcopy(intent))) + creator = getattr(self, "_create_lifecycle_background_task", None) + task = ( + creator(operation, label="qzone_emotional_vent") + if callable(creator) + else asyncio.create_task(operation, name="private-companion-qzone-emotional-vent") + ) + if task is None: + raise RuntimeError("background task unavailable") + if not callable(creator): + def consume(done_task: asyncio.Task) -> None: + try: + done_task.result() + except asyncio.CancelledError: + pass + except Exception as exc: + logger.warning( + "[PrivateCompanion] QQ 空间情绪动态后台任务失败: %s", + _single_line(exc, 160), + ) + + task.add_done_callback(consume) except Exception as exc: + close = getattr(operation, "close", None) + if callable(close): + close() logger.debug("[PrivateCompanion] 公开心情动态任务创建失败: %s", _single_line(exc, 120)) def _remember_passive_reply_topic(self, user: dict[str, Any], text: str, inbound_text: str = "") -> None: @@ -7589,13 +7641,28 @@ Bot 主动后用户回复次数:{reply_count} preference, ) if followup_user is not None: - asyncio.create_task( - self._refresh_persona_relationship( - user_id, - followup_user, - trigger="pending_boundary", - ) + operation = self._refresh_persona_relationship( + user_id, + followup_user, + trigger="pending_boundary", ) + creator = getattr(self, "_create_lifecycle_background_task", None) + try: + task = ( + creator(operation, label="persona_relationship_followup") + if callable(creator) + else asyncio.create_task(operation, name="private-companion-persona-relationship-followup") + ) + if task is None: + raise RuntimeError("background task unavailable") + except Exception as exc: + close = getattr(operation, "close", None) + if callable(close): + close() + logger.warning( + "[PrivateCompanion] relationship follow-up task failed to start: %s", + _single_line(exc, 160), + ) return True except Exception as exc: await self._mark_user_background_retry(user_id, "relationship", now, exc)