hestia-earth-models 0.74.4__py3-none-any.whl → 0.74.5__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of hestia-earth-models might be problematic. Click here for more details.

Files changed (62) hide show
  1. hestia_earth/models/cml2001Baseline/abioticResourceDepletionMineralsAndMetals.py +0 -1
  2. hestia_earth/models/config/Cycle.json +15 -0
  3. hestia_earth/models/config/ImpactAssessment.json +9 -1
  4. hestia_earth/models/cycle/animal/input/hestiaAggregatedData.py +3 -3
  5. hestia_earth/models/cycle/completeness/seed.py +1 -1
  6. hestia_earth/models/cycle/input/hestiaAggregatedData.py +25 -16
  7. hestia_earth/models/data/hestiaAggregatedData/__init__.py +73 -0
  8. hestia_earth/models/environmentalFootprintV3_1/scarcityWeightedWaterUse.py +1 -1
  9. hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandOccupation.py +5 -6
  10. hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandTransformation.py +10 -13
  11. hestia_earth/models/fantkeEtAl2016/damageToHumanHealthParticulateMatterFormation.py +1 -1
  12. hestia_earth/models/hestia/landCover.py +24 -0
  13. hestia_earth/models/hestia/landOccupationDuringCycle.py +80 -51
  14. hestia_earth/models/hestia/landTransformation100YearAverageDuringCycle.py +7 -1
  15. hestia_earth/models/hestia/landTransformation20YearAverageDuringCycle.py +7 -1
  16. hestia_earth/models/hestia/resourceUse_utils.py +58 -119
  17. hestia_earth/models/hestia/waterSalinity.py +57 -12
  18. hestia_earth/models/impact_assessment/post_checks/__init__.py +3 -2
  19. hestia_earth/models/impact_assessment/post_checks/remove_cache_fields.py +9 -0
  20. hestia_earth/models/impact_assessment/pre_checks/cache_emissionsResourceUse.py +21 -0
  21. hestia_earth/models/impact_assessment/pre_checks/cycle.py +5 -0
  22. hestia_earth/models/ipcc2019/co2ToAirAboveGroundBiomassStockChange.py +6 -64
  23. hestia_earth/models/ipcc2019/co2ToAirBelowGroundBiomassStockChange.py +9 -87
  24. hestia_earth/models/ipcc2019/co2ToAirBiocharStockChange.py +140 -0
  25. hestia_earth/models/ipcc2019/co2ToAirCarbonStockChange_utils.py +329 -217
  26. hestia_earth/models/ipcc2019/co2ToAirSoilOrganicCarbonStockChange.py +10 -87
  27. hestia_earth/models/mocking/__init__.py +2 -2
  28. hestia_earth/models/mocking/mock_search.py +20 -10
  29. hestia_earth/models/mocking/search-results.json +1 -7679
  30. hestia_earth/models/pooreNemecek2018/landOccupationDuringCycle.py +8 -7
  31. hestia_earth/models/poschEtAl2008/terrestrialAcidificationPotentialAccumulatedExceedance.py +1 -1
  32. hestia_earth/models/poschEtAl2008/terrestrialEutrophicationPotentialAccumulatedExceedance.py +1 -1
  33. hestia_earth/models/preload_requests.py +18 -4
  34. hestia_earth/models/schmidt2007/utils.py +3 -3
  35. hestia_earth/models/utils/__init__.py +4 -1
  36. hestia_earth/models/utils/aggregated.py +21 -68
  37. hestia_earth/models/utils/cycle.py +3 -3
  38. hestia_earth/models/utils/impact_assessment.py +45 -41
  39. hestia_earth/models/utils/lookup.py +92 -67
  40. hestia_earth/models/version.py +1 -1
  41. hestia_earth/orchestrator/models/__init__.py +47 -10
  42. hestia_earth/orchestrator/models/transformations.py +3 -1
  43. hestia_earth/orchestrator/strategies/merge/__init__.py +1 -2
  44. hestia_earth/orchestrator/strategies/merge/merge_list.py +31 -8
  45. hestia_earth/orchestrator/utils.py +29 -0
  46. {hestia_earth_models-0.74.4.dist-info → hestia_earth_models-0.74.5.dist-info}/METADATA +2 -3
  47. {hestia_earth_models-0.74.4.dist-info → hestia_earth_models-0.74.5.dist-info}/RECORD +62 -55
  48. tests/models/cycle/animal/input/test_hestiaAggregatedData.py +3 -3
  49. tests/models/cycle/input/test_hestiaAggregatedData.py +9 -18
  50. tests/models/data/__init__.py +0 -0
  51. tests/models/data/test_hestiaAggregatedData.py +32 -0
  52. tests/models/hestia/test_landCover.py +32 -1
  53. tests/models/hestia/test_waterSalinity.py +16 -4
  54. tests/models/ipcc2019/test_co2ToAirAboveGroundBiomassStockChange.py +1 -6
  55. tests/models/ipcc2019/test_co2ToAirBelowGroundBiomassStockChange.py +1 -6
  56. tests/models/ipcc2019/test_co2ToAirBiocharStockChange.py +90 -0
  57. tests/models/ipcc2019/test_co2ToAirSoilOrganicCarbonStockChange.py +1 -6
  58. tests/models/pooreNemecek2018/test_landOccupationDuringCycle.py +1 -0
  59. tests/orchestrator/strategies/merge/test_merge_list.py +5 -0
  60. {hestia_earth_models-0.74.4.dist-info → hestia_earth_models-0.74.5.dist-info}/LICENSE +0 -0
  61. {hestia_earth_models-0.74.4.dist-info → hestia_earth_models-0.74.5.dist-info}/WHEEL +0 -0
  62. {hestia_earth_models-0.74.4.dist-info → hestia_earth_models-0.74.5.dist-info}/top_level.txt +0 -0
@@ -3,9 +3,9 @@ hestia_earth/models/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3
3
3
  hestia_earth/models/cache_nodes.py,sha256=CqcTkvT0SQw-MKExUJgM3wDRt2sgdxgVYb6ylNnfC4I,5423
4
4
  hestia_earth/models/cache_sites.py,sha256=XpXnkYt823PQzrswgP__L4CT8xZG_n7a41CIHK8wQ3U,6427
5
5
  hestia_earth/models/log.py,sha256=LQ6nRMc5q8-xs8DsAx9h8drWhWLkqDG9dFlG9OzFbeA,3780
6
- hestia_earth/models/preload_requests.py,sha256=vK_G1UzhNMhYy7ymnCtHUz_vv3cfApCSKqv29VREEBQ,1943
6
+ hestia_earth/models/preload_requests.py,sha256=-eb4TA4m-A4bLcdAwbKqr3TIsDteVSXhJGCp95mQCew,2504
7
7
  hestia_earth/models/requirements.py,sha256=eU4yT443fx7BnaokhrLB_PCizJI7Y6m4auyo8vQauNg,17363
8
- hestia_earth/models/version.py,sha256=9UrfDoiXqrGUjBFfAlsBA8zSqgKE4oTF72ANo452dU8,19
8
+ hestia_earth/models/version.py,sha256=Yw5gBLFlJzKrCW3z-N2u5t7ExCXhNqHDMYZHrXtwdx4,19
9
9
  hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
10
10
  hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=1ngl8pdxeNhlVV8keAeWRwGorr_1uFXM9EoPUWx-uSc,4382
11
11
  hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=queToXuzq0tQ9_XuUJ2pJgSywXmbt9uX3ZoIKgqkROM,2660
@@ -27,7 +27,7 @@ hestia_earth/models/chaudharyBrooks2018/damageToTerrestrialEcosystemsTotalLandUs
27
27
  hestia_earth/models/chaudharyBrooks2018/utils.py,sha256=UsjuO-tL6zBD4xXoFQBdK-BUoTibQ5qdW8aZEzucmy0,1738
28
28
  hestia_earth/models/cml2001Baseline/__init__.py,sha256=0uGrCKDNUH-MUkpvts9MyPMnZKao-M03gU8uKquUozQ,416
29
29
  hestia_earth/models/cml2001Baseline/abioticResourceDepletionFossilFuels.py,sha256=K7rq8jARCGvxA_nstNNGCnNrqtF0AsdMKElbYVNdx6M,4731
30
- hestia_earth/models/cml2001Baseline/abioticResourceDepletionMineralsAndMetals.py,sha256=RT69ZgQjwtY72Qxrxq7Kw7L6WLTfPttYANYVs9OMRnA,5151
30
+ hestia_earth/models/cml2001Baseline/abioticResourceDepletionMineralsAndMetals.py,sha256=OKeRzwUzoH0sXg_YDHUt2E70v4OFmCUT5lTUdIy3p6c,5115
31
31
  hestia_earth/models/cml2001Baseline/eutrophicationPotentialExcludingFate.py,sha256=nUWKsn3COqAOrYNmiBKnA2rUs88pj4o3k4fHKA0TVbU,1068
32
32
  hestia_earth/models/cml2001Baseline/resourceUseEnergyDepletionDuringCycle.py,sha256=C9pXq8Al971s4Xn50S85mXmtw7OYHzKRnPH6kcqZTCY,5237
33
33
  hestia_earth/models/cml2001Baseline/resourceUseEnergyDepletionInputsProduction.py,sha256=azNsUDaeZ5WLS8F24sVWyBAzZKFQtim1pkGqUJN4OLU,1232
@@ -37,8 +37,8 @@ hestia_earth/models/cml2001Baseline/terrestrialAcidificationPotentialIncludingFa
37
37
  hestia_earth/models/cml2001NonBaseline/__init__.py,sha256=vI8wp8Og_e8DiJqYYvp33YoI3t4ffAC31LWlnV20JTg,419
38
38
  hestia_earth/models/cml2001NonBaseline/eutrophicationPotentialIncludingFateAverageEurope.py,sha256=lcgyRHY08KCBFPERJNqV4DYGEJCvyHBDnJXD0kEkVqM,1097
39
39
  hestia_earth/models/cml2001NonBaseline/terrestrialAcidificationPotentialExcludingFate.py,sha256=xcrxfs9UoV_EWvV-XzMt35oPWCUsTzqg2SGA3j2MFIw,1091
40
- hestia_earth/models/config/Cycle.json,sha256=CifX2AMdnGKf4iq51exXVVio9xwNeONkRyvUbCRcEaM,60950
41
- hestia_earth/models/config/ImpactAssessment.json,sha256=-05Z4xEPA1-VSj8NjS95pPSq6F55zzvOLoVUMy3f-rw,60550
40
+ hestia_earth/models/config/Cycle.json,sha256=3QSThmSDNw0dDREXKnHnxyi1Jb8yCMprTmdjI2HcSlI,61355
41
+ hestia_earth/models/config/ImpactAssessment.json,sha256=0o8FUBehmLD6sEU2hwJRMD99BvROv6vlcx0ZqAHfHmU,60799
42
42
  hestia_earth/models/config/Site.json,sha256=4DPSziHnDIngyub3Of8OvDEKa446q3Yx48R2Eobqk24,14374
43
43
  hestia_earth/models/config/__init__.py,sha256=7ZqOGd4dO2Stonte6fbktVZqbY7vp8Ls_LifgofCu8I,3009
44
44
  hestia_earth/models/config/run-calculations.json,sha256=e3nJ4M6CP1iFzfv8ou_ZUFbFxYkDxJgwuNDXTm4PBDc,615
@@ -60,7 +60,7 @@ hestia_earth/models/cycle/animal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
60
60
  hestia_earth/models/cycle/animal/milkYield.py,sha256=4j7B0f2OWMUaf-pGs9jMeKw3rp-_INmKIXzFRog9PlY,2237
61
61
  hestia_earth/models/cycle/animal/properties.py,sha256=KYCjznw9-e0BOLh3jep86DC_BmDGaZ0Y6TG-m3YnxHE,466
62
62
  hestia_earth/models/cycle/animal/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
63
- hestia_earth/models/cycle/animal/input/hestiaAggregatedData.py,sha256=1ZN_c7qj5GL8DuX9NDW_baoWLTx7fKnUEN_RYTFDjWo,2263
63
+ hestia_earth/models/cycle/animal/input/hestiaAggregatedData.py,sha256=c5pXvMV0QX2LasRIbLpAkaPrB0kbfWV78h9dfI1dBWs,2318
64
64
  hestia_earth/models/cycle/animal/input/properties.py,sha256=rqmwFznfgc-719vHfXNNleRMkpBmCSfjuNJUpIOFXa0,3286
65
65
  hestia_earth/models/cycle/completeness/__init__.py,sha256=bQ-tpeCbUsIdSPGla06Mg2IZWpGp7TgWXlgZTYeLsKk,1512
66
66
  hestia_earth/models/cycle/completeness/animalFeed.py,sha256=_qUJcQ2ggdy0fBCBkHmeRDL71HuX4b9KfnSm7JqPgFM,830
@@ -69,10 +69,10 @@ hestia_earth/models/cycle/completeness/electricityFuel.py,sha256=ZXljdjAxYgu75Gd
69
69
  hestia_earth/models/cycle/completeness/excreta.py,sha256=wgrinfKnsXMG4I01g0iyFIpz2Ir-T69YB00pgrM_zvY,821
70
70
  hestia_earth/models/cycle/completeness/freshForage.py,sha256=4gKLpZN_WxYU9W6VNpRshSu5oJktBVzbU_7XPhUKByY,2224
71
71
  hestia_earth/models/cycle/completeness/material.py,sha256=cF33MJkVBUnoicmecdsR78Snrv1Zng097aUeEfYDfdc,1185
72
- hestia_earth/models/cycle/completeness/seed.py,sha256=O4OygpPOeXHbn_32rdUk8m1BcZiQ6QpmvV463UOCmKY,1763
72
+ hestia_earth/models/cycle/completeness/seed.py,sha256=vufXOV-KZ860U5DdoTno1WTuM3AK5-ecCUkeKDMiFyE,1775
73
73
  hestia_earth/models/cycle/completeness/soilAmendment.py,sha256=RQPq1Y5VWJbz50tKFtcW54DdQ1YT48mQOteidW8sFcQ,1226
74
74
  hestia_earth/models/cycle/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
75
- hestia_earth/models/cycle/input/hestiaAggregatedData.py,sha256=wLdIWCSMHURAt3_cnHI_f5gpz0E9JIFnZOCldmNohTE,5648
75
+ hestia_earth/models/cycle/input/hestiaAggregatedData.py,sha256=8_99X7PEOPcImgCGuKpRA2dY9luj3C5_25vlscBolwc,6138
76
76
  hestia_earth/models/cycle/input/properties.py,sha256=-bsKbgS92AicE7_0GSamFG2-O3Rvn2LnXcmlrEt72dA,2752
77
77
  hestia_earth/models/cycle/input/value.py,sha256=TUcqoaMheIhlM0c7Ki7qWSdHpxes3SEVORAUNdyR8Rg,1391
78
78
  hestia_earth/models/cycle/post_checks/__init__.py,sha256=5ThdvGKp7ilFOzn8Tq23c4XXqhA345PYIe63yOtGJTY,336
@@ -99,6 +99,7 @@ hestia_earth/models/dammgen2009/__init__.py,sha256=dZ8tIXl6e3ZEixYrWiW7rzoqRJVFO
99
99
  hestia_earth/models/dammgen2009/noxToAirExcreta.py,sha256=LeTrgk4I1S8kNseNKXVYnn3VPyz2D2N_22S6Dsf29zA,1632
100
100
  hestia_earth/models/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
101
101
  hestia_earth/models/data/ecoinventV3/__init__.py,sha256=9JGjfmDMxjdP_AMftq5f2koPDdK2OD9hba4K8KquKsc,629
102
+ hestia_earth/models/data/hestiaAggregatedData/__init__.py,sha256=CZWReqNUjBl8I1Tcl5pcdfWeQNtJhiy0vrA3YwCatWk,1954
102
103
  hestia_earth/models/deRuijterEtAl2010/__init__.py,sha256=lbH6mB98dmZZlwdZctNYtEmVwAow957l80Dv7JSPDsI,418
103
104
  hestia_earth/models/deRuijterEtAl2010/nh3ToAirCropResidueDecomposition.py,sha256=2z10WqMsGUDDO8xJ3lmXvSUHgzz2t6PPRDha5NHoT5s,3291
104
105
  hestia_earth/models/ecoalimV9/__init__.py,sha256=_evwL-DZejYohms9PUi4TNqLic44-UbOzw178wak7Pk,410
@@ -132,14 +133,14 @@ hestia_earth/models/environmentalFootprintV3_1/environmentalFootprintSingleOvera
132
133
  hestia_earth/models/environmentalFootprintV3_1/freshwaterEcotoxicityPotentialCtue.py,sha256=N_gw2aNoCMW5Z1XM-uAyCF1kfpZUI07giv_bo3Lmr5Q,918
133
134
  hestia_earth/models/environmentalFootprintV3_1/marineEutrophicationPotential.py,sha256=UM9pezQeETfk9i0FtOBRdreaaJ9OqL6G4gYljrKOz-0,1063
134
135
  hestia_earth/models/environmentalFootprintV3_1/photochemicalOzoneCreationPotentialHumanHealthNmvocEq.py,sha256=47raZTA3aUbBpgClTzKnzUI8Vfy9qUwYNdFDUKM3hJ0,1101
135
- hestia_earth/models/environmentalFootprintV3_1/scarcityWeightedWaterUse.py,sha256=JhZB4qGQBQb7fF3ambBuILL7eKLG6B_4RYvIgbINNpY,1299
136
- hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandOccupation.py,sha256=JrDXWTdmeROyuCXYfr-zhWLPkSS7NsyXgHl4eZ4P8uc,4807
137
- hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandTransformation.py,sha256=7eQUNCD-rQRuWwP_MB2DsY0wG3NM3KlLI5lqx77xDnk,6796
136
+ hestia_earth/models/environmentalFootprintV3_1/scarcityWeightedWaterUse.py,sha256=dLFXQEs1uDv5LB3H8GZvOnkMw8_JeS-6K6uoZHuHca4,1302
137
+ hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandOccupation.py,sha256=w-8fgJX08HlpK2al7yfHh-bSaxvG0r3wJbXj2kD56WM,4606
138
+ hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandTransformation.py,sha256=nwfTw0-LyTNKBQ7bDJsnqLNun-C8_ZPwJUDNqJygn00,6537
138
139
  hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexTotalLandUseEffects.py,sha256=6g76wBf0XcQdAadE4BCD5-qUmpGbbYV9kfKsM6cKnHM,3075
139
140
  hestia_earth/models/epa2014/__init__.py,sha256=ckGf_6X7CCzI_18OqchEkuJAXKXM1x7V53u480ckknM,408
140
141
  hestia_earth/models/epa2014/no3ToGroundwaterExcreta.py,sha256=683vgGM-m4cdFhbvlp9V1yobLHM7bQWYMwjByoozzZA,1724
141
142
  hestia_earth/models/fantkeEtAl2016/__init__.py,sha256=NtOlRmjTA4e8i0nW8erwdm-DDtfYlbLiARqqv82bkU4,415
142
- hestia_earth/models/fantkeEtAl2016/damageToHumanHealthParticulateMatterFormation.py,sha256=6o_2j4pgNlgS9ogSoRF3UivddYgbyy7TsueBC_79Y8k,1188
143
+ hestia_earth/models/fantkeEtAl2016/damageToHumanHealthParticulateMatterFormation.py,sha256=4XohVOBmLwxbo9cUMAcQTcJrsHO-eC1tGQFZgqdCUYM,1186
143
144
  hestia_earth/models/faostat2018/__init__.py,sha256=ecN-pKF1pkFnzmooBrg1VAxJkG76q9v4piiaKGP_vbo,412
144
145
  hestia_earth/models/faostat2018/coldCarcassWeightPerHead.py,sha256=Qf_nvHxT4mn9kSNgOEXJUX0oUIOuuw0KSzLf-si04tQ,3105
145
146
  hestia_earth/models/faostat2018/coldDressedCarcassWeightPerHead.py,sha256=2WqIFxUMHngcsY7CffAn0bZClB_VXW1egtvBrKOFmxw,3196
@@ -211,10 +212,10 @@ hestia_earth/models/hestia/freshWater.py,sha256=Q-dmFJLZfyYEyFyYkJUOjgmQR3G5YXCX
211
212
  hestia_earth/models/hestia/histosol.py,sha256=IexiWTSlSJYGjrdpYmRooW6v8LjhYATPQ8smMz1UZBA,1612
212
213
  hestia_earth/models/hestia/inorganicFertiliser.py,sha256=We4PBaTXyGwEQTfhX0-J8Xt03p-FB9i9j3tEK5JQ8uE,9026
213
214
  hestia_earth/models/hestia/irrigatedTypeUnspecified.py,sha256=VdYzfYxcRzWv21qxRkDn9HBid7-Bt_CgIv4iyXJH03g,1929
214
- hestia_earth/models/hestia/landCover.py,sha256=1pm_F79ANQHi8oeKkV24koiaSGCNRtzYBk3f38k-Bpk,39463
215
- hestia_earth/models/hestia/landOccupationDuringCycle.py,sha256=F3JwyptK9RgiCWgbB3J_Znj9UXfXejUE-3vgb0ZgYW8,8324
216
- hestia_earth/models/hestia/landTransformation100YearAverageDuringCycle.py,sha256=hF7_DDvrs7swH6ott_ihgYx13UzEKHH6pccYCtzrN8o,1069
217
- hestia_earth/models/hestia/landTransformation20YearAverageDuringCycle.py,sha256=05SCH6ZjEV3mIleRusBg677zu0xgu5YK0f9FCddgNPg,1067
215
+ hestia_earth/models/hestia/landCover.py,sha256=bZdlubbri0yzYCdhAQx_6iXZWQjeijBLr8NLldZPWOs,40280
216
+ hestia_earth/models/hestia/landOccupationDuringCycle.py,sha256=9FAjqFh-MFeABzW83Ge5Y5JOmakhG8hYv8dtKqdXms0,9582
217
+ hestia_earth/models/hestia/landTransformation100YearAverageDuringCycle.py,sha256=Bd8rD4ioiXvlKCTtYva_Cj3yqIgi2ykeVmCDtjgeY4A,1202
218
+ hestia_earth/models/hestia/landTransformation20YearAverageDuringCycle.py,sha256=yWbnkjvV87M8lUcSR5nxJGunX3Ne3wdVvBMR2b1K_Sc,1200
218
219
  hestia_earth/models/hestia/liveAnimal.py,sha256=d7HuUi40c-7TN1kecdRuqbht8PAe7x4ps0NhSuWG34Q,3868
219
220
  hestia_earth/models/hestia/longFallowRatio.py,sha256=LkJaER1VNDI5351-oC8tru-LgiPK3sNMg0NhB5ic9RE,1690
220
221
  hestia_earth/models/hestia/management.py,sha256=nvbqjxR4spBVh9IzzduRp5BStDd7wyKTpkkJenUYObo,13447
@@ -240,7 +241,7 @@ hestia_earth/models/hestia/residueBurnt.py,sha256=lVJNeLwsq-43_-n7m-3QqE-IkUBh2K
240
241
  hestia_earth/models/hestia/residueIncorporated.py,sha256=fMlZHIrsy5JQCQ-a0sMucU9iCUrZv8jhDgwALxU0GPw,2770
241
242
  hestia_earth/models/hestia/residueLeftOnField.py,sha256=EZoPlDhh1aNJvPT52Bvro6xcHwHctmID1sUvJfuzN1M,2182
242
243
  hestia_earth/models/hestia/residueRemoved.py,sha256=2I4wTJJcORrhkWiRJOzjwxRMIn3Jjeggh1dhFC2CK4Y,4969
243
- hestia_earth/models/hestia/resourceUse_utils.py,sha256=SYMN-40NW76LaVo2jVdnCbTgYN03mmSqvYRzgDzm5jI,8564
244
+ hestia_earth/models/hestia/resourceUse_utils.py,sha256=eEROdEYQc4hQsz57iAThV8hQi-FVb5aDZmDZWqzHF-M,6624
244
245
  hestia_earth/models/hestia/salineWater.py,sha256=rqiF3KfjvvNx3sxWFiXsP1_e5aB3ekA4QGC8vtcFHmo,1270
245
246
  hestia_earth/models/hestia/seed_emissions.py,sha256=1TxXfDjtIYS7yEZLDs70j6D3-x-68K9KZQGwHIBl7EE,12107
246
247
  hestia_earth/models/hestia/soilMeasurement.py,sha256=cP4nuz2DE-FLaFbP-0fG5wbIgU28s3n4-lo8-RTFpF0,7088
@@ -251,7 +252,7 @@ hestia_earth/models/hestia/totalNitrogenPerKgSoil.py,sha256=hpyYqMwO9TvZjrpQuSBA
251
252
  hestia_earth/models/hestia/unknownPreSeasonWaterRegime.py,sha256=Ix7Eg4NVW1iKvPKIOqOdSkahn7BlJNtPM8nlrogrfcM,1460
252
253
  hestia_earth/models/hestia/utils.py,sha256=oTdk7VKuaxDTKj9Cz4t3qp3RZ5wSt3bZXpPiImgIIto,4768
253
254
  hestia_earth/models/hestia/waterDepth.py,sha256=gnvd1kwbTCt9HjgxlKzuCGkPi8Sq7nQiHFbk8xBAZV0,1251
254
- hestia_earth/models/hestia/waterSalinity.py,sha256=YkiLEljMd4xHT0bKv-nXbgOXcaEQmLDlSwpFrfg49ow,2962
255
+ hestia_earth/models/hestia/waterSalinity.py,sha256=TT26QPMJLzziK-x6aPM4WG94SKEZafcA7J6lS8lIhPc,4437
255
256
  hestia_earth/models/hestia/feedConversionRatio/__init__.py,sha256=G4T1jfN1OqERsywiWyrBiFneUZs5QXpChz7dgGfg9Ko,2512
256
257
  hestia_earth/models/hestia/feedConversionRatio/feedConversionRatioCarbon.py,sha256=21_PXoKXJCxPOPOspKqqq-E7dh-2tVQnR4cnGZ9JGj8,1992
257
258
  hestia_earth/models/hestia/feedConversionRatio/feedConversionRatioDryMatter.py,sha256=zf-v-cAPLpSe7sr1auzUUXkjXwpXRTVvsCrzbZrwBI8,2388
@@ -263,11 +264,13 @@ hestia_earth/models/impact_assessment/allocationMethod.py,sha256=x52IjSmyu8vSyr9
263
264
  hestia_earth/models/impact_assessment/emissions.py,sha256=w5Fs6g_ZdGpeDxIVWCErt7wSk3qRZ31vFsdJQMPeE94,3773
264
265
  hestia_earth/models/impact_assessment/irrigated.py,sha256=syD3r4wykOHnC9PC-J67QXlWHnJ6K6MjTC2InccWxXI,674
265
266
  hestia_earth/models/impact_assessment/organic.py,sha256=FtYco3NwhSJEsMjjK_JDRyxwuSoKH_8y17x-RBl3exM,645
266
- hestia_earth/models/impact_assessment/post_checks/__init__.py,sha256=rkHO4Z3Zz8LCT1OoDgHmUuGURvXsdzh2nQqgU2M4tjU,304
267
+ hestia_earth/models/impact_assessment/post_checks/__init__.py,sha256=9YvfW2TxavG0d2YcbBfUd-Z-U6VPflq4b-OZ8nYRJbE,354
267
268
  hestia_earth/models/impact_assessment/post_checks/cycle.py,sha256=hXtG_EJIAP6i-kOa6UrYrD8r4GkYcZiEDaorWvKn-kU,588
269
+ hestia_earth/models/impact_assessment/post_checks/remove_cache_fields.py,sha256=tLNS3r--qoXcoTSMyvEkHBiorazPBf4CGLfYVArqCsY,267
268
270
  hestia_earth/models/impact_assessment/post_checks/site.py,sha256=3o4wABsdQKU9b72Oa_Ry6mcSYTxFkbYIk4zWxOohgpg,581
269
271
  hestia_earth/models/impact_assessment/pre_checks/__init__.py,sha256=rkHO4Z3Zz8LCT1OoDgHmUuGURvXsdzh2nQqgU2M4tjU,304
270
- hestia_earth/models/impact_assessment/pre_checks/cycle.py,sha256=TfX41aYPbA9dXEKIoJfH5X2Rwrr-Ni_-m4yGW8HixmA,812
272
+ hestia_earth/models/impact_assessment/pre_checks/cache_emissionsResourceUse.py,sha256=Yr4mCm11ERJ2dSC-4MG4xHe3-KXaSXXMyiw1DhKSFYc,862
273
+ hestia_earth/models/impact_assessment/pre_checks/cycle.py,sha256=DW2iAnaBLPuT2iUcfKNyHwB0jpKxclrERSwJ8wT2L8E,991
271
274
  hestia_earth/models/impact_assessment/pre_checks/site.py,sha256=YEx5-HS_PadrIR-YzA4Sg5UlqTeqAkikyOS6iJ2U0dU,667
272
275
  hestia_earth/models/impact_assessment/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
273
276
  hestia_earth/models/impact_assessment/product/economicValueShare.py,sha256=ssyuAUWpzH1DVrbb0SvMtznWv9Z33_qC2epGrb2hfRU,1280
@@ -302,12 +305,13 @@ hestia_earth/models/ipcc2019/ch4ToAirEntericFermentation.py,sha256=b9FIMIGMGcpOh
302
305
  hestia_earth/models/ipcc2019/ch4ToAirExcreta.py,sha256=4GI_d4sTlskQiSK7xR2f1EaFhBt5Mu7sx0Xq9eUhiJk,6608
303
306
  hestia_earth/models/ipcc2019/ch4ToAirFloodedRice.py,sha256=26WZtckmb7b3sbUN7hpshEdaSdvJpL3-Oer60III_KU,10225
304
307
  hestia_earth/models/ipcc2019/ch4ToAirOrganicSoilCultivation.py,sha256=oXK35mLD6rkHG0Zv5F0Atyn0OxQgwuUs6Pkr7E7_qcg,9544
305
- hestia_earth/models/ipcc2019/co2ToAirAboveGroundBiomassStockChange.py,sha256=cA7COPsb8WFDiObqaxm1MQfUVLvkq9-jZSm1UtrVUaI,6414
306
- hestia_earth/models/ipcc2019/co2ToAirBelowGroundBiomassStockChange.py,sha256=MNX8uNxLfzwy8j3EchD0KqLXsXoMz7bA2Rma1djXqi0,6462
307
- hestia_earth/models/ipcc2019/co2ToAirCarbonStockChange_utils.py,sha256=c8UIroBrVT7V8bEGiZ4MirnZiofWZrnRREfUX4WVT58,57220
308
+ hestia_earth/models/ipcc2019/co2ToAirAboveGroundBiomassStockChange.py,sha256=WJVfdTBgLI-RsKAd2V-AF7rTnYfR1qUbLkWS5i1gGqo,4559
309
+ hestia_earth/models/ipcc2019/co2ToAirBelowGroundBiomassStockChange.py,sha256=EPS2IBw1qFGWmzkNpJUNp1bxU2j4pbzQS5jCpvYF-6Y,4083
310
+ hestia_earth/models/ipcc2019/co2ToAirBiocharStockChange.py,sha256=ULpNDp_njb3lUeVcbsKaVp3rJlDdrmujiOA8a7eeFhM,3751
311
+ hestia_earth/models/ipcc2019/co2ToAirCarbonStockChange_utils.py,sha256=43iUB72uqH05O9iXoywamPdkNfxDBcb7jRyCN8pAaO0,61559
308
312
  hestia_earth/models/ipcc2019/co2ToAirLimeHydrolysis.py,sha256=X3-M4Mn3fdGsUR7ZGjBXXWrPFBGD1ipV8_4O94lB7Z8,2487
309
313
  hestia_earth/models/ipcc2019/co2ToAirOrganicSoilCultivation.py,sha256=PvWxWlIQiDy-PvaZH9GqKD8GYiE6Vrkypkr-zWKY2bY,7609
310
- hestia_earth/models/ipcc2019/co2ToAirSoilOrganicCarbonStockChange.py,sha256=zKNYGiebIOmI3L4yMKUq41hF4_lVyfWwxCdeqp7XP3A,6474
314
+ hestia_earth/models/ipcc2019/co2ToAirSoilOrganicCarbonStockChange.py,sha256=eyFRis1py_8sJOzDQZOIw_HVX3i3gyf4gKowIJm2NXw,4095
311
315
  hestia_earth/models/ipcc2019/co2ToAirUreaHydrolysis.py,sha256=P6OxdUbvONaTVGchvogEnGeNxox-X1FaZ08yOdqqm6k,3879
312
316
  hestia_earth/models/ipcc2019/croppingDuration.py,sha256=X2fuBCr-mspLwJUGOlVis9lnyzdZ92vYqgDA6dgL5eo,3088
313
317
  hestia_earth/models/ipcc2019/ligninContent.py,sha256=nAhwrl0b3pbGQnAycEESAzakdpXajONTnbhNwgPR7nw,7293
@@ -460,10 +464,10 @@ hestia_earth/models/linkedImpactAssessment/landOccupationInputsProduction.py,sha
460
464
  hestia_earth/models/linkedImpactAssessment/landTransformation100YearAverageInputsProduction.py,sha256=IqQ76I05IC79g2GXY91iWFqEeXk8Fhw-hcrifCaAbiI,1228
461
465
  hestia_earth/models/linkedImpactAssessment/landTransformation20YearAverageInputsProduction.py,sha256=yHGyhabzKdBIPSGciJ_LJPKvHbTECXDx8dGOgmT1eqM,1225
462
466
  hestia_earth/models/linkedImpactAssessment/utils.py,sha256=DM6ZUnw23KH0oMKS3jA5qH0Evap2wJEXqJr4o5kPnog,4773
463
- hestia_earth/models/mocking/__init__.py,sha256=9VX50c-grz-snfd-7MBS0KfF7AadtbKuj7kK6PqtsgE,687
467
+ hestia_earth/models/mocking/__init__.py,sha256=-mJ_zrVWZSGc3awWW2YJfXAK3Nku77sAUgmmFa99Xmo,733
464
468
  hestia_earth/models/mocking/build_mock_search.py,sha256=p15ccEUmkmLp1RiGNznxMz3OFHbI8P1-29ExuohiQN8,1355
465
- hestia_earth/models/mocking/mock_search.py,sha256=ccFe_WrI73JElFmxp4hPNLCX7eeU--lBC1JFR901KJY,1069
466
- hestia_earth/models/mocking/search-results.json,sha256=nTy4mQnzN5lYKpw2BX-rEwAjeQdjKuf8y3oIMAJML54,162832
469
+ hestia_earth/models/mocking/mock_search.py,sha256=uvklojTAbjDI7Jw43jGAUDcTHk1R3A3CWiYBJZI6rao,1493
470
+ hestia_earth/models/mocking/search-results.json,sha256=jzk1kqMxajoL5SojazrZfsG3Tl2LqvxfBihTTMT0Dc0,103845
467
471
  hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
468
472
  hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=oXillpppAas1q9GKmODxe1YXyno3EzV-j12xhzkqtTc,2404
469
473
  hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=_pQMPSvI--Xm00H6vXDA4ct_pQXKRGrLE2f-2tQE6y4,2323
@@ -471,7 +475,7 @@ hestia_earth/models/pooreNemecek2018/ch4ToAirAquacultureSystems.py,sha256=k_dB5i
471
475
  hestia_earth/models/pooreNemecek2018/excretaKgN.py,sha256=EKVQK_wfDGRvj3lsSYp4xCjVEobOVt04fNhiZZXXfDk,5956
472
476
  hestia_earth/models/pooreNemecek2018/excretaKgVs.py,sha256=khyeuP2KBHSpseR2YPtXg0mT3qZS3fVVE47ey674fvw,9289
473
477
  hestia_earth/models/pooreNemecek2018/freshwaterWithdrawalsDuringCycle.py,sha256=n6_QxRZlAMkhf9yVerv2EQ6nJOxIBsrv3dgVtIFKrjw,5656
474
- hestia_earth/models/pooreNemecek2018/landOccupationDuringCycle.py,sha256=gSUzPuzzLwQsBiX_Tgx6mWJ4pEB5qhlKoOtaEdmDGQ4,3431
478
+ hestia_earth/models/pooreNemecek2018/landOccupationDuringCycle.py,sha256=j9kTb_c63jzDATPNnmlU9VnuKJuy3LEjNOeCcm5M_aI,3444
475
479
  hestia_earth/models/pooreNemecek2018/longFallowDuration.py,sha256=qtqIPWR4Fvbi5yWnMlG3apYPQT4X_YMCob3z035mQMU,1519
476
480
  hestia_earth/models/pooreNemecek2018/n2OToAirAquacultureSystemsDirect.py,sha256=n3G4p1ed7-45Ts09kbGGyJ4wea4dp8cY4lTm_9HAsP8,2375
477
481
  hestia_earth/models/pooreNemecek2018/n2ToAirAquacultureSystems.py,sha256=dFbrp4juLeCrD4wSDzfRrxiLpSFN_K4bmLsDxW4ckSs,2220
@@ -491,8 +495,8 @@ hestia_earth/models/pooreNemecek2018/rotationDuration.py,sha256=j5hW_NEKYQbeMcds
491
495
  hestia_earth/models/pooreNemecek2018/saplingsDepreciatedAmountPerCycle.py,sha256=W_elFn-__VwMBnoGee6Gm5WNu_E2K7ipW2cHX5vmlOg,2519
492
496
  hestia_earth/models/pooreNemecek2018/utils.py,sha256=q3vVRch8waL8EzE-q0WtDRxsrbKhJfvx0olznNtTwcs,3790
493
497
  hestia_earth/models/poschEtAl2008/__init__.py,sha256=nvyyGglxCTV4PpxcOjY7jJb0v8Bjzj435Zt1j6VcryM,414
494
- hestia_earth/models/poschEtAl2008/terrestrialAcidificationPotentialAccumulatedExceedance.py,sha256=1pd7RX4Q0ilASi9k3l1zNnz3bUg2MakR8luJQVxYxKA,1418
495
- hestia_earth/models/poschEtAl2008/terrestrialEutrophicationPotentialAccumulatedExceedance.py,sha256=z6i-wYpPrchNmivb4Cvr9wOsc4WvDRQadORFOq_YiYM,1420
498
+ hestia_earth/models/poschEtAl2008/terrestrialAcidificationPotentialAccumulatedExceedance.py,sha256=L71tNWVTwqtxh5ccTcty6pzpcRn44sNzSIsEpOOexnE,1421
499
+ hestia_earth/models/poschEtAl2008/terrestrialEutrophicationPotentialAccumulatedExceedance.py,sha256=MiuL4mvBxUGcIgc-zOUg9f8eWCiuHWcXamJhYdbZB3M,1423
496
500
  hestia_earth/models/recipe2016Egalitarian/__init__.py,sha256=OvZoSgfaMe6DWIdqr-Sx3ouzXlp994oro7Mi0Xid18Q,422
497
501
  hestia_earth/models/recipe2016Egalitarian/damageToFreshwaterEcosystemsSpeciesYear.py,sha256=npKpO4b57399P2uUWX8l6SrNc9op6mrd73QBhBKomjk,1167
498
502
  hestia_earth/models/recipe2016Egalitarian/damageToHumanHealth.py,sha256=8LtvNlddVa8xvvBhHf0xOgMWwCsdA1Te5QKhMJuHLcE,1131
@@ -560,7 +564,7 @@ hestia_earth/models/schmidt2007/ch4ToAirWasteTreatment.py,sha256=YADAFxJl0UB_UCx
560
564
  hestia_earth/models/schmidt2007/h2SToAirWasteTreatment.py,sha256=Ma20xG4Crk7bp12FvpDQkyVwXyikFz9Bnn0pFoWSu64,1351
561
565
  hestia_earth/models/schmidt2007/n2OToAirWasteTreatmentDirect.py,sha256=a0uv1788OxF6Cw01y7SWywS9WevI6aimhPR3RETuXjI,1357
562
566
  hestia_earth/models/schmidt2007/nh3ToAirWasteTreatment.py,sha256=UOOcEOZsW9-UOlS8pcgBkSl1V1kFbURn1hNx20Ubtq0,1351
563
- hestia_earth/models/schmidt2007/utils.py,sha256=ytV6wGAuIMqu_Z_Ck8f0Zia_XETfno8fyr3IdvdP2ho,990
567
+ hestia_earth/models/schmidt2007/utils.py,sha256=Frf0SOAMlQ7QzoVWgATS2v4Y-4W4PVciI9t7vkd7_vk,992
564
568
  hestia_earth/models/site/__init__.py,sha256=aVuLLhq0OQVm-_MZoq4JAKMidqexUWJBg_7mmojmDzc,405
565
569
  hestia_earth/models/site/defaultMethodClassification.py,sha256=1EIWC99Fegu7B8GFlpysvWhuXaLDmABom3wDelIYUjc,1068
566
570
  hestia_earth/models/site/defaultMethodClassificationDescription.py,sha256=4YXf8grO9Zf5N7bPomKAqXKPOa7JhmLCXm6sO53I4is,1213
@@ -605,8 +609,8 @@ hestia_earth/models/transformation/product/__init__.py,sha256=47DEQpj8HBSa-_TImW
605
609
  hestia_earth/models/transformation/product/excreta.py,sha256=zYts6AKQizoy9NQf5PwMttuPePe8-U0d8QthC_sSM1E,5389
606
610
  hestia_earth/models/usetoxV2/__init__.py,sha256=pK37V3H-KvYcvRKw4Mv8CWrB2N0LFLzmv0jKLdhGGqs,409
607
611
  hestia_earth/models/usetoxV2/freshwaterEcotoxicityPotentialCtue.py,sha256=pPX8u-Aq6Pg5Y9xw0CS0S2WkAHQpOMl0lL2tLQwwOuU,918
608
- hestia_earth/models/utils/__init__.py,sha256=W6LxMNLCfcviL6X8XMAExj_Z-E2x84HQw27_uQD5M18,7232
609
- hestia_earth/models/utils/aggregated.py,sha256=G7FNJfHqJ_eoXB66kGdjLyZGDOI_gsF56o7VnyW3bqA,4801
612
+ hestia_earth/models/utils/__init__.py,sha256=ml-Q7AqPFHeeF_Pvid63BHLH2R-1ML-xWxjMP6r8kn0,7280
613
+ hestia_earth/models/utils/aggregated.py,sha256=wS9S8GljTuUYkueyoHaFRIGf-FcoBnRMznsi-7-sbKE,3044
610
614
  hestia_earth/models/utils/animalProduct.py,sha256=M5IunAKGY6oZv3j1Ascl34ywyeLWApqOIlBzbtlA2FE,721
611
615
  hestia_earth/models/utils/aquacultureManagement.py,sha256=dxrbC1Xf140cohxTbSw6TxLAnAASWTdNZwBBam4yQnw,171
612
616
  hestia_earth/models/utils/background_emissions.py,sha256=0AmrKgV_ajVVhj8wwEIOwRfK5CwpYbS03E4eFGOY6h8,6959
@@ -618,20 +622,20 @@ hestia_earth/models/utils/crop.py,sha256=GbYwrz3Zd4JU-cwUBijc8GeAK0XgurV3ubwcFIg
618
622
  hestia_earth/models/utils/cropResidue.py,sha256=uEXMnP7qxuH5xFNABlwWeQ-q5jsWfyik-9x1OKgNFHA,1506
619
623
  hestia_earth/models/utils/cropResidueManagement.py,sha256=nIDFjf39rDD10UHSVudfDyu-EiL261g8jyrgS-2aDKw,347
620
624
  hestia_earth/models/utils/currency.py,sha256=f_ArJANb--pZq4LL49SXQ1AMX_oKroqwBXKRRQqZwsM,578
621
- hestia_earth/models/utils/cycle.py,sha256=J8ATBSDkhkEPRMRC0ufO8eC_JeGCpkpdvSz2xSTAg-8,16220
625
+ hestia_earth/models/utils/cycle.py,sha256=WBDKaLqQtxxhvhPm3Sz_3tVSgVFm5zONkANx6hRFra0,16222
622
626
  hestia_earth/models/utils/ecoClimateZone.py,sha256=kJmXtRiq8-vWF7S1rNIA6WpWkPtt8JoNfWgG9azM_ts,4269
623
627
  hestia_earth/models/utils/emission.py,sha256=aIQA3mFbGYlnD2DqDx6GY8qd2bzcjUjfvz8wnzmQ6Tc,4227
624
628
  hestia_earth/models/utils/excretaManagement.py,sha256=PNZoaf6nvdt1t7B8Apa638rU8T4hI5VW2fy1fAoC64k,2265
625
629
  hestia_earth/models/utils/feedipedia.py,sha256=ETJx80zf_qGFWASE1u4kmpYncCz-7xSFlQ-vDyHAVVk,4033
626
630
  hestia_earth/models/utils/fertiliser.py,sha256=9Kv7czDEPDvZ5Bz6Rr_2vy2MsXrPDvBC3921cEJSks8,810
627
631
  hestia_earth/models/utils/fuel.py,sha256=XzOELV3dn506PkMKjFQ_ZKVZInd2lL2x6PKdsa6Po4M,1429
628
- hestia_earth/models/utils/impact_assessment.py,sha256=1gA7KstClbVEWfO5Uc0zNgxYOrmd2VOaPMeY6ZI83Fk,8432
632
+ hestia_earth/models/utils/impact_assessment.py,sha256=AfIZo_ykkkqWYY2AG-kLzGtd3fwzGIQXxnEKEzL_oGk,8516
629
633
  hestia_earth/models/utils/indicator.py,sha256=Vb5L2ziXKXiL558M0K5V5ihaDTuvX3BLJP1SCbQ_B5E,1009
630
634
  hestia_earth/models/utils/inorganicFertiliser.py,sha256=2Uq6ATWwb_YYRzBCMdrlVWyCDDtWVApUxgxDEN3-3OA,1782
631
635
  hestia_earth/models/utils/input.py,sha256=61aaJV6QApJQIQT5TMsBww46cBYpJdf__krnwV95KsY,6160
632
636
  hestia_earth/models/utils/landCover.py,sha256=8-nfynzCx9gf9YfhpuoH6Cn4kQwWFpYA5RmoGW-0ETE,300
633
637
  hestia_earth/models/utils/liveAnimal.py,sha256=-ufUs00ALXRKGbrRJi7a7eTWVvkEj_pxLDWYbMJmx2g,1770
634
- hestia_earth/models/utils/lookup.py,sha256=USNU2wMokNhollPezuNsyqMq7zs6d6RFoe86cTEA-iI,7767
638
+ hestia_earth/models/utils/lookup.py,sha256=f_04Te0O6WgLXFrCXGVmCKUj0vAo8IaYCGgC-EKDzzk,8105
635
639
  hestia_earth/models/utils/management.py,sha256=urvoHvTw5wrO12POjGQ50Or25X1Y4Gx26l4fDoVt-Ck,376
636
640
  hestia_earth/models/utils/measurement.py,sha256=1Da0CzWu_RDzVEqcBIl_EGsRq7PmafICyBva3-QtjVQ,11744
637
641
  hestia_earth/models/utils/method.py,sha256=ZYN2_Fyeiwr9pmvD84ZPg7ZHBlvaIY2A6XL4F_KByS0,740
@@ -651,16 +655,16 @@ hestia_earth/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=Niv7ZFM
651
655
  hestia_earth/models/webbEtAl2012AndSintermannEtAl2012/nh3ToAirOrganicFertiliser.py,sha256=TGXyusrRd9shT842iqbrI6MkQhICgw7uYdrl4jsDrg8,4193
652
656
  hestia_earth/orchestrator/__init__.py,sha256=ntPWzdomHMdKejrnUlVPCUrLw0P2C9UIt3jRJD_Gwn4,1402
653
657
  hestia_earth/orchestrator/log.py,sha256=C45LGnZ_3I2SHqX75JFnkK1yYmfh5mkDLF4GcZRxXo4,2440
654
- hestia_earth/orchestrator/utils.py,sha256=LAMUTyIQ-90TR6CUljWPbCNBsAMeukOhW4zoPy7LzuU,4111
655
- hestia_earth/orchestrator/models/__init__.py,sha256=TCQjmMiAOvayPwqvIwzx7gEvyiUlUc69gMECkoHUNE8,4534
656
- hestia_earth/orchestrator/models/transformations.py,sha256=zJwfVXabudLXhdyz0Hsk4IV_2OjgMtaYEZbD9kuZtLk,4128
658
+ hestia_earth/orchestrator/utils.py,sha256=5m1q9nWddRMH6zBKcqThhE764ybS_7ya-HDZqcRwreQ,4735
659
+ hestia_earth/orchestrator/models/__init__.py,sha256=6oKO5lTizvQhAtjJdpEp5OWXFU-OBawLWbOPsGJaziE,5641
660
+ hestia_earth/orchestrator/models/transformations.py,sha256=v6pWIRutMtPFKxEz6ekaibPbf-cd6QmrscukkhMFXws,4251
657
661
  hestia_earth/orchestrator/models/emissions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
658
662
  hestia_earth/orchestrator/models/emissions/deleted.py,sha256=KC6J1bdMJC1rBFlWW5SD1NhbN8kyBPFdncbtY9OfYBU,575
659
663
  hestia_earth/orchestrator/strategies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
660
- hestia_earth/orchestrator/strategies/merge/__init__.py,sha256=9fytXEII6aSbc0edEp0Dg1QMVayU3eMUXdwKYVky_24,1416
664
+ hestia_earth/orchestrator/strategies/merge/__init__.py,sha256=rs9j1EbAAI1GvFKYZ3XbG8Vkr6xxcOWMEJNa9YTNA1Y,1377
661
665
  hestia_earth/orchestrator/strategies/merge/merge_append.py,sha256=5xJ8fqu2UqCDotVkSxj7yRDRdw0RM2tERsA4j_1Zlu8,915
662
666
  hestia_earth/orchestrator/strategies/merge/merge_default.py,sha256=ssKq5ZIoQr4k2HHpkyPqHJSQQj-AGqu8zUzEQIRafv8,45
663
- hestia_earth/orchestrator/strategies/merge/merge_list.py,sha256=LR82y-JVI4pHC93Wz9pQPYRmFgAQLbmGgExvV5C_q1k,4029
667
+ hestia_earth/orchestrator/strategies/merge/merge_list.py,sha256=k88Dp4GUYFD7LToKoTUCGN83_9RFGyG0G03TvaCb3IQ,4531
664
668
  hestia_earth/orchestrator/strategies/merge/merge_node.py,sha256=iAgxHVVR7y2kXtR_pdNzS4Fq-iLmwaqNHXMfjIBG6eE,2622
665
669
  hestia_earth/orchestrator/strategies/run/__init__.py,sha256=At0V8CI4vyiSY-Vh2PHMhTYfnp7vl31gq78RyCeIqJk,307
666
670
  hestia_earth/orchestrator/strategies/run/add_blank_node_if_missing.py,sha256=lAfL-NK-gh2YQnTis2lIyb1uI_fsnwFWS10qwbga43M,2756
@@ -722,7 +726,7 @@ tests/models/cycle/animal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
722
726
  tests/models/cycle/animal/test_milkYield.py,sha256=E6WLhuSRydREyKmqmOuOPB8VH1nwZwUMcUULshIdj7k,873
723
727
  tests/models/cycle/animal/test_properties.py,sha256=ND9ltZQie1xXtQvAzoDUkBYGV_N3rw5D5W-irARvO0s,715
724
728
  tests/models/cycle/animal/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
725
- tests/models/cycle/animal/input/test_hestiaAggregatedData.py,sha256=19rTpeoktPFMyOSolACMJkSe2p96xLsXAeRVjND0WbY,1229
729
+ tests/models/cycle/animal/input/test_hestiaAggregatedData.py,sha256=xCLFFd1WiDu19PQhk5pWS1rZgLeK5iPbUw1HYMkpWLo,1245
726
730
  tests/models/cycle/animal/input/test_properties.py,sha256=rp-PfGijk-Sbh1NsV5nkf9gh_xZpGocDgWIl8N7VtTo,1983
727
731
  tests/models/cycle/completeness/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
728
732
  tests/models/cycle/completeness/test_animalFeed.py,sha256=J52m1kInw8mPE_pwx0j3QGKI8ZpDGeN2TLqUuArn7WA,348
@@ -734,7 +738,7 @@ tests/models/cycle/completeness/test_material.py,sha256=bA1_32wmtdd77cD8vinkIjsp
734
738
  tests/models/cycle/completeness/test_seed.py,sha256=NvCh4-YTUVoo2K5tX9h7-Wo7GjZGsRn-Nxn76iTw3sY,1043
735
739
  tests/models/cycle/completeness/test_soilAmendment.py,sha256=2kXOyux6wVIbjIbsaCFNEN3Ic-RMLtli-pH7fAXZpo4,641
736
740
  tests/models/cycle/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
737
- tests/models/cycle/input/test_hestiaAggregatedData.py,sha256=cT2xxlC1iaMzySZbirpIifpbpdDLYFb7q-f5iiB1Z5A,3513
741
+ tests/models/cycle/input/test_hestiaAggregatedData.py,sha256=ViGBVxCvByMUUvkW-Naqx5zIe0_klJ_HXYaAAZA166I,3119
738
742
  tests/models/cycle/input/test_properties.py,sha256=5O2ubBE_WSLz5NRtLTGwsE-gADIcw7sZyJqL0w7GYcQ,1962
739
743
  tests/models/cycle/input/test_value.py,sha256=NR7KHsqnPnw43BB1efT0KPaszY4DKY293Av-lVde-DI,977
740
744
  tests/models/cycle/post_checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -757,6 +761,8 @@ tests/models/cycle/product/test_revenue.py,sha256=H_LxjvMEyyr8dr8SAC3zWezGsGcD4l
757
761
  tests/models/cycle/product/test_value.py,sha256=IfkcE8kgrvXg_iIbnoJ3n0CIjlfgg_lHkILQ8u38HVE,963
758
762
  tests/models/dammgen2009/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
759
763
  tests/models/dammgen2009/test_noxToAirExcreta.py,sha256=NeUaj7eb597prutS0ynUdsnlNWB-t_6CHJZJu8iGNBU,1618
764
+ tests/models/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
765
+ tests/models/data/test_hestiaAggregatedData.py,sha256=m72rayilqxzJ3SzamDdIQ7ZVAPU3HeNnDjAcd3Clg-I,780
760
766
  tests/models/deRuijterEtAl2010/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
761
767
  tests/models/deRuijterEtAl2010/test_nh3ToAirCropResidueDecomposition.py,sha256=kS1nUBVohOSCb386g6Wq7iVclmx0haekUDYo7VQ4NCA,2030
762
768
  tests/models/ecoalimV9/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -864,7 +870,7 @@ tests/models/hestia/test_freshWater.py,sha256=v2UD69csKrniKP3MXkOEHxQeE6O3-lvIVi
864
870
  tests/models/hestia/test_histosol.py,sha256=7g-3wQPZok2O8mExcnKZxO_T2Ye_h3UHv3HG3Kn8orM,888
865
871
  tests/models/hestia/test_inorganicFertiliser.py,sha256=v2Zs1Ig-ChOaq9gXuurcBt12izkH2bRUUuzW6rh3rqQ,643
866
872
  tests/models/hestia/test_irrigatedTypeUnspecified.py,sha256=bluZADFagxfXW4QyI0CIJzG97D2V33w333Z9Vwjqo0M,2015
867
- tests/models/hestia/test_landCover.py,sha256=YM7iH4FYKdJ_GBKKKr2ZR4v3s-vqFv4tiTHjHdaqNMQ,10216
873
+ tests/models/hestia/test_landCover.py,sha256=D72asF018FkZfvivbsYsKyWmTrBK85QYupHS11jFVis,11410
868
874
  tests/models/hestia/test_landOccupationDuringCycle.py,sha256=pJmLUrC1CDFFhVE-00jz_eNF6XL9o71IC_w-lM3-vTA,2254
869
875
  tests/models/hestia/test_landTransformation100YearAverageDuringCycle.py,sha256=3qa4rWUFqP1VM5-vm_182rhiBYJDxPqJwWtBqJ5K028,956
870
876
  tests/models/hestia/test_landTransformation20YearAverageDuringCycle.py,sha256=bUByojQuVeuCfko1_2YtNJi1PT9yktHlcbPi_p-MPvk,1001
@@ -902,7 +908,7 @@ tests/models/hestia/test_temperatureMonthly.py,sha256=3fuyr-bBmRAb8f9LRJg9W02Dcg
902
908
  tests/models/hestia/test_totalNitrogenPerKgSoil.py,sha256=vecubyhWVSjwTASZZc3dGLk64AwMtirTNlOe7eXybL8,1163
903
909
  tests/models/hestia/test_unknownPreSeasonWaterRegime.py,sha256=ZilBXNREiinmub5LG4sdigVPIva4hMDuNl5MyUDo-Q8,1221
904
910
  tests/models/hestia/test_waterDepth.py,sha256=LR56IBuXYmO1RMkRc__Wbr4McfGgzioWQm15-Tnramw,1121
905
- tests/models/hestia/test_waterSalinity.py,sha256=6BSjLyhsLcQxFXiC_Gc4ryB0dlbNjYy2rtJKiNfShRY,869
911
+ tests/models/hestia/test_waterSalinity.py,sha256=SDpWeEvj0FnM_6CQINFz0fHrruxnC9Xm6cxCnpeWgR8,1310
906
912
  tests/models/impact_assessment/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
907
913
  tests/models/impact_assessment/test_allocationMethod.py,sha256=HkUt6oWdEyFSdxMpx8y_Oxk0nO2Fi9B_kUZcVte9tzg,1223
908
914
  tests/models/impact_assessment/test_emissions.py,sha256=nygoe5JeuQ1rbMQSqAr8oBSm6jC4ygZb2XNHyEx85lo,990
@@ -948,12 +954,13 @@ tests/models/ipcc2019/test_ch4ToAirEntericFermentation.py,sha256=nmmxxJFX_VFOgvN
948
954
  tests/models/ipcc2019/test_ch4ToAirExcreta.py,sha256=e58NXmBW2SNVLUqQO9A66Xq6jiGTyhdFZDZk51JApF8,2902
949
955
  tests/models/ipcc2019/test_ch4ToAirFloodedRice.py,sha256=YRyxNaGPAgsCJBRXhwhEsZ6r44dawHMSN-Qmi-yS0xI,1025
950
956
  tests/models/ipcc2019/test_ch4ToAirOrganicSoilCultivation.py,sha256=7AzKbCrNa3C2miC98ALCtlkIBMV12cOTSIvxxHjLSgw,1759
951
- tests/models/ipcc2019/test_co2ToAirAboveGroundBiomassStockChange.py,sha256=1lei99xqneCU3a_2fOTcnAmRKKN6_mYU7uOyfLhXqJ4,4546
952
- tests/models/ipcc2019/test_co2ToAirBelowGroundBiomassStockChange.py,sha256=ZoxBDNmNXutv5MUfKzoASCeBTEavjRC75ZSI0irWSG0,4481
957
+ tests/models/ipcc2019/test_co2ToAirAboveGroundBiomassStockChange.py,sha256=FUGI1_KoXqmP_24AZGWyG_GQDtyA80Ll5aDjML0QQTY,4369
958
+ tests/models/ipcc2019/test_co2ToAirBelowGroundBiomassStockChange.py,sha256=WOzi2DtIDlE_xVu8TLjiPKXKR_7QbpfON9oBsSw860Q,4304
959
+ tests/models/ipcc2019/test_co2ToAirBiocharStockChange.py,sha256=8k8Z9icwEZex-UcwGtdvcGp97NIOmMx5dpk728QYy1A,2731
953
960
  tests/models/ipcc2019/test_co2ToAirCarbonStockChange_utils.py,sha256=wCEtrbMl6zef8V-n_Ci_rtlQAlfuKm3khUVltr8eAcc,2173
954
961
  tests/models/ipcc2019/test_co2ToAirLimeHydrolysis.py,sha256=r7QmCH0YURS41JZxH2mFAC0J29WqmdkKG9EoEgv27AA,1350
955
962
  tests/models/ipcc2019/test_co2ToAirOrganicSoilCultivation.py,sha256=w4MBn2bYwyiv001xEU2RI9Q8L2Eu9lFC0CoxBcOzkWU,1761
956
- tests/models/ipcc2019/test_co2ToAirSoilOrganicCarbonStockChange.py,sha256=gPT_yyQBRoISSizW-7qE32VEeFXxsc55K3-3eZMJlOU,5688
963
+ tests/models/ipcc2019/test_co2ToAirSoilOrganicCarbonStockChange.py,sha256=UmKJPWVyHXZhpFrh-Rl20ypGSKrTup4A1vmiwT0w31E,5511
957
964
  tests/models/ipcc2019/test_co2ToAirUreaHydrolysis.py,sha256=2u4_jtekmVzLTwKpNr1fVcAzgegm17Fh9h59JRXFpOM,1030
958
965
  tests/models/ipcc2019/test_croppingDuration.py,sha256=1oRW1QaEwQvBadyVhaDi-jlkjuNqodyAinl88TdPmiY,1879
959
966
  tests/models/ipcc2019/test_ligninContent.py,sha256=eIKEN__ab-0R52EhlhPSBiHnmTl6xOf1XbI33O-W9A4,4146
@@ -1108,7 +1115,7 @@ tests/models/pooreNemecek2018/test_ch4ToAirAquacultureSystems.py,sha256=p_n0NZim
1108
1115
  tests/models/pooreNemecek2018/test_excretaKgN.py,sha256=HExbvxYBDumOg0u6wkXZ9F_2rW0vxgsTDaEp9lj6Nos,4054
1109
1116
  tests/models/pooreNemecek2018/test_excretaKgVs.py,sha256=VQCfF6y7oPQAQ7DgwPHWoeFcgVSuLzhU2G0VgEfECOo,3252
1110
1117
  tests/models/pooreNemecek2018/test_freshwaterWithdrawalsDuringCycle.py,sha256=TQEYds8imjMNHqjApn0MIMuPbx5HtZtVABb_Ds5T7ZY,2044
1111
- tests/models/pooreNemecek2018/test_landOccupationDuringCycle.py,sha256=R8tiV9FtpvwDNcxt4zs1RUDDLNKRjGHS1fS9ZJKZYgA,1986
1118
+ tests/models/pooreNemecek2018/test_landOccupationDuringCycle.py,sha256=-sji2CbHeZ9lHACVizGPFNK_wZr2A_NmGt_r9_gbz9k,2037
1112
1119
  tests/models/pooreNemecek2018/test_longFallowDuration.py,sha256=kelZajIbKyvVm1vX_grRZy0IUrtejGI5GPn03qbElnw,925
1113
1120
  tests/models/pooreNemecek2018/test_n2OToAirAquacultureSystemsDirect.py,sha256=Dvgnk1tOxJteXzULyDr0dVbqkYe_TYnjGJcAK2kZujk,1977
1114
1121
  tests/models/pooreNemecek2018/test_n2ToAirAquacultureSystems.py,sha256=h2x3_9d2ZzFpjnE3LcZUqCzO6SsiT5iPHYmI-F61AnY,1970
@@ -1273,14 +1280,14 @@ tests/orchestrator/strategies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
1273
1280
  tests/orchestrator/strategies/merge/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
1274
1281
  tests/orchestrator/strategies/merge/test_merge_append.py,sha256=T6_y3qDb4ZmZixzSZMNCYD-dbkIHFfvpayXo1K9-lNA,800
1275
1282
  tests/orchestrator/strategies/merge/test_merge_default.py,sha256=iEia74Z7RflmxDZ3XzubN9yR8n5DR_CDSMyLIW1e8PU,198
1276
- tests/orchestrator/strategies/merge/test_merge_list.py,sha256=xq41t83ylTC1lUEgYPcKohisyYABWH_Nh1Rwa2vLHgQ,9727
1283
+ tests/orchestrator/strategies/merge/test_merge_list.py,sha256=ANt7EZotwkm4dxaCRvrVUZnAo2T3Xk5zEfbDkA3nQVc,9855
1277
1284
  tests/orchestrator/strategies/merge/test_merge_node.py,sha256=yCaIKFFdJcIANidQBJb95f50OPgm9wwTsuTEzhHumA0,3203
1278
1285
  tests/orchestrator/strategies/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
1279
1286
  tests/orchestrator/strategies/run/test_add_blank_node_if_missing.py,sha256=K4xg4UAXfNhSaLyknKVPO7MGBF44Z_gD7CuZ_pe28gU,3512
1280
1287
  tests/orchestrator/strategies/run/test_add_key_if_missing.py,sha256=hKwvk1ohcBVnQUCTiDhRW99J0xEa29BpwFi1KC0yWLE,329
1281
1288
  tests/orchestrator/strategies/run/test_always.py,sha256=w5-Dhp6yLzgZGAeMRz3OrqZbbAed9gZ1O266a3z9k7w,134
1282
- hestia_earth_models-0.74.4.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
1283
- hestia_earth_models-0.74.4.dist-info/METADATA,sha256=u58F9YX_7d58HTQ6IVVLLIlpn2Cgtdm4Pjjg5-C2uew,4075
1284
- hestia_earth_models-0.74.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
1285
- hestia_earth_models-0.74.4.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
1286
- hestia_earth_models-0.74.4.dist-info/RECORD,,
1289
+ hestia_earth_models-0.74.5.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
1290
+ hestia_earth_models-0.74.5.dist-info/METADATA,sha256=7JSVI3aieeaAATUOsKCFJUyxj9Suv4GkM8Cy0A88FaE,4037
1291
+ hestia_earth_models-0.74.5.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
1292
+ hestia_earth_models-0.74.5.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
1293
+ hestia_earth_models-0.74.5.dist-info/RECORD,,
@@ -1,7 +1,7 @@
1
- from unittest.mock import patch
2
1
  import json
2
+ from unittest.mock import patch
3
3
 
4
- from tests.utils import fake_aggregated_search, fixtures_path
4
+ from tests.utils import fake_closest_impact_id, fixtures_path
5
5
  from hestia_earth.models.cycle.animal.input.hestiaAggregatedData import MODEL_ID, run, _should_run_animal
6
6
 
7
7
  class_path = f"hestia_earth.models.cycle.animal.input.{MODEL_ID}"
@@ -28,7 +28,7 @@ def test_should_run():
28
28
  assert should_run is True
29
29
 
30
30
 
31
- @patch('hestia_earth.models.utils.aggregated.search', side_effect=fake_aggregated_search)
31
+ @patch('hestia_earth.models.utils.aggregated.find_closest_impact_id', side_effect=fake_closest_impact_id)
32
32
  def test_run(*args):
33
33
  with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
34
34
  cycle = json.load(f)
@@ -1,25 +1,19 @@
1
- from unittest.mock import patch
1
+ import os
2
2
  import json
3
-
3
+ from unittest.mock import patch
4
4
  from hestia_earth.schema import TermTermType
5
5
 
6
- from tests.utils import fake_download, fake_aggregated_search, fixtures_path
6
+ from tests.utils import fake_closest_impact_id, fixtures_path
7
7
  from hestia_earth.models.cycle.input.hestiaAggregatedData import MODEL_ID, run, _should_run, _should_run_seed
8
8
 
9
9
  class_path = f"hestia_earth.models.cycle.input.{MODEL_ID}"
10
- fixtures_folder = f"{fixtures_path}/cycle/input/{MODEL_ID}"
10
+ fixtures_folder = os.path.join(fixtures_path, 'cycle', 'input', MODEL_ID)
11
11
 
12
12
  GENERIC_CROP = {'@id': 'genericCropSeed', 'name': 'Generic crop, seed'}
13
13
 
14
14
 
15
- def fake_search_generic(query, **args):
16
- match_name = query['bool']['must'][3]['bool']['should'][0]['match']['product.term.name.keyword']
17
- return [{
18
- "@id": "genericCropSeed-world-2000-2009",
19
- "@type": "ImpactAssessment",
20
- "name": "Generic crop, seed, World, 2000-2009",
21
- "endDate": "2009"
22
- }] if match_name == GENERIC_CROP['name'] else []
15
+ def _fake_generic_closest_impact_id(product_id: str, **kwargs):
16
+ return 'genericCropSeed-world-2000-2009' if product_id == GENERIC_CROP['@id'] else None
23
17
 
24
18
 
25
19
  def test_should_run():
@@ -58,9 +52,8 @@ def test_should_run_seed(mock_primary_product, *args):
58
52
  assert should_run is True
59
53
 
60
54
 
61
- @patch(f"{class_path}.download_term", side_effect=fake_download)
62
55
  @patch(f"{class_path}.get_generic_crop", return_value=GENERIC_CROP)
63
- @patch('hestia_earth.models.utils.aggregated.search', side_effect=fake_aggregated_search)
56
+ @patch('hestia_earth.models.utils.aggregated.find_closest_impact_id', side_effect=fake_closest_impact_id)
64
57
  def test_run(*args):
65
58
  with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
66
59
  cycle = json.load(f)
@@ -72,9 +65,8 @@ def test_run(*args):
72
65
  assert result == expected
73
66
 
74
67
 
75
- @patch(f"{class_path}.download_term", side_effect=fake_download)
76
68
  @patch(f"{class_path}.get_generic_crop", return_value=GENERIC_CROP)
77
- @patch('hestia_earth.models.utils.aggregated.search', side_effect=fake_aggregated_search)
69
+ @patch(f"{class_path}.find_closest_impact_id", side_effect=fake_closest_impact_id)
78
70
  def test_run_seed(*args):
79
71
  with open(f"{fixtures_folder}/seed/cycle.jsonld", encoding='utf-8') as f:
80
72
  cycle = json.load(f)
@@ -86,9 +78,8 @@ def test_run_seed(*args):
86
78
  assert result == expected
87
79
 
88
80
 
89
- @patch(f"{class_path}.download_term", side_effect=fake_download)
90
81
  @patch(f"{class_path}.get_generic_crop", return_value=GENERIC_CROP)
91
- @patch('hestia_earth.models.utils.aggregated.search', side_effect=fake_search_generic)
82
+ @patch(f"{class_path}.find_closest_impact_id", side_effect=_fake_generic_closest_impact_id)
92
83
  def test_run_seed_generic(*args):
93
84
  with open(f"{fixtures_folder}/seed-generic/cycle.jsonld", encoding='utf-8') as f:
94
85
  cycle = json.load(f)
File without changes
@@ -0,0 +1,32 @@
1
+ from unittest.mock import patch
2
+ import pytest
3
+
4
+ from hestia_earth.models.data.hestiaAggregatedData import find_closest_impact_id
5
+
6
+ class_path = 'hestia_earth.models.data.hestiaAggregatedData'
7
+
8
+ product_id = 'productId'
9
+ country_id = 'countryId'
10
+ fake_data = {
11
+ product_id: {
12
+ country_id: {
13
+ '2025': 'id-2025',
14
+ '2009': 'id-2009',
15
+ '1990': 'id-1990'
16
+ }
17
+ }
18
+ }
19
+
20
+
21
+ @pytest.mark.parametrize(
22
+ 'year,expected',
23
+ [
24
+ (2030, 'id-2025'),
25
+ (2019, 'id-2009'),
26
+ (2001, 'id-1990'),
27
+ (1969, None),
28
+ ]
29
+ )
30
+ @patch(f"{class_path}._get_data", return_value=fake_data)
31
+ def test_find_closest_impact_id(mock_get_data, year: int, expected):
32
+ assert find_closest_impact_id(product_id, country_id, year) == expected, year
@@ -5,8 +5,10 @@ import pytest
5
5
  from unittest.mock import patch
6
6
 
7
7
  from hestia_earth.models.hestia.utils import (
8
- FOREST_LAND, PERMANENT_PASTURE, PERMANENT_CROPLAND, ANNUAL_CROPLAND, OTHER_LAND
8
+ FOREST_LAND, PERMANENT_PASTURE, PERMANENT_CROPLAND, ANNUAL_CROPLAND, OTHER_LAND, TOTAL_CROPLAND,
9
+ TOTAL_AGRICULTURAL_CHANGE
9
10
  )
11
+ from hestia_earth.models.log import log_as_table
10
12
  from tests.utils import fixtures_path, fake_new_management
11
13
  from hestia_earth.models.faostat2018.utils import MODEL as FAOSTAT_MODEL
12
14
  from hestia_earth.models.hestia.landCover import (
@@ -273,6 +275,35 @@ def test_get_ratio_between_land_use_types():
273
275
  assert result == (3800.0, 57.417)
274
276
 
275
277
 
278
+ @patch(f"{CLASS_PATH}.logShouldRun")
279
+ @patch(f"{CLASS_PATH}.logRequirements")
280
+ @patch(f"{CLASS_PATH}._get_changes")
281
+ @patch(f"{CLASS_PATH}._new_management", side_effect=fake_new_management)
282
+ def test_run_missing_changes_logs(mock_new_mgt, mock_get_changes, mock_logRequirements, mock_logShouldRun):
283
+ fake_changes = {
284
+ FOREST_LAND: 0, ANNUAL_CROPLAND: 10, PERMANENT_CROPLAND: 20, PERMANENT_PASTURE: 70, OTHER_LAND: 0,
285
+ TOTAL_CROPLAND: 30, TOTAL_AGRICULTURAL_CHANGE: 100
286
+ }
287
+ mock_get_changes.return_value = (fake_changes, ["Forest land"])
288
+ folder = f"{fixtures_folder}/malaysia"
289
+ with open(f"{folder}/site.jsonld", encoding='utf-8') as f:
290
+ site = json.load(f)
291
+
292
+ _ = run(site)
293
+ mock_logRequirements.assert_any_call(
294
+ log_node=site,
295
+ model=MODEL,
296
+ term="forest",
297
+ model_key=MODEL_KEY,
298
+ land_use_type=PERMANENT_CROPLAND,
299
+ country_id="GADM-MYS",
300
+ changes=log_as_table(fake_changes),
301
+ missing_changes=FOREST_LAND
302
+ )
303
+
304
+ mock_logShouldRun.assert_any_call(site, MODEL, "forest", False, model_key=MODEL_KEY)
305
+
306
+
276
307
  @pytest.mark.parametrize("subfolder", _folders)
277
308
  @patch(f"{CLASS_PATH}._new_management", side_effect=fake_new_management)
278
309
  def test_run(mock, subfolder: str):
@@ -10,16 +10,28 @@ fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
10
10
 
11
11
  @patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)
12
12
  @patch(f"{class_path}.related_cycles")
13
- def test_run(mock_related_cycles: Mock, *args):
14
- with open(f"{fixtures_folder}/site.jsonld", encoding='utf-8') as f:
13
+ def test_run_from_products(mock_related_cycles: Mock, *args):
14
+ with open(f"{fixtures_folder}/products/site.jsonld", encoding='utf-8') as f:
15
15
  site = json.load(f)
16
16
 
17
- with open(f"{fixtures_folder}/cycles.jsonld", encoding='utf-8') as f:
17
+ with open(f"{fixtures_folder}/products/cycles.jsonld", encoding='utf-8') as f:
18
18
  cycles = json.load(f)
19
19
 
20
20
  mock_related_cycles.return_value = cycles
21
21
 
22
- with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
22
+ with open(f"{fixtures_folder}/products/result.jsonld", encoding='utf-8') as f:
23
+ expected = json.load(f)
24
+
25
+ value = run(site)
26
+ assert value == expected
27
+
28
+
29
+ @patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)
30
+ def test_run_from_measurement(*args):
31
+ with open(f"{fixtures_folder}/measurements/site.jsonld", encoding='utf-8') as f:
32
+ site = json.load(f)
33
+
34
+ with open(f"{fixtures_folder}/measurements/result.jsonld", encoding='utf-8') as f:
23
35
  expected = json.load(f)
24
36
 
25
37
  value = run(site)
@@ -63,13 +63,11 @@ RUN_IDS = [f"{param[0]}, cycle{param[2]}" for param in RUN_PARAMS]
63
63
  @mark.parametrize("subfolder, num_cycles, cycle_index", RUN_PARAMS, ids=RUN_IDS)
64
64
  @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
65
65
  @patch(f"{utils_path}.related_cycles")
66
- @patch(f"{utils_path}._get_site")
67
66
  @patch(f"{biomass_utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
68
67
  @patch(f"{term_path}.search")
69
68
  def test_run(
70
69
  search_mock: MagicMock,
71
70
  get_cover_crop_property_terms_mock: MagicMock,
72
- get_site_mock: MagicMock,
73
71
  related_cycles_mock: MagicMock,
74
72
  _new_emission_mock: MagicMock,
75
73
  subfolder: str,
@@ -87,7 +85,7 @@ def test_run(
87
85
  _load_fixture(f"{fixtures_folder}/{subfolder}/cycle{i}.jsonld") for i in range(num_cycles)
88
86
  ]
89
87
 
90
- get_site_mock.return_value = site
88
+ cycle["site"] = site
91
89
  related_cycles_mock.return_value = cycles
92
90
 
93
91
  result = run(cycle)
@@ -99,13 +97,11 @@ def test_run(
99
97
 
100
98
  @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
101
99
  @patch(f"{utils_path}.related_cycles")
102
- @patch(f"{utils_path}._get_site")
103
100
  @patch(f"{biomass_utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
104
101
  @patch(f"{term_path}.search")
105
102
  def test_run_empty(
106
103
  search_mock: MagicMock,
107
104
  get_cover_crop_property_terms_mock: MagicMock,
108
- get_site_mock: MagicMock,
109
105
  related_cycles_mock: MagicMock,
110
106
  _new_emission_mock: MagicMock
111
107
  ):
@@ -115,7 +111,6 @@ def test_run_empty(
115
111
  CYCLE = {}
116
112
  EXPECTED = []
117
113
 
118
- get_site_mock.return_value = {}
119
114
  related_cycles_mock.return_value = [CYCLE]
120
115
 
121
116
  result = run(CYCLE)