Merge branch 'jstone-dev/variant-search' into feature/bencap/311/clin…

…var-control-ingestion
VariantEffect · Jan 30, 2025 · 622ba56 · 622ba56
2 parents 21f8669 + a582d6e
commit 622ba56
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/mavedb/routers/variants.py b/src/mavedb/routers/variants.py
@@ -12,7 +12,7 @@
 from mavedb.lib.logging.context import logging_context, save_to_logging_context
 from mavedb.models.score_set import ScoreSet
 from mavedb.models.variant import Variant
-from mavedb.view_models.variant import ClingenAlleleIdVariantLookupsRequest, VariantWithShortScoreSet
+from mavedb.view_models.variant import ClingenAlleleIdVariantLookupsRequest, VariantWithScoreSet, VariantWithShortScoreSet
 
 router = APIRouter(
     prefix="/api/v1", tags=["access keys"], responses={404: {"description": "Not found"}}, route_class=LoggedRoute
@@ -49,7 +49,7 @@ def lookup_variants(
 @router.post(
     "/variants/{urn}",
     status_code=200,
-    response_model=VariantWithShortScoreSet,
+    response_model=VariantWithScoreSet,
     responses={404: {}, 500: {}},
     response_model_exclude_none=True,
 )

diff --git a/src/mavedb/view_models/variant.py b/src/mavedb/view_models/variant.py
@@ -72,6 +72,12 @@ class VariantWithMappedVariant(SavedVariantWithMappedVariant):
     mapped_variant: Optional[MappedVariant]
 
 
+class VariantWithScoreSet(SavedVariant):
+    """Variant view model with mapped variants and score set"""
+    score_set: "ScoreSet"
+    mapped_variants: list[MappedVariant]
+
+
 class VariantWithShortScoreSet(SavedVariant):
     """Variant view model with mapped variants and a limited set of score set details"""
 
@@ -86,6 +92,7 @@ class ClingenAlleleIdVariantLookupsRequest(BaseModel):
 
 
 # ruff: noqa: E402
-from mavedb.view_models.score_set import ShortScoreSet
+from mavedb.view_models.score_set import ScoreSet, ShortScoreSet
 
+VariantWithScoreSet.update_forward_refs()
 VariantWithShortScoreSet.update_forward_refs()