From d5836eb84564a8f8aa78062630c5f0c3fa3dd152 Mon Sep 17 00:00:00 2001 From: ThearchyHelios Date: Wed, 21 Oct 2026 16:10:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=99=E4=BD=9C=E7=9B=AE=E5=BD=95=E7=9C=81?= =?UTF-8?q?=E7=95=A5=E8=AF=B4=E6=98=8E=E9=87=8C=E5=88=86=E6=9E=90=E7=BB=93?= =?UTF-8?q?=E8=AE=BA=E9=82=A3=E5=87=A0=E5=8F=A5=E6=94=B9=E6=88=90=E7=BB=99?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=9C=8B=E7=9A=84=E5=B8=B8=E9=87=8F=EF=BC=88?= =?UTF-8?q?ANALYSIS=5FTABLES=5FOMITTED=5FPROMPT=E3=80=81ANALYSIS=5FTRIMMED?= =?UTF-8?q?=5FPROMPT=E3=80=81ANALYSIS=5FLEVEL=5FPROMPT=5FWORDS=EF=BC=89?= =?UTF-8?q?=EF=BC=8C=E5=92=8C=E5=88=AB=E7=9A=84=E5=86=99=E4=BD=9C=E8=A7=84?= =?UTF-8?q?=E5=88=99=E5=90=8C=E4=B8=80=E4=B8=AA=E8=AE=A4=E6=B3=95=EF=BC=8C?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=96=87=E6=A1=88=E6=A3=80=E6=9F=A5=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E6=8A=8A=E5=AE=83=E4=BB=AC=E5=BD=93=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E4=B8=8A=E7=9A=84=E5=AD=97=EF=BC=9B=E3=80=8C=E6=B2=A1=E5=88=97?= =?UTF-8?q?=E5=87=BA=E7=9A=84=E7=85=A7=E6=A0=B7=E8=83=BD=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E3=80=8D=E6=94=B9=E6=88=90=E3=80=8C=E6=B2=A1=E5=88=97=E5=87=BA?= =?UTF-8?q?=E7=9A=84=E4=B9=9F=E8=83=BD=E5=BC=95=E7=94=A8=E3=80=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/engine/evidence.py | 23 ++++++++++++++--------- backend/tests/test_analysis_evidence.py | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/backend/app/engine/evidence.py b/backend/app/engine/evidence.py index d3ee3206..3cdbcec6 100644 --- a/backend/app/engine/evidence.py +++ b/backend/app/engine/evidence.py @@ -4584,22 +4584,27 @@ def _trimmed_catalog(catalog: dict[str, Any], head: list[str], first: list[str], omitted=[e["alias"] for e in queries if tier[e["alias"]] == "brief"], empty_sources=empty) -#: 目录有省略时,开头那句里分析结论各种样子的说法(给模型看) -_ANALYSIS_LEVEL_WORDS = (("full", "列出了结果表的前几段"), ("compact", "没列出结果表的各段"), - ("brief", "只列了判定语和具名的数(判定标准、附带说明没列)"), ("head", "只列了编号")) +#: 目录有省略、分析结论只是结果表没列各段时,开头那句里接的说明(给模型看) +ANALYSIS_TABLES_OMITTED_PROMPT = ("另有 {total} 条分析结论,判定和具名的数都列出了,其中 {bare} 条没列出结果表的各段" + "(要列出就单独一行写整表引用,系统照结果表生成)。") +#: 分析结论还降到了只留判定语和具名的数、只列编号时接的说明(给模型看):各样子各有几条(ANALYSIS_LEVEL_PROMPT_WORDS), +#: 以及没列出的怎么引用 +ANALYSIS_TRIMMED_PROMPT = ("另有 {total} 条分析结论,这一段最多占篇幅的一半:{parts}。没列出的也能引用:判定语单独写 " + "[[a:编号]],系统照结论渲染;要列出结果表就单独一行写整表引用,系统照结果表生成;没列出的具名的数" + "不要编造。") +ANALYSIS_LEVEL_PROMPT_WORDS = (("full", "列出了结果表的前几段"), ("compact", "没列出结果表的各段"), + ("brief", "只列了判定语和具名的数(判定标准、附带说明没列)"), ("head", "只列了编号")) def _analysis_notice(levels: Counter, total: int) -> str: """目录有省略时开头那句里分析结论的情况:都列全了的不说;只是结果表没列各段的照旧一句;还降到了只留判定语和具名的数、 - 只列编号的,照实写各有几条,以及没列的照样能引用。""" + 只列编号的,照实写各有几条,以及没列出的怎么引用。""" if not total or levels["full"] == total: return "" if not levels["brief"] and not levels["head"]: - return (f"另有 {total} 条分析结论,判定和具名的数都列出了,其中 {levels['compact']} 条没列出结果表的各段" - "(要列出就单独一行写整表引用,系统照结果表生成)。") - parts = ",".join(f"{levels[level]} 条{word}" for level, word in _ANALYSIS_LEVEL_WORDS if levels[level]) - return (f"另有 {total} 条分析结论,这一段最多占篇幅的一半:{parts}。没列出的照样能引用:判定语单独写 [[a:编号]]," - "系统照结论渲染;要列出结果表就单独一行写整表引用,系统照结果表生成;没列出的具名的数不要编造。") + return ANALYSIS_TABLES_OMITTED_PROMPT.format(total=total, bare=levels["compact"]) + parts = ",".join(f"{levels[level]} 条{word}" for level, word in ANALYSIS_LEVEL_PROMPT_WORDS if levels[level]) + return ANALYSIS_TRIMMED_PROMPT.format(total=total, parts=parts) def catalog_prompt(catalog: dict[str, Any], *, budget: int = DEFAULT_CATALOG_BUDGET, cells_allowed: bool = True, diff --git a/backend/tests/test_analysis_evidence.py b/backend/tests/test_analysis_evidence.py index b24c0bf4..150fdf1a 100644 --- a/backend/tests/test_analysis_evidence.py +++ b/backend/tests/test_analysis_evidence.py @@ -530,7 +530,7 @@ def test_the_analysis_part_of_a_trimmed_catalog_takes_at_most_half_of_the_budget assert order == sorted(order) # 越往后越简 notice = next(line for line in writer.text.split("\n") if line.startswith("注意:")) assert f"另有 {n} 条分析结论,这一段最多占篇幅的一半:" in notice and all(w in notice for w in words), notice - assert "没列出的照样能引用:判定语单独写 [[a:编号]]" in notice + assert "没列出的也能引用:判定语单独写 [[a:编号]]" in notice assert writer.queries == 31 and writer.compact > 0 # 查询照样有展开的