From 83c5c04d76f8ba4f2c6cd12786ce63926b206e44 Mon Sep 17 00:00:00 2001 From: ThearchyHelios Date: Wed, 21 Oct 2026 15:41:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=94=AE=E6=95=B0=E7=9A=84=E4=BB=A3?= =?UTF-8?q?=E5=85=A5=E5=BC=8F=E6=89=BE=E5=88=A4=E5=AE=9A=E7=82=B9=E5=90=8D?= =?UTF-8?q?=E7=9A=84=E9=82=A3=E4=B8=80=E6=AE=B5=EF=BC=8C=E7=BB=B4=E5=BA=A6?= =?UTF-8?q?=E5=80=BC=E6=8C=89=E7=AE=97=E5=AD=90=E5=86=99=E6=AE=B5=E7=9A=84?= =?UTF-8?q?=E5=90=8C=E4=B8=80=E4=B8=AA=E5=87=BD=E6=95=B0=E6=AF=94=EF=BC=88?= =?UTF-8?q?=5Fdecompose=5Frow=20=E7=94=A8=20app.analysis.phrases.key=5Ftex?= =?UTF-8?q?t=EF=BC=9A=E7=A9=BA=E5=80=BC=E5=86=99=E3=80=8C=EF=BC=88?= =?UTF-8?q?=E7=A9=BA=EF=BC=89=E3=80=8D=E3=80=81=E5=B8=83=E5=B0=94=E5=86=99?= =?UTF-8?q?=E3=80=8C=E6=98=AF=20/=20=E5=90=A6=E3=80=8D=EF=BC=8C=E4=B8=A4?= =?UTF-8?q?=E5=88=97=E7=94=A8=E3=80=8C=C2=B7=E3=80=8D=E8=BF=9E=EF=BC=89?= =?UTF-8?q?=EF=BC=8C=E6=AE=B5=E7=9A=84=E5=8F=AB=E6=B3=95=E4=B9=9F=E7=85=A7?= =?UTF-8?q?=E5=AE=83=E5=86=99=E3=80=82=E4=BB=A5=E5=89=8D=E6=8B=BF=E5=8E=9F?= =?UTF-8?q?=E5=80=BC=E7=9A=84=20str=20=E5=8E=BB=E6=AF=94=20subjects?= =?UTF-8?q?=EF=BC=8C=E7=A9=BA=E5=80=BC=E3=80=81=E5=B8=83=E5=B0=94=E7=BB=B4?= =?UTF-8?q?=E5=BA=A6=E7=9A=84=E6=AE=B5=E5=AF=B9=E4=B8=8D=E4=B8=8A=EF=BC=8C?= =?UTF-8?q?=E4=BB=A3=E5=85=A5=E5=BC=8F=E9=80=80=E5=9B=9E=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E8=A1=A8=E7=AC=AC=E4=B8=80=E8=A1=8C=EF=BC=8C=E5=86=99=E6=88=90?= =?UTF-8?q?=E4=BA=86=E5=8F=8D=E6=96=B9=E5=90=91=E5=8F=98=E5=8C=96=E6=9C=80?= =?UTF-8?q?=E5=A4=A7=E7=9A=84=E9=82=A3=E4=B8=80=E6=AE=B5=E3=80=82=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=EF=BC=9A=E7=82=B9=E5=90=8D=E7=9A=84=E6=AE=B5=E6=98=AF?= =?UTF-8?q?=E7=A9=BA=E5=80=BC=E3=80=81=E5=B8=83=E5=B0=94=E3=80=81=E5=8F=88?= =?UTF-8?q?=E4=B8=8D=E5=9C=A8=E7=AC=AC=E4=B8=80=E8=A1=8C=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E4=BB=A3=E5=85=A5=E5=BC=8F=E5=86=99=E7=9A=84=E6=98=AF=E7=82=B9?= =?UTF-8?q?=E5=90=8D=E7=9A=84=E9=82=A3=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/engine/evidence.py | 10 +++++++--- backend/tests/test_analysis_evidence.py | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/backend/app/engine/evidence.py b/backend/app/engine/evidence.py index 41496690..7c74a1b7 100644 --- a/backend/app/engine/evidence.py +++ b/backend/app/engine/evidence.py @@ -4751,7 +4751,11 @@ _DECOMPOSE_NUMBERS = ("base", "target", "delta", "pct", "share", "contrib", "fla def _decompose_row(result: dict[str, Any]) -> tuple[str, list[Any]] | None: """变化拆解的结果表里判定点名的那一段:(这一段的叫法, 那一行)。段按维度列(params.by;乘积模式是 factor 一列)对 - verdict.subjects 的第一项,对不上就取第一行(结果表按变化的绝对值从大到小排)。叫法是维度值用「·」连起来。""" + verdict.subjects 的第一项,对不上就取第一行(结果表按变化的绝对值从大到小排)。维度值和叫法都按算子写段的同一个函数 + (app.analysis.phrases.key_text:空值写「(空)」、布尔写「是 / 否」,两列用「·」连):subjects 就是这么写的,拿原值的 + str 去比,空值、布尔维度的段对不上,代入式会退回第一行。""" + from app.analysis.phrases import key_text + table = result.get("table") if isinstance(result.get("table"), dict) else {} rows = [r for r in table.get("rows") or [] if isinstance(r, list)] columns = [str(c) for c in table.get("columns") or []] @@ -4768,8 +4772,8 @@ def _decompose_row(result: dict[str, Any]) -> tuple[str, list[Any]] | None: picked = rows[0] if subjects and at and isinstance(subjects[0], list): wanted = [str(v) for v in subjects[0]] - picked = next((row for row in rows if [str(row[i]) for i in at if i < len(row)] == wanted), rows[0]) - name = "·".join(str(picked[i]) for i in at if i < len(picked) and picked[i] is not None) + picked = next((row for row in rows if [key_text([row[i]]) for i in at if i < len(row)] == wanted), rows[0]) + name = key_text([picked[i] for i in at if i < len(picked)]) if at else "" return name or "这一段", picked diff --git a/backend/tests/test_analysis_evidence.py b/backend/tests/test_analysis_evidence.py index 84c922de..4bc1449f 100644 --- a/backend/tests/test_analysis_evidence.py +++ b/backend/tests/test_analysis_evidence.py @@ -601,6 +601,25 @@ def test_formulas_substitute_the_key_numbers(): assert analysis_formulas(fake_result(values={})) == [] +@pytest.mark.parametrize("keys, named", [((None, "华南", "华北"), "(空)"), ((True, False, None), "是")]) +def test_the_formula_names_the_segment_the_verdict_names(keys, named): + """代入式里点名的那一段按判定的 subjects 找,维度值按算子写段的同一个函数比(空值写「(空)」、布尔写「是 / 否」)。 + 这里判定点名的段不在结果表第一行(第一行是反方向变化最大的那段):以前拿原值的 str 比,对不上就退回第一行,代入式写成了 + 第一行那段。""" + store = Store() + driver, opposite, other = keys # 变化:driver -220、opposite +250、other -180,总共 -150 + snap = {"columns": ["region", "week", "gmv"], "column_types": {"region": "text", "week": "text", "gmv": "number"}, + "rows": [[driver, "W41", 1000], [driver, "W42", 780], [opposite, "W41", 500], [opposite, "W42", 750], + [other, "W41", 600], [other, "W42", 420]], + "sql": "SELECT region, week, SUM(gmv) AS gmv FROM orders GROUP BY region, week", "source": "shop", + "truncated": False} + result = real_result(store.put(snap), snap) + assert result["verdict"]["code"] == "driver" and result["verdict"]["subjects"] == [[named]] + assert [r[0] for r in result["table"]["rows"]] == [opposite, driver, other] # 按变化的绝对值排 + texts = {f["label"]: f["text"] for f in analysis_formulas(result)} + assert texts["占比"] == f"{named}的占比 = {named}的变化 ÷ 总变化 = -220 ÷ (-150) = 146.7%" + + def test_formulas_for_factor_ratio_and_baseline(): store = Store() factor_snap = {"columns": ["week", "gmv", "orders", "aov"],