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

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.6'
+VERSION = '0.73.7'

{hestia_earth_models-0.73.6.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.6
+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

{hestia_earth_models-0.73.6.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=gitCsBIWkcodAN8Lqch7WqL2CaXjTfpeoB_0nJ451NM,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
@@ -203,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=VI3DiDxbdHe54S47ixO4PIPyGVtt-Hw_QRScQokOEVo,35569
+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
@@ -219,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
@@ -447,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=RirhWmqO7ySe_qzdefCJuQb4iacXB_ioJLjaN940VXY,162692
+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
@@ -615,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
@@ -1248,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.6.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
-hestia_earth_models-0.73.6.dist-info/METADATA,sha256=sI6oUwv9y6tLBVv_TWI8Wj7LWgBYs0ij46PzkKOYypc,4065
-hestia_earth_models-0.73.6.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_models-0.73.6.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.73.6.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,,