hestia-earth-models 0.65.7__py3-none-any.whl → 0.65.9__py3-none-any.whl

hestia_earth/models/site/management.py

@@ -165,7 +165,7 @@ def _gap_filled_date_obj(date_str: str, mode: str = DatestrGapfillMode.END) -> d
     )
 
 
-def _gap_filled_start_date(land_cover_id: str, end_date: str, cycle: dict) -> str:
+def _gap_filled_start_date(land_cover_id: str, end_date: str, cycle: dict) -> datetime:
     """If possible, gap-fill the startDate based on the endDate - maximumCycleDuration"""
     maximum_cycle_duration = _get_maximum_cycle_duration(land_cover_id)
     return max(
@@ -322,12 +322,12 @@ def _has_prop_grouped_with_landCover(product: dict):
     )
 
 
-def _run_from_crop_forage(cycle: dict):
+def _run_from_crop_forage(cycle: dict, site: dict):
     products = _get_relevant_items(
         cycle=cycle,
         item_name="products",
         relevant_terms=[TermTermType.CROP, TermTermType.FORAGE]
-    )
+    ) if site.get("siteType", "") == SiteSiteType.CROPLAND.value else []
     # only take products with a matching landCover term
     products = [p for p in products if get_landCover_term_id(p.get('term', {}))]
     # remove any properties that should not get gap-filled
@@ -376,8 +376,8 @@ def _run_from_practices(cycle: dict):
 
 def _run_cycle(site: dict, cycle: dict):
     inputs = _run_from_inputs(site, cycle)
-    products = _run_from_crop_forage(cycle)
-    site_types = _run_from_siteType(site, cycle)
+    products = _run_from_crop_forage(site=site, cycle=cycle)
+    site_types = _run_from_siteType(site=site, cycle=cycle)
     practices = _run_from_practices(cycle)
     return [
         node | {'cycle-id': cycle.get('@id')}
@@ -387,7 +387,7 @@ def _run_cycle(site: dict, cycle: dict):
 
 def run(site: dict):
     cycles = related_cycles(site)
-    nodes = flatten([_run_cycle(site, cycle) for cycle in cycles])
+    nodes = flatten([_run_cycle(site=site, cycle=cycle) for cycle in cycles])
 
     # group nodes with same `id` to display as a single log per node
     grouped_nodes = group_by(nodes, ['id'])

hestia_earth/models/utils/lookup.py

@@ -11,7 +11,7 @@ from ..log import debugValues, log_as_table, debugMissingLookup
 
 def _node_value(node):
     value = node.get('value')
-    return list_sum(value) if isinstance(value, list) else value
+    return list_sum(value, default=None) if isinstance(value, list) else value
 
 
 def _factor_value(model: str, term_id: str, lookup_name: str, lookup_col: str, grouped_key: Optional[str] = None):
@@ -52,8 +52,8 @@ def all_factor_value(
     missing_values = set([v.get('id') for v in values if v.get('value') is not None and v.get('coefficient') is None])
     all_with_factors = all([v.get('coefficient') is not None for v in values if v.get('value') is not None])
 
-    for term_id in missing_values:
-        debugMissingLookup(lookup_name, 'termid', term_id, lookup_col, None)
+    for missing_value in missing_values:
+        debugMissingLookup(lookup_name, 'termid', missing_value, lookup_col, None)
 
     debugValues(node, model=model, term=term_id,
                 all_with_factors=all_with_factors,

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.65.7'
+VERSION = '0.65.9'

hestia_earth/orchestrator/models/__init__.py

@@ -39,14 +39,14 @@ def _import_model(name: str):
     try:
         return {
             'run': importlib.import_module(f"hestia_earth.models.{name}").run,
-            'version': importlib.import_module('hestia_earth.models.version').VERSION
+            'version': VERSION
         }
     except ModuleNotFoundError:
         # try to load the model from the the models folder, fallback to fully specified name
         try:
             return {
                 'run': importlib.import_module(f"hestia_earth.orchestrator.models.{name}").run,
-                'version': importlib.import_module('hestia_earth.orchestrator.version').VERSION
+                'version': VERSION
             }
         except ModuleNotFoundError:
             return {

{hestia_earth_models-0.65.7.dist-info → hestia_earth_models-0.65.9.dist-info}/METADATA

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

@@ -4,7 +4,7 @@ hestia_earth/models/cache_sites.py,sha256=Llo2SH1Lp-R8x1JRxJ2Ta-vw5RbdUj2FHXUP-c
 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=stR4pjKHfSb4U3BpRBryv63I9rlfGch2ifjxGb-dZps,19
+hestia_earth/models/version.py,sha256=kCzRyuygd47dgg8pZkkwCs6b_7Lb4-nPncYEsjaT4jc,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=rm5ZaRAzJ08m2y4BxkGh-RjudkDWgozmg3XumoRm-fQ,4511
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=BPjnWmg73i_OxM2ouCdMTWZtPIqyoUAXrvutntyteE0,3390
@@ -34,12 +34,12 @@ hestia_earth/models/cml2001Baseline/terrestrialAcidificationPotentialIncludingFa
 hestia_earth/models/cml2001NonBaseline/__init__.py,sha256=vI8wp8Og_e8DiJqYYvp33YoI3t4ffAC31LWlnV20JTg,419
 hestia_earth/models/cml2001NonBaseline/eutrophicationPotentialIncludingFateAverageEurope.py,sha256=lcgyRHY08KCBFPERJNqV4DYGEJCvyHBDnJXD0kEkVqM,1097
 hestia_earth/models/cml2001NonBaseline/terrestrialAcidificationPotentialExcludingFate.py,sha256=xcrxfs9UoV_EWvV-XzMt35oPWCUsTzqg2SGA3j2MFIw,1091
-hestia_earth/models/config/Cycle.json,sha256=JSrcDhzYLyQ1M7oDfY39pxOgWCScz3dXFSjNNPWvMTo,56546
+hestia_earth/models/config/Cycle.json,sha256=HcwStlwnBEjuZwoK6gCFdCfvX5RphSPhDGDj0LQ32Fg,56086
 hestia_earth/models/config/ImpactAssessment.json,sha256=EB8O8_GZ182upCP-Rpko7I48Tdf30ScK-ZZ3rf4DQQI,57585
 hestia_earth/models/config/Site.json,sha256=FfuME8DLLyoHYJ2uBgnueTIK9E7m9aV7iPT8TBoqlzk,12565
 hestia_earth/models/config/__init__.py,sha256=UZZdwfnxTqnZLG4hNecu6sfKvMLvctjdWFraE_9H438,2130
-hestia_earth/models/config/run-calculations.json,sha256=c-WhY3Rd6UinTxz9ht-1O5_rwe2L7DmX6tFaiVGJ0VY,615
-hestia_earth/models/config/trigger-calculations.json,sha256=pAlb_6GN1HVv9OZwQr8togx7y2ygabGmisJLWILMq_A,623
+hestia_earth/models/config/run-calculations.json,sha256=e3nJ4M6CP1iFzfv8ou_ZUFbFxYkDxJgwuNDXTm4PBDc,615
+hestia_earth/models/config/trigger-calculations.json,sha256=3dmn2bRuj6QEtSTOLdIy31ho7thgUXyDsnqZzPV9rAQ,623
 hestia_earth/models/cycle/__init__.py,sha256=VowO3kOHb0LpURsljNaJsYO7s6vgjhul6bF_85UjUEI,406
 hestia_earth/models/cycle/aboveGroundCropResidueTotal.py,sha256=9swq4YEeJQ2YjVOmghgBYWkMZWdNU4MKCUBY5FsmBSU,3088
 hestia_earth/models/cycle/coldCarcassWeightPerHead.py,sha256=fQ7huuxyS5PQkRmR_tRCOz9rV3LJwLfLQJjH_TcTz6k,2955
@@ -148,7 +148,7 @@ hestia_earth/models/emissionNotRelevant/__init__.py,sha256=NkP635TDNs7bQBv2n9tUT
 hestia_earth/models/environmentalFootprintV3/__init__.py,sha256=lzg9qccwd9tbspw0lQ58YPprnvvSLTn3QV5T2-tPcC4,425
 hestia_earth/models/environmentalFootprintV3/freshwaterEcotoxicityPotentialCtue.py,sha256=N_gw2aNoCMW5Z1XM-uAyCF1kfpZUI07giv_bo3Lmr5Q,918
 hestia_earth/models/environmentalFootprintV3/soilQualityIndexLandOccupation.py,sha256=r3GV2pspKWAlKU46TMh_6D_rrXtY_onhk3RnukzJjD8,5095
-hestia_earth/models/environmentalFootprintV3/soilQualityIndexLandTransformation.py,sha256=idxeoR7n1Kq0A4pB4rkZ2_mW-yafEJVkc-gStoxPoE4,6262
+hestia_earth/models/environmentalFootprintV3/soilQualityIndexLandTransformation.py,sha256=h4NVqDHYuf2-6WIZMzA6-8WrZ2yLyGAUCSanEJo_dzs,6709
 hestia_earth/models/environmentalFootprintV3/soilQualityIndexTotalLandUseEffects.py,sha256=SIjFYPv4n3mziohW2nlycaMssHQ3ws79hqHa4i3sCVI,2997
 hestia_earth/models/environmentalFootprintV3/utils.py,sha256=fZ99_G0Kh4OUW5wH-LglzCrKp8l2plKuCs4yvUH_3hs,699
 hestia_earth/models/epa2014/__init__.py,sha256=ckGf_6X7CCzI_18OqchEkuJAXKXM1x7V53u480ckknM,408
@@ -206,7 +206,7 @@ hestia_earth/models/haversineFormula/__init__.py,sha256=o155nR-XI67iCSBVNYIu4sPR
 hestia_earth/models/haversineFormula/transport/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=10wiHdIBhvWjK2ctHusgOcD2aqTNo8MmJVPW2_DQwu0,29409
+hestia_earth/models/hestia/landCover.py,sha256=zq9JIJn4qdsX3SvZxmS5qllOl0xinJfrHDR5dsYjDpg,29507
 hestia_earth/models/hestia/landTransformation100YearAverageDuringCycle.py,sha256=-7ToRvCVPD6AAcjxorPS5jSWio7JAglHrdSS9PPyPqQ,1551
 hestia_earth/models/hestia/landTransformation20YearAverageDuringCycle.py,sha256=TCskVLhYXBMxdeZM-gN4Tdixk5ua7eVn-o5dfIT_H7o,1543
 hestia_earth/models/hestia/resourceUse_utils.py,sha256=1ySn4d-qkDeU8Ss_80l-uOypPoWsmDsqnS6IM8wkI34,7113
@@ -406,7 +406,7 @@ hestia_earth/models/linkedImpactAssessment/utils.py,sha256=S1zlux02gU2Lajrtoq-zQ
 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=D2Ule1jJAIeLu4ojLX0pXd4YmUDGxW1BduwqcDbpcUw,102056
+hestia_earth/models/mocking/search-results.json,sha256=K2swFvB_pADeINR3vBoKMdLcMf8aXTqfTvKaPy6tsFw,102055
 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
@@ -508,7 +508,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=jZqcYxflJWsPef2NrQgPxoKNPKAL3gs616HeMMmQUDY,14503
+hestia_earth/models/site/management.py,sha256=51gpDKNGghiKnt7cbDJGyW62e1Bh7IoXUmgCThaU7Ms,14626
 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
@@ -593,7 +593,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=hSqIDZ7aw3YdLtUjCw-wlsUdh3dA6p1jl9Nuvcru3go,8673
+hestia_earth/models/utils/lookup.py,sha256=-IUSbwp1f0LicPFlD45DT0dh4tTmhu9weCLLCBEpc5c,8699
 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
@@ -614,7 +614,7 @@ hestia_earth/models/webbEtAl2012AndSintermannEtAl2012/nh3ToAirOrganicFertiliser.
 hestia_earth/orchestrator/__init__.py,sha256=ntPWzdomHMdKejrnUlVPCUrLw0P2C9UIt3jRJD_Gwn4,1402
 hestia_earth/orchestrator/log.py,sha256=rvuc221TZCXB1s_Qxme_lTPAI9cZWkmTvnZHGqSDtWY,2214
 hestia_earth/orchestrator/utils.py,sha256=LAMUTyIQ-90TR6CUljWPbCNBsAMeukOhW4zoPy7LzuU,4111
-hestia_earth/orchestrator/models/__init__.py,sha256=wVFqISTf8dKAjsvL9bcqxZx7szn8Gycvuey7Dkxg0fM,4126
+hestia_earth/orchestrator/models/__init__.py,sha256=LdoDX-_wv6ZUCNomEuUMPZrr2jmfsiU_LIcUF8V1Px8,4010
 hestia_earth/orchestrator/models/transformations.py,sha256=zJwfVXabudLXhdyz0Hsk4IV_2OjgMtaYEZbD9kuZtLk,4128
 hestia_earth/orchestrator/models/emissions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/orchestrator/models/emissions/deleted.py,sha256=KC6J1bdMJC1rBFlWW5SD1NhbN8kyBPFdncbtY9OfYBU,575
@@ -758,7 +758,7 @@ tests/models/emepEea2019/test_utils.py,sha256=G6z8tEfWM0OPnUBaFCQgQyEi5-kRF_Dqsq
 tests/models/environmentalFootprintV3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/environmentalFootprintV3/test_freshwaterEcotoxicityPotentialCtue.py,sha256=ZPDKM23qlLMe_ZzeA-QIutSkFlod3BsmjloA9WA8nug,845
 tests/models/environmentalFootprintV3/test_soilQualityIndexLandOccupation.py,sha256=pgauGmFl52lQJVPaDHryrUU3LSmjWC-Al_XBqQj33u4,6116
-tests/models/environmentalFootprintV3/test_soilQualityIndexLandTransformation.py,sha256=3o9pT6S6yNAlvouViRWxVXsjOzXnbZ_OZjRV_jkaQQg,6178
+tests/models/environmentalFootprintV3/test_soilQualityIndexLandTransformation.py,sha256=yR2b7MNw1kDpcHHB_c2uPZ2QF-nDEAs-eBE7HqMxm5k,6231
 tests/models/environmentalFootprintV3/test_soilQualityIndexTotalLandUseEffects.py,sha256=j6V2AE1I98hi-Cv_-L5Rc2zzL0au9SWW4XnMkSuV7yo,2314
 tests/models/epa2014/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/epa2014/test_no3ToGroundwaterExcreta.py,sha256=ESVz4UURvQfhjGBTxjuAV_bymMBcvGNfLAkYMvNup9U,1217
@@ -816,7 +816,7 @@ tests/models/haversineFormula/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 tests/models/haversineFormula/transport/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/haversineFormula/transport/test_distance.py,sha256=hqzIOA1nGao8uiBE16J0ou52McwV4w30ZLpEAqtfi9k,970
 tests/models/hestia/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/hestia/test_landCover.py,sha256=MP5sKjForlG1FGHl6W9zGEV5iQu4DoswrQa_ZhMqGDg,6078
+tests/models/hestia/test_landCover.py,sha256=TCgZMAd11TjXs0RZHHJzjXSCY_UicFgYPoGjjryScm4,6105
 tests/models/hestia/test_landTransformation100YearAverageDuringCycle.py,sha256=3qa4rWUFqP1VM5-vm_182rhiBYJDxPqJwWtBqJ5K028,956
 tests/models/hestia/test_landTransformation20YearAverageDuringCycle.py,sha256=257nCGseM8IEc7i3c2lvx0AsJOpk5Cy633PlZZQYRGo,956
 tests/models/hestia/test_seed_emissions.py,sha256=dCUuJBkhwNFBhhcypQN7eMqrWZ9iGCnypoidO5DfQYw,921
@@ -1107,7 +1107,7 @@ tests/models/site/test_brackishWater.py,sha256=YGCp4glaWudKklYBSp-50KbfvIRtp3F4Q
 tests/models/site/test_cationExchangeCapacityPerKgSoil.py,sha256=tNMhN998vcjQ15I-5mNnFh2d7mHzEBIBO6o1VSfQNUE,1075
 tests/models/site/test_flowingWater.py,sha256=t_rxvdlmUVDsFBoDF20_zDM-0iiLKkNCV7knO9l1T7o,1370
 tests/models/site/test_freshWater.py,sha256=GOeAxHhPW_2E1wQdQRX4W-r7mnb_LgmiAVLImitoApw,982
-tests/models/site/test_management.py,sha256=GT1SRtmZFxyIA8lUABAnzWKcD4JpBwjXGbWzGK-_DvA,1697
+tests/models/site/test_management.py,sha256=-QgZc4jBkhHrvvssn3Xtd3kYGIuV2dDoMJxoejkEhmM,1762
 tests/models/site/test_netPrimaryProduction.py,sha256=JCxG0MODbKVvl3hOqmKzh4FjHYn3Xs9KsVod6LvKQII,1108
 tests/models/site/test_organicCarbonPerHa.py,sha256=XtGrE7ZqthTF0x8lDxJ1slNd_GvYHEyEydcRgA46jEc,3207
 tests/models/site/test_organicCarbonPerKgSoil.py,sha256=0M-NMg_T3UXzGT_VlKOKhSxg4cZ0_zhd3FRgY5Hpj6o,1087
@@ -1204,8 +1204,8 @@ tests/orchestrator/strategies/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 tests/orchestrator/strategies/run/test_add_blank_node_if_missing.py,sha256=lGqeebvgAwGathB8NLZ14Js5JV_-KyHueaD6I8IH8mU,3615
 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.65.7.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
-hestia_earth_models-0.65.7.dist-info/METADATA,sha256=WBcWi-w_mq-nLFKriqoNmPd5Gb2dbMDGRAttdzZIzn4,4046
-hestia_earth_models-0.65.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_models-0.65.7.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.65.7.dist-info/RECORD,,
+hestia_earth_models-0.65.9.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
+hestia_earth_models-0.65.9.dist-info/METADATA,sha256=yf4UsyfGEEeJHUC7KgsGyf6YODOANQkvdOPgErfvMeI,4046
+hestia_earth_models-0.65.9.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hestia_earth_models-0.65.9.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.65.9.dist-info/RECORD,,

tests/models/environmentalFootprintV3/test_soilQualityIndexLandTransformation.py

@@ -18,7 +18,6 @@ def fake_rounded_indicator(value: float):
     return indicator
 
 
-land_cover_terms = ['cropland', 'seaOrOcean', 'forest']
 crop_land = {"@id": "cropland", "termType": "landCover"}
 sea_land_cover = {"@id": "seaOrOcean", "termType": "landCover"}
 forest = {"@id": "forest", "termType": "landCover"}
@@ -27,26 +26,18 @@ indicator = {
     "termType": "resourceUse",
     "units": "m2 / year"
 }
-
 wrong_indicator = {"term": {"@id": "NOT_VALID_INDICATOR_ID", "termType": "resourceUse", "units": "m2 / year"},
-                   "value": 0.5, "landCover": crop_land}
+                   "value": 0.5, "landCover": crop_land, "previousLandCover": forest}
 
 indicator_no_land_cover = {
     "term": indicator,
     "previousLandCover": forest,
     "value": 0.5}
 
-indicator_no_unit = {
-    "term": indicator,
-    "previousLandCover": forest,
-    "value": 0.5,
-    "landCover": crop_land}
-
-indicator_wrong_unit = {
+indicator_no_previous_land_cover = {
     "term": indicator,
-    "value": 0.5,
-    "previousLandCover": forest,
-    "landCover": crop_land}
+    "landCover": crop_land,
+    "value": 0.5}
 
 indicator_bad_area_value = {
     "term": indicator,
@@ -73,13 +64,13 @@ good_inputs_production_indicator_from_forest_to_forest = {
     "landCover": forest}
 
 good_during_cycle_indicator_from_forest_to_cropland = {
-    "term": indicator,
+    "term": indicator | {'@id': 'landTransformation20YearAverageDuringCycle'},
     "value": 0.5,
     "previousLandCover": forest,
     "landCover": crop_land}
 
 good_during_cycle_indicator_from_forest_to_forest = {
-    "term": indicator,
+    "term": indicator | {'@id': 'landTransformation20YearAverageDuringCycle'},
     "value": 0.5,
     "previousLandCover": forest,
     "landCover": forest}
@@ -91,6 +82,7 @@ good_during_cycle_indicator_from_forest_to_forest = {
         ([], True, 0),
         ([wrong_indicator], True, 0),
         ([indicator_no_land_cover], False, 0),
+        ([indicator_no_previous_land_cover], False, 0),
         ([indicator_bad_area_value], False, 0),
         ([good_during_cycle_indicator_from_forest_to_cropland], True, 1),
         ([good_during_cycle_indicator_from_forest_to_forest], True, 1),
@@ -103,6 +95,7 @@ good_during_cycle_indicator_from_forest_to_forest = {
     ids=["No emissionsResourceUse => run, 0 dict",
          "Wrong indicator termid => run, 0 dict",
          "Indicator no landcover terms => no run",
+         "Indicator no previousLandCover terms => no run",
          "Bad m2 / year value => no run",
          "One good during cycle transformation => run, 1 dict",
          "One 0 during cycle transformation => run, 1 dict",

tests/models/hestia/test_landCover.py

@@ -196,7 +196,8 @@ def test_get_sums_of_crop_expansion():
         "brazil_empty_example",
         "gbr_example",
         "malaysia",
-        "prior_landCover"
+        "prior_landCover",
+        "nigeria_cassava"
     ]
 )
 @patch(f"{CLASS_PATH}._new_management", side_effect=fake_new_management)

tests/models/site/test_management.py

@@ -12,7 +12,8 @@ fixtures_folder = os.path.join(fixtures_path, MODEL, MODEL_KEY)
 
 _LAND_COVER_TERM_BY_SITE_TYPE = {
     SiteSiteType.ANIMAL_HOUSING.value: "animalHousing",
-    SiteSiteType.CROPLAND.value: "cropland"
+    SiteSiteType.CROPLAND.value: "cropland",
+    SiteSiteType.AGRI_FOOD_PROCESSOR.value: "agriFoodProcessor"
 }
 _folders = [d for d in os.listdir(fixtures_folder) if os.path.isdir(os.path.join(fixtures_folder, d))]