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

hestia_earth/models/hestia/utils.py

@@ -1,9 +1,9 @@
 from functools import reduce
 from hestia_earth.schema import TermTermType
-from hestia_earth.utils.tools import non_empty_list
+from hestia_earth.utils.tools import non_empty_list, omit
 from hestia_earth.utils.date import DAY
 
-from hestia_earth.models.utils import _omit, first_day_of_month, last_day_of_month
+from hestia_earth.models.utils import first_day_of_month, last_day_of_month
 from hestia_earth.models.utils.term import get_lookup_value
 from hestia_earth.models.utils.measurement import _new_measurement, measurement_value, has_all_months
 from . import MODEL
@@ -33,7 +33,7 @@ LAND_USE_TERMS_FOR_TRANSFORMATION = {
     ANNUAL_CROPLAND: ("annualCropland", "Annual cropland"),
     PERMANENT_CROPLAND: ("permanentCropland", "Permanent cropland"),
     PERMANENT_PASTURE: ("permanentPasture", "Permanent pasture"),
-    OTHER_LAND: ("otherLand", OTHER_LAND)  # Not used yet
+    OTHER_LAND: ("otherLand", OTHER_LAND)
 }
 
 
@@ -63,8 +63,8 @@ def _value_func(data: dict, apply_func, key: str = 'value'):
 
 
 def copy_measurement(term_id: str, data: dict):
-    measurement = _new_measurement(term_id, MODEL)
-    return _omit(data, ['description', 'method']) | measurement
+    measurement = _new_measurement(term=term_id, model=MODEL)
+    return omit(data, ['description', 'method']) | measurement
 
 
 def slice_by_year(term_id: str, dates: list, values: list):

hestia_earth/models/hestia/waterDepth.py

@@ -25,8 +25,7 @@ SITE_TYPE_TO_DEPTH = {
 
 
 def _measurement(site: dict, value: float):
-    data = _new_measurement(TERM_ID, MODEL)
-    data['value'] = [value]
+    data = _new_measurement(term=TERM_ID, model=MODEL, value=value)
     data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
     return data | get_source(site, BIBLIO_TITLE)
 

hestia_earth/models/hestia/waterSalinity.py

@@ -52,8 +52,7 @@ _DEFAULT_SALINITY = {
 
 
 def _measurement(value: float, start_date: str = None, end_date: str = None):
-    data = _new_measurement(TERM_ID, MODEL)
-    data['value'] = [value]
+    data = _new_measurement(term=TERM_ID, model=MODEL, value=value)
     if start_date:
         data['startDate'] = start_date
     if end_date:

hestia_earth/models/impact_assessment/emissions.py

@@ -1,8 +1,7 @@
-from hestia_earth.utils.tools import list_sum
+from hestia_earth.utils.tools import list_sum, pick
 from hestia_earth.utils.emission import cycle_emissions_in_system_boundary
 
 from hestia_earth.models.log import logRequirements, logShouldRun
-from hestia_earth.models.utils import _include
 from hestia_earth.models.utils.impact_assessment import get_product, convert_value_from_cycle
 from hestia_earth.models.utils.indicator import _new_indicator
 from . import MODEL
@@ -39,14 +38,14 @@ def _indicator(impact_assessment: dict, product: dict):
             impact_assessment, product, list_sum(emission.get('value', [0])), model=MODEL, term_id=term_id
         )
 
-        indicator = _new_indicator(emission.get('term', {}), emission.get('methodModel'))
-        indicator['value'] = value
+        indicator = _new_indicator(
+            term=emission.get('term', {}),
+            model=emission.get('methodModel'),
+            value=value,
+            inputs=emission['inputs'] if len(emission.get('inputs', [])) else None
+        )
         indicator['methodTier'] = emission.get('methodTier')
-
-        if len(emission.get('inputs', [])):
-            indicator['inputs'] = emission['inputs']
-
-        return indicator | _include(emission, ['animals', 'operation', 'transformation', 'country', 'key'])
+        return indicator | pick(emission, ['animals', 'operation', 'transformation', 'country', 'key'])
     return run
 
 

hestia_earth/models/impact_assessment/post_checks/cycle.py

@@ -25,4 +25,4 @@ def _should_run(impact: dict):
     return run
 
 
-def run(impact: dict): return {**impact, **({MODEL_KEY: _run(impact)} if _should_run(impact) else {})}
+def run(impact: dict): return impact | ({MODEL_KEY: _run(impact)} if _should_run(impact) else {})

hestia_earth/models/impact_assessment/pre_checks/cycle.py

@@ -37,4 +37,4 @@ def _should_run(impact: dict):
     return run
 
 
-def run(impact: dict): return {**impact, **({MODEL_KEY: _run(impact)} if _should_run(impact) else {})}
+def run(impact: dict): return impact | ({MODEL_KEY: _run(impact)} if _should_run(impact) else {})

hestia_earth/models/ipcc2006/aboveGroundCropResidueRemoved.py

@@ -31,9 +31,7 @@ TERM_ID = 'aboveGroundCropResidueRemoved'
 PROPERTY_KEY = 'dryMatter'
 
 
-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_value(product: dict, product_dm_property: dict):

hestia_earth/models/ipcc2006/aboveGroundCropResidueTotal.py

@@ -34,9 +34,7 @@ TERM_ID = 'aboveGroundCropResidueTotal'
 PROPERTY_KEY = 'dryMatter'
 
 
-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_value_dm(product: dict, dm_percent: float):

hestia_earth/models/ipcc2006/belowGroundCropResidue.py

@@ -33,9 +33,7 @@ TERM_ID = 'belowGroundCropResidue'
 PROPERTY_KEY = 'dryMatter'
 
 
-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_value_dm(product: dict, dm_percent: float):

hestia_earth/models/ipcc2006/n2OToAirCropResidueDecompositionDirect.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, debugValues, log_as_table
 from hestia_earth.models.utils.constant import Units, get_atomic_conversion
@@ -40,12 +40,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
     return emission
 
 

hestia_earth/models/ipcc2006/n2OToAirCropResidueDecompositionIndirect.py

@@ -31,8 +31,7 @@ NOX_TERM_ID = 'noxToAirCropResidueDecomposition'
 
 
 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/ipcc2006/n2OToAirExcretaDirect.py

@@ -32,8 +32,7 @@ TIER = EmissionMethodTier.TIER_1.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/ipcc2006/n2OToAirExcretaIndirect.py

@@ -31,8 +31,7 @@ NOX_TERM_ID = 'noxToAirExcreta'
 
 
 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/ipcc2006/n2OToAirInorganicFertiliserDirect.py

@@ -44,8 +44,7 @@ TIER = EmissionMethodTier.TIER_1.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/ipcc2006/n2OToAirInorganicFertiliserIndirect.py

@@ -50,8 +50,7 @@ NOX_TERM_ID = 'noxToAirInorganicFertiliser'
 
 
 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/ipcc2006/n2OToAirOrganicFertiliserDirect.py

@@ -43,8 +43,7 @@ TIER = EmissionMethodTier.TIER_1.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/ipcc2006/n2OToAirOrganicFertiliserIndirect.py

@@ -49,8 +49,7 @@ NOX_TERM_ID = 'noxToAirOrganicFertiliser'
 
 
 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/ipcc2013ExcludingFeedbacks/gwp100.py

@@ -19,15 +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)
     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/ipcc2013IncludingFeedbacks/gwp100.py

@@ -19,15 +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)
     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/ipcc2019/aboveGroundBiomass.py

@@ -566,7 +566,7 @@ def _measurement(
         "dates": [f"{year}-12-31" for year in timestamps],
         "methodClassification": _METHOD_CLASSIFICATION
     }
-    measurement = _new_measurement(TERM_ID, MODEL) | {
+    measurement = _new_measurement(term=TERM_ID, model=MODEL) | {
         key: value for key, value in update_dict.items() if value
     }
     return measurement

hestia_earth/models/ipcc2019/aboveGroundCropResidueTotal.py

@@ -36,9 +36,7 @@ TERM_ID = 'aboveGroundCropResidueTotal'
 PROPERTY_KEY = 'dryMatter'
 
 
-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 _product_value(product: dict):

hestia_earth/models/ipcc2019/animal/milkYieldPerAnimal.py

@@ -35,18 +35,14 @@ RETURNS = {
 MODEL_KEY = 'milkYieldPerAnimal'
 
 
-def _practice(term_id: str, value: float):
-    node = _new_practice(term_id, MODEL)
-    node['value'] = [value]
-    return node
-
-
 def _run_animal(data: dict):
     animal = data.get('animal')
     value = data.get('value')
     practice_id = get_lookup_value(animal.get('term'), LOOKUPS['liveAnimal'][1])
     return animal | ({
-        'practices': merge_blank_nodes(animal.get('practices', []), [_practice(practice_id, value)])
+        'practices': merge_blank_nodes(animal.get('practices', []), [
+            _new_practice(term=practice_id, model=MODEL, value=value)
+        ])
     } if practice_id else {})
 
 

hestia_earth/models/ipcc2019/animal/pastureGrass.py

@@ -148,8 +148,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/ipcc2019/belowGroundBiomass.py

@@ -549,7 +549,7 @@ def _measurement(
         "dates": [f"{year}-12-31" for year in timestamps],
         "methodClassification": _METHOD_CLASSIFICATION
     }
-    measurement = _new_measurement(TERM_ID, MODEL) | {
+    measurement = _new_measurement(term=TERM_ID, model=MODEL) | {
         key: value for key, value in update_dict.items() if value
     }
     measurement["depthUpper"] = _DEPTH_UPPER

hestia_earth/models/ipcc2019/belowGroundCropResidue.py

@@ -36,9 +36,7 @@ TERM_ID = 'belowGroundCropResidue'
 PROPERTY_KEY = 'dryMatter'
 
 
-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(term: dict, column: str):

hestia_earth/models/ipcc2019/biocharOrganicCarbonPerHa.py

@@ -436,7 +436,7 @@ def _measurement(
         "depthLower": _DEPTH_LOWER,
         "methodClassification": _METHOD_CLASSIFICATION
     }
-    measurement = _new_measurement(TERM_ID, MODEL) | {
+    measurement = _new_measurement(term=TERM_ID, model=MODEL) | {
         key: value for key, value in update_dict.items() if value is not None
     }
     return measurement

hestia_earth/models/ipcc2019/ch4ToAirAquacultureSystems.py

@@ -1,4 +1,4 @@
-from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition, CycleFunctionalUnit
+from hestia_earth.schema import EmissionMethodTier, CycleFunctionalUnit
 from hestia_earth.utils.model import find_term_match
 from hestia_earth.utils.tools import safe_parse_float, non_empty_list
 
@@ -47,11 +47,7 @@ _WATER_TERM_IDS = [
 
 
 def _emission(value: float, min: float, max: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
-    emission['min'] = [min]
-    emission['max'] = [max]
-    emission['statsDefinition'] = EmissionStatsDefinition.MODELLED.value
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value, min=min, max=max)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/ipcc2019/ch4ToAirEntericFermentation.py

@@ -1,4 +1,4 @@
-from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition
+from hestia_earth.schema import EmissionMethodTier
 from hestia_earth.utils.lookup import column_name, download_lookup, get_table_value, extract_grouped_data
 from hestia_earth.utils.model import find_primary_product, find_term_match
 from hestia_earth.utils.tools import list_sum, safe_parse_float
@@ -90,17 +90,7 @@ METHANE_EC = 55.65  # MJ/kg CH4
 
 
 def _emission(value: float, sd: float = None, min: float = None, max: float = None, description: str = None):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
-    if sd is not None:
-        emission['sd'] = [sd]
-        emission['statsDefinition'] = EmissionStatsDefinition.MODELLED.value
-    if min is not None:
-        emission['min'] = [min]
-        emission['statsDefinition'] = EmissionStatsDefinition.MODELLED.value
-    if max is not None:
-        emission['max'] = [max]
-        emission['statsDefinition'] = EmissionStatsDefinition.MODELLED.value
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value, min=min, max=max, sd=sd)
     if description:
         emission['description'] = description
     emission['methodTier'] = TIER

hestia_earth/models/ipcc2019/ch4ToAirExcreta.py

@@ -66,8 +66,7 @@ def _get_duration_key(duration: int):
 
 
 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/ipcc2019/ch4ToAirFloodedRice.py

@@ -1,5 +1,5 @@
 from functools import reduce
-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, safe_parse_float, non_empty_list
 
@@ -80,16 +80,8 @@ _STATS = ['value', 'min', 'max', 'sd']
 
 
 def _emission(value: float, min: float, max: float, sd: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
-    if min is not None:
-        emission['min'] = [min]
-    if max is not None:
-        emission['max'] = [max]
-    if sd is not None:
-        emission['sd'] = [sd]
+    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/ch4ToAirOrganicSoilCultivation.py

@@ -97,7 +97,7 @@ _CATEGORY_REMAPPER = {
 
 
 def _emission(descriptive_stats: dict):
-    emission = _new_emission(TERM_ID, MODEL) | descriptive_stats
+    emission = _new_emission(term=TERM_ID, model=MODEL) | descriptive_stats
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/ipcc2019/co2ToAirAboveGroundBiomassStockChange.py

@@ -100,7 +100,7 @@ def _emission(
         "observations": observations,
         "methodTier": method_tier.value,
     }
-    emission = _new_emission(term_id, MODEL) | {
+    emission = _new_emission(term=term_id, model=MODEL) | {
         key: value for key, value in update_dict.items() if value
     }
     return emission

hestia_earth/models/ipcc2019/co2ToAirBelowGroundBiomassStockChange.py

@@ -92,7 +92,7 @@ def _emission(
         "methodTier": method_tier.value,
         "depth": _DEPTH_LOWER
     }
-    emission = _new_emission(term_id, MODEL) | {
+    emission = _new_emission(term=term_id, model=MODEL) | {
         key: value for key, value in update_dict.items() if value
     }
     return emission

hestia_earth/models/ipcc2019/co2ToAirBiocharStockChange.py

@@ -94,7 +94,7 @@ def _emission(
         "methodTier": method_tier.value,
         "depth": _DEPTH_LOWER
     }
-    emission = _new_emission(term_id, MODEL) | {
+    emission = _new_emission(term=term_id, model=MODEL) | {
         key: value for key, value in update_dict.items() if value
     }
     return emission

hestia_earth/models/ipcc2019/co2ToAirLimeHydrolysis.py

@@ -31,8 +31,7 @@ TIER = EmissionMethodTier.TIER_1.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/ipcc2019/co2ToAirOrganicSoilCultivation.py

@@ -88,7 +88,7 @@ _ITERATIONS = 100000
 
 
 def _emission(descriptive_stats: dict):
-    emission = _new_emission(TERM_ID, MODEL) | descriptive_stats
+    emission = _new_emission(term=TERM_ID, model=MODEL) | descriptive_stats
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/ipcc2019/co2ToAirSoilOrganicCarbonStockChange.py

@@ -92,7 +92,7 @@ def _emission(
         "methodTier": method_tier.value,
         "depth": _DEPTH_LOWER
     }
-    emission = _new_emission(term_id, MODEL) | {
+    emission = _new_emission(term=term_id, model=MODEL) | {
         key: value for key, value in update_dict.items() if value
     }
     return emission

hestia_earth/models/ipcc2019/co2ToAirUreaHydrolysis.py

@@ -31,8 +31,7 @@ UNSPECIFIED_TERM_ID = 'inorganicNitrogenFertiliserUnspecifiedKgN'
 
 
 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/ipcc2019/croppingDuration.py

@@ -44,8 +44,7 @@ LOOKUP_COL_PREFIX = 'Rice_croppingDuration_days'
 
 
 def _practice(value: float, min: float, max: float, sd: float):
-    practice = _new_practice(TERM_ID, MODEL)
-    practice['value'] = [value]
+    practice = _new_practice(term=TERM_ID, model=MODEL, value=value)
     practice['min'] = [min]
     practice['max'] = [max]
     practice['sd'] = [sd]

hestia_earth/models/ipcc2019/n2OToAirCropResidueBurningDirect.py

@@ -32,8 +32,7 @@ TIER = EmissionMethodTier.TIER_1.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/ipcc2019/n2OToAirCropResidueDecompositionDirect.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, debugValues, log_as_table
 from hestia_earth.models.utils.constant import Units, get_atomic_conversion
@@ -51,13 +51,8 @@ TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float, min: float, max: float, sd: float, aggregated: bool = False):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
-    emission['min'] = [min]
-    emission['max'] = [max]
-    emission['sd'] = [sd]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value, min=min, max=max, sd=sd)
     emission['methodTier'] = TIER
-    emission['statsDefinition'] = EmissionStatsDefinition.MODELLED.value
     emission['methodModelDescription'] = 'Aggregated version' if aggregated else 'Disaggregated version'
     return emission
 

hestia_earth/models/ipcc2019/n2OToAirExcretaDirect.py

@@ -35,8 +35,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/ipcc2019/n2OToAirInorganicFertiliserDirect.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, debugValues, log_as_table
 from hestia_earth.models.utils.constant import Units, get_atomic_conversion
@@ -61,13 +61,8 @@ TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float, min: float, max: float, sd: float, aggregated: bool = False):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
-    emission['min'] = [min]
-    emission['max'] = [max]
-    emission['sd'] = [sd]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value, min=min, max=max, sd=sd)
     emission['methodTier'] = TIER
-    emission['statsDefinition'] = EmissionStatsDefinition.MODELLED.value
     emission['methodModelDescription'] = 'Aggregated version' if aggregated else 'Disaggregated version'
     return emission
 

hestia_earth/models/ipcc2019/n2OToAirOrganicFertiliserDirect.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, debugValues, log_as_table
 from hestia_earth.models.utils.constant import Units, get_atomic_conversion
@@ -61,13 +61,8 @@ TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float, min: float, max: float, sd: float, aggregated: bool = False):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
-    emission['min'] = [min]
-    emission['max'] = [max]
-    emission['sd'] = [sd]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value, min=min, max=max, sd=sd)
     emission['methodTier'] = TIER
-    emission['statsDefinition'] = EmissionStatsDefinition.MODELLED.value
     emission['methodModelDescription'] = 'Aggregated version' if aggregated else 'Disaggregated version'
     return emission