From 2bc13cf82615ef70e9b7adc5633da93e366bdb67 Mon Sep 17 00:00:00 2001 From: Lisa-Ann B <115558393+libpitt@users.noreply.github.com> Date: Tue, 4 Aug 2026 11:09:19 -0400 Subject: [PATCH 1/2] Add constraint for uberon code - #977 --- src/lib/constraints/sample.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lib/constraints/sample.py b/src/lib/constraints/sample.py index cd2a69b3..2979bb10 100644 --- a/src/lib/constraints/sample.py +++ b/src/lib/constraints/sample.py @@ -18,6 +18,12 @@ def build_sample_organ_constraints(entity, constraints=None): descendant = build_constraint_unit(Entities.SAMPLE, [SpecimenCategories.SUSPENSION]) constraints.append(build_constraint(ancestor, [descendant])) + # Sample suspension ---> Sample organ of blood (organ_uberon) + ancestor = build_constraint_unit( + entity, [SpecimenCategories.ORGAN], [Ontology.ops(as_data_dict=True, val_key='organ_uberon').organ_types()['BLOOD']] + ) + constraints.append(build_constraint(ancestor, [descendant])) + # Sample block ---> Sample organ ancestor = build_constraint_unit(entity, [SpecimenCategories.ORGAN]) descendant = build_constraint_unit(Entities.SAMPLE, [SpecimenCategories.BLOCK]) From 237896bd9124e12109d9498f07f169d212ac6b13 Mon Sep 17 00:00:00 2001 From: Lisa-Ann B <115558393+libpitt@users.noreply.github.com> Date: Tue, 4 Aug 2026 11:15:06 -0400 Subject: [PATCH 2/2] No need to retun as dict - #977 --- src/lib/constraints/sample.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/constraints/sample.py b/src/lib/constraints/sample.py index 2979bb10..84342843 100644 --- a/src/lib/constraints/sample.py +++ b/src/lib/constraints/sample.py @@ -20,7 +20,7 @@ def build_sample_organ_constraints(entity, constraints=None): # Sample suspension ---> Sample organ of blood (organ_uberon) ancestor = build_constraint_unit( - entity, [SpecimenCategories.ORGAN], [Ontology.ops(as_data_dict=True, val_key='organ_uberon').organ_types()['BLOOD']] + entity, [SpecimenCategories.ORGAN], [Ontology.ops(val_key='organ_uberon').organ_types().BLOOD] ) constraints.append(build_constraint(ancestor, [descendant]))