@furongjun1999/dsh-memory 0.9.23 → 0.10.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.en.md +450 -404
- package/CHANGELOG.md +67 -0
- package/README.en.md +244 -240
- package/README.md +272 -262
- package/codebuddy/CODEBUDDY.md +1 -1
- package/docs/discipline/templates/full.md.tmpl +1 -1
- package/docs/discipline/templates/rules.mdc.tmpl +1 -1
- package/docs/en/mdcg/world-model-endpoint.md +1 -1
- package/docs/mdcg/cogmap_ops.md +16 -15
- package/lib/client.js +29 -3
- package/lib/hooks.d.ts +12 -0
- package/lib/hooks.js +43 -1
- package/md_cg/bucketindex.py +231 -0
- package/md_cg/bucketscope.py +339 -0
- package/md_cg/config_registry_bulk.py +19 -10
- package/md_cg/config_validate.py +14 -2
- package/md_cg/detrerank.py +137 -0
- package/md_cg/fsutil.py +135 -0
- package/md_cg/govern/__init__.py +23 -0
- package/md_cg/iface/__init__.py +46 -0
- package/md_cg/iface/_verify.py +609 -0
- package/md_cg/iface/contracts.py +337 -0
- package/md_cg/judgment_manifest.py +14 -0
- package/md_cg/kernel/__init__.py +27 -0
- package/md_cg/mcp_server.py +5991 -5761
- package/md_cg/mdcg.py +474 -16
- package/md_cg/mdcos.py +228 -11
- package/md_cg/metacognition.py +66 -13
- package/md_cg/mutate_extract_shipped.py +126 -0
- package/md_cg/mutate_ledger_e2e.py +100 -0
- package/md_cg/op_table.py +8 -0
- package/md_cg/probe_c_ledger_integrity.py +258 -0
- package/md_cg/probe_d_retirement_discipline.py +263 -0
- package/md_cg/review_cli.py +6 -1
- package/md_cg/run_tests.py +30 -1
- package/md_cg/scopeselect.py +214 -0
- package/md_cg/scrub.py +66 -9
- package/md_cg/state_extract.py +149 -0
- package/md_cg/state_slots.py +58 -10
- package/md_cg/structboost.py +179 -0
- package/md_cg/test_alternatives_historical.py +162 -0
- package/md_cg/test_b2_sensitivity_landing.py +226 -223
- package/md_cg/test_b3_merge_keeps_content.py +608 -583
- package/md_cg/test_bucket_cards.py +85 -0
- package/md_cg/test_bucket_day_order.py +74 -0
- package/md_cg/test_bucket_quota.py +79 -0
- package/md_cg/test_bucket_recency_guards.py +75 -0
- package/md_cg/test_bucket_three_causes.py +83 -0
- package/md_cg/test_bucketindex.py +130 -0
- package/md_cg/test_bucketscope_early.py +71 -0
- package/md_cg/test_cond_term_fold_gate.py +1210 -0
- package/md_cg/test_cond_term_neg_scope.py +147 -0
- package/md_cg/test_detrerank.py +157 -0
- package/md_cg/test_gate_four_kpi.py +136 -0
- package/md_cg/test_generation_guard.py +14 -2
- package/md_cg/test_issue192_move_layer_indices_guard.py +48 -0
- package/md_cg/test_issue39_utf8_stdio.py +572 -572
- package/md_cg/test_issue413_preimage_failclosed.py +147 -9
- package/md_cg/test_issue768_overwrite_time_window_anchor.py +135 -0
- package/md_cg/test_issue789_log_plaintext_probe.py +100 -0
- package/md_cg/test_issue790_verb_negation.py +77 -0
- package/md_cg/test_issue810_root_guard.py +71 -0
- package/md_cg/test_issue812_info_index_stale.py +78 -0
- package/md_cg/test_issue827_weaken_dedup.py +361 -0
- package/md_cg/test_issue829_calibration_positive_gate.py +473 -0
- package/md_cg/test_kernel_iface_contracts.py +18 -0
- package/md_cg/test_md_cg_no_hive_dep.py +238 -17
- package/md_cg/test_probe_cd_shipped.py +385 -0
- package/md_cg/test_recent_tail.py +93 -0
- package/md_cg/test_run_tests_entry_gates.py +110 -0
- package/md_cg/test_scopeselect.py +70 -0
- package/md_cg/test_scopeselect_clock.py +70 -0
- package/md_cg/test_session_attribution_consistency.py +835 -813
- package/md_cg/test_state_extract_shipped.py +162 -0
- package/md_cg/test_state_ledger_chain.py +207 -0
- package/md_cg/test_state_ledger_e2e.py +145 -0
- package/md_cg/test_structboost.py +102 -0
- package/md_cg/test_timeboost.py +83 -0
- package/md_cg/test_timeboost_relativedate.py +71 -0
- package/md_cg/test_topicagg.py +129 -0
- package/md_cg/timeboost.py +223 -0
- package/md_cg/topicagg.py +142 -0
- package/md_cg/whitebox_kb/wisdom/code_compose.py +33 -5
- package/md_cg/whitebox_kb/wisdom/compose_engine.py +5 -1
- package/md_cg/whitebox_kb/wisdom/role_compose.py +271 -268
- package/package.json +137 -137
- package/src/hooks.ts +43 -1
- package/ui/minimal/payload/build-ui.mjs +41 -2
- package/ui/minimal/payload/lib/client.js +29 -3
- package/ui/minimal/payload/web/app.js +3 -1
- package/ui/minimal/payload/web/client.js +30 -3
- package/web/app.js +3 -1
- package/web/client.js +30 -3
- package/zcode/AGENTS.md +1 -1
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
"""外测 2026-11-11 两个卡点守卫。
|
|
3
|
+
|
|
4
|
+
卡点 1:`_pick` 部分命中抑制——只要有一条命中就把同桶其余节点全丢(锚点在桶里也消失)。
|
|
5
|
+
卡点 2:`recall` 没有 `now` 入口——生产装包按真实时钟算,宿主/外部复测丢逻辑时钟。
|
|
6
|
+
"""
|
|
7
|
+
from __future__ import annotations
|
|
8
|
+
|
|
9
|
+
import inspect
|
|
10
|
+
import os
|
|
11
|
+
import sys
|
|
12
|
+
import tempfile
|
|
13
|
+
import time
|
|
14
|
+
|
|
15
|
+
sys.stdout.reconfigure(encoding="utf-8", errors="replace")
|
|
16
|
+
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
|
17
|
+
|
|
18
|
+
from md_cg import bucketindex as bi # noqa: E402
|
|
19
|
+
from md_cg import bucketscope as bs # noqa: E402
|
|
20
|
+
from md_cg.mdcos import MdCGOS # noqa: E402
|
|
21
|
+
|
|
22
|
+
CCG = ('# 功能名:{n}\n# 生效条件:c\n# 子功能:s\n# 执行:e\n'
|
|
23
|
+
'# 验证方式:test\n# 不适用条件:无\n\n{body}\n')
|
|
24
|
+
FAILS = []
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
def ok(cond, name, detail=""):
|
|
28
|
+
if cond:
|
|
29
|
+
print(" PASS " + name)
|
|
30
|
+
else:
|
|
31
|
+
print(" FAIL " + name + " " + str(detail)[:170])
|
|
32
|
+
FAILS.append(name)
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
def main():
|
|
36
|
+
print("=" * 66)
|
|
37
|
+
print("卡点 1(命中抑制)/ 卡点 2(recall 时钟)/ 跨桶轮转")
|
|
38
|
+
print("=" * 66)
|
|
39
|
+
root = tempfile.mkdtemp(prefix="card_")
|
|
40
|
+
g = MdCGOS(root, actor="test")
|
|
41
|
+
now = time.mktime(time.strptime("2026-07-10 12:00:00", "%Y-%m-%d %H:%M:%S"))
|
|
42
|
+
day = time.mktime(time.strptime("2026-05-03 10:00:00", "%Y-%m-%d %H:%M:%S"))
|
|
43
|
+
# 同一天三条:只有 114 命中 query 词,锚点 116 不命中
|
|
44
|
+
g.add("114", CCG.format(n="命中的", s="w", e="1", body="陪爸 开药 相关"),
|
|
45
|
+
created_at=day, session="other")
|
|
46
|
+
g.add("115", CCG.format(n="中间", s="w", e="2", body="别的 内容"),
|
|
47
|
+
created_at=day + 60, session="other")
|
|
48
|
+
g.add("116", CCG.format(n="锚点", s="w", e="3", body="完全 无关 措辞"),
|
|
49
|
+
created_at=day + 120, session="other")
|
|
50
|
+
bi.build(g, write=True, with_content=True)
|
|
51
|
+
|
|
52
|
+
# 直接测 _pick 的补足行为:需显式 fill_rest(缺省关,以保持「最近 N 天」兜底不塞无关条目)
|
|
53
|
+
picked = bs._pick(g, ["114", "115", "116"], bs._terms("陪爸 开药"), 8, fill_rest=True)
|
|
54
|
+
ids = [n.get("id") for n, _s, _q, _p in picked]
|
|
55
|
+
ok("114" in ids, "K1a 命中节点在", ids)
|
|
56
|
+
ok("116" in ids, "K1b **锚点(零命中)也按时间补足进来**", ids)
|
|
57
|
+
ok(len(ids) == 3, "K1c 同桶补足到桶内全部(cap 允许)", ids)
|
|
58
|
+
|
|
59
|
+
# 跨桶轮转:8 个桶各 3 条,cap=4 → 至少覆盖 4 个不同桶
|
|
60
|
+
root2 = tempfile.mkdtemp(prefix="rr_")
|
|
61
|
+
g2 = MdCGOS(root2, actor="test")
|
|
62
|
+
base = time.mktime(time.strptime("2026-04-01 10:00:00", "%Y-%m-%d %H:%M:%S"))
|
|
63
|
+
for i in range(8):
|
|
64
|
+
for j in range(3):
|
|
65
|
+
g2.add("d%d_%d" % (i, j), CCG.format(n="n", s="w", e=str(j), body="陪爸 开药 记录"),
|
|
66
|
+
created_at=base + i * 86400, session="s%d" % i)
|
|
67
|
+
bi.build(g2, write=True, with_content=True)
|
|
68
|
+
now2 = time.mktime(time.strptime("2026-07-10 12:00:00", "%Y-%m-%d %H:%M:%S"))
|
|
69
|
+
picked2 = bs.scope_recall(g2, "我最早陪爸开药", session=None, now=now2, cap=4)
|
|
70
|
+
buckets = {q.get("bucket") for _n, _s, q, _p in picked2}
|
|
71
|
+
ok(len(buckets) >= 3, "K2 跨桶轮转:4 个名额覆盖 ≥3 个不同日桶", buckets)
|
|
72
|
+
|
|
73
|
+
ok("now" in inspect.signature(MdCGOS.recall).parameters, "K3a recall 签名含 now")
|
|
74
|
+
pack = g.recall("陪爸 开药", budget_tokens=4000, k=10, now=now)
|
|
75
|
+
metas = [it.get("metadata") or {} for it in (pack.get("items") or pack.get("pack") or [])]
|
|
76
|
+
rd = [m.get("resolved_dates") for m in metas if m.get("resolved_dates")]
|
|
77
|
+
ok(True, "K3b recall(now=) 可调用且不炸", (len(metas), rd[:2]))
|
|
78
|
+
|
|
79
|
+
print()
|
|
80
|
+
print("全部通过" if not FAILS else "失败 %d 项" % len(FAILS))
|
|
81
|
+
return 1 if FAILS else 0
|
|
82
|
+
|
|
83
|
+
|
|
84
|
+
if __name__ == "__main__":
|
|
85
|
+
sys.exit(main())
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
"""候选日桶排序守卫:两端交替池 + 证据优先序(外测 2026-11-11 剩余 6 个锚点)。
|
|
3
|
+
|
|
4
|
+
两条实测教训:
|
|
5
|
+
① 池子只取「最早 4 + 末 2」时,锚点在**倒数第三**就压根不在池里;
|
|
6
|
+
② 即便在池里(末日),升序排到队尾、日名额只有 4–8 个 ⇒ 永远轮不到。
|
|
7
|
+
"""
|
|
8
|
+
from __future__ import annotations
|
|
9
|
+
|
|
10
|
+
import os
|
|
11
|
+
import sys
|
|
12
|
+
import tempfile
|
|
13
|
+
import time
|
|
14
|
+
|
|
15
|
+
sys.stdout.reconfigure(encoding="utf-8", errors="replace")
|
|
16
|
+
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
|
17
|
+
|
|
18
|
+
from md_cg import bucketindex as bi # noqa: E402
|
|
19
|
+
from md_cg import bucketscope as bs # noqa: E402
|
|
20
|
+
from md_cg.mdcos import MdCGOS # noqa: E402
|
|
21
|
+
|
|
22
|
+
CCG = ('# 功能名:{n}\n# 生效条件:c\n# 子功能:s\n# 执行:e\n'
|
|
23
|
+
'# 验证方式:test\n# 不适用条件:无\n\n{body}\n')
|
|
24
|
+
FAILS = []
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
def ok(cond, name, detail=""):
|
|
28
|
+
if cond:
|
|
29
|
+
print(" PASS " + name)
|
|
30
|
+
else:
|
|
31
|
+
print(" FAIL " + name + " " + str(detail)[:170])
|
|
32
|
+
FAILS.append(name)
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
def main():
|
|
36
|
+
print("=" * 66)
|
|
37
|
+
print("候选日桶:两端交替池 + 证据优先序")
|
|
38
|
+
print("=" * 66)
|
|
39
|
+
root = tempfile.mkdtemp(prefix="dayorder_")
|
|
40
|
+
g = MdCGOS(root, actor="test")
|
|
41
|
+
base = time.mktime(time.strptime("2026-04-12 10:00:00", "%Y-%m-%d %H:%M:%S"))
|
|
42
|
+
N = 31
|
|
43
|
+
days = []
|
|
44
|
+
for i in range(N):
|
|
45
|
+
ts = base + i * 86400
|
|
46
|
+
body = "江北回声 陪爸开药 交换架" if i == N - 3 else "日常 闲聊 记录"
|
|
47
|
+
for j in range(3):
|
|
48
|
+
g.add("d%02d_%d" % (i, j), CCG.format(n="x", s="w", e=str(j), body=body),
|
|
49
|
+
created_at=ts, session="s%02d" % i)
|
|
50
|
+
days.append(time.strftime("%Y-%m-%d", time.localtime(ts)))
|
|
51
|
+
bi.build(g, write=True, with_content=True)
|
|
52
|
+
now = time.mktime(time.strptime("2026-06-10 12:00:00", "%Y-%m-%d %H:%M:%S"))
|
|
53
|
+
q = "我最早陪爸开药是哪天"
|
|
54
|
+
|
|
55
|
+
pool = bs._early_days(sorted(bi.all_days(g)))
|
|
56
|
+
ok(days[-3] in pool, "D1 倒数第三天在候选池里(旧版只取末 2 天会漏)", pool[-6:])
|
|
57
|
+
ok(pool[0] == days[-1], "D2 池的顺序**从最末一天开始**(不再升序排队尾)", pool[:4])
|
|
58
|
+
ok(days[0] in pool, "D3 最早那天仍在池里(两端兼顾)", pool[:6])
|
|
59
|
+
|
|
60
|
+
ordered = bs._order_by_evidence(g, pool, bs._terms(q))
|
|
61
|
+
ok(ordered[0] == days[-3], "D4 含强实体的那天被证据排到第 1", ordered[:3])
|
|
62
|
+
|
|
63
|
+
picked = bs.scope_recall(g, q, session=None, now=now, cap=8)
|
|
64
|
+
buckets = [str(qq.get("bucket")) for _n, _s, qq, _p in picked]
|
|
65
|
+
ok(any(b.endswith(days[-3]) for b in buckets),
|
|
66
|
+
"D5 端到端:倒数第三天的锚点进了 pack", buckets[:4])
|
|
67
|
+
|
|
68
|
+
print()
|
|
69
|
+
print("全部通过" if not FAILS else "失败 %d 项" % len(FAILS))
|
|
70
|
+
return 1 if FAILS else 0
|
|
71
|
+
|
|
72
|
+
|
|
73
|
+
if __name__ == "__main__":
|
|
74
|
+
sys.exit(main())
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
"""桶配额守卫:会话桶不得吃光名额;早段候选池必须含首尾;metadata 要带 resolved_dates。
|
|
3
|
+
|
|
4
|
+
背景(2026-11-10 外测 v2.1):A 类 10 题的**第一原因**是 `cap=8` 被会话桶先吃光,
|
|
5
|
+
日桶即便选中也 0 条进 pack;另有 P16 锚点恰是库内最后一天、均匀采样跨过它。
|
|
6
|
+
"""
|
|
7
|
+
from __future__ import annotations
|
|
8
|
+
|
|
9
|
+
import os
|
|
10
|
+
import sys
|
|
11
|
+
import tempfile
|
|
12
|
+
import time
|
|
13
|
+
|
|
14
|
+
sys.stdout.reconfigure(encoding="utf-8", errors="replace")
|
|
15
|
+
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
|
16
|
+
|
|
17
|
+
from md_cg import bucketindex as bi # noqa: E402
|
|
18
|
+
from md_cg import bucketscope as bs # noqa: E402
|
|
19
|
+
from md_cg.mdcos import MdCGOS # noqa: E402
|
|
20
|
+
|
|
21
|
+
CCG = ('# 功能名:{n}\n# 生效条件:c\n# 子功能:s\n# 执行:e\n'
|
|
22
|
+
'# 验证方式:test\n# 不适用条件:无\n\n{body}\n')
|
|
23
|
+
FAILS = []
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
def ok(cond, name, detail=""):
|
|
27
|
+
if cond:
|
|
28
|
+
print(" PASS " + name)
|
|
29
|
+
else:
|
|
30
|
+
print(" FAIL " + name + " " + str(detail)[:170])
|
|
31
|
+
FAILS.append(name)
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
def main():
|
|
35
|
+
print("=" * 66)
|
|
36
|
+
print("桶配额 / 首尾入池 / metadata 透传")
|
|
37
|
+
print("=" * 66)
|
|
38
|
+
root = tempfile.mkdtemp(prefix="quota_")
|
|
39
|
+
g = MdCGOS(root, actor="test")
|
|
40
|
+
now = time.mktime(time.strptime("2026-07-10 12:00:00", "%Y-%m-%d %H:%M:%S"))
|
|
41
|
+
old = time.mktime(time.strptime("2026-04-01 10:00:00", "%Y-%m-%d %H:%M:%S"))
|
|
42
|
+
last = time.mktime(time.strptime("2026-05-03 10:00:00", "%Y-%m-%d %H:%M:%S"))
|
|
43
|
+
for i in range(8):
|
|
44
|
+
g.add("s%d" % i, CCG.format(n="会%d" % i, s="w", e=str(i), body="陪爸 开药 会话记录"),
|
|
45
|
+
created_at=now - i * 60, session="s")
|
|
46
|
+
g.add("d_old", CCG.format(n="老", s="w", e="o", body="陪爸 开药 最早那条"),
|
|
47
|
+
created_at=old, session="other")
|
|
48
|
+
g.add("d_last", CCG.format(n="末", s="w", e="l", body="陪爸 开药 最后一天那条"),
|
|
49
|
+
created_at=last, session="other")
|
|
50
|
+
bi.build(g, write=True, with_content=True)
|
|
51
|
+
|
|
52
|
+
picked = bs.scope_recall(g, "我最早陪爸开药是哪天", session="s", now=now, cap=8)
|
|
53
|
+
ids = [n.get("id") for n, _s, _q, _p in picked]
|
|
54
|
+
sess_n = len([i for i in ids if i.startswith("s")])
|
|
55
|
+
day_items = [q.get("bucket") for _n, _s, q, _p in picked
|
|
56
|
+
if str(q.get("bucket") or "").startswith("day:")]
|
|
57
|
+
ok(sess_n <= bs.SESSION_QUOTA, "Q1 会话桶不超过 SESSION_QUOTA", (sess_n, ids))
|
|
58
|
+
ok(bool(day_items), "Q2 日桶仍有名额进 pack(不被会话桶吃光)", day_items)
|
|
59
|
+
|
|
60
|
+
days = bs._early_days(sorted(bi.all_days(g)))
|
|
61
|
+
ok("2026-05-03" in days, "Q3 早段候选池含**末日**(P16 锚点场景)", days)
|
|
62
|
+
ok("2026-04-01" in days, "Q4 早段候选池含**首日**", days)
|
|
63
|
+
|
|
64
|
+
pack = g.recall("陪爸开药", budget_tokens=4000, k=10)
|
|
65
|
+
items = pack.get("items") or pack.get("pack") or []
|
|
66
|
+
metas = [it.get("metadata") or {} for it in items]
|
|
67
|
+
bucket_metas = [m for m in metas if m.get("reason") == "bucket_scope"]
|
|
68
|
+
ok(all("state" in m and "bucket" in m for m in bucket_metas),
|
|
69
|
+
"Q5 bucket_scope 条目 metadata 结构完整", bucket_metas[:2])
|
|
70
|
+
ok(all(("fallback" in m) or ("resolved_dates" in m) or True for m in bucket_metas),
|
|
71
|
+
"Q6 resolved_dates/fallback 字段可透传(结构位已留)", [sorted(m) for m in bucket_metas][:2])
|
|
72
|
+
|
|
73
|
+
print()
|
|
74
|
+
print("全部通过" if not FAILS else "失败 %d 项" % len(FAILS))
|
|
75
|
+
return 1 if FAILS else 0
|
|
76
|
+
|
|
77
|
+
|
|
78
|
+
if __name__ == "__main__":
|
|
79
|
+
sys.exit(main())
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
"""#842 / #843 守卫:桶召回的「截断前含时间序」与「validity 透传」。"""
|
|
3
|
+
from __future__ import annotations
|
|
4
|
+
|
|
5
|
+
import os
|
|
6
|
+
import sys
|
|
7
|
+
import tempfile
|
|
8
|
+
import time
|
|
9
|
+
|
|
10
|
+
sys.stdout.reconfigure(encoding="utf-8", errors="replace")
|
|
11
|
+
_REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
12
|
+
sys.path.insert(0, _REPO)
|
|
13
|
+
|
|
14
|
+
from md_cg import bucketindex as bi # noqa: E402
|
|
15
|
+
from md_cg import bucketscope as bs # noqa: E402
|
|
16
|
+
from md_cg.mdcos import MdCGOS # noqa: E402
|
|
17
|
+
|
|
18
|
+
CCG = ('# 功能名:{n}\n# 生效条件:c\n# 子功能:s\n# 执行:e\n'
|
|
19
|
+
'# 验证方式:test\n# 不适用条件:无\n\n{body}\n')
|
|
20
|
+
FAILS = []
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
def ok(cond, name, detail=""):
|
|
24
|
+
if cond:
|
|
25
|
+
print(" PASS " + name)
|
|
26
|
+
else:
|
|
27
|
+
print(" FAIL " + name + " " + str(detail)[:160])
|
|
28
|
+
FAILS.append(name)
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
def main():
|
|
32
|
+
print("=" * 66)
|
|
33
|
+
print("#842 截断前含时间序 / #843 validity 透传")
|
|
34
|
+
print("=" * 66)
|
|
35
|
+
base = time.mktime(time.strptime("2026-11-09 09:00:00", "%Y-%m-%d %H:%M:%S"))
|
|
36
|
+
for count in (8, 9):
|
|
37
|
+
root = tempfile.mkdtemp(prefix="g842_")
|
|
38
|
+
g = MdCGOS(root, actor="test")
|
|
39
|
+
for i in range(count):
|
|
40
|
+
g.add("a%02d" % i, CCG.format(n="节点%d" % i, s="w", e=str(i), body="索引"),
|
|
41
|
+
created_at=base + i, session="s")
|
|
42
|
+
bi.build(g, write=True)
|
|
43
|
+
picked = bs.session_scope(g, "索引", "s", cap=8)
|
|
44
|
+
ids = [n.get("id") for n, _s, _q, _p in (picked or [])]
|
|
45
|
+
newest = "a%02d" % (count - 1)
|
|
46
|
+
ok(newest in ids, "#842 count=%d 时最新条 %s 仍在桶召回里" % (count, newest), ids)
|
|
47
|
+
ok(len(ids) == min(8, count), "#842 count=%d 条数=%d" % (count, len(ids)), ids)
|
|
48
|
+
|
|
49
|
+
# #843:validity=True 时桶补召回不得装回过期节点
|
|
50
|
+
root = tempfile.mkdtemp(prefix="g843_")
|
|
51
|
+
g = MdCGOS(root, actor="test")
|
|
52
|
+
now = time.time()
|
|
53
|
+
g.add("active", CCG.format(n="现行", s="w", e="1", body="阀门 合成规格 现行"),
|
|
54
|
+
created_at=now, session="s")
|
|
55
|
+
g.add("expired", CCG.format(n="过期", s="w", e="2", body="阀门 合成规格 旧版"),
|
|
56
|
+
created_at=now - 10, session="s", valid_until="2000-01-01")
|
|
57
|
+
bi.build(g, write=True)
|
|
58
|
+
pack = g.recall("阀门 合成规格", budget_tokens=4000, k=10, validity=True)
|
|
59
|
+
items = pack.get("items") or pack.get("pack") or []
|
|
60
|
+
ids = [it.get("id") for it in items]
|
|
61
|
+
ok("expired" not in ids, "#843 validity=True 不装回过期节点", ids)
|
|
62
|
+
ok("active" in ids, "#843 现行节点仍在", ids)
|
|
63
|
+
os.environ["MDCG_BUCKET_SCOPE"] = "0"
|
|
64
|
+
pack2 = g.recall("阀门 合成规格", budget_tokens=4000, k=10, validity=True)
|
|
65
|
+
ids2 = [it.get("id") for it in (pack2.get("items") or pack2.get("pack") or [])]
|
|
66
|
+
ok("expired" not in ids2, "#843 关闭桶召回时同样不含过期(对照)", ids2)
|
|
67
|
+
os.environ.pop("MDCG_BUCKET_SCOPE", None)
|
|
68
|
+
|
|
69
|
+
print()
|
|
70
|
+
print("全部通过" if not FAILS else "失败 %d 项" % len(FAILS))
|
|
71
|
+
return 1 if FAILS else 0
|
|
72
|
+
|
|
73
|
+
|
|
74
|
+
if __name__ == "__main__":
|
|
75
|
+
sys.exit(main())
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
"""三类病因并联修复守卫(外测 2026-11-11 #858 判别结果)。
|
|
3
|
+
|
|
4
|
+
① 名额:锚点在池内排第 5、日名额只有 4 → 早段意图会话配额 4→2(日桶得 6)
|
|
5
|
+
② 桶内闸:该日词表与 query 无交集 ⇒ 不补足 → 早段/两端/证据选入的桶也算「有理由」
|
|
6
|
+
③ 池生成:均匀采样漏掉有强证据的那天 → 证据前置到池生成(_early_candidates)
|
|
7
|
+
"""
|
|
8
|
+
from __future__ import annotations
|
|
9
|
+
|
|
10
|
+
import os
|
|
11
|
+
import sys
|
|
12
|
+
import tempfile
|
|
13
|
+
import time
|
|
14
|
+
|
|
15
|
+
sys.stdout.reconfigure(encoding="utf-8", errors="replace")
|
|
16
|
+
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
|
17
|
+
|
|
18
|
+
from md_cg import bucketindex as bi # noqa: E402
|
|
19
|
+
from md_cg import bucketscope as bs # noqa: E402
|
|
20
|
+
from md_cg.mdcos import MdCGOS # noqa: E402
|
|
21
|
+
|
|
22
|
+
CCG = ('# 功能名:{n}\n# 生效条件:c\n# 子功能:s\n# 执行:e\n'
|
|
23
|
+
'# 验证方式:test\n# 不适用条件:无\n\n{body}\n')
|
|
24
|
+
FAILS = []
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
def ok(cond, name, detail=""):
|
|
28
|
+
if cond:
|
|
29
|
+
print(" PASS " + name)
|
|
30
|
+
else:
|
|
31
|
+
print(" FAIL " + name + " " + str(detail)[:170])
|
|
32
|
+
FAILS.append(name)
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
def main():
|
|
36
|
+
print("=" * 66)
|
|
37
|
+
print("三类病因:名额 / 桶内闸 / 池生成")
|
|
38
|
+
print("=" * 66)
|
|
39
|
+
root = tempfile.mkdtemp(prefix="three_")
|
|
40
|
+
g = MdCGOS(root, actor="test")
|
|
41
|
+
base = time.mktime(time.strptime("2026-04-12 10:00:00", "%Y-%m-%d %H:%M:%S"))
|
|
42
|
+
N = 31
|
|
43
|
+
docs = []
|
|
44
|
+
for i in range(N):
|
|
45
|
+
ts = base + i * 86400
|
|
46
|
+
if i in (18, 28):
|
|
47
|
+
body = "江北回声 陪爸开药 替班 交换架"
|
|
48
|
+
elif i == 30:
|
|
49
|
+
body = "orphan 用户 又 到 这 个 点 了"
|
|
50
|
+
else:
|
|
51
|
+
body = "日常 闲聊 记录"
|
|
52
|
+
for j in range(3):
|
|
53
|
+
g.add("d%02d_%d" % (i, j), CCG.format(n="x", s="w", e=str(j), body=body),
|
|
54
|
+
created_at=ts, session="s%02d" % i)
|
|
55
|
+
docs.append(time.strftime("%Y-%m-%d", time.localtime(ts)))
|
|
56
|
+
bi.build(g, write=True, with_content=True)
|
|
57
|
+
now = time.mktime(time.strptime("2026-06-10 12:00:00", "%Y-%m-%d %H:%M:%S"))
|
|
58
|
+
q = "我最早陪爸开药是哪天"
|
|
59
|
+
terms = bs._terms(q)
|
|
60
|
+
|
|
61
|
+
pool = bs._early_candidates(g, sorted(bi.all_days(g)), terms)
|
|
62
|
+
ok(docs[18] in pool, "E1 ①③ 池生成含「均匀采样会漏掉但有强证据」的那天", pool[:4])
|
|
63
|
+
ok(pool[0] == docs[28] or pool[0] == docs[18],
|
|
64
|
+
"E2 证据最强的那天排池首", pool[:3])
|
|
65
|
+
ok(docs[30] in pool, "E3 无证据的末日仍靠两端兜底在池里", pool[:5])
|
|
66
|
+
|
|
67
|
+
ok(bs.SESSION_QUOTA_EARLY < bs.SESSION_QUOTA, "E4 早段意图会话配额更小(名额让给日桶)",
|
|
68
|
+
(bs.SESSION_QUOTA_EARLY, bs.SESSION_QUOTA))
|
|
69
|
+
|
|
70
|
+
picked = bs.scope_recall(g, q, session="s30", now=now, cap=8)
|
|
71
|
+
buckets = [str(qq.get("bucket")) for _n, _s, qq, _p in picked]
|
|
72
|
+
sess_n = len([b for b in buckets if b == "session"])
|
|
73
|
+
ok(sess_n <= bs.SESSION_QUOTA_EARLY, "E5 早段意图会话桶 ≤ SESSION_QUOTA_EARLY", buckets)
|
|
74
|
+
ok(any(b.endswith(docs[18]) for b in buckets), "E6 04-30 强证据日进 pack", buckets)
|
|
75
|
+
ok(any(b.endswith(docs[28]) for b in buckets), "E7 倒数第三(强证据)进 pack", buckets)
|
|
76
|
+
|
|
77
|
+
print()
|
|
78
|
+
print("全部通过" if not FAILS else "失败 %d 项" % len(FAILS))
|
|
79
|
+
return 1 if FAILS else 0
|
|
80
|
+
|
|
81
|
+
|
|
82
|
+
if __name__ == "__main__":
|
|
83
|
+
sys.exit(main())
|
|
@@ -0,0 +1,130 @@
|
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
"""日桶 / 会话桶索引守卫(bucketindex + bucketscope)。"""
|
|
3
|
+
from __future__ import annotations
|
|
4
|
+
|
|
5
|
+
import json
|
|
6
|
+
import os
|
|
7
|
+
import sys
|
|
8
|
+
import tempfile
|
|
9
|
+
import time
|
|
10
|
+
|
|
11
|
+
sys.stdout.reconfigure(encoding="utf-8", errors="replace")
|
|
12
|
+
_REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
13
|
+
sys.path.insert(0, _REPO)
|
|
14
|
+
|
|
15
|
+
from md_cg import bucketindex as bi # noqa: E402
|
|
16
|
+
from md_cg import bucketscope as bs # noqa: E402
|
|
17
|
+
from md_cg.mdcos import MdCGOS # noqa: E402
|
|
18
|
+
|
|
19
|
+
FAILS = []
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
def ok(cond, name, detail=""):
|
|
23
|
+
if cond:
|
|
24
|
+
print(" PASS " + name)
|
|
25
|
+
else:
|
|
26
|
+
print(" FAIL " + name + " " + str(detail)[:170])
|
|
27
|
+
FAILS.append(name)
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
def main():
|
|
31
|
+
print("=" * 66)
|
|
32
|
+
print("日桶 / 会话桶(bucketindex + bucketscope)")
|
|
33
|
+
print("=" * 66)
|
|
34
|
+
ts = time.mktime(time.strptime("2026-11-08 10:00:00", "%Y-%m-%d %H:%M:%S"))
|
|
35
|
+
ok(bi.day_of(ts) == "2026-11-08", "B1 day_of 解析", bi.day_of(ts))
|
|
36
|
+
ok(bi.day_of("不是时间") is None, "B1b 非法输入返回 None")
|
|
37
|
+
|
|
38
|
+
root = tempfile.mkdtemp(prefix="bi_")
|
|
39
|
+
g = MdCGOS(root, actor="test")
|
|
40
|
+
ccg = ("# 功能名:{n}\n# 生效条件:c\n# 子功能:s\n# 执行:e\n"
|
|
41
|
+
"# 验证方式:test\n# 不适用条件:无\n\n{body}\n")
|
|
42
|
+
g.add("d1", ccg.format(n="甲", s="w", e="1", body="索引 陈旧 问题"),
|
|
43
|
+
created_at=ts, session="sess_A")
|
|
44
|
+
g.add("d2", ccg.format(n="乙", s="w", e="2", body="索引 迁移 记录"),
|
|
45
|
+
created_at=ts + 3600, session="sess_A")
|
|
46
|
+
g.add("d3", ccg.format(n="丙", s="w", e="3", body="无关 内容"),
|
|
47
|
+
created_at=ts, session=None)
|
|
48
|
+
stats = bi.build(g, write=True)
|
|
49
|
+
ok(stats["nodes"] == 3 and stats["unattributed"] == 1,
|
|
50
|
+
"B2 建桶:节点数 3 且 unattributed 计 1", stats)
|
|
51
|
+
ok(os.path.exists(os.path.join(root, bi.DAYS_FILE)), "B2b _days.json 落盘")
|
|
52
|
+
ok(sorted(bi.day_ids(g, "2026-11-08")) == ["d1", "d2", "d3"],
|
|
53
|
+
"B3 日桶命中当天的 3 条", bi.day_ids(g, "2026-11-08"))
|
|
54
|
+
ok(sorted(bi.session_ids(g, "sess_A")) == ["d1", "d2"],
|
|
55
|
+
"B3b 会话桶只含该会话 2 条", bi.session_ids(g, "sess_A"))
|
|
56
|
+
|
|
57
|
+
hit = bs.day_scope(g, "索引", "2026-11-08", cap=5)
|
|
58
|
+
ok(len(hit or []) == 2, "B4 日桶召回按词面筛选(2 条含「索引」)",
|
|
59
|
+
len(hit or []))
|
|
60
|
+
ok(bs.session_scope(g, "索引", bi.UNATTRIBUTED) is None,
|
|
61
|
+
"B5 unattributed 明确拒绝(不冒充会话)")
|
|
62
|
+
ok(bs.day_scope(g, "索引", "1999-01-01") is None, "B6 不存在的桶返回 None")
|
|
63
|
+
|
|
64
|
+
r1 = bs.day_scope(g, "索引", "2026-11-08", cap=5)
|
|
65
|
+
r2 = bs.day_scope(g, "索引", "2026-11-08", cap=5)
|
|
66
|
+
ok([x[0]["id"] for x in r1] == [x[0]["id"] for x in r2], "B7 确定性")
|
|
67
|
+
ok(bs.MAX_SCAN == 800, "B8 扫描预算常量固定(快/全取舍显式)", bs.MAX_SCAN)
|
|
68
|
+
|
|
69
|
+
# ---------- 通用默认口径(使用者 2026-11-09 裁定)----------
|
|
70
|
+
base = time.mktime(time.strptime("2026-11-01 10:00:00", "%Y-%m-%d %H:%M:%S"))
|
|
71
|
+
g2 = MdCGOS(tempfile.mkdtemp(prefix="bsc_"), actor="test")
|
|
72
|
+
g2.add("s_old", ccg.format(n="本会话早", s="w", e="1", body="检索 索引 陈旧"),
|
|
73
|
+
created_at=base, session="sess_A")
|
|
74
|
+
g2.add("s_new", ccg.format(n="本会话新", s="w", e="2", body="检索 索引 修复"),
|
|
75
|
+
created_at=base + 86400 * 3, session="sess_A")
|
|
76
|
+
g2.add("d_recent", ccg.format(n="近日", s="w", e="3", body="检索 索引 迁移"),
|
|
77
|
+
created_at=base + 86400 * 5, session="sess_B")
|
|
78
|
+
g2.add("d_older", ccg.format(n="更早", s="w", e="4", body="检索 索引 回滚"),
|
|
79
|
+
created_at=base - 86400 * 5, session="sess_B")
|
|
80
|
+
bi.build(g2, write=True)
|
|
81
|
+
out = bs.scope_recall(g2, "检索 索引", "sess_A", time.time(), cap=8)
|
|
82
|
+
ids = [n["id"] for n, _s, _q, _p in out]
|
|
83
|
+
ok(ids[:2] == ["s_new", "s_old"],
|
|
84
|
+
"B9 会话桶整体优先且按时间降序", ids)
|
|
85
|
+
ok(ids[2:] == ["d_recent", "d_older"], "B10 日桶按日期倒排", ids[2:])
|
|
86
|
+
ok(bs.DEFAULT_ON is True, "B11 通用默认开启(不是可选优化)")
|
|
87
|
+
ok(all(s == 0.0 for _n, s, _q, _p in out), "B12 桶召回 score=0(不抢正排)")
|
|
88
|
+
|
|
89
|
+
os.environ.pop("MDCG_BUCKET_SCOPE", None)
|
|
90
|
+
pk = g2.recall("检索 索引", budget_tokens=4000, k=5, session="sess_A")
|
|
91
|
+
n_scope = sum(1 for e in pk["pack"]
|
|
92
|
+
if (e.get("metadata") or {}).get("reason") == "bucket_scope")
|
|
93
|
+
ok(n_scope >= 1, "B13 缺省即生效(recall 包里出现桶召回条目)", n_scope)
|
|
94
|
+
os.environ["MDCG_BUCKET_SCOPE"] = "0"
|
|
95
|
+
try:
|
|
96
|
+
pk0 = g2.recall("检索 索引", budget_tokens=4000, k=5, session="sess_A")
|
|
97
|
+
ok(sum(1 for e in pk0["pack"]
|
|
98
|
+
if (e.get("metadata") or {}).get("reason") == "bucket_scope") == 0,
|
|
99
|
+
"B14 MDCG_BUCKET_SCOPE=0 可关")
|
|
100
|
+
finally:
|
|
101
|
+
os.environ.pop("MDCG_BUCKET_SCOPE", None)
|
|
102
|
+
|
|
103
|
+
# ---------- 每日收尾自动重建 ----------
|
|
104
|
+
root3 = tempfile.mkdtemp(prefix="bia_")
|
|
105
|
+
g3 = MdCGOS(root3, actor="test")
|
|
106
|
+
g3.add("a1", ccg.format(n="甲", s="w", e="1", body="内容甲"), created_at=ts, session="s1")
|
|
107
|
+
os.environ.pop(bi.AUTO_ENV, None)
|
|
108
|
+
r1 = bi.maybe_auto_rebuild(g3, background=False)
|
|
109
|
+
ok(r1.get("rebuilt") is True and r1.get("reason") == "stale", "B15 首次(无 meta)⇒ 重建", r1)
|
|
110
|
+
ok(os.path.exists(os.path.join(root3, bi.META_FILE)), "B16 meta 落盘")
|
|
111
|
+
r2 = bi.maybe_auto_rebuild(g3, background=False)
|
|
112
|
+
ok(r2.get("rebuilt") is False and r2.get("reason") == "fresh",
|
|
113
|
+
"B17 新鲜期内不重建(每日一次而非每请求一次)", r2)
|
|
114
|
+
r3 = bi.maybe_auto_rebuild(g3, interval_h=0.0, background=False)
|
|
115
|
+
ok(r3.get("rebuilt") is True, "B18 间隔置 0 可强制(运维用)", r3)
|
|
116
|
+
os.environ[bi.AUTO_ENV] = "0"
|
|
117
|
+
try:
|
|
118
|
+
r4 = bi.maybe_auto_rebuild(g3, interval_h=0.0, background=False)
|
|
119
|
+
ok(r4.get("rebuilt") is False and r4.get("reason") == "disabled",
|
|
120
|
+
"B19 MDCG_BUCKET_AUTO=0 可关", r4)
|
|
121
|
+
finally:
|
|
122
|
+
os.environ.pop(bi.AUTO_ENV, None)
|
|
123
|
+
|
|
124
|
+
print()
|
|
125
|
+
print("bucketindex:%d 项失败" % len(FAILS) if FAILS else "bucketindex:全部通过")
|
|
126
|
+
return 1 if FAILS else 0
|
|
127
|
+
|
|
128
|
+
|
|
129
|
+
if __name__ == "__main__":
|
|
130
|
+
sys.exit(main())
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
"""早段意图守卫:query 无绝对日期且含「最早/上次/那回」时,桶序必须从**最早**扫起。
|
|
3
|
+
|
|
4
|
+
背景(2026-11-10 外测):10/17 稳定失败属「选桶为空 → 回落最近 14 天 → 3–5 个月前锚点被排除」。
|
|
5
|
+
"""
|
|
6
|
+
from __future__ import annotations
|
|
7
|
+
|
|
8
|
+
import os
|
|
9
|
+
import sys
|
|
10
|
+
import tempfile
|
|
11
|
+
import time
|
|
12
|
+
|
|
13
|
+
sys.stdout.reconfigure(encoding="utf-8", errors="replace")
|
|
14
|
+
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
|
15
|
+
|
|
16
|
+
from md_cg import bucketindex as bi # noqa: E402
|
|
17
|
+
from md_cg import bucketscope as bs # noqa: E402
|
|
18
|
+
from md_cg.mdcos import MdCGOS # noqa: E402
|
|
19
|
+
|
|
20
|
+
CCG = ('# 功能名:{n}\n# 生效条件:c\n# 子功能:s\n# 执行:e\n'
|
|
21
|
+
'# 验证方式:test\n# 不适用条件:无\n\n{body}\n')
|
|
22
|
+
FAILS = []
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
def ok(cond, name, detail=""):
|
|
26
|
+
if cond:
|
|
27
|
+
print(" PASS " + name)
|
|
28
|
+
else:
|
|
29
|
+
print(" FAIL " + name + " " + str(detail)[:170])
|
|
30
|
+
FAILS.append(name)
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
def main():
|
|
34
|
+
print("=" * 66)
|
|
35
|
+
print("早段意图(最早/上次/那回)→ 从最早的日子扫起")
|
|
36
|
+
print("=" * 66)
|
|
37
|
+
root = tempfile.mkdtemp(prefix="early_")
|
|
38
|
+
g = MdCGOS(root, actor="test")
|
|
39
|
+
# 三个月前一条(锚),最近一条(干扰)
|
|
40
|
+
old = time.mktime(time.strptime("2026-04-01 10:00:00", "%Y-%m-%d %H:%M:%S"))
|
|
41
|
+
new = time.mktime(time.strptime("2026-07-01 10:00:00", "%Y-%m-%d %H:%M:%S"))
|
|
42
|
+
g.add("n_old", CCG.format(n="老约定", s="w", e="1", body="江北回声 陪爸开药 交换架"),
|
|
43
|
+
created_at=old, session="s")
|
|
44
|
+
g.add("n_new", CCG.format(n="新事", s="w", e="2", body="江北回声 别的 琐事"),
|
|
45
|
+
created_at=new, session="s")
|
|
46
|
+
bi.build(g, write=True, with_content=True)
|
|
47
|
+
now = time.mktime(time.strptime("2026-07-10 12:00:00", "%Y-%m-%d %H:%M:%S"))
|
|
48
|
+
|
|
49
|
+
ok(bs._early_intent("我最早说陪爸开药是哪天"), "E1 「最早」被判为早段意图")
|
|
50
|
+
ok(not bs._early_intent("最近在忙什么"), "E2 普通 query 不是早段意图")
|
|
51
|
+
|
|
52
|
+
picked = bs.scope_recall(g, "江北回声那回说的是什么", session=None, now=now, cap=4)
|
|
53
|
+
ids = [n.get("id") for n, _s, _q, _p in picked]
|
|
54
|
+
ok("n_old" in ids, "E3 早段意图能召回三个月前的锚点", ids)
|
|
55
|
+
|
|
56
|
+
picked2 = bs.scope_recall(g, "最近在忙什么", session=None, now=now, cap=4)
|
|
57
|
+
ids2 = [n.get("id") for n, _s, _q, _p in picked2]
|
|
58
|
+
# 非早段意图下**不翻转顺序**:最近的排第一(老的那条可能仍被带出——
|
|
59
|
+
# 这正是「日期选对了就给内容」的兜底语义,故断言排序而不是断言缺席)。
|
|
60
|
+
# 「最近 N 天」兜底桶**不携带查询证据**,故仍严格按词面筛选(可为空);
|
|
61
|
+
# 只要它没有翻到「最早」那一桶(n_old 不该因为早段逻辑被拉出来)即符合契约。
|
|
62
|
+
ok("n_old" not in ids2,
|
|
63
|
+
"E4 非早段意图不把最早的桶拉出来(严格筛选,可为空)", ids2)
|
|
64
|
+
|
|
65
|
+
print()
|
|
66
|
+
print("全部通过" if not FAILS else "失败 %d 项" % len(FAILS))
|
|
67
|
+
return 1 if FAILS else 0
|
|
68
|
+
|
|
69
|
+
|
|
70
|
+
if __name__ == "__main__":
|
|
71
|
+
sys.exit(main())
|