v3.4:童限小运、全量流年与节气边界提示;解释输出契约 v3.0 直答先行
排盘输出 schema 1.1→1.2:
- ## 流年 改为出生年至今+10 年全量,逐年标注所属区间(童限/某运/交运年)
- 新增 ## 小运(童限各虚岁干支,自时柱起、一位一岁、顺逆同大运)
- 生于交节前后 12 小时内出 ⚠️ 节气边界提示(月令敏感性)
- 神煞改由脚本按查法直接计算并列锚点;新增 scripts/query_shensha.py 查岁运神煞
规则库 380→541(16→20 文件,版本 3.4):
- 新增 89_旺衰扶抑 / 91_何知事类 / 92_调候 / 93_性情(滴天髓、穷通宝鉴参看层)
- 90_行运.md 新增 §10 童限(R-运-36~39,蒸馏《命理探源》《三命通会》小运诸法)
- R-运-33 改写为核对前置:intake 一问定场景,可核对走锚点、不可核对直推,输出只出现一次
- R-运-32 增前提挑战、直答收敛(一个主答案+置信度)、同机制证伪降权
- R-运-34 增救应回查(合绊解冲折减引动并回写排序);R-运-10 补「缓急非早晚」之辨
- 94 神煞扩展 19 条(三命通会书证);规则编号记录移调试层
- sources 按书归档五书全文;黄金集扩至 291 例(真诠 92 + 滴天髓 199)
SKILL.md 输出契约 v2.1→v3.0:
- 骨架改为 排盘口径→直答→现实对应→分析推理→存疑与边界→免责
- 说人话段改现实对应段(问题域优先);编号默认不进用户面输出
- Intake 增场景判定一问(命主本人/替人看/能否核对)
测试:新增 test_luck.py 9 项,全套 65 项通过
This commit is contained in:
@@ -42,11 +42,17 @@ def _hidden(me, earth_branch) -> list:
|
||||
return items
|
||||
|
||||
|
||||
def _shen_sha(solar: SolarTime) -> list:
|
||||
try:
|
||||
return [g.get_name() for g in solar.get_lunar_hour().get_lunar_day().get_gods()]
|
||||
except Exception:
|
||||
return []
|
||||
def _shen_sha(ganzhi: dict, gender: str) -> dict:
|
||||
"""子平通行神煞(查法见 chart/shensha.py 与 rules/94_神煞细节.md)。"""
|
||||
from chart.shensha import evaluate_natal, STAR_ORDER
|
||||
|
||||
raw = evaluate_natal(ganzhi, gender)
|
||||
order = {name: i for i, name in enumerate(STAR_ORDER)}
|
||||
return {
|
||||
key: [f"{star}({note})"
|
||||
for star, note in sorted(entries, key=lambda e: order[e[0]])]
|
||||
for key, entries in raw.items()
|
||||
}
|
||||
|
||||
|
||||
def cast(cast_dt: datetime, gender: str) -> dict:
|
||||
@@ -59,9 +65,12 @@ def cast(cast_dt: datetime, gender: str) -> dict:
|
||||
|
||||
prev_jie, next_jie = _jie_bounds(cast_dt)
|
||||
|
||||
base = {k: {"gan": p.get_heaven_stem().get_name(),
|
||||
"zhi": p.get_earth_branch().get_name()} for k, p in pillars.items()}
|
||||
ganzhi = {k: v["gan"] + v["zhi"] for k, v in base.items()}
|
||||
|
||||
return {
|
||||
**{k: {"gan": p.get_heaven_stem().get_name(),
|
||||
"zhi": p.get_earth_branch().get_name()} for k, p in pillars.items()},
|
||||
**base,
|
||||
"day_master": me.get_name(),
|
||||
"ten_god": {k: me.get_ten_star(pillars[k].get_heaven_stem()).get_name()
|
||||
for k in ("year", "month", "hour")},
|
||||
@@ -71,7 +80,7 @@ def cast(cast_dt: datetime, gender: str) -> dict:
|
||||
"na_yin": {k: pillars[k].get_sound().get_name() for k in _PILLARS},
|
||||
"void": {k: "".join(b.get_name() for b in pillars[k].get_extra_earth_branches())
|
||||
for k in ("day", "hour")},
|
||||
"shen_sha": _shen_sha(solar),
|
||||
"shen_sha": _shen_sha(ganzhi, gender),
|
||||
"prev_jie": {"name": prev_jie[0].get_name(), "time": prev_jie[1]},
|
||||
"next_jie": {"name": next_jie[0].get_name(), "time": next_jie[1]},
|
||||
"tai_yuan": ec.get_fetal_origin().get_name(),
|
||||
|
||||
Reference in New Issue
Block a user