hestia-earth-models 0.64.11__py3-none-any.whl → 0.64.12__py3-none-any.whl

hestia_earth/models/utils/lookup.py

@@ -104,7 +104,8 @@ def _aware_factor_value(model: str, term_id: str, lookup_name: str, aware_id: st
 _ALLOW_ALL = 'all'
 
 
-def _is_site(site: dict): return site.get('@type', site.get('type')) == SchemaType.SITE.value
+def _is_site(site: dict):
+    return site.get('@type', site.get('type')) == SchemaType.SITE.value if site else None
 
 
 def _get_sites(node: dict):

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.64.11'
+VERSION = '0.64.12'

{hestia_earth_models-0.64.11.dist-info → hestia_earth_models-0.64.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.64.11
+Version: 0.64.12
 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.11.dist-info → hestia_earth_models-0.64.12.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=Ds7eJqKfbiiaKqpRr69Z_GKUpYtP1j7XZKZX4Y9z7lE,1348
 hestia_earth/models/requirements.py,sha256=eU4yT443fx7BnaokhrLB_PCizJI7Y6m4auyo8vQauNg,17363
-hestia_earth/models/version.py,sha256=mmvF4B2rPzCJ3IxZSO6jAz7xoK7q4-z-FZYTiigDRm4,20
+hestia_earth/models/version.py,sha256=gqX4DFm9GQhSbAelUK8yrfNUHfEeS-Id8fI9wY0Op4Q,20
 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
@@ -39,7 +39,7 @@ hestia_earth/models/cycle/__init__.py,sha256=VowO3kOHb0LpURsljNaJsYO7s6vgjhul6bF
 hestia_earth/models/cycle/aboveGroundCropResidueTotal.py,sha256=9swq4YEeJQ2YjVOmghgBYWkMZWdNU4MKCUBY5FsmBSU,3088
 hestia_earth/models/cycle/coldCarcassWeightPerHead.py,sha256=fQ7huuxyS5PQkRmR_tRCOz9rV3LJwLfLQJjH_TcTz6k,2955
 hestia_earth/models/cycle/coldDressedCarcassWeightPerHead.py,sha256=k0xg5SIfJGwEKteFr2Fh-lh8yDC_sqQw_lBnnfwl9zU,3069
-hestia_earth/models/cycle/concentrateFeed.py,sha256=ly7TyEnw46D7AmFCftO8GWFDu-4_lFnqeDcoqLZCCRA,6219
+hestia_earth/models/cycle/concentrateFeed.py,sha256=e9oaCoRNfEZEDbalxq7L2Z5rYXpyUdR84sGHi4efm2M,6701
 hestia_earth/models/cycle/cropResidueManagement.py,sha256=QTRCCFu9VvD_a3_8aAj216vsuhAJEhlAwTJH7ifMkDo,2237
 hestia_earth/models/cycle/croppingIntensity.py,sha256=44CgDqXg9CBRfTPYTyOleQT-M4_tsQgPba-0vjjk_C4,1770
 hestia_earth/models/cycle/cycleDuration.py,sha256=ccODF5CJBEd55-CMttCr0eI4uH7OoRvYJZjcth09QMg,3193
@@ -157,7 +157,7 @@ hestia_earth/models/faostat2018/landTransformationFromCropland20YearAverage.py,s
 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
-hestia_earth/models/faostat2018/utils.py,sha256=Ud2vu_8ze5VFfeBFBzUKdJTWRfxVJO4VUTdgwaLJU-w,3715
+hestia_earth/models/faostat2018/utils.py,sha256=gxs7tULyBDhkvB2NuI3RnYTYzm75vEw1B2dDf48D_R8,5741
 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
@@ -199,6 +199,8 @@ hestia_earth/models/globalCropWaterModel2008/rootingDepth.py,sha256=pajS-6UWxqIq
 hestia_earth/models/haversineFormula/__init__.py,sha256=o155nR-XI67iCSBVNYIu4sPRIF3C2Y1NnUZ6lfpi0Do,417
 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=PRQ4-7-EvDrhngvwtxHoNOfE4oY7zlfqsZMVI6Wzaes,28336
 hestia_earth/models/hyde32/__init__.py,sha256=hSOwDiK0M0NfmQbW_J7O_SZa8IsJMgITSHSVMsDS4KI,407
 hestia_earth/models/hyde32/landTransformationFromCropland100YearAverageDuringCycle.py,sha256=7ZqhExZORiYIzvkQhLhPdTPzyY2NnSKrat76poGn5tc,2392
 hestia_earth/models/hyde32/landTransformationFromCropland20YearAverageDuringCycle.py,sha256=RDMzmxz236nMSd5IYASXFMk8wL4HyeMi2zNdhhjkTs0,2388
@@ -253,11 +255,11 @@ hestia_earth/models/ipcc2019/ch4ToAirAquacultureSystems.py,sha256=q6yyEiYQhHJ2Vy
 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/co2ToAirAboveGroundBiomassStockChange.py,sha256=8dy_earC86duElYWv2Tmlzc20NodNADjXjV6Wto_nys,6466
-hestia_earth/models/ipcc2019/co2ToAirBelowGroundBiomassStockChange.py,sha256=1IImP8z9tYHp8WUawceKW4gAN0ajm36wtD6h0wxTOzI,6517
-hestia_earth/models/ipcc2019/co2ToAirCarbonStockChange_utils.py,sha256=8f8hm4JYsV6mmRI-lSwkca874N_h7JxxdY7nQNS_Z1A,53872
+hestia_earth/models/ipcc2019/co2ToAirAboveGroundBiomassStockChange.py,sha256=fefPcxy7TTG-33dgZecDppMroUAmKoluhomyLuRqQiU,6545
+hestia_earth/models/ipcc2019/co2ToAirBelowGroundBiomassStockChange.py,sha256=l5Mrb8non9JjQhpWMzqHHK7FAjYPuWUzIwa08zdBUpo,6595
+hestia_earth/models/ipcc2019/co2ToAirCarbonStockChange_utils.py,sha256=7A4wqVDmzVWaBjxG02TP8MMnqP_IQ0p8XX82nTE8XQE,55461
 hestia_earth/models/ipcc2019/co2ToAirLimeHydrolysis.py,sha256=7z0zdqiiWQwkyJCgSNMoK2mft3cJkTRlqwKrMuSKdWI,2454
-hestia_earth/models/ipcc2019/co2ToAirSoilOrganicCarbonStockChange.py,sha256=Ptmritqlmgl_16PpcxzOMU_CXr3uOnc-myuBPFrBpIo,6535
+hestia_earth/models/ipcc2019/co2ToAirSoilOrganicCarbonStockChange.py,sha256=1yC99dH3ZQC3PX_ppLhDxzECTTvGwiRSGxkFudEzKBw,6613
 hestia_earth/models/ipcc2019/co2ToAirUreaHydrolysis.py,sha256=Ofld5SuRKndcKB3FFFoUdzSgNq-gc4kmiNyyrPKQ3Io,3580
 hestia_earth/models/ipcc2019/croppingDuration.py,sha256=-CesZ2cNDOQoU3QyVFnSWYO-6-JXxuhRDQoHoxTawDA,3228
 hestia_earth/models/ipcc2019/ligninContent.py,sha256=Qh-UH4lv1TIf7wWlbAPwIZZHxzbbmQgND3m15pt5Si8,7285
@@ -286,13 +288,14 @@ hestia_earth/models/ipcc2019/pastureGrass.py,sha256=Hhm9szzsL3otuo-V6fQ_cNyDbG0d
 hestia_earth/models/ipcc2019/pastureGrass_utils.py,sha256=nL31uS3c77PH_5nA2E2MvB1NS2mMvhD341taGl5YWNE,13842
 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/fatContent.py,sha256=iVDMPjuy_-oGhmWaylsoCMw0qdkI5jDdqn4uzbq4D4Q,999
+hestia_earth/models/ipcc2019/animal/fatContent.py,sha256=T-wWzxzPdy4pexS8ivQSeH9Z6U6qRGYfCiEwQDujcww,1003
 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/milkYieldPerAnimal.py,sha256=WknnXH2BmY4PFmYdF0ZAb_vl74da4DkObR7Q5dnkhRo,2752
 hestia_earth/models/ipcc2019/animal/pastureGrass.py,sha256=4vs-KIlCKQhU1EpX0BFlVAQrh1szm154AnrPDs13oE4,12212
 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/trueProteinContent.py,sha256=9hOg5KAFQ6Q-2_5h8pduYiYg9QBr22UnHdJYmkh8qi0,1023
+hestia_earth/models/ipcc2019/animal/utils.py,sha256=HPOjdJGUxn4Ls4jnr0kD5_w-JrzG1C7_cwdMpCCA1kk,4514
 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=EQ-OBQrahSgMBFtGregiNlbm3DHVwr67o4e29Z5Gns8,1039
@@ -407,7 +410,7 @@ hestia_earth/models/linkedImpactAssessment/utils.py,sha256=dGwGc2d-8_WQElTpfyPmz
 hestia_earth/models/mocking/__init__.py,sha256=n3Fkkrvh8zHNWiJZmnfQ7WZ91JRzAO9P6pSG1JpwtXo,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=NPkaq_ZNRSrVbLRkXkPWP5skxL8Ycwx1lJE92O02Z84,101693
+hestia_earth/models/mocking/search-results.json,sha256=Acsrm2K9NBM4ESH-qFAy_5BY6jRWC_OKiMuZFktOCnc,101690
 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
@@ -593,7 +596,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=xZPIaRYWBI4qXw8cGOFqYCXOR5h_sHaU-CdBoiHvkpg,8495
+hestia_earth/models/utils/lookup.py,sha256=uEP5v4atNkY5FLMopsuBncALOmsyhFe4lNtZvUhcQRM,8517
 hestia_earth/models/utils/measurement.py,sha256=izEiPszUcPA22zaIc0OuF7Yk82JWu5cxi0Sbz_9YgBo,11142
 hestia_earth/models/utils/organicFertiliser.py,sha256=2HY-a0EBzUw4DkEAXClLMXVCEZTKYf0BwFHBo7lQ5Tg,363
 hestia_earth/models/utils/pesticideAI.py,sha256=eK3HTfu5-I-HAQ0UV3ikpbZgtdA3s99RX2h9u77diFA,2361
@@ -749,6 +752,7 @@ tests/models/fantkeEtAl2016/test_damageToHumanHealthParticulateMatterFormation.p
 tests/models/faostat2018/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/faostat2018/test_coldCarcassWeightPerHead.py,sha256=RImhLygwrJ2RoEHjDwhuymvLEitOtNleP_lLoBhiNOs,1736
 tests/models/faostat2018/test_coldDressedCarcassWeightPerHead.py,sha256=hZVKMtf-F5Iz7igZVahDJoqzfm2VtcIlwWBPCry7kqw,1594
+tests/models/faostat2018/test_faostat_utils.py,sha256=DFVQHPhOmD0dsv9bNjv-zAHXpYJeJYpJsffy7MmXkh4,2301
 tests/models/faostat2018/test_landTransformationFromCropland100YearAverage.py,sha256=AkDXj4qNKgbu5xRbw9u_cUibnVSnAK1CN8pc4IjK9fk,1263
 tests/models/faostat2018/test_landTransformationFromCropland20YearAverage.py,sha256=L03Xh1QbbXc9yGdMoHGNmyCpu9WKANNiEE73NoBSqxk,1260
 tests/models/faostat2018/test_liveweightPerHead.py,sha256=5Z0Fw7iT3-REg8QjK8tUpWs5bUIG4fjWDM7SEOSYBcw,4799
@@ -795,6 +799,8 @@ tests/models/globalCropWaterModel2008/test_rootingDepth.py,sha256=CkRDlsDqWtTNwA
 tests/models/haversineFormula/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=nFaDQI6JzfgvSZhTmI-4f1bfm1Mi1G7E17C5CgLvSgI,5931
 tests/models/hyde32/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/hyde32/test_landTransformationFromCropland100YearAverageDuringCycle.py,sha256=tOwcToAZLgIvVEx0i3S67EDaTBi_gXKy-XZCnw1Akl8,797
 tests/models/hyde32/test_landTransformationFromCropland20YearAverageDuringCycle.py,sha256=Fw1goOLe6xPUA7J65MojAyvuEBWnsypHzfjopER9wWo,796
@@ -853,7 +859,7 @@ tests/models/ipcc2019/test_co2ToAirAboveGroundBiomassStockChange.py,sha256=R4dRh
 tests/models/ipcc2019/test_co2ToAirBelowGroundBiomassStockChange.py,sha256=rnwuLr77uZmQX4AxFU9lN1IGUwEcVceZ1YQ9Xg-tOyA,2982
 tests/models/ipcc2019/test_co2ToAirCarbonStockChange_utils.py,sha256=wCEtrbMl6zef8V-n_Ci_rtlQAlfuKm3khUVltr8eAcc,2173
 tests/models/ipcc2019/test_co2ToAirLimeHydrolysis.py,sha256=e5iuZ-kQNEVih0ZRgRPWqaUtXcLpfkoU7sQypbqA9_Y,1345
-tests/models/ipcc2019/test_co2ToAirSoilOrganicCarbonStockChange.py,sha256=30NGC8OKlH_1l0Zy7aMNkaywTx-g0zGsga0nDFOmUmw,2993
+tests/models/ipcc2019/test_co2ToAirSoilOrganicCarbonStockChange.py,sha256=BxIV_T_o-m2w4rdrcCZDjzP2eV8xNOAPN__4FxdzZYY,4432
 tests/models/ipcc2019/test_co2ToAirUreaHydrolysis.py,sha256=MmtEME0xjsa3KojFk_fxOLK6RZM_6p5HIpY2DOFHVu4,1530
 tests/models/ipcc2019/test_croppingDuration.py,sha256=gLRXeR6Tqa7ciD9KTRfsIflSeIIWT2iOpZMdcxAQla4,1871
 tests/models/ipcc2019/test_ligninContent.py,sha256=eIKEN__ab-0R52EhlhPSBiHnmTl6xOf1XbI33O-W9A4,4146
@@ -883,6 +889,7 @@ tests/models/ipcc2019/animal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 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_milkYieldPerAnimal.py,sha256=98rslTxLk92smiUfxRfxB6kjmQAm6085GV9NqWCGpVo,713
 tests/models/ipcc2019/animal/test_pastureGrass.py,sha256=vuwd7WPUKIWaYREv_UmEa8m9llZSr0OclDsmnSDtHOQ,1987
 tests/models/ipcc2019/animal/test_pregnancyRateTotal.py,sha256=3M4cpH0rM0fLR86bwtBQbkUhuflj0ebaQpPgHtAFZxo,783
 tests/models/ipcc2019/animal/test_trueProteinContent.py,sha256=3O2w_PsVEki_piIHO-Wa6m28f5SAHWHsSk27nYDQDuM,783
@@ -1177,8 +1184,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.11.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
-hestia_earth_models-0.64.11.dist-info/METADATA,sha256=dHqLbhRCLo0yEMPj7QmdMzk5k4G1mjGNeJc4kCf32l0,3345
-hestia_earth_models-0.64.11.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
-hestia_earth_models-0.64.11.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.64.11.dist-info/RECORD,,
+hestia_earth_models-0.64.12.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
+hestia_earth_models-0.64.12.dist-info/METADATA,sha256=_BsGHskrQW34lz3Y_Q3NQVbMREseBV4Ea5Oof4UzefA,3345
+hestia_earth_models-0.64.12.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
+hestia_earth_models-0.64.12.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.64.12.dist-info/RECORD,,

tests/models/faostat2018/test_faostat_utils.py

@@ -0,0 +1,84 @@
+from unittest.mock import patch
+
+import numpy
+
+from hestia_earth.models.faostat2018.utils import (get_sum_of_columns, MODEL, get_land_ratio,
+                                                   get_change_in_harvested_area_for_crop)
+from tests.utils import fixtures_path
+
+CLASS_PATH = f"hestia_earth.models.{MODEL}.utils"
+fixtures_folder = f"{fixtures_path}/{MODEL}/utils"
+
+
+def _afg_download_fixture():
+    with open(f"{fixtures_folder}/gadm-afg.csv") as f:
+        afg_lookup = numpy.recfromcsv(
+            fname=f,
+            missing_values="",
+            filling_values="",
+            delimiter=",",
+            encoding="utf-8"
+        )
+    return afg_lookup
+
+
+def test_get_sum_of_columns():
+    result = get_sum_of_columns(
+        lookup=_afg_download_fixture(),
+        country="GADM-AFG",
+        year=1975,
+        columns_list=["Arable land", "Permanent crops"]
+    )
+    assert result == 8050.3
+
+
+def test_check_sums_for_columns():
+    """
+    Check that the values of Arable and Permanent add up to Cropland, at least for AFG
+    """
+    for year in range(1961, 2021):
+        sum_arab_perm = get_sum_of_columns(
+            lookup=_afg_download_fixture(),
+            country="GADM-AFG",
+            year=year,
+            columns_list=["Arable land", "Permanent crops"]
+        )
+
+        cropland_value = get_sum_of_columns(
+            lookup=_afg_download_fixture(),
+            country="GADM-AFG",
+            year=year,
+            columns_list=["Cropland"]
+        )
+        assert sum_arab_perm == cropland_value
+
+
+@patch(f"{CLASS_PATH}.download_lookup")
+def test_get_land_ratio(mock_lookup):
+    mock_lookup.return_value = _afg_download_fixture()
+    result = get_land_ratio(
+        country="GADM-AFG",
+        start_year=1990,
+        end_year=2010,
+        first_column="Forest land",
+        second_column="Cropland"
+    )
+
+    assert result == (-123.0, 0.0, -123.0)
+
+
+def test_get_harvested_area_for_crop():
+    result = get_change_in_harvested_area_for_crop(
+        country_id="GADM-AFG",
+        start_year=1990,
+        end_year=1992,
+        crop_name="Wheat"
+    )
+    assert result == 30000.0
+
+    result = get_change_in_harvested_area_for_crop(
+        country_id="GADM-AFG",
+        start_year=2019,
+        crop_name="Wheat"
+    )
+    assert result == 2334000

tests/models/hestia/test_landCover.py

@@ -0,0 +1,209 @@
+import csv
+import json
+import numpy as np
+import pytest
+from unittest.mock import patch
+
+from tests.utils import fixtures_path
+from hestia_earth.models.faostat2018.utils import MODEL as FAOSTAT_MODEL
+from hestia_earth.models.hestia.landCover import (
+    MODEL, MODEL_KEY, get_changes, _estimate_maximum_forest_change,
+    run, site_area_sum_to_100, _get_sums_of_crop_expansion
+)
+
+CLASS_PATH = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"
+
+FAOSTAT_CLASS_PATH = f"hestia_earth.models.{FAOSTAT_MODEL}.utils"
+faostat_fixtures_folder = f"{fixtures_path}/{FAOSTAT_MODEL}/utils"
+
+BRAZIL_SITE = {
+    "@type": "Site",
+    "id": "Brazil-example",
+    "country": {
+        "name": "Brazil",
+        "type": "Term"
+    },
+    "siteType": "cropland",
+    "management": [
+        {
+            "term": {
+                "@id": "maizePlant",
+                "name": "Maize plant",
+                "type": "Term",
+                "termType": "landCover"
+            },
+            "value": 100,
+            "startDate": "2010-01-01",
+            "endDate": "2010-12-31",
+            "type": "Management"
+        }
+    ]
+}
+
+
+def recfromcsv_mod(filename, **kwargs):
+    def rewrite_csv_as_tab(csv_name):
+        with open(csv_name, newline='') as fp:
+            for row in csv.reader(fp, delimiter=","):
+                yield "\t".join(row)
+    return np.recfromcsv(
+        rewrite_csv_as_tab(filename), delimiter="\t", encoding=None, **kwargs)
+
+
+def _download_fixture(filepath: str):
+    return recfromcsv_mod(filename=filepath)
+
+
+@patch(f"{FAOSTAT_CLASS_PATH}.download_lookup")
+def test_get_changes(mock_lookup):
+    mock_lookup.return_value = _download_fixture(f"{faostat_fixtures_folder}/gadm-afg.csv")
+    result = get_changes(
+        country_id="GADM-AFG",
+        end_year=2010
+    )
+    assert (
+        result == {
+            "Arable land": -117.0,
+            "Cropland": -123.0,
+            "Forest land": 0,
+            "Other land": 123.0,
+            "Land area": 0,
+            "Permanent crops": -6.0,
+            "Permanent meadows and pastures": 0,
+            "Total agricultural change": -123.0
+        }
+    )
+
+
+@pytest.mark.parametrize(
+    "description,inputs,expected_output",
+    [
+        (
+            "Annual cropland gain from forest",
+            {
+                "forest_change": -1000,
+                "total_cropland_change": 1000,
+                "pasture_change": 0,
+                "total_agricultural_change": 1000
+            },
+            -1000
+        ),
+        (
+            "Pasture gain from forest",
+            {
+                "forest_change": -1000,
+                "total_cropland_change": 0,
+                "pasture_change": 1000,
+                "total_agricultural_change": 1000
+            },
+            -1000
+        ),
+        (
+            "Brazil",
+            {
+                "forest_change": -77317,
+                "total_cropland_change": 5201,
+                "pasture_change": -8267,
+                "total_agricultural_change": -3066
+            },
+            -5201
+        ),
+        (
+            "Argentina",
+            {
+                "forest_change": -4990,
+                "total_cropland_change": 11408,
+                "pasture_change": -12705,
+                "total_agricultural_change": -1297
+            },
+            -4990
+        ),
+        (
+            "Madagascar",
+            {
+                "forest_change": -1131,
+                "total_cropland_change": 275,
+                "pasture_change": 4295,
+                "total_agricultural_change": 4570
+            },
+            -1131
+        ),
+        (
+            "Afforestation",
+            {
+                "forest_change": 100,
+                "total_cropland_change": -1000,
+                "pasture_change": -50,
+                "total_agricultural_change": -1000
+            },
+            0
+        ),
+        (
+            "Pasture gain more than forest loss",
+            {
+                "forest_change": -49,
+                "total_cropland_change": -1000,
+                "pasture_change": 50,
+                "total_agricultural_change": -950
+            },
+            -49
+        )
+    ]
+)
+def test_estimate_maximum_forest_change(description, inputs, expected_output):
+    assert _estimate_maximum_forest_change(**inputs) == expected_output, description
+
+
+@pytest.mark.parametrize(
+    "description,inputs,expected_result",
+    [
+        ("All zeros, OK", {"a": 0, "b": 0, "c": 0.0, "d": 0.0}, True),
+        ("Exactly 1, OK", {"a": 0.1, "b": 0.5, "c": 0.4, "d": 0.0}, True),
+        ("Almost 1, OK", {"a": 0.1, "b": 0.5, "c": 0.4, "d": 0.01}, True),
+        ("Less than 1, Fail", {"a": 0.1, "b": 0, "c": 0.0, "d": 0.65}, False),
+        ("More than 1, Fail", {"a": 0.15, "b": 0.7, "c": 0.0, "d": 0.65}, False),
+    ]
+)
+def test_check_sum_of_percentages(description, inputs, expected_result):
+    assert site_area_sum_to_100(dict_of_percentages=inputs) == expected_result
+
+
+def test_get_sums_of_crop_expansion():
+    result = _get_sums_of_crop_expansion(
+        country_id="GADM-AFG",
+        year=2010,
+        include_negatives=True
+    )
+    assert result == (753973.3, 18354.0)
+
+    result = _get_sums_of_crop_expansion(
+        country_id="GADM-AFG",
+        year=2010,
+        include_negatives=False
+    )
+    assert result == (940270.0, 28139.0)
+
+
+@pytest.mark.parametrize(
+    "subfolder",
+    [
+        "albania_example",
+        "argentina_example",
+        "armenia_example",
+        "brazil_example",
+        "zimbabwe_example",
+        "brazil_empty_example",
+        "gbr_example"
+    ]
+)
+def test_run(subfolder):
+    folder = f"{fixtures_folder}/{subfolder}"
+    with open(f"{folder}/site.jsonld", encoding='utf-8') as f:
+        site = json.load(f)
+
+    with open(f"{folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    result = run(site)
+    assert result == expected

tests/models/ipcc2019/animal/test_milkYieldPerAnimal.py

@@ -0,0 +1,21 @@
+from unittest.mock import patch
+import json
+from tests.utils import fixtures_path, fake_new_practice
+
+from hestia_earth.models.ipcc2019 import MODEL
+from hestia_earth.models.ipcc2019.animal.milkYieldPerAnimal import MODEL_KEY, run
+
+class_path = f"hestia_earth.models.{MODEL}.animal.{MODEL_KEY}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/animal/{MODEL_KEY}"
+
+
+@patch(f"{class_path}._new_practice", side_effect=fake_new_practice)
+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}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(cycle)
+    assert value == expected

tests/models/ipcc2019/test_co2ToAirSoilOrganicCarbonStockChange.py

@@ -10,8 +10,34 @@ from tests.utils import fake_new_emission, fixtures_path, order_list
 
 class_path = f"hestia_earth.models.{MODEL}.co2ToAirSoilOrganicCarbonStockChange"
 utils_path = f"hestia_earth.models.{MODEL}.co2ToAirCarbonStockChange_utils"
+soc_utils_path = f"hestia_earth.models.{MODEL}.organicCarbonPerHa_utils"
+term_folder = "hestia_earth.models.utils.term"
 fixtures_folder = f"{fixtures_path}/{MODEL}/co2ToAirSoilOrganicCarbonStockChange"
 
+
+IRRIGATED_TERM_IDS = [
+    "rainfedDeepWater",
+    "rainfedDeepWaterWaterDepth100Cm",
+    "rainfedDeepWaterWaterDepth50100Cm",
+    "irrigatedTypeUnspecified",
+    "irrigatedCenterPivotIrrigation",
+    "irrigatedContinuouslyFlooded",
+    "irrigatedDripIrrigation",
+    "irrigatedFurrowIrrigation",
+    "irrigatedLateralMoveIrrigation",
+    "irrigatedLocalizedIrrigation",
+    "irrigatedManualIrrigation",
+    "irrigatedSurfaceIrrigationMultipleDrainagePeriods",
+    "irrigatedSurfaceIrrigationSingleDrainagePeriod",
+    "irrigatedSprinklerIrrigation",
+    "irrigatedSubIrrigation",
+    "irrigatedSurfaceIrrigationDrainageRegimeUnspecified"
+]
+
+UPLAND_RICE_LAND_COVER_TERM_IDS = [
+    "ricePlantUpland"
+]
+
 RUN_SCENARIOS = [
     ("no-overlapping-cycles", 3),
     ("overlapping-cycles", 4),
@@ -47,7 +73,20 @@ RUN_IDS = [f"{param[0]}, cycle{param[2]}" for param in RUN_PARAMS]
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 @patch(f"{utils_path}.related_cycles")
 @patch(f"{utils_path}._get_site")
-def test_run(_get_site_mock, related_cycles_mock, _new_emission_mock, subfolder, num_cycles, cycle_index):
+@patch(f"{soc_utils_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
+@patch(f"{soc_utils_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
+@patch(f"{term_folder}.search")
+def test_run(
+    search_mock,
+    get_irrigated_terms_mock,
+    get_upland_rice_land_cover_terms_mock,
+    _get_site_mock,
+    related_cycles_mock,
+    _new_emission_mock,
+    subfolder,
+    num_cycles,
+    cycle_index
+):
     """
     Test `run` function for each cycle in each scenario.
     """
@@ -63,6 +102,14 @@ def test_run(_get_site_mock, related_cycles_mock, _new_emission_mock, subfolder,
     related_cycles_mock.return_value = cycles
 
     result = run(cycle)
+
+    # Ensure that API calls to retrieve term IDs are properly cached.
+    get_irrigated_terms_mock.call_count <= 1
+    get_upland_rice_land_cover_terms_mock.call_count <= 1
+
+    # Ensure that the property and term utils are properly mocked.
+    search_mock.assert_not_called()
+
     assert order_list(result) == order_list(expected)