fix(rectification): split D4/D5 stages and recast after adopt
Independent Staging Quality Gate / validate (push) Successful in 9m19s
Independent Staging Quality Gate / publish (push) Failing after 7m45s

Keep family on D12+D7 instead of mixing it into D4, score D5 on education, and show a natal recast plus technique audit after adopt without unique-minute claims.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Jesse_Chen
2026-08-20 09:11:54 +08:00
parent b1b4f5fac9
commit a93a3cc1a9
40 changed files with 1195 additions and 66 deletions
+63 -2
View File
@@ -12,7 +12,7 @@ from scripts.rectification.refinement_packet import (
)
def feature(time: str, *, d1: int | None = None, d9: int | None = None, d10: int | None = None, d4: int | None = None, degree: float | None = None) -> dict:
def feature(time: str, *, d1: int | None = None, d9: int | None = None, d10: int | None = None, d4: int | None = None, d5: int | None = None, d7: int | None = None, d12: int | None = None, degree: float | None = None) -> dict:
vargas = {}
if d9 is not None:
vargas["D9"] = d9
@@ -20,6 +20,12 @@ def feature(time: str, *, d1: int | None = None, d9: int | None = None, d10: int
vargas["D10"] = d10
if d4 is not None:
vargas["D4"] = d4
if d5 is not None:
vargas["D5"] = d5
if d7 is not None:
vargas["D7"] = d7
if d12 is not None:
vargas["D12"] = d12
row: dict = {"time": time, "varga_ascendants": vargas}
if d1 is not None:
row["ascendant_sign_index"] = d1
@@ -87,7 +93,11 @@ class RefinementPacketTest(unittest.TestCase):
self.assertEqual(precision_stage({"d1_candidates_differ": True}, 2)["current"], "lagna_frame")
self.assertEqual(precision_stage({"d9_candidates_differ": True}, 2)["current"], "d9_refine")
self.assertEqual(precision_stage({"d10_candidates_differ": True}, 2)["current"], "d10_refine")
self.assertEqual(precision_stage({"d4_candidates_differ": True}, 2)["current"], "theme_refine")
self.assertEqual(precision_stage({"d4_candidates_differ": True}, 2)["current"], "d4_refine")
self.assertEqual(precision_stage({"d5_candidates_differ": True}, 2)["current"], "d5_refine")
self.assertNotEqual(precision_stage({"d4_candidates_differ": True}, 2)["current"], "theme_refine")
self.assertIn("搬家", precision_stage({"d4_candidates_differ": True}, 2)["user_meaning"])
self.assertNotIn("家人", precision_stage({"d4_candidates_differ": True}, 2)["user_meaning"])
ready = precision_stage({}, 3)
self.assertEqual(ready["current"], "ready_to_adopt")
self.assertFalse(ready["unique_minute_claim"])
@@ -170,6 +180,57 @@ class RefinementPacketTest(unittest.TestCase):
self.assertIn("vimshottari_narayana_conflict", receipt["reasons"])
self.assertEqual(receipt["dasha_agreement"]["status"], "conflict")
self.assertEqual(receipt["event_dasha_ledger"][0]["match_label"], "强相关")
self.assertTrue(any(row["technique"] == "唯一分钟确认" and row["status"] == "blocked" for row in receipt["technique_audit_table"]))
self.assertTrue(any(row["technique"] == "VedAstro 分钟级校验" and row["status"] == "blocked" for row in receipt["technique_audit_table"]))
self.assertFalse(receipt["unique_minute_claim"])
def test_receipt_recasts_house_tables_per_candidate_and_blocks_unique_minute(self):
request = request_events()
rows = [
{"time": "05:13", "score": 20, "evidence": [], "missing_layers": []},
{"time": "05:14", "score": 8, "evidence": [], "missing_layers": []},
]
decisions = build_candidate_decisions(rows, result_id="00000000-0000-4000-8000-000000000099")
chart_a = {"ascendant": {"sign": "Taurus", "lon": 40.0}, "planets": {"Sun": {"sign": "Aries", "house": 12}}}
chart_b = {"ascendant": {"sign": "Gemini", "lon": 70.0}, "planets": {"Sun": {"sign": "Aries", "house": 11}}}
built = {
"missing_layers": [],
"static_contexts": [
{**feature("05:13", d1=1, d9=1, d10=4), "chart": chart_a},
{**feature("05:14", d1=2, d9=1, d10=4), "chart": chart_b},
],
"matrix": {
request["events"][0]["id"]: {
"05:13": {"points": 8, "rule_ids": ["vim_md_domain_house"], "technique_layers": ["d1-rashi", "d10-dashamsa"]},
"05:14": {"points": 1, "rule_ids": ["vim_ad_domain_house"], "technique_layers": ["d1-rashi", "d10-dashamsa"]},
},
request["events"][1]["id"]: {
"05:13": {"points": 1, "rule_ids": ["narayana_ad_domain_house"], "technique_layers": ["d1-rashi", "d9-navamsa"]},
"05:14": {"points": 9, "rule_ids": ["narayana_md_domain_house"], "technique_layers": ["d1-rashi", "d9-navamsa"]},
},
request["events"][2]["id"]: {
"05:13": {"points": 1, "rule_ids": ["vim_md_domain_varga"], "technique_layers": ["d1-rashi", "d5-panchamsha"]},
"05:14": {"points": 1, "rule_ids": ["vim_md_domain_varga"], "technique_layers": ["d1-rashi", "d5-panchamsha"]},
},
},
}
receipt = build_decision_receipt(request, decisions, built, {
"leave_one_event_out_retention_rate": 1,
"leave_one_domain_out_retention_rate": 1,
"date_sensitivity_retention_rate": 1,
"primary_secondary_margin_percent": 50,
})
self.assertEqual(receipt["house_table"]["time"], "05:13")
self.assertEqual(receipt["house_table"]["lagna"], "金牛座")
self.assertEqual(receipt["house_tables_by_time"]["05:14"]["lagna"], "双子座")
self.assertEqual(receipt["natal_recast"]["time"], "05:13")
self.assertFalse(receipt["natal_recast"]["unique_minute_claim"])
self.assertFalse(receipt["confirmation_allowed"])
techniques = {row["technique"]: row["status"] for row in receipt["technique_audit_table"]}
self.assertEqual(techniques["D1 本命盘"], "executed")
self.assertEqual(techniques["D5 成就分盘"], "executed")
self.assertEqual(techniques["KP 宫头"], "blocked")
self.assertEqual(techniques["唯一分钟确认"], "blocked")
if __name__ == "__main__":