fix: a met Neecha Bhanga and a birth-time boundary are worded the astrologer's way for users (BUG-2030)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01DbBXp2Vp62Ur3C7yRWQdSq
This commit is contained in:
@@ -27262,3 +27262,14 @@
|
||||
- 验证与防复发:新增 `frontend/tests/synastry-followup-2026.test.ts`;两处钉住旧标签的断言按原值、新值、原因更新。公开名人盘同一个两段式问题真实生成一次:一轮完成,只读了事件所在的那一节,两人的星宿都写出,扫描时间段只作为计算结果提到,回答用名字,没有内部用词。
|
||||
- 关联记录:BUG-2023、BUG-2022、BUG-2001、BUG-1986、BUG-1990。之前的测试没有覆盖结算分支,也没有用内部用词表去检查材料本身。
|
||||
- 修复版本:`claude/synastry-followup-2025`。
|
||||
|
||||
## BUG-2030 | 问答按占星师分层规则说落陷取消和出生时间分界(规则口吻不进回答)
|
||||
|
||||
- 状态:fixed-pending-verify(待 staging 实测)。
|
||||
- 首次发现 / 最近更新:2026-11-19 / 2026-11-19。
|
||||
- 触发与现象:占星师 11-19 第二次答复的分层规则:普通用户只看结论和会实质改变结论的条件,用日常语言。落陷取消对用户说「这一配置的不利影响有缓解因素,但不能据此认为困难全部消失」;出生时间影响说「出生时间前后几分钟,会影响这部分判断」。第六轮复测的回答写「落陷,落陷取消条件满足」;Obama 公开盘年运 3 份里还有「落陷但落陷取消」。
|
||||
- 根因:卡上本命星状态(BUG-2020 改成的「落陷,落陷取消条件已满足(……)」)、证据包取消句里的「提到…时写成落陷、取消条件已满足」和直接证据括注,都是规则口吻,模型照抄。
|
||||
- 修复:卡上标签和报告事实的同名标签(`NEECHA_BHANGA_CARD_LABEL`、`scripts/report_render/reading_facts.py` NEECHA_BHANGA_READER_ZH,两处保持同一句)改为她的原话「落陷;这一配置的不利影响有缓解因素,但不能据此认为困难全部消失」;证据包取消句的写法要求和括注改成同样的意思;成立条件仍在格局行和取消说明里(后台)。「判断依据」补充表加:落陷取消条件已满足 / 满足 / 成立、落陷取消成立 → 「落陷,不利影响有缓解因素」,落陷已取消 → 「落陷的不利影响有缓解因素」,单独的落陷取消 → 「不利影响有缓解因素」,分界敏感 → 「出生时间前后几分钟会影响这一条」。格局状态词「检测器检出,待核实」是格局状态表的现行说法,没动(见第 4 项方案)。
|
||||
- 验证与防复发:`consult-fact-guard-dignity-2020`、`evidence-pack-cancel-1987`、`tests/test_report_wording_2024.py` 按新值更新并注明原因;`consult-internal-words-1948` 加对应断言;问答、证据包、卡片、报告前端测试 1147 条通过。另:`tests/test_report_status_words_20261111.py::test_status_words_and_projection_keys_match_frontend_source`、`tests/test_report_reading_facts.py::test_reading_facts_are_packet_leaves` 在 d3bbd5cb 上本来就失败(未改动时同样失败),不是本项引入,已告知证据包窗口。
|
||||
- 关联记录:BUG-2012、BUG-2020、BUG-2024、BUG-2025;占星师 11-19 第二次答复。
|
||||
- 修复版本:`claude/qa-layering-2030`,待 staging。
|
||||
|
||||
@@ -1494,7 +1494,9 @@ function claimEvidence(packet: unknown, category: string): Record<string, unknow
|
||||
}
|
||||
|
||||
export const NEECHA_BHANGA_ENGINE_LABEL = "落陷取消(Neecha Bhanga)";
|
||||
export const NEECHA_BHANGA_CARD_LABEL = "落陷,落陷取消条件已满足(不等于入旺,也不代表相关困难全部消失)";
|
||||
// BUG-2030 原值「落陷,落陷取消条件已满足(不等于入旺,也不代表相关困难全部消失)」/ 新值:她 11-19 第二次答复给用户的说法 /
|
||||
// 原因:分层规则,规则口吻(取消条件已满足)留在后台;回答照抄了这个标签。成立条件仍在格局行里。
|
||||
export const NEECHA_BHANGA_CARD_LABEL = "落陷;这一配置的不利影响有缓解因素,但不能据此认为困难全部消失";
|
||||
|
||||
const PLANET_ROW_KEYS = ["sign", "house", "degree_in_sign", "nakshatra", "retrograde", "status"] as const;
|
||||
const FUNCTIONAL_KEYS = [
|
||||
|
||||
@@ -180,6 +180,14 @@ const PHRASE_RE = new RegExp(Object.keys(INTERNAL_CHINESE_PHRASES).join("|"), "g
|
||||
* written into Chinese text (「与 Mercury、Rahu 同宫」「Libra(Venus)」) get their Chinese names.
|
||||
*/
|
||||
export const BASIS_ONLY_WORDS: Readonly<Record<string, string>> = {
|
||||
// BUG-2030(占星师 11-19 第二次答复,分层规则):落陷取消和出生时间分界的规则口吻换成她给用户的说法。
|
||||
"落陷取消条件已满足": "落陷,不利影响有缓解因素",
|
||||
"落陷取消条件满足": "落陷,不利影响有缓解因素",
|
||||
"落陷取消条件成立": "落陷,不利影响有缓解因素",
|
||||
"落陷取消成立": "落陷,不利影响有缓解因素",
|
||||
"落陷已取消": "落陷的不利影响有缓解因素",
|
||||
"落陷取消": "不利影响有缓解因素",
|
||||
"分界敏感": "出生时间前后几分钟会影响这一条",
|
||||
"在卡上": "",
|
||||
"卡上": "",
|
||||
"结构观察行": "结构上的观察",
|
||||
@@ -189,7 +197,7 @@ export const BASIS_ONLY_WORDS: Readonly<Record<string, string>> = {
|
||||
Aries: "白羊", Taurus: "金牛", Gemini: "双子", Cancer: "巨蟹", Leo: "狮子", Virgo: "处女",
|
||||
Libra: "天秤", Scorpio: "天蝎", Sagittarius: "射手", Capricorn: "摩羯", Aquarius: "水瓶", Pisces: "双鱼",
|
||||
};
|
||||
const BASIS_CHINESE_RE = /在卡上|卡上|结构观察行|随参数翻转|参数翻转/gu;
|
||||
const BASIS_CHINESE_RE = /落陷取消条件已满足|落陷取消条件满足|落陷取消条件成立|落陷取消成立|落陷已取消|落陷取消|分界敏感|在卡上|卡上|结构观察行|随参数翻转|参数翻转/gu;
|
||||
const BASIS_NAME_RE = new RegExp(
|
||||
`(?<![A-Za-z][ \\t]?|[A-Za-z])(${Object.keys(BASIS_ONLY_WORDS).filter((word) => /^[A-Z]/.test(word)).join("|")})(?![a-z])(?![ \\t]?[A-Za-z])`,
|
||||
"gu",
|
||||
|
||||
@@ -240,7 +240,8 @@ export function cancellationSentence(edge: EvidenceEdge): string {
|
||||
// 因落陷而来的不利判断,燃烧、其他受冲、功能凶性和该领域别的困难照旧。
|
||||
return `${name}本命${sign ? `在${sign}` : ""}落陷,按《Light on Life》规则,已满足落陷取消条件${conditions ? `:${conditions}` : ""}。`
|
||||
+ `这不等于${name}入旺,也不代表相关困难全部消失。`
|
||||
+ `提到${name}时写成落陷、取消条件已满足;取消只针对因落陷而来的那一项不利判断,${name}的落陷位置不变,`
|
||||
// BUG-2030 原值「提到…时写成落陷、取消条件已满足」/ 新值:她 11-19 第二次答复给用户的说法 / 原因:规则口吻进了回答
|
||||
+ `提到${name}时说成这一配置的不利影响有缓解因素,但不能据此认为困难全部消失;缓解只针对因落陷而来的那一项不利判断,${name}的落陷位置不变,`
|
||||
+ `它受到的其他压力照样算,不因此算作另一个格局,也不说它变得有力。`;
|
||||
}
|
||||
return `规则自带的取消条件已满足,它指向的那一项效应按规则取消${witnessed}。取消不删掉原来的位置,也不因此推出相反的结论。`;
|
||||
@@ -468,7 +469,8 @@ export function buildEvidencePack(
|
||||
const cancelled = new Set(cancelEdges.map((edge) => edge.to));
|
||||
for (const entry of direct) {
|
||||
// BUG-2012:原值「(落陷已被取消,见取消说明)」;新值照她第 3 条:确认的是条件成立,不是落陷消失。
|
||||
if (cancelled.has(entry.evidence_id)) entry.what = `${String(entry.what)}(落陷取消条件已满足,见取消说明)`;
|
||||
// BUG-2030 原值「(落陷取消条件已满足,见取消说明)」/ 新值见下 / 原因:同上
|
||||
if (cancelled.has(entry.evidence_id)) entry.what = `${String(entry.what)}(落陷的不利有缓解因素,见取消说明)`;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -31,5 +31,6 @@ test("ambiguous clauses pass: two signs, two planets, nodes, or the word away fr
|
||||
|
||||
test("the card states a cancelled debilitation in her words, not as 「落陷取消」", () => {
|
||||
assert.equal(NEECHA_BHANGA_ENGINE_LABEL, "落陷取消(Neecha Bhanga)");
|
||||
assert.match(NEECHA_BHANGA_CARD_LABEL, /^落陷,落陷取消条件已满足(不等于入旺/);
|
||||
// BUG-2030 原值 /^落陷,落陷取消条件已满足(不等于入旺/ / 新值:她给用户的说法 / 原因:11-19 第二次答复的分层规则
|
||||
assert.equal(NEECHA_BHANGA_CARD_LABEL, "落陷;这一配置的不利影响有缓解因素,但不能据此认为困难全部消失");
|
||||
});
|
||||
|
||||
@@ -101,6 +101,11 @@ test("the table uses existing wording, drops what carries nothing, and leaves re
|
||||
assert.equal(scrubInternalWords("宫主金星落本命第 2 宫,与 Mercury、Rahu 同宫"), "宫主金星落本命第 2 宫,与水星、罗睺同宫");
|
||||
assert.equal(scrubInternalWords("Moon 6.08(最低线 6.0)标为随参数翻转"), "月亮 6.08(最低线 6.0)标为随算法设置会变");
|
||||
assert.equal(scrubInternalWords("原书:「Jupiter in the 2nd」;KP Sub Lord Saturn"), "原书:「Jupiter in the 2nd」;KP Sub Lord Saturn");
|
||||
// BUG-2030(占星师 11-19 第二次答复,分层规则):落陷取消和分界的规则口吻换成她给用户的说法。
|
||||
assert.equal(scrubInternalWords("- **关系**:第 7 宫有木星,落陷取消条件已满足"), "- **关系**:第 7 宫有木星,落陷,不利影响有缓解因素");
|
||||
assert.equal(scrubInternalWords("木星落陷已取消,但仍在摩羯"), "木星落陷的不利影响有缓解因素,但仍在摩羯");
|
||||
assert.equal(scrubInternalWords("(相关分盘在卡上;分界敏感)"), "(相关分盘;出生时间前后几分钟会影响这一条)");
|
||||
assert.equal(scrubInternalWords("与木星(摩羯 8.99°,落陷但落陷取消)同宫"), "与木星(摩羯 8.99°,落陷但不利影响有缓解因素)同宫");
|
||||
// 卡片和证据包的分析句不查这些(只查判断依据)。
|
||||
assert.deepEqual(findInternalWords("依赖项不在这张卡上;与 Mercury 同宫"), []);
|
||||
assert.equal(scrubInternalWords("Vimshottari 提供主要时间框架,Narayana 的当前分支按来源版各步配置计算,保留为条件性窗口,暂不作为双体系确认"), "Vimshottari 提供主要时间框架,Narayana 的当前分支,保留为条件性窗口");
|
||||
|
||||
@@ -68,7 +68,8 @@ test("one sentence per Neecha Bhanga cancellation on the public charts and the s
|
||||
assert.match(text, new RegExp(`这不等于${name}入旺,也不代表相关困难全部消失`), chart);
|
||||
assert.doesNotMatch(text, /已被取消|已被化解/, chart);
|
||||
for (const condition of edge.conditions ?? []) assert.ok(text.includes(condition), `${chart}: ${condition}`);
|
||||
assert.match(text, new RegExp(`提到${name}时写成落陷、取消条件已满足;取消只针对因落陷而来的那一项不利判断`), chart);
|
||||
// BUG-2030 原值「提到…时写成落陷、取消条件已满足;取消只针对…」/ 新值:她给用户的说法 / 原因:分层规则
|
||||
assert.match(text, new RegExp(`提到${name}时说成这一配置的不利影响有缓解因素,但不能据此认为困难全部消失;缓解只针对因落陷而来的那一项不利判断`), chart);
|
||||
// the placement stays; no claim that it becomes strong or forms another combination
|
||||
assert.match(text, new RegExp(`${name}的落陷位置不变,它受到的其他压力照样算`), chart);
|
||||
}
|
||||
@@ -119,7 +120,8 @@ test("in the pack the sentence sits before the direct evidence and the cancelled
|
||||
checkProse(pack.cancellation_reading as string);
|
||||
const jupiter = (pack.direct as Json[]).find((row) => row.evidence_id === "ev:D1:Jupiter")!;
|
||||
// 原值:/落陷已被取消,见取消说明/;新值:确认的是条件成立(BUG-2012)
|
||||
assert.match(String(jupiter.what), /落陷取消条件已满足,见取消说明/);
|
||||
// BUG-2030 原值 /落陷取消条件已满足,见取消说明/ / 新值见下 / 原因:分层规则,规则口吻不进回答
|
||||
assert.match(String(jupiter.what), /落陷的不利有缓解因素,见取消说明/);
|
||||
// the structured cancels row is still in limits, unchanged in kind
|
||||
assert.ok((pack.limits as Json[]).some((row) => row.relation === "cancels" && row.target === "ev:D1:Jupiter"));
|
||||
// no cancellation: no sentence, no pointer
|
||||
|
||||
@@ -955,7 +955,9 @@ def _birth_precision(full_reading: dict, view: dict, domains: dict, minute_confi
|
||||
# BUG-2020); tests/test_report_wording_2024.py pins them to that file. The bare 「落陷取消」 read as
|
||||
# "the debilitation is gone".
|
||||
NEECHA_BHANGA_ENGINE_LABEL = "落陷取消(Neecha Bhanga)"
|
||||
NEECHA_BHANGA_READER_ZH = "落陷,落陷取消条件已满足(不等于入旺,也不代表相关困难全部消失)"
|
||||
# BUG-2030 原值「落陷,落陷取消条件已满足(不等于入旺,也不代表相关困难全部消失)」/ 新值:她 11-19 第二次答复给用户的说法 /
|
||||
# 原因:分层规则,规则口吻留在后台;与问答卡 NEECHA_BHANGA_CARD_LABEL 保持同一句(report-wording-2024.test.ts)。
|
||||
NEECHA_BHANGA_READER_ZH = "落陷;这一配置的不利影响有缓解因素,但不能据此认为困难全部消失"
|
||||
|
||||
|
||||
def _neecha_bhanga_reader_label(value: Any, key: str | None = None) -> Any:
|
||||
|
||||
@@ -41,7 +41,9 @@ def test_cancelled_debilitation_reads_in_the_astrologers_wording_everywhere_in_t
|
||||
assert out["yogas"]["rows"][0]["planets"]["Jupiter"]["dignity"] == NEECHA_BHANGA_READER_ZH
|
||||
# The yoga's own name is not the planet label and stays.
|
||||
assert out["yogas"]["rows"][0]["name_cn"] == "落陷取消"
|
||||
assert "不等于入旺" in NEECHA_BHANGA_READER_ZH and NEECHA_BHANGA_READER_ZH.startswith("落陷,")
|
||||
# BUG-2030 原值:含「不等于入旺」、以「落陷,」开头 / 新值:她给用户的说法 / 原因:11-19 第二次答复的分层规则
|
||||
assert NEECHA_BHANGA_READER_ZH == "落陷;这一配置的不利影响有缓解因素,但不能据此认为困难全部消失"
|
||||
assert "入旺" not in NEECHA_BHANGA_READER_ZH and "取消条件" not in NEECHA_BHANGA_READER_ZH
|
||||
# The input is not changed in place.
|
||||
assert facts["planets"]["Jupiter"]["d1_dignity_zh"] == "落陷取消"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user