hestia-earth-models 0.47.5__tar.gz → 0.49.0__tar.gz

{hestia-earth-models-0.47.5/hestia_earth_models.egg-info → hestia-earth-models-0.49.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.47.5
+Version: 0.49.0
 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.47.5 → hestia-earth-models-0.49.0}/hestia_earth/models/agribalyse2016/fuelElectricity.py

@@ -3,6 +3,7 @@ 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 InputStatsDefinition, TermTermType
 from hestia_earth.utils.model import filter_list_term_type
 from hestia_earth.utils.tools import flatten, list_sum, non_empty_list
@@ -44,34 +45,49 @@ def _input(term_id: str, value: float, operation: dict):
     return input
 
 
+def _operation_input(operation: dict):
+    input = operation.get('input', {})
+    return _input(input.get('id'), input.get('value') * operation.get('value'), operation.get('term', {}))
+
+
 def _run_operation(cycle: dict):
-    def exec(operation: dict):
-        input = operation.get('input', {})
-        input_term = input.get('term', {})
-        input_term_id = input_term.get('@id')
-        coefficient = input.get('value')
-        value = list_sum(operation.get('value', []))
+    def exec(operations: list):
+        input_term_id = operations[0].get('input').get('id')
+        values_logs = ';'.join([
+            f"id:{p.get('term').get('@id')}_value:{p.get('value')}_coefficient:{p.get('input').get('value')}"
+            for p in operations
+        ])
 
         debugValues(cycle, model=MODEL, term=input_term_id,
-                    operation=operation.get('@id'),
-                    value=value,
-                    coefficient=coefficient)
-        logShouldRun(cycle, MODEL, input_term_id, True, model_key=MODEL_KEY, operation=operation.get('@id'))
+                    values=values_logs)
+
+        logShouldRun(cycle, MODEL, input_term_id, True, model_key=MODEL_KEY)
 
-        return _input(input_term.get('@id'), coefficient * value, operation.get('term', {}))
+        return list(map(_operation_input, operations))
     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', {})
         term_id = term.get('@id')
-        value = list_sum(practice.get('value', []))
+        values = practice.get('value', [])
+        value = list_sum(values) if all([not isinstance(v, str) for v in values]) else 0  # str allowed for Practice
         has_value = value > 0
 
         coeffs = get_lookup_value(term, LOOKUPS['operation'], model=MODEL, model_key=MODEL_KEY)
         values = non_empty_list(coeffs.split(';')) if coeffs else []
-        inputs = [{'term': {'@id': c.split(':')[0]}, 'value': float(c.split(':')[1])} for c in values]
+        inputs = [{'id': c.split(':')[0], 'value': float(c.split(':')[1])} for c in values]
         has_lookup_value = len(inputs) > 0
 
         logRequirements(cycle, model=MODEL, term=term_id, model_key=MODEL_KEY,
@@ -80,10 +96,7 @@ def _should_run_operation(cycle: dict):
 
         should_run = all([has_value, has_lookup_value])
         logShouldRun(cycle, MODEL, term_id, should_run, model_key=MODEL_KEY)
-        return [{
-            **practice,
-            'input': input
-        } for input in inputs] if should_run else []
+        return [{'term': term, 'value': value, 'input': input} for input in inputs] if should_run else []
     return exec
 
 
@@ -105,4 +118,6 @@ def _should_run(cycle: dict):
 
 def run(cycle: dict):
     should_run, operations = _should_run(cycle)
-    return list(map(_run_operation(cycle), operations)) if should_run else []
+    # group operations by input to show logs as table
+    grouped_operations = _group_operations(operations)
+    return flatten(map(_run_operation(cycle), grouped_operations.values())) if should_run else []

{hestia-earth-models-0.47.5 → hestia-earth-models-0.49.0}/hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py

@@ -79,7 +79,7 @@ def _should_run(cycle: dict):
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
                     site_type_valid=site_type_valid,
-                    term_type_incomplete=term_type_incomplete)
+                    term_type_material_incomplete=term_type_incomplete)
 
     should_run = all([site_type_valid, term_type_incomplete])
     logShouldRun(cycle, MODEL, TERM_ID, should_run)

hestia-earth-models-0.47.5/hestia_earth/models/blonkConsultants2016/co2ToAirSoilCarbonStockChangeManagementChange.py → hestia-earth-models-0.49.0/hestia_earth/models/blonkConsultants2016/co2ToAirAboveGroundBiomassStockChangeLandUseChange.py

@@ -49,7 +49,7 @@ RETURNS = {
         "statsDefinition": "modelled"
     }]
 }
-TERM_ID = 'co2ToAirSoilCarbonStockChangeManagementChange'
+TERM_ID = 'co2ToAirAboveGroundBiomassStockChangeLandUseChange'
 TIER = EmissionMethodTier.TIER_1.value
 
 

{hestia-earth-models-0.47.5 → hestia-earth-models-0.49.0}/hestia_earth/models/deRuijterEtAl2010/nh3ToAirCropResidueDecomposition.py

@@ -77,7 +77,7 @@ def _should_run(cycle: dict):
     ])
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
-                    term_type_complete=term_type_complete,
+                    term_type_cropResidue_complete=term_type_complete,
                     left_on_field_residue=left_on_field_residue,
                     total_nitrogenContent=total_nitrogenContent)
 

{hestia-earth-models-0.47.5 → hestia-earth-models-0.49.0}/hestia_earth/models/faostat2018/product/price.py

@@ -67,7 +67,7 @@ def _lookup_data(
     data = get_table_value(lookup, 'termid', country_id, column_name(grouping))
     debugMissingLookup(lookup_name, 'termid', country_id, grouping, data,
                        model=MODEL, term=term_id, key=MODEL_KEY)
-    price = extract_grouped_data(data, str(year)) if year else extract_grouped_data(data, 'Average_price_per_tonne')
+    price = extract_grouped_data(data, str(year)) or extract_grouped_data(data, 'Average_price_per_tonne')
     return safe_parse_float(price, None)
 
 

{hestia-earth-models-0.47.5 → hestia-earth-models-0.49.0}/hestia_earth/models/faostat2018/seed.py

@@ -69,7 +69,7 @@ def _should_run(cycle: dict):
     term_type_incomplete = _is_term_type_incomplete(cycle, TERM_ID)
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
-                    term_type_incomplete=term_type_incomplete,
+                    term_type_other_incomplete=term_type_incomplete,
                     has_products=has_products,
                     product_ids=product_ids)
 

{hestia-earth-models-0.47.5 → hestia-earth-models-0.49.0}/hestia_earth/models/haversineFormula/transport/distance.py

@@ -74,18 +74,37 @@ def _run_input(cycle: dict, site_country: dict):
     return exec
 
 
-def _should_run_input(site_country: str):
+def _should_run_input(site_country_id: str):
     def exec(input: dict):
-        input_country = input.get('country', {}).get('@id')
+        input_country = input.get('country', {}) or {}
+        input_country_id = input_country.get('@id')
+        input_country = download_hestia(input_country_id)
         has_transports = len(input.get('transport', [])) > 0
-        should_run = all([has_transports, input_country, input_country != site_country])
+        should_run = input_country and all([
+            input_country.get('latitude'), input_country.get('latitude'),
+            has_transports, input_country_id != site_country_id
+        ])
         return should_run
     return exec
 
 
-def run(cycle: dict):
-    site_country = cycle.get('site', {}).get('country', {}).get('@id')
-    inputs = list(filter(_should_run_input(site_country), cycle.get('inputs', [])))
+def _should_run(cycle: dict):
+    country = cycle.get('site', {}).get('country', {})
+    country_id = cycle.get('site', {}).get('country', {}).get('@id')
+    inputs = list(filter(_should_run_input(country_id), cycle.get('inputs', [])))
     # download full term to get coordinates only if there is anything to run
-    site_country = download_hestia(site_country) if len(inputs) > 0 else site_country
-    return non_empty_list(map(_run_input(cycle, site_country), inputs))
+    country = download_hestia(country_id) if len(inputs) > 0 else {}
+
+    # can only run if the site country has centroid coordinates
+    logRequirements(cycle, model=MODEL, term=None, key=MODEL_KEY,
+                    latitude=country.get('latitude'),
+                    longitude=country.get('latitude'),
+                    has_inputs_transport=len(inputs) > 0)
+    should_run = all([country.get('latitude'), country.get('latitude'), len(inputs) > 0])
+    logShouldRun(cycle, MODEL, None, should_run, key=MODEL_KEY)
+    return should_run, country, inputs
+
+
+def run(cycle: dict):
+    should_run, country, inputs = _should_run(cycle)
+    return non_empty_list(map(_run_input(cycle, country), inputs)) if should_run else []

{hestia-earth-models-0.47.5 → hestia-earth-models-0.49.0}/hestia_earth/models/impact_assessment/freshwaterWithdrawalsDuringCycle.py

@@ -36,7 +36,11 @@ RETURNS = {
 }
 LOOKUPS = {
     "crop": "cropGroupingFAO",
-    "region": ["Conveyancing_Efficiency_Annual_crops", "Conveyancing_Efficiency_Permanent_crops"]
+    "region": [
+        "Conveyancing_Efficiency_Annual_crops",
+        "Conveyancing_Efficiency_Permanent_crops",
+        "Conveyancing_Efficiency_Perennial_crops"
+    ]
 }
 TERM_ID = 'freshwaterWithdrawalsDuringCycle'
 

{hestia-earth-models-0.47.5 → hestia-earth-models-0.49.0}/hestia_earth/models/impact_assessment/product/economicValueShare.py

@@ -26,7 +26,8 @@ MODEL_KEY = 'economicValueShare'
 
 
 def _run(impact: dict, product: dict):
-    return {**impact.get('product'), MODEL_KEY: product.get(MODEL_KEY, 100)}
+    value = product.get(MODEL_KEY)
+    return {**impact.get('product'), MODEL_KEY: value} if value is not None else None
 
 
 def _should_run(impact: dict):

{hestia-earth-models-0.47.5 → hestia-earth-models-0.49.0}/hestia_earth/models/ipcc2006/aboveGroundCropResidueRemoved.py

@@ -70,7 +70,7 @@ def _should_run(cycle: dict):
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
                     has_products_with_dryMatter=has_products_with_dryMatter,
-                    term_type_incomplete=term_type_incomplete)
+                    term_type_cropResidue_incomplete=term_type_incomplete)
 
     should_run = all([has_products_with_dryMatter, term_type_incomplete])
     logShouldRun(cycle, MODEL, TERM_ID, should_run)

{hestia-earth-models-0.47.5 → hestia-earth-models-0.49.0}/hestia_earth/models/ipcc2006/aboveGroundCropResidueTotal.py

@@ -81,7 +81,7 @@ def _should_run(cycle: dict):
                     single_crop_product=single_crop_product,
                     nb_products=len(products),
                     dryMatter=dm_property.get('value'),
-                    term_type_incomplete=term_type_incomplete)
+                    term_type_cropResidue_incomplete=term_type_incomplete)
 
     should_run = all([term_type_incomplete, single_crop_product, dm_property])
     logShouldRun(cycle, MODEL, TERM_ID, should_run)

{hestia-earth-models-0.47.5 → hestia-earth-models-0.49.0}/hestia_earth/models/ipcc2006/belowGroundCropResidue.py

@@ -22,7 +22,7 @@ REQUIREMENTS = {
     }
 }
 LOOKUPS = {
-    "crop": ["Crop_residue_intercept", "Crop_residue_slope", "Ratio_Abv_to_Below_Grou_crop_residue"]
+    "crop": ["Crop_residue_intercept", "Crop_residue_slope", "IPCC_2019_Ratio_BGRes_AGRes"]
 }
 RETURNS = {
     "Product": [{
@@ -95,7 +95,7 @@ def _should_run(cycle: dict):
                     single_crop_product=single_crop_product,
                     nb_products=len(products),
                     dryMatter=dm_property.get('value'),
-                    term_type_incomplete=term_type_incomplete)
+                    term_type_cropResidue_incomplete=term_type_incomplete)
 
     should_run = all([term_type_incomplete, single_crop_product, dm_property])
     logShouldRun(cycle, MODEL, TERM_ID, should_run)

{hestia-earth-models-0.47.5 → hestia-earth-models-0.49.0}/hestia_earth/models/ipcc2006/n2OToAirCropResidueDecompositionIndirect.py

@@ -52,7 +52,7 @@ def _should_run(cycle: dict):
                     no3_n=no3_n,
                     nh3_n=nh3_n,
                     nox_n=nox_n,
-                    term_type_complete=term_type_complete)
+                    term_type_cropResidue_complete=term_type_complete)
 
     should_run = all([no3_n, nh3_n, nox_n]) or term_type_complete
     logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)

{hestia-earth-models-0.47.5 → hestia-earth-models-0.49.0}/hestia_earth/models/ipcc2006/n2OToAirExcretaDirect.py

@@ -52,7 +52,7 @@ def _should_run(cycle: dict):
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
                     N_total=N_total,
-                    term_type_complete=term_type_complete)
+                    term_type_excreta_complete=term_type_complete)
 
     should_run = any([N_total, term_type_complete])
     logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)

{hestia-earth-models-0.47.5 → hestia-earth-models-0.49.0}/hestia_earth/models/ipcc2006/n2OToAirExcretaIndirect.py

@@ -68,7 +68,7 @@ def _should_run(cycle: dict):
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
                     N_total=N_total,
-                    term_type_complete=term_type_complete)
+                    term_type_excreta_complete=term_type_complete)
 
     should_run = any([N_total, term_type_complete])
     logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)

{hestia-earth-models-0.47.5 → hestia-earth-models-0.49.0}/hestia_earth/models/ipcc2006/n2OToAirInorganicFertiliserDirect.py

@@ -52,7 +52,7 @@ def _should_run(cycle: dict):
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
                     N_total=N_total,
-                    term_type_complete=term_type_complete)
+                    term_type_fertiliser_complete=term_type_complete)
 
     should_run = any([N_total, term_type_complete])
     logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)

{hestia-earth-models-0.47.5 → hestia-earth-models-0.49.0}/hestia_earth/models/ipcc2006/n2OToAirInorganicFertiliserIndirect.py

@@ -68,7 +68,7 @@ def _should_run(cycle: dict):
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
                     N_total=N_total,
-                    term_type_complete=term_type_complete)
+                    term_type_fertiliser_complete=term_type_complete)
 
     should_run = any([N_total, term_type_complete])
     logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)

{hestia-earth-models-0.47.5 → hestia-earth-models-0.49.0}/hestia_earth/models/ipcc2006/n2OToAirOrganicFertiliserDirect.py

@@ -55,7 +55,7 @@ def _should_run(cycle: dict):
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
                     N_total=N_total,
-                    term_type_complete=term_type_complete)
+                    term_type_fertiliser_complete=term_type_complete)
 
     should_run = any([N_total, term_type_complete])
     logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)

{hestia-earth-models-0.47.5 → hestia-earth-models-0.49.0}/hestia_earth/models/ipcc2006/n2OToAirOrganicFertiliserIndirect.py

@@ -68,7 +68,7 @@ def _should_run(cycle: dict):
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
                     N_total=N_total,
-                    term_type_complete=term_type_complete)
+                    term_type_fertiliser_complete=term_type_complete)
 
     should_run = any([N_total, term_type_complete])
     logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)

{hestia-earth-models-0.47.5 → hestia-earth-models-0.49.0}/hestia_earth/models/ipcc2019/aboveGroundCropResidueTotal.py

@@ -75,7 +75,7 @@ def _should_run(cycle: dict):
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
                     has_crop_products=has_crop_products,
-                    term_type_incomplete=term_type_incomplete)
+                    term_type_cropResidue_incomplete=term_type_incomplete)
 
     should_run = all([term_type_incomplete, has_crop_products])
     logShouldRun(cycle, MODEL, TERM_ID, should_run)

{hestia-earth-models-0.47.5 → hestia-earth-models-0.49.0}/hestia_earth/models/ipcc2019/belowGroundCropResidue.py

@@ -81,7 +81,7 @@ def _should_run(cycle: dict):
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
                     has_crop_products=has_crop_products,
-                    term_type_incomplete=term_type_incomplete)
+                    term_type_cropResidue_incomplete=term_type_incomplete)
 
     should_run = all([term_type_incomplete, has_crop_products])
     logShouldRun(cycle, MODEL, TERM_ID, should_run)

{hestia-earth-models-0.47.5 → hestia-earth-models-0.49.0}/hestia_earth/models/ipcc2019/n2OToAirCropResidueDecompositionDirect.py

@@ -119,7 +119,7 @@ def _should_run(cycle: dict):
     ecoClimateZone = get_ecoClimateZone(cycle)
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
-                    term_type_complete=term_type_complete,
+                    term_type_cropResidue_complete=term_type_complete,
                     N_crop_residue=N_crop_residue,
                     ecoClimateZone=ecoClimateZone)
 

{hestia-earth-models-0.47.5 → hestia-earth-models-0.49.0}/hestia_earth/models/koble2014/aboveGroundCropResidue.py

@@ -130,7 +130,7 @@ def _should_run(cycle: dict):
     should_run = all([has_aboveGroundCropResidueTotal, term_type_incomplete])
     for term_id in TERM_ID.split(','):
         logRequirements(cycle, model=MODEL, term=term_id,
-                        term_type_incomplete=term_type_incomplete,
+                        term_type_cropResidue_incomplete=term_type_incomplete,
                         has_aboveGroundCropResidueTotal=has_aboveGroundCropResidueTotal)
         logShouldRun(cycle, MODEL, term_id, should_run)