hestia-earth-models 0.74.15__py3-none-any.whl → 0.74.17__py3-none-any.whl

hestia_earth/models/utils/property.py

@@ -1,3 +1,4 @@
+from functools import lru_cache
 from hestia_earth.schema import SchemaType, TermTermType
 from hestia_earth.utils.lookup import download_lookup, extract_grouped_data, get_table_value, column_name
 from hestia_earth.utils.model import find_term_match, linked_node
@@ -99,11 +100,10 @@ def node_has_property(term_id: str):
     return lambda product: find_term_match(product.get('properties', []), term_id, None) is not None
 
 
-def node_property_lookup_value(model: str, node_term: dict, prop_id: str, default=None, **log_args):
-    # as the lookup table might not exist, we are making sure we return `0` in thise case
+@lru_cache()
+def node_property_lookup_value(model: str, term_id: str, term_type: str, prop_id: str, default=None, **log_args):
     try:
-        lookup_name = f"{node_term.get('termType')}-property.csv"
-        term_id = node_term.get('@id')
+        lookup_name = f"{term_type}-property.csv"
         lookup_value = get_table_value(download_lookup(lookup_name), 'termid', term_id, column_name(prop_id))
         value = extract_grouped_data(lookup_value, 'Avg') if (
             isinstance(lookup_value, str) and 'Avg' in lookup_value
@@ -111,16 +111,18 @@ def node_property_lookup_value(model: str, node_term: dict, prop_id: str, defaul
         debugMissingLookup(lookup_name, 'termid', term_id, prop_id, value, model=model, **log_args)
         return safe_parse_float(value, default=None)
     except Exception:
-        return default
+        value = get_lookup_value({'@id': term_id, 'termType': term_type}, prop_id, skip_debug=True)
+        return default if value is None else value
 
 
 def get_node_property_value(model: str, node: dict, prop_id: str, default=None, handle_percents=True, **log_args):
     prop = get_node_property(node, prop_id, download_from_hestia=True)
     term = prop.get('term')
+    node_term = node.get('term', {})
     units = (term or {}).get('units')
     value = (
         prop['value'] if 'value' in prop else
-        node_property_lookup_value(model, node.get('term', {}), prop_id, **log_args)
+        node_property_lookup_value(model, node_term.get('@id'), node_term.get('termType'), prop_id, **log_args)
     )
     return default if value is None else (value / 100 if units == '%' and handle_percents else value)
 

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.74.15'
+VERSION = '0.74.17'

{hestia_earth_models-0.74.15.dist-info → hestia_earth_models-0.74.17.dist-info}/METADATA

@@ -1,12 +1,11 @@
-Metadata-Version: 2.1
-Name: hestia-earth-models
-Version: 0.74.15
+Metadata-Version: 2.4
+Name: hestia_earth_models
+Version: 0.74.17
 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
 Author-email: guillaumeroyer.mail@gmail.com
 License: MIT
-Platform: UNKNOWN
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Programming Language :: Python :: 3.6
 Description-Content-Type: text/markdown
@@ -19,6 +18,17 @@ Requires-Dist: pydash
 Requires-Dist: area
 Provides-Extra: spatial
 Requires-Dist: hestia-earth-earth-engine>=0.5.0; extra == "spatial"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 # HESTIA Engine Models
 
@@ -94,5 +104,3 @@ ecoinvent is a consistent, transparent, and well validated life cycle inventory
 We use ecoinvent data to ascertain the environmental impacts of activities that occur outside of our system boundary, for example data on the environmental impacts of extracting oil and producing diesel, or the impacts of manufacturing plastics.
 
 The `ecoinventV3` model requires a valid [license](https://ecoinvent.org/offerings/licences/) to run. We are currently working on a way to enable users of this code with a valid ecoinvent licence to run these models themselves, but for now, these models are only available on the public platform.
-
-

{hestia_earth_models-0.74.15.dist-info → hestia_earth_models-0.74.17.dist-info}/RECORD

@@ -1,11 +1,11 @@
 hestia_earth/__init__.py,sha256=G-d438vPx7m_ks5e9XTtM3u7LDRO5dSSukibukWmyPM,56
 hestia_earth/models/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3hk,76
-hestia_earth/models/cache_nodes.py,sha256=CqcTkvT0SQw-MKExUJgM3wDRt2sgdxgVYb6ylNnfC4I,5423
+hestia_earth/models/cache_nodes.py,sha256=wJj3IrxGlZ1Ro7mWZe3ad5yeWzBtroJoaKuvK2FFTrw,5449
 hestia_earth/models/cache_sites.py,sha256=0TK08ewVobQkXQ-qph_uB_mfoOhEqcPr4KKwlPWgUKs,6439
-hestia_earth/models/log.py,sha256=CGQw2VGbGzVw0ezjlzejTFFUpaHvTED2meLFDW589eo,6362
+hestia_earth/models/log.py,sha256=8rZGVAztD5Cy-w9MJWVN7U3pKyxuYHTYnrtn_LmGebI,6524
 hestia_earth/models/preload_requests.py,sha256=-eb4TA4m-A4bLcdAwbKqr3TIsDteVSXhJGCp95mQCew,2504
 hestia_earth/models/requirements.py,sha256=eU4yT443fx7BnaokhrLB_PCizJI7Y6m4auyo8vQauNg,17363
-hestia_earth/models/version.py,sha256=vO9Eir4oHyHd47pkxODdM0pYKudLMviS6FXpd_kDsSI,20
+hestia_earth/models/version.py,sha256=n9M5qoRbC1ljXdVuxsbtDxipj4mxNKYZTh_Uz-hBdFk,20
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=FraWAl06a8OSqbAiHYYLv9e4fYZkVw42S9wikfjeTdw,4377
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=qRkDqpEt3WwleMfHdxMi2nezLmCAxa1TlJZ0IPHDTtI,2584
@@ -38,7 +38,7 @@ hestia_earth/models/cml2001NonBaseline/__init__.py,sha256=vI8wp8Og_e8DiJqYYvp33Y
 hestia_earth/models/cml2001NonBaseline/eutrophicationPotentialIncludingFateAverageEurope.py,sha256=i6zOr4KAe0FYBEnT9M7Aj1bQqtNqVYDZKYOJ4LLhHlE,972
 hestia_earth/models/cml2001NonBaseline/terrestrialAcidificationPotentialExcludingFate.py,sha256=JAzphWh_hY437frP0WLobRjnysMsESNcCaNthvCnGd8,966
 hestia_earth/models/config/Cycle.json,sha256=3QSThmSDNw0dDREXKnHnxyi1Jb8yCMprTmdjI2HcSlI,61355
-hestia_earth/models/config/ImpactAssessment.json,sha256=X_CgEB1m8M4uEubhvcgQSovwMwuwSSTFWfkTXM6tChU,61069
+hestia_earth/models/config/ImpactAssessment.json,sha256=0t8zv-zZXMwhYqjLhSgXPrIBu1KbEWskvW2Mrtn2EXk,60405
 hestia_earth/models/config/Site.json,sha256=ygHgsrrBHKlj7gY7p_9lGXOGPNFWjZnfnnCHkeLhdOM,14992
 hestia_earth/models/config/__init__.py,sha256=7ZqOGd4dO2Stonte6fbktVZqbY7vp8Ls_LifgofCu8I,3009
 hestia_earth/models/config/run-calculations.json,sha256=e3nJ4M6CP1iFzfv8ou_ZUFbFxYkDxJgwuNDXTm4PBDc,615
@@ -68,7 +68,7 @@ hestia_earth/models/cycle/completeness/cropResidue.py,sha256=7SNfYvP4erJ2keem3DH
 hestia_earth/models/cycle/completeness/electricityFuel.py,sha256=ZXljdjAxYgu75GdHioYjNYTgF97LClEP_1g3hFcvJYU,1927
 hestia_earth/models/cycle/completeness/excreta.py,sha256=wgrinfKnsXMG4I01g0iyFIpz2Ir-T69YB00pgrM_zvY,821
 hestia_earth/models/cycle/completeness/freshForage.py,sha256=4gKLpZN_WxYU9W6VNpRshSu5oJktBVzbU_7XPhUKByY,2224
-hestia_earth/models/cycle/completeness/material.py,sha256=cF33MJkVBUnoicmecdsR78Snrv1Zng097aUeEfYDfdc,1185
+hestia_earth/models/cycle/completeness/material.py,sha256=_O_gZavBa3P_6HSVQpvZKHkQ-zeNxOTxjUh_DN5LJNQ,1096
 hestia_earth/models/cycle/completeness/seed.py,sha256=vufXOV-KZ860U5DdoTno1WTuM3AK5-ecCUkeKDMiFyE,1775
 hestia_earth/models/cycle/completeness/soilAmendment.py,sha256=RQPq1Y5VWJbz50tKFtcW54DdQ1YT48mQOteidW8sFcQ,1226
 hestia_earth/models/cycle/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -242,7 +242,7 @@ hestia_earth/models/hestia/residueBurnt.py,sha256=2r53JRfR-im2rfxs9hRKEG4qyNSGxH
 hestia_earth/models/hestia/residueIncorporated.py,sha256=3Y3l5aiA040YqRpeRE6ljCYSehsp5x7gUYSgj5XyeJk,2679
 hestia_earth/models/hestia/residueLeftOnField.py,sha256=YKTb_FLcBfHGvnjBf7IC6XvIR4Zum3mnXLMdUWIasTw,2091
 hestia_earth/models/hestia/residueRemoved.py,sha256=zCGIfdC1DE51rkvK5uUSYxw6jTWI9ahEsrbFRTabIq8,4933
-hestia_earth/models/hestia/resourceUse_utils.py,sha256=ctjeJBu2AJ2WJ9ZlFPFBcnmMiyygmz6PSZCX6vV0s3Q,6153
+hestia_earth/models/hestia/resourceUse_utils.py,sha256=fWdK9EnXy3kTHEG1rR7rUk6VyWhNJo4yUztpVShp-qk,7036
 hestia_earth/models/hestia/salineWater.py,sha256=6P0L24tD0-r4VoFt0Uh8djiMgtivGAePXmHlT0zJPUI,1266
 hestia_earth/models/hestia/seed_emissions.py,sha256=UbWTnfI76FRX9XSno09bxVSBKxKkuMv6zU7xEyVpVWk,12454
 hestia_earth/models/hestia/slope.py,sha256=2LdcRvRecUkwmlGVqWBQIeaYfRMvsSWKfS9hWvV_DbU,1160
@@ -304,19 +304,20 @@ hestia_earth/models/ipcc2019/belowGroundBiomass.py,sha256=NOp8WaX1NJk0TawwJRGzdr
 hestia_earth/models/ipcc2019/belowGroundCropResidue.py,sha256=M9--7akmPWo7gfxEYnKobsJ0HyDzfAzRxLmrCt3Pg1Y,3505
 hestia_earth/models/ipcc2019/biocharOrganicCarbonPerHa.py,sha256=1N4dsiRY_pyLvPcq3g8uBiAiVwSScLFocS9FFBxRW1s,12580
 hestia_earth/models/ipcc2019/biomass_utils.py,sha256=NkTPGMl-0tqvhUZKZ1rxW0XTBnZOvgFJki_IPzEEyu0,15796
+hestia_earth/models/ipcc2019/burning_utils.py,sha256=uq3ndASMuyMjDZLCqIcIRo2gHZnh0yi01HnLWhleaTA,1822
 hestia_earth/models/ipcc2019/carbonContent.py,sha256=XhXDu6DRQxANBsRsCEgw4f0UJDOgWsvhVyEwK1-4YT0,7263
 hestia_earth/models/ipcc2019/ch4ToAirAquacultureSystems.py,sha256=n1hG-p67BTXkJATvX1em6255WY0mJxk7SojzBwebtnQ,3385
 hestia_earth/models/ipcc2019/ch4ToAirEntericFermentation.py,sha256=piSmwF1G5mYO32_WWncq_k5PaJ0EWrYguVEl_vns6-Q,12167
 hestia_earth/models/ipcc2019/ch4ToAirExcreta.py,sha256=5Ujxec6f5lFZaPbKRcg7XMUBmyYeWcMdaR3ZQ6iStrQ,6489
 hestia_earth/models/ipcc2019/ch4ToAirFloodedRice.py,sha256=3173-WEI_4TpvPdl55VNpmXANPoM92o8hTqcGidj7ds,9979
 hestia_earth/models/ipcc2019/ch4ToAirOrganicSoilCultivation.py,sha256=0NX2SGFVXcT2bi-icSc-AiscLI2QqgVsOmWV05nOHpM,9552
-hestia_earth/models/ipcc2019/co2ToAirAboveGroundBiomassStockChange.py,sha256=HaqqfVT19OTp943QpPkdxv6R8eDSYmEddHq9J2fN6b0,4570
-hestia_earth/models/ipcc2019/co2ToAirBelowGroundBiomassStockChange.py,sha256=4kQ0jAnvr1tNS12_FCJpD3K5f9SCkMheNheXu2evaKE,4094
-hestia_earth/models/ipcc2019/co2ToAirBiocharStockChange.py,sha256=ngZcV_0Gyowccx5PXhYF56Q7YyxcvmfOjgXkU-Odyyw,3762
-hestia_earth/models/ipcc2019/co2ToAirCarbonStockChange_utils.py,sha256=Y9l9DZs9xsojplhFMLWdwNsvnzyMKijX_Y7fvFn3vwA,60998
+hestia_earth/models/ipcc2019/co2ToAirAboveGroundBiomassStockChange.py,sha256=bt9JoG68MBg-u4tw_H7UdpOKj6MMz4QWLEa3ooerghw,4174
+hestia_earth/models/ipcc2019/co2ToAirBelowGroundBiomassStockChange.py,sha256=DmvEDPjZeDv8ikby7vPGHVH-T_099-XbiNq-zHPX_1U,3699
+hestia_earth/models/ipcc2019/co2ToAirBiocharStockChange.py,sha256=khkNR2Z5aFNiF098YLSqr0yQdVlXVXX2_ZagmCzB9PA,3509
+hestia_earth/models/ipcc2019/co2ToAirCarbonStockChange_utils.py,sha256=TtE72p3TYsPYV1cdUCNO1gDK2y94JZG8Ra_wnNWTRt8,63246
 hestia_earth/models/ipcc2019/co2ToAirLimeHydrolysis.py,sha256=5ciisz0wFbjlwfshDzMlvRIjvw_E8NsphX0IulzVD3A,2479
 hestia_earth/models/ipcc2019/co2ToAirOrganicSoilCultivation.py,sha256=MZGAlJEGs7DiiFw40tGzx-e8ZMze7sgC-R2X-FZl3aE,7613
-hestia_earth/models/ipcc2019/co2ToAirSoilOrganicCarbonStockChange.py,sha256=Ti1koM7k_fV7iWklSFngYaBpAERf3yOaUM5BTbWmDxs,4106
+hestia_earth/models/ipcc2019/co2ToAirSoilOrganicCarbonStockChange.py,sha256=CmKMmW0O6pDcg-uCUIhLXm2xf3c2AktxGS6Cl939xpY,3712
 hestia_earth/models/ipcc2019/co2ToAirUreaHydrolysis.py,sha256=IInWDQCfMQWd6rXDRZnLMQlaQGghVQJcwFSGtRMdkzo,3871
 hestia_earth/models/ipcc2019/croppingDuration.py,sha256=AEOnzVc8mbx0kHpm5BIEiXr1zP0IDUl9qKktNlgURnk,3080
 hestia_earth/models/ipcc2019/ligninContent.py,sha256=nAhwrl0b3pbGQnAycEESAzakdpXajONTnbhNwgPR7nw,7293
@@ -344,7 +345,7 @@ hestia_earth/models/ipcc2019/no3ToGroundwaterCropResidueDecomposition.py,sha256=
 hestia_earth/models/ipcc2019/no3ToGroundwaterExcreta.py,sha256=BV7kdeGlDbSQASBtYZuLNTQktrteaMWGJzIbG97flH0,4319
 hestia_earth/models/ipcc2019/no3ToGroundwaterInorganicFertiliser.py,sha256=zww-PDlLdz3XbrlXfW7F8nWzP3Iud1uLW-mRo8HZf2o,3250
 hestia_earth/models/ipcc2019/no3ToGroundwaterOrganicFertiliser.py,sha256=AHCYaj_al-cLFtvWHhxZLlrZfpjIyWg2rKR435qqGxM,3184
-hestia_earth/models/ipcc2019/nonCo2EmissionsToAirNaturalVegetationBurning.py,sha256=MSg_43Pybi5Tf2RVlSv_2pCBk2RSV6PiwoYlEm2Z0Hg,33455
+hestia_earth/models/ipcc2019/nonCo2EmissionsToAirNaturalVegetationBurning.py,sha256=SFBZqhczOKsEQEm-xURnFwL9qL1a4W_JZgyiMR9cnhU,32446
 hestia_earth/models/ipcc2019/noxToAirInorganicFertiliser.py,sha256=nBBiKzGMUYtHkU49AKBxQ7OdD61cb9_Ehe7ixFWKHR4,4336
 hestia_earth/models/ipcc2019/noxToAirOrganicFertiliser.py,sha256=yONOR8ppiOXQlPPz68GQ2_3MFzvnOQTJTHpJ956ubW0,4008
 hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=qYR1iB95Uz841xPe727ZYUtrRhg_Unbktf1YEjZHqyU,8000
@@ -353,7 +354,7 @@ hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2.py,sha256=2kw9bhkR4o4ZSeC
 hestia_earth/models/ipcc2019/organicCarbonPerHa_utils.py,sha256=DDP3nY-QVRU10FkFihNbnF66-Oa6O6Tkn7ycnetN110,9924
 hestia_earth/models/ipcc2019/organicSoilCultivation_utils.py,sha256=S5XaM7142_ShxFFXPZ4HaOdofRzMYucWc--5udxuin4,5361
 hestia_earth/models/ipcc2019/pastureGrass.py,sha256=V1PRJ17dYw0p9lvuyRVFuYzJrpmNOs0FjhNUXOuUkyU,10202
-hestia_earth/models/ipcc2019/pastureGrass_utils.py,sha256=so5AFrr_0eKXkUoyBpYhHgSXhTQ5z2XADahm2At4RR0,14285
+hestia_earth/models/ipcc2019/pastureGrass_utils.py,sha256=hAZQvG6VdY3KxVe2yiHoYNpGHRdnHApUZSuxUAZcGi0,14310
 hestia_earth/models/ipcc2019/utils.py,sha256=s3khA5nJ0rpFsrwWoIGW0y3OYrYA5Iw2GTxN86gO_K8,5890
 hestia_earth/models/ipcc2019/animal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/models/ipcc2019/animal/fatContent.py,sha256=rnFergteN5rwH9KLyVQR7iolh5Onj2gF785DnLIbIHI,994
@@ -472,7 +473,7 @@ hestia_earth/models/linkedImpactAssessment/utils.py,sha256=uxRu5thfTDGpCNIuv3Nak
 hestia_earth/models/mocking/__init__.py,sha256=-mJ_zrVWZSGc3awWW2YJfXAK3Nku77sAUgmmFa99Xmo,733
 hestia_earth/models/mocking/build_mock_search.py,sha256=p15ccEUmkmLp1RiGNznxMz3OFHbI8P1-29ExuohiQN8,1355
 hestia_earth/models/mocking/mock_search.py,sha256=uvklojTAbjDI7Jw43jGAUDcTHk1R3A3CWiYBJZI6rao,1493
-hestia_earth/models/mocking/search-results.json,sha256=Y38gcp5sPNm7P-Bd2dUk6XMpJGUKQAZNCOJRj37ZD70,103984
+hestia_earth/models/mocking/search-results.json,sha256=ZwHwW0gAsv9_R3lbPXty_PqIRlytWx9UA5Qme2zZdL4,104039
 hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
 hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=FoiRk-bULfC9VbhT7L-wgjehrUkG_74XiG2WnW1Rc-U,2402
 hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=r7Wqo5v29NrKfhDd0g1QCharR2k6H5XFyAsKZ6pvYKY,2321
@@ -649,7 +650,7 @@ hestia_earth/models/utils/pesticideAI.py,sha256=DQIAjgkWjKPyuMLUvnEgVkeQGCEOBjyJ
 hestia_earth/models/utils/practice.py,sha256=EceuaGZjClr6fvgIV2MvsuD9jXJayTBTKCzp98oTGnU,1079
 hestia_earth/models/utils/product.py,sha256=MfkTtuitTUbBJoM3AHymcjnYzWux6FxnIzS-Q4xXtkY,11767
 hestia_earth/models/utils/productivity.py,sha256=KIyrIuGcf8QgdBY54i7i038ZPXGqArM6mCzi2vwU3pI,601
-hestia_earth/models/utils/property.py,sha256=bgQNSXNdJsc0iqmm96LCHrq7In75xZyzYrnhcy8iHr8,5457
+hestia_earth/models/utils/property.py,sha256=bJlMTCbxrH_WIo16h6uX_OdRAjJH7KAdNUOQj7jJZLE,5562
 hestia_earth/models/utils/site.py,sha256=5S-53PHQnstr4LVveRuNhk4kpvGJtR8oc-t3OsxRyms,4128
 hestia_earth/models/utils/source.py,sha256=D_QlW7Ul_NV1iOucMNE3szT64b1RdSdecIEm6OukYhw,2459
 hestia_earth/models/utils/temperature.py,sha256=ljlG4-yCgFFb6LRZweb18cZKLrr7K2mqd4E4Hz_D1f8,476
@@ -675,6 +676,7 @@ hestia_earth/orchestrator/strategies/run/__init__.py,sha256=At0V8CI4vyiSY-Vh2PHM
 hestia_earth/orchestrator/strategies/run/add_blank_node_if_missing.py,sha256=lAfL-NK-gh2YQnTis2lIyb1uI_fsnwFWS10qwbga43M,2756
 hestia_earth/orchestrator/strategies/run/add_key_if_missing.py,sha256=t3U-v87XpbtpsvjA_r0Ftm7MhNkGB0kcUSGFlKBIK_I,352
 hestia_earth/orchestrator/strategies/run/always.py,sha256=D0In6_kr28s-fgqspawgvj5cgFClxGvepZYqtYsjWVE,217
+hestia_earth_models-0.74.17.dist-info/licenses/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
 tests/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/test_cache_nodes.py,sha256=lSSoBGFVXpNv_TePSetls6QbnhfLC7dNLmfiFqT6WuY,1043
 tests/models/test_cache_sites.py,sha256=eZkbgAhfA-67GhPgE4lk8byHnYvX2Ate1KPsE6jH1-c,2954
@@ -880,7 +882,7 @@ tests/models/hestia/test_landCover.py,sha256=dk5mnmCNv6gamx-xf0-_uUR31kBNavL8T9_
 tests/models/hestia/test_landCover_utils.py,sha256=o5LJ2PwTmUkxKvdHXQsdltrxeyt5kCxwtMtZXMrXqNA,6891
 tests/models/hestia/test_landOccupationDuringCycle.py,sha256=0IVJH7jL8q6Gu4gVo-ENYNw8aetOb-nhzvRXsFqMBEQ,2428
 tests/models/hestia/test_landTransformation100YearAverageDuringCycle.py,sha256=3qa4rWUFqP1VM5-vm_182rhiBYJDxPqJwWtBqJ5K028,956
-tests/models/hestia/test_landTransformation20YearAverageDuringCycle.py,sha256=bUByojQuVeuCfko1_2YtNJi1PT9yktHlcbPi_p-MPvk,1001
+tests/models/hestia/test_landTransformation20YearAverageDuringCycle.py,sha256=mFCru8NoHGYD6j1qNmmfbzhzJQhTNrhqdn1yJdsnp8E,1038
 tests/models/hestia/test_liveAnimal.py,sha256=3K9cL1fwr6LlBl1_D8zIaeCOuiExqkDEU7BXx1JK_dk,2139
 tests/models/hestia/test_longFallowRatio.py,sha256=OVd6NByAXeCAOx9ux_m8IJwnEF-fqIaBOoKFSGWhyO0,1513
 tests/models/hestia/test_management.py,sha256=ROWfDX-2aeeQXaflLPzOpiC6Qi5lsbMldBbFAlWKAUQ,2755
@@ -1298,8 +1300,7 @@ tests/orchestrator/strategies/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 tests/orchestrator/strategies/run/test_add_blank_node_if_missing.py,sha256=K4xg4UAXfNhSaLyknKVPO7MGBF44Z_gD7CuZ_pe28gU,3512
 tests/orchestrator/strategies/run/test_add_key_if_missing.py,sha256=hKwvk1ohcBVnQUCTiDhRW99J0xEa29BpwFi1KC0yWLE,329
 tests/orchestrator/strategies/run/test_always.py,sha256=w5-Dhp6yLzgZGAeMRz3OrqZbbAed9gZ1O266a3z9k7w,134
-hestia_earth_models-0.74.15.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
-hestia_earth_models-0.74.15.dist-info/METADATA,sha256=4AtIGfEZBnRYTvkOa0N9lH7i7jNOr1JhKFIAJ0kg4cM,4039
-hestia_earth_models-0.74.15.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_models-0.74.15.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.74.15.dist-info/RECORD,,
+hestia_earth_models-0.74.17.dist-info/METADATA,sha256=MQMZ5cIrnNeiLTJgCFHQEyOz_QJje2X7T_0ae25iK_U,4254
+hestia_earth_models-0.74.17.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+hestia_earth_models-0.74.17.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.74.17.dist-info/RECORD,,

{hestia_earth_models-0.74.15.dist-info → hestia_earth_models-0.74.17.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.45.1)
+Generator: setuptools (79.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/models/hestia/test_landTransformation20YearAverageDuringCycle.py

@@ -1,3 +1,4 @@
+import os
 import json
 from unittest.mock import patch, Mock
 import pytest
@@ -10,15 +11,10 @@ from hestia_earth.models.hestia.landTransformation20YearAverageDuringCycle impor
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
+_folders = [d for d in os.listdir(fixtures_folder) if os.path.isdir(os.path.join(fixtures_folder, d))]
 
-@pytest.mark.parametrize(
-    "subfolder",
-    [
-        "maize_brazil",
-        "orange_iran",
-        "aggregated"
-    ]
-)
+
+@pytest.mark.parametrize("subfolder", _folders)
 @patch("hestia_earth.models.hestia.resourceUse_utils._new_indicator", side_effect=fake_new_indicator)
 def test_run(mock_new_indicator: Mock, subfolder):
     folder = f"{fixtures_folder}/{subfolder}"