iomgaa/CADx-4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(review): 核对包改成医生读得懂；资料库超声一路只留给 agent 的参数

Browse Source 
- ceus：灌注指标改为对病灶去暗区（roi_perf）和紫圈（roi_pan）两组算，roi_all 指标删除；
  D1–D4 仍要 roi_all、roi_perf 两条都过才定位（负责人 2026-10-17：医生要正常区与病灶对比看）
- build/library：tic.json 只出两组 11 个指标与 7 个槽位的视频时间；医生截图挪进
  ultrasound/keyframes/key.png，UltrasoundRoute 去掉 key_image、keyframes 多一个 key
- review：TIC参数.csv 取代 TIC结果.csv；问题清单按原因对照表写成大白话，对照表外的原因报错；
  程序原文进 snapshot/问题清单_原文.csv；说明.pdf 整份重写为合作者口吻
- 文档：结构.md、医生核对包、装配两个库、CEUS定量

任务书 04。

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
iomgaa
2026-10-17 10:22:15 -04:00
parent 77ee03f9a3
commit 7e7f32a13d
19 changed files with 2111 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_build_ceus.py
+183 -86
View File
@@ -1,8 +1,9 @@
"""build 装入 CEUS 结果：C15 跳过、tic.json 只有白名单字段、关键帧去附加数据、运行目录不合规时停下。
预期的 tic.json 键集合照任务书 02 第四阶段的文字手写：四条曲线各自拟合是否成功和拟合优度（R²）；
病灶两条曲线的灌注指标（同旧 replay summary 的 perfusion_metrics 段）；紫圈曲线是否可用；
7 个槽位各自是否定位到、定位到的视频时间、未定位的原因。
tic.json 的预期内容照任务书 04 第二部分手写：紫圈（`roi_pan`）和病灶去暗区（`roi_perf`）两组各
11 个灌注指标（拟合没过整组为 null，单项算不出为 null），7 个槽位定位到的视频时间（没取到为
null），此外什么都没有。超声一路的文件是 report.txt、tic.json 和 keyframes/ 下的 key.png 加定位到
的槽位。
"""
import csv
@@ -17,33 +18,13 @@ from PIL import Image
from cadx.answers import read_aliases
from cadx.build import BuildSummary, run_build
from cadx.library import list_aliases, read_ultrasound, scan_for_leaks
from fake_ceus_run import UNLOCATED_REASON, summary, write_run
from fake_ceus_run import perfusion, summary, write_run
from fake_delivery import REPO_ROOT, make_delivery, write_config
NOW = datetime(2026, 10, 16, 11, 0, 0).astimezone()
RUN_ID = "20261016-100000-abcdef0"
LOCATED = ("D1", "D2", "F1")
_PERFUSION_KEYS = {
"signal_domain",
"time_origin",
"area_curve",
"values",
"supporting_times_s",
}
_PERFUSION_VALUES = {
"PE_au",
"WiAUC_au_s",
"RT_s",
"mTTl_s",
"TTP_s",
"WiR_au_per_s",
"WiPI_au",
"WoAUC_au_s",
"WiWoAUC_au_s",
"FT_s",
"WoR_au_per_s",
}
ALL_SLOTS = ("B0", "D1", "D2", "D3", "D4", "F1", "F2")
def _build(tmp_path: Path, count: int, run_dir: Path) -> BuildSummary:
@@ -66,13 +47,6 @@ def _png_chunks(data: bytes) -> list[str]:
return chunks
def _key_tree(node: Any) -> Any:
"""嵌套字典的键结构：字典换成「键 → 子结构」，其余值换成 None。"""
if isinstance(node, dict):
return {key: _key_tree(value) for key, value in cast(dict[str, Any], node).items()}
return None
def test_c15_skips_failed_and_missing_cases(tmp_path: Path) -> None:
run = write_run(
tmp_path / "runs" / RUN_ID,
@@ -95,39 +69,173 @@ def test_c15_skips_failed_and_missing_cases(tmp_path: Path) -> None:
assert manifest["ceus_source"] == RUN_ID
def test_tic_json_has_exactly_the_listed_fields(tmp_path: Path) -> None:
result = _build(
tmp_path,
1,
write_run(tmp_path / "runs" / RUN_ID, tmp_path / "delivery", {"U001": LOCATED}, []),
)
(alias,) = list_aliases(result.library_dir)
tic = read_ultrasound(result.library_dir, alias).tic
perfusion = {
**dict.fromkeys(_PERFUSION_KEYS - {"values", "supporting_times_s"}),
"values": dict.fromkeys(_PERFUSION_VALUES),
"supporting_times_s": dict.fromkeys(("TI", "mTT", "TO")),
}
slot = {"located": None, "video_time_s": None, "reason": None}
curves = ("roi_all", "roi_perf", "roi_pan", "background_circle")
assert _key_tree(tic) == {
"fits": {name: {"success": None, "r2": None} for name in curves},
"perfusion_metrics": {"roi_all": perfusion, "roi_perf": None},
"pan_curve_usable": None,
"keyframes": {s: slot for s in ("B0", "D1", "D2", "D3", "D4", "F1", "F2")},
}
assert tic is not None
assert tic["fits"]["roi_all"] == {"success": True, "r2": 0.93}
assert tic["fits"]["roi_pan"] == {"success": False, "r2": None}
assert tic["pan_curve_usable"] is False
assert tic["perfusion_metrics"]["roi_all"]["values"]["PE_au"] == 1.0
# 假数据里 D1 是第 2 个槽位：视频时间 1 × 2.5 秒。
assert tic["keyframes"]["D1"] == {"located": True, "video_time_s": 2.5, "reason": None}
assert tic["keyframes"]["D4"] == {
"located": False,
"video_time_s": None,
"reason": UNLOCATED_REASON,
}
# 四例各自定位到的槽位和 summary.json 的改法：
# - U001：紫圈、病灶去暗区两组都有（紫圈 = perfusion(10.0)），7 个槽位都取到；
# - U002：只有病灶去暗区一组（假运行的原样），其中 WoAUC、FT 两项算不出；只取到 D1、D2、F1；
# - U003：两组都 null（病灶两条曲线拟合都没过，紫圈不可用）；只取到 F1、F2；
# - U004：只有紫圈一组，其中 RT 一项算不出；F2 没取到。
_CASE_SLOTS: dict[str, tuple[str, ...]] = {
"U001": ALL_SLOTS,
"U002": LOCATED,
"U003": ("F1", "F2"),
"U004": ("B0", "D1", "D2", "D3", "D4", "F1"),
}
def _both_groups(content: dict[str, Any]) -> None:
content["reference_valid"] = True
content["fits"]["roi_pan"].update(success=True, failure_reason=None)
content["perfusion_metrics"]["roi_pan"] = perfusion(10.0)
def _perf_items_missing(content: dict[str, Any]) -> None:
values = content["perfusion_metrics"]["roi_perf"]["values"]
values["WoAUC_au_s"] = None
values["FT_s"] = None
def _no_groups(content: dict[str, Any]) -> None:
for curve in ("roi_all", "roi_perf"):
content["fits"][curve].update(success=False, failure_reason="credible_peak_not_found")
content["lesion_fit_ready"] = False
content["perfusion_metrics"]["roi_perf"] = None
def _pan_only(content: dict[str, Any]) -> None:
_both_groups(content)
content["fits"]["roi_perf"].update(success=False, failure_reason="parameter_on_boundary")
content["lesion_fit_ready"] = False
content["perfusion_metrics"]["roi_perf"] = None
content["perfusion_metrics"]["roi_pan"]["values"]["RT_s"] = None
_EDITS = {"U001": _both_groups, "U002": _perf_items_missing, "U003": _no_groups, "U004": _pan_only}
_PAN = {
"PE_au": 10.0,
"WiAUC_au_s": 20.0,
"RT_s": 30.0,
"mTTl_s": 40.0,
"TTP_s": 50.0,
"WiR_au_per_s": 60.0,
"WiPI_au": 70.0,
"WoAUC_au_s": 80.0,
"WiWoAUC_au_s": 90.0,
"FT_s": 100.0,
"WoR_au_per_s": 110.0,
}
_PERF = {
"PE_au": 1.0,
"WiAUC_au_s": 2.0,
"RT_s": 3.0,
"mTTl_s": 4.0,
"TTP_s": 5.0,
"WiR_au_per_s": 6.0,
"WiPI_au": 7.0,
"WoAUC_au_s": 8.0,
"WiWoAUC_au_s": 9.0,
"FT_s": 10.0,
"WoR_au_per_s": 11.0,
}
# 假运行里定位到的槽位，视频时间 = 槽位序号 × 2.5 秒。
_ALL_TIMES = {"B0": 0.0, "D1": 2.5, "D2": 5.0, "D3": 7.5, "D4": 10.0, "F1": 12.5, "F2": 15.0}
EXPECTED_TIC = {
"U001": {
"perfusion_metrics": {"roi_pan": _PAN, "roi_perf": _PERF},
"keyframe_times_s": _ALL_TIMES,
},
"U002": {
"perfusion_metrics": {
"roi_pan": None,
"roi_perf": {**_PERF, "WoAUC_au_s": None, "FT_s": None},
},
"keyframe_times_s": {
"B0": None,
"D1": 2.5,
"D2": 5.0,
"D3": None,
"D4": None,
"F1": 12.5,
"F2": None,
},
},
"U003": {
"perfusion_metrics": {"roi_pan": None, "roi_perf": None},
"keyframe_times_s": {
"B0": None,
"D1": None,
"D2": None,
"D3": None,
"D4": None,
"F1": 12.5,
"F2": 15.0,
},
},
"U004": {
"perfusion_metrics": {"roi_pan": {**_PAN, "RT_s": None}, "roi_perf": None},
"keyframe_times_s": {**_ALL_TIMES, "F2": None},
},
}
_FORBIDDEN_TIC_KEYS = {
"fits",
"r2",
"success",
"roi_all",
"background_circle",
"reason",
"pan_curve_usable",
}
@pytest.fixture
def four_cases(tmp_path: Path) -> BuildSummary:
run = write_run(tmp_path / "runs" / RUN_ID, tmp_path / "delivery", _CASE_SLOTS, [])
for video_id, located in _CASE_SLOTS.items():
content = summary(video_id, located)
_EDITS[video_id](content)
(run / video_id / "summary.json").write_text(json.dumps(content), encoding="utf-8")
return _build(tmp_path, 4, run)
def _all_keys(node: object) -> set[str]:
if isinstance(node, dict):
items = cast(dict[str, Any], node)
return set(items) | {k for value in items.values() for k in _all_keys(value)}
return set()
def test_tic_json_is_exactly_the_agent_parameters(four_cases: BuildSummary) -> None:
by_video = {r.video_id: r.alias for r in read_aliases(four_cases.answers_dir)}
assert sorted(by_video) == sorted(EXPECTED_TIC)
for video_id, expected in EXPECTED_TIC.items():
tic_path = four_cases.library_dir / "cases" / by_video[video_id] / "ultrasound" / "tic.json"
assert json.loads(tic_path.read_text(encoding="utf-8")) == expected, video_id
assert read_ultrasound(four_cases.library_dir, by_video[video_id]).tic == expected
def test_tic_json_has_no_internal_keys(four_cases: BuildSummary) -> None:
for alias in list_aliases(four_cases.library_dir):
tic_path = four_cases.library_dir / "cases" / alias / "ultrasound" / "tic.json"
tic = json.loads(tic_path.read_text(encoding="utf-8"))
assert _all_keys(tic) & _FORBIDDEN_TIC_KEYS == set()
def test_ultrasound_files_are_exactly_report_tic_and_keyframes(
tmp_path: Path, four_cases: BuildSummary
) -> None:
for row in read_aliases(four_cases.answers_dir):
folder = four_cases.library_dir / "cases" / row.alias / "ultrasound"
files = sorted(p.relative_to(folder).as_posix() for p in folder.rglob("*") if p.is_file())
slots = [f"keyframes/{slot}.png" for slot in _CASE_SLOTS[row.video_id]]
assert files == sorted(["report.txt", "tic.json", "keyframes/key.png", *slots])
source = tmp_path / "delivery" / "CEUS_agent" / row.case_no / f"U{row.case_no}_key.png"
with Image.open(source) as original, Image.open(folder / "keyframes" / "key.png") as copy:
assert copy.mode == original.mode and copy.size == original.size
assert copy.tobytes() == original.tobytes()
route = read_ultrasound(four_cases.library_dir, row.alias)
assert route.keyframes["key"] == folder / "keyframes" / "key.png"
assert sorted(route.keyframes) == sorted(["key", *_CASE_SLOTS[row.video_id]])
def test_keyframes_metadata_dropped_and_pixels_kept(tmp_path: Path) -> None:
@@ -135,8 +243,9 @@ def test_keyframes_metadata_dropped_and_pixels_kept(tmp_path: Path) -> None:
result = _build(tmp_path, 1, run)
(alias,) = list_aliases(result.library_dir)
route = read_ultrasound(result.library_dir, alias)
assert sorted(route.keyframes) == sorted(LOCATED)
for slot, copied in route.keyframes.items():
assert sorted(route.keyframes) == sorted(["key", *LOCATED])
for slot in LOCATED:
copied = route.keyframes[slot]
assert (
copied == result.library_dir / "cases" / alias / "ultrasound/keyframes" / f"{slot}.png"
)
@@ -149,18 +258,16 @@ def test_keyframes_metadata_dropped_and_pixels_kept(tmp_path: Path) -> None:
assert _png_chunks(copied.read_bytes()) == ["IHDR", "IDAT", "IEND"]
def test_null_ceus_run_has_no_ceus_files(tmp_path: Path) -> None:
def test_null_ceus_run_has_only_key_image_in_keyframes(tmp_path: Path) -> None:
root = make_delivery(2).write(tmp_path / "delivery")
result = run_build(write_config(tmp_path, root, 1, None, None), REPO_ROOT, NOW)
for alias in list_aliases(result.library_dir):
route = read_ultrasound(result.library_dir, alias)
assert route.tic is None and route.keyframes == {}
assert sorted(
p.name for p in (result.library_dir / "cases" / alias / "ultrasound").iterdir()
) == [
"key.png",
"report.txt",
]
folder = result.library_dir / "cases" / alias / "ultrasound"
assert route.tic is None
assert route.keyframes == {"key": folder / "keyframes" / "key.png"}
files = sorted(p.relative_to(folder).as_posix() for p in folder.rglob("*") if p.is_file())
assert files == ["keyframes/key.png", "report.txt"]
def test_scan_finds_nothing_then_hits_video_id_in_tic_json(tmp_path: Path) -> None:
@@ -173,22 +280,12 @@ def test_scan_finds_nothing_then_hits_video_id_in_tic_json(tmp_path: Path) -> No
alias = list_aliases(result.library_dir)[0]
tic_path = result.library_dir / "cases" / alias / "ultrasound" / "tic.json"
tic = json.loads(tic_path.read_text(encoding="utf-8"))
tic["keyframes"]["D4"]["reason"] = "见 U002 第 3 帧"
tic["keyframe_times_s"]["D4"] = "见 U002 第 3 帧"
tic_path.write_text(json.dumps(tic, ensure_ascii=False), encoding="utf-8")
hits = scan_for_leaks(result.library_dir, forbidden, ("name",))
assert [(Path(h.file).name, h.kind, h.term) for h in hits] == [("tic.json", "字符串", "U002")]
def test_reason_with_video_id_stops_build(tmp_path: Path) -> None:
run = write_run(tmp_path / "runs" / RUN_ID, tmp_path / "delivery", {"U001": LOCATED}, [])
content = summary("U001", LOCATED)
content["anchor_frames"]["D4"]["reason"] = "U001 的 D4 不在视频里"
(run / "U001" / "summary.json").write_text(json.dumps(content), encoding="utf-8")
with pytest.raises(ValueError, match="视频号或路径"):
_build(tmp_path, 1, run)
assert not (tmp_path / "library").exists()
def test_keyframe_that_cannot_be_reencoded_skips_case_as_c14(tmp_path: Path) -> None:
run = write_run(
tmp_path / "runs" / RUN_ID, tmp_path / "delivery", {"U001": LOCATED, "U002": LOCATED}, []