From 300a8842d318691e6ec924f8fc9b91f374671a0c Mon Sep 17 00:00:00 2001 From: jesse-ux Date: Sun, 18 Oct 2026 21:33:30 +0800 Subject: [PATCH] fix(synastry): keep the scripts root file count inside the budget Move the three local glue modules into scripts/marriage_match_service and point the invocation matrix at marriage_match.py. The upstream engine file stays where it is. Checked the file-count and oracle contracts, the marriage-match tests, and a Windows full pytest. The 176 failures are python3-missing and path-separator noise; the named contracts passed. Co-Authored-By: Grok (agent loop) Co-authored-by: Cursor --- docs/BUG_HISTORY.md | 1 + .../PROGRESS-marriage-match-p1-20261017.md | 9 +++++++++ docs/tasks/README.md | 1 + ...y_skill_readiness_dashboard_2026_07_20.json | 2 +- ...ctive_skill_capability_view_2026_07_19.json | 2 +- ...technique_invocation_matrix_2026_07_22.json | 18 +++++++++--------- scripts/jyotish_api_server.py | 7 ++++--- scripts/jyotish_engine.py | 2 +- scripts/marriage_match_service/__init__.py | 1 + .../api.py} | 2 +- .../cli.py} | 0 .../full_dossier.py} | 2 +- tests/test_marriage_match_api.py | 10 +++++----- tests/test_marriage_match_product.py | 8 ++++---- tests/test_synastry_full_dossier.py | 2 +- 15 files changed, 40 insertions(+), 27 deletions(-) create mode 100644 scripts/marriage_match_service/__init__.py rename scripts/{marriage_match_api.py => marriage_match_service/api.py} (97%) rename scripts/{marriage_match_cli.py => marriage_match_service/cli.py} (100%) rename scripts/{synastry_full_dossier.py => marriage_match_service/full_dossier.py} (98%) diff --git a/docs/BUG_HISTORY.md b/docs/BUG_HISTORY.md index 3fddcf1e..f621cec7 100644 --- a/docs/BUG_HISTORY.md +++ b/docs/BUG_HISTORY.md @@ -36566,6 +36566,7 @@ - 修复：删掉这三处虚报。命令表改为 `marriage-match`：七项满分 35，火星冲克和婚姻宫压力分开列，没有 Papasamya 加权总分。 - 验证：速查表、能力矩阵和技能命令表已改；旧模块已删除。 - 防复发：能力矩阵写明旧模块已删除。 +- 复查（2026-10-18 第 2 次打回）：调用清单仍指向已删除的旧文件。清单改为 `scripts/marriage_match.py`，内容哈希按合同重算。三个胶水文件放进 `scripts/marriage_match_service/`，根目录文件数回到 446。 - 相关记录：BUG-1372。 - 复发自：无。 - 修复版本：分支 `codex/marriage-match-p1-20261017`。 diff --git a/docs/tasks/PROGRESS-marriage-match-p1-20261017.md b/docs/tasks/PROGRESS-marriage-match-p1-20261017.md index aeaa430d..4b97b5fc 100644 --- a/docs/tasks/PROGRESS-marriage-match-p1-20261017.md +++ b/docs/tasks/PROGRESS-marriage-match-p1-20261017.md @@ -57,6 +57,15 @@ | 数据库 | `npm run test:db` | 86 项：73 通过，13 失败，0 取消。13 条与 Windows 已知失败清单逐条相同。`database-marriage-match.test.ts` 通过。 | | 全量 pytest / 快速门 | 未跑 | 留给验收方。 | +## 第 2 次打回（G1 / G2） + +`scripts/marriage_match.py` 仍在根目录，与上游同路径。三个胶水文件挪到 `scripts/marriage_match_service/`：`api.py`、`cli.py`、`full_dossier.py`。根目录 Python 文件数回到 446，没有放宽上限。调用清单里的 `scripts/synastry.py` 改成 `scripts/marriage_match.py`，并按合同重算了内容哈希。兼容准备度清单按生成脚本重写了一次。 + +| 检查 | 命令 | 结果 | +| --- | --- | --- | +| 文件数与调用清单 | `pytest tests/test_python_hygiene_budget.py tests/test_owner_case_purge_contract.py tests/test_api_server_growth_contract.py tests/test_marriage_match_api.py tests/test_marriage_match_product.py tests/test_synastry_full_dossier.py -q` | 通过。根目录 446。公开名人证据包仍可写解读。 | +| 全量 pytest | `python -m pytest tests -q --tb=line` | Windows 上 176 失败。抽查是 `python3` 不存在（退出码 9009）和路径分隔符。本单点名的文件数、调用清单、合盘测试不在失败名单里。Linux 全量仍由验收方对照基线。 | + ## 偏离 - 不做页面、不扣点，与第六版一致。 diff --git a/docs/tasks/README.md b/docs/tasks/README.md index b86b1360..4e98c3b1 100644 --- a/docs/tasks/README.md +++ b/docs/tasks/README.md @@ -503,6 +503,7 @@ | `TASK-people-archive-limit-20-20261017.md` | `PROGRESS-people-archive-limit-20-20261017.md` | 星盘档案上限 5→20 人（触发器新迁移 + 常量 + 文案；婚恋合盘前置单） | 待验收 | `codex/people-archive-limit-20-20261017` | | `TASK-marriage-match-p1-20261017.md` | #79 | 婚恋合盘引擎（搬上游 bde5d615：marriage_match + 合盘证据包；35 分七项、不分男女；第六版不扣点、不做页面）（BUG-1370 起） | 待验收 | `codex/marriage-match-p1-20261017`；动表 | | `TASK-marriage-match-p1-fix-20261018.md` | #79 | 只存两个 profile 的配对结果；旧历史列表不读新行；并发重复写入改为重读 | 待验收 | `codex/marriage-match-p1-20261017` | +| `TASK-marriage-match-p1-fix-20261018-2.md` | #79 | 胶水挪进子包，根目录文件数回到 446；调用清单改指向 marriage_match.py | 待验收 | `codex/marriage-match-p1-20261017` | | `TASK-full-reading-module-parity-20261018.md` | #81 | full-reading 补齐上游 5 个模块（西占层文件没搬致永远 blocked、Navamsha / Niryaana 用我们自己的实现填键、Lagna Vargottamamsa / Pushkara / Punarphoo）（BUG-1375 起） | 待执行（可与 #78 并行） | `codex/full-reading-module-parity-20261018` | | `TASK-synastry-full-report-20261018.md` | #82 | 婚恋合盘：选人页 + 完整合盘报告（关系画像九节：结论+折叠的分析逻辑+关系时间线+技术依据摘要；英文按需；计费键 synastry.full） | 排队（等 #78、#79、#81） | `codex/synastry-full-report-20261018`；动表 | | `TASK-synastry-report-chat-20261018.md` | #83 | 从合盘报告某一节进入对话问依据（绑定报告与节、对话里可用术语、只依据已存计算结果并逐条核对、计费照普通对话） | 排队（等 #82） | `codex/synastry-report-chat-20261018`；动表 | diff --git a/references/oracle/compatibility_skill_readiness_dashboard_2026_07_20.json b/references/oracle/compatibility_skill_readiness_dashboard_2026_07_20.json index d0e7ca2e..5a304859 100644 --- a/references/oracle/compatibility_skill_readiness_dashboard_2026_07_20.json +++ b/references/oracle/compatibility_skill_readiness_dashboard_2026_07_20.json @@ -29,7 +29,7 @@ "evidence_paths": [ "scripts/ashtakoot.py", "references/oracle/ashtakoot_oracle_cases.json", - "scripts/synastry.py" + "scripts/marriage_match.py" ], "claim_boundary": "36-point compatibility can be exposed as one factor only; not deterministic marriage outcome." }, diff --git a/references/oracle/effective_skill_capability_view_2026_07_19.json b/references/oracle/effective_skill_capability_view_2026_07_19.json index 2e32ba1f..c9bfbbde 100644 --- a/references/oracle/effective_skill_capability_view_2026_07_19.json +++ b/references/oracle/effective_skill_capability_view_2026_07_19.json @@ -615,7 +615,7 @@ "effective_status": "covered", "overlay_evidence": "", "overlay_reason": "", - "public_label": "synastry.py", + "public_label": "marriage_match.py", "registry_status": "covered", "technique_id": "synastry_16factor" }, diff --git a/references/oracle/full_technique_invocation_matrix_2026_07_22.json b/references/oracle/full_technique_invocation_matrix_2026_07_22.json index 5ae94d42..90a0d805 100644 --- a/references/oracle/full_technique_invocation_matrix_2026_07_22.json +++ b/references/oracle/full_technique_invocation_matrix_2026_07_22.json @@ -7961,7 +7961,7 @@ "scripts/full_technique_invocation_matrix.py", "scripts/reading_orchestrator.py", "scripts/remedies.py", - "scripts/synastry.py", + "scripts/marriage_match.py", "scripts/validation_report.json", "scripts/yogas_doshas.py" ], @@ -7972,7 +7972,7 @@ "scripts/full_technique_invocation_matrix.py", "scripts/reading_orchestrator.py", "scripts/remedies.py", - "scripts/synastry.py", + "scripts/marriage_match.py", "scripts/validation_report.json", "scripts/yogas_doshas.py" ], @@ -8494,14 +8494,14 @@ "api": [ "scripts/full_technique_invocation_matrix.py", "scripts/jyotish_api_server.py", - "scripts/synastry.py", + "scripts/marriage_match.py", "scripts/technique_registry.py" ], "ui": [], "scripts": [ "scripts/full_technique_invocation_matrix.py", "scripts/jyotish_api_server.py", - "scripts/synastry.py", + "scripts/marriage_match.py", "scripts/technique_registry.py" ], "references": [ @@ -14054,7 +14054,7 @@ "scripts/full_technique_invocation_matrix.py", "scripts/reading_orchestrator.py", "scripts/remedies.py", - "scripts/synastry.py", + "scripts/marriage_match.py", "scripts/validation_report.json", "scripts/yogas_doshas.py" ], @@ -14065,7 +14065,7 @@ "scripts/full_technique_invocation_matrix.py", "scripts/reading_orchestrator.py", "scripts/remedies.py", - "scripts/synastry.py", + "scripts/marriage_match.py", "scripts/validation_report.json", "scripts/yogas_doshas.py" ], @@ -14139,14 +14139,14 @@ "api": [ "scripts/full_technique_invocation_matrix.py", "scripts/jyotish_api_server.py", - "scripts/synastry.py", + "scripts/marriage_match.py", "scripts/technique_registry.py" ], "ui": [], "scripts": [ "scripts/full_technique_invocation_matrix.py", "scripts/jyotish_api_server.py", - "scripts/synastry.py", + "scripts/marriage_match.py", "scripts/technique_registry.py" ], "references": [ @@ -14428,5 +14428,5 @@ "priority_score": 295 } ], - "content_hash": "5985d71b0e972165cecb9466dd6abc00548b86bb4b27489e1b6b3440544b4722" + "content_hash": "0e50da49c85162da6d9a193ee9e3a1e5f8b61dd5a9a33cde9e4b7ed9fadd9236" } diff --git a/scripts/jyotish_api_server.py b/scripts/jyotish_api_server.py index 47e50517..472b7e68 100644 --- a/scripts/jyotish_api_server.py +++ b/scripts/jyotish_api_server.py @@ -2534,7 +2534,8 @@ def _load_local_module(module_name): cached = _LOCAL_MODULE_CACHE.get(module_name) if cached: return cached - module_path = os.path.join(SCRIPTS_DIR, f'{module_name}.py') + relative = module_name.replace('.', os.sep) + module_path = os.path.join(SCRIPTS_DIR, f'{relative}.py') spec = importlib.util.spec_from_file_location(f'_jyotish_local_{module_name}', module_path) if not spec or not spec.loader: raise ImportError(f'Cannot load local module: {module_name}') @@ -10506,14 +10507,14 @@ class JyotishAPIHandler(BaseHTTPRequestHandler, JyotishComputeService): result = self._compute_synastry(body) self._json(result) elif path == '/api/marriage-match': - match_api = _load_local_module('marriage_match_api') + match_api = _load_local_module('marriage_match_service.api') try: result = match_api.compute_marriage_match(body) except match_api.MarriageMatchInputError as exc: raise BadRequest(str(exc)) from exc self._json(result) elif path == '/api/synastry_full_dossier': - match_api = _load_local_module('marriage_match_api') + match_api = _load_local_module('marriage_match_service.api') try: result = match_api.compute_synastry_full_dossier(self, body) except match_api.MarriageMatchInputError as exc: diff --git a/scripts/jyotish_engine.py b/scripts/jyotish_engine.py index 81282e33..6bb63bc5 100644 --- a/scripts/jyotish_engine.py +++ b/scripts/jyotish_engine.py @@ -14514,7 +14514,7 @@ def _tajika_annual_core(args, planet_lons, asc_si, age, mode='all'): def cmd_marriage_match(args): try: sys.path.insert(0, SCRIPT_DIR) - from marriage_match_cli import run_marriage_match_cli + from marriage_match_service.cli import run_marriage_match_cli except ImportError as exc: return {"error": f"marriage_match模块导入失败: {exc}"} try: diff --git a/scripts/marriage_match_service/__init__.py b/scripts/marriage_match_service/__init__.py new file mode 100644 index 00000000..acf1c24f --- /dev/null +++ b/scripts/marriage_match_service/__init__.py @@ -0,0 +1 @@ +"""Local glue for the upstream marriage-match engine. The engine file stays at scripts/marriage_match.py.""" diff --git a/scripts/marriage_match_api.py b/scripts/marriage_match_service/api.py similarity index 97% rename from scripts/marriage_match_api.py rename to scripts/marriage_match_service/api.py index bc89387d..33008ab7 100644 --- a/scripts/marriage_match_api.py +++ b/scripts/marriage_match_service/api.py @@ -11,7 +11,7 @@ import os from typing import Any from marriage_match import build_marriage_match_dossier -from synastry_full_dossier import RULES_VERSION, build_synastry_full_dossier +from marriage_match_service.full_dossier import RULES_VERSION, build_synastry_full_dossier try: from scripts import consult_full_data_cache as _cache diff --git a/scripts/marriage_match_cli.py b/scripts/marriage_match_service/cli.py similarity index 100% rename from scripts/marriage_match_cli.py rename to scripts/marriage_match_service/cli.py diff --git a/scripts/synastry_full_dossier.py b/scripts/marriage_match_service/full_dossier.py similarity index 98% rename from scripts/synastry_full_dossier.py rename to scripts/marriage_match_service/full_dossier.py index 7b1e8e64..b4096cd3 100644 --- a/scripts/synastry_full_dossier.py +++ b/scripts/marriage_match_service/full_dossier.py @@ -15,7 +15,7 @@ from typing import Any, Callable from marriage_match import build_marriage_match_dossier -ROOT = Path(__file__).resolve().parents[1] +ROOT = Path(__file__).resolve().parents[2] DOSSIER_SCRIPT = ( ROOT / "skills" diff --git a/tests/test_marriage_match_api.py b/tests/test_marriage_match_api.py index c05d5175..7ac9ba13 100644 --- a/tests/test_marriage_match_api.py +++ b/tests/test_marriage_match_api.py @@ -15,14 +15,14 @@ if str(SCRIPTS) not in sys.path: sys.path.insert(0, str(SCRIPTS)) from marriage_match import build_marriage_match_dossier -from marriage_match_api import ( +from marriage_match_service.api import ( CACHE_NAME, MarriageMatchInputError, compute_marriage_match, compute_synastry_full_dossier, ) -import marriage_match_api as api -from synastry_full_dossier import RULES_VERSION +import marriage_match_service.api as api +from marriage_match_service.full_dossier import RULES_VERSION import api_heavy_compute_gate @@ -83,7 +83,7 @@ def test_disk_cache_reuses_one_build(monkeypatch, tmp_path): return {"rules_version": RULES_VERSION, "dossier": {"schema": "fixture"}, "raman_marriage_match": {}} monkeypatch.setattr( - "marriage_match_api.build_synastry_full_dossier", + "marriage_match_service.api.build_synastry_full_dossier", fake, ) body = { @@ -105,7 +105,7 @@ def test_missing_commit_does_not_reuse_the_disk_cache(monkeypatch): calls["n"] += 1 return {"rules_version": RULES_VERSION, "dossier": {}, "raman_marriage_match": {}} - monkeypatch.setattr("marriage_match_api.build_synastry_full_dossier", fake) + monkeypatch.setattr("marriage_match_service.api.build_synastry_full_dossier", fake) body = { "person_a": {"year": 1990, "month": 1, "day": 2, "hour": 3, "minute": 4, "lat": 1, "lon": 2, "tz": 8}, "person_b": {"year": 1991, "month": 5, "day": 6, "hour": 7, "minute": 8, "lat": 3, "lon": 4, "tz": 8}, diff --git a/tests/test_marriage_match_product.py b/tests/test_marriage_match_product.py index fb6d2df3..16deadf7 100644 --- a/tests/test_marriage_match_product.py +++ b/tests/test_marriage_match_product.py @@ -135,10 +135,10 @@ def test_non_romantic_scope_is_rejected(): def test_api_handler_uses_the_new_product_contract_without_legacy_kuja_score(): - # 原值: JyotishAPIHandler._compute_marriage_match - # 新值: marriage_match_api.compute_marriage_match - # 原因: JyotishAPIHandler 类方法数不得增长，计算放独立模块。 - from marriage_match_api import compute_marriage_match + # 原值: marriage_match_api.compute_marriage_match + # 新值: marriage_match_service.api.compute_marriage_match + # 原因: scripts 根目录文件数不得增加，胶水放进子包。 + from marriage_match_service.api import compute_marriage_match payload = { "person_a": chart(0, 1, 20, 180), diff --git a/tests/test_synastry_full_dossier.py b/tests/test_synastry_full_dossier.py index 7db99ab6..dced815d 100644 --- a/tests/test_synastry_full_dossier.py +++ b/tests/test_synastry_full_dossier.py @@ -12,7 +12,7 @@ if str(SCRIPTS) not in sys.path: sys.path.insert(0, str(SCRIPTS)) from jyotish_api_server import JyotishComputeService -from synastry_full_dossier import build_synastry_full_dossier +from marriage_match_service.full_dossier import build_synastry_full_dossier FIXTURE = ROOT / "frontend" / "tests" / "fixtures" / "synastry-full-dossier-truncated.json"