hestia-earth-models 0.74.10__py3-none-any.whl → 0.74.12__py3-none-any.whl

hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py

@@ -24,9 +24,7 @@ RETURNS = {
 TERM_ID = 'aboveGroundCropResidueTotal'
 
 
-def _product(value: float):
-    product = _new_product(TERM_ID, value, MODEL)
-    return product
+def _product(value: float = None): return _new_product(term=TERM_ID, model=MODEL, value=value)
 
 
 def _get_lookup_value(product: dict):

hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py

@@ -24,9 +24,7 @@ RETURNS = {
 TERM_ID = 'belowGroundCropResidue'
 
 
-def _product(value: float):
-    product = _new_product(TERM_ID, value, MODEL)
-    return product
+def _product(value: float = None): return _new_product(term=TERM_ID, model=MODEL, value=value)
 
 
 def _get_lookup_value(product: dict):

hestia_earth/models/pooreNemecek2018/ch4ToAirAquacultureSystems.py

@@ -90,8 +90,7 @@ MOC_FROM_SYS = {
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/pooreNemecek2018/excretaKgN.py

@@ -1,9 +1,8 @@
 from hestia_earth.schema import TermTermType
 from hestia_earth.utils.model import find_primary_product
-from hestia_earth.utils.tools import list_sum
+from hestia_earth.utils.tools import list_sum, omit
 
 from hestia_earth.models.log import logRequirements, logShouldRun
-from hestia_earth.models.utils import _omit
 from hestia_earth.models.utils.property import _get_nitrogen_content
 from hestia_earth.models.utils.input import get_feed_inputs
 from hestia_earth.models.utils.product import _new_product, get_animal_produced_nitrogen
@@ -71,8 +70,8 @@ MODEL_KEY = 'excretaKgN'
 
 
 def _product(excreta_product: str, value: float = None):
-    product = _new_product(excreta_product.get('term', {}).get('@id'), value, MODEL)
-    return _omit(excreta_product, ['value']) | product
+    product = _new_product(term=excreta_product.get('term', {}).get('@id'), model=MODEL, value=value)
+    return omit(excreta_product, ['value']) | product
 
 
 def _run_no_value(excreta_products: list):

hestia_earth/models/pooreNemecek2018/excretaKgVs.py

@@ -1,9 +1,9 @@
 from hestia_earth.schema import SiteSiteType, TermTermType
 from hestia_earth.utils.model import find_primary_product, find_term_match, filter_list_term_type
-from hestia_earth.utils.tools import list_sum, safe_parse_float
+from hestia_earth.utils.tools import list_sum, safe_parse_float, omit
 
 from hestia_earth.models.log import logRequirements, logShouldRun
-from hestia_earth.models.utils import get_kg_VS_term_id, _filter_list_term_unit, _omit
+from hestia_earth.models.utils import get_kg_VS_term_id, _filter_list_term_unit
 from hestia_earth.models.utils.constant import Units
 from hestia_earth.models.utils.term import get_lookup_value
 from hestia_earth.models.utils.property import get_node_property
@@ -104,8 +104,8 @@ Conv_AQ_OC_OCSed_Fresh = 0.35
 
 
 def _product(excreta_product: str, value: float = None):
-    product = _new_product(excreta_product.get('term', {}).get('@id'), value, MODEL)
-    return _omit(excreta_product, ['value']) | product
+    product = _new_product(term=excreta_product.get('term', {}).get('@id'), model=MODEL, value=value)
+    return omit(excreta_product, ['value']) | product
 
 
 def _run_no_value(excreta_vs_products: list, excreta_n_products: list):

hestia_earth/models/pooreNemecek2018/freshwaterWithdrawalsDuringCycle.py

@@ -1,5 +1,5 @@
 from hestia_earth.schema import TermTermType
-from hestia_earth.utils.tools import list_sum, safe_parse_float
+from hestia_earth.utils.tools import list_sum, safe_parse_float, non_empty_list
 from hestia_earth.utils.model import filter_list_term_type
 
 from hestia_earth.models.log import debugValues, logRequirements, logShouldRun, log_as_table
@@ -52,12 +52,6 @@ LOOKUPS = {
 TERM_ID = 'freshwaterWithdrawalsDuringCycle'
 
 
-def _indicator(term_id: str, value: float):
-    indicator = _new_indicator(term_id, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 def _get_conveyancing_efficiency_from_waterRegime(impact_assessment: dict):
     practices = filter_list_term_type(impact_assessment.get('cycle', {}).get('practices', []), TermTermType.WATERREGIME)
     practices_with_factors = [
@@ -110,7 +104,7 @@ def _run(impact_assessment: dict, product: dict, irrigation: float):
     )
     debugValues(impact_assessment, model=MODEL, term=TERM_ID,
                 value=value)
-    return _indicator(TERM_ID, value)
+    return non_empty_list([_new_indicator(term=TERM_ID, model=MODEL, value=value)])
 
 
 def _get_irrigation(impact_assessment: dict):
@@ -139,4 +133,4 @@ def _should_run(impact_assessment: dict):
 
 def run(impact_assessment: dict):
     should_run, product, irrigation = _should_run(impact_assessment)
-    return [_run(impact_assessment, product, irrigation)] if should_run else []
+    return _run(impact_assessment, product, irrigation) if should_run else []

hestia_earth/models/pooreNemecek2018/landOccupationDuringCycle.py

@@ -45,12 +45,6 @@ RETURNS = {
 TERM_ID = 'landOccupationDuringCycle'
 
 
-def _indicator(term_id: str, value: float, land_cover_term_id: str):
-    indicator = _new_indicator(term_id, MODEL, land_cover_term_id)
-    indicator['value'] = value
-    return indicator
-
-
 def _should_run(impact_assessment: dict):
     product = get_product(impact_assessment)
     product_evs = product.get('economicValueShare')
@@ -74,4 +68,6 @@ def _should_run(impact_assessment: dict):
 
 def run(impact_assessment: dict):
     should_run, land_occupation_kg, land_cover_term_id = _should_run(impact_assessment)
-    return [_indicator(TERM_ID, land_occupation_kg, land_cover_term_id)] if should_run else []
+    return [
+        _new_indicator(term=TERM_ID, model=MODEL, value=land_occupation_kg, land_cover_id=land_cover_term_id)
+    ] if should_run else []

hestia_earth/models/pooreNemecek2018/longFallowDuration.py

@@ -21,12 +21,6 @@ RETURNS = {
 TERM_ID = 'longFallowDuration'
 
 
-def _practice(value: float):
-    practice = _new_practice(TERM_ID, MODEL)
-    practice['value'] = [value]
-    return practice
-
-
 def _get_value(product: dict):
     term_id = product.get('term', {}).get('@id', '')
     return safe_parse_float(get_crop_lookup_value(MODEL, TERM_ID, term_id, LOOKUPS['crop']), default=None)
@@ -34,7 +28,7 @@ def _get_value(product: dict):
 
 def _run(product: dict):
     value = _get_value(product)
-    return [_practice(value)]
+    return [_new_practice(term=TERM_ID, model=MODEL, value=value)]
 
 
 def _should_run_product(product: dict): return _get_value(product) is not None

hestia_earth/models/pooreNemecek2018/n2OToAirAquacultureSystemsDirect.py

@@ -34,8 +34,7 @@ EF_Aqua = {'NH3N_N2ON': 0.018, 'OtherN_N2ON': 0.005}
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/pooreNemecek2018/n2ToAirAquacultureSystems.py

@@ -33,8 +33,7 @@ EF_Aqua = {'NH3N_N2N': 0.054, 'OtherN_N2N': 0.015}
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/pooreNemecek2018/nh3ToAirAquacultureSystems.py

@@ -48,8 +48,7 @@ EF_Aqua = {'TAN_NH3N': 0.3, 'MAX_NH3N': 0.00005}
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/pooreNemecek2018/no3ToGroundwaterCropResidueDecomposition.py

@@ -40,8 +40,7 @@ TIER = EmissionMethodTier.TIER_2.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/pooreNemecek2018/no3ToGroundwaterExcreta.py

@@ -45,8 +45,7 @@ TIER = EmissionMethodTier.TIER_2.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/pooreNemecek2018/no3ToGroundwaterInorganicFertiliser.py

@@ -48,8 +48,7 @@ TIER = EmissionMethodTier.TIER_2.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/pooreNemecek2018/no3ToGroundwaterOrganicFertiliser.py

@@ -48,8 +48,7 @@ TIER = EmissionMethodTier.TIER_2.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/pooreNemecek2018/no3ToGroundwaterSoilFlux_utils.py

@@ -56,8 +56,7 @@ TIER = EmissionMethodTier.TIER_2.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/pooreNemecek2018/noxToAirAquacultureSystems.py

@@ -40,8 +40,7 @@ EF_Aqua = {'NH3N_NON': 0.0018, 'OtherN_NON': 0.0005}
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/pooreNemecek2018/nurseryDensity.py

@@ -26,12 +26,6 @@ def _get_value(product: dict):
     return safe_parse_float(get_crop_lookup_value(MODEL, TERM_ID, term_id, LOOKUPS['crop']), default=None)
 
 
-def _practice(value: float):
-    practice = _new_practice(TERM_ID, MODEL)
-    practice['value'] = [value]
-    return practice
-
-
 def run(cycle: dict):
     value = run_products_average(cycle, TERM_ID, _get_value)
-    return [_practice(value)] if value is not None else []
+    return [_new_practice(term=TERM_ID, model=MODEL, value=value)] if value is not None else []

hestia_earth/models/pooreNemecek2018/nurseryDuration.py

@@ -21,12 +21,6 @@ RETURNS = {
 TERM_ID = 'nurseryDuration'
 
 
-def _practice(value: float):
-    practice = _new_practice(TERM_ID, MODEL)
-    practice['value'] = [value]
-    return practice
-
-
 def _get_value(product: dict):
     term_id = product.get('term', {}).get('@id', '')
     return safe_parse_float(get_crop_lookup_value(MODEL, TERM_ID, term_id, LOOKUPS['crop']), default=None)
@@ -34,4 +28,4 @@ def _get_value(product: dict):
 
 def run(cycle: dict):
     value = run_products_average(cycle, TERM_ID, _get_value)
-    return [_practice(value)] if value is not None else []
+    return [_new_practice(term=TERM_ID, model=MODEL, value=value)] if value is not None else []

hestia_earth/models/pooreNemecek2018/plantationDensity.py

@@ -21,12 +21,6 @@ RETURNS = {
 TERM_ID = 'plantationDensity'
 
 
-def _practice(value: float):
-    practice = _new_practice(TERM_ID, MODEL)
-    practice['value'] = [value]
-    return practice
-
-
 def _get_value(product: dict):
     term_id = product.get('term', {}).get('@id', '')
     return safe_parse_float(get_crop_lookup_value(MODEL, TERM_ID, term_id, LOOKUPS['crop']), default=None)
@@ -34,4 +28,4 @@ def _get_value(product: dict):
 
 def run(cycle: dict):
     value = run_products_average(cycle, TERM_ID, _get_value)
-    return [_practice(value)] if value is not None else []
+    return [_new_practice(term=TERM_ID, model=MODEL, value=value)] if value is not None else []

hestia_earth/models/pooreNemecek2018/plantationLifespan.py

@@ -26,12 +26,6 @@ def _get_value(product: dict):
     return safe_parse_float(get_crop_lookup_value(MODEL, TERM_ID, term_id, LOOKUPS['crop']), default=None)
 
 
-def _practice(value: float):
-    practice = _new_practice(TERM_ID, MODEL)
-    practice['value'] = [value]
-    return practice
-
-
 def run(cycle: dict):
     value = run_products_average(cycle, TERM_ID, _get_value)
-    return [_practice(value)] if value is not None else []
+    return [_new_practice(term=TERM_ID, model=MODEL, value=value)] if value is not None else []

hestia_earth/models/pooreNemecek2018/plantationProductiveLifespan.py

@@ -23,12 +23,6 @@ RETURNS = {
 TERM_ID = 'plantationProductiveLifespan'
 
 
-def _practice(value: float):
-    practice = _new_practice(TERM_ID, MODEL)
-    practice['value'] = [value]
-    return practice
-
-
 def _get_value(cycle: dict):
     def get(product: dict):
         term_id = product.get('term', {}).get('@id', '')
@@ -51,4 +45,4 @@ def _get_value(cycle: dict):
 
 def run(cycle: dict):
     value = run_products_average(cycle, TERM_ID, _get_value(cycle))
-    return [_practice(value)] if value is not None else []
+    return [_new_practice(term=TERM_ID, model=MODEL, value=value)] if value is not None else []

hestia_earth/models/pooreNemecek2018/rotationDuration.py

@@ -22,12 +22,6 @@ RETURNS = {
 TERM_ID = 'rotationDuration'
 
 
-def _practice(value: float):
-    practice = _new_practice(TERM_ID, MODEL)
-    practice['value'] = [value]
-    return practice
-
-
 def _get_value(cycle: dict):
     def get(product: dict):
         plantationLifespan = get_plantationLifespan(product)
@@ -45,4 +39,4 @@ def _get_value(cycle: dict):
 
 def run(cycle: dict):
     value = run_products_average(cycle, TERM_ID, _get_value(cycle))
-    return [_practice(value)] if value is not None else []
+    return [_new_practice(term=TERM_ID, model=MODEL, value=value)] if value is not None else []

hestia_earth/models/pooreNemecek2018/saplingsDepreciatedAmountPerCycle.py

@@ -27,12 +27,6 @@ RETURNS = {
 TERM_ID = 'saplingsDepreciatedAmountPerCycle'
 
 
-def _input(value: float):
-    input = _new_input(TERM_ID, MODEL)
-    input['value'] = [value]
-    return input
-
-
 def _get_value(product: dict):
     term_id = product.get('term', {}).get('@id', '')
     return safe_parse_float(get_crop_lookup_value(MODEL, TERM_ID, term_id, LOOKUPS['crop']), default=None)
@@ -40,7 +34,7 @@ def _get_value(product: dict):
 
 def _run(product: dict, plantationLifespan: float, cycleDuration: float):
     value = _get_value(product)
-    return [_input(value / plantationLifespan * cycleDuration)]
+    return [_new_input(term=TERM_ID, model=MODEL, value=value / plantationLifespan * cycleDuration)]
 
 
 def _should_run_product(product: dict): return _get_value(product) is not None

hestia_earth/models/poschEtAl2008/terrestrialAcidificationPotentialAccumulatedExceedance.py

@@ -28,16 +28,10 @@ TERM_ID = 'terrestrialAcidificationPotentialAccumulatedExceedance'
 LOOKUP = f"{list(LOOKUPS.keys())[0]}.csv"
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv",
                                  default_world_value=True)
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
-    return None if value is None else _indicator(value)
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)

hestia_earth/models/poschEtAl2008/terrestrialEutrophicationPotentialAccumulatedExceedance.py

@@ -28,16 +28,10 @@ TERM_ID = 'terrestrialEutrophicationPotentialAccumulatedExceedance'
 LOOKUP = f"{list(LOOKUPS.keys())[0]}.csv"
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv",
                                  default_world_value=True)
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
-    return None if value is None else _indicator(value)
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)

hestia_earth/models/recipe2016Egalitarian/damageToFreshwaterEcosystemsSpeciesYear.py

@@ -23,15 +23,9 @@ LOOKUPS = {
 TERM_ID = 'damageToFreshwaterEcosystemsSpeciesYear'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 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, value is not None)
-    return _indicator(value) if value is not None else None
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)

hestia_earth/models/recipe2016Egalitarian/damageToHumanHealth.py

@@ -23,15 +23,9 @@ LOOKUPS = {
 TERM_ID = 'damageToHumanHealth'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 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, value is not None)
-    return _indicator(value) if value is not None else None
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)

hestia_earth/models/recipe2016Egalitarian/damageToMarineEcosystemsSpeciesYear.py

@@ -23,15 +23,9 @@ LOOKUPS = {
 TERM_ID = 'damageToMarineEcosystemsSpeciesYear'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 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, value is not None)
-    return _indicator(value) if value is not None else None
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)

hestia_earth/models/recipe2016Egalitarian/damageToResourceAvailability.py

@@ -22,12 +22,6 @@ LOOKUPS = {
 TERM_ID = 'damageToResourceAvailability'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 def run(impact_assessment: dict):
     value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['fuel'])
-    return None if value is None else _indicator(value)
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)

hestia_earth/models/recipe2016Egalitarian/damageToTerrestrialEcosystemsSpeciesYear.py

@@ -23,15 +23,9 @@ LOOKUPS = {
 TERM_ID = 'damageToTerrestrialEcosystemsSpeciesYear'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 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, value is not None)
-    return _indicator(value) if value is not None else None
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)

hestia_earth/models/recipe2016Egalitarian/ecosystemDamageOzoneFormation.py

@@ -27,12 +27,6 @@ LOOKUPS = {
 TERM_ID = 'ecosystemDamageOzoneFormation'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 def run(impact_assessment: dict):
     emissions_value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
@@ -45,4 +39,4 @@ def run(impact_assessment: dict):
     should_run = all([value is not None])
     logShouldRun(impact_assessment, MODEL, TERM_ID, should_run)
 
-    return _indicator(value) if should_run else None
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value) if should_run else None

hestia_earth/models/recipe2016Egalitarian/fossilResourceScarcity.py

@@ -22,12 +22,6 @@ LOOKUPS = {
 TERM_ID = 'fossilResourceScarcity'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 def run(impact_assessment: dict):
     value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['fuel'])
-    return None if value is None else _indicator(value)
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)

hestia_earth/models/recipe2016Egalitarian/freshwaterAquaticEcotoxicityPotential14Dcbeq.py

@@ -22,12 +22,6 @@ LOOKUPS = {
 TERM_ID = 'freshwaterAquaticEcotoxicityPotential14Dcbeq'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 def run(impact_assessment: dict):
     value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['pesticideAI'])
-    return _indicator(value) if value is not None else None
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)

hestia_earth/models/recipe2016Egalitarian/freshwaterEutrophicationPotential.py

@@ -19,15 +19,9 @@ LOOKUPS = {
 TERM_ID = 'freshwaterEutrophicationPotential'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 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, value is not None)
-    return _indicator(value) if value is not None else None
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)

hestia_earth/models/recipe2016Egalitarian/humanCarcinogenicToxicity.py

@@ -22,12 +22,6 @@ LOOKUPS = {
 TERM_ID = 'humanCarcinogenicToxicity'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 def run(impact_assessment: dict):
     value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['pesticideAI'])
-    return _indicator(value) if value is not None else None
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)

hestia_earth/models/recipe2016Egalitarian/humanDamageOzoneFormation.py

@@ -27,12 +27,6 @@ LOOKUPS = {
 TERM_ID = 'humanDamageOzoneFormation'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 def run(impact_assessment: dict):
     emissions_value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
@@ -42,7 +36,5 @@ def run(impact_assessment: dict):
 
     value = sum_values([emissions_value, pesticides_value])
 
-    should_run = all([value is not None])
-    logShouldRun(impact_assessment, MODEL, TERM_ID, should_run)
-
-    return _indicator(value) if should_run else None
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)

hestia_earth/models/recipe2016Egalitarian/humanNonCarcinogenicToxicity.py

@@ -22,12 +22,6 @@ LOOKUPS = {
 TERM_ID = 'humanNonCarcinogenicToxicity'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 def run(impact_assessment: dict):
     value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['pesticideAI'])
-    return _indicator(value) if value is not None else None
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)