hestia-earth-models 0.74.13__py3-none-any.whl → 0.74.15__py3-none-any.whl

hestia_earth/models/utils/__init__.py

@@ -37,9 +37,9 @@ def group_by(values: list, keys: list):
     return reduce(_group_by, values, {})
 
 
-def value_with_precision(value):
+def value_with_precision(value, digits: int = 3):
     def _to_precision(value):
-        return to_precision(value) if is_number(value) and value else value
+        return to_precision(value, digits=digits) if is_number(value) and value else value
 
     return list(map(_to_precision, value)) if isinstance(value, list) else _to_precision(value)
 

hestia_earth/models/utils/aggregated.py

@@ -50,9 +50,9 @@ def link_inputs_to_impact(model: str, cycle: dict, inputs: list, **log_args):
     return non_empty_list(map(_link_input_to_impact(model, cycle, date, **log_args), inputs))
 
 
-def _should_aggregate_input(term: dict):
+def _should_not_skip_input(term: dict):
     lookup = download_lookup(f"{term.get('termType')}.csv", True)
-    value = get_table_value(lookup, 'termid', term.get('@id'), column_name('skipAggregation'))
+    value = get_table_value(lookup, 'termid', term.get('@id'), column_name('skipLinkedImpactAssessment'))
     return True if value is None or value == '' else not value
 
 
@@ -60,7 +60,7 @@ def should_link_input_to_impact(cycle: dict):
     def should_run(input: dict):
         term = input.get('term', {})
         return all([
-            _should_aggregate_input(term),
+            _should_not_skip_input(term),
             # make sure Input is not a Product as well or we might double-count emissions
             find_term_match(cycle.get('products', []), term.get('@id'), None) is None,
             not input.get('impactAssessment'),

hestia_earth/models/utils/blank_node.py

@@ -27,6 +27,7 @@ from hestia_earth.utils.tools import (
 from hestia_earth.utils.lookup_utils import (
     is_model_siteType_allowed,
     is_model_product_id_allowed,
+    is_model_measurement_id_allowed,
     is_siteType_allowed,
     is_site_measurement_id_allowed,
     is_product_id_allowed,
@@ -121,12 +122,14 @@ def _module_term_id(term_id: str, module):
 def _run_model_required(model: str, term_id: str, data: dict, skip_logs: bool = False):
     siteType_allowed = is_model_siteType_allowed(model, term_id, data)
     product_id_allowed = is_model_product_id_allowed(model, term_id, data)
+    site_measurement_id_allowed = is_model_measurement_id_allowed(model, term_id, data)
 
-    run_required = all([siteType_allowed, product_id_allowed])
+    run_required = all([siteType_allowed, product_id_allowed, site_measurement_id_allowed])
     if not skip_logs:
         debugValues(data, model=model, term=term_id,
                     run_required=run_required,
                     siteType_allowed=siteType_allowed,
+                    site_measurement_id_allowed=site_measurement_id_allowed,
                     product_id_allowed=product_id_allowed)
     return run_required
 
@@ -147,15 +150,16 @@ def _run_required(model: str, term_id: str, data: dict):
     # model is only used for logs here, skip logs if model not provided
     if model:
         debugValues(data, model=model, term=term_id,
+                    # logging this for the model would cause issues parsing statuses
+                    **({} if model.endswith('NotRelevant') else {
+                        'run_required': run_required
+                    }),
                     siteType_allowed=siteType_allowed,
                     site_measurement_id_allowed=site_measurement_id_allowed,
                     product_id_allowed=product_id_allowed,
                     product_termType_allowed=product_termType_allowed,
                     input_id_allowed=input_id_allowed,
                     input_termType_allowed=input_termType_allowed)
-        # logging this for the model would cause issues parsing statuses
-        if not model.endswith('NotRelevant'):
-            debugValues(data, model=model, term=term_id, run_required=run_required)
     return run_required
 
 
@@ -1206,6 +1210,10 @@ def split_node_by_dates(node: dict) -> list[dict]:
     )
 
 
+def split_nodes_by_dates(nodes: list[dict]) -> list[dict]:
+    return non_empty_list(flatten(split_node_by_dates(node) for node in nodes))
+
+
 def group_nodes_by_year_and_month(
     nodes: list[dict],
     default_node_duration: int = 1,

hestia_earth/models/utils/lookup.py

@@ -7,7 +7,7 @@ from hestia_earth.utils.lookup import (
     extract_grouped_data,
     _get_single_table_value
 )
-from hestia_earth.utils.tools import list_sum, safe_parse_float, non_empty_list
+from hestia_earth.utils.tools import list_sum, safe_parse_float
 
 from ..log import debugValues, log_as_table, debugMissingLookup
 
@@ -157,19 +157,19 @@ def all_factor_value(
 
     has_values = len(values) > 0
     missing_values = set([
-        '_'.join(non_empty_list([v.get('id'), v.get('region-id')]))
+        (v.get('id'), v.get('region-id'))
         for v in values
         if v.get('value') and v.get('coefficient') is None
     ])
     all_with_factors = not missing_values
 
     for missing_value in missing_values:
-        debug_values = missing_value.split('_')
+        term_id, region_id = missing_value
         debugMissingLookup(
             lookup_name=lookup_name,
             row='termid',
-            row_value=debug_values[1] if len(debug_values) == 2 else debug_values[0],
-            col=debug_values[0] if len(debug_values) == 2 else lookup_col,
+            row_value=region_id or term_id,
+            col=term_id if region_id else lookup_col,
             value=None,
             model=log_model,
             term=log_term_id
@@ -179,11 +179,10 @@ def all_factor_value(
                 all_with_factors=all_with_factors,
                 missing_lookup_factor=log_as_table([
                     {
-                        'id': v.split('_')[0]
-                    } | ({
-                        'region-id': v.split('_')[1]
-                    } if len(v.split('_')) == 2 else {})
-                    for v in missing_values
+                        'id': term_id,
+                        'region-id': region_id
+                    }
+                    for term_id, region_id in missing_values
                 ]),
                 has_values=has_values,
                 values_used=log_as_table([v for v in values if v.get('coefficient')]))

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.74.13'
+VERSION = '0.74.15'

{hestia_earth_models-0.74.13.dist-info → hestia_earth_models-0.74.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.74.13
+Version: 0.74.15
 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
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: hestia-earth-schema<34.0.0,>=33.5.0
-Requires-Dist: hestia-earth-utils>=0.15.12
+Requires-Dist: hestia-earth-utils>=0.15.16
 Requires-Dist: CurrencyConverter==0.16.8
 Requires-Dist: haversine>=2.7.0
 Requires-Dist: pydash

{hestia_earth_models-0.74.13.dist-info → hestia_earth_models-0.74.15.dist-info}/RECORD

@@ -2,10 +2,10 @@ hestia_earth/__init__.py,sha256=G-d438vPx7m_ks5e9XTtM3u7LDRO5dSSukibukWmyPM,56
 hestia_earth/models/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3hk,76
 hestia_earth/models/cache_nodes.py,sha256=CqcTkvT0SQw-MKExUJgM3wDRt2sgdxgVYb6ylNnfC4I,5423
 hestia_earth/models/cache_sites.py,sha256=0TK08ewVobQkXQ-qph_uB_mfoOhEqcPr4KKwlPWgUKs,6439
-hestia_earth/models/log.py,sha256=LQ6nRMc5q8-xs8DsAx9h8drWhWLkqDG9dFlG9OzFbeA,3780
+hestia_earth/models/log.py,sha256=CGQw2VGbGzVw0ezjlzejTFFUpaHvTED2meLFDW589eo,6362
 hestia_earth/models/preload_requests.py,sha256=-eb4TA4m-A4bLcdAwbKqr3TIsDteVSXhJGCp95mQCew,2504
 hestia_earth/models/requirements.py,sha256=eU4yT443fx7BnaokhrLB_PCizJI7Y6m4auyo8vQauNg,17363
-hestia_earth/models/version.py,sha256=AOjtinMDzwgw8t4XrYc_SZZmwllwgui8kCF_Lb4OO50,20
+hestia_earth/models/version.py,sha256=vO9Eir4oHyHd47pkxODdM0pYKudLMviS6FXpd_kDsSI,20
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=FraWAl06a8OSqbAiHYYLv9e4fYZkVw42S9wikfjeTdw,4377
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=qRkDqpEt3WwleMfHdxMi2nezLmCAxa1TlJZ0IPHDTtI,2584
@@ -38,8 +38,8 @@ hestia_earth/models/cml2001NonBaseline/__init__.py,sha256=vI8wp8Og_e8DiJqYYvp33Y
 hestia_earth/models/cml2001NonBaseline/eutrophicationPotentialIncludingFateAverageEurope.py,sha256=i6zOr4KAe0FYBEnT9M7Aj1bQqtNqVYDZKYOJ4LLhHlE,972
 hestia_earth/models/cml2001NonBaseline/terrestrialAcidificationPotentialExcludingFate.py,sha256=JAzphWh_hY437frP0WLobRjnysMsESNcCaNthvCnGd8,966
 hestia_earth/models/config/Cycle.json,sha256=3QSThmSDNw0dDREXKnHnxyi1Jb8yCMprTmdjI2HcSlI,61355
-hestia_earth/models/config/ImpactAssessment.json,sha256=v3dQizWYrQ4i2LoTqlZ1HDIu5P3xvjk2Y28k_wJX3Rc,61003
-hestia_earth/models/config/Site.json,sha256=8yQKu7XpwMy7Qmm4UJkrzLUcHdz-viPyU6tKFphGx2E,14790
+hestia_earth/models/config/ImpactAssessment.json,sha256=X_CgEB1m8M4uEubhvcgQSovwMwuwSSTFWfkTXM6tChU,61069
+hestia_earth/models/config/Site.json,sha256=ygHgsrrBHKlj7gY7p_9lGXOGPNFWjZnfnnCHkeLhdOM,14992
 hestia_earth/models/config/__init__.py,sha256=7ZqOGd4dO2Stonte6fbktVZqbY7vp8Ls_LifgofCu8I,3009
 hestia_earth/models/config/run-calculations.json,sha256=e3nJ4M6CP1iFzfv8ou_ZUFbFxYkDxJgwuNDXTm4PBDc,615
 hestia_earth/models/config/trigger-calculations.json,sha256=3dmn2bRuj6QEtSTOLdIy31ho7thgUXyDsnqZzPV9rAQ,623
@@ -103,9 +103,9 @@ hestia_earth/models/data/hestiaAggregatedData/__init__.py,sha256=vUYbY-Es_kBSg8C
 hestia_earth/models/deRuijterEtAl2010/__init__.py,sha256=lbH6mB98dmZZlwdZctNYtEmVwAow957l80Dv7JSPDsI,418
 hestia_earth/models/deRuijterEtAl2010/nh3ToAirCropResidueDecomposition.py,sha256=NP6LfOifE7zSz9dUJRgIpGajJdA6lUtdOF_1S9rXKi8,3283
 hestia_earth/models/ecoalimV9/__init__.py,sha256=_evwL-DZejYohms9PUi4TNqLic44-UbOzw178wak7Pk,410
-hestia_earth/models/ecoalimV9/cycle.py,sha256=rnXWQWnvhAQhgXJdZhvcAbRJ6qaW49H3tOpYxG5HOtE,4946
+hestia_earth/models/ecoalimV9/cycle.py,sha256=XSVxQ3_297HpbqBEjF6YRKQZkTED2NbslCLcSbOB8FY,5525
 hestia_earth/models/ecoalimV9/impact_assessment.py,sha256=t0LU31qmNzYMF79OnxQwsobgNdf5y8dALJ0aRHR8yL8,5135
-hestia_earth/models/ecoalimV9/utils.py,sha256=EvzVfllJUbHfl2Q79ojK9fCdYLl58U48ql3PonNqLmI,1348
+hestia_earth/models/ecoalimV9/utils.py,sha256=bnsc9qjQDRLjTEwGNmACMToyIZ5p7AUfbFpf3OcZ79c,3078
 hestia_earth/models/ecoinventV3/__init__.py,sha256=ucIV9cYq4nH-BTMiDerL6_XvTAGlyU8On-2RnxJRghc,412
 hestia_earth/models/ecoinventV3/cycle.py,sha256=JHuXNqIg2tjcToO2KyEfe8t6U74yln4mHh2RIwTE6kc,5327
 hestia_earth/models/ecoinventV3/utils.py,sha256=1bCssR0Ffof_Lf56898vGZKX7PXYbKMNTmrQcSEDEMA,1385
@@ -116,7 +116,7 @@ hestia_earth/models/edip2003/__init__.py,sha256=nyB0CI2gNmRAXj-203aJHQMmETYhcY-d
 hestia_earth/models/edip2003/ozoneDepletionPotential.py,sha256=GF9IeaZ_fC9HMYy5GT4gk67RQZLZrdoBZmEdmEgAiYI,908
 hestia_earth/models/emepEea2019/__init__.py,sha256=l90-pWrqIzt1ap1WNk0gF4iZeF5_TSG62hE83bIi4rQ,412
 hestia_earth/models/emepEea2019/co2ToAirFuelCombustion.py,sha256=f59-XXhUlPw8L80Q9TATkNZf5Pw9LJlofZWfVJNIL9E,814
-hestia_earth/models/emepEea2019/fuelCombustion_utils.py,sha256=IA7qsye4esAOpcpwvkRMHdQHgsjhkSxd325lQp67N_M,4103
+hestia_earth/models/emepEea2019/fuelCombustion_utils.py,sha256=ZsQmJZybPQrAtsULOmEKfrSed3wasTvLxSbfnPfARtU,4124
 hestia_earth/models/emepEea2019/n2OToAirFuelCombustionDirect.py,sha256=6IJSNDMXSeuf9_XGmEll8LxusYnEzVR3WadoVj999j8,860
 hestia_earth/models/emepEea2019/nh3ToAirExcreta.py,sha256=DssSjl_Kug9jE5laqJs9X4xOdOrJBnsXSnk-uA_anyE,2153
 hestia_earth/models/emepEea2019/nh3ToAirFuelCombustion.py,sha256=wbruN-aO3Cj8FCaHbXxlom2AYm_7Jef113EbkXHhj4w,814
@@ -129,7 +129,7 @@ hestia_earth/models/emepEea2019/tspToAirAnimalHousing.py,sha256=TaT5GyYK6MyJQHKA
 hestia_earth/models/emepEea2019/utils.py,sha256=avwNzVQKUgFDq-XyqVrGHiJG5WBrfxGfU94yKPz6TzQ,2947
 hestia_earth/models/emissionNotRelevant/__init__.py,sha256=gPILCub3_rKxwDNH9WmeltkAsMTnV2wkQZlNj019UIE,3029
 hestia_earth/models/environmentalFootprintV3_1/__init__.py,sha256=tF2WrWiV1Wzi2vnRiNXdfPWfmVxgVu9w9-7eA6PA7-s,473
-hestia_earth/models/environmentalFootprintV3_1/environmentalFootprintSingleOverallScore.py,sha256=-ktzRYdyKDea80QSLZGye7rD4AKneGHSIY36oA4B44Y,5673
+hestia_earth/models/environmentalFootprintV3_1/environmentalFootprintSingleOverallScore.py,sha256=zxyQftjaZMRLdtMB5Z2oCspgH7r2EmBRgvfj70CqLJ4,5871
 hestia_earth/models/environmentalFootprintV3_1/freshwaterEcotoxicityPotentialCtue.py,sha256=XEOu4Vp-70B5KZU0gobHcN5d3R97YsEsfq-lwqvkek0,793
 hestia_earth/models/environmentalFootprintV3_1/marineEutrophicationPotential.py,sha256=LismaHPP9r3-F6KxvhYioNkVkjrkLbBSNQxClaiVXbk,938
 hestia_earth/models/environmentalFootprintV3_1/photochemicalOzoneCreationPotentialHumanHealthNmvocEq.py,sha256=d5dc-vHVH-TplFp9tHvSPfUYOQ1pZ42ytJdLazMEJSs,976
@@ -212,9 +212,9 @@ hestia_earth/models/hestia/freshWater.py,sha256=g8H7NL0Q22AG3NQpebylLU6VNfpwbrJ5
 hestia_earth/models/hestia/histosol.py,sha256=-CwOFOVexQpPyZcqGjU0fe5aI7oxlw945bCrfyG9md0,1595
 hestia_earth/models/hestia/inorganicFertiliser.py,sha256=S0LyeoWfczSllGu6js6BORV5vMsWWJwmynrWgUz_aBY,8639
 hestia_earth/models/hestia/irrigatedTypeUnspecified.py,sha256=3qKc7lUOfwiCEfM0MALih3UCAWFnWiHwHk7ocxxF7O0,1855
-hestia_earth/models/hestia/landCover.py,sha256=e9ZoLnZ6TlVV2okHkx5XBXBIz9IVEYSDcVNFLj916tg,12448
-hestia_earth/models/hestia/landCover_utils.py,sha256=jPmQsTDqiu4GvROWjHNAt5Q96jdoyWM9XvEKWgmBJCg,29855
-hestia_earth/models/hestia/landOccupationDuringCycle.py,sha256=CxnT1gktOY8AK02FhvBt6qeynOcoTDAbyOmFneu2LaU,9555
+hestia_earth/models/hestia/landCover.py,sha256=eg43qTmsKiraPFwfgtHGScJHt_pCNtakc_iurKkUqwo,11914
+hestia_earth/models/hestia/landCover_utils.py,sha256=QbDJIKWQb9ggDIxq0s8ipRHDK7Lvi-Ak68PBpNrdy74,29647
+hestia_earth/models/hestia/landOccupationDuringCycle.py,sha256=76TbZrSVxEArozUA5Bg6MY5e8UVN5cR4yb3J-DwYEbE,8975
 hestia_earth/models/hestia/landTransformation100YearAverageDuringCycle.py,sha256=Bd8rD4ioiXvlKCTtYva_Cj3yqIgi2ykeVmCDtjgeY4A,1202
 hestia_earth/models/hestia/landTransformation20YearAverageDuringCycle.py,sha256=yWbnkjvV87M8lUcSR5nxJGunX3Ne3wdVvBMR2b1K_Sc,1200
 hestia_earth/models/hestia/liveAnimal.py,sha256=LhPlAJUVFDwUlKMLaznFidgc8woD4kAeUSUMXlg3fRI,3872
@@ -247,6 +247,7 @@ hestia_earth/models/hestia/salineWater.py,sha256=6P0L24tD0-r4VoFt0Uh8djiMgtivGAe
 hestia_earth/models/hestia/seed_emissions.py,sha256=UbWTnfI76FRX9XSno09bxVSBKxKkuMv6zU7xEyVpVWk,12454
 hestia_earth/models/hestia/slope.py,sha256=2LdcRvRecUkwmlGVqWBQIeaYfRMvsSWKfS9hWvV_DbU,1160
 hestia_earth/models/hestia/slopeLength.py,sha256=-EK4Kwh2MwFqdRyDWNl4O6zoA4Dz7QcD0RwdlTTaC_E,1166
+hestia_earth/models/hestia/soilClassification.py,sha256=HUYqlxHslS1UjBizEynR3iiQLZaESQNNf08wic_PIFc,9852
 hestia_earth/models/hestia/soilMeasurement.py,sha256=_-3Ex9Lr3e7tseQ530b3axC4svTOQ47dY7vEkLMCNYo,7084
 hestia_earth/models/hestia/stockingDensityAnimalHousingAverage.py,sha256=seqIDyRefjFKaznXTZMaMov7fF_0DGiUij_UAEwP65g,1743
 hestia_earth/models/hestia/temperatureAnnual.py,sha256=ja2ts1YGTL5BSh-ccZFWnE6OxPq1B1I2Kw0Kb8XGO2Y,1959
@@ -297,24 +298,24 @@ hestia_earth/models/ipcc2013ExcludingFeedbacks/gwp100.py,sha256=Mv__KZMzP7cvl_rU
 hestia_earth/models/ipcc2013IncludingFeedbacks/__init__.py,sha256=VJ16KIGQQHybzZiTvu3mpZy_3j0xcd06RHHCfPrCMgU,427
 hestia_earth/models/ipcc2013IncludingFeedbacks/gwp100.py,sha256=XyeEZZN_sxxSqcJY19HkTAAB13q-ybif8e_QsD0xyO0,916
 hestia_earth/models/ipcc2019/__init__.py,sha256=LdRpu8KbEc-MroIwXfKDjfj-xbgmfUYgctjKVvtpRfQ,409
-hestia_earth/models/ipcc2019/aboveGroundBiomass.py,sha256=LQ6yRCAOsxROUFDorOAmfLG5TVgZ7_Lp2Tiead2VZYQ,20427
+hestia_earth/models/ipcc2019/aboveGroundBiomass.py,sha256=fdkpLZ34WTXZxeKaCBHstxDP4sqkJFwWkEmKOqG2VJA,20138
 hestia_earth/models/ipcc2019/aboveGroundCropResidueTotal.py,sha256=oG7j8K0bqPGqIaw35wlwHEEz1xI_o5qTwABp5YVTtaA,3466
-hestia_earth/models/ipcc2019/belowGroundBiomass.py,sha256=JgskA_sOHoJMGbUJXgwBjjkBioYZcHrqyjEWOrCXvQ0,19432
+hestia_earth/models/ipcc2019/belowGroundBiomass.py,sha256=NOp8WaX1NJk0TawwJRGzdrrpc0-1xW2JUlACRtbW0-c,19143
 hestia_earth/models/ipcc2019/belowGroundCropResidue.py,sha256=M9--7akmPWo7gfxEYnKobsJ0HyDzfAzRxLmrCt3Pg1Y,3505
-hestia_earth/models/ipcc2019/biocharOrganicCarbonPerHa.py,sha256=5y3dWGGuAzNXpNJhyMW5JfnBryyhmIut4hUhthBif8w,13457
+hestia_earth/models/ipcc2019/biocharOrganicCarbonPerHa.py,sha256=1N4dsiRY_pyLvPcq3g8uBiAiVwSScLFocS9FFBxRW1s,12580
 hestia_earth/models/ipcc2019/biomass_utils.py,sha256=NkTPGMl-0tqvhUZKZ1rxW0XTBnZOvgFJki_IPzEEyu0,15796
 hestia_earth/models/ipcc2019/carbonContent.py,sha256=XhXDu6DRQxANBsRsCEgw4f0UJDOgWsvhVyEwK1-4YT0,7263
 hestia_earth/models/ipcc2019/ch4ToAirAquacultureSystems.py,sha256=n1hG-p67BTXkJATvX1em6255WY0mJxk7SojzBwebtnQ,3385
-hestia_earth/models/ipcc2019/ch4ToAirEntericFermentation.py,sha256=FVQWXsK92KkV10O8cP0oquNNCTMgjzH8HRoMLpwYP1Q,12121
+hestia_earth/models/ipcc2019/ch4ToAirEntericFermentation.py,sha256=piSmwF1G5mYO32_WWncq_k5PaJ0EWrYguVEl_vns6-Q,12167
 hestia_earth/models/ipcc2019/ch4ToAirExcreta.py,sha256=5Ujxec6f5lFZaPbKRcg7XMUBmyYeWcMdaR3ZQ6iStrQ,6489
 hestia_earth/models/ipcc2019/ch4ToAirFloodedRice.py,sha256=3173-WEI_4TpvPdl55VNpmXANPoM92o8hTqcGidj7ds,9979
-hestia_earth/models/ipcc2019/ch4ToAirOrganicSoilCultivation.py,sha256=MG3zsm07JMVm7uRHQ8MtzG_0iswWSIIer2XsYWMXeUU,9555
+hestia_earth/models/ipcc2019/ch4ToAirOrganicSoilCultivation.py,sha256=0NX2SGFVXcT2bi-icSc-AiscLI2QqgVsOmWV05nOHpM,9552
 hestia_earth/models/ipcc2019/co2ToAirAboveGroundBiomassStockChange.py,sha256=HaqqfVT19OTp943QpPkdxv6R8eDSYmEddHq9J2fN6b0,4570
 hestia_earth/models/ipcc2019/co2ToAirBelowGroundBiomassStockChange.py,sha256=4kQ0jAnvr1tNS12_FCJpD3K5f9SCkMheNheXu2evaKE,4094
 hestia_earth/models/ipcc2019/co2ToAirBiocharStockChange.py,sha256=ngZcV_0Gyowccx5PXhYF56Q7YyxcvmfOjgXkU-Odyyw,3762
-hestia_earth/models/ipcc2019/co2ToAirCarbonStockChange_utils.py,sha256=43iUB72uqH05O9iXoywamPdkNfxDBcb7jRyCN8pAaO0,61559
+hestia_earth/models/ipcc2019/co2ToAirCarbonStockChange_utils.py,sha256=Y9l9DZs9xsojplhFMLWdwNsvnzyMKijX_Y7fvFn3vwA,60998
 hestia_earth/models/ipcc2019/co2ToAirLimeHydrolysis.py,sha256=5ciisz0wFbjlwfshDzMlvRIjvw_E8NsphX0IulzVD3A,2479
-hestia_earth/models/ipcc2019/co2ToAirOrganicSoilCultivation.py,sha256=EBFX59QBIO67dfY2Z3p_UB5wGkAaaFIrHq9bhFB5-N8,7620
+hestia_earth/models/ipcc2019/co2ToAirOrganicSoilCultivation.py,sha256=MZGAlJEGs7DiiFw40tGzx-e8ZMze7sgC-R2X-FZl3aE,7613
 hestia_earth/models/ipcc2019/co2ToAirSoilOrganicCarbonStockChange.py,sha256=Ti1koM7k_fV7iWklSFngYaBpAERf3yOaUM5BTbWmDxs,4106
 hestia_earth/models/ipcc2019/co2ToAirUreaHydrolysis.py,sha256=IInWDQCfMQWd6rXDRZnLMQlaQGghVQJcwFSGtRMdkzo,3871
 hestia_earth/models/ipcc2019/croppingDuration.py,sha256=AEOnzVc8mbx0kHpm5BIEiXr1zP0IDUl9qKktNlgURnk,3080
@@ -333,7 +334,7 @@ hestia_earth/models/ipcc2019/n2OToAirNaturalVegetationBurningIndirect.py,sha256=
 hestia_earth/models/ipcc2019/n2OToAirOrganicFertiliserDirect.py,sha256=RSNdJIVgnGs6Qe3SkR9yLYkwVIOjVPBUhqk7P29pv3I,4195
 hestia_earth/models/ipcc2019/n2OToAirOrganicFertiliserIndirect.py,sha256=1izTtLx0iFsK5yRzbxoy_kN6oflHTfBEj-sFXBERAnU,1380
 hestia_earth/models/ipcc2019/n2OToAirOrganicSoilBurningIndirect.py,sha256=6nyMMrhpK5ZaG_Be0ivJB6MSdbYYg6RD67appp1wJiU,1301
-hestia_earth/models/ipcc2019/n2OToAirOrganicSoilCultivationDirect.py,sha256=QR2ZTSX9FJK1zJQ3rgdHWiXyydLCZcLKp5kI2U_7ZLQ,5812
+hestia_earth/models/ipcc2019/n2OToAirOrganicSoilCultivationDirect.py,sha256=tQvOTcqq642WWXs6xMExvwr-2Qb1L8HHHtOSm20vsrs,5807
 hestia_earth/models/ipcc2019/n2OToAirOrganicSoilCultivationIndirect.py,sha256=lXMSAIvWBsNf6TTbYIPTu_uMSBBgk_JDO6S6r630yvg,1321
 hestia_earth/models/ipcc2019/n2OToAir_indirect_emissions_utils.py,sha256=gsxEwd_WF4ZgUIGb8H1Co6AME_eIpCWPvSCNfDJCKbo,4467
 hestia_earth/models/ipcc2019/nh3ToAirInorganicFertiliser.py,sha256=UGojWa9GJRf_JQxfvgX8ywwfoL7N-9FGDF7h679iLNM,4336
@@ -343,14 +344,14 @@ hestia_earth/models/ipcc2019/no3ToGroundwaterCropResidueDecomposition.py,sha256=
 hestia_earth/models/ipcc2019/no3ToGroundwaterExcreta.py,sha256=BV7kdeGlDbSQASBtYZuLNTQktrteaMWGJzIbG97flH0,4319
 hestia_earth/models/ipcc2019/no3ToGroundwaterInorganicFertiliser.py,sha256=zww-PDlLdz3XbrlXfW7F8nWzP3Iud1uLW-mRo8HZf2o,3250
 hestia_earth/models/ipcc2019/no3ToGroundwaterOrganicFertiliser.py,sha256=AHCYaj_al-cLFtvWHhxZLlrZfpjIyWg2rKR435qqGxM,3184
-hestia_earth/models/ipcc2019/nonCo2EmissionsToAirNaturalVegetationBurning.py,sha256=HH7Wp_JSUe8-cwvRZhtEGF1OBHNGJuxeIavARjrQB_E,34647
+hestia_earth/models/ipcc2019/nonCo2EmissionsToAirNaturalVegetationBurning.py,sha256=MSg_43Pybi5Tf2RVlSv_2pCBk2RSV6PiwoYlEm2Z0Hg,33455
 hestia_earth/models/ipcc2019/noxToAirInorganicFertiliser.py,sha256=nBBiKzGMUYtHkU49AKBxQ7OdD61cb9_Ehe7ixFWKHR4,4336
 hestia_earth/models/ipcc2019/noxToAirOrganicFertiliser.py,sha256=yONOR8ppiOXQlPPz68GQ2_3MFzvnOQTJTHpJ956ubW0,4008
-hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=E2w8HAuFmglNpKM4X79Zt8jG7j-AHarntGvQDwRVQMs,8010
+hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=qYR1iB95Uz841xPe727ZYUtrRhg_Unbktf1YEjZHqyU,8000
 hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1.py,sha256=IfXans2CZLagxfr8A0GRxCF2pMu9-ZV8DjuUludaeRQ,79084
 hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2.py,sha256=2kw9bhkR4o4ZSeC4ZFEIEe7OxZvE7Ft1f3Et94YPl3c,69231
-hestia_earth/models/ipcc2019/organicCarbonPerHa_utils.py,sha256=Ui4G7B6jWWSCe-0IgNQ790Ld2QJmBejCk6gDs73sDeI,10335
-hestia_earth/models/ipcc2019/organicSoilCultivation_utils.py,sha256=mJCKYZxqk5vFknckjIjGw478BjZbvKC_xQ-zYpvJ8xM,5628
+hestia_earth/models/ipcc2019/organicCarbonPerHa_utils.py,sha256=DDP3nY-QVRU10FkFihNbnF66-Oa6O6Tkn7ycnetN110,9924
+hestia_earth/models/ipcc2019/organicSoilCultivation_utils.py,sha256=S5XaM7142_ShxFFXPZ4HaOdofRzMYucWc--5udxuin4,5361
 hestia_earth/models/ipcc2019/pastureGrass.py,sha256=V1PRJ17dYw0p9lvuyRVFuYzJrpmNOs0FjhNUXOuUkyU,10202
 hestia_earth/models/ipcc2019/pastureGrass_utils.py,sha256=so5AFrr_0eKXkUoyBpYhHgSXhTQ5z2XADahm2At4RR0,14285
 hestia_earth/models/ipcc2019/utils.py,sha256=s3khA5nJ0rpFsrwWoIGW0y3OYrYA5Iw2GTxN86gO_K8,5890
@@ -471,7 +472,7 @@ hestia_earth/models/linkedImpactAssessment/utils.py,sha256=uxRu5thfTDGpCNIuv3Nak
 hestia_earth/models/mocking/__init__.py,sha256=-mJ_zrVWZSGc3awWW2YJfXAK3Nku77sAUgmmFa99Xmo,733
 hestia_earth/models/mocking/build_mock_search.py,sha256=p15ccEUmkmLp1RiGNznxMz3OFHbI8P1-29ExuohiQN8,1355
 hestia_earth/models/mocking/mock_search.py,sha256=uvklojTAbjDI7Jw43jGAUDcTHk1R3A3CWiYBJZI6rao,1493
-hestia_earth/models/mocking/search-results.json,sha256=a8oMxNa0iMDm5BhFVsyM76yJAuum8-pMYcw_helkmEw,103942
+hestia_earth/models/mocking/search-results.json,sha256=Y38gcp5sPNm7P-Bd2dUk6XMpJGUKQAZNCOJRj37ZD70,103984
 hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
 hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=FoiRk-bULfC9VbhT7L-wgjehrUkG_74XiG2WnW1Rc-U,2402
 hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=r7Wqo5v29NrKfhDd0g1QCharR2k6H5XFyAsKZ6pvYKY,2321
@@ -613,12 +614,12 @@ hestia_earth/models/transformation/product/__init__.py,sha256=47DEQpj8HBSa-_TImW
 hestia_earth/models/transformation/product/excreta.py,sha256=q4IuG48TyuoKxMs1TiB6FnhsILWTBCpc5NC0xLY7alM,5398
 hestia_earth/models/usetoxV2/__init__.py,sha256=pK37V3H-KvYcvRKw4Mv8CWrB2N0LFLzmv0jKLdhGGqs,409
 hestia_earth/models/usetoxV2/freshwaterEcotoxicityPotentialCtue.py,sha256=KVagbCNTceMTj2HGni-b6GwAN2oUzmY91Ru4fJT2ytA,793
-hestia_earth/models/utils/__init__.py,sha256=ZF_Nl39RS23qx4J5eELRi5AJ0q_IPxgOxpLXgppHees,8136
-hestia_earth/models/utils/aggregated.py,sha256=wS9S8GljTuUYkueyoHaFRIGf-FcoBnRMznsi-7-sbKE,3044
+hestia_earth/models/utils/__init__.py,sha256=hMiWAk1AWHqQwatxVLEKIIAwcT4NbYqJzJCNja4vjTs,8168
+hestia_earth/models/utils/aggregated.py,sha256=IJ24J79bbLTOek5VV9SDxbv2PuFxoyrzEY9gQTL_dk4,3053
 hestia_earth/models/utils/animalProduct.py,sha256=M5IunAKGY6oZv3j1Ascl34ywyeLWApqOIlBzbtlA2FE,721
 hestia_earth/models/utils/aquacultureManagement.py,sha256=dxrbC1Xf140cohxTbSw6TxLAnAASWTdNZwBBam4yQnw,171
 hestia_earth/models/utils/background_emissions.py,sha256=hCQQ5W50xqniLvPaZu__bZpK9A16ymH7rhd8KijzWLQ,6957
-hestia_earth/models/utils/blank_node.py,sha256=WfHXhKEGlRMmKQ9favq84WUoIJ8OizywaZLeOmMpTTo,56630
+hestia_earth/models/utils/blank_node.py,sha256=nUCnH0Tzpg5Lbf8yF1I1HgDM5DoWw9Vc_HuD_QAL20Y,57027
 hestia_earth/models/utils/cache_sources.py,sha256=MBkrPpjwNiC4ApDjeYVHZjWBbpvAerXRDrMHpjasAZ0,377
 hestia_earth/models/utils/completeness.py,sha256=1FtDzl1dQ-AZ4nCn1vfGqR4RK3yHItfkksVqsJzIWR0,1256
 hestia_earth/models/utils/constant.py,sha256=DmB3VVuoh7Pz2QDBJqiUG6yAML2i0fOy1BPuPHmhT1w,3442
@@ -639,7 +640,7 @@ hestia_earth/models/utils/inorganicFertiliser.py,sha256=2Uq6ATWwb_YYRzBCMdrlVWyC
 hestia_earth/models/utils/input.py,sha256=KF248eAezwMwDy29xGo0LtWswvH0g1V_sh3gd9_kH2U,6699
 hestia_earth/models/utils/landCover.py,sha256=8-nfynzCx9gf9YfhpuoH6Cn4kQwWFpYA5RmoGW-0ETE,300
 hestia_earth/models/utils/liveAnimal.py,sha256=-ufUs00ALXRKGbrRJi7a7eTWVvkEj_pxLDWYbMJmx2g,1770
-hestia_earth/models/utils/lookup.py,sha256=f_04Te0O6WgLXFrCXGVmCKUj0vAo8IaYCGgC-EKDzzk,8105
+hestia_earth/models/utils/lookup.py,sha256=RMbigN3cTjFuJU2yx-KWtS3oY2xufCMey8bgzvMwJLg,7937
 hestia_earth/models/utils/management.py,sha256=PCL72hDaMrddaP6hNsItMxx35yyGtiSEWnePs_s40LE,792
 hestia_earth/models/utils/measurement.py,sha256=cZCDhI0iLKFdGzvWSu4JK8E1ylv61unoMbETrl5u3Hw,11972
 hestia_earth/models/utils/method.py,sha256=c_HnijbjCTiIK0Juhf34gvXtseCyi0ox8NMoOURIQW8,757
@@ -679,6 +680,7 @@ tests/models/test_cache_nodes.py,sha256=lSSoBGFVXpNv_TePSetls6QbnhfLC7dNLmfiFqT6
 tests/models/test_cache_sites.py,sha256=eZkbgAhfA-67GhPgE4lk8byHnYvX2Ate1KPsE6jH1-c,2954
 tests/models/test_config.py,sha256=wMzRHRtu_H61haAQpT-UtN6nxOQw-JAFrAf-jiIWkiQ,4578
 tests/models/test_emissionNotRelevant.py,sha256=TsIV47lpn7joLGx-LlPVqWbshcLf2c6pUvB3FZwLvwY,1023
+tests/models/test_log.py,sha256=AuhnN-G-CrvHu8fGOEsFKwhR7ZXwZsveYr7JT8bSMmg,4059
 tests/models/test_resourceUseNotRelevant.py,sha256=z1zY3pJdffongIsBJaLB7WToBrMiE4wYuHSsAbGEJ7w,983
 tests/models/test_utils.py,sha256=Caa9sCyz25egPrSlu7FQhjXD2vNcQW9gea_ppUYOsEs,186
 tests/models/agribalyse2016/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -770,7 +772,7 @@ tests/models/data/test_hestiaAggregatedData.py,sha256=m72rayilqxzJ3SzamDdIQ7ZVAP
 tests/models/deRuijterEtAl2010/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/deRuijterEtAl2010/test_nh3ToAirCropResidueDecomposition.py,sha256=kS1nUBVohOSCb386g6Wq7iVclmx0haekUDYo7VQ4NCA,2030
 tests/models/ecoalimV9/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/ecoalimV9/test_cycle.py,sha256=BWaZhVSt9zNFnju12m809Nxa2edj5OkWxSUn6FT7V7U,653
+tests/models/ecoalimV9/test_cycle.py,sha256=NMQqd3vYRvbL6WAodJsJNo6YnW0z67-VtG3vEIK7RYY,747
 tests/models/ecoalimV9/test_impact_assessment.py,sha256=5h9jx7wSPah_FvRDyT-NEejRKlXc5ZmtVucHfkxVMQ8,862
 tests/models/ecoinventV3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/ecoinventV3/test_cycle.py,sha256=jOX-1Xmp8rFzGammioA3zPwPq-w5CS3GeEJ5vUoX0JU,2030
@@ -874,7 +876,7 @@ tests/models/hestia/test_freshWater.py,sha256=v2UD69csKrniKP3MXkOEHxQeE6O3-lvIVi
 tests/models/hestia/test_histosol.py,sha256=7g-3wQPZok2O8mExcnKZxO_T2Ye_h3UHv3HG3Kn8orM,888
 tests/models/hestia/test_inorganicFertiliser.py,sha256=v2Zs1Ig-ChOaq9gXuurcBt12izkH2bRUUuzW6rh3rqQ,643
 tests/models/hestia/test_irrigatedTypeUnspecified.py,sha256=bluZADFagxfXW4QyI0CIJzG97D2V33w333Z9Vwjqo0M,2015
-tests/models/hestia/test_landCover.py,sha256=uy2asaVHRytEDo9F1zGoF0UDVNDZLm04IUp5SVgVBPY,4228
+tests/models/hestia/test_landCover.py,sha256=dk5mnmCNv6gamx-xf0-_uUR31kBNavL8T9_FOsSwMZE,4234
 tests/models/hestia/test_landCover_utils.py,sha256=o5LJ2PwTmUkxKvdHXQsdltrxeyt5kCxwtMtZXMrXqNA,6891
 tests/models/hestia/test_landOccupationDuringCycle.py,sha256=0IVJH7jL8q6Gu4gVo-ENYNw8aetOb-nhzvRXsFqMBEQ,2428
 tests/models/hestia/test_landTransformation100YearAverageDuringCycle.py,sha256=3qa4rWUFqP1VM5-vm_182rhiBYJDxPqJwWtBqJ5K028,956
@@ -908,6 +910,7 @@ tests/models/hestia/test_salineWater.py,sha256=a-JNyzcAPlP-VAQnJbJ6igYWkZ0GCJT_C
 tests/models/hestia/test_seed_emissions.py,sha256=dCUuJBkhwNFBhhcypQN7eMqrWZ9iGCnypoidO5DfQYw,921
 tests/models/hestia/test_slope.py,sha256=ahlhaznJXuU4jxBMZXAEdWUA8Am7WyF4GvNvyX1SdxM,658
 tests/models/hestia/test_slopeLength.py,sha256=O3KXO8mze_PzW1IzV3KPO2YK5QN-a9FWhCkcIG-TWtI,670
+tests/models/hestia/test_soilClassification.py,sha256=B4HXGXBXmQKdC5a5bTzxetuFJGkLh4Rz-pgDXUFhSrI,3594
 tests/models/hestia/test_soilMeasurement.py,sha256=hLJ1wlYIopFzDd4bSuHV64vR2jo4v4Js7Rgso71BX7o,4381
 tests/models/hestia/test_stockingDensityAnimalHousingAverage.py,sha256=ZKLKU75FoYHiKIXqDuXPpfPN06InLA8ZHJFtkkLBhOY,1311
 tests/models/hestia/test_temperatureAnnual.py,sha256=vYqcZu2efQgWfCKXTCTse_9trmMzmBwPz6IN81NzRoI,994
@@ -1003,7 +1006,7 @@ tests/models/ipcc2019/test_noxToAirOrganicFertiliser.py,sha256=LR5pjV5vRbgSSQAw8
 tests/models/ipcc2019/test_organicCarbonPerHa.py,sha256=g_uOqzj6EiyvoAZRpd4PakMYQ7Vfn0QiDGLCTVz92A8,15607
 tests/models/ipcc2019/test_organicCarbonPerHa_tier_1.py,sha256=6DzuqTllZ_Zv3Xuic-3ZIaIik1rYd2eQZk7nysbLCxk,20687
 tests/models/ipcc2019/test_organicCarbonPerHa_tier_2.py,sha256=VYNtsuFDURzqvKH1_5_6_lSQrqTxWnLdopN5ULfrzMg,5486
-tests/models/ipcc2019/test_organicCarbonPerHa_utils.py,sha256=Zd2QlN_Q3k9djuByOH62A00tryVzlvNtsd46N79TTeU,1778
+tests/models/ipcc2019/test_organicCarbonPerHa_utils.py,sha256=jK7wO0dLKODwp_fwY-kp8cfWsDJ1MVXxasGUfqbVFkA,813
 tests/models/ipcc2019/test_pastureGrass.py,sha256=6B8ZmuI1w4rA4wGduWx0l6e0BgGz8b2knTUIcT0GDOg,2725
 tests/models/ipcc2019/animal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/ipcc2019/animal/test_fatContent.py,sha256=Emp8jGudRGA_dJaLMR5Jxsv3Gc57rMAnP0CDqswrmlM,775
@@ -1295,8 +1298,8 @@ tests/orchestrator/strategies/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 tests/orchestrator/strategies/run/test_add_blank_node_if_missing.py,sha256=K4xg4UAXfNhSaLyknKVPO7MGBF44Z_gD7CuZ_pe28gU,3512
 tests/orchestrator/strategies/run/test_add_key_if_missing.py,sha256=hKwvk1ohcBVnQUCTiDhRW99J0xEa29BpwFi1KC0yWLE,329
 tests/orchestrator/strategies/run/test_always.py,sha256=w5-Dhp6yLzgZGAeMRz3OrqZbbAed9gZ1O266a3z9k7w,134
-hestia_earth_models-0.74.13.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
-hestia_earth_models-0.74.13.dist-info/METADATA,sha256=oB5K320bdR7ivb3ao04sbmXqlnDEH2cvYDP9odQcS24,4039
-hestia_earth_models-0.74.13.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_models-0.74.13.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.74.13.dist-info/RECORD,,
+hestia_earth_models-0.74.15.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
+hestia_earth_models-0.74.15.dist-info/METADATA,sha256=4AtIGfEZBnRYTvkOa0N9lH7i7jNOr1JhKFIAJ0kg4cM,4039
+hestia_earth_models-0.74.15.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hestia_earth_models-0.74.15.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.74.15.dist-info/RECORD,,

tests/models/ecoalimV9/test_cycle.py

@@ -2,7 +2,7 @@ import os
 import json
 from unittest.mock import patch
 
-from tests.utils import fixtures_path, fake_new_emission
+from tests.utils import fixtures_path, fake_new_emission, sort_background_emissions
 from hestia_earth.models.ecoalimV9.cycle import MODEL, run
 
 class_path = f"hestia_earth.models.{MODEL}.cycle"
@@ -17,5 +17,6 @@ def test_run(*args):
     with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)['emissions']
 
-    result = run(cycle)
+    result = sort_background_emissions(run(cycle))
+    print(json.dumps(result, indent=2))
     assert result == expected

tests/models/hestia/test_landCover.py

@@ -95,6 +95,6 @@ def test_landCover_from_lookup_run(mock_mgmt, mock_region_lookup, caplog):
         term_id='GADM-BRA',
         column='Maize (corn)',
         model='hestia',
-        key='landCover'
+        model_key='landCover'
     )
     assert result == expected

tests/models/hestia/test_soilClassification.py

@@ -0,0 +1,72 @@
+import json
+from os.path import isfile
+from pytest import mark
+from unittest.mock import patch, MagicMock
+
+from hestia_earth.models.hestia.soilClassification import MODEL, run, _should_run
+
+from tests.utils import fake_new_measurement, fixtures_path
+
+NAME = "soilClassification"
+
+class_path = f"hestia_earth.models.{MODEL}.{NAME}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{NAME}"
+
+
+def _load_fixture(file_name: str, default=None):
+    path = f"{fixtures_folder}/{file_name}.jsonld"
+    if isfile(path):
+        with open(path, encoding="utf-8") as f:
+            return json.load(f)
+    return default
+
+
+# subfolder, should_run
+PARAMS_SHOULD_RUN = [
+    ("single-org-with-date", True),                              # Single histosol measurement, with date
+    ("single-org-without-date", True),                           # Single histosol measurement, no date
+    ("multiple-org-values-single-node-with-dates", True),        # Multiple histosol measurements, with dates, single node # noqa: E501
+    ("multiple-org-values-multiple-nodes-with-dates", True),     # Multiple histosol measurements, with dates, two nodes
+    ("multiple-org-values-multiple-nodes-without-dates", True),  # Multiple histosol measurements, no dates
+    ("multiple-org-values-multiple-nodes-mixed-dates", True),    # Multiple histosol measurements, inconsistent dates
+    ("single-min-equal-100", True),                              # No histosol measurement, mineral measurements equal 100% # noqa: E501
+    ("single-min-less-than-100", True),                          # No histosol measurement, other soilType measurements do not equal 100% # noqa: E501
+    ("no-measurements", True),                                   # No histosol measurement, no other soilType measurements -> return default # noqa: E501
+    ("multiple-org-values-multiple-depths", True),               # Multiple histosol measurements, with different depths
+    ("org-and-min-less-than-100", True),                         # Total soil types do not equal 100%
+    ("non-standard-depths", True),                               # Non-standard depths
+    ("min-with-dates-less-than-100-org-without-dates", True),    # Mineral soils with dates, histosols without
+    ("min-with-dates-equal-100-org-without-dates", True),        # Mineral soils with dates (equal 100%), histosols without # noqa: E501
+    ("0-30-without-dates-0-50-with-dates", True),                # No dates for 0-30, dates for 0-50
+    ("no-dates-no-depth", True),                                 # No dates, no depths
+    ("mixed-depths-choose-standard", True),                      # Mix of standard, non-standard and missing depths -> choose standard depths # noqa: E501
+    ("mixed-depths-choose-non-standard", True),                  # Mix of non-standard and missing depths -> choose non-standard depths # noqa: E501
+]
+IDS_SHOULD_RUN = [p[0] for p in PARAMS_SHOULD_RUN]
+
+
+@mark.parametrize("subfolder, expected", PARAMS_SHOULD_RUN, ids=IDS_SHOULD_RUN)
+def test_should_run(
+    subfolder: str,
+    expected: bool
+):
+    site = _load_fixture(f"{subfolder}/site", {})
+
+    result, *_ = _should_run(site)
+    assert result == expected
+
+
+PARAMS_RUN = [subfolder for subfolder, should_run in PARAMS_SHOULD_RUN if should_run]
+
+
+@mark.parametrize("subfolder", PARAMS_RUN)
+@patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)
+def test_run(
+    _mock_new_measurement: MagicMock,
+    subfolder: str
+):
+    site = _load_fixture(f"{subfolder}/site", {})
+    expected = _load_fixture(f"{subfolder}/result", {})
+
+    result = run(site)
+    assert result == expected

tests/models/ipcc2019/test_organicCarbonPerHa_utils.py

@@ -1,23 +1,6 @@
 from pytest import mark
 
-from hestia_earth.models.ipcc2019.organicCarbonPerHa_utils import (
-    format_bool, format_bool_list, format_enum, format_number, format_number_list, IpccSoilCategory
-)
-
-
-@mark.parametrize(
-    "value, expected",
-    [
-        (True, "True"),
-        (False, "False"),
-        ([], "False"),
-        ("str", "True"),
-        (None, "False")
-    ],
-    ids=["True", "False", "list", "str", "None"]
-)
-def test_format_bool(value, expected):
-    assert format_bool(value) == expected
+from hestia_earth.models.ipcc2019.organicCarbonPerHa_utils import format_bool_list, format_float_list
 
 
 @mark.parametrize(
@@ -25,7 +8,7 @@ def test_format_bool(value, expected):
     [
         ([True, True, False], "True True False"),
         ([], "None"),
-        (["Yes", "No", ""], "True True False"),
+        (["Yes", "No", ""], "None None None"),
         (None, "None")
     ],
     ids=["list", "empty list", "list[str]", "None"]
@@ -37,34 +20,7 @@ def test_format_bool_list(value, expected):
 @mark.parametrize(
     "value, expected",
     [
-        (IpccSoilCategory.WETLAND_SOILS, IpccSoilCategory.WETLAND_SOILS.value),
-        ("str", "None"),
-        (None, "None")
-    ],
-    ids=["Enum", "str", "None"]
-)
-def test_format_enum(value, expected):
-    assert format_enum(value) == expected
-
-
-@mark.parametrize(
-    "value, expected",
-    [
-        (3.141592653, "3.1"),
-        (0, "0.0"),
-        ("20", "None"),
-        (None, "None")
-    ],
-    ids=["float", "zero", "str", "None"]
-)
-def test_format_number(value, expected):
-    assert format_number(value) == expected
-
-
-@mark.parametrize(
-    "value, expected",
-    [
-        ([3.14, 31.4, 314], "3.1 31.4 314.0"),
+        ([3.14, 31.4, 314], "3.1 31.4 314"),
         ([], "None"),
         (["Yes", "No", ""], "None None None"),
         (None, "None")
@@ -72,4 +28,4 @@ def test_format_number(value, expected):
     ids=["list", "empty list", "list[str]", "None"]
 )
 def test_format_number_list(value, expected):
-    assert format_number_list(value) == expected
+    assert format_float_list(value) == expected