missed a few things

ave-dcd · Jul 25, 2024 · ecb923b · ecb923b
1 parent f9b0556
commit ecb923b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/dcd_mapping/annotate.py b/src/dcd_mapping/annotate.py
@@ -229,7 +229,7 @@ def _get_vrs_1_3_haplotype_id(cpb: CisPhasedBlock) -> str:
     ]
     serialized_allele_ids = ",".join([f'"{a_id}"' for a_id in allele_ids])
     serialized_haplotype = f'{{"members":[{serialized_allele_ids}],"type":"Haplotype"}}'
-    return sha512t24u(serialized_haplotype.encode("ascii"))
+    return f"ga4gh:VH.{sha512t24u(serialized_haplotype.encode("ascii"))}"
 
 
 def _annotate_cpb_mapping(
@@ -274,7 +274,7 @@ def _annotate_cpb_mapping(
     pre_mapped.extensions = [
         Extension(name="vrs_v1.3_id", value=_get_vrs_1_3_haplotype_id(pre_mapped))
     ]
-    post_mapped.mappings = [
+    post_mapped.extensions = [
         Extension(name="vrs_v1.3_id", value=_get_vrs_1_3_haplotype_id(post_mapped))
     ]
 

diff --git a/src/dcd_mapping/schemas.py b/src/dcd_mapping/schemas.py
@@ -154,8 +154,8 @@ class ScoreAnnotation(BaseModel):
     This model defines what an individual mapping instance looks like in the final JSON.
     """
 
-    pre_mapped: Allele | CisPhasedBlock
-    post_mapped: Allele | CisPhasedBlock
+    pre_mapped: CisPhasedBlock | Allele
+    post_mapped: CisPhasedBlock | Allele
     mavedb_id: StrictStr
     relation: Literal["SO:is_homologous_to"] = "SO:is_homologous_to"
     score: float | None