change VARITY and MutationTaster mappings

biothings · Oct 28, 2023 · 8c3483f · 8c3483f
1 parent a8a27fc
commit 8c3483f
Showing 1 changed file with 36 additions and 30 deletions.
diff --git a/src/hub/dataload/sources/dbnsfp/dbnsfp_mapping_44a_v1.py b/src/hub/dataload/sources/dbnsfp/dbnsfp_mapping_44a_v1.py
@@ -206,15 +206,19 @@
             },
             "mutationtaster": {
                 "properties": {
-                    **score_field,
                     **converted_rankscore_field,
-                    **pred_field,
-                    "model": {
-                        "type": "keyword",
-                        "normalizer": "keyword_lowercase_normalizer"
-                    },
-                    "aae": {
-                        "type": "text"
+                    "analysis": {  # see prune_mutation_taster()
+                        "properties": {
+                            **pred_field,
+                            **score_field,
+                            "model": {
+                                "type": "keyword",
+                                "normalizer": "keyword_lowercase_normalizer"
+                            },
+                            "aae": {
+                                "type": "text"
+                            }
+                        }
                     }
                 }
             },
@@ -370,28 +374,30 @@
                     **pred_field
                 }
             },
-            "varity_r": {
-                "properties": {
-                    **score_field,
-                    **rankscore_field
-                }
-            },
-            "varity_er": {
-                "properties": {
-                    **score_field,
-                    **rankscore_field
-                }
-            },
-            "varity_r_loo": {
-                "properties": {
-                    **score_field,
-                    **rankscore_field
-                }
-            },
-            "varity_er_loo": {
-                "properties": {
-                    **score_field,
-                    **rankscore_field
+            "varity": {
+                "r": {
+                    "properties": {
+                        **score_field,
+                        **rankscore_field
+                    }
+                },
+                "er": {
+                    "properties": {
+                        **score_field,
+                        **rankscore_field
+                    }
+                },
+                "r_loo": {
+                    "properties": {
+                        **score_field,
+                        **rankscore_field
+                    }
+                },
+                "er_loo": {
+                    "properties": {
+                        **score_field,
+                        **rankscore_field
+                    }
                 }
             },
             "aloft": {