hestia-earth-models 0.64.12__py3-none-any.whl → 0.64.14__py3-none-any.whl

hestia_earth/models/pooreNemecek2018/excretaKgN.py

@@ -73,9 +73,9 @@ RETURNS = {
 }
 LOOKUPS = {
     "crop-property": ["nitrogenContent", "crudeProteinContent"],
-    "animalProduct": ["excretaKgNTermId", "allowedExcretaKgNTermIds"],
-    "liveAnimal": ["excretaKgNTermId", "allowedExcretaKgNTermIds"],
-    "liveAquaticSpecies": ["excretaKgNTermId", "allowedExcretaKgNTermIds"]
+    "animalProduct": ["excretaKgNTermIds", "allowedExcretaKgNTermIds"],
+    "liveAnimal": ["excretaKgNTermIds", "allowedExcretaKgNTermIds"],
+    "liveAquaticSpecies": ["excretaKgNTermIds", "allowedExcretaKgNTermIds"]
 }
 MODEL_KEY = 'excretaKgN'
 
@@ -94,7 +94,7 @@ def _run(excreta_product: dict, mass_balance_items: list, alternate_items: list)
 
 def _get_excreta_product(cycle: dict, primary_product: dict):
     term = primary_product.get('term', {})
-    return get_excreta_product(cycle, term, 'excretaKgNTermId', 'allowedExcretaKgNTermIds')
+    return get_excreta_product(cycle, term, 'excretaKgNTermIds', 'allowedExcretaKgNTermIds')
 
 
 def _should_run(cycle: dict):

hestia_earth/models/pooreNemecek2018/excretaKgVs.py

@@ -89,9 +89,9 @@ RETURNS = {
 }
 LOOKUPS = {
     "crop-property": ["carbonContent", "energyContentHigherHeatingValue"],
-    "animalProduct": ["excretaKgVsTermId", "allowedExcretaKgVsTermIds"],
-    "liveAnimal": ["excretaKgVsTermId", "allowedExcretaKgVsTermIds"],
-    "liveAquaticSpecies": ["excretaKgVsTermId", "allowedExcretaKgVsTermIds"]
+    "animalProduct": ["excretaKgVsTermIds", "allowedExcretaKgVsTermIds"],
+    "liveAnimal": ["excretaKgVsTermIds", "allowedExcretaKgVsTermIds"],
+    "liveAquaticSpecies": ["excretaKgVsTermIds", "allowedExcretaKgVsTermIds"]
 }
 MODEL_KEY = 'excretaKgVs'
 
@@ -129,7 +129,7 @@ def _get_conv_aq_ocsed(siteType: str):
 
 def _get_excreta_product(cycle: dict, primary_product: dict):
     term = primary_product.get('term', {})
-    return get_excreta_product(cycle, term, 'excretaKgVsTermId', 'allowedExcretaKgVsTermIds')
+    return get_excreta_product(cycle, term, 'excretaKgVsTermIds', 'allowedExcretaKgVsTermIds')
 
 
 def _should_run(cycle: dict):

hestia_earth/models/pooreNemecek2018/no3ToGroundwaterCropResidueDecomposition.py

@@ -2,7 +2,7 @@ from hestia_earth.schema import EmissionMethodTier
 
 from hestia_earth.models.utils.emission import _new_emission
 from hestia_earth.models.utils.cycle import get_crop_residue_decomposition_N_total
-from .no3ToGroundwaterSoilFlux import _should_run, _get_value
+from .no3ToGroundwaterSoilFlux_utils import _should_run, _get_value
 from . import MODEL
 
 REQUIREMENTS = {

hestia_earth/models/pooreNemecek2018/no3ToGroundwaterExcreta.py

@@ -2,7 +2,7 @@ from hestia_earth.schema import EmissionMethodTier
 
 from hestia_earth.models.utils.cycle import get_excreta_N_total
 from hestia_earth.models.utils.emission import _new_emission
-from .no3ToGroundwaterSoilFlux import _should_run, _get_value
+from .no3ToGroundwaterSoilFlux_utils import _should_run, _get_value
 from . import MODEL
 
 REQUIREMENTS = {

hestia_earth/models/pooreNemecek2018/no3ToGroundwaterInorganicFertiliser.py

@@ -2,7 +2,7 @@ from hestia_earth.schema import EmissionMethodTier
 
 from hestia_earth.models.utils.cycle import get_inorganic_fertiliser_N_total
 from hestia_earth.models.utils.emission import _new_emission
-from .no3ToGroundwaterSoilFlux import _should_run, _get_value
+from .no3ToGroundwaterSoilFlux_utils import _should_run, _get_value
 from . import MODEL
 
 REQUIREMENTS = {

hestia_earth/models/pooreNemecek2018/no3ToGroundwaterOrganicFertiliser.py

@@ -2,7 +2,7 @@ from hestia_earth.schema import EmissionMethodTier
 
 from hestia_earth.models.utils.cycle import get_organic_fertiliser_N_total
 from hestia_earth.models.utils.emission import _new_emission
-from .no3ToGroundwaterSoilFlux import _should_run, _get_value
+from .no3ToGroundwaterSoilFlux_utils import _should_run, _get_value
 from . import MODEL
 
 REQUIREMENTS = {

hestia_earth/models/pooreNemecek2018/{saplings.py → saplingsDepreciatedAmountPerCycle.py}

@@ -24,7 +24,7 @@ RETURNS = {
         "value": ""
     }]
 }
-TERM_ID = 'saplings'
+TERM_ID = 'saplingsDepreciatedAmountPerCycle'
 
 
 def _input(value: float):

hestia_earth/models/pooreNemecek2018/utils.py

@@ -1,5 +1,6 @@
 from hestia_earth.utils.model import find_term_match
 from hestia_earth.utils.tools import non_empty_list, list_average
+from hestia_earth.utils.lookup import extract_grouped_data
 
 from hestia_earth.models.log import logShouldRun, logRequirements, log_as_table
 from hestia_earth.models.utils.term import get_lookup_value
@@ -29,7 +30,12 @@ def run_products_average(cycle: dict, term_id: str, get_value_func):
 
 
 def get_excreta_product(cycle: dict, term: dict, lookup_expected_id: str, lookup_allowed_ids: str):
-    expected_term_id = get_lookup_value(term, lookup_expected_id, model=MODEL)
+    primary_excreta_data = get_lookup_value(term, lookup_expected_id, model=MODEL) or (
+        # TODO: remove fallback when glossary is fixed for liveAquaticSpecies
+        get_lookup_value(term, lookup_expected_id[0:-1], model=MODEL) or ''
+    )
+    expected_term_id = extract_grouped_data(primary_excreta_data, 'default') if ':' in primary_excreta_data \
+        else primary_excreta_data
     allowed_term_ids = (get_lookup_value(term, lookup_allowed_ids, model=MODEL) or '').split(';')
     products = non_empty_list([
         find_term_match(cycle.get('products', []), term_id) for term_id in non_empty_list(

hestia_earth/models/preload_requests.py

@@ -3,13 +3,31 @@ Preload all search requests to avoid making the same searches many times while r
 """
 import json
 import os
+from hestia_earth.utils.storage import _load_from_storage
 
 from .log import logger
 from .mocking.build_mock_search import create_search_results
 from .mocking import RESULTS_PATH, enable_mock as _mock
 
 
-def enable_preload(filepath: str = RESULTS_PATH, node: dict = None, overwrite_existing: bool = True):
+def _write_results(filepath: str, data: dict):
+    with open(filepath, 'w') as f:
+        f.write(json.dumps(data, indent=2, ensure_ascii=False))
+
+
+def _load_data_from_glossary():
+    try:
+        return json.loads(_load_from_storage(os.path.join('glossary', 'models-search-results.json'), glossary=True))
+    except Exception:
+        return None
+
+
+def enable_preload(
+    filepath: str = RESULTS_PATH,
+    node: dict = None,
+    overwrite_existing: bool = True,
+    use_glossary: bool = False
+):
     """
     Prefetch calls to HESTIA API in a local file.
 
@@ -22,6 +40,9 @@ def enable_preload(filepath: str = RESULTS_PATH, node: dict = None, overwrite_ex
     overwrite_existing : bool
         Optional - If the file already exists, the file can be used instead of generating it again.
         Will overwrite by default.
+    use_glossary : bool
+        Optional - Try to fetch search results from the glossary.
+        Only available with access to HESTIA infrastructure.
     """
     should_generate = overwrite_existing or not os.path.exists(filepath)
 
@@ -29,11 +50,10 @@ def enable_preload(filepath: str = RESULTS_PATH, node: dict = None, overwrite_ex
         logger.debug('Preloading search results and storing in %s', filepath)
 
         # build the search results
-        data = create_search_results()
+        data = (_load_data_from_glossary() if use_glossary else None) or create_search_results()
 
         # store in file
-        with open(filepath, 'w') as f:
-            f.write(json.dumps(data, indent=2, ensure_ascii=False))
+        _write_results(filepath, data)
 
     # enable mock search results from file
     _mock(filepath=filepath, node=node)

hestia_earth/models/recipe2016Egalitarian/damageToFreshwaterEcosystemsSpeciesYear.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_endpoint_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['characterisedIndicator'])
     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 _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Egalitarian/damageToHumanHealth.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_endpoint_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['characterisedIndicator'])
     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 _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Egalitarian/damageToMarineEcosystemsSpeciesYear.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_endpoint_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['characterisedIndicator'])
     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 _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Egalitarian/damageToTerrestrialEcosystemsSpeciesYear.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_endpoint_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['characterisedIndicator'])
     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 _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Egalitarian/freshwaterAquaticEcotoxicityPotential14Dcbeq.py

@@ -1,5 +1,5 @@
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.pesticideAI import impact_lookup_value, impact_value_set_none
+from hestia_earth.models.utils.pesticideAI import impact_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -30,5 +30,4 @@ def _indicator(value: float):
 
 def run(impact_assessment: dict):
     value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['pesticideAI'])
-    should_run = any([value is not None, impact_value_set_none(impact_assessment)])
-    return _indicator(value) if should_run else None
+    return _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Egalitarian/freshwaterEutrophicationPotential.py

@@ -29,5 +29,5 @@ def run(impact_assessment: dict):
     value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     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 _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Egalitarian/humanCarcinogenicToxicity.py

@@ -1,5 +1,5 @@
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.pesticideAI import impact_lookup_value, impact_value_set_none
+from hestia_earth.models.utils.pesticideAI import impact_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -30,5 +30,4 @@ def _indicator(value: float):
 
 def run(impact_assessment: dict):
     value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['pesticideAI'])
-    should_run = any([value is not None, impact_value_set_none(impact_assessment)])
-    return _indicator(value) if should_run else None
+    return _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Egalitarian/humanNonCarcinogenicToxicity.py

@@ -1,5 +1,5 @@
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.pesticideAI import impact_lookup_value, impact_value_set_none
+from hestia_earth.models.utils.pesticideAI import impact_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -30,5 +30,4 @@ def _indicator(value: float):
 
 def run(impact_assessment: dict):
     value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['pesticideAI'])
-    should_run = any([value is not None, impact_value_set_none(impact_assessment)])
-    return _indicator(value) if should_run else None
+    return _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Egalitarian/marineAquaticEcotoxicityPotential14Dcbeq.py

@@ -1,5 +1,5 @@
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.pesticideAI import impact_lookup_value, impact_value_set_none
+from hestia_earth.models.utils.pesticideAI import impact_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -30,5 +30,4 @@ def _indicator(value: float):
 
 def run(impact_assessment: dict):
     value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['pesticideAI'])
-    should_run = any([value is not None, impact_value_set_none(impact_assessment)])
-    return _indicator(value) if should_run else None
+    return _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Egalitarian/marineEutrophicationPotential.py

@@ -29,5 +29,5 @@ def run(impact_assessment: dict):
     value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     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 _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Egalitarian/ozoneDepletionPotential.py

@@ -29,5 +29,5 @@ def run(impact_assessment: dict):
     value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     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 _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Egalitarian/terrestrialAcidificationPotential.py

@@ -29,5 +29,5 @@ def run(impact_assessment: dict):
     value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     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 _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Egalitarian/terrestrialEcotoxicityPotential14Dcbeq.py

@@ -1,5 +1,5 @@
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.pesticideAI import impact_lookup_value, impact_value_set_none
+from hestia_earth.models.utils.pesticideAI import impact_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -30,5 +30,4 @@ def _indicator(value: float):
 
 def run(impact_assessment: dict):
     value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['pesticideAI'])
-    should_run = any([value is not None, impact_value_set_none(impact_assessment)])
-    return _indicator(value) if should_run else None
+    return _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Hierarchist/damageToFreshwaterEcosystemsSpeciesYear.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_endpoint_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['characterisedIndicator'])
     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 _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Hierarchist/damageToHumanHealth.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_endpoint_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['characterisedIndicator'])
     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 _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Hierarchist/damageToMarineEcosystemsSpeciesYear.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_endpoint_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['characterisedIndicator'])
     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 _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Hierarchist/damageToTerrestrialEcosystemsSpeciesYear.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_endpoint_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['characterisedIndicator'])
     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 _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Hierarchist/freshwaterAquaticEcotoxicityPotential14Dcbeq.py

@@ -1,5 +1,5 @@
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.pesticideAI import impact_lookup_value, impact_value_set_none
+from hestia_earth.models.utils.pesticideAI import impact_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -30,5 +30,4 @@ def _indicator(value: float):
 
 def run(impact_assessment: dict):
     value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['pesticideAI'])
-    should_run = any([value is not None, impact_value_set_none(impact_assessment)])
-    return _indicator(value) if should_run else None
+    return _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Hierarchist/freshwaterEutrophicationPotential.py

@@ -29,5 +29,5 @@ def run(impact_assessment: dict):
     value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     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 _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Hierarchist/humanCarcinogenicToxicity.py

@@ -1,5 +1,5 @@
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.pesticideAI import impact_lookup_value, impact_value_set_none
+from hestia_earth.models.utils.pesticideAI import impact_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -30,5 +30,4 @@ def _indicator(value: float):
 
 def run(impact_assessment: dict):
     value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['pesticideAI'])
-    should_run = any([value is not None, impact_value_set_none(impact_assessment)])
-    return _indicator(value) if should_run else None
+    return _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Hierarchist/humanNonCarcinogenicToxicity.py

@@ -1,5 +1,5 @@
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.pesticideAI import impact_lookup_value, impact_value_set_none
+from hestia_earth.models.utils.pesticideAI import impact_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -30,5 +30,4 @@ def _indicator(value: float):
 
 def run(impact_assessment: dict):
     value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['pesticideAI'])
-    should_run = any([value is not None, impact_value_set_none(impact_assessment)])
-    return _indicator(value) if should_run else None
+    return _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Hierarchist/marineAquaticEcotoxicityPotential14Dcbeq.py

@@ -1,5 +1,5 @@
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.pesticideAI import impact_lookup_value, impact_value_set_none
+from hestia_earth.models.utils.pesticideAI import impact_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -30,5 +30,4 @@ def _indicator(value: float):
 
 def run(impact_assessment: dict):
     value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['pesticideAI'])
-    should_run = any([value is not None, impact_value_set_none(impact_assessment)])
-    return _indicator(value) if should_run else None
+    return _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Hierarchist/marineEutrophicationPotential.py

@@ -29,5 +29,5 @@ def run(impact_assessment: dict):
     value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     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 _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Hierarchist/ozoneDepletionPotential.py

@@ -29,5 +29,5 @@ def run(impact_assessment: dict):
     value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     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 _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Hierarchist/terrestrialAcidificationPotential.py

@@ -29,5 +29,5 @@ def run(impact_assessment: dict):
     value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     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 _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Hierarchist/terrestrialEcotoxicityPotential14Dcbeq.py

@@ -1,5 +1,5 @@
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.pesticideAI import impact_lookup_value, impact_value_set_none
+from hestia_earth.models.utils.pesticideAI import impact_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -30,5 +30,4 @@ def _indicator(value: float):
 
 def run(impact_assessment: dict):
     value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['pesticideAI'])
-    should_run = any([value is not None, impact_value_set_none(impact_assessment)])
-    return _indicator(value) if should_run else None
+    return _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Individualist/damageToFreshwaterEcosystemsSpeciesYear.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_endpoint_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['characterisedIndicator'])
     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 _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Individualist/damageToHumanHealth.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_endpoint_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['characterisedIndicator'])
     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 _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Individualist/damageToMarineEcosystemsSpeciesYear.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_endpoint_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['characterisedIndicator'])
     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 _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Individualist/damageToTerrestrialEcosystemsSpeciesYear.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_endpoint_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['characterisedIndicator'])
     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 _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Individualist/freshwaterAquaticEcotoxicityPotential14Dcbeq.py

@@ -1,5 +1,5 @@
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.pesticideAI import impact_lookup_value, impact_value_set_none
+from hestia_earth.models.utils.pesticideAI import impact_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -30,5 +30,4 @@ def _indicator(value: float):
 
 def run(impact_assessment: dict):
     value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['pesticideAI'])
-    should_run = any([value is not None, impact_value_set_none(impact_assessment)])
-    return _indicator(value) if should_run else None
+    return _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Individualist/freshwaterEutrophicationPotential.py

@@ -29,5 +29,5 @@ def run(impact_assessment: dict):
     value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     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 _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Individualist/humanCarcinogenicToxicity.py

@@ -1,5 +1,5 @@
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.pesticideAI import impact_lookup_value, impact_value_set_none
+from hestia_earth.models.utils.pesticideAI import impact_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -30,5 +30,4 @@ def _indicator(value: float):
 
 def run(impact_assessment: dict):
     value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['pesticideAI'])
-    should_run = any([value is not None, impact_value_set_none(impact_assessment)])
-    return _indicator(value) if should_run else None
+    return _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Individualist/humanNonCarcinogenicToxicity.py

@@ -1,5 +1,5 @@
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.pesticideAI import impact_lookup_value, impact_value_set_none
+from hestia_earth.models.utils.pesticideAI import impact_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -30,5 +30,4 @@ def _indicator(value: float):
 
 def run(impact_assessment: dict):
     value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['pesticideAI'])
-    should_run = any([value is not None, impact_value_set_none(impact_assessment)])
-    return _indicator(value) if should_run else None
+    return _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Individualist/marineAquaticEcotoxicityPotential14Dcbeq.py

@@ -1,5 +1,5 @@
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.pesticideAI import impact_lookup_value, impact_value_set_none
+from hestia_earth.models.utils.pesticideAI import impact_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -30,5 +30,4 @@ def _indicator(value: float):
 
 def run(impact_assessment: dict):
     value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['pesticideAI'])
-    should_run = any([value is not None, impact_value_set_none(impact_assessment)])
-    return _indicator(value) if should_run else None
+    return _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Individualist/marineEutrophicationPotential.py

@@ -29,5 +29,5 @@ def run(impact_assessment: dict):
     value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     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 _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Individualist/ozoneDepletionPotential.py

@@ -29,5 +29,5 @@ def run(impact_assessment: dict):
     value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     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 _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Individualist/terrestrialAcidificationPotential.py

@@ -29,5 +29,5 @@ def run(impact_assessment: dict):
     value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     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 _indicator(value) if value is not None else None

hestia_earth/models/recipe2016Individualist/terrestrialEcotoxicityPotential14Dcbeq.py

@@ -1,5 +1,5 @@
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.pesticideAI import impact_lookup_value, impact_value_set_none
+from hestia_earth.models.utils.pesticideAI import impact_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -30,5 +30,4 @@ def _indicator(value: float):
 
 def run(impact_assessment: dict):
     value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['pesticideAI'])
-    should_run = any([value is not None, impact_value_set_none(impact_assessment)])
-    return _indicator(value) if should_run else None
+    return _indicator(value) if value is not None else None