hestia-earth-models 0.74.16__py3-none-any.whl → 0.75.0__py3-none-any.whl

hestia_earth/models/__init__.py

@@ -1,3 +0,0 @@
-from pkgutil import extend_path
-
-__path__ = extend_path(__path__, __name__)

hestia_earth/models/ipcc2019/burning_utils.py

@@ -0,0 +1,37 @@
+from enum import Enum
+
+
+class FuelCategory(Enum):
+    """
+    Natural vegetation fuel categories from IPCC (2019).
+    """
+    BOREAL_FOREST = "boreal-forest"
+    DRAINED_EXTRATROPICAL_ORGANIC_SOILS_WILDFIRE = "drained-extratropical-organic-soils-wildfire"
+    DRAINED_TROPICAL_ORGANIC_SOILS_WILDFIRE = "drained-tropical-organic-soils-wildfire"
+    EUCALYPT_FOREST = "eucalypt-forest"
+    NATURAL_TROPICAL_FOREST = "natural-tropical-forest"  # mean of primary and secondary tropical forest
+    PEATLAND_VEGETATION = "peatland-vegetation"
+    PRIMARY_TROPICAL_FOREST = "primary-tropical-forest"
+    SAVANNA_GRASSLAND_EARLY_DRY_SEASON_BURNS = "savanna-grassland-early-dry-season-burns"
+    SAVANNA_GRASSLAND_MID_TO_LATE_DRY_SEASON_BURNS = "savanna-grassland-mid-to-late-dry-season-burns"
+    SAVANNA_WOODLAND_EARLY_DRY_SEASON_BURNS = "savanna-woodland-early-dry-season-burns"
+    SAVANNA_WOODLAND_MID_TO_LATE_DRY_SEASON_BURNS = "savanna-woodland-mid-to-late-dry-season-burns"
+    SECONDARY_TROPICAL_FOREST = "secondary-tropical-forest"
+    SHRUBLAND = "shrubland"
+    TEMPERATE_FOREST = "temperate-forest"
+    TERTIARY_TROPICAL_FOREST = "tertiary-tropical-forest"
+    TROPICAL_ORGANIC_SOILS_PRESCRIBED_FIRE = "tropical-organic-soils-prescribed-fire"
+    TUNDRA = "tundra"
+    UNDRAINED_EXTRATROPICAL_ORGANIC_SOILS_WILDFIRE = "undrained-extratropical-organic-soils-wildfire"
+    UNKNOWN_TROPICAL_FOREST = "unknown-tropical-forest"  # mean of primary, secondary and tertiary tropical forest
+
+
+class EmissionCategory(Enum):
+    """
+    Natural vegetation burning emission categories from IPCC (2019).
+    """
+    AGRICULTURAL_RESIDUES = "agricultural-residues"
+    BIOFUEL_BURNING = "biofuel-burning"
+    OTHER_FOREST = "other-forest"
+    SAVANNA_AND_GRASSLAND = "savanna-and-grassland"
+    TROPICAL_FOREST = "tropical-forest"

hestia_earth/models/ipcc2019/nonCo2EmissionsToAirNaturalVegetationBurning.py

@@ -19,9 +19,12 @@ from hestia_earth.models.utils.ecoClimateZone import EcoClimateZone, get_eco_cli
 from hestia_earth.models.utils.emission import _new_emission
 from hestia_earth.models.utils.lookup import get_region_lookup_value
 from hestia_earth.models.utils.site import related_cycles
+from hestia_earth.models.utils.term import get_lookup_value
 
 from . import MODEL
 from .biomass_utils import BiomassCategory, get_valid_management_nodes, summarise_land_cover_nodes
+from .burning_utils import EmissionCategory, FuelCategory
+
 
 REQUIREMENTS = {
     "Cycle": {
@@ -55,9 +58,17 @@ REQUIREMENTS = {
     }
 }
 LOOKUPS = {
-    "emissionToAirNaturalVegetationBurning_emissionCategory_gEmittedPerKgDryMatterCombusted": [
-        "IPCC_2019_G_EMITTED_PER_KG_DRY_MATTER_COMBUSTED_{EMISSION_CATEGORY}_value",
-        "IPCC_2019_G_EMITTED_PER_KG_DRY_MATTER_COMBUSTED_{EMISSION_CATEGORY}_sd"
+    "emission": [
+        "IPCC_2019_G_EMITTED_PER_KG_DRY_MATTER_COMBUSTED_BOREAL_FOREST_sd",
+        "IPCC_2019_G_EMITTED_PER_KG_DRY_MATTER_COMBUSTED_BOREAL_FOREST_value",
+        "IPCC_2019_G_EMITTED_PER_KG_DRY_MATTER_COMBUSTED_NATURAL_TROPICAL_FOREST_sd",
+        "IPCC_2019_G_EMITTED_PER_KG_DRY_MATTER_COMBUSTED_NATURAL_TROPICAL_FOREST_value",
+        "IPCC_2019_G_EMITTED_PER_KG_DRY_MATTER_COMBUSTED_TEMPERATE_FOREST_sd",
+        "IPCC_2019_G_EMITTED_PER_KG_DRY_MATTER_COMBUSTED_TEMPERATE_FOREST_value",
+        "IPCC_2019_G_EMITTED_PER_KG_DRY_MATTER_COMBUSTED_TERTIARY_TROPICAL_FOREST_sd",
+        "IPCC_2019_G_EMITTED_PER_KG_DRY_MATTER_COMBUSTED_TERTIARY_TROPICAL_FOREST_value",
+        "IPCC_2019_G_EMITTED_PER_KG_DRY_MATTER_COMBUSTED_UNKNOWN_TROPICAL_FOREST_sd",
+        "IPCC_2019_G_EMITTED_PER_KG_DRY_MATTER_COMBUSTED_UNKNOWN_TROPICAL_FOREST_value"
     ],
     "ipcc2019FuelCategory_tonnesDryMatterCombustedPerHaBurned": "value",
     "landCover": "BIOMASS_CATEGORY",
@@ -95,36 +106,6 @@ _DEFAULT_FACTOR = {"value": 0}
 _DEFAULT_PERCENT_BURNED = 0
 
 
-class _FuelCategory(Enum):
-    """
-    Natural vegetation fuel categories from IPCC (2019).
-    """
-    BOREAL_FOREST = "boreal-forest"
-    EUCALYPT_FOREST = "eucalypt-forest"
-    NATURAL_TROPICAL_FOREST = "natural-tropical-forest"  # mean of primary and secondary tropical forest
-    PRIMARY_TROPICAL_FOREST = "primary-tropical-forest"
-    SAVANNA_GRASSLAND_EARLY_DRY_SEASON_BURNS = "savanna-grassland-early-dry-season-burns"
-    SAVANNA_GRASSLAND_MID_TO_LATE_DRY_SEASON_BURNS = "savanna-grassland-mid-to-late-dry-season-burns"
-    SAVANNA_WOODLAND_EARLY_DRY_SEASON_BURNS = "savanna-woodland-early-dry-season-burns"
-    SAVANNA_WOODLAND_MID_TO_LATE_DRY_SEASON_BURNS = "savanna-woodland-mid-to-late-dry-season-burns"
-    SECONDARY_TROPICAL_FOREST = "secondary-tropical-forest"
-    SHRUBLAND = "shrubland"
-    TEMPERATE_FOREST = "temperate-forest"
-    TERTIARY_TROPICAL_FOREST = "tertiary-tropical-forest"
-    UNKNOWN_TROPICAL_FOREST = "unknown-tropical-forest"  # mean of primary, secondary and tertiary tropical forest
-
-
-class _EmissionCategory(Enum):
-    """
-    Natural vegetation burning emission categories from IPCC (2019).
-    """
-    AGRICULTURAL_RESIDUES = "agricultural-residues"
-    BIOFUEL_BURNING = "biofuel-burning"
-    OTHER_FOREST = "other-forest"
-    SAVANNA_AND_GRASSLAND = "savanna-and-grassland"
-    TROPICAL_FOREST = "tropical-forest"
-
-
 _EmissionTermId = Literal[
     "ch4ToAirNaturalVegetationBurning",
     "coToAirNaturalVegetationBurning",
@@ -136,7 +117,7 @@ _EmissionTermId = Literal[
 class _InventoryYear(TypedDict, total=False):
     biomass_category_summary: dict[BiomassCategory, float]
     natural_vegetation_delta: dict[BiomassCategory, float]
-    fuel_burnt_per_category: dict[_FuelCategory, npt.NDArray]
+    fuel_burnt_per_category: dict[FuelCategory, npt.NDArray]
     annual_emissions: dict[_EmissionTermId, npt.NDArray]
     amortised_emissions: dict[_EmissionTermId, npt.NDArray]
     share_of_emissions: dict[str, float]  # {cycle_id (str): value, ...}
@@ -161,40 +142,40 @@ _Inventory = dict[int, _InventoryYear]
 
 _BIOMASS_CATEGORY_TO_FUEL_CATEGORY = {
     BiomassCategory.FOREST: {
-        EcoClimateZone.WARM_TEMPERATE_MOIST: _FuelCategory.TEMPERATE_FOREST,
-        EcoClimateZone.WARM_TEMPERATE_DRY: _FuelCategory.TEMPERATE_FOREST,
-        EcoClimateZone.COOL_TEMPERATE_MOIST: _FuelCategory.TEMPERATE_FOREST,
-        EcoClimateZone.COOL_TEMPERATE_DRY: _FuelCategory.TEMPERATE_FOREST,
-        EcoClimateZone.BOREAL_MOIST: _FuelCategory.BOREAL_FOREST,
-        EcoClimateZone.BOREAL_DRY: _FuelCategory.BOREAL_FOREST,
-        EcoClimateZone.TROPICAL_MONTANE: _FuelCategory.UNKNOWN_TROPICAL_FOREST,
-        EcoClimateZone.TROPICAL_WET: _FuelCategory.UNKNOWN_TROPICAL_FOREST,
-        EcoClimateZone.TROPICAL_MOIST: _FuelCategory.UNKNOWN_TROPICAL_FOREST,
-        EcoClimateZone.TROPICAL_DRY: _FuelCategory.UNKNOWN_TROPICAL_FOREST
+        EcoClimateZone.WARM_TEMPERATE_MOIST: FuelCategory.TEMPERATE_FOREST,
+        EcoClimateZone.WARM_TEMPERATE_DRY: FuelCategory.TEMPERATE_FOREST,
+        EcoClimateZone.COOL_TEMPERATE_MOIST: FuelCategory.TEMPERATE_FOREST,
+        EcoClimateZone.COOL_TEMPERATE_DRY: FuelCategory.TEMPERATE_FOREST,
+        EcoClimateZone.BOREAL_MOIST: FuelCategory.BOREAL_FOREST,
+        EcoClimateZone.BOREAL_DRY: FuelCategory.BOREAL_FOREST,
+        EcoClimateZone.TROPICAL_MONTANE: FuelCategory.UNKNOWN_TROPICAL_FOREST,
+        EcoClimateZone.TROPICAL_WET: FuelCategory.UNKNOWN_TROPICAL_FOREST,
+        EcoClimateZone.TROPICAL_MOIST: FuelCategory.UNKNOWN_TROPICAL_FOREST,
+        EcoClimateZone.TROPICAL_DRY: FuelCategory.UNKNOWN_TROPICAL_FOREST
     },
     BiomassCategory.NATURAL_FOREST: {
-        EcoClimateZone.WARM_TEMPERATE_MOIST: _FuelCategory.TEMPERATE_FOREST,
-        EcoClimateZone.WARM_TEMPERATE_DRY: _FuelCategory.TEMPERATE_FOREST,
-        EcoClimateZone.COOL_TEMPERATE_MOIST: _FuelCategory.TEMPERATE_FOREST,
-        EcoClimateZone.COOL_TEMPERATE_DRY: _FuelCategory.TEMPERATE_FOREST,
-        EcoClimateZone.BOREAL_MOIST: _FuelCategory.BOREAL_FOREST,
-        EcoClimateZone.BOREAL_DRY: _FuelCategory.BOREAL_FOREST,
-        EcoClimateZone.TROPICAL_MONTANE: _FuelCategory.NATURAL_TROPICAL_FOREST,
-        EcoClimateZone.TROPICAL_WET: _FuelCategory.NATURAL_TROPICAL_FOREST,
-        EcoClimateZone.TROPICAL_MOIST: _FuelCategory.NATURAL_TROPICAL_FOREST,
-        EcoClimateZone.TROPICAL_DRY: _FuelCategory.NATURAL_TROPICAL_FOREST
+        EcoClimateZone.WARM_TEMPERATE_MOIST: FuelCategory.TEMPERATE_FOREST,
+        EcoClimateZone.WARM_TEMPERATE_DRY: FuelCategory.TEMPERATE_FOREST,
+        EcoClimateZone.COOL_TEMPERATE_MOIST: FuelCategory.TEMPERATE_FOREST,
+        EcoClimateZone.COOL_TEMPERATE_DRY: FuelCategory.TEMPERATE_FOREST,
+        EcoClimateZone.BOREAL_MOIST: FuelCategory.BOREAL_FOREST,
+        EcoClimateZone.BOREAL_DRY: FuelCategory.BOREAL_FOREST,
+        EcoClimateZone.TROPICAL_MONTANE: FuelCategory.NATURAL_TROPICAL_FOREST,
+        EcoClimateZone.TROPICAL_WET: FuelCategory.NATURAL_TROPICAL_FOREST,
+        EcoClimateZone.TROPICAL_MOIST: FuelCategory.NATURAL_TROPICAL_FOREST,
+        EcoClimateZone.TROPICAL_DRY: FuelCategory.NATURAL_TROPICAL_FOREST
     },
     BiomassCategory.PLANTATION_FOREST: {
-        EcoClimateZone.WARM_TEMPERATE_MOIST: _FuelCategory.TEMPERATE_FOREST,
-        EcoClimateZone.WARM_TEMPERATE_DRY: _FuelCategory.TEMPERATE_FOREST,
-        EcoClimateZone.COOL_TEMPERATE_MOIST: _FuelCategory.TEMPERATE_FOREST,
-        EcoClimateZone.COOL_TEMPERATE_DRY: _FuelCategory.TEMPERATE_FOREST,
-        EcoClimateZone.BOREAL_MOIST: _FuelCategory.BOREAL_FOREST,
-        EcoClimateZone.BOREAL_DRY: _FuelCategory.BOREAL_FOREST,
-        EcoClimateZone.TROPICAL_MONTANE: _FuelCategory.TERTIARY_TROPICAL_FOREST,
-        EcoClimateZone.TROPICAL_WET: _FuelCategory.TERTIARY_TROPICAL_FOREST,
-        EcoClimateZone.TROPICAL_MOIST: _FuelCategory.TERTIARY_TROPICAL_FOREST,
-        EcoClimateZone.TROPICAL_DRY: _FuelCategory.TERTIARY_TROPICAL_FOREST
+        EcoClimateZone.WARM_TEMPERATE_MOIST: FuelCategory.TEMPERATE_FOREST,
+        EcoClimateZone.WARM_TEMPERATE_DRY: FuelCategory.TEMPERATE_FOREST,
+        EcoClimateZone.COOL_TEMPERATE_MOIST: FuelCategory.TEMPERATE_FOREST,
+        EcoClimateZone.COOL_TEMPERATE_DRY: FuelCategory.TEMPERATE_FOREST,
+        EcoClimateZone.BOREAL_MOIST: FuelCategory.BOREAL_FOREST,
+        EcoClimateZone.BOREAL_DRY: FuelCategory.BOREAL_FOREST,
+        EcoClimateZone.TROPICAL_MONTANE: FuelCategory.TERTIARY_TROPICAL_FOREST,
+        EcoClimateZone.TROPICAL_WET: FuelCategory.TERTIARY_TROPICAL_FOREST,
+        EcoClimateZone.TROPICAL_MOIST: FuelCategory.TERTIARY_TROPICAL_FOREST,
+        EcoClimateZone.TROPICAL_DRY: FuelCategory.TERTIARY_TROPICAL_FOREST
     }
 }
 """
@@ -202,26 +183,26 @@ Mapping from IPCC biomass category and eco-climate zone to natural vegetation fu
 """
 
 _FUEL_CATEGORY_TO_EMISSION_CATEGORY = {
-    _FuelCategory.BOREAL_FOREST: _EmissionCategory.OTHER_FOREST,
-    _FuelCategory.EUCALYPT_FOREST: _EmissionCategory.OTHER_FOREST,
-    _FuelCategory.NATURAL_TROPICAL_FOREST: _EmissionCategory.TROPICAL_FOREST,
-    _FuelCategory.PRIMARY_TROPICAL_FOREST: _EmissionCategory.TROPICAL_FOREST,
-    _FuelCategory.SAVANNA_GRASSLAND_EARLY_DRY_SEASON_BURNS: _EmissionCategory.SAVANNA_AND_GRASSLAND,
-    _FuelCategory.SAVANNA_GRASSLAND_MID_TO_LATE_DRY_SEASON_BURNS: _EmissionCategory.SAVANNA_AND_GRASSLAND,
-    _FuelCategory.SAVANNA_WOODLAND_EARLY_DRY_SEASON_BURNS: _EmissionCategory.SAVANNA_AND_GRASSLAND,
-    _FuelCategory.SAVANNA_WOODLAND_MID_TO_LATE_DRY_SEASON_BURNS: _EmissionCategory.SAVANNA_AND_GRASSLAND,
-    _FuelCategory.SECONDARY_TROPICAL_FOREST: _EmissionCategory.TROPICAL_FOREST,
-    _FuelCategory.SHRUBLAND: _EmissionCategory.SAVANNA_AND_GRASSLAND,
-    _FuelCategory.TEMPERATE_FOREST: _EmissionCategory.OTHER_FOREST,
-    _FuelCategory.TERTIARY_TROPICAL_FOREST: _EmissionCategory.TROPICAL_FOREST,
-    _FuelCategory.UNKNOWN_TROPICAL_FOREST: _EmissionCategory.TROPICAL_FOREST
+    FuelCategory.BOREAL_FOREST: EmissionCategory.OTHER_FOREST,
+    FuelCategory.EUCALYPT_FOREST: EmissionCategory.OTHER_FOREST,
+    FuelCategory.NATURAL_TROPICAL_FOREST: EmissionCategory.TROPICAL_FOREST,
+    FuelCategory.PRIMARY_TROPICAL_FOREST: EmissionCategory.TROPICAL_FOREST,
+    FuelCategory.SAVANNA_GRASSLAND_EARLY_DRY_SEASON_BURNS: EmissionCategory.SAVANNA_AND_GRASSLAND,
+    FuelCategory.SAVANNA_GRASSLAND_MID_TO_LATE_DRY_SEASON_BURNS: EmissionCategory.SAVANNA_AND_GRASSLAND,
+    FuelCategory.SAVANNA_WOODLAND_EARLY_DRY_SEASON_BURNS: EmissionCategory.SAVANNA_AND_GRASSLAND,
+    FuelCategory.SAVANNA_WOODLAND_MID_TO_LATE_DRY_SEASON_BURNS: EmissionCategory.SAVANNA_AND_GRASSLAND,
+    FuelCategory.SECONDARY_TROPICAL_FOREST: EmissionCategory.TROPICAL_FOREST,
+    FuelCategory.SHRUBLAND: EmissionCategory.SAVANNA_AND_GRASSLAND,
+    FuelCategory.TEMPERATE_FOREST: EmissionCategory.OTHER_FOREST,
+    FuelCategory.TERTIARY_TROPICAL_FOREST: EmissionCategory.TROPICAL_FOREST,
+    FuelCategory.UNKNOWN_TROPICAL_FOREST: EmissionCategory.TROPICAL_FOREST
 }
 """
 Mapping from natural vegetation fuel category to natural vegetation burning emission category.
 """
 
 
-def _get_fuel_category(biomass_category: BiomassCategory, eco_climate_zone: EcoClimateZone) -> _FuelCategory:
+def _get_fuel_category(biomass_category: BiomassCategory, eco_climate_zone: EcoClimateZone) -> FuelCategory:
     """
     Get the IPCC (2019) natural vegetation fuel category that corresponds to a specific combination of biomass category
     and eco-climate zone.
@@ -229,7 +210,7 @@ def _get_fuel_category(biomass_category: BiomassCategory, eco_climate_zone: EcoC
     return _BIOMASS_CATEGORY_TO_FUEL_CATEGORY.get(biomass_category, {}).get(eco_climate_zone)
 
 
-def _get_emission_category(fuel_category: _FuelCategory) -> _EmissionCategory:
+def get_emission_category(fuel_category: FuelCategory) -> EmissionCategory:
     """
     Get the IPCC (2019) emission category that corresponds to a fuel category.
     """
@@ -291,7 +272,7 @@ def _get_sample_func(kwargs: dict) -> Callable:
     )
 
 
-def _get_fuel_factor(fuel_category: _FuelCategory) -> dict:
+def _get_fuel_factor(fuel_category: FuelCategory) -> dict:
     """
     Retrieve distribution data for a specific fuel category.
     """
@@ -323,29 +304,24 @@ def _get_fuel_factor(fuel_category: _FuelCategory) -> dict:
     )
 
 
-def _get_emission_factor(term_id: _EmissionTermId, emission_category: _EmissionCategory) -> dict:
+def _get_emission_factor(term_id: _EmissionTermId, emission_category: EmissionCategory) -> dict:
     """
     Retrieve distribution data for a specific emission and emission category.
     """
-    LOOKUP_KEY = "emissionToAirNaturalVegetationBurning_emissionCategory_gEmittedPerKgDryMatterCombusted"
-    LOOKUP_FILENAME = f"{LOOKUP_KEY}.csv"
+    TERM_TYPE = "emission"
     TARGET_DATA = ("value", "sd")
 
-    row = term_id
     column_root = f"IPCC_2019_G_EMITTED_PER_KG_DRY_MATTER_COMBUSTED_{emission_category.name}"
 
-    lookup = download_lookup(LOOKUP_FILENAME)
-
     data = {
-        target: get_table_value(lookup, column_name("term.id"), row, column_name(f"{column_root}_{target}"))
-        for target in TARGET_DATA
+        target: get_lookup_value(
+            {"@id": term_id, "termType": TERM_TYPE},
+            f"{column_root}_{target}",
+            model=MODEL,
+            term=term_id
+        ) for target in TARGET_DATA
     }
 
-    for target in TARGET_DATA:
-        debugMissingLookup(
-            LOOKUP_FILENAME, "term.id", row, f"{column_root}_{target}", data.get(target), model=MODEL, term=term_id
-        )
-
     return (
         {
             k: parsed for k, v in data.items() if (parsed := safe_parse_float(v, default=None)) is not None
@@ -355,7 +331,7 @@ def _get_emission_factor(term_id: _EmissionTermId, emission_category: _EmissionC
 
 
 def _sample_fuel_factor(
-    fuel_category: _FuelCategory, *, seed: Union[int, np.random.Generator, None] = None
+    fuel_category: FuelCategory, *, seed: Union[int, np.random.Generator, None] = None
 ) -> npt.NDArray:
     """
     Generate random samples from a fuel factor's distribution data.
@@ -367,7 +343,7 @@ def _sample_fuel_factor(
 
 def _sample_emission_factor(
     term_id: _EmissionTermId,
-    emission_category: _EmissionCategory,
+    emission_category: EmissionCategory,
     *,
     seed: Union[int, np.random.Generator, None] = None
 ) -> npt.NDArray:
@@ -432,11 +408,11 @@ def _calc_burnt_fuel(area_converted: npt.NDArray, fuel_factor: npt.NDArray, frac
 def _build_fuel_burnt_accumulator(
     percent_burned: npt.ArrayLike,
     eco_climate_zone: EcoClimateZone,
-    sample_fuel_factor_func: Callable[[_FuelCategory], npt.NDArray]
+    sample_fuel_factor_func: Callable[[FuelCategory], npt.NDArray]
 ):
     """
     Build an `accumulate_fuel_burnt` function to reduce natural vegetation deltas into mass of fuel burnt per
-    `_FuelCategory`.
+    `FuelCategory`.
 
     Parameters
     ----------
@@ -444,7 +420,7 @@ def _build_fuel_burnt_accumulator(
         The percentage of land converted using burning during a land use change event (percentage, 0-100%).
     eco_climate_zone : EcoClimateZone
         The eco-climate zone of the Site.
-    sample_fuel_factor_func : Callable[[_FuelCategory], npt.NDArray]
+    sample_fuel_factor_func : Callable[[FuelCategory], npt.NDArray]
         Function to sample fuel factor parameter.
 
     Returns
@@ -455,15 +431,15 @@ def _build_fuel_burnt_accumulator(
     frac_burnt = percent_burned / 100
 
     def accumulate_fuel_burnt(
-        result: dict[_FuelCategory, npt.NDArray], biomass_category: BiomassCategory, delta: float
-    ) -> dict[_FuelCategory, npt.NDArray]:
+        result: dict[FuelCategory, npt.NDArray], biomass_category: BiomassCategory, delta: float
+    ) -> dict[FuelCategory, npt.NDArray]:
         """
-        Calculate the amount of fuel burnt when natural vegetation is lost. Accumulate fuel burnt by `_FuelCategory`.
+        Calculate the amount of fuel burnt when natural vegetation is lost. Accumulate fuel burnt by `FuelCategory`.
 
         Parameters
         ----------
-        result : dict[_FuelCategory, npt.NDArray]
-            A dict with the format `{_FuelCategory: kg_fuel_burnt (npt.NDArray)}`.
+        result : dict[FuelCategory, npt.NDArray]
+            A dict with the format `{FuelCategory: kg_fuel_burnt (npt.NDArray)}`.
         biomass_category : BiomassCategory
             A biomass category undergoing change during a LUC event.
         delta : float
@@ -471,7 +447,7 @@ def _build_fuel_burnt_accumulator(
 
         Returns
         -------
-        dict[_FuelCategory, npt.NDArray]
+        dict[FuelCategory, npt.NDArray]
         """
 
         fuel_category = _get_fuel_category(biomass_category, eco_climate_zone)
@@ -560,12 +536,12 @@ def _compile_inventory(
     land_cover_grouped = group_nodes_by_year(land_cover_nodes)
     percent_burned = get_percent_burned(site)
 
-    @lru_cache(maxsize=len(_FuelCategory))
+    @lru_cache(maxsize=len(FuelCategory))
     def sample_fuel_factor(*args):
         """Fuel factors should not be re-sampled between years, so cache results."""
         return _sample_fuel_factor(*args, seed=rng)
 
-    @lru_cache(maxsize=len(EMISSION_TERM_IDS)*len(_EmissionCategory))
+    @lru_cache(maxsize=len(EMISSION_TERM_IDS)*len(EmissionCategory))
     def sample_emission_factor(*args):
         """Emission factors should not be re-sampled between years, so cache results."""
         return _sample_emission_factor(*args, seed=rng)
@@ -610,7 +586,7 @@ def _compile_inventory(
 
         annual_emissions = {
             term_id: sum(
-                _calc_emission(amount, sample_emission_factor(term_id, _get_emission_category(fuel_category)))
+                _calc_emission(amount, sample_emission_factor(term_id, get_emission_category(fuel_category)))
                 for fuel_category, amount in fuel_burnt_per_category.items()
             ) for term_id in EMISSION_TERM_IDS
         }
@@ -890,7 +866,7 @@ def run(cycle: dict):
     Returns
     -------
     list[dict]
-        A list of HESTIA [Emission](https://www.hestia.earth/schema/Emission) nodes with `term.termType` =
+        A list of HESTIA [Emission](https://www.hestia.earth/schema/Emission) nodes with `term.@id` =
         `ch4ToAirNaturalVegetationBurning` **OR** `coToAirNaturalVegetationBurning` **OR**
         `n2OToAirNaturalVegetationBurningDirect` **OR** `noxToAirNaturalVegetationBurning`.
     """

hestia_earth/models/ipcc2019/pastureGrass_utils.py

@@ -219,7 +219,7 @@ def _pastureGrass_key_property_value(column: dict, **log_args):
         term_id = practice_input_id(practice)
         term = download_hestia(term_id)
         value = list_sum(practice.get('value', [0]))
-        lookup_value = node_property_lookup_value(MODEL, term, column, default=0, **log_args)
+        lookup_value = node_property_lookup_value(MODEL, term_id, term.get('termType'), column, default=0, **log_args)
         return (lookup_value, value)
     return get_value