fix(anatomy): R5.4 report guard as an allowlist (report_guard.rs), sweep of 762 probes incl. seeded random strings, NUL refused in field segments
This commit is contained in:
1 parent
077d91bdff
commit
124d954a0d
10 files changed
+246
-195
No files matched your search
@@ -15,7 +15,8 @@ use faunosteo_core::curation::draft::migration_map::{
|
||||
use faunosteo_core::curation::draft::review_report::{ReviewReportInput, render_review_report};
|
||||
use faunosteo_core::curation::draft::stats::document_stats;
|
||||
use faunosteo_core::curation::draft::{apply_changeset, parse_changeset, parse_references};
|
||||
use faunosteo_core::curation::markdown::format_markdown;
|
||||
use faunosteo_core::curation::ids::sha256_hex;
|
||||
use faunosteo_core::curation::report_guard::format_report;
|
||||
use faunosteo_core::json::to_js_compact;
|
||||
use serde_json::{Value, json};
|
||||
|
||||
@@ -69,9 +70,11 @@ const EQUINE_SAFE: &str = "[]&#{}=<>\"':;()/%?-.,«»…≠°—+";
|
||||
fn equine_safe(probe: &str) -> bool {
|
||||
// A leading or trailing space becomes two spaces once the probe sits in its sentence; the
|
||||
// inline constructs (links, wiki links, autolinks, character references) are probed apart.
|
||||
let construct = ["](", "][", "[[", "&", "<h", "<a@"]
|
||||
.iter()
|
||||
.any(|m| probe.contains(m));
|
||||
let tag = probe
|
||||
.split('<')
|
||||
.skip(1)
|
||||
.any(|after| after.starts_with(|c: char| c.is_ascii_alphabetic() || "/!?".contains(c)));
|
||||
let construct = tag || ["](", "][", "[[ ", "&"].iter().any(|m| probe.contains(m));
|
||||
!construct
|
||||
&& !probe.contains(" ")
|
||||
&& !probe.starts_with(' ')
|
||||
@@ -88,32 +91,26 @@ fn every_probe_is_formatted_as_the_typescript_or_refused() {
|
||||
for case in frozen["cases"].as_array().unwrap() {
|
||||
let probe = case["probe"].as_str().unwrap();
|
||||
let (changelog, review) = raw_reports(&frozen, case);
|
||||
let digest = |text: &str| sha256_hex(text.as_bytes());
|
||||
assert_eq!(
|
||||
changelog,
|
||||
case["changelog_raw"].as_str().unwrap(),
|
||||
digest(&changelog),
|
||||
case["changelog_raw_sha256"],
|
||||
"{probe:?} raw"
|
||||
);
|
||||
if let Ok(review) = &review {
|
||||
assert_eq!(
|
||||
review,
|
||||
case["review_raw"].as_str().unwrap(),
|
||||
"{probe:?} raw"
|
||||
);
|
||||
assert_eq!(digest(review), case["review_raw_sha256"], "{probe:?} raw");
|
||||
}
|
||||
let outcomes = [
|
||||
(format_report(&changelog), &case["changelog_sha256"]),
|
||||
(
|
||||
format_markdown(&changelog),
|
||||
case["changelog"].as_str().unwrap(),
|
||||
),
|
||||
(
|
||||
review.and_then(|text| format_markdown(&text)),
|
||||
case["review"].as_str().unwrap(),
|
||||
review.and_then(|text| format_report(&text)),
|
||||
&case["review_sha256"],
|
||||
),
|
||||
];
|
||||
let mut case_refused = false;
|
||||
for (outcome, expected) in outcomes {
|
||||
match outcome {
|
||||
Ok(text) if text == expected => {}
|
||||
Ok(text) if digest(&text) == *expected => {}
|
||||
Ok(_) => silent.push(probe.to_owned()),
|
||||
Err(PipelineError::UnsupportedMarkdown(_) | PipelineError::UnsupportedWidth(_)) => {
|
||||
case_refused = true;
|
||||
@@ -137,6 +134,6 @@ fn every_probe_is_formatted_as_the_typescript_or_refused() {
|
||||
"silent differences for {} probes: {silent:?}",
|
||||
silent.len()
|
||||
);
|
||||
assert_eq!(same + refused, 247);
|
||||
assert_eq!(same + refused, 762);
|
||||
println!("{same} identical, {refused} refused");
|
||||
}
|
||||
@@ -27,8 +27,8 @@ use faunosteo_core::curation::legacy::types::Anomaly;
|
||||
use faunosteo_core::curation::legacy::{
|
||||
EquineLegacyInput, HEAD_VIEW_ID, ImportResult, SvgSource, import_equine_legacy,
|
||||
};
|
||||
use faunosteo_core::curation::markdown::format_markdown;
|
||||
use faunosteo_core::curation::prettier_json::format_json;
|
||||
use faunosteo_core::curation::report_guard::format_report;
|
||||
use faunosteo_core::domain::sheet::AnatomicalSheetDocument;
|
||||
use faunosteo_core::json::to_js_compact;
|
||||
use serde_json::{Map, Value};
|
||||
@@ -174,7 +174,7 @@ fn the_raw_reports_are_the_texts_prettier_received() {
|
||||
row["before_prettier_sha256"],
|
||||
"{file} raw"
|
||||
);
|
||||
let formatted = format_markdown(&raw).unwrap();
|
||||
let formatted = format_report(&raw).unwrap();
|
||||
assert_eq!(
|
||||
sha256_hex(formatted.as_bytes()),
|
||||
row["sha256"],
|
||||
@@ -326,8 +326,8 @@ fn render_case(frozen: &Value, case: &Value) -> Rendered {
|
||||
drawings.insert(format!("app-{}", view.id()), Value::from(app));
|
||||
}
|
||||
Rendered {
|
||||
changelog: format_markdown(&changelog_raw),
|
||||
review: format_markdown(&review_raw),
|
||||
changelog: format_report(&changelog_raw),
|
||||
review: format_report(&review_raw),
|
||||
changelog_raw,
|
||||
review_raw,
|
||||
drawings,
|
||||
@@ -355,7 +355,10 @@ fn the_synthetic_review_cases_match_the_typescript_or_are_refused_as_declared()
|
||||
if DECLARED_REFUSALS.contains(&name) {
|
||||
let refused = rendered.changelog.unwrap_err();
|
||||
assert!(
|
||||
matches!(refused, PipelineError::UnsupportedWidth(_)),
|
||||
matches!(
|
||||
refused,
|
||||
PipelineError::UnsupportedWidth(_) | PipelineError::UnsupportedMarkdown(_)
|
||||
),
|
||||
"{name}"
|
||||
);
|
||||
continue;
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"baseline":{"schema_version":2,"species_id":"equine","name":{"fr":"Mini","en":"Mini"},"description":{},"scope_disclaimer":{},"attribution":{"authors":[],"license":null,"notes":null},"vertebral_config":{"regions":[{"code":"C","name":{"fr":"Cervicales","en":"Cervical"},"count":7},{"code":"T","name":{"fr":"Thoraciques","en":"Thoracic"},"count":18}]},"references":[],"categories":[{"id":"joints","name":{"fr":"Articulations","en":"Joints"},"color":null},{"id":"bones","name":{"fr":"Os","en":"Bones"},"color":null}],"views":[{"id":"main","kind":"main","name":{"fr":"Vue","en":"View"},"svg_asset_id":"3f6c1b52-8a4e-4d17-9b0c-5e2a7d91c4f8","view_box":null},{"id":"head","kind":"detail","parent_view_id":"main","name":{"fr":"Tête","en":"Head"},"svg_asset_id":null,"view_box":{"min_x":0,"min_y":0,"width":10,"height":10}}],"annotations":[{"id":"hip","kind":"point","view_id":"main","category_id":"joints","laterality":"bilateral","geometry":{"type":"circle","cx":1,"cy":2,"r":3},"name":{"fr":"Hanche","en":"Hip"},"finding_zone_id":"hip","vertebral_region_code":null},{"id":"neck","kind":"zone","view_id":"main","category_id":"bones","laterality":"unpaired","geometry":null,"name":{"fr":"Cou","en":"Neck"},"finding_zone_id":"neck","vertebral_region_code":"C"},{"id":"head-trigger","kind":"detail_trigger","view_id":"main","category_id":"bones","laterality":"unpaired","geometry":null,"name":null,"opens_view_id":"head"}],"finding_zones":[{"id":"hip","name":{"fr":"Hanche","en":"Hip"},"categories":[{"id":"hip-dysfunctions","kind":"dysfunction","name":{"fr":"Dysfonctions","en":"Dysfunctions"},"children":[{"id":"mobility","name":{"fr":"mobility fr","en":"mobility en"},"children":[{"id":"flexion","name":{"fr":"flexion fr","en":"flexion en"}},{"id":"extension","name":{"fr":"extension fr","en":"extension en"}}]},{"id":"pain","name":{"fr":"pain fr","en":"pain en"}}]},{"id":"anamnesis","kind":"anamnesis","name":{"fr":"Anamnèse","en":"Anamnesis"},"children":[{"id":"trauma","name":{"fr":"trauma fr","en":"trauma en"}}]}]},{"id":"neck","name":{"fr":"Cou","en":"Neck"},"categories":[{"id":"neck-dysfunctions","kind":"dysfunction","name":{"fr":"Dysfonctions","en":"Dysfunctions"},"children":[{"id":"stiffness","name":{"fr":"stiffness fr","en":"stiffness en"}},{"id":"vet","name":{"fr":"vet fr","en":"vet en"},"requires_vet_referral":true}]}]}]},"references":[{"id":"atlas","type":"book","citation":"Atlas of anatomy","url":null,"doi":null},{"id":"paper","type":"journal","citation":"A paper","url":null,"doi":"10.1/x"}],"legacy_id_map":{"views":{"head":"head"},"annotations":{"legacy-hip":"hip","legacy-neck":"neck"},"categories":{},"finding_nodes":{},"assets":{}},"cases":[{"probe":"*","changes_file":{"changes":[{"id":"CHG-001","level":"C","kind":"correction","title":{"fr":"Titre *","en":"Title"},"rationale":"Raison * fin.","reference_ids":[],"question":"Question * ?","ops":[{"op":"add","target":"document","field":"references","value":{"id":"probe-ref","type":"web","citation":"Citation *","url":null,"doi":null}},{"op":"cite","target":"finding:hip/hip-dysfunctions/mobility","reference_ids":["probe-ref"]},{"op":"set","target":"finding:hip/hip-dysfunctions/mobility","field":"name.en","value":"Label *"}]}]},"changelog_raw":"# Journal des changements : révision de travail\n\nGénéré par `pnpm import:equine` : import historique (`legacy-import/`) puis changements rédigés (`curation/changes.json`). Ne pas modifier à la main : relancer la commande.\n\nNiveaux : A = erreur démontrée, B = amélioration étayée, C = point incertain. Les niveaux B et C demandent une confirmation professionnelle.\n\n## Comparaison quantitative\n\n| Indicateur | Avant | Après |\n| --- | --- | --- |\n| Vues | 2 | 2 |\n| Dessins SVG distincts | 1 | 1 |\n| Annotations | 3 | 3 |\n| Annotations (point) | 1 | 1 |\n| Annotations (zone) | 1 | 1 |\n| Annotations (detail_trigger) | 1 | 1 |\n| Annotations, revue (inherited) | 3 | 3 |\n| Annotations, revue (reviewed) | 0 | 0 |\n| Annotations, revue (to_confirm) | 0 | 0 |\n| Catégories d'annotation | 2 | 2 |\n| Zones de constats | 2 | 2 |\n| Catégories de constats | 3 | 3 |\n| Nœuds (catégories incluses) | 10 | 10 |\n| Feuilles | 6 | 6 |\n| Renvois vétérinaires | 1 | 1 |\n| Nœuds, revue (inherited) | 10 | 9 |\n| Nœuds, revue (reviewed) | 0 | 0 |\n| Nœuds, revue (to_confirm) | 0 | 1 |\n| Descriptions | 0 | 0 |\n| Descriptions en français seulement | 0 | 0 |\n| Références bibliographiques | 0 | 3 |\n| Nœuds cités | 0 | 1 |\n| Régions vertébrales avec plage documentée | 0 | 0 |\n\n## Migration des bilans v2\n\n| Nœuds | Nombre |\n| --- | --- |\n| Nœuds du catalogue historique | 10 |\n| Chemin identique | 10 |\n| Chemin renommé ou déplacé (suivi des renommages) | 0 |\n| Relogé sous une autre catégorie (correspondance unique) | 0 |\n| Retiré : le bilan garde le constat avec ses libellés figés | 0 |\n\n## Niveau A : erreurs démontrées\n\nAucun changement de ce niveau.\n\n## Niveau B : améliorations étayées (confirmatioLine truncated
|
||||
{"baseline":{"schema_version":2,"species_id":"equine","name":{"fr":"Mini","en":"Mini"},"description":{},"scope_disclaimer":{},"attribution":{"authors":[],"license":null,"notes":null},"vertebral_config":{"regions":[{"code":"C","name":{"fr":"Cervicales","en":"Cervical"},"count":7},{"code":"T","name":{"fr":"Thoraciques","en":"Thoracic"},"count":18}]},"references":[],"categories":[{"id":"joints","name":{"fr":"Articulations","en":"Joints"},"color":null},{"id":"bones","name":{"fr":"Os","en":"Bones"},"color":null}],"views":[{"id":"main","kind":"main","name":{"fr":"Vue","en":"View"},"svg_asset_id":"3f6c1b52-8a4e-4d17-9b0c-5e2a7d91c4f8","view_box":null},{"id":"head","kind":"detail","parent_view_id":"main","name":{"fr":"Tête","en":"Head"},"svg_asset_id":null,"view_box":{"min_x":0,"min_y":0,"width":10,"height":10}}],"annotations":[{"id":"hip","kind":"point","view_id":"main","category_id":"joints","laterality":"bilateral","geometry":{"type":"circle","cx":1,"cy":2,"r":3},"name":{"fr":"Hanche","en":"Hip"},"finding_zone_id":"hip","vertebral_region_code":null},{"id":"neck","kind":"zone","view_id":"main","category_id":"bones","laterality":"unpaired","geometry":null,"name":{"fr":"Cou","en":"Neck"},"finding_zone_id":"neck","vertebral_region_code":"C"},{"id":"head-trigger","kind":"detail_trigger","view_id":"main","category_id":"bones","laterality":"unpaired","geometry":null,"name":null,"opens_view_id":"head"}],"finding_zones":[{"id":"hip","name":{"fr":"Hanche","en":"Hip"},"categories":[{"id":"hip-dysfunctions","kind":"dysfunction","name":{"fr":"Dysfonctions","en":"Dysfunctions"},"children":[{"id":"mobility","name":{"fr":"mobility fr","en":"mobility en"},"children":[{"id":"flexion","name":{"fr":"flexion fr","en":"flexion en"}},{"id":"extension","name":{"fr":"extension fr","en":"extension en"}}]},{"id":"pain","name":{"fr":"pain fr","en":"pain en"}}]},{"id":"anamnesis","kind":"anamnesis","name":{"fr":"Anamnèse","en":"Anamnesis"},"children":[{"id":"trauma","name":{"fr":"trauma fr","en":"trauma en"}}]}]},{"id":"neck","name":{"fr":"Cou","en":"Neck"},"categories":[{"id":"neck-dysfunctions","kind":"dysfunction","name":{"fr":"Dysfonctions","en":"Dysfunctions"},"children":[{"id":"stiffness","name":{"fr":"stiffness fr","en":"stiffness en"}},{"id":"vet","name":{"fr":"vet fr","en":"vet en"},"requires_vet_referral":true}]}]}]},"references":[{"id":"atlas","type":"book","citation":"Atlas of anatomy","url":null,"doi":null},{"id":"paper","type":"journal","citation":"A paper","url":null,"doi":"10.1/x"}],"legacy_id_map":{"views":{"head":"head"},"annotations":{"legacy-hip":"hip","legacy-neck":"neck"},"categories":{},"finding_nodes":{},"assets":{}},"cases":[{"probe":"*","changes_file":{"changes":[{"id":"CHG-001","level":"C","kind":"correction","title":{"fr":"Titre *","en":"Title"},"rationale":"Raison * fin.","reference_ids":[],"question":"Question * ?","ops":[{"op":"add","target":"document","field":"references","value":{"id":"probe-ref","type":"web","citation":"Citation *","url":null,"doi":null}},{"op":"cite","target":"finding:hip/hip-dysfunctions/mobility","reference_ids":["probe-ref"]},{"op":"set","target":"finding:hip/hip-dysfunctions/mobility","field":"name.en","value":"Label *"},{"op":"set","target":"finding:hip/hip-dysfunctions/mobility/flexion","field":"name.fr","value":"*"}]}]},"changelog_raw_sha256":"55b992587e03e05c2b98e81e7c644aa852713084183a89cd2651b61f0e922cbb","changelog_sha256":"1e21c6e4509109bba34c869cf8df77f838e69cfdc85df203a71917b1cd25cca7","review_raw_sha256":"3f289d6d2f18fef8f99ea375703603f2b0f1076063f7440a7554ed081b1f63aa","review_sha256":"2fef9ccf08ff9e38ff59e7ca7b6fa4966e8f4ddea9188c666276adb0c59f41db"},{"probe":"*x","changes_file":{"changes":[{"id":"CHG-001","level":"C","kind":"correction","title":{"fr":"Titre *x","en":"Title"},"rationale":"Raison *x fin.","reference_ids":[],"question":"Question *x ?","ops":[{"op":"add","target":"document","field":"references","value":{"id":"probe-ref","type":"web","citation":"Citation *x","url":null,"doi":null}},{"op":"cite","target":"finding:hip/hip-dysfunctions/mobility","reference_ids":["probe-ref"]},{"op":"set","target":"finding:hip/hip-dysfunctions/mobility","field":"name.en","value":"Label *x"},{"op":"set","target":"finding:hip/hip-dysfunctions/mobility/flexion","field":"name.fr","value":"*x"}]}]},"changelog_raw_sha256":"bcb9602df19f1a01322e79fb099fd4031f40c3863ecf904daf6e107ceec9f8a6","changelog_sha256":"23d0c545ce56bc949d88d6ad5d99104aba582f851fc8f8689901cc57d9400399","review_raw_sha256":"cff4115989dd4c411d94893c5b1a19333169b53fd0a6c4dd668ba771f7e97332","review_sha256":"382d3968e4d03960e4cca33109a06b6af0db8cc53b8aec01cf940004ab91755e"},{"probe":"x*","changes_file":{"changes":[{"id":"CHG-001","level":"C","kind":"correction","title":{"fr":"Titre x*","en":"Title"},"rationale":"Raison x* fin.","reference_ids":[],"question":"Question x* ?","ops":[{"op":"add","target":"document","field":"references","value":{"id":"probe-ref","type":"web","citation":"Citation x*","url":null,"doi":null}}Line truncated
|
||||
Reference in new issue
Block a user