Gulum
df13136955
god maintains tools/import/conflict-decisions.json as Julian/his wife answer the D-conflicts. extract.py now consumes it (apply_conflict_decisions): for an animal matching normalize(name)+dob, it clears the conflict, marks resolvedByDecision, and — when the decision carries a `genotype` (breeder notation, parsed via genotype.py) and/or `farbschlag` — treats those as AUTHORITATIVE. Tolerates a missing/empty/garbled file. Genuinely-unresolved conflicts stay quarantined. Loader (ImportService): SourceAnimal.ResolvedByDecision flows through; the report surfaces Animals.ConflictsResolvedByDecision + a German note. Result on real data: the 2 current decisions (Firefly D-/PP, WildFire PP) un-quarantine → Konflikte 21 → 19. As god appends entries the count grows; nothing else needed from me. Tests: python test_extract (decision clears conflict + genotype authoritative + removes from conflicts list + tolerates missing file) and a C# loader test (a resolved animal loads and is counted). Folded into the EXTRACT-BANDS branch so the next re-extract applies band-aware Farbschlag + these decisions in one pass. No schema change (JSON DTO fields). python + dotnet 121/121 green; has-pending clean. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
GerbilManager import tooling (FEAT-8b)
One-off migration tooling (Python, no third-party deps) that turns Julian's wife's hand-built spreadsheets into normalised JSON for review and, later, import. This is not product code — it lives outside the app and is run manually.
See the format analysis in FEAT-8a-format-spec.md (Pam's hive workspace).
What it does
extract.py runs stages 1–2 of the pipeline:
- Extract (stage 1)
- 10 Stammbaum pedigree charts → animals (name, DOB, death, Farbschlag, genotype, breeder, positionally-reconstructed parent links, photos).
- Wurfchronik litter chronicle → litters (date, dam, sire, Wurfstärke, sex breakdown, Zuchtnummer, notes). Columns are read by header row because the two sheets use different schemas.
- Embedded photos (
xl/media) →output/photos/<animal-slug>/, mapped to the animal by drawing anchor position.
- Dedup + review (stage 2)
- Merge animals on
normalise(call-name) + DOB, with the Zucht as discriminator (Julian's ruling: Wurfchronik[brackets]≡ Stammbaumof/von <line>suffix — both are the breeding line; same name+DOB but different Zucht stays two animals). - Match animals onto Wurfchronik litters (
litterRef) via DOB + (Vater, Mutter) — the Pam-validated build order (chronicle litters are canonical). - Emit a German-language
output/review-report.mdfor the breeder to verify (merges, conflicts, ambiguous/incomplete entries, unmapped genotype tokens, litter data-quality warnings). - Nothing is loaded into the database — stage 3 (API load) is separate and waits on DATA-2 + FEAT-1b phase 2.
- Merge animals on
Wurfchronik column semantics (Julian, authoritative)
A Wurfbezeichnung · B Geburtsdatum · C Mutter · D Vater ([…] = Zucht,
& = multiple sires) · E survivedToGoHome (Tabelle1 only, unlabeled —
detected positionally) · F Wurfstärke → totalBorn · G breakdown
Männchen,Weibchen,TG,s → males/females/stillborn/diedLater (s = died
after birth, before Abgabe) · last column → note. Validation: E should
equal F − TG − s; mismatches become German warnings in the review report
(data-quality signal, not an import blocker). A few Tabelle2 rows shift these
columns — they are read value-adaptively and flagged with a warning.
Genotypes are mapped to the frozen 8-locus contract (A C D E G P Sp Re) while
preserving everything: genotype.mapped8locus, genotype.rawGenotype (verbatim),
genotype.unmappedTokens (e.g. the Uw locus, markers WFNZ/WP/DP). A -
(unknown second allele) maps to ?.
Run
cd tools/import
python extract.py # uses the default source paths
python extract.py --stammbaeume "<dir>" --wurfchronik "<file.xlsx>"
Requires Python 3. Re-runnable / idempotent — re-run when more files arrive
(Wurfchronik Teil2+, or new charts).
Output (tools/import/output/, git-ignored except the report)
| File | Contents |
|---|---|
animals.json |
deduped animals with genotype, parentRefs, photos, sourceFiles |
litters.json |
litters from the Wurfchronik |
photos/<slug>/… |
extracted, anchor-mapped images |
review-report.md |
human review deliverable (committed) |
Files
xlsx_util.py— dependency-free.xlsxreader (zip + XML): shared strings, cells by reference, image/drawing anchors.genotype.py— genotype notation parser → 8-locus mapping + raw + unmapped.extract.py— the pipeline (stages 1–2).