Merge pull request #16 from ihmeuw/feature/rmbarber/microsoft-v8-update

v8 building dataset

Author: rmbarber

src/rra_population_model/constants.py

@@ -27,7 +27,7 @@ def to_list(cls) -> list[str]:
 
 class BuiltVersion(BaseModel):
     provider: Literal["ghsl", "microsoft"]
-    version: Literal["v7_1", "v7_1_d", "v7_1_h", "r2023a"]
+    version: Literal["v7_1", "v8", "r2023a"]
     time_points: list[str]
     measures: list[str]
 
@@ -72,22 +72,33 @@ def time_points_float(self) -> list[float]:
             "height",
         ],
     ),
-    "microsoft_v7_1_d": BuiltVersion(
+    "microsoft_v8": BuiltVersion(
         provider="microsoft",
-        version="v7_1_d",
+        version="v8",
         time_points=[
-            f"{y}q{q}" for y, q in itertools.product(range(2020, 2025), range(1, 5))
-        ][1:-2],
-        measures=["density"],
-    ),
-    "microsoft_v7_1_h": BuiltVersion(
-        provider="microsoft",
-        version="v7_1_h",
-        time_points=[
-            f"{y}q{q}" for y, q in itertools.product(range(2020, 2025), range(1, 5))
+            f"{y}q{q}" for y, q in itertools.product(range(2020, 2026), range(1, 5))
         ][1:-2],
-        measures=["height"],
+        measures=[
+            "density",
+            "height",
+        ],
     ),
+    # "microsoft_v7_1_d": BuiltVersion(
+    #     provider="microsoft",
+    #     version="v7_1_d",
+    #     time_points=[
+    #         f"{y}q{q}" for y, q in itertools.product(range(2020, 2025), range(1, 5))
+    #     ][1:-2],
+    #     measures=["density"],
+    # ),
+    # "microsoft_v7_1_h": BuiltVersion(
+    #     provider="microsoft",
+    #     version="v7_1_h",
+    #     time_points=[
+    #         f"{y}q{q}" for y, q in itertools.product(range(2020, 2025), range(1, 5))
+    #     ][1:-2],
+    #     measures=["height"],
+    # ),
 }
 
 DENOMINATORS = []

src/rra_population_model/model_prep/features/built.py

@@ -290,6 +290,12 @@ def _generate_microsoft_derived_measures(
             "p_residential": "ghsl_r2023a_proportion_residential",
             "reference_density": "ghsl_r2023a_density",
         },
+        "microsoft_v8": {
+            "density": "microsoft_v8_density",
+            "height": "microsoft_v8_height",
+            "p_residential": "ghsl_r2023a_proportion_residential",
+            "reference_density": "ghsl_r2023a_density",
+        },
     }[built_version_name]
     density = pm_data.load_feature(
         feature_name=feature_dict["density"],

src/rra_population_model/model_prep/features/runner.py

@@ -20,12 +20,12 @@
     '40': [
         pmc.BUILT_VERSIONS["ghsl_r2023a"],
         pmc.BUILT_VERSIONS["microsoft_v7_1"],
-        pmc.BUILT_VERSIONS["microsoft_v7_1_d"],
-        pmc.BUILT_VERSIONS["microsoft_v7_1_h"],
+        pmc.BUILT_VERSIONS["microsoft_v8"],
     ],
     '100': [
         pmc.BUILT_VERSIONS["ghsl_r2023a"],
         pmc.BUILT_VERSIONS["microsoft_v7_1"],
+        pmc.BUILT_VERSIONS["microsoft_v8"],
     ],
 }