hestia-earth-models 0.53.12__py3-none-any.whl → 0.54.1__py3-none-any.whl

hestia_earth/models/site/cationExchangeCapacityPerKgSoil.py

@@ -22,7 +22,7 @@ RETURNS = {
         "value": "",
         "depthUpper": "",
         "depthLower": "",
-        "methodClassification": "modelled using other physical measurements"
+        "methodClassification": "modelled using other measurements"
     }]
 }
 TERM_ID = 'cationExchangeCapacityPerKgSoil'
@@ -36,7 +36,7 @@ def _measurement(site: dict, value: float, depthUpper: int = None, depthLower: i
         data['depthUpper'] = depthUpper
     if depthLower is not None:
         data['depthLower'] = depthLower
-    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_PHYSICAL_MEASUREMENTS.value
+    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
     return data | get_source(site, BIBLIO_TITLE)
 
 

hestia_earth/models/site/flowingWater.py

@@ -19,7 +19,7 @@ REQUIREMENTS = {
 RETURNS = {
     "Measurement": [{
         "value": "1",
-        "methodClassification": "modelled using other physical measurements"
+        "methodClassification": "modelled using other measurements"
     }]
 }
 TERM_ID = 'slowFlowingWater,fastFlowingWater'
@@ -32,7 +32,7 @@ SITE_TYPE_TO_TERM_ID = {
 def _measurement(site: dict, term_id: str):
     data = _new_measurement(term_id)
     data['value'] = [1]
-    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_PHYSICAL_MEASUREMENTS.value
+    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
     return data | get_source(site, BIBLIO_TITLE)
 
 

hestia_earth/models/site/netPrimaryProduction.py

@@ -15,7 +15,7 @@ REQUIREMENTS = {
 RETURNS = {
     "Measurement": [{
         "value": "",
-        "methodClassification": "modelled using other physical measurements"
+        "methodClassification": "modelled using other measurements"
     }]
 }
 TERM_ID = 'netPrimaryProduction'
@@ -26,7 +26,7 @@ NPP_Aqua = {TemperatureLevel.LOW: 2, TemperatureLevel.MEDIUM: 4, TemperatureLeve
 def _measurement(site: dict, value: float):
     data = _new_measurement(TERM_ID)
     data['value'] = [value]
-    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_PHYSICAL_MEASUREMENTS.value
+    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
     return data | get_source(site, BIBLIO_TITLE)
 
 

hestia_earth/models/site/organicCarbonPerHa.py

@@ -33,7 +33,7 @@ RETURNS = {
         "value": "",
         "depthUpper": "",
         "depthLower": "",
-        "methodClassification": "modelled using other physical measurements"
+        "methodClassification": "modelled using other measurements"
     }]
 }
 TERM_ID = 'organicCarbonPerHa'
@@ -45,7 +45,7 @@ def _measurement(site: dict, value: float, depthUpper: int, depthLower: int):
     data['value'] = [value]
     data['depthUpper'] = depthUpper
     data['depthLower'] = depthLower
-    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_PHYSICAL_MEASUREMENTS.value
+    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
     return data | get_source(site, BIBLIO_TITLE)
 
 

hestia_earth/models/site/organicCarbonPerKgSoil.py

@@ -17,7 +17,7 @@ RETURNS = {
         "min": "",
         "max": "",
         "statsDefinition": "modelled",
-        "methodClassification": "modelled using other physical measurements"
+        "methodClassification": "modelled using other measurements"
     }]
 }
 TERM_ID = 'organicCarbonPerKgSoil'
@@ -31,7 +31,7 @@ def _measurement(site: dict, measurement: dict):
     data['min'] = _value_func(measurement, lambda v: v / 2.5, 'min')
     data['max'] = _value_func(measurement, lambda v: v / 1.4, 'max')
     data['statsDefinition'] = MeasurementStatsDefinition.MODELLED.value
-    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_PHYSICAL_MEASUREMENTS.value
+    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
     return data | get_source(site, BIBLIO_TITLE)
 
 

hestia_earth/models/site/organicCarbonPerM3Soil.py

@@ -17,7 +17,7 @@ RETURNS = {
         "min": "",
         "max": "",
         "statsDefinition": "modelled",
-        "methodClassification": "modelled using other physical measurements"
+        "methodClassification": "modelled using other measurements"
     }]
 }
 TERM_ID = 'organicCarbonPerM3Soil'
@@ -31,7 +31,7 @@ def _measurement(site: dict, measurement: dict):
     data['min'] = _value_func(measurement, lambda v: v / 2.5, 'min')
     data['max'] = _value_func(measurement, lambda v: v / 1.4, 'max')
     data['statsDefinition'] = MeasurementStatsDefinition.MODELLED.value
-    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_PHYSICAL_MEASUREMENTS.value
+    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
     return data | get_source(site, BIBLIO_TITLE)
 
 

hestia_earth/models/site/organicMatterPerKgSoil.py

@@ -17,7 +17,7 @@ RETURNS = {
         "min": "",
         "max": "",
         "statsDefinition": "modelled",
-        "methodClassification": "modelled using other physical measurements"
+        "methodClassification": "modelled using other measurements"
     }]
 }
 TERM_ID = 'organicMatterPerKgSoil'
@@ -31,7 +31,7 @@ def _measurement(site: dict, measurement: dict):
     data['min'] = _value_func(measurement, lambda v: v * 1.4, 'min')
     data['max'] = _value_func(measurement, lambda v: v * 2.5, 'max')
     data['statsDefinition'] = MeasurementStatsDefinition.MODELLED.value
-    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_PHYSICAL_MEASUREMENTS.value
+    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
     return data | get_source(site, BIBLIO_TITLE)
 
 

hestia_earth/models/site/organicMatterPerM3Soil.py

@@ -17,7 +17,7 @@ RETURNS = {
         "min": "",
         "max": "",
         "statsDefinition": "modelled",
-        "methodClassification": "modelled using other physical measurements"
+        "methodClassification": "modelled using other measurements"
     }]
 }
 TERM_ID = 'organicMatterPerM3Soil'
@@ -31,7 +31,7 @@ def _measurement(site: dict, measurement: dict):
     data['min'] = _value_func(measurement, lambda v: v * 1.4, 'min')
     data['max'] = _value_func(measurement, lambda v: v * 2.5, 'max')
     data['statsDefinition'] = MeasurementStatsDefinition.MODELLED.value
-    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_PHYSICAL_MEASUREMENTS.value
+    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
     return data | get_source(site, BIBLIO_TITLE)
 
 

hestia_earth/models/site/potentialEvapotranspirationAnnual.py

@@ -21,7 +21,7 @@ RETURNS = {
         "value": "",
         "startDate": "",
         "endDate": "",
-        "methodClassification": "modelled using other physical measurements"
+        "methodClassification": "modelled using other measurements"
     }]
 }
 TERM_ID = 'potentialEvapotranspirationAnnual'
@@ -33,7 +33,7 @@ def _measurement(value: float, start_date: str, end_date: str):
     data['value'] = [value]
     data['startDate'] = start_date
     data['endDate'] = end_date
-    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_PHYSICAL_MEASUREMENTS.value
+    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
     return data
 
 

hestia_earth/models/site/potentialEvapotranspirationMonthly.py

@@ -20,7 +20,7 @@ RETURNS = {
     "Measurement": [{
         "value": "",
         "dates": "",
-        "methodClassification": "modelled using other physical measurements"
+        "methodClassification": "modelled using other measurements"
     }]
 }
 TERM_ID = 'potentialEvapotranspirationMonthly'
@@ -31,7 +31,7 @@ def _measurement(value: list, dates: list):
     data = _new_measurement(TERM_ID)
     data['value'] = value
     data['dates'] = dates
-    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_PHYSICAL_MEASUREMENTS.value
+    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
     return data
 
 

hestia_earth/models/site/precipitationAnnual.py

@@ -21,7 +21,7 @@ RETURNS = {
         "value": "",
         "startDate": "",
         "endDate": "",
-        "methodClassification": "modelled using other physical measurements"
+        "methodClassification": "modelled using other measurements"
     }]
 }
 TERM_ID = 'precipitationAnnual'
@@ -33,7 +33,7 @@ def _measurement(value: float, start_date: str, end_date: str):
     data['value'] = [value]
     data['startDate'] = start_date
     data['endDate'] = end_date
-    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_PHYSICAL_MEASUREMENTS.value
+    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
     return data
 
 

hestia_earth/models/site/precipitationMonthly.py

@@ -20,7 +20,7 @@ RETURNS = {
     "Measurement": [{
         "value": "",
         "dates": "",
-        "methodClassification": "modelled using other physical measurements"
+        "methodClassification": "modelled using other measurements"
     }]
 }
 TERM_ID = 'precipitationMonthly'
@@ -31,7 +31,7 @@ def _measurement(value: list, dates: list):
     data = _new_measurement(TERM_ID)
     data['value'] = value
     data['dates'] = dates
-    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_PHYSICAL_MEASUREMENTS.value
+    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
     return data
 
 

hestia_earth/models/site/rainfallAnnual.py

@@ -21,7 +21,7 @@ RETURNS = {
         "value": "",
         "startDate": "",
         "endDate": "",
-        "methodClassification": "modelled using other physical measurements"
+        "methodClassification": "modelled using other measurements"
     }]
 }
 TERM_ID = 'rainfallAnnual'
@@ -33,7 +33,7 @@ def _measurement(value: float, start_date: str, end_date: str):
     data['value'] = [value]
     data['startDate'] = start_date
     data['endDate'] = end_date
-    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_PHYSICAL_MEASUREMENTS.value
+    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
     return data
 
 

hestia_earth/models/site/rainfallMonthly.py

@@ -20,7 +20,7 @@ RETURNS = {
     "Measurement": [{
         "value": "",
         "dates": "",
-        "methodClassification": "modelled using other physical measurements"
+        "methodClassification": "modelled using other measurements"
     }]
 }
 TERM_ID = 'rainfallMonthly'
@@ -31,7 +31,7 @@ def _measurement(value: list, dates: list):
     data = _new_measurement(TERM_ID)
     data['value'] = value
     data['dates'] = dates
-    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_PHYSICAL_MEASUREMENTS.value
+    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
     return data
 
 

hestia_earth/models/site/temperatureAnnual.py

@@ -21,7 +21,7 @@ RETURNS = {
         "value": "",
         "startDate": "",
         "endDate": "",
-        "methodClassification": "modelled using other physical measurements"
+        "methodClassification": "modelled using other measurements"
     }]
 }
 TERM_ID = 'temperatureAnnual'
@@ -33,7 +33,7 @@ def _measurement(value: float, start_date: str, end_date: str):
     data['value'] = [value]
     data['startDate'] = start_date
     data['endDate'] = end_date
-    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_PHYSICAL_MEASUREMENTS.value
+    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
     return data
 
 

hestia_earth/models/site/temperatureMonthly.py

@@ -20,7 +20,7 @@ RETURNS = {
     "Measurement": [{
         "value": "",
         "dates": "",
-        "methodClassification": "modelled using other physical measurements"
+        "methodClassification": "modelled using other measurements"
     }]
 }
 TERM_ID = 'temperatureMonthly'
@@ -31,7 +31,7 @@ def _measurement(value: list, dates: list):
     data = _new_measurement(TERM_ID)
     data['value'] = value
     data['dates'] = dates
-    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_PHYSICAL_MEASUREMENTS.value
+    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
     return data
 
 

hestia_earth/models/site/totalNitrogenPerKgSoil.py

@@ -17,7 +17,7 @@ RETURNS = {
         "value": "",
         "depthUpper": "0",
         "depthLower": "50",
-        "methodClassification": "modelled using other physical measurements"
+        "methodClassification": "modelled using other measurements"
     }]
 }
 TERM_ID = 'totalNitrogenPerKgSoil'
@@ -29,7 +29,7 @@ def _measurement(site: dict, value: float):
     data['value'] = [value]
     data['depthUpper'] = 0
     data['depthLower'] = 50
-    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_PHYSICAL_MEASUREMENTS.value
+    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
     return data | get_source(site, BIBLIO_TITLE)
 
 

hestia_earth/models/site/waterDepth.py

@@ -11,7 +11,7 @@ REQUIREMENTS = {
 RETURNS = {
     "Measurement": [{
         "value": "",
-        "methodClassification": "modelled using other physical measurements"
+        "methodClassification": "modelled using other measurements"
     }]
 }
 LOOKUPS = {
@@ -30,7 +30,7 @@ SITE_TYPE_TO_DEPTH = {
 def _measurement(site: dict, value: float):
     data = _new_measurement(TERM_ID)
     data['value'] = [value]
-    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_PHYSICAL_MEASUREMENTS.value
+    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
     return data | get_source(site, BIBLIO_TITLE)
 
 

hestia_earth/models/utils/lookup.py

@@ -76,7 +76,7 @@ _ALLOW_ALL = 'all'
 def _model_lookup_values(model: str, term: dict, restriction: str):
     lookup = download_lookup(f"{term.get('termType')}-model-{restriction}.csv")
     values = get_table_value(lookup, 'termid', term.get('@id'), column_name(model))
-    return (values or _ALLOW_ALL).split(';')
+    return (values or _ALLOW_ALL).split(';') if isinstance(values, str) else _ALLOW_ALL
 
 
 def is_model_siteType_allowed(model: str, term: dict, data: dict):
@@ -89,7 +89,7 @@ def is_model_siteType_allowed(model: str, term: dict, data: dict):
 def _lookup_values(term: dict, column: str):
     lookup = download_lookup(f"{term.get('termType')}.csv")
     values = get_table_value(lookup, 'termid', term.get('@id'), column_name(column))
-    return (values or _ALLOW_ALL).split(';')
+    return (values or _ALLOW_ALL).split(';') if isinstance(values, str) else _ALLOW_ALL
 
 
 def is_siteType_allowed(data: dict, term: dict):

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.53.12'
+VERSION = '0.54.1'

{hestia_earth_models-0.53.12.dist-info → hestia_earth_models-0.54.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.53.12
+Version: 0.54.1
 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
@@ -11,7 +11,7 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Programming Language :: Python :: 3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: hestia-earth.schema >=23.7.0
+Requires-Dist: hestia-earth.schema ==24.*
 Requires-Dist: hestia-earth.utils >=0.11.12
 Requires-Dist: python-dateutil >=2.8.1
 Requires-Dist: CurrencyConverter ==0.16.8

{hestia_earth_models-0.53.12.dist-info → hestia_earth_models-0.54.1.dist-info}/RECORD

@@ -3,7 +3,7 @@ hestia_earth/models/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3
 hestia_earth/models/cache_sites.py,sha256=kp_3D09P-JdAn9vt7eU-KKTwd6BAXWKQL_0UQCDsH2s,4798
 hestia_earth/models/log.py,sha256=kPLBOABkSiiAaPejXYvDJ9g6RbaXQXgtOZP2x9v_FwA,3008
 hestia_earth/models/requirements.py,sha256=znNZJAhwX2iYiKcAQXPftY7z_1MsNa0QxCXkXyHm_U0,17363
-hestia_earth/models/version.py,sha256=bY-UXBRR6HkkERACUFcY5JHR9kpK1oBg2Rl-fIfwbNA,20
+hestia_earth/models/version.py,sha256=zfnCjNaSTHlVSA05T5eojWihV7uCYZpJOHnNMPfNEts,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=mrh8seYSYdTgcMDCETLiknuPeJehg071YoG4UiyW0yU,4404
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=_Rbngu0DzHKa62JwBl58ZC_ui1zLF2que_nB7ukhOQc,3392
@@ -67,7 +67,7 @@ hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioEnergy.py,sha25
 hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioFedWeight.py,sha256=RJFNK1g1bnX1146-d0K4ADI-wx-yyVdohHP3MXKJusM,1533
 hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioNitrogen.py,sha256=DtgaZbPhYJ-cSqTNhfusL44ok-7ChAA3LMEa01fVhUI,1819
 hestia_earth/models/cycle/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hestia_earth/models/cycle/input/ecoinventV3.py,sha256=tJUrnY5oSmNj3RkPoNC0yUbGTYEM3QBv3tuLDm9DMk0,5839
+hestia_earth/models/cycle/input/ecoinventV3.py,sha256=aATN9BBz7-jfxMIkUx0BJYDJJd7kAbfOcWTDciaplVM,5882
 hestia_earth/models/cycle/input/hestiaAggregatedData.py,sha256=pwHaPqJjM23AaXvMn_sPmyGg-lNgnmNbHezFWlBTZns,9136
 hestia_earth/models/cycle/input/properties.py,sha256=i_zRwRzbQsjIhz1PF0foHSPYu18zg1zKhpLoHlSxKiE,1964
 hestia_earth/models/cycle/input/value.py,sha256=kolH9Fc5GIn9OVH2DgHEaW8ksS4xisy0LerS3WkKK9E,1550
@@ -136,7 +136,7 @@ hestia_earth/models/geospatialDatabase/potentialEvapotranspirationLongTermAnnual
 hestia_earth/models/geospatialDatabase/precipitationAnnual.py,sha256=8_lMKVUPClnp7tetHrsoUY2ZGG2J7c-cXqJD8rznp0Q,2803
 hestia_earth/models/geospatialDatabase/precipitationLongTermAnnualMean.py,sha256=fS5knfil5f2QP8-gxFdXuoGTxXpzoJQZ9h4UjWIWjCA,2376
 hestia_earth/models/geospatialDatabase/region.py,sha256=rdywdsI4OglcO05tih0UQx0qbnm8BAn7mP-x74iV03c,1462
-hestia_earth/models/geospatialDatabase/sandContent.py,sha256=Vv-GssCnyMCkuzR7eo9kUybSMwsqwxKlOQM1Ulx9fYc,2108
+hestia_earth/models/geospatialDatabase/sandContent.py,sha256=34gmXDuv8pA7KGmxWQ8YEVnaJxHN2oS6lCgFVmr6qHc,2114
 hestia_earth/models/geospatialDatabase/siltContent.py,sha256=SC0AzPRq9U5tQVh7wv_8RvQVd-0dT7kiYWDDLaO1IRQ,2169
 hestia_earth/models/geospatialDatabase/slope.py,sha256=g1SpuYks60injv2w-CMjESNfu8KM1JsiYnRT9XZfSuY,1859
 hestia_earth/models/geospatialDatabase/slopeLength.py,sha256=6pGr1qR0EiiUKkeflpYut7eI6UsnXAzHDoHhAzXKFJk,1864
@@ -163,7 +163,7 @@ hestia_earth/models/hyde32/landTransformationFromPermanentPasture100YearAverageD
 hestia_earth/models/hyde32/landTransformationFromPermanentPasture20YearAverageDuringCycle.py,sha256=khH8zdALTeaCaIDK6L-3OexD03I7MB8vA_mBOSkwe1M,2408
 hestia_earth/models/hyde32/utils.py,sha256=j9QavyBZIQ-ZCNjdPLWjOjg2LrxcNlanQ1wPnT0IKX8,3098
 hestia_earth/models/impact_assessment/__init__.py,sha256=gTR_PhWps593fPhm-V826VLLrZVH8CNQTqxExB7GGNI,418
-hestia_earth/models/impact_assessment/emissions.py,sha256=XcHTqyPAZeCz7qPTD8VvccmYMYROqBGrR0zJNpZtmvM,3413
+hestia_earth/models/impact_assessment/emissions.py,sha256=zRQd17joMqij8mjRcrY9LssHgwzsYC5bkoy7iGdjj-Q,3429
 hestia_earth/models/impact_assessment/freshwaterWithdrawalsDuringCycle.py,sha256=ljh9vou6jJzNjWCtdLsvozx2S1K9cQvWVxifk6mMWso,3952
 hestia_earth/models/impact_assessment/freshwaterWithdrawalsInputsProduction.py,sha256=DSLX_aEWaUFcFZRD46bG5lIQ4TtAtIqH-sMkVCJH2Dg,990
 hestia_earth/models/impact_assessment/irrigated.py,sha256=0lFUPRUwQze283F6aCsqiBJ2pbFNPvApcbppwbSF2SE,749
@@ -226,7 +226,7 @@ hestia_earth/models/ipcc2019/no3ToGroundwaterExcreta.py,sha256=WNfaopS9canZs5zeP
 hestia_earth/models/ipcc2019/no3ToGroundwaterInorganicFertiliser.py,sha256=X2WPGOiWi_1cQ5yiyjfrBU_rAm3EDsm4WnRJi8ea6g8,3007
 hestia_earth/models/ipcc2019/no3ToGroundwaterOrganicFertiliser.py,sha256=Q6XLA-yUEJFQCrk1N4Tq2DiMSACI7XnsW_Mn595V1as,3102
 hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=UTQ2PkqceBV1UC9u6qfIArrlqIvWuO3r-cvUE5jmEsE,75841
-hestia_earth/models/ipcc2019/pastureGrass.py,sha256=vPFrkIZH5mr7oAAe62eGm1zIUAsQlwvf9_OOFl-JSqo,21833
+hestia_earth/models/ipcc2019/pastureGrass.py,sha256=oqr1z-4F0muU1m636Kbozfs5aaJB7_r28nahqjkGx5I,21894
 hestia_earth/models/ipcc2019/utils.py,sha256=he8OFl72a2UZpqHFRsf7gyQFjrqUxiMYzqmBVSCvD9E,3158
 hestia_earth/models/ipcc2021/__init__.py,sha256=VTgGFKhwMmk_nuI1RRq0in27fHYVPBonlXlPK00K8no,409
 hestia_earth/models/ipcc2021/gwp100.py,sha256=HEV4Misbe5h99qCqZeCaKNTs4FkFWmv6RdCty_U2pps,947
@@ -328,7 +328,7 @@ hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystems
 hestia_earth/models/linkedImpactAssessment/__init__.py,sha256=4UZB1SC_7bzmi4f3qf3yVB7PfEXSCG2OfnAJfgst5bM,3428
 hestia_earth/models/mocking/__init__.py,sha256=kmSeOTSvurMUxw7Ajhf3G-SVPQ1NgmirMTk4TSOEicY,765
 hestia_earth/models/mocking/mock_search.py,sha256=V-ycVBTkJu7PP37Ivy_16hpKBV4aEtJb5S9DfChPNSU,2038
-hestia_earth/models/mocking/search-results.json,sha256=rtpoLvGELlqFKrD4CXkmGDlUVA33zHoEjLd2mVG3AQk,32915
+hestia_earth/models/mocking/search-results.json,sha256=L11QB1Yg0B3lIVgeHKMJHhuZECuIREEqxjRrFrYxq2g,32915
 hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
 hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=Qt-mel4dkhK6N5uUOutNOinCTFjbjtGzITaaI0LvYc4,2396
 hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=pAAMrlGgarI3mhi2L07kiEVhfKif_hq1FfzHurmRTag,2071
@@ -419,25 +419,25 @@ hestia_earth/models/schmidt2007/__init__.py,sha256=xheSN6LOGXpWx7Hnv83onhe60Xk1_
 hestia_earth/models/schmidt2007/ch4ToAirWasteTreatment.py,sha256=-N5uLvVHlA2djOs_lwR_8RmbeCfkPw5p3vmbqG2kzkI,1474
 hestia_earth/models/schmidt2007/utils.py,sha256=NGG5iJI5F1PFSscW2u2Z4clj6UFXVfCewqRnXB5Pv48,815
 hestia_earth/models/site/__init__.py,sha256=aVuLLhq0OQVm-_MZoq4JAKMidqexUWJBg_7mmojmDzc,405
-hestia_earth/models/site/cationExchangeCapacityPerKgSoil.py,sha256=gwxvLZ9IW1WgcypoY-Wul0xzBhxYYyB0FR5MNOMFnVQ,3671
-hestia_earth/models/site/flowingWater.py,sha256=l1nZejHjZII2mZJXPNY4YUQCRHwdM9Dk7eoZIjoH0ac,1746
-hestia_earth/models/site/netPrimaryProduction.py,sha256=Xt3EBMDkwY4HbnTfl2pEgCWbg3-KK9vt44XdMVgnqyc,1867
-hestia_earth/models/site/organicCarbonPerHa.py,sha256=orKrQYg-tUpaBpmWV7aV8j4M7mpNUF7w1iUBZiTk8AA,4445
-hestia_earth/models/site/organicCarbonPerKgSoil.py,sha256=6125cUbqbJoSQajNHQypYz7qptRsH2NkWi35UqlCGuc,1963
-hestia_earth/models/site/organicCarbonPerM3Soil.py,sha256=hSTj_SLcQ7VrpA8pG9am5Au63Nt8S1PDQwegVGpt1Vg,1963
-hestia_earth/models/site/organicMatterPerKgSoil.py,sha256=_W8mAI3siCxPHAysqbOaK_lXg5t9VzR9ljVI32GFDBM,1963
-hestia_earth/models/site/organicMatterPerM3Soil.py,sha256=udlLE7R5k9OiKSJ4CSOCl4ytGfwqwOOLWEj2QCFtghs,1963
-hestia_earth/models/site/potentialEvapotranspirationAnnual.py,sha256=-FzUbcuPtOGe2wEwn7nIO2DT2QLX4lsoYKiiwt_qqcc,2078
-hestia_earth/models/site/potentialEvapotranspirationMonthly.py,sha256=0BikW5_fSJ7za0lMEoyaYM-A4Gppm1i3SQtRMBEg4Io,1956
-hestia_earth/models/site/precipitationAnnual.py,sha256=k13_yPvTlnMlZAI3kyeh2SRGut7cEAi3H45YATy6-74,2036
-hestia_earth/models/site/precipitationMonthly.py,sha256=ZGOyAbig8_BloBIAzsR8CV7aspdNKMat4GnCT6O3i-M,1914
-hestia_earth/models/site/rainfallAnnual.py,sha256=zwRdEhP4G1gUJPxSE9nqZamGDXv3cIpZ3K2YujoeLNA,2021
-hestia_earth/models/site/rainfallMonthly.py,sha256=40MwLrsHmhpWAC2T-bE9EsFRSzc1Y4Z6TiK0IQXRCeo,1899
-hestia_earth/models/site/temperatureAnnual.py,sha256=Whah30OuSS5QRmFCeSnbPIfrxGEiUIqnw1gsmg7nHMI,2030
-hestia_earth/models/site/temperatureMonthly.py,sha256=lAOo7jprqmRaVFRQHrgiLTptnDjasclmss2sFCKwJmw,1908
-hestia_earth/models/site/totalNitrogenPerKgSoil.py,sha256=R96ODvLmkk9LgJ-eI4UtlJ7ddoiFcFAjZ42hLZ9euhM,1956
+hestia_earth/models/site/cationExchangeCapacityPerKgSoil.py,sha256=0eH4A-tXJ0hvIkiYXWxlx8TfrdbIKUGYUDk97-yQJgg,3653
+hestia_earth/models/site/flowingWater.py,sha256=0ZuSXMr3EUTY3wsy8hdfuXeZcNX-n3D45MfX3dwyaeA,1728
+hestia_earth/models/site/netPrimaryProduction.py,sha256=UIIQkYd911qVzrWjxBLrC37e-RARIVgDwLdARY9BuLw,1849
+hestia_earth/models/site/organicCarbonPerHa.py,sha256=jmrrkztrGes7X2nb7c2p0zZzpOhCDOHEiXbA7Vmi5sw,4427
+hestia_earth/models/site/organicCarbonPerKgSoil.py,sha256=t--wAshiAKS-JvEKhLFRadGvgSBv5NFZ68jdyms_wh4,1945
+hestia_earth/models/site/organicCarbonPerM3Soil.py,sha256=pdv5V-ojcfhlGzPwRS9s-vEnxiHZQPZP-ESVcz2pt0g,1945
+hestia_earth/models/site/organicMatterPerKgSoil.py,sha256=fJpFVkpuCjnrBhgV0RtwKqQHvAJWWtZO9xtmnJnl8O4,1945
+hestia_earth/models/site/organicMatterPerM3Soil.py,sha256=FTNc0FKnWt91BvbsIrBx_0SoGfuqnAC0AlTUL5RvzZ8,1945
+hestia_earth/models/site/potentialEvapotranspirationAnnual.py,sha256=9vYppO56PZpt0R3OIr81FHvo81L-waceo9_OnfNgNQM,2060
+hestia_earth/models/site/potentialEvapotranspirationMonthly.py,sha256=DGBCoRLBcrrKn0zK9YopAgnw0J2aOBFlak63Kdh898k,1938
+hestia_earth/models/site/precipitationAnnual.py,sha256=to14BEFjUaYyCu5aIBQZtuaIr1xsbg5tIyKqWPTrn5k,2018
+hestia_earth/models/site/precipitationMonthly.py,sha256=yGUbiUCu1Prp3qVHuZodGrcfrbYu170WTUGyaj-KEjY,1896
+hestia_earth/models/site/rainfallAnnual.py,sha256=Ix_B8Ny7IIRkJ_3lUvoHOjPgqCyR9I0U3_ADUUtMqsY,2003
+hestia_earth/models/site/rainfallMonthly.py,sha256=2Uo8F-YxnTK0_txlHmiAyVp1bGfWD4bneRKyg4tdQkI,1881
+hestia_earth/models/site/temperatureAnnual.py,sha256=Q3b1RH2_hpA0JWwOYA5nKgMGcXHjV8-akXT9vB0cbwc,2012
+hestia_earth/models/site/temperatureMonthly.py,sha256=yXwpFCGT2tUqvVBNedaPyBmN_KlzZqo5yv2TWem1pBk,1890
+hestia_earth/models/site/totalNitrogenPerKgSoil.py,sha256=8ERrTZpN_yCRUyFg_EYaX4abE9jLcyX3lx3MO4Bi6CE,1938
 hestia_earth/models/site/utils.py,sha256=sX-U-Edomaw5hhXZVQJ5ugWJmk8-jpdgWts6xDaulRo,3303
-hestia_earth/models/site/waterDepth.py,sha256=5_5iLEJIJBs2sYnVDM86XknwV_wB4r7mq-TGsDgWuPA,1311
+hestia_earth/models/site/waterDepth.py,sha256=uasApPdOzibZMiOyKNKr_ajAkzwUEEPm1j0FNEy49TY,1293
 hestia_earth/models/site/measurement/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/models/site/measurement/value.py,sha256=7IhUbIj7n5vB7yXoNxXsWbliEJjg1Ww3T5g_P2IyNCU,1661
 hestia_earth/models/site/post_checks/__init__.py,sha256=CkExxesk1GuG8NjrbKfix1iDuVUgU-9i1ccM_X7MZn4,284
@@ -494,7 +494,7 @@ hestia_earth/models/utils/indicator.py,sha256=fPq38ifd53xWbuOfoiVwiA0Nwa7jVPJLSA
 hestia_earth/models/utils/inorganicFertiliser.py,sha256=T48wQlPAAZNpmbAq-58y7wlR7HxdIyOulWfuOKkbBZg,1573
 hestia_earth/models/utils/input.py,sha256=4zeBsdVKredh4pjMxVJjJU9mKNoBah1LisKl_Tr3yj0,6879
 hestia_earth/models/utils/liveAnimal.py,sha256=u_Lym0hVinncCZMYF_KscCA3vuelWmlyHn4I-jVRDs4,1505
-hestia_earth/models/utils/lookup.py,sha256=HIgHg-3ITvcfwVtAbYOkKM-U6YXyMeb3Wq-tOho2GGk,6169
+hestia_earth/models/utils/lookup.py,sha256=3tXnOaTGF91NhL9NsM0hQ05Vm_bQQG6aNgC5dEq0KdQ,6255
 hestia_earth/models/utils/measurement.py,sha256=yc-0YVsHH5iYdXfrUGhs3OLn6fCLPcgXpMXyG3ivRq8,7933
 hestia_earth/models/utils/pesticideAI.py,sha256=pmjiFJkMLodXSP16VnxT7YizH-LBFFvEsvShplyAPB8,1374
 hestia_earth/models/utils/practice.py,sha256=tNadOzsrNlCEt801B815XaruJXzZ5yPASam7B3sWpXE,1091
@@ -725,7 +725,7 @@ tests/models/ipcc2019/test_no3ToGroundwaterExcreta.py,sha256=Z-pCBQvlUf0ttmCERge
 tests/models/ipcc2019/test_no3ToGroundwaterInorganicFertiliser.py,sha256=e7REnQ9r9a8xroq5aPp0NIzmkad_6MyTuceRTYoKdkE,1613
 tests/models/ipcc2019/test_no3ToGroundwaterOrganicFertiliser.py,sha256=e1ZViD12qB3bLdH3TJw3GbBP8iqMen-UJbcFkytb3VQ,1609
 tests/models/ipcc2019/test_organicCarbonPerHa.py,sha256=BNr3tPzMbEKXyhCIudq3HC5FJs_Pi387r1gcy8bfZeQ,4852
-tests/models/ipcc2019/test_pastureGrass.py,sha256=fs_og0NM_XiJuFgL8UXegjOvKj7bL2koxXeOionbebs,1912
+tests/models/ipcc2019/test_pastureGrass.py,sha256=nT2_TUxehiiUhR3KCKkBhFRnam__NbQOznLOENGkQTw,2229
 tests/models/ipcc2021/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/ipcc2021/test_gwp100.py,sha256=r3pDw_TUcOrNlNRWtFAN3CBWfG5FCkHExypVqg0sZVk,857
 tests/models/jarvisAndPain1994/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -983,8 +983,8 @@ tests/models/utils/test_source.py,sha256=_Ol-OrJs2Tt9iZAZ_RY2qRuSbnE4yz5OuEGkDSb
 tests/models/utils/test_term.py,sha256=-Wn2C1jyOLfkvhcKmKWT-Jms7yqLwx5ok91gYJNcGWc,2028
 tests/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/webbEtAl2012AndSintermannEtAl2012/test_nh3ToAirOrganicFertiliser.py,sha256=qi2FNXS5Af2WDtm7nq_FsprH3BfCF0XxnE0XHmC4aIY,2244
-hestia_earth_models-0.53.12.dist-info/LICENSE,sha256=EFSZhfUdZCTsCIYdHzTGewMKfRfp7X9t1s2aaKxm8O0,1154
-hestia_earth_models-0.53.12.dist-info/METADATA,sha256=ziO4YGhf-UEZcovRnG2EbIxkvzVADjCoCrBjMTXlOp0,3204
-hestia_earth_models-0.53.12.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-hestia_earth_models-0.53.12.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.53.12.dist-info/RECORD,,
+hestia_earth_models-0.54.1.dist-info/LICENSE,sha256=EFSZhfUdZCTsCIYdHzTGewMKfRfp7X9t1s2aaKxm8O0,1154
+hestia_earth_models-0.54.1.dist-info/METADATA,sha256=aa2Ac5WfwSF6rUSBdcv_zQvKCZGiusqSBMWh2e51YGQ,3201
+hestia_earth_models-0.54.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+hestia_earth_models-0.54.1.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.54.1.dist-info/RECORD,,

{hestia_earth_models-0.53.12.dist-info → hestia_earth_models-0.54.1.dist-info}/WHEEL

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

tests/models/ipcc2019/test_pastureGrass.py

@@ -10,6 +10,10 @@ MILK_YIELD_TERMS = ['milkYieldPerCowRaw', 'milkYieldPerSheepRaw']
 WOOL_TERMS = ['woolSheepGreasy']
 
 
+def fake_download_hestia(term_id: str, *args): return {'@id': term_id, 'termType': 'forage'}
+
+
+@patch(f"{class_path}.download_hestia", side_effect=fake_download_hestia)
 @patch(f"{class_path}.get_wool_terms", return_value=WOOL_TERMS)
 @patch(f"{class_path}.get_milkYield_terms", return_value=MILK_YIELD_TERMS)
 @patch(f"{class_path}._new_input", side_effect=fake_new_input)
@@ -24,6 +28,7 @@ def test_run(*args):
     assert value == expected
 
 
+@patch(f"{class_path}.download_hestia", side_effect=fake_download_hestia)
 @patch(f"{class_path}.get_wool_terms", return_value=WOOL_TERMS)
 @patch(f"{class_path}.get_milkYield_terms", return_value=MILK_YIELD_TERMS)
 @patch(f"{class_path}._new_input", side_effect=fake_new_input)
@@ -38,6 +43,7 @@ def test_run_with_feed(*args):
     assert value == expected
 
 
+@patch(f"{class_path}.download_hestia", side_effect=fake_download_hestia)
 @patch(f"{class_path}.get_wool_terms", return_value=WOOL_TERMS)
 @patch(f"{class_path}.get_milkYield_terms", return_value=MILK_YIELD_TERMS)
 @patch(f"{class_path}._new_input", side_effect=fake_new_input)