hestia-earth-models 0.68.1__py3-none-any.whl → 0.69.1__py3-none-any.whl

hestia_earth/models/cycle/product/primary.py

@@ -1,8 +1,3 @@
-"""
-Product Primary
-
-Determines the primary product which is the product with the highest `economicValueShare`.
-"""
 from hestia_earth.models.log import logRequirements, logShouldRun
 from .. import MODEL
 

hestia_earth/models/cycle/product/properties.py

@@ -1,10 +1,3 @@
-"""
-Product Properties
-
-This model handles the following case:
-- when the `dryMatter` property is set, the model recalculates the other properties based on the data from feedipedia;
-- when the `min` and `max` are set, the model averages the `value`.
-"""
 from hestia_earth.utils.model import find_term_match
 
 from hestia_earth.models.utils.feedipedia import rescale_properties_from_dryMatter

hestia_earth/models/cycle/product/revenue.py

@@ -1,12 +1,3 @@
-"""
-Product Revenue
-
-This model calculates the revenue of each product by multiplying the yield with the revenue.
-
-In the case the product `value` is `0`, the `revenue` will be set to `0`.
-
-In the case the product `price` is `0`, the `revenue` will be set to `0`.
-"""
 from hestia_earth.utils.tools import list_sum, non_empty_list
 
 from hestia_earth.models.log import logRequirements, logShouldRun

hestia_earth/models/cycle/product/value.py

@@ -1,9 +1,3 @@
-"""
-Product Value
-
-This model calculates the `value` of the [Product](https://hestia.earth/schema/Product)
-by taking an average from the `min` and `max` values.
-"""
 from hestia_earth.utils.tools import non_empty_list, list_average
 
 from hestia_earth.models.log import logRequirements, logShouldRun

hestia_earth/models/cycle/siteArea.py

@@ -1,9 +1,3 @@
-"""
-Site Area
-
-For animal production cycles, use the `stockingDensityAnimalHousingAverage` to calculate the average area required
-for all animals.
-"""
 from hestia_earth.schema import TermTermType, SiteSiteType
 from hestia_earth.utils.model import filter_list_term_type, find_term_match
 from hestia_earth.utils.tools import list_sum

hestia_earth/models/cycle/siteDuration.py

@@ -1,13 +1,3 @@
-"""
-Site duration
-
-This model calculates the `siteDuration` on the `Cycle` to the same value as `cycleDuration`
-when only a single `Site` is present.
-
-Note: on `crop` production cycles:
-* For temporary crops, gap fill only when `startDateDefinition` = `harvest of previous crop`.
-* For permanent crops, no restriction applies.
-"""
 from hestia_earth.schema import TermTermType, CycleStartDateDefinition
 from hestia_earth.utils.model import find_primary_product
 

hestia_earth/models/cycle/siteUnusedDuration.py

@@ -1,9 +1,3 @@
-"""
-Site Unused Duration
-
-This model sets the [Cycle siteUnusedDuration](https://hestia.earth/schema/Cycle#siteUnusedDuration) based on
-the `siteDuration` and the `longFallowRatio` practice.
-"""
 from hestia_earth.schema import SiteSiteType
 from hestia_earth.utils.tools import list_sum
 

hestia_earth/models/cycle/startDate.py

@@ -1,11 +1,3 @@
-"""
-Start Date
-
-This model sets the [Cycle startDate](https://hestia.earth/schema/Cycle#startDate) based on:
-* the `cycleDuration` and the `endDate` if it has been provided to a day precision (e.g., `2000-01-01`);
-* if no `cycleDuration` is provided, and the `startDate` is set to month precision (e.g., `2000-01`),
-assumed it started on the 15th of the month.
-"""
 from datetime import timedelta
 from hestia_earth.utils.date import is_in_days, is_in_months
 from hestia_earth.utils.tools import safe_parse_date

hestia_earth/models/cycle/startDateDefinition.py

@@ -1,9 +1,3 @@
-"""
-Start Date Definition
-
-This model sets the [Cycle startDateDefinition](https://hestia.earth/schema/Cycle#startDateDefinition)
-based on the result of the `cycleDuration` gap-filling model.
-"""
 from hestia_earth.schema import TermTermType, CycleStartDateDefinition
 from hestia_earth.utils.model import find_primary_product
 

hestia_earth/models/cycle/transformation.py

@@ -1,8 +1,3 @@
-"""
-Transformations
-
-Returns the `Emission` from every `Transformation` to be added in the `Cycle`.
-"""
 from hestia_earth.utils.tools import flatten
 
 from hestia_earth.models.log import logShouldRun

hestia_earth/models/dammgen2009/noxToAirExcreta.py

@@ -35,7 +35,7 @@ def _emission(value: float):
 
 
 def _run(excretaKgN: float, NO_N_EF: float):
-    value = NO_N_EF * excretaKgN * get_atomic_conversion(Units.KG_NOX, Units.TO_N)
+    value = (NO_N_EF or 0) * (excretaKgN or 0) * get_atomic_conversion(Units.KG_NOX, Units.TO_N)
     return [_emission(value)]
 
 
@@ -47,7 +47,7 @@ def _should_run(cycle: dict):
                     excretaKgN=excretaKgN,
                     NO_N_EF=NO_N_EF)
 
-    should_run = all([excretaKgN, NO_N_EF])
+    should_run = all([excretaKgN is not None, NO_N_EF is not None])
     logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)
     return should_run, excretaKgN, NO_N_EF
 

hestia_earth/models/ecoinventV3/__init__.py

@@ -1,18 +1,3 @@
-"""
-ecoinvent v3
-
-This model calculates background emissions related to the production of Inputs from the ecoinvent database, version 3.
-
-Note: to use the `ecoinventV3` model locally or in the
-[HESTIA Community Edition](https://gitlab.com/hestia-earth/hestia-community-edition) you need a valid ecoinvent license.
-Please contact us at community@hestia.earth for instructions to download the required file to run the model.
-
-**Pesticide Brand Name**
-
-For `Input` with a [Pesticide Brand Name](https://hestia.earth/glossary?pesticideBrandBane) term, you can override the
-default list of [Pesticide Active Ingredient](https://hestia.earth/glossary?pesticideAI) by specifying the list of
-[properties](https://hestia.earth/schema/Input#properties) manually.
-"""
 from functools import reduce
 from hestia_earth.schema import EmissionMethodTier
 from hestia_earth.utils.tools import flatten, list_sum

hestia_earth/models/ecoinventV3AndEmberClimate/__init__.py

@@ -1,14 +1,3 @@
-"""
-ecoinvent v3 and Ember Climate
-
-This model calculates background emissions related to the production of Inputs from the ecoinvent database, version 3,
-and using the percentage of production for each energy source from
-[Ember](https://ember-climate.org/data-catalogue/yearly-electricity-data/).
-
-Note: to use the `ecoinventV3AndEmberClimate` model locally or in the
-[Hestia Community Edition](https://gitlab.com/hestia-earth/hestia-community-edition) you need a valid ecoinvent license.
-Please contact us at community@hestia.earth for instructions to download the required file to run the model.
-"""
 from functools import reduce
 from hestia_earth.utils.tools import list_sum, flatten
 from hestia_earth.schema import EmissionMethodTier

hestia_earth/models/emepEea2019/nh3ToAirExcreta.py

@@ -1,18 +1,16 @@
 from hestia_earth.schema import EmissionMethodTier, TermTermType
-from hestia_earth.utils.lookup import column_name, download_lookup, get_table_value
-from hestia_earth.utils.model import filter_list_term_type
-from hestia_earth.utils.tools import safe_parse_float, list_sum
 
-from hestia_earth.models.log import logRequirements, debugMissingLookup, logShouldRun, log_as_table
-from hestia_earth.models.utils import _filter_list_term_unit
+from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.constant import Units, get_atomic_conversion
 from hestia_earth.models.utils.completeness import _is_term_type_complete
 from hestia_earth.models.utils.input import total_excreta_tan
+from hestia_earth.models.utils.excretaManagement import get_excreta_inputs_with_factor
 from . import MODEL
 from .utils import _emission
 
 REQUIREMENTS = {
     "Cycle": {
+        "completeness.excreta": "True",
         "inputs": [{
             "@type": "Input",
             "value": "",
@@ -28,7 +26,7 @@ REQUIREMENTS = {
     }
 }
 LOOKUPS = {
-    "excretaManagement-excreta-NH3_EF_2019": "product @id"
+    "excretaManagement-excreta-NH3_EF_2019": ""
 }
 RETURNS = {
     "Emission": [{
@@ -40,50 +38,26 @@ TERM_ID = 'nh3ToAirExcreta'
 TIER = EmissionMethodTier.TIER_2.value
 
 
-def _get_nh3_factor(term_id: str, input: dict):
-    input_term_id = input.get('term', {}).get('@id')
-    lookup_name = f"{list(LOOKUPS.keys())[0]}.csv"
-    value = get_table_value(download_lookup(lookup_name), 'termid', term_id, column_name(input_term_id))
-    debugMissingLookup(lookup_name, 'termid', term_id, input_term_id, value, model=MODEL, term=TERM_ID)
-    return safe_parse_float(value, None)
-
-
-def _run(excreta_EF_product: float):
-    value = excreta_EF_product * get_atomic_conversion(Units.KG_NH3, Units.TO_N)
+def _run(excreta_EF_input: float):
+    value = excreta_EF_input * get_atomic_conversion(Units.KG_NH3, Units.TO_N)
     return [_emission(value=value, tier=TIER, term_id=TERM_ID)]
 
 
 def _should_run(cycle: dict):
     excreta_complete = _is_term_type_complete(cycle, TermTermType.EXCRETA)
-
-    practices = filter_list_term_type(cycle.get('practices', []), TermTermType.EXCRETAMANAGEMENT)
-    practice_id = practices[0].get('term', {}).get('@id') if len(practices) > 0 else None
-
-    # total of excreta including the NH3 factor
-    excreta = filter_list_term_type(cycle.get('inputs', []), TermTermType.EXCRETA)
-    excreta = _filter_list_term_unit(excreta, Units.KG_N)
-    excreta_values = [
-        (i.get('term', {}).get('@id'), total_excreta_tan([i]), _get_nh3_factor(practice_id, i)) for i in excreta
-    ]
-    excreta_logs = log_as_table([
-        {'id': id, 'value': v, 'EF': ef} for id, v, ef in excreta_values
-    ])
-    excreta_EF_products = [v * f for id, v, f in excreta_values if v is not None and f is not None]
-    has_excreta_EF_products = len(excreta_EF_products) > 0
-    excreta_EF_product = list_sum(excreta_EF_products, 0)
+    excreta_EF_input = get_excreta_inputs_with_factor(
+        cycle, f"{list(LOOKUPS.keys())[0]}.csv", excreta_convertion_func=total_excreta_tan, model=MODEL, term=TERM_ID
+    )
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
                     term_type_excreta_complete=excreta_complete,
-                    practice_id=practice_id,
-                    excreta=excreta_logs,
-                    excreta_EF_product=excreta_EF_product,
-                    has_excreta_EF_products=has_excreta_EF_products)
+                    excreta_EF_input=excreta_EF_input)
 
-    should_run = excreta_complete or all([has_excreta_EF_products])
+    should_run = all([excreta_complete, excreta_EF_input >= 0])
     logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)
-    return should_run, excreta_EF_product
+    return should_run, excreta_EF_input
 
 
 def run(cycle: dict):
-    should_run, excreta_EF_product = _should_run(cycle)
-    return _run(excreta_EF_product) if should_run else []
+    should_run, excreta_EF_input = _should_run(cycle)
+    return _run(excreta_EF_input) if should_run else []

hestia_earth/models/emepEea2019/pm10ToAirAnimalHousing.py

@@ -1,7 +1,3 @@
-"""
-When `otherSites` are provided, `otherSitesDuration` must be set as well so we know the length of time the animals
-spend on each Site.
-"""
 from hestia_earth.schema import EmissionMethodTier
 
 from .utils import _emission, get_live_animal_emission_value, should_run_animal

hestia_earth/models/emepEea2019/pm25ToAirAnimalHousing.py

@@ -1,7 +1,3 @@
-"""
-When `otherSites` are provided, `otherSitesDuration` must be set as well so we know the length of time the animals
-spend on each Site.
-"""
 from hestia_earth.schema import EmissionMethodTier
 
 from .utils import _emission, get_live_animal_emission_value, should_run_animal

hestia_earth/models/emepEea2019/tspToAirAnimalHousing.py

@@ -1,7 +1,3 @@
-"""
-When `otherSites` are provided, `otherSitesDuration` must be set as well so we know the length of time the animals
-spend on each Site.
-"""
 from hestia_earth.schema import EmissionMethodTier
 
 from .utils import _emission, get_live_animal_emission_value, should_run_animal

hestia_earth/models/emissionNotRelevant/__init__.py

@@ -1,8 +1,3 @@
-"""
-Emission not relevant
-
-The emission is not relevant for this Site, Cycle, or Product.
-"""
 from hestia_earth.schema import NodeType, EmissionMethodTier
 from hestia_earth.utils.lookup_utils import is_in_system_boundary
 

hestia_earth/models/environmentalFootprintV3_1/environmentalFootprintSingleOverallScore.py

@@ -1,12 +1,3 @@
-"""
-The inputs and outputs from the life cycle inventory are aggregated in 16 midpoint
-characterised impact categories. These impact categories are then normalised (i.e., the results are divided by
-the overall inventory of a reference unit, e.g., the entire world, to convert the characterised impact categories in
-relative shares of the impacts of the analysed system) and weighted (i.e., each impact category is multiplied by
-a weighting factor to reflect their perceived relative importance). The weighted impact categories can then be
-summed to obtain the EF single overall score. The number and the name of the impact categories is the same
-in EF3.0 and EF3.1.
-"""
 from typing import List, Optional, Tuple
 
 from hestia_earth.schema import TermTermType

hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandOccupation.py

@@ -1,9 +1,3 @@
-"""
-Characterises [soilQualityIndexLandOccupation](https://hestia.earth/term/soilQualityIndexLandOccupation)
-based on an updated [LANCA model (De Laurentiis et al. 2019)](
-http://publications.jrc.ec.europa.eu/repository/handle/JRC113865) and on the LANCA (Regionalised) Characterisation
-Factors version 2.5 (Horn and Meier, 2018).
-"""
 from typing import Tuple
 
 from hestia_earth.schema import TermTermType

hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandTransformation.py

@@ -1,9 +1,3 @@
-"""
-Characterises [soilQualityIndexLandTransformation](https://hestia.earth/term/soilQualityIndexLandTransformation)
-based on an updated [LANCA model (De Laurentiis et al. 2019)](
-http://publications.jrc.ec.europa.eu/repository/handle/JRC113865) and on the LANCA (Regionalised) Characterisation
-Factors version 2.5 (Horn and Meier, 2018).
-"""
 from typing import List, Tuple
 
 from hestia_earth.schema import TermTermType

hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexTotalLandUseEffects.py

@@ -1,9 +1,3 @@
-"""
-Characterises [soilQualityIndexTotalLandUseEffects](https://hestia.earth/term/soilQualityIndexTotalLandUseEffects)
-based on an updated [LANCA model (De Laurentiis et al. 2019)](
-http://publications.jrc.ec.europa.eu/repository/handle/JRC113865) and on the LANCA (Regionalised) Characterisation
-Factors version 2.5 (Horn and Meier, 2018).
-"""
 from hestia_earth.schema import TermTermType
 from hestia_earth.utils.model import find_term_match, filter_list_term_type
 from hestia_earth.utils.tools import list_sum

hestia_earth/models/epa2014/no3ToGroundwaterExcreta.py

@@ -17,14 +17,14 @@ REQUIREMENTS = {
 RETURNS = {
     "Emission": [{
         "value": "",
-        "methodTier": "tier 2"
+        "methodTier": "tier 1"
     }]
 }
 LOOKUPS = {
     "excretaManagement": "EF_NO3-N"
 }
 TERM_ID = 'no3ToGroundwaterExcreta'
-TIER = EmissionMethodTier.TIER_2.value
+TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float):

hestia_earth/models/faostat2018/product/price.py

@@ -1,8 +1,3 @@
-"""
-Product Price
-
-Calculates the price of `crop` and `liveAnimal` using FAOSTAT data.
-"""
 from hestia_earth.schema import TermTermType
 from hestia_earth.utils.lookup import extract_grouped_data
 from hestia_earth.utils.tools import non_empty_list, safe_parse_float, safe_parse_date

hestia_earth/models/geospatialDatabase/awareWaterBasinId.py

@@ -1,8 +1,3 @@
-"""
-Aware Water Basin ID
-
-This model calculates the the [AWARE](https://wulca-waterlca.org/) water basin identifier.
-"""
 from hestia_earth.models.log import logRequirements, logShouldRun
 from .utils import download, has_geospatial_data, should_download
 from . import MODEL

hestia_earth/models/geospatialDatabase/ecoClimateZone.py

@@ -1,22 +1,3 @@
-"""
-They approximataely map to the [IPCC (2019) Climate Zones](https://www.ipcc-nggip.iges.or.jp/public/2019rf/pdf/4_Volume4/19R_V4_Ch03_Land%20Representation.pdf).  # noqa: E501
-Data are derived from [Hiederer et al. (2010) Biofuels: A new methodology to estimate GHG emissions from global land use change, European Commission Joint Research Centre](https://ec.europa.eu/jrc/en/publication/eur-scientific-and-technical-research-reports/biofuels-new-methodology-estimate-ghg-emissions-due-global-land-use-change-methodology).  # noqa: E501
-
-| Value | Climate Zone         |
-|-------|----------------------|
-| 1     | Warm Temperate Moist |
-| 2     | Warm Temperate Dry   |
-| 3     | Cool Temperate Moist |
-| 4     | Cool Temperate Dry   |
-| 5     | Polar Moist          |
-| 6     | Polar Dry            |
-| 7     | Boreal Moist         |
-| 8     | Boreal Dry           |
-| 9     | Tropical Montane     |
-| 10    | Tropical Wet         |
-| 11    | Tropical Moist       |
-| 12    | Tropical Dry         |
-"""
 from hestia_earth.schema import MeasurementMethodClassification
 from hestia_earth.utils.lookup import download_lookup, _get_single_table_value, column_name
 
@@ -51,7 +32,7 @@ EE_PARAMS = {
     'ee_type': 'raster',
     'reducer': 'mode'
 }
-BIBLIO_TITLE = 'Biofuels: A new methodology to estimate GHG emissions from global land use change'
+BIBLIO_TITLE = 'Biofuels: a new methodology to estimate GHG emissions from global land use change'
 
 
 def _measurement(site: dict, value: int):

hestia_earth/models/geospatialDatabase/ecoregion.py

@@ -1,10 +1,3 @@
-"""
-Ecoregion
-
-Ecoregions represent the original distribution of distinct assemblages of species and communities.
-There are 867 terrestrial ecoregions as
-[defined by WWF](https://www.worldwildlife.org/publications/terrestrial-ecoregions-of-the-world).
-"""
 from hestia_earth.models.log import logRequirements, logShouldRun
 from .utils import download, has_geospatial_data, should_download
 from . import MODEL

hestia_earth/models/geospatialDatabase/potentialEvapotranspirationAnnual.py

@@ -1,7 +1,3 @@
-"""
-Must be associated with at least 1 `Cycle` that has an
-[endDate](https://hestia.earth/schema/Cycle#endDate) after `1958` and before `2021`.
-"""
 from hestia_earth.schema import MeasurementMethodClassification
 from hestia_earth.utils.tools import non_empty_list
 

hestia_earth/models/geospatialDatabase/potentialEvapotranspirationMonthly.py

@@ -1,7 +1,3 @@
-"""
-Must be associated with at least 1 `Cycle` that has an
-[endDate](https://hestia.earth/schema/Cycle#endDate) after `1979-01-01` and before `2020-06-01`.
-"""
 from hestia_earth.schema import MeasurementMethodClassification
 from hestia_earth.utils.tools import flatten, non_empty_list
 

hestia_earth/models/geospatialDatabase/precipitationAnnual.py

@@ -1,7 +1,3 @@
-"""
-Must be associated with at least 1 `Cycle` that has an
-[endDate](https://hestia.earth/schema/Cycle#endDate) after `1979-01-01` and before `2020-06-01`.
-"""
 from hestia_earth.schema import MeasurementMethodClassification
 from hestia_earth.utils.tools import non_empty_list
 

hestia_earth/models/geospatialDatabase/precipitationMonthly.py

@@ -1,7 +1,3 @@
-"""
-Must be associated with at least 1 `Cycle` that has an
-[endDate](https://hestia.earth/schema/Cycle#endDate) after `1979-01-01` and before `2020-06-01`.
-"""
 from hestia_earth.schema import MeasurementMethodClassification
 from hestia_earth.utils.tools import flatten, non_empty_list
 

hestia_earth/models/geospatialDatabase/region.py

@@ -1,8 +1,3 @@
-"""
-Region
-
-This model finds the region that contains the coordinates provided.
-"""
 from hestia_earth.utils.api import download_hestia
 from hestia_earth.utils.model import linked_node
 

hestia_earth/models/geospatialDatabase/temperatureAnnual.py

@@ -1,7 +1,3 @@
-"""
-Must be associated with at least 1 `Cycle` that has an
-[endDate](https://hestia.earth/schema/Cycle#endDate) after `1979-01-01` and before `2020-06-01`.
-"""
 from hestia_earth.schema import MeasurementMethodClassification
 from hestia_earth.utils.tools import non_empty_list
 

hestia_earth/models/geospatialDatabase/temperatureMonthly.py

@@ -1,7 +1,3 @@
-"""
-Must be associated with at least 1 `Cycle` that has an
-[endDate](https://hestia.earth/schema/Cycle#endDate) after `1979-01-01` and before `2020-06-01`.
-"""
 from hestia_earth.schema import MeasurementMethodClassification
 from hestia_earth.utils.tools import flatten, non_empty_list
 

hestia_earth/models/haversineFormula/transport/distance.py

@@ -1,10 +1,3 @@
-"""
-Transport Value
-
-This model calculates the `distance` of the [Transport](https://hestia.earth/schema/Transport) linked to the
-[Inputs of the Cycle](https://hestia.earth/schema/Cycle#inputs) by calculating the distance between the
-country of the Cycle and the country of origin of the Input (which must be different).
-"""
 from haversine import haversine
 from hestia_earth.utils.api import download_hestia
 from hestia_earth.utils.tools import non_empty_list

hestia_earth/models/hestia/landCover.py

@@ -1,9 +1,4 @@
-"""
-Land Cover
-
-This model calculates historic land use change over a twenty-year period,
-extending the functionality of the Blonk model.
-"""
+import functools
 import math
 from collections import defaultdict
 from datetime import datetime, timedelta
@@ -103,6 +98,26 @@ OUTPUT_SIGNIFICANT_DIGITS = 3
 _LOOKUP_EXPANSION = "region-crop-cropGroupingFaostatProduction-areaHarvestedUpTo20YearExpansion.csv"
 
 
+def _get_lookup_with_cache(lookup_term, column):
+    """Wrapper to get_lookup_value which pulls out the immutable parts of the term to allow caching."""
+    @functools.cache
+    def _get_immutable_lookup(term_id: str, term_type: str, col: str):
+        new_term = {"@id": term_id, "termType": term_type} if term_type and term_id else {}
+        return get_lookup_value(
+            lookup_term=new_term,
+            column=col,
+            skip_debug=False,
+            model=MODEL,
+            term=new_term
+        )
+
+    return _get_immutable_lookup(
+        term_id=lookup_term.get("@id"),
+        term_type=lookup_term.get("termType"),
+        col=column
+    )
+
+
 def _management(term_id: str, value: float, start_date: str, end_date: str):
     node = _new_management(term_id, MODEL)
     node['value'] = value
@@ -140,10 +155,13 @@ def site_area_sum_to_100(dict_of_percentages: dict):
     )
 
 
-def _should_group_landCover(term: dict):
+def _should_group_landCover(management_node: dict):
     return any(
-        bool(get_lookup_value(lookup_term=prop.get("term", {}), column="CALCULATE_TOTAL_LAND_COVER_SHARE_SEPARATELY"))
-        for prop in term.get("properties", [])
+        bool(_get_lookup_with_cache(
+            lookup_term=prop.get("term", {}),
+            column="CALCULATE_TOTAL_LAND_COVER_SHARE_SEPARATELY"
+        ))
+        for prop in management_node.get("properties", [])
     )
 
 
@@ -391,7 +409,7 @@ def _get_shares_of_expansion(
 
 def _get_faostat_name(term: dict) -> str:
     """For landCover terms, find the cropGroupingFaostatArea name for the landCover id."""
-    return get_lookup_value(term, "cropGroupingFaostatArea")
+    return _get_lookup_with_cache(term, "cropGroupingFaostatArea")
 
 
 def _get_complete_faostat_to_crop_mapping() -> dict:
@@ -515,7 +533,7 @@ def _get_sums_of_crop_expansion(country_id: str, year: int, include_negatives: b
     lookup = download_lookup(_LOOKUP_EXPANSION.replace('region', f"{country_id}")) or download_lookup(_LOOKUP_EXPANSION)
     columns = lookup_columns(lookup)
     values = {
-        name: get_table_value(lookup, 'termid', country_id, column_name(name))
+        name: get_region_lookup_value(lookup_name=_LOOKUP_EXPANSION, term_id=country_id, column=name, model=MODEL)
         for name in columns if name != "termid"
     }
 
@@ -729,13 +747,8 @@ def _should_run_historical_land_use_change_single_crop(
     return should_run, capped_site_area
 
 
-def _get_land_use_term_from_node(node: dict) -> str:
-    return get_lookup_value(
-        lookup_term=node.get("term", {}),
-        column=LOOKUPS.get("landCover")[1],
-        model=MODEL,
-        term=node.get("term", {})
-    )
+def _get_land_use_term_from_node(node: dict):
+    return _get_lookup_with_cache(lookup_term=node.get("term", {}), column=LOOKUPS.get("landCover")[1])
 
 
 def _collect_land_use_types(nodes: list) -> list:

hestia_earth/models/hestia/landTransformation100YearAverageDuringCycle.py

@@ -1,14 +1,3 @@
-"""
-Creates an [emissionsResourceUse](https://hestia.earth/schema/Emission) for every landCover land transformation.
-contained within the [ImpactAssesment.cycle](https://hestia.earth/schema/ImpactAssessment#cycle), averaged over the last
-100 years.
-
-It does this by multiplying the land occupation during the cycle by the
-[Site](https://hestia.earth/schema/Site) area 100 years ago and dividing by 100.
-
-Land transformation from [land type] 100 years =
-(Land occupation, during Cycle * Site Percentage Area 100 years ago [land type] / 100) / 100
-"""
 from .resourceUse_utils import run_resource_use
 
 REQUIREMENTS = {

hestia_earth/models/hestia/landTransformation20YearAverageDuringCycle.py

@@ -1,14 +1,3 @@
-"""
-Creates an [emissionsResourceUse](https://hestia.earth/schema/Emission) for every landCover land transformation.
-contained within the [ImpactAssesment.cycle](https://hestia.earth/schema/ImpactAssessment#cycle), averaged over the last
-20 years.
-
-It does this by multiplying the land occupation during the cycle by the
-[Site](https://hestia.earth/schema/Site) area 20 years ago and dividing by 20.
-
-Land transformation from [land type] 20 years =
-(Land occupation, during Cycle * Site Percentage Area 20 years ago [land type] / 100) / 20
-"""
 from .resourceUse_utils import run_resource_use
 
 REQUIREMENTS = {