From 9c30bf0307da60c3afc7f9bc30b41852c8081757 Mon Sep 17 00:00:00 2001 From: ThearchyHelios Date: Wed, 14 Oct 2026 09:59:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9B=AE=E5=BD=95=E9=97=AD?= =?UTF-8?q?=E7=8E=AF=E7=AC=AC=E4=B8=80=E6=AD=A5=EF=BC=88=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=20A=EF=BC=89=E5=A4=8D=E6=A0=B8=E4=BF=AE=E6=AD=A3=EF=BC=9A?= =?UTF-8?q?=E8=B5=B7=E8=8D=89=E6=8F=90=E7=A4=BA=E9=87=8C=E3=80=8C=E5=B7=B2?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E7=9A=84=E7=9B=AE=E5=BD=95=E9=A1=B9=E3=80=8D?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E5=B8=A6=E9=81=AE=E7=BD=A9=E5=88=97=E7=9A=84?= =?UTF-8?q?=E7=A0=81=E5=80=BC=EF=BC=8C=E4=BA=BA=E5=B7=A5=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E8=BF=87=E7=9A=84=E4=B9=9F=E4=B8=8D=E7=BB=99=EF=BC=88=E7=A0=81?= =?UTF-8?q?=E5=80=BC=E5=B0=B1=E6=98=AF=E8=BF=99=E4=B8=80=E5=88=97=E7=9A=84?= =?UTF-8?q?=E5=8F=96=E5=80=BC=EF=BC=89=EF=BC=8C=E5=BC=80=E6=B2=A1=E5=BC=80?= =?UTF-8?q?=E5=89=96=E6=9E=90=E9=83=BD=E4=B8=80=E6=A0=B7=EF=BC=9B=E8=BF=99?= =?UTF-8?q?=E4=B8=80=E5=88=97=E5=88=AB=E7=9A=84=E7=A1=AE=E8=AE=A4=E8=BF=87?= =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=85=A7=E7=BB=99=E3=80=82=E5=92=8C=E6=96=B0?= =?UTF-8?q?=E5=8A=A0=E7=9A=84=E7=A0=81=E5=80=BC=E8=83=8C=E6=99=AF=E3=80=81?= =?UTF-8?q?=E8=A1=A8=E5=8A=A9=E6=89=8B=E7=9A=84=E8=83=8C=E6=99=AF=E3=80=81?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=9B=AE=E5=BD=95=E7=9A=84=E5=8F=A3=E5=BE=84?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/data/catalog_draft.py | 28 ++++++++++++----------- backend/tests/test_catalog_draft_facts.py | 22 +++++++++++++++++- 2 files changed, 36 insertions(+), 14 deletions(-) diff --git a/backend/app/data/catalog_draft.py b/backend/app/data/catalog_draft.py index 181cf73c..282a63c2 100644 --- a/backend/app/data/catalog_draft.py +++ b/backend/app/data/catalog_draft.py @@ -80,9 +80,9 @@ **防错事实。** 表级的项里模型可以提议有效行过滤（valid_filter）和去重规则（dedup），各附一句依据（写进这一项的 note）， 校验见 catalog._from_model（有效行过滤按方言解析，不过就丢掉）。开了数据剖析的源（catalog_profile.profile_settings）： -目录里记下的码值交给模型做背景（遮罩的列不给），表级那段写完后经剖析的只读守卫数一数有效行过滤排除了多少行 -（catalog_profile.check_valid_filter），排除 0% 或 100% 的不收，收下的 note 写上排除比例；没开剖析、连不上的照收， -note 写没有核对的原因。 +目录里记下的码值交给模型做背景（遮罩的列不给，「已确认的目录项」里遮罩列的码值同样不给），表级那段写完后经剖析的只读 +守卫数一数有效行过滤排除了多少行（catalog_profile.check_valid_filter），排除 0% 或 100% 的不收，收下的 note 写上排除 +比例；没开剖析、连不上的照收，note 写没有核对的原因。 交给模型的是表结构（列、类型、主键、外键、唯一约束、注释）和使用者补充的背景；开了数据剖析的源另给目录里记下的码值 （剖析取过的取值和含义，遮罩的列不给），别的数据值一概不发。写给模型的文字都在 catalog.py 名字带 _SYSTEM / _PROMPT @@ -1750,16 +1750,18 @@ class _Run: line = labels["column"].format(name=col["name"], type=col.get("type") or "") return line + ("，" + "，".join(marks) if marks else "") - @staticmethod - def _confirmed_for(st: _Table, piece: _Piece) -> dict[str, Any]: - """已确认、有确证的项（以此为准的背景）：整表全给；其余给表级的项和这一段的列，关系只在要写表级的项时给。""" - confirmed = C._confirmed_only(st.existing) - if not st.whole(piece): - wanted = set(piece.columns) - kept = {key: item for key, item in C._slots(confirmed).items() - if key[0] == "t" or (key[0] == "c" and key[1] in wanted) or (key[0] == "r" and piece.table_level)} - confirmed = C._assemble(kept) - return confirmed + def _confirmed_for(self, st: _Table, piece: _Piece) -> dict[str, Any]: + """已确认、有确证的项（以此为准的背景）：整表全给；其余给表级的项和这一段的列，关系只在要写表级的项时给。 + + 遮罩的列上的码值不给，人工确认过的也一样：码值就是这一列的取值（同 _codes_lines，也同表助手的背景、导入目录的 + 规矩）。以前只有新加的码值背景挡住了，这里照给。这一列别的确认过的项（中文名、含义……）照给。""" + whole = st.whole(piece) + wanted = set(piece.columns) + kept = {key: item for key, item in C._slots(C._confirmed_only(st.existing)).items() + if not (key[0] == "c" and key[2] == "codes" and key[1].lower() in self.masked) + and (whole or key[0] == "t" or (key[0] == "c" and key[1] in wanted) + or (key[0] == "r" and piece.table_level))} + return C._assemble(kept) def _codes_lines(self, st: _Table, piece: _Piece, shown: Mapping[str, Any]) -> list[str]: """开了数据剖析的源：目录里记下的码值（剖析取过的取值和已知含义）交给模型，判断有效行过滤、列的含义用。要写表级 diff --git a/backend/tests/test_catalog_draft_facts.py b/backend/tests/test_catalog_draft_facts.py index c7c2cabd..de942c4e 100644 --- a/backend/tests/test_catalog_draft_facts.py +++ b/backend/tests/test_catalog_draft_facts.py @@ -5,7 +5,7 @@ 比较、IN、BETWEEN、LIKE、IS NULL、AND / OR / NOT 和 UPPER / LOWER / TRIM / COALESCE，不超过 500 字。不过就丢掉； - 开了数据剖析、能连上的源：经剖析的只读守卫数出排除比例，排除 0% 或 100% 的不收，收下的在 note 里写剖析核对的结果； 没开剖析、连不上的照收，note 写没有核对的原因； -- 开了剖析的源，目录里记下的码值交给模型做背景（遮罩的列不给）； +- 开了剖析的源，目录里记下的码值交给模型做背景（遮罩的列不给；「已确认的目录项」里遮罩列的码值也不给）； - 这两项照旧记模型起草 / 推断；SQL 检查只在人工确认、有确证时才把漏了有效行过滤报成警告，推断的只是提示。 用合成的景区业务库（tests/fixtures/catalog/scenic.py）和虚构的表结构，不调用真实模型。 @@ -257,6 +257,26 @@ async def test_codes_go_to_the_model_when_profiling_is_on_but_not_masked_ones(): assert head not in plain.calls[0] and "已支付" not in plain.calls[0], "没开剖析不给码值" +@pytest.mark.parametrize("options", [ + {PROFILE_OPTION: {"enabled": True}, MASK_COLUMNS_OPTION: ["ORDER_NO"]}, + {MASK_COLUMNS_OPTION: "order_no"}, +], ids=["profiled", "not-profiled"]) +async def test_confirmed_codes_of_a_masked_column_do_not_reach_the_model_either(options): + """遮罩的列不给码值，人工确认过的也一样：码值就是这一列的取值。以前经「已确认的目录项」照给（开没开剖析都给）； + 没遮罩的列确认过的码值照给（以此为准），遮罩列别的确认过的项（中文名）也照给。""" + existing = {"orders": {"columns": { + "order_no": {"codes": make_item({"ZX-0417": "内部测试单"}, "human", "confirmed"), + "label": make_item("订单号", "human", "confirmed")}, + "status": {"codes": make_item({"C": "作废"}, "human", "confirmed")}, + }}} + model = FakeModel({"orders": REPLY}) + await D.run_model_draft(model, _plain({"orders": _orders()}, options=options), ["orders"], existing=existing) + text = model.calls[0] + assert "ZX-0417" not in text and "内部测试单" not in text + confirmed = text[text.index(catalog.CATALOG_DRAFT_PROMPT_LABELS["confirmed"]):] + assert "status：码值：C=作废" in confirmed and "order_no：订单号" in confirmed + + async def test_codes_reach_the_table_part_of_a_wide_table_and_only_their_column_part(): cols = [_col(f"c{i:03d}") for i in range(1, 46)] + [_col("state", "TEXT")] wide = {"qualified": "wide", "schema": None, "is_view": False, "primary_key": ["c001"], "foreign_keys": [],