hestia-earth-models 0.73.5__py3-none-any.whl → 0.73.7__py3-none-any.whl

hestia_earth/models/utils/__init__.py

@@ -11,7 +11,7 @@ from pydash.objects import get
 from typing import Union, List, Callable
 from hestia_earth.schema import SchemaType
 from hestia_earth.utils.api import download_hestia
-from hestia_earth.utils.tools import flatten, non_empty_list
+from hestia_earth.utils.tools import flatten, non_empty_list, safe_parse_date
 from hestia_earth.utils.date import is_in_days, is_in_months
 
 from .constant import Units
@@ -157,6 +157,15 @@ def current_date(): return datetime.datetime.now().date().strftime('%Y-%m-%d')
 def current_year(): return int(current_date()[:4])
 
 
+def max_date(date_str: str):
+    """
+    If the date is after today, returns today. Otherwise returns the date.
+    """
+    date = safe_parse_date(date_str).date()
+    max_date = datetime.datetime.now().date()
+    return current_date() if date > max_date else date_str
+
+
 def flatten_args(args) -> list:
     """
     Flatten the input args into a single list.

hestia_earth/models/utils/blank_node.py

@@ -584,7 +584,7 @@ def cumulative_nodes_match(
     """
     values = [
         get_node_value(
-            node, 'value', is_larger_unit, array_treatment
+            node, key='value', is_larger_unit=is_larger_unit, array_treatment=array_treatment
         ) or default_node_value for node in nodes if function(node)
     ]
 

hestia_earth/models/utils/lookup.py

@@ -1,4 +1,4 @@
-import functools
+from functools import lru_cache
 from typing import Optional, List
 from hestia_earth.utils.lookup import (
     download_lookup,
@@ -159,13 +159,18 @@ def fallback_country(country_id: str, lookups: List[str]) -> str:
     return country_id if country_id and is_in_lookup(country_id) else fallback_id if is_in_lookup(fallback_id) else None
 
 
-@functools.cache
-def get_region_lookup_value(lookup_name: str, term_id: str, column: str, **log_args):
+def get_region_lookup(lookup_name: str, term_id: str):
     # for performance, try to load the region specific lookup if exists
-    lookup = (
+    return (
         download_lookup(lookup_name.replace('region-', f"{term_id}-"))
         if lookup_name and lookup_name.startswith('region-') else None
     ) or download_lookup(lookup_name)
+
+
+@lru_cache()
+def get_region_lookup_value(lookup_name: str, term_id: str, column: str, **log_args):
+    # for performance, try to load the region specific lookup if exists
+    lookup = get_region_lookup(lookup_name, term_id)
     value = get_table_value(lookup, 'termid', term_id, column_name(column))
     debugMissingLookup(lookup_name, 'termid', term_id, column, value, **log_args)
     return value

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.73.5'
+VERSION = '0.73.7'

{hestia_earth_models-0.73.5.dist-info → hestia_earth_models-0.73.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.73.5
+Version: 0.73.7
 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
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: hestia-earth-schema==33.*
-Requires-Dist: hestia-earth-utils>=0.14.7
+Requires-Dist: hestia-earth-utils>=0.14.9
 Requires-Dist: python-dateutil>=2.8.1
 Requires-Dist: CurrencyConverter==0.16.8
 Requires-Dist: haversine>=2.7.0

{hestia_earth_models-0.73.5.dist-info → hestia_earth_models-0.73.7.dist-info}/RECORD

@@ -5,7 +5,7 @@ hestia_earth/models/cache_sites.py,sha256=XpXnkYt823PQzrswgP__L4CT8xZG_n7a41CIHK
 hestia_earth/models/log.py,sha256=eRuH86v7Thuw-QXdKqaqVmA_MkwnOCo0UBEwtuDq4Oc,3554
 hestia_earth/models/preload_requests.py,sha256=vK_G1UzhNMhYy7ymnCtHUz_vv3cfApCSKqv29VREEBQ,1943
 hestia_earth/models/requirements.py,sha256=eU4yT443fx7BnaokhrLB_PCizJI7Y6m4auyo8vQauNg,17363
-hestia_earth/models/version.py,sha256=gaJ7asOZglEOu1WEQGhDLAicifIKNkt5PDb2Cw4T0-8,19
+hestia_earth/models/version.py,sha256=o_M7PTyKtfBCAOVqpfGyhs0b9QaYbQJyB5V8ve_FlSo,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=1ngl8pdxeNhlVV8keAeWRwGorr_1uFXM9EoPUWx-uSc,4382
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=queToXuzq0tQ9_XuUJ2pJgSywXmbt9uX3ZoIKgqkROM,2660
@@ -35,8 +35,8 @@ hestia_earth/models/cml2001Baseline/terrestrialAcidificationPotentialIncludingFa
 hestia_earth/models/cml2001NonBaseline/__init__.py,sha256=vI8wp8Og_e8DiJqYYvp33YoI3t4ffAC31LWlnV20JTg,419
 hestia_earth/models/cml2001NonBaseline/eutrophicationPotentialIncludingFateAverageEurope.py,sha256=lcgyRHY08KCBFPERJNqV4DYGEJCvyHBDnJXD0kEkVqM,1097
 hestia_earth/models/cml2001NonBaseline/terrestrialAcidificationPotentialExcludingFate.py,sha256=xcrxfs9UoV_EWvV-XzMt35oPWCUsTzqg2SGA3j2MFIw,1091
-hestia_earth/models/config/Cycle.json,sha256=3fsz2dNEKA4noEjqrp25Or3_scDxqFS7c_7v911Gpno,59078
-hestia_earth/models/config/ImpactAssessment.json,sha256=ubAHJRHOFdX-fIYkOEBuD0CYvNZtFYSr8GSgKliVL8g,60968
+hestia_earth/models/config/Cycle.json,sha256=DSwKJd-5UX4Lnt3C3sHeYKHh6Zr2Fe-RgTas2DoDTGA,57840
+hestia_earth/models/config/ImpactAssessment.json,sha256=VLkGnDNGLilYK2410STpB63MO_hzOQCaY6QgUcvJLz0,60323
 hestia_earth/models/config/Site.json,sha256=4DPSziHnDIngyub3Of8OvDEKa446q3Yx48R2Eobqk24,14374
 hestia_earth/models/config/__init__.py,sha256=l1WqL7ezlank86ABP4zUia_hIvM9ba-sOE3z6wNrea8,2333
 hestia_earth/models/config/run-calculations.json,sha256=e3nJ4M6CP1iFzfv8ou_ZUFbFxYkDxJgwuNDXTm4PBDc,615
@@ -136,8 +136,6 @@ hestia_earth/models/fantkeEtAl2016/damageToHumanHealthParticulateMatterFormation
 hestia_earth/models/faostat2018/__init__.py,sha256=ecN-pKF1pkFnzmooBrg1VAxJkG76q9v4piiaKGP_vbo,412
 hestia_earth/models/faostat2018/coldCarcassWeightPerHead.py,sha256=Qf_nvHxT4mn9kSNgOEXJUX0oUIOuuw0KSzLf-si04tQ,3105
 hestia_earth/models/faostat2018/coldDressedCarcassWeightPerHead.py,sha256=2WqIFxUMHngcsY7CffAn0bZClB_VXW1egtvBrKOFmxw,3196
-hestia_earth/models/faostat2018/landTransformation100YearAverageDuringCycle.py,sha256=Pp94-1uMHN-jlMIbUQB-Go26WAxtMtTmf8zyyyAEvvk,998
-hestia_earth/models/faostat2018/landTransformation20YearAverageDuringCycle.py,sha256=LNQfb_vqNsJOrgZXVo6m9hBGdI8OaHSnfA9jSbp6JVY,995
 hestia_earth/models/faostat2018/liveweightPerHead.py,sha256=2BmSe8xdEdm68i6t_UkeXQshxLH3WVNyvButsoE_9zE,5031
 hestia_earth/models/faostat2018/readyToCookWeightPerHead.py,sha256=obJLPV8GgG2lEhLqg9RrJLSFPzbasXJnmzHnwkpW7O0,3131
 hestia_earth/models/faostat2018/seed.py,sha256=brDGypvFJR6gpb4VMTW16cN2Jw0jbvD2msV-NMWuwxQ,2948
@@ -160,10 +158,10 @@ hestia_earth/models/geospatialDatabase/histosol.py,sha256=uVl96zpxPHYDW81SxnEpMP
 hestia_earth/models/geospatialDatabase/longFallowRatio.py,sha256=X-qJS0euYVwhGHd4rCnlRSL3KOMLQJl5kO8QqSREcpA,2561
 hestia_earth/models/geospatialDatabase/nutrientLossToAquaticEnvironment.py,sha256=uEsoYJ1mzgUo6fQhUrcJ-ATcFw1j9oEgqMXKbQuFRxQ,1973
 hestia_earth/models/geospatialDatabase/organicCarbonPerKgSoil.py,sha256=pGy35cvt5Rzv2h0ka5PZqZqWp0wThWqJL8o_nVZinCo,2862
-hestia_earth/models/geospatialDatabase/potentialEvapotranspirationAnnual.py,sha256=x8-108UuysEZNgCBvLGOWsYvvBAIlE_5h6y2Kl-Tl40,2396
+hestia_earth/models/geospatialDatabase/potentialEvapotranspirationAnnual.py,sha256=UZl-1PlopZdhjzeCU2dbxQJhU7IeTIUI6oT4TPQ2mSQ,2453
 hestia_earth/models/geospatialDatabase/potentialEvapotranspirationLongTermAnnualMean.py,sha256=YywD9wCkGFF1q60LocXNvLr-tQ2_9km2PrVnXRgN83E,2125
 hestia_earth/models/geospatialDatabase/potentialEvapotranspirationMonthly.py,sha256=rt-MNUYkFruViMSPJV6r66042227CdCLmccYT48dU4o,3197
-hestia_earth/models/geospatialDatabase/precipitationAnnual.py,sha256=VMrz4z4FmA0SLIwYr1mT5RWX41XbmubQlwdQvU2eq80,2657
+hestia_earth/models/geospatialDatabase/precipitationAnnual.py,sha256=ljqttqQ7bZqMOWt9hGxsGGjQ4u1wm7IpUS-J19ttrAU,2714
 hestia_earth/models/geospatialDatabase/precipitationLongTermAnnualMean.py,sha256=wZ_QprRT9ILSNpiUhPdKtTERUsGofQT1kqUaHuJjDOs,2390
 hestia_earth/models/geospatialDatabase/precipitationMonthly.py,sha256=jQ3XLN8Zh7q2LZgLmybzvwR0X2vdi6IDz301EUVbAmE,3261
 hestia_earth/models/geospatialDatabase/region.py,sha256=55tjxaffUaQnJ_kqWd-eejhLMs-5N2CjUQd9FU1wWoU,1448
@@ -172,7 +170,7 @@ hestia_earth/models/geospatialDatabase/siltContent.py,sha256=rFUlQ3SlwCJFcMYQd5F
 hestia_earth/models/geospatialDatabase/slope.py,sha256=g1SpuYks60injv2w-CMjESNfu8KM1JsiYnRT9XZfSuY,1859
 hestia_earth/models/geospatialDatabase/slopeLength.py,sha256=6pGr1qR0EiiUKkeflpYut7eI6UsnXAzHDoHhAzXKFJk,1864
 hestia_earth/models/geospatialDatabase/soilPh.py,sha256=f-jZhIpbsVDe_lGm0rfA7K0vRRTy0M5adKA-_-W11LU,2799
-hestia_earth/models/geospatialDatabase/temperatureAnnual.py,sha256=wprDhySO4y2wAebLIQPfsLP4tQYowaUh8V-rNGEc380,2553
+hestia_earth/models/geospatialDatabase/temperatureAnnual.py,sha256=sI1j-Zw5cAlLRElv6c-RhHDMz4vQZV7yuKCEgqEV4sw,2610
 hestia_earth/models/geospatialDatabase/temperatureLongTermAnnualMean.py,sha256=ypQbdbily63m_B7t7_aTaJ8RN9gzzauHeZTFDgFhlds,2230
 hestia_earth/models/geospatialDatabase/temperatureMonthly.py,sha256=E2k2kkhVDtmeFEB4_AZhhq5od57lRDMWu6AqaurgqvQ,3194
 hestia_earth/models/geospatialDatabase/totalNitrogenPerKgSoil.py,sha256=eajSzMCX201k_xrfZZSHtTzEIH29hqgJdztQgQeewig,2853
@@ -205,7 +203,7 @@ hestia_earth/models/hestia/freshWater.py,sha256=Q-dmFJLZfyYEyFyYkJUOjgmQR3G5YXCX
 hestia_earth/models/hestia/histosol.py,sha256=IexiWTSlSJYGjrdpYmRooW6v8LjhYATPQ8smMz1UZBA,1612
 hestia_earth/models/hestia/inorganicFertiliser.py,sha256=We4PBaTXyGwEQTfhX0-J8Xt03p-FB9i9j3tEK5JQ8uE,9026
 hestia_earth/models/hestia/irrigatedTypeUnspecified.py,sha256=VdYzfYxcRzWv21qxRkDn9HBid7-Bt_CgIv4iyXJH03g,1929
-hestia_earth/models/hestia/landCover.py,sha256=l0uhIxHZ9cD8ZB37RzeWUzjfh7d0iTB7GiMG7DYWddU,34937
+hestia_earth/models/hestia/landCover.py,sha256=MIW2-zOlIL4SVt5Ti8kO30HM4W6PJns2azvqsx8YANM,35513
 hestia_earth/models/hestia/landTransformation100YearAverageDuringCycle.py,sha256=hF7_DDvrs7swH6ott_ihgYx13UzEKHH6pccYCtzrN8o,1069
 hestia_earth/models/hestia/landTransformation20YearAverageDuringCycle.py,sha256=05SCH6ZjEV3mIleRusBg677zu0xgu5YK0f9FCddgNPg,1067
 hestia_earth/models/hestia/liveAnimal.py,sha256=d7HuUi40c-7TN1kecdRuqbht8PAe7x4ps0NhSuWG34Q,3868
@@ -221,7 +219,7 @@ hestia_earth/models/hestia/organicMatterPerKgSoil.py,sha256=fJpFVkpuCjnrBhgV0Rtw
 hestia_earth/models/hestia/organicMatterPerM3Soil.py,sha256=FTNc0FKnWt91BvbsIrBx_0SoGfuqnAC0AlTUL5RvzZ8,1945
 hestia_earth/models/hestia/pToSurfaceWaterAquacultureSystems.py,sha256=K-Remsxa3FG2OVNPioPO2PgwVJ608XoizHGyQTGCWuI,5528
 hestia_earth/models/hestia/pastureGrass.py,sha256=2k3wvHDozW4cHW5JpmRvMOitA1x-80OIhRHhnRC1e0s,1275
-hestia_earth/models/hestia/pastureSystem.py,sha256=Cremfv1q55pX1U1FYNvLz8gvZ-DX33o4P_i4VEfJsKo,2573
+hestia_earth/models/hestia/pastureSystem.py,sha256=DBI82HT5qZftlZx_Zsp7_baEEXysLhUnxnpGXB1IQho,2584
 hestia_earth/models/hestia/potentialEvapotranspirationAnnual.py,sha256=FTMY7fjTg1Z4owSoXrxDKpWaIpVUm5HQ47jz4EdcQqU,2011
 hestia_earth/models/hestia/potentialEvapotranspirationMonthly.py,sha256=UCjpq7pqkCYrrFoPSZKq2Pqt3t9OhYfcj-8dIm0Ta_M,1890
 hestia_earth/models/hestia/precipitationAnnual.py,sha256=ypAkk627MeiJGi_qAa03m57J17wndhCkzpIlcqnz0H8,1969
@@ -449,7 +447,7 @@ hestia_earth/models/linkedImpactAssessment/utils.py,sha256=7M-E7u35fIF0uMoA1hwcr
 hestia_earth/models/mocking/__init__.py,sha256=9VX50c-grz-snfd-7MBS0KfF7AadtbKuj7kK6PqtsgE,687
 hestia_earth/models/mocking/build_mock_search.py,sha256=p15ccEUmkmLp1RiGNznxMz3OFHbI8P1-29ExuohiQN8,1355
 hestia_earth/models/mocking/mock_search.py,sha256=ccFe_WrI73JElFmxp4hPNLCX7eeU--lBC1JFR901KJY,1069
-hestia_earth/models/mocking/search-results.json,sha256=eMTxqv2Lz6tZuSuUkOWRnBLsqPIp7JIoupRI3YyIrig,162691
+hestia_earth/models/mocking/search-results.json,sha256=3poKHCxkS0WxYwQ9oxdxh5Pvx4XfgDePZseAW75beBk,162687
 hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
 hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=oXillpppAas1q9GKmODxe1YXyno3EzV-j12xhzkqtTc,2404
 hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=_pQMPSvI--Xm00H6vXDA4ct_pQXKRGrLE2f-2tQE6y4,2323
@@ -591,12 +589,12 @@ hestia_earth/models/transformation/product/__init__.py,sha256=47DEQpj8HBSa-_TImW
 hestia_earth/models/transformation/product/excreta.py,sha256=tggXIoUujzu8O949_3KFog219k_bQ0IcytpCsJ8oMcc,5384
 hestia_earth/models/usetoxV2/__init__.py,sha256=pK37V3H-KvYcvRKw4Mv8CWrB2N0LFLzmv0jKLdhGGqs,409
 hestia_earth/models/usetoxV2/freshwaterEcotoxicityPotentialCtue.py,sha256=pPX8u-Aq6Pg5Y9xw0CS0S2WkAHQpOMl0lL2tLQwwOuU,918
-hestia_earth/models/utils/__init__.py,sha256=8YXFDBdB7VJK9F4BTMeq_WoNAGySEGgoVbvW5EoZahA,6848
+hestia_earth/models/utils/__init__.py,sha256=0v-wjG9xzJeitWEUN3XRleM_is1AkVm2r7WkApB7-ho,7136
 hestia_earth/models/utils/aggregated.py,sha256=G7FNJfHqJ_eoXB66kGdjLyZGDOI_gsF56o7VnyW3bqA,4801
 hestia_earth/models/utils/animalProduct.py,sha256=M5IunAKGY6oZv3j1Ascl34ywyeLWApqOIlBzbtlA2FE,721
 hestia_earth/models/utils/aquacultureManagement.py,sha256=dxrbC1Xf140cohxTbSw6TxLAnAASWTdNZwBBam4yQnw,171
 hestia_earth/models/utils/background_emissions.py,sha256=54zuH4yFNc_cle3uYGtK_EjhkG0XGaG5L6eGKiTyOG4,3100
-hestia_earth/models/utils/blank_node.py,sha256=o1MzCz6FXuJ4Iit55EeGrHbrGM9VUfdAF1RNqTBU89Y,56070
+hestia_earth/models/utils/blank_node.py,sha256=Y4Q1wnddrMyo9NEqKFcmt43LKHPWDlbe9l1seDcU8K0,56105
 hestia_earth/models/utils/cache_sources.py,sha256=MBkrPpjwNiC4ApDjeYVHZjWBbpvAerXRDrMHpjasAZ0,377
 hestia_earth/models/utils/completeness.py,sha256=iRG4uviOAQQ4T2Nr4LlelPVTS_F1felGZNJYxek_JG8,1239
 hestia_earth/models/utils/constant.py,sha256=DmB3VVuoh7Pz2QDBJqiUG6yAML2i0fOy1BPuPHmhT1w,3442
@@ -617,7 +615,7 @@ hestia_earth/models/utils/inorganicFertiliser.py,sha256=2Uq6ATWwb_YYRzBCMdrlVWyC
 hestia_earth/models/utils/input.py,sha256=61aaJV6QApJQIQT5TMsBww46cBYpJdf__krnwV95KsY,6160
 hestia_earth/models/utils/landCover.py,sha256=8-nfynzCx9gf9YfhpuoH6Cn4kQwWFpYA5RmoGW-0ETE,300
 hestia_earth/models/utils/liveAnimal.py,sha256=-ufUs00ALXRKGbrRJi7a7eTWVvkEj_pxLDWYbMJmx2g,1770
-hestia_earth/models/utils/lookup.py,sha256=uDye1fnvOdmR9ch5rVNI61qHRKAxzBLk3aPK93BxnfE,7196
+hestia_earth/models/utils/lookup.py,sha256=qT0-lMInGNIY4EfwkVGc4oxfTSRYH-ae8fqlMLzl7Mo,7387
 hestia_earth/models/utils/management.py,sha256=urvoHvTw5wrO12POjGQ50Or25X1Y4Gx26l4fDoVt-Ck,376
 hestia_earth/models/utils/measurement.py,sha256=1Da0CzWu_RDzVEqcBIl_EGsRq7PmafICyBva3-QtjVQ,11744
 hestia_earth/models/utils/method.py,sha256=ZYN2_Fyeiwr9pmvD84ZPg7ZHBlvaIY2A6XL4F_KByS0,740
@@ -660,6 +658,7 @@ tests/models/test_ecoinventV3.py,sha256=SvBn1ZomoturZhjj4BE2EU46Sq0il-tOJIqutmGa
 tests/models/test_ecoinventV3AndEmberClimate.py,sha256=_7sX0s07Xr00uNcVk78L1AdSqI1OpUV3tkkG1hVSY2w,803
 tests/models/test_emissionNotRelevant.py,sha256=TsIV47lpn7joLGx-LlPVqWbshcLf2c6pUvB3FZwLvwY,1023
 tests/models/test_resourceUseNotRelevant.py,sha256=z1zY3pJdffongIsBJaLB7WToBrMiE4wYuHSsAbGEJ7w,983
+tests/models/test_utils.py,sha256=Caa9sCyz25egPrSlu7FQhjXD2vNcQW9gea_ppUYOsEs,186
 tests/models/agribalyse2016/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/agribalyse2016/test_fuelElectricity.py,sha256=u_wNlqngJc8NELPr16kYsYQ-_2PcL8BnrfJucY7dccU,1353
 tests/models/agribalyse2016/test_machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=75yJ0yuPbIizpSsHr7CpZnUv01LZbuYsm5s9hE0VL_o,1090
@@ -776,8 +775,6 @@ tests/models/faostat2018/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 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=25Y6N4kdbBXno0PwosaC94NRW3W2FIyjS4-WoIV9Xmc,1679
-tests/models/faostat2018/test_landTransformation100YearAverageDuringCycle.py,sha256=gcJd_d1GYw7VI8oZHvgbSjUgagp4AyMiMeJBrnpLgAE,753
-tests/models/faostat2018/test_landTransformation20YearAverageDuringCycle.py,sha256=ZRDfN2E-kJOKQkbs6se0x7T03dzmnf4TN1D5uwrLdKA,752
 tests/models/faostat2018/test_liveweightPerHead.py,sha256=Qp4iKZ6Ofq1rGQL8ngESAx2JSPR_97TK4wOymmikdfA,4781
 tests/models/faostat2018/test_readyToCookWeightPerHead.py,sha256=pMDcONs0WUvANcJ6_OPF7TBwMF45JGMxFRPNPtHLqVI,1570
 tests/models/faostat2018/test_seed.py,sha256=tUXoNVveX0m0ed9UXB4zXxIZsPxktXyUXlbWuUKG0sQ,1705
@@ -845,7 +842,7 @@ tests/models/hestia/test_freshWater.py,sha256=v2UD69csKrniKP3MXkOEHxQeE6O3-lvIVi
 tests/models/hestia/test_histosol.py,sha256=7g-3wQPZok2O8mExcnKZxO_T2Ye_h3UHv3HG3Kn8orM,888
 tests/models/hestia/test_inorganicFertiliser.py,sha256=v2Zs1Ig-ChOaq9gXuurcBt12izkH2bRUUuzW6rh3rqQ,643
 tests/models/hestia/test_irrigatedTypeUnspecified.py,sha256=bluZADFagxfXW4QyI0CIJzG97D2V33w333Z9Vwjqo0M,2015
-tests/models/hestia/test_landCover.py,sha256=rGJq9WtaAOKYmUA_sLRHyHZgxo2heoODpB9Jo7jC9Pc,9076
+tests/models/hestia/test_landCover.py,sha256=usfFMcVUvZDFpYoo53NdsinbhZjwlEnjtWNuNli03eE,9889
 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_liveAnimal.py,sha256=3K9cL1fwr6LlBl1_D8zIaeCOuiExqkDEU7BXx1JK_dk,2139
@@ -1251,8 +1248,8 @@ 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.73.5.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
-hestia_earth_models-0.73.5.dist-info/METADATA,sha256=waCb4T4IfTXsSP5YtJg9ac3PfcnmIDejSOW2sgFDf4I,4065
-hestia_earth_models-0.73.5.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_models-0.73.5.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.73.5.dist-info/RECORD,,
+hestia_earth_models-0.73.7.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
+hestia_earth_models-0.73.7.dist-info/METADATA,sha256=V17IPd6to67Xy1sf-Cthruu9mYoZYk5QQwq_oz3oMDg,4065
+hestia_earth_models-0.73.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hestia_earth_models-0.73.7.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.73.7.dist-info/RECORD,,

tests/models/hestia/test_landCover.py

@@ -4,12 +4,15 @@ import json
 import pytest
 from unittest.mock import patch
 
+from hestia_earth.models.hestia.utils import (
+    FOREST_LAND, PERMANENT_PASTURE, PERMANENT_CROPLAND, ANNUAL_CROPLAND, OTHER_LAND
+)
 from tests.utils import fixtures_path, fake_new_management
 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, _get_sum_for_land_category, scale_values_to_one,
-    _get_most_common_or_alphabetically_first
+    _get_most_common_or_alphabetically_first, _get_land_cover_lookup_suffix
 )
 
 CLASS_PATH = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
@@ -246,6 +249,20 @@ def test_scale_values_to_one(dictionary, expected_result):
         assert round(v, 3) == round(expected_result[k], 3)
 
 
+@pytest.mark.parametrize(
+    "land_type,expected",
+    [
+        (FOREST_LAND, "forest"),
+        (ANNUAL_CROPLAND, "annualCropland"),
+        (PERMANENT_CROPLAND, "permanentCropland"),
+        (PERMANENT_PASTURE, "permanentPasture"),
+        (OTHER_LAND, "otherLand"),
+    ]
+)
+def test_get_land_cover_lookup_suffix(land_type: str, expected: str):
+    assert _get_land_cover_lookup_suffix(land_type=land_type) == expected, land_type
+
+
 @pytest.mark.parametrize("subfolder", _folders)
 @patch(f"{CLASS_PATH}._new_management", side_effect=fake_new_management)
 def test_run(mock, subfolder: str):
@@ -277,12 +294,19 @@ def test_landCover_from_lookup_run(mock_mgmt, mock_region_lookup, caplog):
         expected = json.load(f)
 
     result = run(site)
+    mock_region_lookup.assert_called_with(
+        lookup_name='region-crop-cropGroupingFAOSTAT-landCover-otherLand.csv',
+        term_id='GADM-BRA',
+        column='Maize plant',
+        model='hestia',
+        key='landCover'
+    )
     expected_message = ("site=Brazil-example, requirements=true, model=hestia, model_key=landCover, "
                         "has_management_nodes=True, land_use_type=Arable land, allowed_land_use_types=Arable land;"
                         "Permanent crops;Permanent meadows and pastures, has_no_prior_land_cover_data=True, "
                         "management_nodes=value:100_id:maizePlant_land-use-type:Arable land_endDate:2010-12-31"
-                        "_startDate:2010-01-01, landCover_from_lookups={'Forest land': 0.55, 'Arable land': 0.55, "
-                        "'Permanent crops': 0.55, 'Permanent meadows and pastures': 0.55, 'Other land': 0.55}, "
+                        "_startDate:2010-01-01, landCover_from_lookups=Forest land:0.55;Arable land:0.55;"
+                        "Permanent crops:0.55;Permanent meadows and pastures:0.55;Other land:0.55, "
                         "should_run_nodes=True")
     assert expected_message in [r.msg for r in caplog.records]
     assert result == expected

tests/models/test_utils.py

@@ -0,0 +1,6 @@
+from hestia_earth.models.utils import current_date, max_date
+
+
+def test_max_date():
+    assert max_date('2100-01-01') == current_date()
+    assert max_date('2000-01-01') == '2000-01-01'

hestia_earth/models/faostat2018/landTransformation100YearAverageDuringCycle.py

@@ -1,34 +0,0 @@
-from .utils import should_run_landTransformationFromCropland, run_landTransformationFromCropland
-
-REQUIREMENTS = {
-    "ImpactAssessment": {
-        "endDate": "",
-        "country": {"@type": "Term", "termType": "region"},
-        "emissionsResourceUse": [{
-            "@type": "Indicator",
-            "term.@id": "landTransformation100YearAverageDuringCycle",
-            "value": "",
-            "previousLandCover": {
-                "@type": "Term",
-                "termType": "landCover",
-                "@id": "cropland"
-            }
-        }]
-    }
-}
-LOOKUPS = {
-    "region-faostatArea": ""
-}
-RETURNS = {
-    "Indicator": [{
-        "value": "",
-        "landCover": "",
-        "previousLandCover": ""
-    }]
-}
-TERM_ID = 'landTransformation100YearAverageDuringCycle'
-
-
-def run(impact: dict):
-    should_run, indicators = should_run_landTransformationFromCropland(TERM_ID, impact)
-    return run_landTransformationFromCropland(TERM_ID, impact, indicators, 100) if should_run else []

hestia_earth/models/faostat2018/landTransformation20YearAverageDuringCycle.py

@@ -1,34 +0,0 @@
-from .utils import should_run_landTransformationFromCropland, run_landTransformationFromCropland
-
-REQUIREMENTS = {
-    "ImpactAssessment": {
-        "endDate": "",
-        "country": {"@type": "Term", "termType": "region"},
-        "emissionsResourceUse": [{
-            "@type": "Indicator",
-            "term.@id": "landTransformation20YearAverageDuringCycle",
-            "value": "",
-            "previousLandCover": {
-                "@type": "Term",
-                "termType": "landCover",
-                "@id": "cropland"
-            }
-        }]
-    }
-}
-LOOKUPS = {
-    "region-faostatArea": ""
-}
-RETURNS = {
-    "Indicator": [{
-        "value": "",
-        "landCover": "",
-        "previousLandCover": ""
-    }]
-}
-TERM_ID = 'landTransformation20YearAverageDuringCycle'
-
-
-def run(impact: dict):
-    should_run, indicators = should_run_landTransformationFromCropland(TERM_ID, impact)
-    return run_landTransformationFromCropland(TERM_ID, impact, indicators, 20) if should_run else []

tests/models/faostat2018/test_landTransformation100YearAverageDuringCycle.py

@@ -1,21 +0,0 @@
-from unittest.mock import patch
-import json
-from tests.utils import fixtures_path, fake_new_indicator
-
-from hestia_earth.models.faostat2018 import MODEL
-from hestia_earth.models.faostat2018.landTransformation100YearAverageDuringCycle import TERM_ID, run
-
-class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
-fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
-
-
-@patch(f"hestia_earth.models.{MODEL}.utils._new_indicator", side_effect=fake_new_indicator)
-def test_run(*args):
-    with open(f"{fixtures_folder}/impact-assessment.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/faostat2018/test_landTransformation20YearAverageDuringCycle.py

@@ -1,21 +0,0 @@
-from unittest.mock import patch
-import json
-from tests.utils import fixtures_path, fake_new_indicator
-
-from hestia_earth.models.faostat2018 import MODEL
-from hestia_earth.models.faostat2018.landTransformation20YearAverageDuringCycle import TERM_ID, run
-
-class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
-fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
-
-
-@patch(f"hestia_earth.models.{MODEL}.utils._new_indicator", side_effect=fake_new_indicator)
-def test_run(*args):
-    with open(f"{fixtures_folder}/impact-assessment.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