hestia-earth-models 0.64.5__py3-none-any.whl → 0.64.7__py3-none-any.whl

hestia_earth/models/pooreNemecek2018/landOccupationDuringCycle.py

@@ -2,6 +2,7 @@ from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.indicator import _new_indicator
 from hestia_earth.models.utils.impact_assessment import get_product, get_site
 from hestia_earth.models.utils.cycle import land_occupation_per_kg
+from hestia_earth.models.utils.site import get_land_cover_term_id
 from . import MODEL
 
 REQUIREMENTS = {
@@ -38,14 +39,15 @@ REQUIREMENTS = {
 }
 RETURNS = {
     "Indicator": [{
-        "value": ""
+        "value": "",
+        "landCover": ""
     }]
 }
 TERM_ID = 'landOccupationDuringCycle'
 
 
-def _indicator(term_id: str, value: float):
-    indicator = _new_indicator(term_id, MODEL)
+def _indicator(term_id: str, value: float, land_covert_term_id: str):
+    indicator = _new_indicator(term_id, MODEL, land_covert_term_id)
     indicator['value'] = value
     return indicator
 
@@ -54,16 +56,18 @@ def _should_run(impact_assessment: dict):
     product = get_product(impact_assessment)
     cycle = impact_assessment.get('cycle', {})
     site = get_site(impact_assessment)
+    land_covert_term_id = get_land_cover_term_id(site.get('siteType'))
     land_occupation_m2_kg = land_occupation_per_kg(MODEL, TERM_ID, cycle, site, product)
 
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
-                    land_occupation_kg=land_occupation_m2_kg)
+                    land_occupation_kg=land_occupation_m2_kg,
+                    land_covert_term_id=land_covert_term_id)
 
     should_run = all([land_occupation_m2_kg is not None])
     logShouldRun(impact_assessment, MODEL, TERM_ID, should_run)
-    return should_run, land_occupation_m2_kg
+    return should_run, land_occupation_m2_kg, land_covert_term_id
 
 
 def run(impact_assessment: dict):
-    should_run, land_occupation_kg = _should_run(impact_assessment)
-    return [_indicator(TERM_ID, land_occupation_kg)] if should_run else []
+    should_run, land_occupation_kg, land_covert_term_id = _should_run(impact_assessment)
+    return [_indicator(TERM_ID, land_occupation_kg, land_covert_term_id)] if should_run else []

hestia_earth/models/transformation/input/excreta.py

@@ -4,12 +4,13 @@ Input Excreta
 Copy Cycle (or previous Transformation) `excreta` products into the Transformation inputs if they are missing.
 """
 from functools import reduce
-from hestia_earth.schema import NodeType, TermTermType
+from hestia_earth.schema import NodeType, TermTermType, Input, Product
 from hestia_earth.utils.model import filter_list_term_type, find_term_match
 from hestia_earth.utils.tools import list_sum
 
 from hestia_earth.models.log import logShouldRun
-from hestia_earth.models.utils import term_id_prefix
+from hestia_earth.models.utils import _omit, term_id_prefix
+from hestia_earth.models.utils.blank_node import merge_blank_nodes
 from hestia_earth.models.utils.input import _new_input
 from hestia_earth.models.utils.transformation import previous_transformation
 from .. import MODEL
@@ -43,13 +44,10 @@ MODEL_LOG = '/'.join([MODEL, 'input', MODEL_KEY])
 def _to_input(transformation: dict):
     def new_input(values: tuple):
         product, ratio = values
-        data = {**product}
-        if 'primary' in data.keys():
-            del data['primary']
+        # omit all keys in Product but not in Input
+        data = _omit(product, list(Product().fields.keys() - Input().fields.keys()))
         logShouldRun(transformation, MODEL_LOG, product.get('term', {}).get('@id'), True)
-        return {
-            **data,
-            **_new_input(product.get('term')),
+        return data | _new_input(product.get('term')) | {
             'value': [v * ratio for v in product.get('value', [])],
             'fromCycle': True
         }
@@ -59,8 +57,7 @@ def _to_input(transformation: dict):
 def _group_by_prefix(values: dict, input: dict):
     term_id = input.get('term', {}).get('@id')
     group_id = term_id_prefix(term_id)
-    values[group_id] = values.get(group_id, [])
-    values[group_id].append(input)
+    values[group_id] = values.get(group_id, []) + [input]
     return values
 
 
@@ -84,10 +81,9 @@ def _run_transformation(cycle: dict):
         previous = previous_transformation(cycle, transformations, transformation)
         products = filter_list_term_type(previous.get('products', []), TermTermType.EXCRETA)
         inputs = transformation.get('inputs', [])
-        excreta = filter_list_term_type(transformation.get('inputs'), TermTermType.EXCRETA)
-        grouped_inputs = reduce(_group_by_prefix, excreta, {})
+        grouped_inputs = reduce(_group_by_prefix, filter_list_term_type(inputs, TermTermType.EXCRETA), {})
         missing_products = reduce(_group_missing_products(products), grouped_inputs.values(), [])
-        transformation['inputs'] = inputs + list(map(_to_input(transformation), missing_products))
+        transformation['inputs'] = merge_blank_nodes(inputs, list(map(_to_input(transformation), missing_products)))
         return transformations + [transformation]
     return run
 

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.64.5'
+VERSION = '0.64.7'

{hestia_earth_models-0.64.5.dist-info → hestia_earth_models-0.64.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.64.5
+Version: 0.64.7
 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.64.5.dist-info → hestia_earth_models-0.64.7.dist-info}/RECORD

@@ -4,7 +4,7 @@ hestia_earth/models/cache_sites.py,sha256=KQp9cUKE-aIcYJoMWEtKFYS8gBFfsx5LKQhqoW
 hestia_earth/models/log.py,sha256=DbfNcGzaC5hzkuMDxQqW6XYoNBI4Uxw4SIoOYoZA6og,3474
 hestia_earth/models/preload_requests.py,sha256=Ibx-YOhR_1yuyFBxsLUbvJHVK7PLyMLoPu5l9jDN_Qk,1342
 hestia_earth/models/requirements.py,sha256=eU4yT443fx7BnaokhrLB_PCizJI7Y6m4auyo8vQauNg,17363
-hestia_earth/models/version.py,sha256=CYd0D6vc7EuWRoOk67dhRjY9k0ez3s-7552UUgvJqLU,19
+hestia_earth/models/version.py,sha256=t7dOvw4O9g0IERDiBz_TU-VBx8C8EBuoC8snFc4ns-I,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=tnGxBmJdPfPFfehLUQcefEqy1lHvzsSpx_s7O8nf3Zs,4412
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=BPjnWmg73i_OxM2ouCdMTWZtPIqyoUAXrvutntyteE0,3390
@@ -138,7 +138,7 @@ hestia_earth/models/emepEea2019/utils.py,sha256=oTHjbRRwJZv_tpO9MOlfpyQRmN0a1kvE
 hestia_earth/models/emissionNotRelevant/__init__.py,sha256=nIuPIkQR1ghv_T_Ab4Ckq5wmGdWVmgbaOjhtKfIJ-WE,2183
 hestia_earth/models/environmentalFootprintV3/__init__.py,sha256=lzg9qccwd9tbspw0lQ58YPprnvvSLTn3QV5T2-tPcC4,425
 hestia_earth/models/environmentalFootprintV3/freshwaterEcotoxicityPotentialCtue.py,sha256=X62-4v0NJdM_Z5kLK3NuU4GNEeSrXlKlMZQB_o4JZ6c,1018
-hestia_earth/models/environmentalFootprintV3/soilQualityIndexLandOccupation.py,sha256=6fT2pB8nkI1JM9BqVx1n_Ja8wjqDR7l2BM44eGUJm9k,4271
+hestia_earth/models/environmentalFootprintV3/soilQualityIndexLandOccupation.py,sha256=uo489YIEIO1kuVYm6AKDGysLLjxcBchGWGr0jjLOJo4,4426
 hestia_earth/models/environmentalFootprintV3/utils.py,sha256=HKz_ckzuMZvo8YL-laApyhiccl2NoJUxHs2npwBCMWw,712
 hestia_earth/models/epa2014/__init__.py,sha256=ckGf_6X7CCzI_18OqchEkuJAXKXM1x7V53u480ckknM,408
 hestia_earth/models/epa2014/no3ToGroundwaterExcreta.py,sha256=fN4fOOcjBg3tl0lzNeJ8mzg6mrvQRxilx-R5Gc4l4Nw,1724
@@ -244,7 +244,7 @@ hestia_earth/models/ipcc2019/aboveGroundCropResidueTotal.py,sha256=lT2QVV5c2LvQq
 hestia_earth/models/ipcc2019/belowGroundCropResidue.py,sha256=7AFU2Q0qPAvv6uEKWByS38jl77FvjTPbGm2GQ53waGg,3499
 hestia_earth/models/ipcc2019/carbonContent.py,sha256=tlQvu4Auhpjmaz7XrZz86xwxVrJhsYYf8DFA_aQeev4,7255
 hestia_earth/models/ipcc2019/ch4ToAirAquacultureSystems.py,sha256=q6yyEiYQhHJ2VyQy2Fa84cuTl1D8bjBXOK3UpaRuo20,3196
-hestia_earth/models/ipcc2019/ch4ToAirEntericFermentation.py,sha256=khX90NjkmlvosyRZ77QxgwTKwg42Z_ftOWTTAanHViw,11420
+hestia_earth/models/ipcc2019/ch4ToAirEntericFermentation.py,sha256=7rA9thwYXbJkSFTEl71AbFVQfBz0CaJfblpJpO9s6D8,11611
 hestia_earth/models/ipcc2019/ch4ToAirExcreta.py,sha256=eY_yb7ncTb_2HoUUgXZnnRHiybTXYj_DTe3CmDzD3fY,6717
 hestia_earth/models/ipcc2019/ch4ToAirFloodedRice.py,sha256=TJ4J7VA5n4RPrJYZQeR3lc3ZoCw7T1E5Cb1XJewr834,7331
 hestia_earth/models/ipcc2019/co2ToAirCarbonStockChange_utils.py,sha256=n87ghsqDEuZodeJOAHadfS2au4rqB-cuhZoZhrG55dw,32154
@@ -395,7 +395,7 @@ hestia_earth/models/linkedImpactAssessment/landTransformationFromPermanentPastur
 hestia_earth/models/linkedImpactAssessment/utils.py,sha256=dGwGc2d-8_WQElTpfyPmz5vQtL-LHQRmiZnCTuPXMDs,1876
 hestia_earth/models/mocking/__init__.py,sha256=n3Fkkrvh8zHNWiJZmnfQ7WZ91JRzAO9P6pSG1JpwtXo,687
 hestia_earth/models/mocking/mock_search.py,sha256=qgABw-sZK37XtsALKt8AHF2VJPUrZSnHv5Qj1Dn93oA,2405
-hestia_earth/models/mocking/search-results.json,sha256=_ulYLViCygXSaulspT6Bnf85Sq0d6WEqdKnJ3_T3WOM,54788
+hestia_earth/models/mocking/search-results.json,sha256=wOz1T0GfXcwzzoXZ0QioZ4oL7N5WkZitP7g1fOAQP18,11627
 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
@@ -403,7 +403,7 @@ hestia_earth/models/pooreNemecek2018/ch4ToAirAquacultureSystems.py,sha256=CxjhFi
 hestia_earth/models/pooreNemecek2018/excretaKgN.py,sha256=kB4C1mSA9h8uUJXXaf-39ZwhzAmmvapkfA7v0nUN_Qg,6418
 hestia_earth/models/pooreNemecek2018/excretaKgVs.py,sha256=5rK3wfI8JO2feaFRv23-s9bH09DIl4LLLcjHS3cf-Ow,8424
 hestia_earth/models/pooreNemecek2018/freshwaterWithdrawalsDuringCycle.py,sha256=HB_9q5eE6al2Te3v29hC5wqxsYe4P46ZAPwdWNzx3v0,3939
-hestia_earth/models/pooreNemecek2018/landOccupationDuringCycle.py,sha256=jE110XgPMgfnBMUXyKIL5SL9yZWYhdGr5NrfHcqn2h0,2785
+hestia_earth/models/pooreNemecek2018/landOccupationDuringCycle.py,sha256=GFOm1T9I_aqnGRS3Rsb7gGFEMn9jB4irtdoNW8SFI6s,3118
 hestia_earth/models/pooreNemecek2018/longFallowDuration.py,sha256=Wdm6QyOttCFP9Y3OjbaYrvdMmivOmMIT-m5Eg9SM9rY,1511
 hestia_earth/models/pooreNemecek2018/n2OToAirAquacultureSystemsDirect.py,sha256=HJ7IstImGyasIKosK2lQZ-v6Lqt3_aEfZhoiC4CY0rM,2586
 hestia_earth/models/pooreNemecek2018/n2ToAirAquacultureSystems.py,sha256=SoZlogDd7_4kq5S9gc8KmVeIXacWWhaUkWlKTuho_OA,2431
@@ -544,7 +544,7 @@ hestia_earth/models/stehfestBouwman2006GisImplementation/noxToAirOrganicFertilis
 hestia_earth/models/stehfestBouwman2006GisImplementation/noxToAirSoilFlux.py,sha256=yRsk-WcI13mVz4jerCAxJY91hqNs2JelXhbufP83Km0,3403
 hestia_earth/models/transformation/__init__.py,sha256=63Y_fXFBn4sX2l7F0hMsWkgIvxk5Tw9XoDBQr6bUBQQ,352
 hestia_earth/models/transformation/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hestia_earth/models/transformation/input/excreta.py,sha256=cuUlM3QwrTDu2WdPflkELDjLbSu-mB6TX620T1xPyu8,4231
+hestia_earth/models/transformation/input/excreta.py,sha256=Ic2PrVZcVkxV7M5_Ouk1Yx3GZiiSsQSGQvTWMRE-dHo,4281
 hestia_earth/models/transformation/input/max.py,sha256=epoVopKlKl7epxwz-iLTfmnCHBjmOhiBMhGEQB8-LtU,1574
 hestia_earth/models/transformation/input/min.py,sha256=E3o7Fpoyx-DVrFk_QzQrs24kwvCX9Ylb4mvCoUOwtcw,1574
 hestia_earth/models/transformation/input/properties.py,sha256=tIWhpYDzywATe3_NAMQhrL0hMFeeRHnpZWmLcRsJP8Q,2294
@@ -723,8 +723,8 @@ tests/models/emepEea2019/test_so2ToAirFuelCombustion.py,sha256=zRTyeeQM1fRdRVFWb
 tests/models/emepEea2019/test_tspToAirAnimalHousing.py,sha256=4MNDsxIeUk5_3IvZwEZslxgoPNyQN9OQFDNY3uGNX6E,714
 tests/models/emepEea2019/test_utils.py,sha256=G6z8tEfWM0OPnUBaFCQgQyEi5-kRF_DqsqdYaPnzR_I,8761
 tests/models/environmentalFootprintV3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/environmentalFootprintV3/test_freshwaterEcotoxicityPotentialCtue.py,sha256=lIgsdGh_0eDi-rPcCOrSSjVYNiET2GCSRkAHdugAkDk,851
-tests/models/environmentalFootprintV3/test_soilQualityIndexLandOccupation.py,sha256=3UGN-FM6jn0IimqtjNHh-QlD41nmszrkU--SqlS-Mk8,4411
+tests/models/environmentalFootprintV3/test_freshwaterEcotoxicityPotentialCtue.py,sha256=ZPDKM23qlLMe_ZzeA-QIutSkFlod3BsmjloA9WA8nug,845
+tests/models/environmentalFootprintV3/test_soilQualityIndexLandOccupation.py,sha256=5cv3R1Zam0aW00smkWNKExgdWomhT9Ad8bCTH8KZCdw,4324
 tests/models/epa2014/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/epa2014/test_no3ToGroundwaterExcreta.py,sha256=ESVz4UURvQfhjGBTxjuAV_bymMBcvGNfLAkYMvNup9U,1217
 tests/models/fantkeEtAl2016/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -980,7 +980,7 @@ tests/models/pooreNemecek2018/test_ch4ToAirAquacultureSystems.py,sha256=rUxD57yl
 tests/models/pooreNemecek2018/test_excretaKgN.py,sha256=lKM-Q7TjQoxjvjY9tCcmJxoWvHuxglNCVsPXh6JBgCY,4063
 tests/models/pooreNemecek2018/test_excretaKgVs.py,sha256=LIoLevR0tHrZwazuGprt6SCFtmDrj4NBq1s1SJEhQCA,3252
 tests/models/pooreNemecek2018/test_freshwaterWithdrawalsDuringCycle.py,sha256=5QxDU6VzcwWup3Nuhn32kJoIlAkqcSggGr4CmoRqrFA,1623
-tests/models/pooreNemecek2018/test_landOccupationDuringCycle.py,sha256=XbsApbRIuzq4GeaN7PrzlMA7grU7y6j_HPesgQIf_Uw,1650
+tests/models/pooreNemecek2018/test_landOccupationDuringCycle.py,sha256=MrgxJIuojKCuwCKX6d_KMsg8dTkfdxWwZPnCtjFZDwo,1873
 tests/models/pooreNemecek2018/test_longFallowDuration.py,sha256=kelZajIbKyvVm1vX_grRZy0IUrtejGI5GPn03qbElnw,925
 tests/models/pooreNemecek2018/test_n2OToAirAquacultureSystemsDirect.py,sha256=4YAoUhIwfEmRe2B5BvNg247VeB7UXHNeZqr2mRtJA7Y,2207
 tests/models/pooreNemecek2018/test_n2ToAirAquacultureSystems.py,sha256=YqwAvbYfLVamfkUJUwGTEWEnz8ts66jVF8831QcWNkg,2200
@@ -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.64.5.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
-hestia_earth_models-0.64.5.dist-info/METADATA,sha256=zXgavHtoRldACaVQKBoTj6c1UoaCMSSpEEa1ef5Vk1k,3343
-hestia_earth_models-0.64.5.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-hestia_earth_models-0.64.5.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.64.5.dist-info/RECORD,,
+hestia_earth_models-0.64.7.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
+hestia_earth_models-0.64.7.dist-info/METADATA,sha256=QNAYnAT1-gWDF6jiD3vDBfJQXuwsVE3hzMZDdq6TTEo,3343
+hestia_earth_models-0.64.7.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+hestia_earth_models-0.64.7.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.64.7.dist-info/RECORD,,

tests/models/environmentalFootprintV3/test_freshwaterEcotoxicityPotentialCtue.py

@@ -8,10 +8,12 @@ class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
+with open(f"{fixtures_path}/impact_assessment/emissions/impact-assessment.jsonld", encoding='utf-8') as f:
+    impact = json.load(f)
+
+
 @patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
 def test_run(*args):
-    with open(f"{fixtures_path}/impact_assessment/emissions/impact-assessment.jsonld", encoding='utf-8') as f:
-        impact = json.load(f)
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
 

tests/models/environmentalFootprintV3/test_soilQualityIndexLandOccupation.py

@@ -8,6 +8,10 @@ class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
+with open(f"{fixtures_path}/impact_assessment/emissions/impact-assessment.jsonld", encoding='utf-8') as f:
+    impact = json.load(f)
+
+
 def test_should_run():
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
@@ -16,41 +20,25 @@ def test_should_run():
     cycle['site']['management'] = [{"endDate": "2024-03-31", "@type": "Management",
                                     "term": {"termType": "landCover", "@type": "Term", "@id": "ocean"}}]
 
-    should_run, *args = _should_run(cycle)
+    should_run, *args = _should_run({'cycle': cycle})
     assert not should_run
 
     # no management => no run
     cycle['site']['management'] = []
-    should_run, *args = _should_run(cycle)
+    should_run, *args = _should_run({'cycle': cycle})
     assert not should_run
 
 
 @patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
 def test_run(*args):
-    """
-    Example data:
-    Country: Italy
-    Quantity in m^2: 1.3573373E-9
-    CF METHOD factor: 4.3198E+01
-    "Charact Result [soil quality index]" result also in result.jsonld : 5.86342566854E-08
-    siteArea in test file in ha:    1.3573373E-9 / 10 000 = 1.3573373e-13
-
-    Name Flow: forest Land occupation
-    Parameters
-    ----------
-    args
-
-    Returns
-    -------
-
-    """
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
 
     with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
-    value = run(cycle)
+    impact['cycle'] = cycle
+    value = run(impact)
     assert value == expected
 
 
@@ -77,7 +65,8 @@ def test_run_other_sites(*args):
     with open(f"{fixtures_folder}/otherSites/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
-    value = run(cycle)
+    impact['cycle'] = cycle
+    value = run(impact)
     assert value == expected
 
 
@@ -100,7 +89,8 @@ def test_run_with_subclass_landcover(*args):
     with open(f"{fixtures_folder}/plantationForest/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
-    value = run(cycle)
+    impact['cycle'] = cycle
+    value = run(impact)
     assert value == expected
 
 
@@ -115,7 +105,8 @@ def test_run_with_region_missing_data(*args):
     with open(f"{fixtures_folder}/default-region-world/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
-    value = run(cycle)
+    impact['cycle'] = cycle
+    value = run(impact)
     assert value == expected
 
 
@@ -132,5 +123,6 @@ def test_run_with_no_region(*args):
     with open(f"{fixtures_folder}/default-region-world/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
-    value = run(cycle)
+    impact['cycle'] = cycle
+    value = run(impact)
     assert value == expected

tests/models/pooreNemecek2018/test_landOccupationDuringCycle.py

@@ -9,8 +9,9 @@ class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
+@patch(f"{class_path}.get_land_cover_term_id", return_value='cropland')
 @patch(f"{class_path}.land_occupation_per_kg", return_value=None)
-def test_should_run(mock_land_occupation):
+def test_should_run(mock_land_occupation, *args):
     # with a cycle and functionalUnit = 1 ha => no run
     impact = {'cycle': {'functionalUnit': CycleFunctionalUnit._1_HA.value}}
     should_run, *args = _should_run(impact)
@@ -22,6 +23,7 @@ def test_should_run(mock_land_occupation):
     assert should_run is True
 
 
+@patch(f"{class_path}.get_land_cover_term_id", return_value='cropland')
 @patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
 def test_run(*args):
     with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:
@@ -34,6 +36,7 @@ def test_run(*args):
     assert value == expected
 
 
+@patch(f"{class_path}.get_land_cover_term_id", return_value='cropland')
 @patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
 def test_run_with_plantation(*args):
     with open(f"{fixtures_folder}/with-orchard-crop/impact-assessment.jsonld", encoding='utf-8') as f: