Merge 05a968d into 804f95b

genomehubs · Mar 23, 2021 · 4491916 · 4491916
2 parents 804f95b + 05a968d
commit 4491916
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/src/genomehubs/lib/fill.py b/src/genomehubs/lib/fill.py
@@ -323,10 +323,14 @@ def track_missing_attribute_values(
         for child_id, obj in missing_attributes[node["_source"]["taxon_id"]].items():
             for key, attribute in attr_dict.items():
                 if key in obj["keys"]:
-                    # update aggregation source here
-                    # TODO: #51 include ancestral rank in aggregation source
+                    # update aggregation source to include ancestral rank
                     obj["attributes"].append(
-                        {**attribute, "aggregation_source": "ancestor"}
+                        {
+                            **attribute,
+                            "aggregation_source": "ancestor",
+                            "aggregation_rank": node["_source"]["taxon_rank"],
+                            "aggregation_taxon_id": node["_source"]["taxon_id"],
+                        }
                     )
                     obj["keys"].remove(key)
             if obj["keys"]:

diff --git a/src/genomehubs/templates/taxon.json b/src/genomehubs/templates/taxon.json
@@ -280,6 +280,22 @@
               "description": "Summary source (direct, ancestor, descendant)"
             }
           },
+          "aggregation_rank": {
+            "type": "keyword",
+            "ignore_above": 16,
+            "normalizer": "lowercase",
+            "meta": {
+              "description": "Source rank for ancestor derived values"
+            }
+          },
+          "aggregation_taxon_id": {
+            "type": "keyword",
+            "ignore_above": 16,
+            "normalizer": "lowercase",
+            "meta": {
+              "description": "Source taxon_id for ancestor derived values"
+            }
+          },
           "comment": {
             "type": "text",
             "index": false