hestia-earth-models 0.64.8__py3-none-any.whl → 0.64.9__py3-none-any.whl

hestia_earth/models/poschEtAl2008/terrestrialAcidificationPotentialAccumulatedExceedance.py

@@ -25,6 +25,8 @@ LOOKUPS = {
 }
 TERM_ID = 'terrestrialAcidificationPotentialAccumulatedExceedance'
 
+LOOKUP = f"{list(LOOKUPS.keys())[0]}.csv"
+
 
 def _indicator(value: float):
     indicator = _new_indicator(TERM_ID, MODEL)
@@ -33,7 +35,8 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
+    value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv",
+                                 country_fallback=True, default_no_emissions=0)
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, True)

hestia_earth/models/poschEtAl2008/terrestrialEutrophicationPotentialAccumulatedExceedance.py

@@ -25,6 +25,8 @@ LOOKUPS = {
 }
 TERM_ID = 'terrestrialEutrophicationPotentialAccumulatedExceedance'
 
+LOOKUP = f"{list(LOOKUPS.keys())[0]}.csv"
+
 
 def _indicator(value: float):
     indicator = _new_indicator(TERM_ID, MODEL)
@@ -33,7 +35,8 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
+    value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv",
+                                 country_fallback=True, default_no_emissions=0)
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, True)

hestia_earth/models/utils/__init__.py

@@ -188,9 +188,10 @@ def full_date_str(date_str: str, is_end: bool = False):
     )
 
 
-def days_to_years(days):
-    return days / 365
+def days_to_years(days): return days / 365
 
 
-def hectar_to_square_meter(value):
-    return value * 10000
+def hectar_to_square_meter(value): return value * 10000
+
+
+def square_meter_to_hectare(value): return value / 10000

hestia_earth/models/utils/impact_assessment.py

@@ -1,9 +1,10 @@
 from typing import Optional
 
+from hestia_earth.utils.lookup import download_lookup
 from hestia_earth.utils.model import find_term_match
 from hestia_earth.utils.tools import list_sum, safe_parse_date
 
-from .lookup import factor_value, _term_factor_value, _aware_factor_value
+from .lookup import factor_value, _term_factor_value, _aware_factor_value, fallback_country
 from .product import find_by_product
 from .site import region_level_1_id
 from ..log import logRequirements
@@ -116,7 +117,8 @@ def impact_lookup_value(model: str, term_id: str, impact: dict, lookup_col: str,
     return list_sum(values) if len(values) > 0 else None
 
 
-def impact_country_value(model: str, term_id: str, impact: dict, lookup: str, group_key: str = None) -> float:
+def impact_country_value(model: str, term_id: str, impact: dict, lookup: str, group_key: str = None,
+                         country_fallback: bool = False, default_no_emissions=None) -> float:
     """
     Calculate the value of the impact based on lookup factors and `site.country.@id`.
 
@@ -126,12 +128,17 @@ def impact_country_value(model: str, term_id: str, impact: dict, lookup: str, gr
         The model to display in the logs only.
     term_id : str
         The term to display in the logs only.
-    impact_assessment : dict
+    impact : dict
         The `ImpactAssessment`.
     lookup : str
         The name of the lookup to fetch the factors from.
     group_key : str
         Optional: key to use if the data is a group of values.
+    country_fallback : bool
+        Optional: if True fallback to default `region-world` country_id if country_id in `ImpactAssessment` not found in
+        lookup file containing factors.
+    default_no_emissions :
+        Optional: if set, will return this value if no contributing terms found in emissionsResourceUse
 
     Returns
     -------
@@ -140,9 +147,11 @@ def impact_country_value(model: str, term_id: str, impact: dict, lookup: str, gr
     """
     nodes = impact.get('emissionsResourceUse', [])
     country_id = get_country_id(impact)
+    country_id = fallback_country(country_id, [download_lookup(lookup)]) if country_fallback else country_id
+
     factors = list(map(_term_factor_value(model, term_id, lookup, country_id, group_key), nodes))
     values = [value for value in factors if value is not None]
-    return list_sum(values) if len(values) > 0 else None
+    return list_sum(values) if len(values) > 0 else default_no_emissions
 
 
 def impact_aware_value(model: str, term_id: str, impact: dict, lookup: str, group_key: str = None) -> float:

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.64.8'
+VERSION = '0.64.9'

{hestia_earth_models-0.64.8.dist-info → hestia_earth_models-0.64.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.64.8
+Version: 0.64.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.64.8.dist-info → hestia_earth_models-0.64.9.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=L60xIy0nhRJ6qj8RKQ1dAZGRyLHbUcTSsWzwzTRRH2M,19
+hestia_earth/models/version.py,sha256=Jgb2_29ee7rkzvbt06so5Fn_7zQiC2iVFHY9sT85u3c,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
@@ -60,7 +60,7 @@ hestia_earth/models/cycle/residueBurnt.py,sha256=HwU1D9ibiIul-FlXDUcEMDEc_KxpB8u
 hestia_earth/models/cycle/residueIncorporated.py,sha256=9_s2RMOy5D20eq9ziDBEA_Y7RiFFMeK0bDJ65CW4qlE,2763
 hestia_earth/models/cycle/residueLeftOnField.py,sha256=qYxKGAdUORN7Vjqj7AZC2VGV_rM3MN0-padDGhgjiNU,2175
 hestia_earth/models/cycle/residueRemoved.py,sha256=jxDu_Jfcyd-rm-qo8ZuRIf-GGxtFBMpmGy1zHOavwy0,2135
-hestia_earth/models/cycle/siteArea.py,sha256=ueWaQqH4POYynLG1aVXYcOm8pRehmo4IxkbsYcy4Gvc,2661
+hestia_earth/models/cycle/siteArea.py,sha256=K_Vj8lc_HP1WOVm22jlIMfE9fIOc6WkMXe-iDHiTdB4,2748
 hestia_earth/models/cycle/siteDuration.py,sha256=8VCYn608Lw1A6gLOG2bA1Z2tAQbmDg_yXeq6sgkrXac,2342
 hestia_earth/models/cycle/siteUnusedDuration.py,sha256=orYGlbzGMpjuDAtZe7KkCOLWrwUYR1H4A0ccAbutW3s,2189
 hestia_earth/models/cycle/startDate.py,sha256=pbBi55b6uJezPE8EOovOCSwQVrbwpmxwmravOCIh2zg,2683
@@ -138,9 +138,9 @@ 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=fFYSOjO_G1XPRW0Au7erYj4XSAZkoMN0Lx4DvEziSBo,4514
-hestia_earth/models/environmentalFootprintV3/soilQualityIndexLandTransformation.py,sha256=K0ot5wLo8beAHkBmXEQGPDRykoBoQ0u2ihxLAZWpy6I,7259
-hestia_earth/models/environmentalFootprintV3/soilQualityIndexTotalLandUseEffects.py,sha256=-Lsc2VLtOwFnNqCL7nHKsyLfcSWIgYGs4iMso3AoDk8,2679
+hestia_earth/models/environmentalFootprintV3/soilQualityIndexLandOccupation.py,sha256=r3GV2pspKWAlKU46TMh_6D_rrXtY_onhk3RnukzJjD8,5095
+hestia_earth/models/environmentalFootprintV3/soilQualityIndexLandTransformation.py,sha256=1vDkm9SifdcNNJX8JGDeuyTNP65D684X7I2kk3H760U,7348
+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
 hestia_earth/models/epa2014/no3ToGroundwaterExcreta.py,sha256=fN4fOOcjBg3tl0lzNeJ8mzg6mrvQRxilx-R5Gc4l4Nw,1724
@@ -149,8 +149,8 @@ hestia_earth/models/fantkeEtAl2016/damageToHumanHealthParticulateMatterFormation
 hestia_earth/models/faostat2018/__init__.py,sha256=ecN-pKF1pkFnzmooBrg1VAxJkG76q9v4piiaKGP_vbo,412
 hestia_earth/models/faostat2018/coldCarcassWeightPerHead.py,sha256=y1ouj5FBrnGWxd4dIC7luG6iQwiMrm1CGgYbXCcKS8E,3139
 hestia_earth/models/faostat2018/coldDressedCarcassWeightPerHead.py,sha256=Aphq7r06Q5-RDer4i1CneOLifVQCKTiVPTIWE3AxLfE,3230
-hestia_earth/models/faostat2018/landTransformationFromCropland100YearAverage.py,sha256=yFQdfHnMifPtwnBUbedXq1FY7qlzv1EieU-UA83MFcE,2647
-hestia_earth/models/faostat2018/landTransformationFromCropland20YearAverage.py,sha256=MmMer9DJkDFO_VsWBwHywwUdqvBaKNkfuix--PeL1kU,2640
+hestia_earth/models/faostat2018/landTransformationFromCropland100YearAverage.py,sha256=M0NblGiHme8yL8CBvZvfgbW52DODq4FO_Y3iThlq3n0,2684
+hestia_earth/models/faostat2018/landTransformationFromCropland20YearAverage.py,sha256=HuFHJDAqNaaJWpaWxD1jGaQsTdsJEVufsPGKwI6iAb0,2677
 hestia_earth/models/faostat2018/liveweightPerHead.py,sha256=flI3_TyG-7xoWp6cU6pZAFiXyHyFkfRz7Lmb7cQAffI,5140
 hestia_earth/models/faostat2018/readyToCookWeightPerHead.py,sha256=b1_GZQ3oFl88w6TY5DqLSqXNaYX6TcRBK4R9M2cWSjM,3165
 hestia_earth/models/faostat2018/seed.py,sha256=ts9PKs9UnZnJ9nPFlL7etL1Qb9uIWIES8Mz8W7FWbOw,2917
@@ -158,7 +158,7 @@ hestia_earth/models/faostat2018/utils.py,sha256=Ud2vu_8ze5VFfeBFBzUKdJTWRfxVJO4V
 hestia_earth/models/faostat2018/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/models/faostat2018/product/price.py,sha256=X7Zxa-rXthzYdgw2lzybbHc-oKGE5nyXpBn-BfZC_7w,7753
 hestia_earth/models/frischknechtEtAl2000/__init__.py,sha256=Fixyy9UwoCGP5-MHyJu_ctS40SQ2imfvZo8a547029U,421
-hestia_earth/models/frischknechtEtAl2000/ionisingRadiationKbqU235Eq.py,sha256=8Y5-dIlswtrQYjDth3ahJ5z2CKwh3OnhV3rRSinMGrE,2885
+hestia_earth/models/frischknechtEtAl2000/ionisingRadiationKbqU235Eq.py,sha256=czZx8DgnDuLOdK0CfiriPbj1BwoiWn4d1nkQOiwkcPA,4472
 hestia_earth/models/geospatialDatabase/__init__.py,sha256=TH-FW3aoL7r1GquRChr7rde7uQonKQRDR00udG8tDrQ,957
 hestia_earth/models/geospatialDatabase/aware.py,sha256=cbxFnShXW8QUCIjU4uuO1DdK9KhYiLf41ZVjS9hSppI,1358
 hestia_earth/models/geospatialDatabase/clayContent.py,sha256=u8SQKx-zu3vhMQ-XOJgqyUn-tlCCIy-VG7zpl5AyjtY,3386
@@ -282,11 +282,14 @@ hestia_earth/models/ipcc2019/pastureGrass.py,sha256=Hhm9szzsL3otuo-V6fQ_cNyDbG0d
 hestia_earth/models/ipcc2019/pastureGrass_utils.py,sha256=Bzz4yPDdA7YVUhhJhQCCVu0uKONeO3b6a48_ZITZgzU,13889
 hestia_earth/models/ipcc2019/utils.py,sha256=MSDMu15D9DnilFUgi4_6jYXC0FaKso3OODauGTMB6hs,6229
 hestia_earth/models/ipcc2019/animal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hestia_earth/models/ipcc2019/animal/liveweightGain.py,sha256=Gwd6J6k-W84EAsC_cNMLaNy3p4-2pqCSc3grBfPvanw,2618
-hestia_earth/models/ipcc2019/animal/liveweightPerHead.py,sha256=Lhnk58SvVtM2FayljOBPHFFx5OBFFqsiaVG8ZjwCaXA,2634
+hestia_earth/models/ipcc2019/animal/fatContent.py,sha256=iVDMPjuy_-oGhmWaylsoCMw0qdkI5jDdqn4uzbq4D4Q,999
+hestia_earth/models/ipcc2019/animal/liveweightGain.py,sha256=UElmAdB4yQEFAOT5RrURn0Yt7U3gB2qiCWvNXyLk8Hw,971
+hestia_earth/models/ipcc2019/animal/liveweightPerHead.py,sha256=cq88VTxPYVPyEr2NLPb0Zmmppn_eMp9Xtw6Nxnta4-M,984
 hestia_earth/models/ipcc2019/animal/pastureGrass.py,sha256=4vs-KIlCKQhU1EpX0BFlVAQrh1szm154AnrPDs13oE4,12212
-hestia_earth/models/ipcc2019/animal/utils.py,sha256=ziyphGLEO_eitOLtBG0BLpJfmN3csqUetFZuDo8FX2U,990
-hestia_earth/models/ipcc2019/animal/weightAtMaturity.py,sha256=IHrG6cqLVhOiIbrvK0w5xDu4bHmy5om-1qBKMmkFC2o,3376
+hestia_earth/models/ipcc2019/animal/pregnancyRateTotal.py,sha256=MWPnuT4WeKJCGjJ_DAJnYelsX2Ld0C5e8eN__0Ws0E0,982
+hestia_earth/models/ipcc2019/animal/trueProteinContent.py,sha256=0VYI2Yg_GF5qvuxazZ3KUa03vAYcbpNLnzCOjUaG5ZI,1019
+hestia_earth/models/ipcc2019/animal/utils.py,sha256=9EyLCOpBGkpa97VVcFbl1tRlDdJHHiy8lI7tLc_y5BE,4439
+hestia_earth/models/ipcc2019/animal/weightAtMaturity.py,sha256=4Pp14_40NYcPqqBUnkqYVkpJLcDzZ70tlM-stte7JsQ,3055
 hestia_earth/models/ipcc2021/__init__.py,sha256=VTgGFKhwMmk_nuI1RRq0in27fHYVPBonlXlPK00K8no,409
 hestia_earth/models/ipcc2021/gwp100.py,sha256=v-DYU-11XnWI1Ns1GEiKrJqL3JafxvhTsLmuBuFcxJU,1021
 hestia_earth/models/jarvisAndPain1994/__init__.py,sha256=ercUwy29sV7oPIESj8UjsGB5lqiBCss9OZcbjxeeG8E,418
@@ -399,7 +402,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=IgD-CYkxGRF8pfPqCwY9jf_mRxK3kgRhXm5W_WSxPsI,55196
+hestia_earth/models/mocking/search-results.json,sha256=wPdmhIkbqUSSKJ5xoOgnePFVQ49FlumwDJs5-kKSME0,55323
 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
@@ -427,8 +430,8 @@ hestia_earth/models/pooreNemecek2018/rotationDuration.py,sha256=j5hW_NEKYQbeMcds
 hestia_earth/models/pooreNemecek2018/saplings.py,sha256=6iJKXIZvw-PIEi4FZfNPdt7dW4tI5sMNPR7LllSTRkM,2495
 hestia_earth/models/pooreNemecek2018/utils.py,sha256=to2vtONKCbuG1gVSDvsUcG7EnlahELfG_57gzIAHlv0,1710
 hestia_earth/models/poschEtAl2008/__init__.py,sha256=nvyyGglxCTV4PpxcOjY7jJb0v8Bjzj435Zt1j6VcryM,414
-hestia_earth/models/poschEtAl2008/terrestrialAcidificationPotentialAccumulatedExceedance.py,sha256=gbD8fgvdHANXsuPPWRx4Flcqhk3fPD5ROrrb2LMgmS8,1279
-hestia_earth/models/poschEtAl2008/terrestrialEutrophicationPotentialAccumulatedExceedance.py,sha256=X1CixghiqYiE1N-sWhXuFcy9nxCA2RdBiClFAgUWTgw,1281
+hestia_earth/models/poschEtAl2008/terrestrialAcidificationPotentialAccumulatedExceedance.py,sha256=1Vha55V1MAXTw4mfLnar8ltSRZfLOQ5b8qE9bSx6YkQ,1402
+hestia_earth/models/poschEtAl2008/terrestrialEutrophicationPotentialAccumulatedExceedance.py,sha256=sI69CvgnlTAiEXgbrcz5IUIit53Tg7vpqVYXXGWBjgw,1404
 hestia_earth/models/recipe2016Egalitarian/__init__.py,sha256=OvZoSgfaMe6DWIdqr-Sx3ouzXlp994oro7Mi0Xid18Q,422
 hestia_earth/models/recipe2016Egalitarian/damageToFreshwaterEcosystemsSpeciesYear.py,sha256=b1UZAsy3yGlHYxH2YhBhhSnjm5zzQl8Z32DcQBjgWNE,1123
 hestia_earth/models/recipe2016Egalitarian/damageToHumanHealth.py,sha256=dJ8WinGe52wFQCMKtT_B7c1MFM_GbBo8aqfw0n2pw94,1087
@@ -559,7 +562,7 @@ hestia_earth/models/transformation/product/__init__.py,sha256=47DEQpj8HBSa-_TImW
 hestia_earth/models/transformation/product/excreta.py,sha256=Yj9wMF5if-zivb6qbN3vy1X51ZNYxvoyG9f4KPp3Y18,5700
 hestia_earth/models/usetoxV2/__init__.py,sha256=pK37V3H-KvYcvRKw4Mv8CWrB2N0LFLzmv0jKLdhGGqs,409
 hestia_earth/models/usetoxV2/freshwaterEcotoxicityPotentialCtue.py,sha256=oYNwThnMXjZymif5buyHiczFiOq_61jOdDMOAyy8vwQ,1018
-hestia_earth/models/utils/__init__.py,sha256=bfmKUi3wdGj4CZkxd2pPxtmeTV2XN_vq_61_Euv593w,6291
+hestia_earth/models/utils/__init__.py,sha256=lYPDZu-5Uh6hLmQcAx2Yq-Fga1-mcD1uZLI0SNzkTmU,6342
 hestia_earth/models/utils/aggregated.py,sha256=sz6usleZmo_tC_hIvmGgYsX8-H0dulXmmhHK4EkA5Kg,4946
 hestia_earth/models/utils/animalProduct.py,sha256=M5IunAKGY6oZv3j1Ascl34ywyeLWApqOIlBzbtlA2FE,721
 hestia_earth/models/utils/aquacultureManagement.py,sha256=dxrbC1Xf140cohxTbSw6TxLAnAASWTdNZwBBam4yQnw,171
@@ -579,7 +582,7 @@ hestia_earth/models/utils/excretaManagement.py,sha256=NuWPQjFZxMVt9sYgBjcqhGWCFk
 hestia_earth/models/utils/feedipedia.py,sha256=wzzrMbYlda1XCpWiObLz4bFLXbAZejHcxsXJFr4U_AM,3953
 hestia_earth/models/utils/fertiliser.py,sha256=DBO4OBNgnQJ0fCQMDkIk_ZGZX-uKGaTFZCEXfAnJciY,690
 hestia_earth/models/utils/fuel.py,sha256=r1MKMMxg-PYiVlRutP83RuvY2rsdCQ1iN6ekSGGQGpA,1379
-hestia_earth/models/utils/impact_assessment.py,sha256=ma2oINLTIL1qplqC5D1_DbQu4EILpMXSgYNEslxIa2Y,7059
+hestia_earth/models/utils/impact_assessment.py,sha256=iQ-M3-oaQi0_gBlzyhQ6BBxfxQjQgDFa1WNO6kR_NvM,7650
 hestia_earth/models/utils/indicator.py,sha256=IFrVIUYpmdVLOR1SKkrTReDbG1Tzq2b6daVvLMYpCs4,537
 hestia_earth/models/utils/inorganicFertiliser.py,sha256=_dLBY-otGkLr8PobR5dQ89bF2uwc2PB4JPrHFSksMEQ,1900
 hestia_earth/models/utils/input.py,sha256=gsVFKTC9WF8dO6YAg_-H_GAOQTnvAr49Ox5-eTH8zf8,5145
@@ -728,9 +731,9 @@ tests/models/emepEea2019/test_tspToAirAnimalHousing.py,sha256=4MNDsxIeUk5_3IvZwE
 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=ZPDKM23qlLMe_ZzeA-QIutSkFlod3BsmjloA9WA8nug,845
-tests/models/environmentalFootprintV3/test_soilQualityIndexLandOccupation.py,sha256=5cv3R1Zam0aW00smkWNKExgdWomhT9Ad8bCTH8KZCdw,4324
-tests/models/environmentalFootprintV3/test_soilQualityIndexLandTransformation.py,sha256=XgxgTmuc1jZ0l1nmOd3KpIUfW7uY_erCj0GUN7DYmCQ,3564
-tests/models/environmentalFootprintV3/test_soilQualityIndexTotalLandUseEffects.py,sha256=6cIdQ-EpMc3gdvt2PLKxX8nUhN05nUTlNpOm6njQYHY,1949
+tests/models/environmentalFootprintV3/test_soilQualityIndexLandOccupation.py,sha256=pgauGmFl52lQJVPaDHryrUU3LSmjWC-Al_XBqQj33u4,6116
+tests/models/environmentalFootprintV3/test_soilQualityIndexLandTransformation.py,sha256=9be8usvkBqLhDFEaUP5PXEzbZcfFlZcquMoDbtUhpm4,6970
+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
 tests/models/fantkeEtAl2016/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -746,7 +749,7 @@ tests/models/faostat2018/test_seed.py,sha256=tUXoNVveX0m0ed9UXB4zXxIZsPxktXyUXlb
 tests/models/faostat2018/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/faostat2018/product/test_price.py,sha256=vUTT-FZVbXnDrwQVOgq8PWTDuFK_gAT6aqJ9ZK6Qcsc,3493
 tests/models/frischknechtEtAl2000/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/frischknechtEtAl2000/test_ionisingRadiationKbqU235Eq.py,sha256=Fa44zHKi0XZPq_68g7BtOuFlpciefH9yIEgsVDWhlBg,2096
+tests/models/frischknechtEtAl2000/test_ionisingRadiationKbqU235Eq.py,sha256=rT75VNmpUKG6aIQLNgmMzKDyJegTm2_qGLaRHUYlzF8,4416
 tests/models/geospatialDatabase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/geospatialDatabase/test_aware.py,sha256=tbBBvXrOqdO0cMPJTa02UfhlwfosH8iNoJLzZNFs1NU,857
 tests/models/geospatialDatabase/test_clayContent.py,sha256=GqFAPIOkXfDpJFkI-vK6l3hK0Ap36lLCWGhXCly-DME,1797
@@ -868,10 +871,13 @@ tests/models/ipcc2019/test_organicCarbonPerHa_tier_2_utils.py,sha256=6YXLqH5wz_c
 tests/models/ipcc2019/test_organicCarbonPerHa_utils.py,sha256=Zd2QlN_Q3k9djuByOH62A00tryVzlvNtsd46N79TTeU,1778
 tests/models/ipcc2019/test_pastureGrass.py,sha256=mKx8NnTtMT9TrXxRNLv73wD1TWBaiRZzA1xh2ukb-HI,2667
 tests/models/ipcc2019/animal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/ipcc2019/animal/test_liveweightGain.py,sha256=XN1Ly_Jeg4zoRVQAVX2D0ORxmKjrcW163bI0wpLjUWs,663
-tests/models/ipcc2019/animal/test_liveweightPerHead.py,sha256=oMzpf7crgkTXO3sF88i4XhJXVOqkCFgKbZruE9kCQTY,666
+tests/models/ipcc2019/animal/test_fatContent.py,sha256=Emp8jGudRGA_dJaLMR5Jxsv3Gc57rMAnP0CDqswrmlM,775
+tests/models/ipcc2019/animal/test_liveweightGain.py,sha256=KmRZyrjrXZcgff1QFtfu1WphNuJW_nHx1GguD8xB2ls,779
+tests/models/ipcc2019/animal/test_liveweightPerHead.py,sha256=nfNAcUEIPQeKyjKYttI5W6hiHBMXLZ9Vbz0nfj81ZvA,782
 tests/models/ipcc2019/animal/test_pastureGrass.py,sha256=vuwd7WPUKIWaYREv_UmEa8m9llZSr0OclDsmnSDtHOQ,1987
-tests/models/ipcc2019/animal/test_weightAtMaturity.py,sha256=Tss9bTVz66yXVEBZT31KMm6gd45B9E1DJLqwYArPuYY,665
+tests/models/ipcc2019/animal/test_pregnancyRateTotal.py,sha256=3M4cpH0rM0fLR86bwtBQbkUhuflj0ebaQpPgHtAFZxo,783
+tests/models/ipcc2019/animal/test_trueProteinContent.py,sha256=3O2w_PsVEki_piIHO-Wa6m28f5SAHWHsSk27nYDQDuM,783
+tests/models/ipcc2019/animal/test_weightAtMaturity.py,sha256=-lP4Sx1s11Wyo4Vm1it3SdIpNP43TZWmwOWttrAd_N8,705
 tests/models/ipcc2021/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/ipcc2021/test_gwp100.py,sha256=JRklKMSg-OXopb9ZufGgl94deuMuJSsfNXRZDBtOZrE,1119
 tests/models/jarvisAndPain1994/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1007,8 +1013,8 @@ tests/models/pooreNemecek2018/test_plantationProductiveLifespan.py,sha256=ifvjTX
 tests/models/pooreNemecek2018/test_rotationDuration.py,sha256=tD2E91beAXdyT-xf5QSqc7kp5UPDDEaCE-FgsoSGorg,923
 tests/models/pooreNemecek2018/test_saplings.py,sha256=S70y9JUplSH9MIrrBUkrGsVsN9ZEBplTugyR-b-n6ZY,1643
 tests/models/poschEtAl2008/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/poschEtAl2008/test_terrestrialAcidificationPotentialAccumulatedExceedance.py,sha256=NJ_W-ypWwjBuGiaXUeJvaQ9ZufoqlSWk1NYE9tt94ZA,1612
-tests/models/poschEtAl2008/test_terrestrialEutrophicationPotentialAccumulatedExceedance.py,sha256=m-AUbdVDBEFEcmNOv13cYvNZQgDMYhHX33kfWywXQWM,1485
+tests/models/poschEtAl2008/test_terrestrialAcidificationPotentialAccumulatedExceedance.py,sha256=AlDvYqNq8TFPDNtgdSr1dNP-_Rqzbvoxq8ribh8AeEc,1876
+tests/models/poschEtAl2008/test_terrestrialEutrophicationPotentialAccumulatedExceedance.py,sha256=0-hn3Ssu5cfJor_Mq5DYzLlgXiw9ulARlBa_ovJGMbg,1875
 tests/models/recipe2016Egalitarian/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/recipe2016Egalitarian/test_damageToFreshwaterEcosystemsSpeciesYear.py,sha256=OC8WjzPuyz5fd_E-LxFbOg3sasVc6LMJ9UK-jAKO7LU,697
 tests/models/recipe2016Egalitarian/test_damageToHumanHealth.py,sha256=fWjzC9r6itihyW6AdmDkotbhML_0KavXernOpnK1SmY,677
@@ -1162,8 +1168,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.8.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
-hestia_earth_models-0.64.8.dist-info/METADATA,sha256=4UYoZURD_6LGH95ysuWrhXju7wQe7L1gXJSFQjRB7Ns,3343
-hestia_earth_models-0.64.8.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-hestia_earth_models-0.64.8.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.64.8.dist-info/RECORD,,
+hestia_earth_models-0.64.9.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
+hestia_earth_models-0.64.9.dist-info/METADATA,sha256=oM-ufMyDov0e8MyRBXejcGC4lcvzzkR0Hhi0ykZ3TgI,3343
+hestia_earth_models-0.64.9.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+hestia_earth_models-0.64.9.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.64.9.dist-info/RECORD,,

tests/models/environmentalFootprintV3/test_soilQualityIndexLandOccupation.py

@@ -1,71 +1,107 @@
 import json
 from unittest.mock import patch
 
-from hestia_earth.models.environmentalFootprintV3.soilQualityIndexLandOccupation import MODEL, TERM_ID, run, _should_run
+import pytest
+
+from hestia_earth.models.environmentalFootprintV3.soilQualityIndexLandOccupation import MODEL, TERM_ID, run, \
+    _should_run
 from tests.utils import fixtures_path, fake_new_indicator
 
 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)
-
-    # a LandCover type with no CF => no run
-    cycle['site']['management'] = [{"endDate": "2024-03-31", "@type": "Management",
-                                    "term": {"termType": "landCover", "@type": "Term", "@id": "ocean"}}]
-
-    should_run, *args = _should_run({'cycle': cycle})
-    assert not should_run
-
-    # no management => no run
-    cycle['site']['management'] = []
-    should_run, *args = _should_run({'cycle': cycle})
-    assert not should_run
+crop_land = {"@id": "cropland", "termType": "landCover"}
+sea_land_cover = {"@id": "seaOrOcean", "termType": "landCover"}
+forest = {"@id": "forest", "termType": "landCover"}
+
+wrong_indicator = {"term": {"@id": "NOT_landOccupationInputsProduction", "termType": "resourceUse", "units": "m2*year"},
+                   "value": 0.5, "landCover": crop_land}
+
+indicator_no_land_cover = {
+    "term": {"@id": "landOccupationInputsProduction", "termType": "resourceUse", "units": "m2*year"},
+    "value": 0.5}
+
+indicator_no_unit = {"term": {"@id": "landOccupationInputsProduction", "termType": "resourceUse"},
+                     "value": 0.5, "landCover": crop_land}
+
+indicator_wrong_unit = {
+    "term": {"@id": "landOccupationInputsProduction", "termType": "resourceUse", "units": "ha*day"}, "value": 0.5,
+    "landCover": crop_land}
+
+indicator_bad_area_time_value = {
+    "term": {"@id": "landOccupationInputsProduction", "termType": "resourceUse", "units": "m2*year"}, "value": 0,
+    "landCover": crop_land}
+
+inputs_production_indicator_no_cf = {
+    "term": {"@id": "landOccupationInputsProduction", "termType": "resourceUse", "units": "m2*year"}, "value": 0.5,
+    "landCover": sea_land_cover}
+
+good_inputs_production_indicator_cropland = {
+    "term": {"@id": "landOccupationInputsProduction", "termType": "resourceUse", "units": "m2*year"}, "value": 0.5,
+    "landCover": crop_land}
+
+good_inputs_production_indicator_forest = {
+    "term": {"@id": "landOccupationInputsProduction", "termType": "resourceUse", "units": "m2*year"}, "value": 0.5,
+    "landCover": forest}
+
+good_during_cycle_indicator_cropland = {
+    "term": {"@id": "landOccupationDuringCycle", "termType": "resourceUse", "units": "m2*year"}, "value": 0.5,
+    "landCover": crop_land}
+
+good_during_cycle_indicator_forest = {
+    "term": {"@id": "landOccupationDuringCycle", "termType": "resourceUse", "units": "m2*year"}, "value": 0.5,
+    "landCover": forest}
+
+
+@pytest.mark.parametrize(
+    "resources, expected, num_inputs",
+    [
+        ([], False, 0),
+        ([wrong_indicator], False, 0),
+        ([indicator_no_land_cover], False, 0),
+        ([indicator_no_unit], False, 0),
+        ([indicator_wrong_unit], False, 0),
+        ([indicator_bad_area_time_value], False, 0),
+        ([inputs_production_indicator_no_cf], True, 0),
+        ([good_during_cycle_indicator_cropland], True, 1),
+        ([good_during_cycle_indicator_cropland, good_inputs_production_indicator_forest], True, 2),
+        ([good_during_cycle_indicator_cropland, inputs_production_indicator_no_cf], True, 1),
+        ([good_during_cycle_indicator_cropland, good_during_cycle_indicator_forest,
+          good_inputs_production_indicator_forest, good_inputs_production_indicator_cropland], True, 4),
+
+    ],
+    ids=["No emissionsResourceUse => no run",
+         "Wrong indicator termid => no run",
+         "Indicator no landcover terms => no run",
+         "Missing unit => no run",
+         "Wrong unit => no run",
+         "Bad area*time value => no run",
+         "Input with no cf => run, empty input",
+         "One good input => run, 1 dict",
+         "Two good input => run, 2 dict",
+         "One good input and One with no CF => run, 2 dict",
+         "Multiple good indicators with same id => run, 4 dict",
+         ]
+)
+def test_should_run(resources, expected, num_inputs):
+    with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:
+        impactassessment = json.load(f)
+
+    impactassessment['emissionsResourceUse'] = resources
+
+    should_run, resources_with_cf = _should_run(impactassessment)
+    assert should_run is expected
+    assert len(resources_with_cf) == num_inputs
 
 
 @patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
 def test_run(*args):
-    with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
-        cycle = json.load(f)
+    with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:
+        impact = json.load(f)
 
     with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
-    impact['cycle'] = cycle
-    value = run(impact)
-    assert value == expected
-
-
-@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
-def test_run_other_sites(*args):
-    """
-    This test case contains 2 sites:
-    One is a crop in france, with value:
-    CF_METHOD_factor_france_permanent_crops * ( siteArea_france_crop * time_in_years )
-    = 87.631 * ( 1.0082662E-7 * 1 )
-    = 8.835537537220001e-06
-
-    And one a forest in italy, with value:
-    CF_METHOD_factor_italy_forest * ( siteArea_italy_forest * time_in_years )
-    = 43.198 * ( 1.3573373E-9 * 1 )
-    = 5.86342566854E-08
-
-    We expect the model to return 8.835537537220001e-06 + 5.86342566854E-08 = 8.894171793905402e-06
-
-    """
-    with open(f"{fixtures_folder}/otherSites/cycle.jsonld", encoding='utf-8') as f:
-        cycle = json.load(f)
-
-    with open(f"{fixtures_folder}/otherSites/result.jsonld", encoding='utf-8') as f:
-        expected = json.load(f)
-
-    impact['cycle'] = cycle
     value = run(impact)
     assert value == expected
 
@@ -75,21 +111,18 @@ def test_run_with_subclass_landcover(*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
+    Quantity in m2*year: 1
+    CF METHOD factor: 50.438
 
     landCover field "plantationForest" should map to
     Name Flow: "forest, intensive Land occupation"
     """
-    with open(f"{fixtures_folder}/plantationForest/cycle.jsonld", encoding='utf-8') as f:
-        cycle = json.load(f)
 
+    with open(f"{fixtures_folder}/plantationForest/impact-assessment.jsonld", encoding='utf-8') as f:
+        impact = json.load(f)
     with open(f"{fixtures_folder}/plantationForest/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
-    impact['cycle'] = cycle
     value = run(impact)
     assert value == expected
 
@@ -99,13 +132,12 @@ def test_run_with_region_missing_data(*args):
     """
     When given valid sub-region or country not in the lookup file should default to 'region-world'
     """
-    with open(f"{fixtures_folder}/default-region-world/cycle.jsonld", encoding='utf-8') as f:
-        cycle = json.load(f)
+    with open(f"{fixtures_folder}/default-region-world/impact-assessment.jsonld", encoding='utf-8') as f:
+        impact = json.load(f)
 
     with open(f"{fixtures_folder}/default-region-world/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
-    impact['cycle'] = cycle
     value = run(impact)
     assert value == expected
 
@@ -115,14 +147,13 @@ def test_run_with_no_region(*args):
     """
     When no location is specified, defaults to region world.
     """
-    with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
-        cycle = json.load(f)
+    with open(f"{fixtures_folder}/default-region-world/impact-assessment.jsonld", encoding='utf-8') as f:
+        impact = json.load(f)
 
-    del cycle['site']['country']
+    del impact['country']
 
     with open(f"{fixtures_folder}/default-region-world/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
-    impact['cycle'] = cycle
     value = run(impact)
     assert value == expected