v3.6.0 同步发版
- 交互契约改对话式询问（禁点选工具、一次1~2问、先铺垫再问），规则库 3.6 - 盘面图默认生成+chart_shot 截图；品牌区、大运/流年小卡信息补全、交流群二维码卡 - day_boundary 子正换日；memory_save --update-chart 换盘留痕；share_export 事件简介+城市级地域 - share_push 失败诊断+代理引导；_runtime_guard；修 STAR_ORDER 三奇贵人 KeyError - README 规则计数 541→542；manifest 重建（1275 文件）；测试 142 项全绿
This commit is contained in:
+85
-9
@@ -19,7 +19,7 @@ import _memory_store as store
|
||||
|
||||
PILLARS = ["庚午", "辛巳", "己卯", "戊辰"]
|
||||
BIRTH = "1990-05-14 08:30"
|
||||
PLACE = "四川省成都市"
|
||||
PLACE = "四川省成都市武侯区"
|
||||
|
||||
git = pytest.mark.skipif(shutil.which("git") is None, reason="无 git")
|
||||
|
||||
@@ -31,11 +31,14 @@ def run(script, *args):
|
||||
capture_output=True, text=True, timeout=120, env=env)
|
||||
|
||||
|
||||
def make_archive(mem_root: Path, feedback: str | None = None) -> Path:
|
||||
"""造一份手工档案：四柱/大运/关注方向齐全，反馈小节可定制。"""
|
||||
def make_archive(mem_root: Path, feedback: str | None = None,
|
||||
events: str | None = None,
|
||||
pillars: list[str] | None = None) -> Path:
|
||||
"""造一份手工档案：四柱/大运/关注方向齐全，流年大事与反馈小节可定制。"""
|
||||
pillars = pillars or PILLARS
|
||||
meta = {"name": "张三", "gender": "男", "birth_clock": BIRTH,
|
||||
"birthplace": PLACE, "true_solar_time": "1990-05-14 08:23",
|
||||
"pillars": PILLARS, "day_master": "己",
|
||||
"pillars": pillars, "day_master": "己",
|
||||
"created_at": "2026-10-01 10:00", "updated_at": "2026-10-08 15:00"}
|
||||
body = (
|
||||
"# 档案：张三（男）\n\n"
|
||||
@@ -49,15 +52,19 @@ def make_archive(mem_root: Path, feedback: str | None = None) -> Path:
|
||||
"## 小运\n\n（无）\n\n"
|
||||
"## 主要关注方向\n\n- 婚姻与事业走向\n\n"
|
||||
"## 归纳\n\n- 性格：未断\n- 身体：未断\n- 事业：未断\n- 感情：未断\n- 婚姻：未断\n\n"
|
||||
"## 流年大事\n\n（未记录）\n\n"
|
||||
"## 反馈与澄清\n\n"
|
||||
"## 流年大事\n\n"
|
||||
+ (events if events is not None else
|
||||
"- 2018（戊戌）：【已核实】升职，自成都赴北京工作。\n"
|
||||
"- 2021（辛丑）：【已核实】张三搬家，新居在幸福小区3栋2单元501室，"
|
||||
"电话 13812345678。\n")
|
||||
+ "\n## 反馈与澄清\n\n"
|
||||
+ (feedback if feedback is not None else
|
||||
"- 【已核实】2018 年升职，跳槽到外企\n- 【未核实】2020 年感情波动\n")
|
||||
)
|
||||
arch_dir = mem_root / "archives"
|
||||
arch_dir.mkdir(parents=True, exist_ok=True)
|
||||
path = arch_dir / store.archive_name(
|
||||
PILLARS, "男", store.key_hash(BIRTH, PLACE, "男"))
|
||||
pillars, "男", store.key_hash(BIRTH, PLACE, "男"))
|
||||
path.write_text(store.dump_frontmatter(meta) + body, encoding="utf-8")
|
||||
return path
|
||||
|
||||
@@ -77,11 +84,13 @@ class TestExport:
|
||||
text = out.read_text("utf-8")
|
||||
pkg = json.loads(text)
|
||||
|
||||
# 脱敏：不含姓名、出生分钟/钟表时间、省以下地域
|
||||
# 脱敏：不含姓名、出生分钟/钟表时间、区县及以下地域、直接定位信息
|
||||
assert "name" not in pkg
|
||||
assert "张三" not in text
|
||||
assert "08:30" not in text and "08:23" not in text
|
||||
assert "成都市" not in text
|
||||
assert "武侯区" not in text
|
||||
assert "幸福小区" not in text and "501" not in text
|
||||
assert "13812345678" not in text
|
||||
assert "birth_clock" not in pkg and "birthplace" not in pkg
|
||||
|
||||
# 结构字段
|
||||
@@ -90,17 +99,50 @@ class TestExport:
|
||||
assert pkg["pillars"] == PILLARS
|
||||
assert pkg["birth_date"] == "1990-05-14"
|
||||
assert pkg["birth_shichen"] == "辰"
|
||||
# 地域放宽到城市级：省+地级市保留
|
||||
assert pkg["region_province"] == "四川省"
|
||||
assert pkg["region_city"] == "成都市"
|
||||
assert [l["pillar"] for l in pkg["luck_pillars"]] == ["壬午", "癸未", "甲申"]
|
||||
assert pkg["luck_pillars"][0]["start_year"] == 1998
|
||||
assert pkg["focus_categories"] == ["婚姻", "事业"]
|
||||
assert {f["year"] for f in pkg["feedback"]} == {2018, 2020}
|
||||
assert {f["status"] for f in pkg["feedback"]} == {"已核实", "未核实"}
|
||||
assert all(f["category"] for f in pkg["feedback"])
|
||||
# 反馈带事件简介（状态标签已剥离）
|
||||
fb = {f["year"]: f for f in pkg["feedback"]}
|
||||
assert fb[2018]["note"] == "2018 年升职，跳槽到外企"
|
||||
assert fb[2020]["note"] == "2020 年感情波动"
|
||||
# 盘 hash = sha1(四柱+出生地) 前 8，文件名即 hash
|
||||
assert out.stem == pkg["chart_hash"]
|
||||
assert len(pkg["chart_hash"]) == 8
|
||||
|
||||
def test_events_carry_notes_with_city_kept(self, tmp_path, share_root):
|
||||
arch = make_archive(tmp_path / "memory")
|
||||
r = run(EXPORT, "--archive", str(arch), "--share-root", str(share_root))
|
||||
assert r.returncode == 0, r.stderr
|
||||
pkg = json.loads(Path(r.stdout.strip()).read_text("utf-8"))
|
||||
|
||||
ev = pkg["events"]
|
||||
assert len(ev) == 2
|
||||
# 目标格式：2018（戊戌）：升职，自成都赴北京工作。——城市级地名保留
|
||||
assert ev[0]["year"] == 2018 and ev[0]["ganzhi"] == "戊戌"
|
||||
assert ev[0]["label"] == "戊戌"
|
||||
assert ev[0]["note"] == "升职，自成都赴北京工作。"
|
||||
assert ev[0]["status"] == "已核实" and ev[0]["category"] == "事业"
|
||||
# 姓名替换为「命主」，详细住址与电话删除，事件内容保留
|
||||
assert ev[1]["year"] == 2021 and ev[1]["ganzhi"] == "辛丑"
|
||||
assert "搬家" in ev[1]["note"] and "命主" in ev[1]["note"]
|
||||
assert "（已删）" in ev[1]["note"]
|
||||
|
||||
def test_events_missing_still_exports(self, tmp_path, share_root):
|
||||
# 流年大事为空不挡导出，events 如实为空
|
||||
arch = make_archive(tmp_path / "memory", events="（未记录）\n")
|
||||
r = run(EXPORT, "--archive", str(arch), "--share-root", str(share_root))
|
||||
assert r.returncode == 0, r.stderr
|
||||
pkg = json.loads(Path(r.stdout.strip()).read_text("utf-8"))
|
||||
assert pkg["events"] == []
|
||||
assert len(pkg["feedback"]) == 2
|
||||
|
||||
def test_lookup_by_birth_place_gender(self, tmp_path, share_root):
|
||||
make_archive(tmp_path / "memory")
|
||||
r = run(EXPORT, "--birth", BIRTH, "--place", PLACE, "--gender", "男",
|
||||
@@ -121,6 +163,20 @@ class TestExport:
|
||||
"--share-root", str(share_root))
|
||||
assert r.returncode == 2
|
||||
|
||||
def test_export_warns_orphan_pending_after_recast(self, tmp_path, share_root):
|
||||
# 先导出原盘，再导出同出生日同性别但时柱不同的换盘 → WARN 提示残留，不自动删
|
||||
arch = make_archive(tmp_path / "memory")
|
||||
r = run(EXPORT, "--archive", str(arch), "--share-root", str(share_root))
|
||||
assert r.returncode == 0, r.stderr
|
||||
arch2 = make_archive(tmp_path / "memory2",
|
||||
pillars=["庚午", "辛巳", "己卯", "己巳"])
|
||||
r2 = run(EXPORT, "--archive", str(arch2), "--share-root", str(share_root))
|
||||
assert r2.returncode == 0, r2.stderr
|
||||
assert r.stdout.strip() != r2.stdout.strip() # hash 确实变了
|
||||
assert "WARN" in r2.stderr and "残留" in r2.stderr
|
||||
assert r.stdout.strip().split("/")[-1] in r2.stderr # 列出了旧包文件名
|
||||
assert len(list((share_root / "pending").glob("*.json"))) == 2 # 不自动删
|
||||
|
||||
|
||||
@git
|
||||
class TestPush:
|
||||
@@ -190,6 +246,26 @@ class TestPush:
|
||||
assert pkg.is_file() # 失败保留 pending
|
||||
st = json.loads((skill / "data" / ".license.json").read_text("utf-8"))
|
||||
assert st["remaining_uses"] == 5 # 未计励
|
||||
# 失败诊断：带该远端 git 报错末行；GitHub 线附 HTTPS_PROXY 提示
|
||||
assert "FAIL" in r.stderr and "no-such-repo" in r.stderr
|
||||
assert "HTTPS_PROXY" in r.stderr
|
||||
|
||||
def test_push_partial_failure_warns_but_succeeds(self, skill, tmp_path):
|
||||
# github 坏、gitea 好：整体成功，但 stderr 带 github 线的失败摘要
|
||||
(skill / "share" / "config.json").write_text(json.dumps(
|
||||
{"github_remote": str(skill / "no-such-repo.git"),
|
||||
"gitea_remote": str(tmp_path / "gitea.git")}, ensure_ascii=False),
|
||||
"utf-8")
|
||||
pkg = skill / "share" / "pending" / "baddcafe.json"
|
||||
pkg.write_text(json.dumps({"schema": "share/v1",
|
||||
"chart_hash": "baddcafe"}), "utf-8")
|
||||
r = run(PUSH, "--root", str(skill))
|
||||
assert r.returncode == 0, r.stderr
|
||||
assert (skill / "share" / "pushed" / "baddcafe.json").is_file()
|
||||
assert "WARN" in r.stderr and "github_remote" in r.stderr
|
||||
assert "no-such-repo" in r.stderr and "HTTPS_PROXY" in r.stderr
|
||||
st = json.loads((skill / "data" / ".license.json").read_text("utf-8"))
|
||||
assert st["remaining_uses"] == 15 # gitea 成功，正常计励
|
||||
|
||||
def test_no_remote_configured(self, tmp_path):
|
||||
root = tmp_path / "skill"
|
||||
|
||||
Reference in New Issue
Block a user