hestia-earth-models 0.64.8__py3-none-any.whl → 0.64.10__py3-none-any.whl

hestia_earth/models/ipcc2019/{co2ToAirSoilOrganicCarbonStockChangeManagementChange.py → co2ToAirSoilOrganicCarbonStockChange.py}

@@ -4,6 +4,7 @@ from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.blank_node import cumulative_nodes_term_match
 from hestia_earth.models.utils.emission import _new_emission
 
+from .organicCarbonPerHa_tier_1_utils import _assign_ipcc_land_use_category
 from .co2ToAirCarbonStockChange_utils import create_run_function, create_should_run_function
 from . import MODEL
 
@@ -40,7 +41,10 @@ RETURNS = {
         "depth": "30"
     }]
 }
-TERM_ID = 'co2ToAirSoilOrganicCarbonStockChangeManagementChange'
+TERM_ID = 'co2ToAirSoilOrganicCarbonStockChangeLandUseChange,co2ToAirSoilOrganicCarbonStockChangeManagementChange'
+
+_LU_EMISSION_TERM_ID = "co2ToAirSoilOrganicCarbonStockChangeLandUseChange"
+_MG_EMISSION_TERM_ID = "co2ToAirSoilOrganicCarbonStockChangeManagementChange"
 
 _DEPTH_UPPER = 0
 _DEPTH_LOWER = 30
@@ -57,6 +61,7 @@ _SITE_TYPE_SYSTEMS_MAPPING = {
 
 def _emission(
     *,
+    term_id: str,
     value: list[float],
     method_tier: EmissionMethodTier,
     sd: list[float] = None,
@@ -94,7 +99,7 @@ def _emission(
         "methodTier": method_tier.value,
         "depth": _DEPTH_LOWER
     }
-    emission = _new_emission(TERM_ID, MODEL) | {
+    emission = _new_emission(term_id, MODEL) | {
         key: value for key, value in update_dict.items() if value
     }
     return emission
@@ -115,17 +120,24 @@ def run(cycle: dict) -> list[dict]:
         A list of [Emission nodes](https://www.hestia.earth/schema/Emission) containing model results.
     """
     should_run_exec = create_should_run_function(
-        _CARBON_STOCK_TERM_ID,
-        _should_compile_inventory_func,
-        should_run_measurement_func=_should_run_measurement_func
+        carbon_stock_term_id=_CARBON_STOCK_TERM_ID,
+        should_compile_inventory_func=_should_compile_inventory_func,
+        summarise_land_use_func=lambda nodes: _assign_ipcc_land_use_category(nodes, None),
+        detect_land_use_change_func=lambda a, b: a != b,
+        should_run_measurement_func=_should_run_measurement_func,
     )
 
-    run_exec = create_run_function(_emission)
+    run_exec = create_run_function(
+        new_emission_func=_emission,
+        land_use_change_emission_term_id=_LU_EMISSION_TERM_ID,
+        management_change_emission_term_id=_MG_EMISSION_TERM_ID
+    )
 
     should_run, cycle_id, inventory, logs = should_run_exec(cycle)
 
-    logRequirements(cycle, model=MODEL, term=TERM_ID, **logs)
-    logShouldRun(cycle, MODEL, TERM_ID, should_run)
+    for term_id in [_LU_EMISSION_TERM_ID, _MG_EMISSION_TERM_ID]:
+        logRequirements(cycle, model=MODEL, term=term_id, **logs)
+        logShouldRun(cycle, MODEL, term_id, should_run)
 
     return run_exec(cycle_id, inventory) if should_run else []
 

hestia_earth/models/ipcc2019/organicCarbonPerHa.py

@@ -24,7 +24,6 @@ from . import MODEL  # noqa
 
 REQUIREMENTS = {
     "Site": {
-        "siteType": ["cropland", "permanent pasture", "forest", "other natural vegetation"],
         "management": [
             {"@type": "Management", "value": "", "term.termType": "landCover"}
         ],
@@ -88,6 +87,9 @@ REQUIREMENTS = {
                 },
                 {"@type": "Management", "value": "", "startDate": "", "endDate": "", "term.@id": "shortBareFallow"}
             ]
+        },
+        "none": {
+            "siteType": ["glass or high accessible cover"]
         }
     }
 }

hestia_earth/models/ipcc2019/pastureGrass_utils.py

@@ -4,6 +4,7 @@ from hestia_earth.utils.lookup import download_lookup, get_table_value, column_n
 from hestia_earth.utils.tools import list_sum, safe_parse_float
 
 from hestia_earth.models.log import debugValues
+from hestia_earth.models.utils import weighted_average
 from hestia_earth.models.utils.input import get_feed_inputs
 from hestia_earth.models.utils.term import get_lookup_value
 from hestia_earth.models.utils.property import get_node_property, get_node_property_value, node_property_lookup_value
@@ -30,17 +31,15 @@ def _get_activityCoefficient(animal: dict, systems: list) -> float:
     term_id = term.get('@id')
     lookup = download_lookup('system-liveAnimal-activityCoefficient-ipcc2019.csv')
 
-    activityCoefficient = list_sum([
+    values = [(
         safe_parse_float(
             get_table_value(lookup, 'termid', system.get('term', {}).get('@id'), column_name(term_id)),
             0
-        ) * list_sum(system.get('value', [0]))
-        for system in systems
-    ]) / list_sum([
-        list_sum(system.get('value', [0])) for system in systems
-    ])
+        ),
+        list_sum(system.get('value', [0]))
+    ) for system in systems]
 
-    return activityCoefficient
+    return weighted_average(values)
 
 
 def _calculate_NEm(cycle: dict, animal: dict) -> float:

hestia_earth/models/lcImpactAllEffects100Years/damageToFreshwaterEcosystemsFreshwaterEutrophication.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactAllEffects100Years/damageToFreshwaterEcosystemsWaterStress.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv", 'allEffects')
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactAllEffects100Years/damageToHumanHealthParticulateMatterFormation.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactAllEffects100Years/damageToHumanHealthPhotochemicalOzoneFormation.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactAllEffects100Years/damageToHumanHealthWaterStress.py

@@ -47,5 +47,5 @@ def run(impact_assessment: dict):
     )
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactAllEffects100Years/damageToMarineEcosystemsMarineEutrophication.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactAllEffects100Years/damageToTerrestrialEcosystemsPhotochemicalOzoneFormation.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactAllEffects100Years/damageToTerrestrialEcosystemsTerrestrialAcidification.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactAllEffectsInfinite/damageToFreshwaterEcosystemsFreshwaterEutrophication.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactAllEffectsInfinite/damageToFreshwaterEcosystemsWaterStress.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv", 'allEffects')
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactAllEffectsInfinite/damageToHumanHealthParticulateMatterFormation.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactAllEffectsInfinite/damageToHumanHealthPhotochemicalOzoneFormation.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactAllEffectsInfinite/damageToHumanHealthWaterStress.py

@@ -47,5 +47,5 @@ def run(impact_assessment: dict):
     )
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactAllEffectsInfinite/damageToMarineEcosystemsMarineEutrophication.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactAllEffectsInfinite/damageToTerrestrialEcosystemsPhotochemicalOzoneFormation.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactAllEffectsInfinite/damageToTerrestrialEcosystemsTerrestrialAcidification.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactCertainEffects100Years/damageToFreshwaterEcosystemsFreshwaterEutrophication.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactCertainEffects100Years/damageToFreshwaterEcosystemsWaterStress.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv", 'certainEffects')
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactCertainEffects100Years/damageToHumanHealthParticulateMatterFormation.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactCertainEffects100Years/damageToHumanHealthPhotochemicalOzoneFormation.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactCertainEffects100Years/damageToHumanHealthWaterStress.py

@@ -47,5 +47,5 @@ def run(impact_assessment: dict):
     )
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactCertainEffects100Years/damageToMarineEcosystemsMarineEutrophication.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactCertainEffects100Years/damageToTerrestrialEcosystemsPhotochemicalOzoneFormation.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactCertainEffects100Years/damageToTerrestrialEcosystemsTerrestrialAcidification.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactCertainEffectsInfinite/damageToFreshwaterEcosystemsFreshwaterEutrophication.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactCertainEffectsInfinite/damageToFreshwaterEcosystemsWaterStress.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv", 'certainEffects')
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactCertainEffectsInfinite/damageToHumanHealthParticulateMatterFormation.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactCertainEffectsInfinite/damageToHumanHealthPhotochemicalOzoneFormation.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactCertainEffectsInfinite/damageToHumanHealthWaterStress.py

@@ -47,5 +47,5 @@ def run(impact_assessment: dict):
     )
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactCertainEffectsInfinite/damageToMarineEcosystemsMarineEutrophication.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystemsPhotochemicalOzoneFormation.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystemsTerrestrialAcidification.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/mocking/build_mock_search.py

@@ -0,0 +1,44 @@
+from inspect import getmembers, isfunction
+from hestia_earth.utils.tools import flatten
+
+from hestia_earth.models.utils import term
+
+_IGNORE_FUNC = ['get_lookup_value', 'get_table_value']
+_original_search_func = term.search
+_original_find_node_func = term.find_node
+
+
+def _map_results(results):
+    # returning the whole term
+    return [results] if isinstance(results, dict) else (
+        {'@type': 'Term', '@id': results} if isinstance(results, str) else
+        flatten(map(_map_results, results)) if isinstance(results, list) else
+        None
+    )
+
+
+def _create_search_result(data: tuple):
+    search_query = {}
+
+    def new_search(query: dict, *_a, **_b):
+        nonlocal search_query
+        search_query = query
+        return _original_search_func(query, *_a, **_b)
+
+    term.search = new_search
+
+    def new_find_node(_n, query: dict, *_a, **_b):
+        nonlocal search_query
+        search_query = query
+        return _original_find_node_func(_n, query, *_a, **_b)
+
+    term.find_node = new_find_node
+
+    function_name, func = data
+    res = func()
+    return {'name': function_name, 'query': search_query, 'results': _map_results(res)}
+
+
+def create_search_results():
+    funcs = list(filter(lambda v: v[0].startswith('get_') and not v[0] in _IGNORE_FUNC, getmembers(term, isfunction)))
+    return list(map(_create_search_result, funcs))

hestia_earth/models/mocking/mock_search.py

@@ -1,48 +1,9 @@
-from inspect import getmembers, isfunction
 import json
-from hestia_earth.utils.tools import flatten
 
 from hestia_earth.models.utils import term
 
-IGNORE_FUNC = ['get_lookup_value', 'get_table_value']
-
-
-def _map_results(results):
-    # returning the whole term
-    return [results] if isinstance(results, dict) else (
-        {'@type': 'Term', '@id': results} if isinstance(results, str) else
-        flatten(map(_map_results, results)) if isinstance(results, list) else
-        None
-    )
-
-
-def _create_search_result(data: tuple):
-    search_query = {}
-
-    original_search = term.search
-
-    def new_search(query: dict, *_a, **_b):
-        nonlocal search_query
-        search_query = query
-        return original_search(query, *_a, **_b)
-    term.search = new_search
-
-    original_find_node = term.find_node
-
-    def new_find_node(_n, query: dict, *_a, **_b):
-        nonlocal search_query
-        search_query = query
-        return original_find_node(_n, query, *_a, **_b)
-    term.find_node = new_find_node
-
-    function_name, func = data
-    res = func()
-    return {'name': function_name, 'query': search_query, 'results': _map_results(res)}
-
-
-def create_search_results():
-    funcs = list(filter(lambda v: v[0].startswith('get_') and not v[0] in IGNORE_FUNC, getmembers(term, isfunction)))
-    return list(map(_create_search_result, funcs))
+_original_search_func = term.search
+_original_find_node_func = term.find_node
 
 
 def _load_results(filepath: str):
@@ -56,22 +17,20 @@ def _find_search_result(filepath: str, query: dict):
     return None if res is None else res.get('results', [])
 
 
-def _mocked_search(original_func, filepath: str):
+def _mocked_search(filepath: str):
     def mock(query: dict, **kwargs):
         result = _find_search_result(filepath, query)
-        return original_func(query, **kwargs) if result is None else result
+        return _original_search_func(query, **kwargs) if result is None else result
     return mock
 
 
-def _mocked_find_node(original_func, filepath: str):
+def _mocked_find_node(filepath: str):
     def mock(node_type: str, query: dict, **kwargs):
         result = _find_search_result(filepath, query)
-        return original_func(node_type, query, **kwargs) if result is None else result
+        return _original_find_node_func(node_type, query, **kwargs) if result is None else result
     return mock
 
 
 def mock(filepath: str):
-    original_search = term.search
-    term.search = _mocked_search(original_search, filepath)
-    original_find_node = term.find_node
-    term.find_node = _mocked_find_node(original_find_node, filepath)
+    term.search = _mocked_search(filepath)
+    term.find_node = _mocked_find_node(filepath)