update structure

ihmeuw · Feb 20, 2024 · 3089abd · 3089abd
1 parent 940580d
commit 3089abd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/vivarium_inputs/core.py b/src/vivarium_inputs/core.py
@@ -496,8 +496,8 @@ def get_utilization_rate(entity: HealthcareEntity, location_id: int) -> pd.DataF
     return data
 
 
-def get_structure(entity: Population, location_id: int) -> pd.DataFrame:
-    data = extract.extract_data(entity, "structure", location_id)
+def get_structure(entity: Population, location_id: int, get_all_years: bool = False) -> pd.DataFrame:
+    data = extract.extract_data(entity, "structure", location_id, validate=True, get_all_years=get_all_years)
     data = data.drop("run_id", axis="columns").rename(columns={"population": "value"})
     data = utilities.normalize(data)
     return data

diff --git a/src/vivarium_inputs/extract.py b/src/vivarium_inputs/extract.py
@@ -286,8 +286,8 @@ def extract_utilization_rate(entity: HealthcareEntity, location_id: int) -> pd.D
     return data
 
 
-def extract_structure(entity: Population, location_id: int) -> pd.DataFrame:
-    data = gbd.get_population(location_id)
+def extract_structure(entity: Population, location_id: int, get_all_years: bool = False) -> pd.DataFrame:
+    data = gbd.get_population(location_id, get_all_years)
     return data