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

hestia_earth/models/ipcc2019/n2OToAirOrganicSoilCultivationDirect.py

@@ -1,4 +1,4 @@
-from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition
+from hestia_earth.schema import EmissionMethodTier
 
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.cycle import land_occupation_per_ha
@@ -76,18 +76,13 @@ RETURNS = {
 TERM_ID = 'n2OToAirOrganicSoilCultivationDirect'
 TIER = EmissionMethodTier.TIER_1.value
 
-_STATS_DEFINITION = EmissionStatsDefinition.MODELLED.value
-
 _CATEGORY_REMAPPER = {
     OrganicSoilCategory.ACACIA: OrganicSoilCategory.PERENNIAL_CROPS
 }
 
 
 def _emission(value: float, sd: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
-    emission['sd'] = [sd]
-    emission['statsDefinition'] = _STATS_DEFINITION
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value, sd=sd)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/ipcc2019/n2OToAir_indirect_emissions_utils.py

@@ -1,4 +1,4 @@
-from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition, TermTermType
+from hestia_earth.schema import EmissionMethodTier, TermTermType
 from hestia_earth.utils.lookup import extract_grouped_data
 from hestia_earth.utils.tools import safe_parse_float, non_empty_list, list_sum
 
@@ -48,15 +48,9 @@ def _get_emission_factors(log_term: str, emission_id: str, ecoClimateZone: str =
     }
 
 
-def _emission(emission_id: str, value: float, min: float, max: float, aggregated: bool = False):
-    emission = _new_emission(emission_id, MODEL)
-    emission['value'] = [value]
-    if min is not None:
-        emission['min'] = [min]
-    if max is not None:
-        emission['max'] = [max]
+def _emission(term_id: str, value: float, min: float, max: float, aggregated: bool = False):
+    emission = _new_emission(term=term_id, model=MODEL, value=value, min=min, max=max)
     emission['methodTier'] = _TIER
-    emission['statsDefinition'] = EmissionStatsDefinition.MODELLED.value
     emission['methodModelDescription'] = 'Aggregated version' if aggregated else 'Disaggregated version'
     return emission
 

hestia_earth/models/ipcc2019/nh3ToAirInorganicFertiliser.py

@@ -1,4 +1,4 @@
-from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition, TermTermType
+from hestia_earth.schema import EmissionMethodTier, TermTermType
 from hestia_earth.utils.model import filter_list_term_type, find_term_match
 from hestia_earth.utils.tools import list_sum
 
@@ -53,12 +53,8 @@ UNSPECIFIED_TERM_ID = 'inorganicNitrogenFertiliserUnspecifiedKgN'
 
 
 def _emission(value: float, min: float, max: float, aggregated: bool = False):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
-    emission['min'] = [min]
-    emission['max'] = [max]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value, min=min, max=max)
     emission['methodTier'] = TIER
-    emission['statsDefinition'] = EmissionStatsDefinition.MODELLED.value
     emission['methodModelDescription'] = 'Aggregated version' if aggregated else 'Disaggregated version'
     return emission
 

hestia_earth/models/ipcc2019/nh3ToAirOrganicFertiliser.py

@@ -1,4 +1,4 @@
-from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition
+from hestia_earth.schema import EmissionMethodTier
 from hestia_earth.utils.tools import list_sum
 
 from hestia_earth.models.log import logRequirements, logShouldRun, debugValues, log_as_table
@@ -51,12 +51,8 @@ TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float, min: float, max: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
-    emission['min'] = [min]
-    emission['max'] = [max]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value, min=min, max=max)
     emission['methodTier'] = TIER
-    emission['statsDefinition'] = EmissionStatsDefinition.MODELLED.value
     emission['methodModelDescription'] = 'Aggregated version'
     return emission
 

hestia_earth/models/ipcc2019/no3ToGroundwaterCropResidueDecomposition.py

@@ -1,4 +1,4 @@
-from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition, TermTermType
+from hestia_earth.schema import EmissionMethodTier, TermTermType
 
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.constant import Units, get_atomic_conversion
@@ -45,13 +45,8 @@ TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float, sd: float, min: float, max: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
-    emission['sd'] = [sd]
-    emission['min'] = [min]
-    emission['max'] = [max]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value, min=min, max=max, sd=sd)
     emission['methodTier'] = TIER
-    emission['statsDefinition'] = EmissionStatsDefinition.MODELLED.value
     return emission
 
 

hestia_earth/models/ipcc2019/no3ToGroundwaterExcreta.py

@@ -1,4 +1,4 @@
-from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition, TermTermType, SiteSiteType
+from hestia_earth.schema import EmissionMethodTier, TermTermType, SiteSiteType
 
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.constant import Units, get_atomic_conversion
@@ -57,14 +57,8 @@ TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float, sd: float = None, min: float = None, max: float = None):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
-    if sd is not None:
-        emission['sd'] = [sd]
-        emission['min'] = [min]
-        emission['max'] = [max]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value, min=min, max=max, sd=sd)
     emission['methodTier'] = TIER
-    emission['statsDefinition'] = EmissionStatsDefinition.MODELLED.value
     return emission
 
 

hestia_earth/models/ipcc2019/no3ToGroundwaterInorganicFertiliser.py

@@ -1,4 +1,4 @@
-from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition, TermTermType
+from hestia_earth.schema import EmissionMethodTier, TermTermType
 
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.constant import Units, get_atomic_conversion
@@ -53,13 +53,8 @@ TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float, sd: float, min: float, max: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
-    emission['sd'] = [sd]
-    emission['min'] = [min]
-    emission['max'] = [max]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value, min=min, max=max, sd=sd)
     emission['methodTier'] = TIER
-    emission['statsDefinition'] = EmissionStatsDefinition.MODELLED.value
     return emission
 
 

hestia_earth/models/ipcc2019/no3ToGroundwaterOrganicFertiliser.py

@@ -1,4 +1,4 @@
-from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition, TermTermType
+from hestia_earth.schema import EmissionMethodTier, TermTermType
 
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.constant import Units, get_atomic_conversion
@@ -52,13 +52,8 @@ TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float, sd: float, min: float, max: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
-    emission['sd'] = [sd]
-    emission['min'] = [min]
-    emission['max'] = [max]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value, min=min, max=max, sd=sd)
     emission['methodTier'] = TIER
-    emission['statsDefinition'] = EmissionStatsDefinition.MODELLED.value
     return emission
 
 

hestia_earth/models/ipcc2019/nonCo2EmissionsToAirNaturalVegetationBurning.py

@@ -380,7 +380,7 @@ def _emission(term_id: str, **kwargs) -> dict:
     """
     Build a HESTIA [Emission node](https://www.hestia.earth/schema/Emission) using model output data.
     """
-    emission = _new_emission(term_id, MODEL)
+    emission = _new_emission(term=term_id, model=MODEL)
     return emission | {
         **{k: v for k, v in kwargs.items()},
         "methodTier": TIER

hestia_earth/models/ipcc2019/noxToAirInorganicFertiliser.py

@@ -1,4 +1,4 @@
-from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition, TermTermType
+from hestia_earth.schema import EmissionMethodTier, TermTermType
 from hestia_earth.utils.model import filter_list_term_type, find_term_match
 from hestia_earth.utils.tools import list_sum
 
@@ -53,12 +53,8 @@ UNSPECIFIED_TERM_ID = 'inorganicNitrogenFertiliserUnspecifiedKgN'
 
 
 def _emission(value: float, min: float, max: float, aggregated: bool = False):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
-    emission['min'] = [min]
-    emission['max'] = [max]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value, min=min, max=max)
     emission['methodTier'] = TIER
-    emission['statsDefinition'] = EmissionStatsDefinition.MODELLED.value
     emission['methodModelDescription'] = 'Aggregated version' if aggregated else 'Disaggregated version'
     return emission
 

hestia_earth/models/ipcc2019/noxToAirOrganicFertiliser.py

@@ -1,4 +1,4 @@
-from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition
+from hestia_earth.schema import EmissionMethodTier
 from hestia_earth.utils.tools import list_sum
 
 from hestia_earth.models.log import logRequirements, logShouldRun, debugValues, log_as_table
@@ -51,12 +51,8 @@ TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float, min: float, max: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
-    emission['min'] = [min]
-    emission['max'] = [max]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value, min=min, max=max)
     emission['methodTier'] = TIER
-    emission['statsDefinition'] = EmissionStatsDefinition.MODELLED.value
     emission['methodModelDescription'] = 'Aggregated version'
     return emission
 

hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1.py

@@ -199,7 +199,7 @@ def _measurement(
     dict
         A valid HESTIA `Measurement` node, see: https://www.hestia.earth/schema/Measurement.
     """
-    measurement = _new_measurement(TERM_ID, MODEL) | descriptive_stats_dict
+    measurement = _new_measurement(term=TERM_ID, model=MODEL) | descriptive_stats_dict
     measurement["dates"] = [f"{year}-12-31" for year in timestamps]
     measurement["depthUpper"] = DEPTH_UPPER
     measurement["depthLower"] = DEPTH_LOWER

hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2.py

@@ -257,7 +257,7 @@ def _measurement(
     dict
         A valid HESTIA `Measurement` node, see: https://www.hestia.earth/schema/Measurement.
     """
-    measurement = _new_measurement(TERM_ID, MODEL) | descriptive_stats_dict
+    measurement = _new_measurement(term=TERM_ID, model=MODEL) | descriptive_stats_dict
     measurement["dates"] = [f"{year}-12-31" for year in timestamps]
     measurement["depthUpper"] = DEPTH_UPPER
     measurement["depthLower"] = DEPTH_LOWER

hestia_earth/models/ipcc2019/pastureGrass.py

@@ -149,8 +149,7 @@ MODEL_KEY = 'pastureGrass'
 
 
 def _input(term_id: str, value: float):
-    node = _new_input(term_id, MODEL)
-    node['value'] = [value]
+    node = _new_input(term=term_id, model=MODEL, value=value)
     node['isAnimalFeed'] = True
     return node
 

hestia_earth/models/ipcc2021/gwp100.py

@@ -19,18 +19,9 @@ LOOKUPS = {
 TERM_ID = 'gwp100'
 
 
-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)
-
-    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/jarvisAndPain1994/n2ToAirExcreta.py

@@ -26,8 +26,7 @@ _N2O_TERM_ID = 'n2OToAirExcretaDirect'
 
 
 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/koble2014/utils.py

@@ -13,9 +13,7 @@ from . import MODEL
 
 
 def _practice(term_id: str, value: float):
-    practice = _new_practice(term_id, MODEL)
-    practice['value'] = [value]
-    return practice
+    return _new_practice(term=term_id, model=MODEL, value=value)
 
 
 def _model_value(term_id: str, practices: list):

hestia_earth/models/lcImpactAllEffects100Years/damageToFreshwaterEcosystemsClimateChange.py

@@ -19,15 +19,9 @@ LOOKUPS = {
 TERM_ID = 'damageToFreshwaterEcosystemsClimateChange'
 
 
-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/lcImpactAllEffects100Years/damageToFreshwaterEcosystemsFreshwaterEcotoxicity.py

@@ -22,12 +22,6 @@ LOOKUPS = {
 TERM_ID = 'damageToFreshwaterEcosystemsFreshwaterEcotoxicity'
 
 
-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/lcImpactAllEffects100Years/damageToFreshwaterEcosystemsFreshwaterEutrophication.py

@@ -23,15 +23,9 @@ LOOKUPS = {
 TERM_ID = 'damageToFreshwaterEcosystemsFreshwaterEutrophication'
 
 
-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")
     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/lcImpactAllEffects100Years/damageToFreshwaterEcosystemsPdfYear.py

@@ -23,15 +23,9 @@ LOOKUPS = {
 TERM_ID = 'damageToFreshwaterEcosystemsPdfYear'
 
 
-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/lcImpactAllEffects100Years/damageToFreshwaterEcosystemsWaterStress.py

@@ -23,15 +23,9 @@ LOOKUPS = {
 TERM_ID = 'damageToFreshwaterEcosystemsWaterStress'
 
 
-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", 'allEffects')
     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/lcImpactAllEffects100Years/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/lcImpactAllEffects100Years/damageToHumanHealthClimateChange.py

@@ -19,15 +19,9 @@ LOOKUPS = {
 TERM_ID = 'damageToHumanHealthClimateChange'
 
 
-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/lcImpactAllEffects100Years/damageToHumanHealthHumanToxicityCancerogenic.py

@@ -22,12 +22,6 @@ LOOKUPS = {
 TERM_ID = 'damageToHumanHealthHumanToxicityCancerogenic'
 
 
-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/lcImpactAllEffects100Years/damageToHumanHealthHumanToxicityNonCancerogenic.py

@@ -22,12 +22,6 @@ LOOKUPS = {
 TERM_ID = 'damageToHumanHealthHumanToxicityNonCancerogenic'
 
 
-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/lcImpactAllEffects100Years/damageToHumanHealthParticulateMatterFormation.py

@@ -23,15 +23,9 @@ LOOKUPS = {
 TERM_ID = 'damageToHumanHealthParticulateMatterFormation'
 
 
-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")
     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/lcImpactAllEffects100Years/damageToHumanHealthPhotochemicalOzoneFormation.py

@@ -23,15 +23,9 @@ LOOKUPS = {
 TERM_ID = 'damageToHumanHealthPhotochemicalOzoneFormation'
 
 
-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")
     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/lcImpactAllEffects100Years/damageToHumanHealthStratosphericOzoneDepletion.py

@@ -19,15 +19,9 @@ LOOKUPS = {
 TERM_ID = 'damageToHumanHealthStratosphericOzoneDepletion'
 
 
-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/lcImpactAllEffects100Years/damageToHumanHealthWaterStress.py

@@ -29,12 +29,6 @@ TERM_ID = 'damageToHumanHealthWaterStress'
 LOOKUP_SUFFIX = 'resourceUse-WaterStressDamageToHumanHealthLCImpactCF'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 def run(impact_assessment: dict):
     value = impact_aware_value(
         MODEL, TERM_ID,
@@ -48,4 +42,4 @@ def run(impact_assessment: dict):
     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/lcImpactAllEffects100Years/damageToMarineEcosystemsMarineEcotoxicity.py

@@ -22,12 +22,6 @@ LOOKUPS = {
 TERM_ID = 'damageToMarineEcosystemsMarineEcotoxicity'
 
 
-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/lcImpactAllEffects100Years/damageToMarineEcosystemsMarineEutrophication.py

@@ -23,15 +23,9 @@ LOOKUPS = {
 TERM_ID = 'damageToMarineEcosystemsMarineEutrophication'
 
 
-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")
     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/lcImpactAllEffects100Years/damageToMarineEcosystemsPdfYear.py

@@ -23,15 +23,9 @@ LOOKUPS = {
 TERM_ID = 'damageToMarineEcosystemsPdfYear'
 
 
-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/lcImpactAllEffects100Years/damageToTerrestrialEcosystemsClimateChange.py

@@ -19,15 +19,9 @@ LOOKUPS = {
 TERM_ID = 'damageToTerrestrialEcosystemsClimateChange'
 
 
-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/lcImpactAllEffects100Years/damageToTerrestrialEcosystemsPdfYear.py

@@ -23,15 +23,9 @@ LOOKUPS = {
 TERM_ID = 'damageToTerrestrialEcosystemsPdfYear'
 
 
-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/lcImpactAllEffects100Years/damageToTerrestrialEcosystemsPhotochemicalOzoneFormation.py

@@ -23,15 +23,9 @@ LOOKUPS = {
 TERM_ID = 'damageToTerrestrialEcosystemsPhotochemicalOzoneFormation'
 
 
-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")
     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)