diff --git a/tests/test_score2.py b/tests/test_score2.py index cda022e..0d19492 100644 --- a/tests/test_score2.py +++ b/tests/test_score2.py @@ -14,7 +14,7 @@ ("test__output__patient_26.json", (50.00, 6.31, "High")), ], ) -def test_phenoage(filename, expected): +def test_score2(filename, expected): # Get the actual fixture value using request.getfixturevalue age, pred_risk, pred_risk_category = compute.cardiovascular_risk(OUT_FILEPATH / filename) expected_age, expected_risk, expected_category = expected diff --git a/vitals/biomarkers/helpers.py b/vitals/biomarkers/helpers.py index 7029503..6c0fd9c 100755 --- a/vitals/biomarkers/helpers.py +++ b/vitals/biomarkers/helpers.py @@ -1,8 +1,9 @@ from typing import TypeVar -import schemas from pydantic import BaseModel +from vitals.biomarkers import schemas + Biomarkers = TypeVar("Biomarkers", bound=BaseModel) Units = schemas.PhenoageUnits | schemas.Score2Units diff --git a/vitals/biomarkers/io.py b/vitals/biomarkers/io.py index f9ed937..8858e1b 100755 --- a/vitals/biomarkers/io.py +++ b/vitals/biomarkers/io.py @@ -1,7 +1,7 @@ import json from pathlib import Path -import helpers +from vitals.biomarkers import helpers def update(input_file: Path) -> dict: diff --git a/vitals/phenoage/compute.py b/vitals/phenoage/compute.py index eb404ad..5397876 100755 --- a/vitals/phenoage/compute.py +++ b/vitals/phenoage/compute.py @@ -1,7 +1,8 @@ import numpy as np -from biomarkers import helpers, schemas from pydantic import BaseModel +from vitals.biomarkers import helpers, schemas + class LinearModel(BaseModel): """ diff --git a/vitals/score2/compute.py b/vitals/score2/compute.py index 457e08d..107d227 100644 --- a/vitals/score2/compute.py +++ b/vitals/score2/compute.py @@ -6,9 +6,10 @@ """ import numpy as np -from biomarkers import helpers, schemas from pydantic import BaseModel +from vitals.biomarkers import helpers, schemas + class ModelCoefficients(BaseModel): """