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

hestia_earth/models/lcImpactCertainEffects100Years/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/lcImpactCertainEffects100Years/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/lcImpactCertainEffects100Years/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/lcImpactCertainEffects100Years/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)

hestia_earth/models/lcImpactCertainEffects100Years/damageToTerrestrialEcosystemsTerrestrialAcidification.py

@@ -23,15 +23,9 @@ LOOKUPS = {
 TERM_ID = 'damageToTerrestrialEcosystemsTerrestrialAcidification'
 
 
-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/lcImpactCertainEffects100Years/damageToTerrestrialEcosystemsTerrestrialEcotoxicity.py

@@ -22,12 +22,6 @@ LOOKUPS = {
 TERM_ID = 'damageToTerrestrialEcosystemsTerrestrialEcotoxicity'
 
 
-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/lcImpactCertainEffectsInfinite/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/lcImpactCertainEffectsInfinite/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/lcImpactCertainEffectsInfinite/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/lcImpactCertainEffectsInfinite/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", 'certainEffects')
     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/lcImpactCertainEffectsInfinite/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/lcImpactCertainEffectsInfinite/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/lcImpactCertainEffectsInfinite/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/lcImpactCertainEffectsInfinite/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/lcImpactCertainEffectsInfinite/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/lcImpactCertainEffectsInfinite/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/lcImpactCertainEffectsInfinite/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/lcImpactCertainEffectsInfinite/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/lcImpactCertainEffectsInfinite/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/lcImpactCertainEffectsInfinite/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/lcImpactCertainEffectsInfinite/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/lcImpactCertainEffectsInfinite/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/lcImpactCertainEffectsInfinite/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/lcImpactCertainEffectsInfinite/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)

hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystemsTerrestrialAcidification.py

@@ -23,15 +23,9 @@ LOOKUPS = {
 TERM_ID = 'damageToTerrestrialEcosystemsTerrestrialAcidification'
 
 
-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/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystemsTerrestrialEcotoxicity.py

@@ -22,12 +22,6 @@ LOOKUPS = {
 TERM_ID = 'damageToTerrestrialEcosystemsTerrestrialEcotoxicity'
 
 
-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/linkedImpactAssessment/emissions.py

@@ -1,11 +1,10 @@
 from functools import reduce
 from hestia_earth.schema import EmissionMethodTier
 from hestia_earth.utils.lookup import download_lookup, get_table_value, column_name
-from hestia_earth.utils.tools import flatten, list_sum
+from hestia_earth.utils.tools import flatten, list_sum, pick
 from hestia_earth.utils.blank_node import group_by_keys
 
 from hestia_earth.models.log import logShouldRun, debugValues, log_as_table
-from hestia_earth.models.utils import _include
 from hestia_earth.models.utils.emission import _new_emission
 from hestia_earth.models.utils.input import load_impacts
 from . import MODEL
@@ -54,8 +53,7 @@ _GROUP_BY_KEYS = ['term', 'key', 'operation', 'animal']
 
 
 def _emission(model: str, term_id: str, value: float, input: dict, animal={}, extra={}):
-    emission = _new_emission(term_id, model)
-    emission['value'] = [value]
+    emission = _new_emission(term=term_id, model=MODEL, value=value)
     emission['methodTier'] = TIER
     emission['inputs'] = [input]
     if animal:
@@ -94,7 +92,7 @@ def _run_emission(cycle: dict, emission_term_id: str, data: dict):
             value=value,
             input=input_term,
             animal=animal,
-            extra=_include(values, ['key', 'operation'])
+            extra=pick(values, ['key', 'operation'])
         )
 
     return list(map(run_input, data.values()))
@@ -141,7 +139,7 @@ def _group_inputs(group: dict, values: tuple):
 
             grouped_inputs = (
                 group[emission_term_id].get(input_group_key) or
-                _include(input, _GROUP_BY_KEYS) | {
+                pick(input, _GROUP_BY_KEYS) | {
                     'value': 0,
                     'aggregated': [],
                     'details': {}

hestia_earth/models/linkedImpactAssessment/utils.py

@@ -1,7 +1,7 @@
-from hestia_earth.utils.tools import non_empty_list, flatten, list_sum
+from hestia_earth.utils.tools import non_empty_list, flatten, list_sum, pick
 
 from hestia_earth.models.log import log_as_table, debugValues, logRequirements, logShouldRun
-from hestia_earth.models.utils import group_by, sum_values, _include
+from hestia_earth.models.utils import group_by, sum_values
 from hestia_earth.models.utils.indicator import _new_indicator
 from hestia_earth.models.utils.impact_assessment import get_product, convert_value_from_cycle
 from hestia_earth.models.utils.input import load_impacts
@@ -9,9 +9,7 @@ from . import MODEL
 
 
 def _indicator(model: str, term_id: str, value: float, input: dict):
-    indicator = _new_indicator(term_id, model)
-    indicator['value'] = value
-    indicator['inputs'] = [input]
+    indicator = _new_indicator(term=term_id, model=model, value=value, inputs=[input])
     return indicator
 
 
@@ -34,7 +32,7 @@ def _run_indicators(impact_assessment: dict, product: dict, term_id: str, model:
                     input=input.get('@id'))
 
         return (
-            _indicator(model, term_id, value, input) | _include(indicator, ['landCover', 'previousLandCover'])
+            _indicator(model, term_id, value, input) | pick(indicator, ['landCover', 'previousLandCover'])
         ) if value is not None else None
     return run