里
- parts = [f"
{p.strip()}
" for p in text.split("\n\n") if p.strip()]
+ # 段落 class 名固定为 diary-para(项目级固定,前端 .diary-para 兜底);
+ # CSS 仍内联到 style,保证分享/导出场景不丢。
+ parts = [
+ f'
{p.strip()}
'
+ for p in text.split("\n\n")
+ if p.strip()
+ ]
if not parts:
article.body_zh_formatted = None
else:
@@ -129,30 +143,67 @@ def _wrap_article_body(inner_html: str) -> str:
)
# 段落样式也内联,保证 v-html 渲染时一定生效
p_style = f"margin:0 0 {ARTICLE_BODY_P_MARGIN_BOTTOM} 0;"
- inner_with_p_style = inner_html.replace("
", f'
')
+ # 内层 HTML 的
形式;把 style 插到 class 后面
+ inner_with_p_style = inner_html.replace(
+ f'
',
+ f'
',
+ )
return f'
{inner_with_p_style}
'
-# === 单任务:classify ===
-async def _enrich_classify(article: Article, setting: LlmSetting, client: LlmClient) -> None:
+# === 单任务:classify (含黑名单 drop gate) ===
+async def _enrich_classify(
+ article: Article,
+ setting: LlmSetting,
+ client: LlmClient,
+ blocklist: list[str],
+) -> tuple[bool, list[str]]:
+ """分类 + 黑名单判断。
+
+ 返回 (drop, categories):
+ - drop=True → 整篇文章应删除(分类命中 blocklist)
+ - categories → 写入 article.category 的多标签列表
+ """
template = setting.classify_prompt or get_default_prompts()["classify_prompt"]
- # 老 prompt 可能只支持 {title}/{summary},不支持 {body} —— _safe_format 兜底
+ # 老 prompt 可能只支持 {title}/{summary},不支持 {body} / {blocklist} —— _safe_format 兜底
vars_ = {
"title": (article.title_zh or article.title)[:200],
"summary": (article.summary_zh or "")[:400],
"body": (article.body_zh_text or "")[:1500],
+ "blocklist": "、".join(blocklist) if blocklist else "(无)",
}
prompt = _safe_format(template, vars_)
result = await client.classify_json(
system="你是新闻分类助手,只返回 JSON。",
user=prompt,
)
- cats = result.get("categories") or result.get("tags") or []
- if isinstance(cats, list) and cats:
- # 多标签(2-5 个),逗号分隔存到 category 字段(已有索引)
- joined = ",".join(str(c).strip() for c in cats[:DEFAULT_IMAGE_MAX_TAGS] if str(c).strip())
- article.category = joined[:64] or None
- article.classify_status = "ok"
+ cats_raw = result.get("categories") or result.get("tags") or []
+ cats: list[str] = []
+ if isinstance(cats_raw, list):
+ cats = [str(c).strip() for c in cats_raw[:DEFAULT_IMAGE_MAX_TAGS] if str(c).strip()]
+ # 兼容两种来源:LLM 自己判断的 drop 字段,或后端兜底检查命中
+ drop_flag = bool(result.get("drop"))
+ if not drop_flag and blocklist:
+ # 兜底:即使 LLM 没正确返回 drop 字段,我们也用本地匹配兜底
+ bl_set = {b.strip() for b in blocklist if b and b.strip()}
+ drop_flag = any(c in bl_set for c in cats)
+ return drop_flag, cats
+
+
+def _merge_blocklist(setting: LlmSetting, source: Source | None) -> list[str]:
+ """合并全局 + per-source blocklist,去重保序。"""
+ out: list[str] = []
+ seen: set[str] = set()
+ sources: list[list[str]] = [setting.blocklist_tags or []]
+ if source is not None:
+ sources.append(source.blocklist_tags or [])
+ for src in sources:
+ for t in src:
+ t = (t or "").strip()
+ if t and t not in seen:
+ seen.add(t)
+ out.append(t)
+ return out
# === 单任务:image ===
@@ -205,6 +256,10 @@ async def _enrich_commentary(article: Article, setting: LlmSetting, client: LlmC
async def enrich_article(article_id: int) -> dict[str, str]:
"""对单篇文章做 4 项 LLM 增强。
+ 顺序:classify(黑名单 gate) → format → image → commentary
+ - classify 命中 blocklist → 整篇文章 DELETE,后续任务直接 return
+ - 任一任务失败,只标 status 不影响其他任务
+
返回 {task: status} 字典(用于日志)。
"""
async with AsyncSessionLocal() as session:
@@ -240,30 +295,54 @@ async def enrich_article(article_id: int) -> dict[str, str]:
if not art:
return {}
- # 4 个任务(互不影响);format / classify / commentary 是 chat,image 是 image
- # 串行执行(已经过 client 内部 Semaphore),但每个 try/except 独立
- tasks: list[tuple[str, Any]] = [
- ("format", _enrich_format(art, setting, client)),
- ("classify", _enrich_classify(art, setting, client)),
- ("image", _enrich_image(art, setting, client)),
- ("commentary", _enrich_commentary(art, setting, client)),
- ]
- for name, coro in tasks:
- try:
- await coro
- results[name] = "ok"
- except Exception as e:
- logger.exception("enrich %s failed for article %s: %s", name, article_id, e)
- results[name] = f"failed:{type(e).__name__}"
- # 标 status
- if name == "format":
- art.format_status = "failed"
- elif name == "classify":
- art.classify_status = "failed"
- elif name == "image":
- art.image_ai_status = "failed"
- elif name == "commentary":
- art.commentary_status = "failed"
+ # === 1) classify(黑名单 gate,优先执行)===
+ blocklist = _merge_blocklist(setting, art.source if art.source_id else None)
+ try:
+ drop, cats = await _enrich_classify(art, setting, client, blocklist)
+ art.classify_status = "ok"
+ if cats:
+ art.category = ",".join(cats)[:64] or None
+ if drop:
+ # 命中 blocklist → 删文章,后续 3 步全跳
+ logger.info(
+ "enrich_article id=%s dropped (blocklist hit, cats=%s, blocklist=%s)",
+ article_id, cats, blocklist,
+ )
+ await session.delete(art)
+ await session.commit()
+ return {"classify": "dropped", "format": "skipped", "image": "skipped", "commentary": "skipped"}
+ except Exception as e:
+ logger.exception("enrich classify failed for article %s: %s", article_id, e)
+ art.classify_status = "failed"
+ results["classify"] = f"failed:{type(e).__name__}"
+ # classify 失败也继续(format/image/commentary 还能跑)
+
+ # === 2) format ===
+ try:
+ await _enrich_format(art, setting, client)
+ results["format"] = "ok"
+ except Exception as e:
+ logger.exception("enrich format failed for article %s: %s", article_id, e)
+ art.format_status = "failed"
+ results["format"] = f"failed:{type(e).__name__}"
+
+ # === 3) image ===
+ try:
+ await _enrich_image(art, setting, client)
+ results["image"] = "ok"
+ except Exception as e:
+ logger.exception("enrich image failed for article %s: %s", article_id, e)
+ art.image_ai_status = "failed"
+ results["image"] = f"failed:{type(e).__name__}"
+
+ # === 4) commentary ===
+ try:
+ await _enrich_commentary(art, setting, client)
+ results["commentary"] = "ok"
+ except Exception as e:
+ logger.exception("enrich commentary failed for article %s: %s", article_id, e)
+ art.commentary_status = "failed"
+ results["commentary"] = f"failed:{type(e).__name__}"
await session.commit()
logger.info("enrich_article id=%s: %s", article_id, results)