hestia-earth-models 0.65.2__py3-none-any.whl → 0.65.4__py3-none-any.whl

hestia_earth/models/agribalyse2016/fuelElectricity.py

@@ -3,12 +3,12 @@ Fuel and Electricity
 
 This model calculates fuel and electricity data from the number of hours each machine is operated for using.
 """
-from functools import reduce
 from hestia_earth.schema import TermTermType
 from hestia_earth.utils.model import filter_list_term_type
 from hestia_earth.utils.tools import flatten, list_sum, non_empty_list
 
 from hestia_earth.models.log import debugValues, logRequirements, logShouldRun, log_as_table
+from hestia_earth.models.utils import group_by
 from hestia_earth.models.utils.term import get_lookup_value
 from hestia_earth.models.utils.input import _new_input
 from . import MODEL
@@ -68,16 +68,6 @@ def _run_operation(cycle: dict):
     return exec
 
 
-def _group_operations(operations: list):
-    def grouper(group: dict, operation: dict):
-        input_term_id = operation.get('input').get('id')
-        group[input_term_id] = group.get(input_term_id, [])
-        group[input_term_id].append(operation)
-        return group
-
-    return reduce(grouper, operations, {})
-
-
 def _should_run_operation(cycle: dict):
     def exec(practice: dict):
         term = practice.get('term', {})
@@ -120,5 +110,5 @@ def _should_run(cycle: dict):
 def run(cycle: dict):
     should_run, operations = _should_run(cycle)
     # group operations by input to show logs as table
-    grouped_operations = _group_operations(operations)
+    grouped_operations = group_by(operations, ['input.id'])
     return flatten(map(_run_operation(cycle), grouped_operations.values())) if should_run else []

hestia_earth/models/cache_sites.py

@@ -4,6 +4,7 @@ from pydash.objects import merge
 from hestia_earth.utils.api import download_hestia
 from hestia_earth.utils.tools import flatten
 
+from .log import logger
 from .utils import CACHE_KEY, cached_value
 from .utils.site import CACHE_YEARS_KEY
 from .site.pre_checks.cache_geospatialDatabase import (
@@ -146,6 +147,7 @@ def run(sites: list, years: list = None, include_region: bool = False):
     batches = range(0, len(unique_years), batch_size)
 
     for batch_index in batches:
+        logger.info(f"Processing sites in batch {batch_index + 1} of {len(batches)}...")
         sub_years = unique_years[batch_index:batch_index + batch_size]
         sites = _run(sites, sub_years, include_region, years_only=True)
 

hestia_earth/models/cycle/completeness/__init__.py

@@ -31,7 +31,7 @@ def _run_model(model, cycle: dict):
 
 def _run(cycle: dict):
     values = non_empty_list([_run_model(model, cycle) for model in MODELS])
-    value = reduce(lambda prev, curr: {**prev, **curr}, values, cycle.get('completeness', {}))
+    value = reduce(lambda prev, curr: prev | curr, values, cycle.get('completeness', {}))
     keys = ','.join([next(iter(val)) for val in values])
     debugValues(cycle, model=MODEL, keys=keys)
     return value if len(values) > 0 else None

hestia_earth/models/emepEea2019/nh3ToAirInorganicFertiliser.py

@@ -78,7 +78,7 @@ def _get_groupings():
 
     def get_grouping(groupings: dict, term_id: str):
         grouping = get_term_lookup(term_id, 'fertGroupingNitrogen')
-        return {**groupings, **({grouping: term_id} if len(grouping) > 0 else {})}
+        return groupings | ({grouping: term_id} if len(grouping) > 0 else {})
 
     return reduce(get_grouping, term_ids, {})
 

hestia_earth/models/hestia/seed_emissions.py

@@ -19,7 +19,7 @@ from hestia_earth.utils.tools import non_empty_list, flatten, list_sum, safe_par
 from hestia_earth.utils.emission import cycle_emissions_in_system_boundary
 
 from hestia_earth.models.log import logRequirements, logShouldRun, log_as_table
-from hestia_earth.models.utils import _omit
+from hestia_earth.models.utils import _omit, group_by
 from hestia_earth.models.utils.emission import _new_emission
 from hestia_earth.models.utils.site import valid_site_type
 from hestia_earth.models.utils.cycle import cycle_end_year
@@ -165,12 +165,7 @@ def _yield(country_id: str, end_year: int, product: dict):
 
 
 def _group_seed_inputs(inputs: list):
-    def _group_by(group: dict, input: dict):
-        term_id = input.get('term', {}).get('@id')
-        group[term_id] = group.get(term_id, []) + [input]
-        return group
-
-    grouped_inputs = reduce(_group_by, inputs, {})
+    grouped_inputs = group_by(inputs, ['term.@id'])
     return [
         inputs[0] | {'value': flatten([v.get('value') for v in inputs])}
         for inputs in grouped_inputs.values()

hestia_earth/models/ipcc2019/croppingDuration.py

@@ -1,3 +1,8 @@
+"""
+`croppingDuration` can be added by the uploader for all crops, however the model `IPCC (2019)` will only run for
+`riceGrainInHusk` or `ricePlantFlooded`.
+The model will only run for rice crops as this is the only crop which requires the value for emission recalculations.
+"""
 from hestia_earth.schema import PracticeStatsDefinition
 from hestia_earth.utils.lookup import download_lookup, get_table_value, column_name
 from hestia_earth.utils.tools import safe_parse_float

hestia_earth/models/linkedImpactAssessment/freshwaterWithdrawalsInputsProduction.py

@@ -30,7 +30,8 @@ REQUIREMENTS = {
 }
 RETURNS = {
     "Indicator": [{
-        "value": ""
+        "value": "",
+        "inputs": ""
     }]
 }
 TERM_ID = 'freshwaterWithdrawalsInputsProduction'

hestia_earth/models/linkedImpactAssessment/landOccupationInputsProduction.py

@@ -31,6 +31,7 @@ REQUIREMENTS = {
 RETURNS = {
     "Indicator": [{
         "value": "",
+        "inputs": "",
         "landCover": ""
     }]
 }

hestia_earth/models/linkedImpactAssessment/landTransformation100YearAverageInputsProduction.py

@@ -31,6 +31,7 @@ REQUIREMENTS = {
 RETURNS = {
     "Indicator": [{
         "value": "",
+        "inputs": "",
         "landCover": "",
         "previousLandCover": ""
     }]

hestia_earth/models/linkedImpactAssessment/landTransformation20YearAverageInputsProduction.py

@@ -31,6 +31,7 @@ REQUIREMENTS = {
 RETURNS = {
     "Indicator": [{
         "value": "",
+        "inputs": "",
         "landCover": "",
         "previousLandCover": ""
     }]

hestia_earth/models/linkedImpactAssessment/utils.py

@@ -1,43 +1,42 @@
-from functools import reduce
 from hestia_earth.utils.tools import non_empty_list, flatten, list_sum
 
-from hestia_earth.models.log import log_as_table, logRequirements, logShouldRun
-from hestia_earth.models.utils import sum_values, _include
+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.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
 from . import MODEL
 
 
-def _indicator(term_id: str, value: float):
+def _indicator(term_id: str, value: float, input: dict):
     indicator = _new_indicator(term_id, MODEL)
     indicator['value'] = value
+    indicator['inputs'] = [input]
     return indicator
 
 
-def _run_indicators(product: dict, term_id: str):
+def _run_indicators(impact_assessment: dict, product: dict, term_id: str):
     def run(values: list):
+        input = values[0].get('input').get('term', {})
         indicator = values[0].get('indicator')
         values_from_cycle = non_empty_list([
             list_sum(value.get('input').get('value')) * value.get('indicator').get('value')
             for value in values
         ])
         value = convert_value_from_cycle(product, sum_values(values_from_cycle), model=MODEL, term_id=term_id)
+
+        # show values per input in the logs
+        debugValues(impact_assessment, model=MODEL, term=term_id,
+                    value=value,
+                    coefficient=1,
+                    input=input.get('@id'))
+
         return (
-            _indicator(term_id, value) | _include(indicator, ['landCover', 'previousLandCover'])
+            _indicator(term_id, value, input) | _include(indicator, ['landCover', 'previousLandCover'])
         ) if value is not None else None
     return run
 
 
-def _group_indicator(group: dict, value: dict):
-    group_key = ';'.join(non_empty_list([
-        value.get('indicator').get('landCover', {}).get('@id'),
-        value.get('indicator').get('previousLandCover', {}).get('@id')
-    ]))
-    group[group_key] = group.get(group_key, []) + [value]
-    return group
-
-
 def _run_inputs_production(impact_assessment: dict, product: dict, term_id: str):
     cycle = impact_assessment.get('cycle', {})
 
@@ -61,11 +60,13 @@ def _run_inputs_production(impact_assessment: dict, product: dict, term_id: str)
         value
         for value in all_indicators
         if all([
-            value.get('indicator').get('value', -1) > 0,
-            list_sum(value.get('input').get('value', [-1]), 0) > 0
+            (value.get('indicator').get('value') or -1) > 0,
+            (list_sum(value.get('input').get('value')) or -1) > 0
         ])
     ]
-    grouped_indicators = reduce(_group_indicator, valid_indicators, {})
+    grouped_indicators = group_by(valid_indicators, [
+        'input.term.@id', 'indicator.landCover.@id', 'indicator.previousLandCover.@id'
+    ])
     has_indicators = bool(valid_indicators)
 
     logRequirements(impact_assessment, model=MODEL, term=term_id,
@@ -82,7 +83,9 @@ def _run_inputs_production(impact_assessment: dict, product: dict, term_id: str)
     should_run = all([has_indicators])
     logShouldRun(impact_assessment, MODEL, term_id, should_run)
 
-    return non_empty_list(flatten(map(_run_indicators(product, term_id), grouped_indicators.values())))
+    return non_empty_list(flatten(
+        map(_run_indicators(impact_assessment, product, term_id), grouped_indicators.values())
+    ))
 
 
 def _should_run_inputs_production(impact_assessment: dict, term_id: str):

hestia_earth/models/mocking/search-results.json

@@ -171,443 +171,443 @@
       },
       {
         "@type": "Term",
-        "@id": "trichlorofluoromethaneToAirIndustrialProcesses"
+        "@id": "noxToAirNaturalVegetationBurning"
       },
       {
         "@type": "Term",
-        "@id": "chloropentafluoroethaneToAirInputsProduction"
+        "@id": "nToSurfaceWaterInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "po43ToSurfaceWaterInputsProduction"
+        "@id": "carbonTetrachlorideToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "nitriteToAirInputsProduction"
+        "@id": "no3ToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "pm25ToAirAnimalHousing"
+        "@id": "chlorodifluoromethaneToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "12DibromotetrafluoroethaneToAirIndustrialProcesses"
+        "@id": "no3ToSurfaceWaterExcreta"
       },
       {
         "@type": "Term",
-        "@id": "22Dichloro111TrifluoroethaneToAirInputsProduction"
+        "@id": "dichlorotetrafluoroethaneToAirIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "33Dichloro11122PentafluoropropaneToAirIndustrialProcesses"
+        "@id": "so2ToAirFuelCombustion"
       },
       {
         "@type": "Term",
-        "@id": "po43ToSurfaceWaterSoilFlux"
+        "@id": "pm10ToAirFuelCombustion"
       },
       {
         "@type": "Term",
-        "@id": "22Dichloro111TrifluoroethaneToAirIndustrialProcesses"
+        "@id": "soxToAirIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "noToAirWasteTreatment"
+        "@id": "tefluraneToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "nmvocToAirAnimalHousing"
+        "@id": "no3ToGroundwaterWasteTreatment"
       },
       {
         "@type": "Term",
-        "@id": "pesticideToWaterPesticideApplication"
+        "@id": "nh4ToGroundwaterIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "so2ToAirIndustrialProcesses"
+        "@id": "sf6ToAirIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "no3ToAirIndustrialProcesses"
+        "@id": "noToAirIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "pesticideToWaterInputsProduction"
+        "@id": "no3ToGroundwaterExcreta"
       },
       {
         "@type": "Term",
-        "@id": "nmvocToAirExcreta"
+        "@id": "noToAirOrganicFertiliser"
       },
       {
         "@type": "Term",
-        "@id": "nmvocToAirSilageStorage"
+        "@id": "nmvocToAirFuelCombustion"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirCropResidueDecompositionDirect"
+        "@id": "pToSurfaceWaterExcreta"
       },
       {
         "@type": "Term",
-        "@id": "so3ToAirIndustrialProcesses"
+        "@id": "nh3ToAirNaturalVegetationBurning"
       },
       {
         "@type": "Term",
-        "@id": "pesticideToHarvestedCropInputsProduction"
+        "@id": "no3ToGroundwaterCropResidueDecomposition"
       },
       {
         "@type": "Term",
-        "@id": "nh4ToGroundwaterOrganicFertiliser"
+        "@id": "1Chloro11DifluoroethaneToAirIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "pToGroundwaterSoilFlux"
+        "@id": "noxToAirAquacultureSystems"
       },
       {
         "@type": "Term",
-        "@id": "dibromodifluoromethaneToAirInputsProduction"
+        "@id": "no2ToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "noxToAirInorganicFertiliser"
+        "@id": "13Dichloro11223PentafluoropropaneToAirIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "bromomethaneToAirIndustrialProcesses"
+        "@id": "hcfc124ToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "bromomethaneToAirInputsProduction"
+        "@id": "pToSurfaceWaterIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "pToSurfaceWaterSoilFlux"
+        "@id": "noxToAirCropResidueBurning"
       },
       {
         "@type": "Term",
-        "@id": "nh3ToAirInputsProduction"
+        "@id": "nh4ToSurfaceWaterAquacultureSystems"
       },
       {
         "@type": "Term",
-        "@id": "noxToAirFuelCombustion"
+        "@id": "n2OToAirOrganicSoilCultivationIndirect"
       },
       {
         "@type": "Term",
-        "@id": "co2ToAirSoilOrganicCarbonStockChangeLandUseChange"
+        "@id": "no3ToSurfaceWaterIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "ch4ToAirIndustrialProcessesNonFossil"
+        "@id": "nErosionSoilFlux"
       },
       {
         "@type": "Term",
-        "@id": "co2ToAirSoilInorganicCarbonStockChangeLandUseChange"
+        "@id": "n2OToAirOrganicSoilCultivationDirect"
       },
       {
         "@type": "Term",
-        "@id": "co2ToAirSoilFlux"
+        "@id": "n2OToAirSoilFlux"
       },
       {
         "@type": "Term",
-        "@id": "n2ToAirOrganicFertiliser"
+        "@id": "nh4ToGroundwaterWasteTreatment"
       },
       {
         "@type": "Term",
-        "@id": "ch4ToAirOrganicSoilCultivation"
+        "@id": "no3ToGroundwaterSoilFlux"
       },
       {
         "@type": "Term",
-        "@id": "ch4ToAirWasteTreatment"
+        "@id": "n2ToAirAquacultureSystems"
       },
       {
         "@type": "Term",
-        "@id": "ch4ToAirFuelCombustion"
+        "@id": "nh3ToAirOrganicSoilBurning"
       },
       {
         "@type": "Term",
-        "@id": "n2ToAirExcreta"
+        "@id": "noxToAirOrganicFertiliser"
       },
       {
         "@type": "Term",
-        "@id": "co2ToAirAboveGroundBiomassStockChangeLandUseChange"
+        "@id": "pesticideToAirPesticideApplication"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirCropResidueBurningIndirect"
+        "@id": "nh3ToAirIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "co2ToAirDeadOrganicMatterStockChangeLandUseChange"
+        "@id": "no2ToAirIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "nh3ToAirFuelCombustion"
+        "@id": "tspToAirAnimalHousing"
       },
       {
         "@type": "Term",
-        "@id": "noToAirSoilFlux"
+        "@id": "nh4ToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "co2ToAirSoilOrganicCarbonStockChangeManagementChange"
+        "@id": "n2OToAirOrganicSoilBurningIndirect"
       },
       {
         "@type": "Term",
-        "@id": "noxToAirOrganicSoilCultivation"
+        "@id": "1112TetrafluoroethaneToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirFuelCombustionDirect"
+        "@id": "ionisingCompoundsToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "nh4ToGroundwaterInorganicFertiliser"
+        "@id": "n2OToAirAquacultureSystemsDirect"
       },
       {
         "@type": "Term",
-        "@id": "noxToAirCropResidueDecomposition"
+        "@id": "ch4ToAirExcreta"
       },
       {
         "@type": "Term",
-        "@id": "nToSurfaceWaterAquacultureSystems"
+        "@id": "n2ToAirSoilFlux"
       },
       {
         "@type": "Term",
-        "@id": "noToAirAquacultureSystems"
+        "@id": "coToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirInputsProduction"
+        "@id": "ch4ToAirSoilFlux"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirExcretaDirect"
+        "@id": "co2ToAirSoilInorganicCarbonStockChangeManagementChange"
       },
       {
         "@type": "Term",
-        "@id": "1Chloro11DifluoroethaneToAirInputsProduction"
+        "@id": "n2OToAirBackgroundSoilFluxDirect"
       },
       {
         "@type": "Term",
-        "@id": "112TrichlorotrifluoroethaneToAirIndustrialProcesses"
+        "@id": "coToAirFuelCombustion"
       },
       {
         "@type": "Term",
-        "@id": "noxToAirNaturalVegetationBurning"
+        "@id": "trichlorofluoromethaneToAirIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "nToSurfaceWaterInputsProduction"
+        "@id": "chloropentafluoroethaneToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "carbonTetrachlorideToAirInputsProduction"
+        "@id": "po43ToSurfaceWaterInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "no3ToAirInputsProduction"
+        "@id": "nitriteToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "chlorodifluoromethaneToAirInputsProduction"
+        "@id": "pm25ToAirAnimalHousing"
       },
       {
         "@type": "Term",
-        "@id": "no3ToSurfaceWaterExcreta"
+        "@id": "12DibromotetrafluoroethaneToAirIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "dichlorotetrafluoroethaneToAirIndustrialProcesses"
+        "@id": "22Dichloro111TrifluoroethaneToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "so2ToAirFuelCombustion"
+        "@id": "33Dichloro11122PentafluoropropaneToAirIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "pm10ToAirFuelCombustion"
+        "@id": "po43ToSurfaceWaterSoilFlux"
       },
       {
         "@type": "Term",
-        "@id": "soxToAirIndustrialProcesses"
+        "@id": "22Dichloro111TrifluoroethaneToAirIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "tefluraneToAirInputsProduction"
+        "@id": "noToAirWasteTreatment"
       },
       {
         "@type": "Term",
-        "@id": "no3ToGroundwaterWasteTreatment"
+        "@id": "nmvocToAirAnimalHousing"
       },
       {
         "@type": "Term",
-        "@id": "nh4ToGroundwaterIndustrialProcesses"
+        "@id": "pesticideToWaterPesticideApplication"
       },
       {
         "@type": "Term",
-        "@id": "sf6ToAirIndustrialProcesses"
+        "@id": "so2ToAirIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "noToAirIndustrialProcesses"
+        "@id": "no3ToAirIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "no3ToGroundwaterExcreta"
+        "@id": "pesticideToWaterInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "noToAirOrganicFertiliser"
+        "@id": "nmvocToAirExcreta"
       },
       {
         "@type": "Term",
-        "@id": "nmvocToAirFuelCombustion"
+        "@id": "nmvocToAirSilageStorage"
       },
       {
         "@type": "Term",
-        "@id": "pToSurfaceWaterExcreta"
+        "@id": "n2OToAirCropResidueDecompositionDirect"
       },
       {
         "@type": "Term",
-        "@id": "nh3ToAirNaturalVegetationBurning"
+        "@id": "so3ToAirIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "no3ToGroundwaterCropResidueDecomposition"
+        "@id": "pesticideToHarvestedCropInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "1Chloro11DifluoroethaneToAirIndustrialProcesses"
+        "@id": "nh4ToGroundwaterOrganicFertiliser"
       },
       {
         "@type": "Term",
-        "@id": "noxToAirAquacultureSystems"
+        "@id": "pToGroundwaterSoilFlux"
       },
       {
         "@type": "Term",
-        "@id": "no2ToAirInputsProduction"
+        "@id": "dibromodifluoromethaneToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "13Dichloro11223PentafluoropropaneToAirIndustrialProcesses"
+        "@id": "noxToAirInorganicFertiliser"
       },
       {
         "@type": "Term",
-        "@id": "hcfc124ToAirInputsProduction"
+        "@id": "bromomethaneToAirIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "pToSurfaceWaterIndustrialProcesses"
+        "@id": "bromomethaneToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "noxToAirCropResidueBurning"
+        "@id": "pToSurfaceWaterSoilFlux"
       },
       {
         "@type": "Term",
-        "@id": "nh4ToSurfaceWaterAquacultureSystems"
+        "@id": "nh3ToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirOrganicSoilCultivationIndirect"
+        "@id": "noxToAirFuelCombustion"
       },
       {
         "@type": "Term",
-        "@id": "no3ToSurfaceWaterIndustrialProcesses"
+        "@id": "co2ToAirSoilOrganicCarbonStockChangeLandUseChange"
       },
       {
         "@type": "Term",
-        "@id": "nErosionSoilFlux"
+        "@id": "ch4ToAirIndustrialProcessesNonFossil"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirOrganicSoilCultivationDirect"
+        "@id": "co2ToAirSoilInorganicCarbonStockChangeLandUseChange"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirSoilFlux"
+        "@id": "co2ToAirSoilFlux"
       },
       {
         "@type": "Term",
-        "@id": "nh4ToGroundwaterWasteTreatment"
+        "@id": "n2ToAirOrganicFertiliser"
       },
       {
         "@type": "Term",
-        "@id": "no3ToGroundwaterSoilFlux"
+        "@id": "ch4ToAirOrganicSoilCultivation"
       },
       {
         "@type": "Term",
-        "@id": "n2ToAirAquacultureSystems"
+        "@id": "ch4ToAirWasteTreatment"
       },
       {
         "@type": "Term",
-        "@id": "nh3ToAirOrganicSoilBurning"
+        "@id": "ch4ToAirFuelCombustion"
       },
       {
         "@type": "Term",
-        "@id": "noxToAirOrganicFertiliser"
+        "@id": "n2ToAirExcreta"
       },
       {
         "@type": "Term",
-        "@id": "pesticideToAirPesticideApplication"
+        "@id": "co2ToAirAboveGroundBiomassStockChangeLandUseChange"
       },
       {
         "@type": "Term",
-        "@id": "nh3ToAirIndustrialProcesses"
+        "@id": "n2OToAirCropResidueBurningIndirect"
       },
       {
         "@type": "Term",
-        "@id": "no2ToAirIndustrialProcesses"
+        "@id": "co2ToAirDeadOrganicMatterStockChangeLandUseChange"
       },
       {
         "@type": "Term",
-        "@id": "tspToAirAnimalHousing"
+        "@id": "nh3ToAirFuelCombustion"
       },
       {
         "@type": "Term",
-        "@id": "nh4ToAirInputsProduction"
+        "@id": "noToAirSoilFlux"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirOrganicSoilBurningIndirect"
+        "@id": "co2ToAirSoilOrganicCarbonStockChangeManagementChange"
       },
       {
         "@type": "Term",
-        "@id": "1112TetrafluoroethaneToAirInputsProduction"
+        "@id": "noxToAirOrganicSoilCultivation"
       },
       {
         "@type": "Term",
-        "@id": "ionisingCompoundsToAirInputsProduction"
+        "@id": "n2OToAirFuelCombustionDirect"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirAquacultureSystemsDirect"
+        "@id": "nh4ToGroundwaterInorganicFertiliser"
       },
       {
         "@type": "Term",
-        "@id": "ch4ToAirExcreta"
+        "@id": "noxToAirCropResidueDecomposition"
       },
       {
         "@type": "Term",
-        "@id": "n2ToAirSoilFlux"
+        "@id": "nToSurfaceWaterAquacultureSystems"
       },
       {
         "@type": "Term",
-        "@id": "coToAirInputsProduction"
+        "@id": "noToAirAquacultureSystems"
       },
       {
         "@type": "Term",
-        "@id": "ch4ToAirSoilFlux"
+        "@id": "n2OToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "co2ToAirSoilInorganicCarbonStockChangeManagementChange"
+        "@id": "n2OToAirExcretaDirect"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirBackgroundSoilFluxDirect"
+        "@id": "1Chloro11DifluoroethaneToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "coToAirFuelCombustion"
+        "@id": "112TrichlorotrifluoroethaneToAirIndustrialProcesses"
       },
       {
         "@type": "Term",
@@ -1298,11 +1298,11 @@
       },
       {
         "@type": "Term",
-        "@id": "residueRemoved"
+        "@id": "residueIncorporatedLessThan30DaysBeforeCultivation"
       },
       {
         "@type": "Term",
-        "@id": "residueIncorporatedLessThan30DaysBeforeCultivation"
+        "@id": "residueRemoved"
       },
       {
         "@type": "Term",
@@ -1768,7 +1768,7 @@
         "@type": "Term",
         "name": "Generic crop, seed",
         "@id": "genericCropSeed",
-        "_score": 24.912773
+        "_score": 24.688505
       }
     ]
   },
@@ -2004,157 +2004,157 @@
         "@type": "Term",
         "name": "Glass or high accessible cover",
         "@id": "glassOrHighAccessibleCover",
-        "_score": 59.591824
+        "_score": 59.344612
       },
       {
         "@type": "Term",
         "name": "Sea or ocean",
         "@id": "seaOrOcean",
-        "_score": 49.211555
+        "_score": 48.93506
       },
       {
         "@type": "Term",
         "name": "River or stream",
         "@id": "riverOrStream",
-        "_score": 48.1141
+        "_score": 47.748756
       },
       {
         "@type": "Term",
         "name": "Other natural vegetation",
         "@id": "otherNaturalVegetation",
-        "_score": 41.84881
+        "_score": 41.860992
       },
       {
         "@type": "Term",
         "name": "Food retailer",
         "@id": "foodRetailer",
-        "_score": 40.49202
+        "_score": 40.538086
       },
       {
         "@type": "Term",
         "name": "Agri-food processor",
         "@id": "agriFoodProcessor",
-        "_score": 40.30419
+        "_score": 40.28276
       },
       {
         "@type": "Term",
         "name": "Natural forest",
         "@id": "naturalForest",
-        "_score": 31.557312
+        "_score": 31.565006
       },
       {
         "@type": "Term",
         "name": "Permanent pasture",
         "@id": "permanentPasture",
-        "_score": 28.212002
+        "_score": 28.16698
       },
       {
         "@type": "Term",
         "name": "Animal housing",
         "@id": "animalHousing",
-        "_score": 27.554867
+        "_score": 27.439247
       },
       {
         "@type": "Term",
         "name": "High intensity grazing pasture",
         "@id": "highIntensityGrazingPasture",
-        "_score": 24.59872
+        "_score": 24.557467
       },
       {
         "@type": "Term",
         "name": "Root or tuber crop plant",
         "@id": "rootOrTuberCropPlant",
-        "_score": 23.863335
+        "_score": 23.628925
       },
       {
         "@type": "Term",
         "name": "Forest",
         "@id": "forest",
-        "_score": 20.173904
+        "_score": 20.177483
       },
       {
         "@type": "Term",
         "name": "Permanent cropland",
         "@id": "permanentCropland",
-        "_score": 19.640331
+        "_score": 19.618952
       },
       {
         "@type": "Term",
         "name": "Other land",
         "@id": "otherLand",
-        "_score": 19.463047
+        "_score": 19.467312
       },
       {
         "@type": "Term",
         "name": "Plantation forest",
         "@id": "plantationForest",
-        "_score": 19.282543
+        "_score": 19.287716
       },
       {
         "@type": "Term",
         "name": "Lake",
         "@id": "lake",
-        "_score": 18.21026
+        "_score": 18.214542
       },
       {
         "@type": "Term",
         "name": "Red sea plume alga",
         "@id": "redSeaPlumeAlga",
-        "_score": 17.605654
+        "_score": 17.61027
       },
       {
         "@type": "Term",
         "name": "Sea kale plant",
         "@id": "seaKalePlant",
-        "_score": 17.513813
+        "_score": 17.518234
       },
       {
         "@type": "Term",
         "name": "Improved pasture",
         "@id": "improvedPasture",
-        "_score": 17.43089
+        "_score": 17.415194
       },
       {
         "@type": "Term",
         "name": "Native pasture",
         "@id": "nativePasture",
-        "_score": 17.387138
+        "_score": 17.327625
       },
       {
         "@type": "Term",
         "name": "Nominally managed pasture",
         "@id": "nominallyManagedPasture",
-        "_score": 16.351063
+        "_score": 16.298176
       },
       {
         "@type": "Term",
         "name": "Severely degraded pasture",
         "@id": "severelyDegradedPasture",
-        "_score": 15.72388
+        "_score": 15.704321
       },
       {
         "@type": "Term",
         "name": "Pond",
         "@id": "pond",
-        "_score": 15.666466
+        "_score": 15.669754
       },
       {
         "@type": "Term",
         "name": "River tamarind tree",
         "@id": "riverTamarindTree",
-        "_score": 15.338312
+        "_score": 15.343109
       },
       {
         "@type": "Term",
         "name": "Cropland",
         "@id": "cropland",
-        "_score": 10.534372
+        "_score": 10.536647
       },
       {
         "@type": "Term",
         "name": "Annual cropland",
         "@id": "annualCropland",
-        "_score": 10.017572
+        "_score": 10.019121
       }
     ]
   },

hestia_earth/models/site/management.py

@@ -20,7 +20,7 @@ from hestia_earth.utils.tools import safe_parse_float, flatten
 from hestia_earth.utils.blank_node import get_node_value
 
 from hestia_earth.models.log import logRequirements, logShouldRun, log_as_table
-from hestia_earth.models.utils import _include, _omit
+from hestia_earth.models.utils import _include, _omit, group_by
 from hestia_earth.models.utils.management import _new_management
 from hestia_earth.models.utils.term import get_lookup_value
 from hestia_earth.models.utils.blank_node import condense_nodes
@@ -330,7 +330,7 @@ def run(site: dict):
     nodes = flatten([_run_cycle(site, cycle) for cycle in cycles])
 
     # group nodes with same `id` to display as a single log per node
-    grouped_nodes = reduce(lambda p, c: p | {c['id']: p.get(c['id'], []) + [c]}, nodes, {})
+    grouped_nodes = group_by(nodes, ['id'])
     for id, values in grouped_nodes.items():
         logRequirements(
             site,

hestia_earth/models/utils/__init__.py

@@ -7,6 +7,7 @@ import sys
 import datetime
 from functools import reduce
 import operator
+from pydash.objects import get
 from typing import Any, Callable, Union
 from hestia_earth.schema import SchemaType
 from hestia_earth.utils.api import download_hestia
@@ -26,6 +27,14 @@ def cached_value(node: dict, key: str = None, default=None):
     return cache.get(key, default) if key else cache
 
 
+def group_by(values: list, keys: list):
+    def _group_by(group: dict, value: dict):
+        group_key = ';'.join(non_empty_list([get(value, key) for key in keys]))
+        group[group_key] = group.get(group_key, []) + [value]
+        return group
+    return reduce(_group_by, values, {})
+
+
 def _term_id(term): return term.get('@id') if isinstance(term, dict) else term
 
 

hestia_earth/models/utils/ecoClimateZone.py

@@ -118,10 +118,7 @@ def get_ecoClimateZone_lookup_grouped_value(
         code = int(str(eco_climate_zone))
         data = _get_single_table_value(lookup, column_name('ecoClimateZone'), code, column_name(col_name))
         grouped_data = reduce(
-            lambda prev, curr: {
-                **prev,
-                **{curr.split(':')[0]: safe_parse_float(curr.split(':')[1])}
-            },
+            lambda prev, curr: prev | {curr.split(':')[0]: safe_parse_float(curr.split(':')[1])},
             data.split(';'),
             {}
         ) if data is not None and isinstance(data, str) and len(data) > 1 else default

hestia_earth/models/utils/lookup.py

@@ -77,7 +77,10 @@ def _term_factor_value(model: str, term_id: str, lookup_name: str, lookup_term_i
         coefficient = get_table_value(lookup, 'termid', lookup_term_id, column_name(node_term_id))
         coefficient = safe_parse_float(extract_grouped_data(coefficient, group_key) if group_key else coefficient)
         if value is not None and coefficient is not None:
-            debugValues(data, model=model, term=term_id, node=node_term_id, value=value, coefficient=coefficient)
+            debugValues(data, model=model, term=term_id,
+                        node=node_term_id,
+                        value=value,
+                        coefficient=coefficient)
         return {'id': node_term_id, 'value': value, 'coefficient': coefficient}
     return get_value
 
@@ -93,7 +96,10 @@ def _aware_factor_value(model: str, term_id: str, lookup_name: str, aware_id: st
             coefficient = _get_single_table_value(lookup, lookup_col, int(aware_id), column_name(node_term_id))
             coefficient = safe_parse_float(extract_grouped_data(coefficient, group_key)) if group_key else coefficient
             if value is not None and coefficient is not None:
-                debugValues(data, model=model, term=term_id, node=node_term_id, value=value, coefficient=coefficient)
+                debugValues(data, model=model, term=term_id,
+                            node=node_term_id,
+                            value=value,
+                            coefficient=coefficient)
                 return value * coefficient
             return None
         except ValueError:  # factor does not exist

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.65.2'
+VERSION = '0.65.4'

{hestia_earth_models-0.65.2.dist-info → hestia_earth_models-0.65.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.65.2
+Version: 0.65.4
 Summary: HESTIA's set of modules for filling gaps in the activity data using external datasets (e.g. populating soil properties with a geospatial dataset using provided coordinates) and internal lookups (e.g. populating machinery use from fuel use). Includes rules for when gaps should be filled versus not (e.g. never gap fill yield, gap fill crop residue if yield provided etc.).
 Home-page: https://gitlab.com/hestia-earth/hestia-engine-models
 Author: HESTIA Team

{hestia_earth_models-0.65.2.dist-info → hestia_earth_models-0.65.4.dist-info}/RECORD

@@ -1,12 +1,12 @@
 hestia_earth/__init__.py,sha256=G-d438vPx7m_ks5e9XTtM3u7LDRO5dSSukibukWmyPM,56
 hestia_earth/models/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3hk,76
-hestia_earth/models/cache_sites.py,sha256=wcF8gr3gEaHoqCP62imvXVrvSLYPYEHTzxkayy4xyck,5645
+hestia_earth/models/cache_sites.py,sha256=Llo2SH1Lp-R8x1JRxJ2Ta-vw5RbdUj2FHXUP-cpKclw,5758
 hestia_earth/models/log.py,sha256=_zAfyOkL_VknEnMFvcpvenSMghadlDfZhiSx28545Gk,3558
 hestia_earth/models/preload_requests.py,sha256=vK_G1UzhNMhYy7ymnCtHUz_vv3cfApCSKqv29VREEBQ,1943
 hestia_earth/models/requirements.py,sha256=eU4yT443fx7BnaokhrLB_PCizJI7Y6m4auyo8vQauNg,17363
-hestia_earth/models/version.py,sha256=s9maOQtfI7tQ3pEMHUg8z_NHZ_D163NY8mQbKoDoJaQ,19
+hestia_earth/models/version.py,sha256=EEisiv1fbGHPaks82hvTdHzqEDCaM-JHsreZadXfBFM,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
-hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=zcuarKatWLIUVwFy71wE2j--tftKga7tobxhasTlruY,4438
+hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=EjDmNYb8ccfOIsA5-bXZvrBLQV85m0hDleiy5q-rLOQ,4142
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=BPjnWmg73i_OxM2ouCdMTWZtPIqyoUAXrvutntyteE0,3390
 hestia_earth/models/akagiEtAl2011AndIpcc2006/__init__.py,sha256=WK7xQwUPX48JGqZeb2S2EKdtXuxMjY7HYyUFHItUqUo,425
 hestia_earth/models/akagiEtAl2011AndIpcc2006/ch4ToAirCropResidueBurning.py,sha256=Mea3L8blwJpRzzJHIMJH71Pn93gz1M2KN2pb43tGBfs,1642
@@ -77,7 +77,7 @@ hestia_earth/models/cycle/animal/properties.py,sha256=OGjRl79w-h439jTkjA8b4V61fM
 hestia_earth/models/cycle/animal/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/models/cycle/animal/input/hestiaAggregatedData.py,sha256=EpJ6qU0jsoSMEuZYIKCn1f-loJ53_nmpnyDhH5sZTuw,2529
 hestia_earth/models/cycle/animal/input/properties.py,sha256=8hqVh4AtW4ZBo3z0mz93etfKCEZgZwBeBVRF9yNYsf0,3609
-hestia_earth/models/cycle/completeness/__init__.py,sha256=rkwGtxIay_AleJCT7al_ngnix_xRqySVie7qvHXMQI0,1517
+hestia_earth/models/cycle/completeness/__init__.py,sha256=bQ-tpeCbUsIdSPGla06Mg2IZWpGp7TgWXlgZTYeLsKk,1512
 hestia_earth/models/cycle/completeness/animalFeed.py,sha256=8Fo1TqwSuiPudvd2vJ-LVxSyOdD8mDCOZMvjuj5W2uo,1012
 hestia_earth/models/cycle/completeness/cropResidue.py,sha256=Jpmm5SAiyUkaFp8EsBIQ55jiCyn3C20a3au_zaPRnEk,2837
 hestia_earth/models/cycle/completeness/electricityFuel.py,sha256=FWG8EuOPubTLDc3jMJv6NdFCgG0wOVgxv-5P9wA7Nys,2044
@@ -131,7 +131,7 @@ hestia_earth/models/emepEea2019/__init__.py,sha256=l90-pWrqIzt1ap1WNk0gF4iZeF5_T
 hestia_earth/models/emepEea2019/co2ToAirFuelCombustion.py,sha256=ib_xzEbIg-iQwvW2L4BosD9lV6EYOXAiIs8gYhSD9GE,1431
 hestia_earth/models/emepEea2019/n2OToAirFuelCombustionDirect.py,sha256=H4dgGqDuvYN4S7TRxYsX3hms1xMWr8clR2gkyyO8T18,1438
 hestia_earth/models/emepEea2019/nh3ToAirExcreta.py,sha256=HNz3w35V0X1Av7if4ZPlDxozrSMurjiy7Hl4iAVEoNg,3590
-hestia_earth/models/emepEea2019/nh3ToAirInorganicFertiliser.py,sha256=n_lpGX6pnJdOy1GJoVSLgA9LnnnWOb_ZHBueZAEDCbk,6041
+hestia_earth/models/emepEea2019/nh3ToAirInorganicFertiliser.py,sha256=7G0_S0G6X9slTykxs6CDb68DvtXB7yfq1iSKg0ReXS8,6036
 hestia_earth/models/emepEea2019/noxToAirFuelCombustion.py,sha256=2--8lI6C6WaYtd9LQe-WZnhvW1eUsjBVAgzT8jclcsc,1431
 hestia_earth/models/emepEea2019/pm10ToAirAnimalHousing.py,sha256=ZxiyoKpT0JbwgEnK9HlselO5-nIq_CTpcGK5a8X5UkM,1527
 hestia_earth/models/emepEea2019/pm25ToAirAnimalHousing.py,sha256=MYMRoFrmu3lhqS9aYE-GCWHfE-NFIgk9Q3Uj1osTlKA,1527
@@ -201,7 +201,7 @@ hestia_earth/models/haversineFormula/transport/__init__.py,sha256=47DEQpj8HBSa-_
 hestia_earth/models/haversineFormula/transport/distance.py,sha256=163KrmKzlEQuKYT1ZvpPgmKlv_-mmvxp0A1_uKya99w,4203
 hestia_earth/models/hestia/__init__.py,sha256=o5vAmPzSaK9XPgL8GCne3-lugfCOgZhHELYolNgqyyY,407
 hestia_earth/models/hestia/landCover.py,sha256=odmRx30UhT_MyOj5jIVtsmLsTcxqC4l-QkCXae_MQEo,28105
-hestia_earth/models/hestia/seed_emissions.py,sha256=omvFmrwngZyonoqxadAy8C0YjUbNV1isqfsOjUF_D5o,11025
+hestia_earth/models/hestia/seed_emissions.py,sha256=B8n8M2RaVfCHHb80rGoQUw8vqmd4crdOdj4ubGBc1gQ,10860
 hestia_earth/models/impact_assessment/__init__.py,sha256=gTR_PhWps593fPhm-V826VLLrZVH8CNQTqxExB7GGNI,418
 hestia_earth/models/impact_assessment/allocationMethod.py,sha256=Qz41nTtMpDCcPy7PjhVtafE13dfJLX_D3Rg3yNhdY_Q,1279
 hestia_earth/models/impact_assessment/emissions.py,sha256=mJsTasM-5AFtZeKzQ9Q38SDLcnl_lQwfjQ52ro2Pjmg,3444
@@ -252,7 +252,7 @@ hestia_earth/models/ipcc2019/co2ToAirCarbonStockChange_utils.py,sha256=PDjwK_mCe
 hestia_earth/models/ipcc2019/co2ToAirLimeHydrolysis.py,sha256=7z0zdqiiWQwkyJCgSNMoK2mft3cJkTRlqwKrMuSKdWI,2454
 hestia_earth/models/ipcc2019/co2ToAirSoilOrganicCarbonStockChange.py,sha256=UQjmccUsKxsycG_htbD1-T2xw6AklKqIR3u8KIMGBOY,6709
 hestia_earth/models/ipcc2019/co2ToAirUreaHydrolysis.py,sha256=Ofld5SuRKndcKB3FFFoUdzSgNq-gc4kmiNyyrPKQ3Io,3580
-hestia_earth/models/ipcc2019/croppingDuration.py,sha256=-CesZ2cNDOQoU3QyVFnSWYO-6-JXxuhRDQoHoxTawDA,3228
+hestia_earth/models/ipcc2019/croppingDuration.py,sha256=0XeM1_iiNXsZTaJQFXc3yNnNf1E-if4gs2ACbAOa3Wk,3508
 hestia_earth/models/ipcc2019/ligninContent.py,sha256=Qh-UH4lv1TIf7wWlbAPwIZZHxzbbmQgND3m15pt5Si8,7285
 hestia_earth/models/ipcc2019/n2OToAirCropResidueDecompositionDirect.py,sha256=Fand7NbT27unwgFTxi_9NxT024s63vQ7U6-tk9yp3d8,3990
 hestia_earth/models/ipcc2019/n2OToAirCropResidueDecompositionIndirect.py,sha256=_Oj6Jw8F4rce7FmhWkzeqyB7W3ZQWpOiA10p6xrfSwc,3777
@@ -387,15 +387,15 @@ hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystems
 hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystemsTerrestrialEcotoxicity.py,sha256=dyUfAD74qEzfIGFei1IcI2RfQXgkjns7AhJ0iYzgCBk,963
 hestia_earth/models/linkedImpactAssessment/__init__.py,sha256=SPP09DMS4zUThyQfcgLpivFwsey4WSt77CDMYHJPKWE,423
 hestia_earth/models/linkedImpactAssessment/emissions.py,sha256=ZU68ljsidyqIKIdFqtR9mze5Am0fK_PE1x4GBTwBTr0,6395
-hestia_earth/models/linkedImpactAssessment/freshwaterWithdrawalsInputsProduction.py,sha256=bWTUaqff4u0Q2fVJBl-S2mXIougZwOBbeGyWoFznJd4,1115
-hestia_earth/models/linkedImpactAssessment/landOccupationInputsProduction.py,sha256=yLC9SiZx9Es9ADVAoW1Db1zs-QQTTjQUmcFOQGAdz28,1119
-hestia_earth/models/linkedImpactAssessment/landTransformation100YearAverageInputsProduction.py,sha256=5ypKZWmMsZhA7f6fEqJ8pMxiiOrlDgdnx6PKLJr5aLE,1206
-hestia_earth/models/linkedImpactAssessment/landTransformation20YearAverageInputsProduction.py,sha256=wjQhCIrdsP99dCaudGx0o2pfLgLV1I-F53zxVi3UQDA,1203
-hestia_earth/models/linkedImpactAssessment/utils.py,sha256=QSf-DPrsPfermpd4vKYAvx2k_vkv8ozpDGhb4LUc-5o,4305
+hestia_earth/models/linkedImpactAssessment/freshwaterWithdrawalsInputsProduction.py,sha256=OTWVjPikOsZTbzgTzCJBkL6fH4Zbprq5SrV5LSLc4C0,1137
+hestia_earth/models/linkedImpactAssessment/landOccupationInputsProduction.py,sha256=M1_QXTxCdWccXPaO7YjOtBa6WkmiQj3Xs89lYIUrM7w,1141
+hestia_earth/models/linkedImpactAssessment/landTransformation100YearAverageInputsProduction.py,sha256=IqQ76I05IC79g2GXY91iWFqEeXk8Fhw-hcrifCaAbiI,1228
+hestia_earth/models/linkedImpactAssessment/landTransformation20YearAverageInputsProduction.py,sha256=yHGyhabzKdBIPSGciJ_LJPKvHbTECXDx8dGOgmT1eqM,1225
+hestia_earth/models/linkedImpactAssessment/utils.py,sha256=RYmvNw147CYGbt8drv4vWZNqwRlT3vOWkadussAfnKY,4459
 hestia_earth/models/mocking/__init__.py,sha256=9VX50c-grz-snfd-7MBS0KfF7AadtbKuj7kK6PqtsgE,687
 hestia_earth/models/mocking/build_mock_search.py,sha256=p15ccEUmkmLp1RiGNznxMz3OFHbI8P1-29ExuohiQN8,1355
 hestia_earth/models/mocking/mock_search.py,sha256=ccFe_WrI73JElFmxp4hPNLCX7eeU--lBC1JFR901KJY,1069
-hestia_earth/models/mocking/search-results.json,sha256=Cv4Kn4zqwM7v3qwa2C6yIcsYpaDISx05iwJig6IlVMs,101691
+hestia_earth/models/mocking/search-results.json,sha256=GuQjDA_voZXB26tGPiBB1I_brcgKIleLiC2hUTu23mI,101696
 hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
 hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=Qt-mel4dkhK6N5uUOutNOinCTFjbjtGzITaaI0LvYc4,2396
 hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=JT0RybbvWVlo01FO8K0Yj41HrEaJT3Kj1xfayr2X-xw,2315
@@ -497,7 +497,7 @@ hestia_earth/models/site/brackishWater.py,sha256=vLEhIZv5PUKwzwvIuYrWi7K---fq7ZX
 hestia_earth/models/site/cationExchangeCapacityPerKgSoil.py,sha256=0eH4A-tXJ0hvIkiYXWxlx8TfrdbIKUGYUDk97-yQJgg,3653
 hestia_earth/models/site/flowingWater.py,sha256=v3g5722GIA4zQAUQI9yGFiZvFvI1QAVZqlQrY-6_B3A,1731
 hestia_earth/models/site/freshWater.py,sha256=FXs3Vt8V4e-wn325_dwSTOKlZtn5ksNUpvYGDeLJShY,1255
-hestia_earth/models/site/management.py,sha256=LXPHWwQ_3HVs651aZx3-CrczhEhYGIiga-WlEmw8A3c,11717
+hestia_earth/models/site/management.py,sha256=ffrXelDxwBuCVy7cZbhYQA0SKymMhCogPQES13ySSYE,11679
 hestia_earth/models/site/netPrimaryProduction.py,sha256=UIIQkYd911qVzrWjxBLrC37e-RARIVgDwLdARY9BuLw,1849
 hestia_earth/models/site/organicCarbonPerHa.py,sha256=F2ShinHf0m9qKa1nCYBspsDkRY6jzOl0wM8mSDre22I,14916
 hestia_earth/models/site/organicCarbonPerKgSoil.py,sha256=t--wAshiAKS-JvEKhLFRadGvgSBv5NFZ68jdyms_wh4,1945
@@ -555,7 +555,7 @@ hestia_earth/models/transformation/product/__init__.py,sha256=47DEQpj8HBSa-_TImW
 hestia_earth/models/transformation/product/excreta.py,sha256=Yj9wMF5if-zivb6qbN3vy1X51ZNYxvoyG9f4KPp3Y18,5700
 hestia_earth/models/usetoxV2/__init__.py,sha256=pK37V3H-KvYcvRKw4Mv8CWrB2N0LFLzmv0jKLdhGGqs,409
 hestia_earth/models/usetoxV2/freshwaterEcotoxicityPotentialCtue.py,sha256=pPX8u-Aq6Pg5Y9xw0CS0S2WkAHQpOMl0lL2tLQwwOuU,918
-hestia_earth/models/utils/__init__.py,sha256=ncZ_1Yb2oZhV8KtdHDK7FkNIZT_kX09D-ik1oA3rzHE,6980
+hestia_earth/models/utils/__init__.py,sha256=ADtNs74scoLRPsBF8J9K-QE6WcNB2qFhBmR8abJAYh8,7302
 hestia_earth/models/utils/aggregated.py,sha256=01V5RDvO9EZAEiApY7M2dUoR4GcGxvAH5lvtIK_qjyI,4946
 hestia_earth/models/utils/animalProduct.py,sha256=M5IunAKGY6oZv3j1Ascl34ywyeLWApqOIlBzbtlA2FE,721
 hestia_earth/models/utils/aquacultureManagement.py,sha256=dxrbC1Xf140cohxTbSw6TxLAnAASWTdNZwBBam4yQnw,171
@@ -570,7 +570,7 @@ hestia_earth/models/utils/cropResidueManagement.py,sha256=nIDFjf39rDD10UHSVudfDy
 hestia_earth/models/utils/currency.py,sha256=f_ArJANb--pZq4LL49SXQ1AMX_oKroqwBXKRRQqZwsM,578
 hestia_earth/models/utils/cycle.py,sha256=uZgqTy4IaCqcSEEHWOcZ0bFBjwGl7gBoedk6HJ5Nryw,16233
 hestia_earth/models/utils/descriptive_stats.py,sha256=EMVwFvg2OnZgKRAfireAoWY2EbrSvqR0V0bK9B53p28,1583
-hestia_earth/models/utils/ecoClimateZone.py,sha256=A3ZtF_B2wr6v7clbVi0zWQ-bOXRoOKq4vGq8mhNf9Ec,4316
+hestia_earth/models/utils/ecoClimateZone.py,sha256=kD5DGActHAfMCJykKQGkwEEicWt7PQlEIX9_PkqXfP0,4265
 hestia_earth/models/utils/emission.py,sha256=H_apu-Og9SJTLVU2lU56IsvSU22-9J7OrqXk1b2qnSE,3638
 hestia_earth/models/utils/excretaManagement.py,sha256=NuWPQjFZxMVt9sYgBjcqhGWCFk_OKb3sA9Ovcff3fRQ,428
 hestia_earth/models/utils/feedipedia.py,sha256=wzzrMbYlda1XCpWiObLz4bFLXbAZejHcxsXJFr4U_AM,3953
@@ -582,7 +582,7 @@ hestia_earth/models/utils/inorganicFertiliser.py,sha256=_dLBY-otGkLr8PobR5dQ89bF
 hestia_earth/models/utils/input.py,sha256=gsVFKTC9WF8dO6YAg_-H_GAOQTnvAr49Ox5-eTH8zf8,5145
 hestia_earth/models/utils/landCover.py,sha256=8-nfynzCx9gf9YfhpuoH6Cn4kQwWFpYA5RmoGW-0ETE,300
 hestia_earth/models/utils/liveAnimal.py,sha256=GnajBPZw5d94raf80KtLloaOqlfqGAPwUtP9bRlGWeE,1754
-hestia_earth/models/utils/lookup.py,sha256=uEP5v4atNkY5FLMopsuBncALOmsyhFe4lNtZvUhcQRM,8517
+hestia_earth/models/utils/lookup.py,sha256=hSqIDZ7aw3YdLtUjCw-wlsUdh3dA6p1jl9Nuvcru3go,8673
 hestia_earth/models/utils/management.py,sha256=W5M9k0arraVUGh4ZccVqgb8rSSLxHM6rkmi4MSzV6Dw,413
 hestia_earth/models/utils/measurement.py,sha256=izEiPszUcPA22zaIc0OuF7Yk82JWu5cxi0Sbz_9YgBo,11142
 hestia_earth/models/utils/organicFertiliser.py,sha256=2HY-a0EBzUw4DkEAXClLMXVCEZTKYf0BwFHBo7lQ5Tg,363
@@ -1154,8 +1154,8 @@ tests/models/utils/test_term.py,sha256=M5Sa26v2gzQYbZ4H_fo7DspnaCx__-WtL-MULGapC
 tests/models/utils/test_time_series.py,sha256=LMhRPf8rp3nAriKAC-2K3FDkrMWntRTUUCERw7Lt68g,2686
 tests/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/webbEtAl2012AndSintermannEtAl2012/test_nh3ToAirOrganicFertiliser.py,sha256=qi2FNXS5Af2WDtm7nq_FsprH3BfCF0XxnE0XHmC4aIY,2244
-hestia_earth_models-0.65.2.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
-hestia_earth_models-0.65.2.dist-info/METADATA,sha256=e85qMBq7uoDEyMt-GC_WG0arpZqoh8ezX1ILgA5D360,3344
-hestia_earth_models-0.65.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_models-0.65.2.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.65.2.dist-info/RECORD,,
+hestia_earth_models-0.65.4.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
+hestia_earth_models-0.65.4.dist-info/METADATA,sha256=NTDzVeU3Bu-lQ5w0Epxbt1LXOtrWX74mEGovrUyF35o,3344
+hestia_earth_models-0.65.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hestia_earth_models-0.65.4.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.65.4.dist-info/RECORD,,