hestia-earth-models 0.74.8__py3-none-any.whl → 0.74.9__py3-none-any.whl

hestia_earth/models/site/pre_checks/country.py

@@ -1,6 +1,5 @@
 from hestia_earth.schema import TermTermType
-
-from hestia_earth.models.utils.term import download_term
+from hestia_earth.utils.term import download_term
 
 
 def run(site: dict): return site | {'country': download_term(site.get('country', {}).get('@id'), TermTermType.REGION)}

hestia_earth/models/utils/__init__.py

@@ -22,11 +22,9 @@ CACHE_KEY = '_cache'
 
 
 def cached_value(node: dict, key: str = None, default=None):
-    cache = node.get(CACHE_KEY, {})
-    return cache.get(key, default) if all([
-        key,
-        cache is not None
-    ]) else cache
+    cache = node.get(CACHE_KEY) or {}
+    value = cache.get(key) if key else cache
+    return default if value is None else value
 
 
 def group_by(values: list, keys: list):
@@ -101,6 +99,10 @@ def multiply_values(values: list):
     return reduce(operator.mul, filtered_values, 1) if len(filtered_values) > 1 else None
 
 
+def clamp(value: Union[int, float], min_value: Union[int, float], max_value: Union[int, float]):
+    return min(max_value, max(min_value, value))
+
+
 def _numeric_weighted_average(values: list):
     total_weight = sum(Decimal(str(weight)) for _v, weight in values) if values else Decimal(0)
     weighted_values = [Decimal(str(value)) * Decimal(str(weight)) for value, weight in values]

hestia_earth/models/utils/blank_node.py

@@ -33,13 +33,14 @@ from hestia_earth.utils.lookup_utils import (
     is_input_id_allowed,
     is_input_termType_allowed
 )
+from hestia_earth.utils.term import download_term
 
 from hestia_earth.models.log import debugValues, log_as_table
 from . import is_from_model, _filter_list_term_unit, is_iterable, full_date_str
 from .constant import Units, get_atomic_conversion
 from .lookup import _node_value
 from .property import get_node_property, get_node_property_value
-from .term import get_lookup_value, download_term
+from .term import get_lookup_value
 
 # TODO: verify those values
 MAX_DEPTH = 1000
@@ -824,7 +825,11 @@ def _gapfill_datestr(datestr: str, mode: DatestrGapfillMode = DatestrGapfillMode
     _datestr = str(datestr)
     format = _get_datestr_format(_datestr)
     should_run = format in VALID_DATE_FORMATS
-    return DATESTR_GAPFILL_MODE_TO_GAPFILL_FUNCTION[mode](_datestr, format) if should_run else _datestr
+    return (
+        None if datestr is None else
+        DATESTR_GAPFILL_MODE_TO_GAPFILL_FUNCTION[mode](_datestr, format) if should_run else
+        _datestr
+    )
 
 
 def _str_dates_match(date_str_one: str, date_str_two: str, mode=DatestrGapfillMode.END) -> bool:

hestia_earth/models/utils/completeness.py

@@ -1,7 +1,6 @@
 from typing import Union
 from hestia_earth.schema import Completeness, TermTermType
-
-from .term import download_term
+from hestia_earth.utils.term import download_term
 
 completeness_fields = Completeness().required
 

hestia_earth/models/utils/emission.py

@@ -3,9 +3,9 @@ from typing import Optional, Union
 from hestia_earth.schema import EmissionMethodTier, SchemaType, TermTermType
 from hestia_earth.utils.model import linked_node
 from hestia_earth.utils.emission import cycle_emissions_in_system_boundary, emissions_in_system_boundary
+from hestia_earth.utils.term import download_term
 
 from . import flatten_args
-from .term import download_term
 from .blank_node import find_terms_value
 from .method import include_methodModel
 from .constant import Units, get_atomic_conversion

hestia_earth/models/utils/indicator.py

@@ -1,8 +1,8 @@
 from hestia_earth.schema import SchemaType, TermTermType
 from hestia_earth.utils.model import linked_node
+from hestia_earth.utils.term import download_term
 
 from .method import include_methodModel
-from .term import download_term
 
 
 def _new_indicator(

hestia_earth/models/utils/input.py

@@ -2,12 +2,12 @@ from hestia_earth.schema import SchemaType, TermTermType
 from hestia_earth.utils.model import find_term_match, linked_node, filter_list_term_type
 from hestia_earth.utils.tools import list_sum, non_empty_list, list_average, flatten
 from hestia_earth.utils.lookup import download_lookup, get_table_value, column_name
+from hestia_earth.utils.term import download_term
 
 from hestia_earth.models.log import logger
 from . import _filter_list_term_unit, _load_calculated_node, group_by
 from .constant import Units
 from .blank_node import get_total_value, get_total_value_converted, get_lookup_value
-from .term import download_term
 from .method import include_model
 
 

hestia_earth/models/utils/management.py

@@ -1,7 +1,7 @@
 from hestia_earth.schema import SchemaType
 from hestia_earth.utils.model import linked_node
+from hestia_earth.utils.term import download_term
 
-from .term import download_term
 from .method import include_model
 
 

hestia_earth/models/utils/measurement.py

@@ -7,11 +7,12 @@ from hestia_earth.schema import MeasurementMethodClassification, SchemaType, Ter
 from hestia_earth.utils.model import linked_node, filter_list_term_type
 from hestia_earth.utils.tools import non_empty_list, flatten, safe_parse_float, list_sum
 from hestia_earth.utils.date import diff_in_days
+from hestia_earth.utils.term import download_term
 
 from . import flatten_args
 from .blank_node import most_relevant_blank_node_by_id
 from .method import include_method
-from .term import download_term, get_lookup_value
+from .term import get_lookup_value
 
 
 # TODO: verify those values

hestia_earth/models/utils/method.py

@@ -1,8 +1,7 @@
 from typing import Union
 from hestia_earth.schema import TermTermType
 from hestia_earth.utils.model import linked_node
-
-from .term import download_term
+from hestia_earth.utils.term import download_term
 
 
 def include_method(node: dict, term_id: Union[None, str, dict], key='method'):

hestia_earth/models/utils/practice.py

@@ -1,7 +1,7 @@
 from hestia_earth.schema import SchemaType
 from hestia_earth.utils.model import linked_node
+from hestia_earth.utils.term import download_term
 
-from .term import download_term
 from .method import include_model
 
 

hestia_earth/models/utils/product.py

@@ -1,12 +1,13 @@
 from hestia_earth.schema import SchemaType, TermTermType, UNIQUENESS_FIELDS
 from hestia_earth.utils.model import filter_list_term_type, find_term_match, linked_node
 from hestia_earth.utils.tools import flatten, list_sum, non_empty_list, get_dict_key
+from hestia_earth.utils.term import download_term
 
 from .blank_node import get_total_value, get_total_value_converted
 from .constant import Units
 from .currency import DEFAULT_CURRENCY
 from .property import _get_nitrogen_content, get_node_property_value
-from .term import get_rice_paddy_terms, download_term
+from .term import get_rice_paddy_terms
 from .method import include_model
 
 

hestia_earth/models/utils/property.py

@@ -2,10 +2,11 @@ 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
 from hestia_earth.utils.tools import list_sum, safe_parse_float
+from hestia_earth.utils.term import download_term
 
 from hestia_earth.models.log import debugMissingLookup
 from .method import include_methodModel
-from .term import download_term, get_lookup_value
+from .term import get_lookup_value
 
 
 def _new_property(term, model=None):

hestia_earth/models/utils/term.py

@@ -1,9 +1,5 @@
-from typing import Union
-from functools import lru_cache
-import json
 from hestia_earth.schema import SchemaType, TermTermType, SiteSiteType
-from hestia_earth.utils.storage import _load_from_storage
-from hestia_earth.utils.api import find_node, search, download_hestia
+from hestia_earth.utils.api import find_node, search
 from hestia_earth.utils.lookup import download_lookup, get_table_value, column_name
 
 from .constant import Units
@@ -24,28 +20,6 @@ def get_lookup_value(lookup_term: dict, column: str, skip_debug: bool = False, *
     return value
 
 
-@lru_cache()
-def _load_term_file(term_type: str):
-    try:
-        filepath = f"glossary/{term_type}.json"
-        nodes = json.loads(_load_from_storage(filepath, glossary=True))
-        return {node.get('@id'): node for node in nodes}
-    except Exception as e:
-        print(e)
-        return {}
-
-
-def download_term(term: Union[str, dict], termType: Union[str, TermTermType] = None):
-    term_id = term.get('@id', term.get('id')) if isinstance(term, dict) else term
-    term_type = (
-        termType if isinstance(termType, str) else termType.value
-    ) if termType else (
-        term.get('termType') if isinstance(term, dict) else None
-    )
-    cached_nodes = _load_term_file(term_type) if term_type else {}
-    return cached_nodes.get(term_id) or download_hestia(term_id)
-
-
 def get_liquid_fuel_terms():
     """
     Find all "liquid" `fuel` terms from the Glossary:

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.74.8'
+VERSION = '0.74.9'

{hestia_earth_models-0.74.8.dist-info → hestia_earth_models-0.74.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.74.8
+Version: 0.74.9
 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<34.0.0,>=33.5.0
-Requires-Dist: hestia-earth-utils>=0.15.3
+Requires-Dist: hestia-earth-utils>=0.15.4
 Requires-Dist: CurrencyConverter==0.16.8
 Requires-Dist: haversine>=2.7.0
 Requires-Dist: pydash

{hestia_earth_models-0.74.8.dist-info → hestia_earth_models-0.74.9.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_sites.py,sha256=XpXnkYt823PQzrswgP__L4CT8xZG_n7a41CIHK8wQ3U,6427
+hestia_earth/models/cache_sites.py,sha256=0TK08ewVobQkXQ-qph_uB_mfoOhEqcPr4KKwlPWgUKs,6439
 hestia_earth/models/log.py,sha256=LQ6nRMc5q8-xs8DsAx9h8drWhWLkqDG9dFlG9OzFbeA,3780
 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=-wuvJ1GtnrOy27v23QyY0WC6EdzSWkVUnvb7IrBJ6Pg,19
+hestia_earth/models/version.py,sha256=Aws-_3hpZkZ3RuLK_wjvQCYDxquGNGglGKckpm_2ER0,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
@@ -144,12 +144,12 @@ 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/liveweightPerHead.py,sha256=2BmSe8xdEdm68i6t_UkeXQshxLH3WVNyvButsoE_9zE,5031
+hestia_earth/models/faostat2018/liveweightPerHead.py,sha256=mzMgdbuuAPr4R5D_fr-Xsnfd47JYTG-Nn_ux0IOvcjM,5024
 hestia_earth/models/faostat2018/readyToCookWeightPerHead.py,sha256=obJLPV8GgG2lEhLqg9RrJLSFPzbasXJnmzHnwkpW7O0,3131
 hestia_earth/models/faostat2018/seed.py,sha256=brDGypvFJR6gpb4VMTW16cN2Jw0jbvD2msV-NMWuwxQ,2948
 hestia_earth/models/faostat2018/utils.py,sha256=bxd4dtML0z5D5LP7peZTcvt7U6GLxGdXzt2CtpqoCQA,7846
 hestia_earth/models/faostat2018/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hestia_earth/models/faostat2018/product/price.py,sha256=6oG8n-tGFRX2p4aC1RBeEvO7iexooFiRok39m8f4VN0,7734
+hestia_earth/models/faostat2018/product/price.py,sha256=3q9E2FT95LDhdxlfOm8leqOICf0r8zx8IkI6Hr_Hf-I,7727
 hestia_earth/models/frischknechtEtAl2000/__init__.py,sha256=Fixyy9UwoCGP5-MHyJu_ctS40SQ2imfvZo8a547029U,421
 hestia_earth/models/frischknechtEtAl2000/ionisingRadiationKbqU235Eq.py,sha256=LVHTTauExpp2xTUaJtqEggj38-RIY1nKuAQ4d-AnCVA,4443
 hestia_earth/models/geospatialDatabase/__init__.py,sha256=TH-FW3aoL7r1GquRChr7rde7uQonKQRDR00udG8tDrQ,957
@@ -159,7 +159,7 @@ hestia_earth/models/geospatialDatabase/awareWaterBasinId_v1.py,sha256=xuUD-isJSD
 hestia_earth/models/geospatialDatabase/clayContent.py,sha256=Rre3QpoYXViJEZv8XqDdiC7_86LjYNt9DwQmhlLd0a4,3398
 hestia_earth/models/geospatialDatabase/croppingIntensity.py,sha256=d1WIrxO4rFj5Oj-k8f1eaVIOR6sfke2CYH8lwtuE_BM,2565
 hestia_earth/models/geospatialDatabase/drainageClass.py,sha256=O77j_OqMMoRw-nlIpFp6T8A6D8Feg7M7nX527Inw5z8,1915
-hestia_earth/models/geospatialDatabase/ecoClimateZone.py,sha256=WBeaYmzer3CeviHnnfK0xIn_3inpkDKqxszFluz0xPQ,2658
+hestia_earth/models/geospatialDatabase/ecoClimateZone.py,sha256=y94W6nqVaLqWXJpkxGZkjaJDloT_Uv447nVdBw4sFSs,2666
 hestia_earth/models/geospatialDatabase/ecoregion.py,sha256=Hr2zJd-KGmOB5PU6nAbTtnUDWMBwhFOUf8PwT-lcPis,1206
 hestia_earth/models/geospatialDatabase/erodibility.py,sha256=M62CetEcHuExeXl7P7DVKZWWbk9tenjaDFvjMsWbga4,1843
 hestia_earth/models/geospatialDatabase/heavyWinterPrecipitation.py,sha256=54pvHOfcfEUNNhTIWIPGRzqO_t59ACh-zhnLidO2xro,1956
@@ -173,7 +173,7 @@ hestia_earth/models/geospatialDatabase/potentialEvapotranspirationMonthly.py,sha
 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
+hestia_earth/models/geospatialDatabase/region.py,sha256=qB3q7qlCV5MyjoxdPxwjxm58Q8pTplyLGEz-8KryALA,1441
 hestia_earth/models/geospatialDatabase/sandContent.py,sha256=qOMmL6MRMyVYm3PXy94Sp0ILm8iFicKB_7t57vHOyA8,3398
 hestia_earth/models/geospatialDatabase/siltContent.py,sha256=rFUlQ3SlwCJFcMYQd5F6t3bnDMjcRilsXk2rShoa5Tk,3786
 hestia_earth/models/geospatialDatabase/slope.py,sha256=g1SpuYks60injv2w-CMjESNfu8KM1JsiYnRT9XZfSuY,1859
@@ -184,27 +184,27 @@ hestia_earth/models/geospatialDatabase/temperatureLongTermAnnualMean.py,sha256=y
 hestia_earth/models/geospatialDatabase/temperatureMonthly.py,sha256=E2k2kkhVDtmeFEB4_AZhhq5od57lRDMWu6AqaurgqvQ,3194
 hestia_earth/models/geospatialDatabase/totalNitrogenPerKgSoil.py,sha256=eajSzMCX201k_xrfZZSHtTzEIH29hqgJdztQgQeewig,2853
 hestia_earth/models/geospatialDatabase/totalPhosphorusPerKgSoil.py,sha256=fL8wNpx-3WdD3k9riy6AaUnpdRMFNMzzc338jRIqfw8,2102
-hestia_earth/models/geospatialDatabase/utils.py,sha256=WlHtjmawyDi9-i_vFVgbrxqzhq2DF4n-Rl48wkO9U6k,7281
+hestia_earth/models/geospatialDatabase/utils.py,sha256=cL679EXmuhTbpM-f9ULSS47pH6bGsEqNLpNSk2xKqss,7274
 hestia_earth/models/geospatialDatabase/waterDepth.py,sha256=Xy2UxwAJrgdOkcw59NetEHMt5vgRYE6qg4fgXb1ptlU,1643
 hestia_earth/models/globalCropWaterModel2008/__init__.py,sha256=vQxexzFCl2Uv2RiIJfcppkRi9RgzBsJ68yhVDK4GvAU,425
-hestia_earth/models/globalCropWaterModel2008/rootingDepth.py,sha256=UuFzMbDrvmll3LL6T887DZ76CHt3wrK-2hl9ymmg2FI,4089
+hestia_earth/models/globalCropWaterModel2008/rootingDepth.py,sha256=LYkS0kTdkXcXElYTK9j5S_JD3fIccFjgcXJq3nURecc,4124
 hestia_earth/models/haversineFormula/__init__.py,sha256=o155nR-XI67iCSBVNYIu4sPRIF3C2Y1NnUZ6lfpi0Do,417
 hestia_earth/models/haversineFormula/transport/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hestia_earth/models/haversineFormula/transport/distance.py,sha256=l00mmyRgWsHWFtk4OTFrhqyOmc-73C4Wkfn5WKM99TA,3990
+hestia_earth/models/haversineFormula/transport/distance.py,sha256=CJEeirdU-lm1QyJJBxNEFOSjOgItWTZhZUjTd8nLBZE,3983
 hestia_earth/models/hestia/__init__.py,sha256=o5vAmPzSaK9XPgL8GCne3-lugfCOgZhHELYolNgqyyY,407
-hestia_earth/models/hestia/aboveGroundCropResidue.py,sha256=S3_ADmOyIBIVMGLgKXzSbsDhx7eS6r0LT5LxtND6CAw,6045
+hestia_earth/models/hestia/aboveGroundCropResidue.py,sha256=uSNqmVZtYRLGCzbI4Yk1-z9a-RI3mXTIRcWgESpkv8E,5987
 hestia_earth/models/hestia/aboveGroundCropResidueTotal.py,sha256=NcaHzSLTmTP0yTO_2mqqouNzkCVYRkDm31LZqOCiFD4,2715
 hestia_earth/models/hestia/brackishWater.py,sha256=V9WhV1Mwix1dqdEepMiz9ZNYufx1mKX4C5sdQ96MH9s,1292
 hestia_earth/models/hestia/cationExchangeCapacityPerKgSoil.py,sha256=GtF-X2ogdXLX0dKed8d2L3baI5MfpN6UXZbZm2aG3Es,3660
 hestia_earth/models/hestia/coldCarcassWeightPerHead.py,sha256=IkOyrLYqSNidrTfuuZcAGXaT5XEDBFmRWPNxAEAORNU,2962
 hestia_earth/models/hestia/coldDressedCarcassWeightPerHead.py,sha256=NE1aw4-rmKsslwsyQkRl2TT9Zng-8NNsYXsajHHmU30,3076
 hestia_earth/models/hestia/concentrateFeed.py,sha256=HnuG3zAECtFVdPRbTATGz5ImO2Ve1NruqD8brbrO2c4,6647
-hestia_earth/models/hestia/cropResidueManagement.py,sha256=VlubB0q5MtvBM2dQSWdrENBMOYpvFbGu36TEwxoDl7A,2301
+hestia_earth/models/hestia/cropResidueManagement.py,sha256=QyDsFaPM5zVzoaGwNHYJEaSg2AJxKHjaWxJyTcJ3FBk,2496
 hestia_earth/models/hestia/croppingIntensity.py,sha256=xev3GOE06nBJ8ZY3XtbnE0eR2YR_kqAFPnrTuKFtLrQ,1777
 hestia_earth/models/hestia/default_emissions.py,sha256=UaG__VXbsa2f3lU_wD7Pz0hYWhABSTmyx8wwT3MQG1w,3546
 hestia_earth/models/hestia/default_resourceUse.py,sha256=ne1apNctXHNFW0_Xzbwyk6hfW8ittWQSeygfaCcJFcw,4341
 hestia_earth/models/hestia/energyContentLowerHeatingValue.py,sha256=2gR7Iu5nUUCGSXjFrkTnss6XBGtQz-yKwexCQoy8TJU,2214
-hestia_earth/models/hestia/excretaKgMass.py,sha256=pBhD3I2NPjJ-Dbnp_P508J7OCLI_fxOAyTi_wKtrkcg,4017
+hestia_earth/models/hestia/excretaKgMass.py,sha256=c9YFOsivJZJyx3UcCEYlVm-VU4tl2Pxz5QQoEjyfWrM,4010
 hestia_earth/models/hestia/excretaKgN.py,sha256=J2TuRGzA8KHDgsRnZflF8LMcd8993YPguY-cdbQOJ8Y,2878
 hestia_earth/models/hestia/excretaKgVs.py,sha256=fhelFqI3xr-GW0ifzYB5oYklXv5tXzedTumFIUBe59Q,2881
 hestia_earth/models/hestia/flowingWater.py,sha256=Iy5PCWun7GMrr0zszd0zpp9lKADpXesjC3doqLY4n28,1603
@@ -212,13 +212,13 @@ 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=bZdlubbri0yzYCdhAQx_6iXZWQjeijBLr8NLldZPWOs,40280
-hestia_earth/models/hestia/landOccupationDuringCycle.py,sha256=xiVun-YIXwtQ917DG9K8-7qzllwIj_QiBjuk1e0CQJU,9574
+hestia_earth/models/hestia/landCover.py,sha256=FV-fu0LdOZX0KtnqhqZZDM_tVQIK_fXA9WLgjm6vKg4,40478
+hestia_earth/models/hestia/landOccupationDuringCycle.py,sha256=AFZY_OEBVB51j8DLwVyZIq9lA9Yjblbgm5uuLKZbwdg,9578
 hestia_earth/models/hestia/landTransformation100YearAverageDuringCycle.py,sha256=Bd8rD4ioiXvlKCTtYva_Cj3yqIgi2ykeVmCDtjgeY4A,1202
 hestia_earth/models/hestia/landTransformation20YearAverageDuringCycle.py,sha256=yWbnkjvV87M8lUcSR5nxJGunX3Ne3wdVvBMR2b1K_Sc,1200
 hestia_earth/models/hestia/liveAnimal.py,sha256=d7HuUi40c-7TN1kecdRuqbht8PAe7x4ps0NhSuWG34Q,3868
 hestia_earth/models/hestia/longFallowRatio.py,sha256=LkJaER1VNDI5351-oC8tru-LgiPK3sNMg0NhB5ic9RE,1690
-hestia_earth/models/hestia/management.py,sha256=nvbqjxR4spBVh9IzzduRp5BStDd7wyKTpkkJenUYObo,13447
+hestia_earth/models/hestia/management.py,sha256=FPqEiuTnhQEAB50p8buwr87NG4ZnkOwhOFZznmmoJDY,14140
 hestia_earth/models/hestia/materialAndSubstrate.py,sha256=abmM_7FOY5yaNb2yZEm-ncI4wFFcbzaebtnG9XWEA6M,5130
 hestia_earth/models/hestia/milkYield.py,sha256=__3AdxRTUTWwS_GsqxFpPGklmTnnpADiN0khlRCMAss,5541
 hestia_earth/models/hestia/netPrimaryProduction.py,sha256=TXBw7qkTYlvViMrM027FejVpwyqnzJ8VazsbWakwd70,1870
@@ -228,7 +228,7 @@ hestia_earth/models/hestia/organicCarbonPerM3Soil.py,sha256=pdv5V-ojcfhlGzPwRS9s
 hestia_earth/models/hestia/organicMatterPerKgSoil.py,sha256=fJpFVkpuCjnrBhgV0RtwKqQHvAJWWtZO9xtmnJnl8O4,1945
 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/pastureGrass.py,sha256=uLblNYPLHgHVUjJXHt8pynVRdS7Kh5QetCzpmNlSz2g,1268
 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
@@ -264,9 +264,10 @@ hestia_earth/models/impact_assessment/allocationMethod.py,sha256=x52IjSmyu8vSyr9
 hestia_earth/models/impact_assessment/emissions.py,sha256=w5Fs6g_ZdGpeDxIVWCErt7wSk3qRZ31vFsdJQMPeE94,3773
 hestia_earth/models/impact_assessment/irrigated.py,sha256=syD3r4wykOHnC9PC-J67QXlWHnJ6K6MjTC2InccWxXI,674
 hestia_earth/models/impact_assessment/organic.py,sha256=FtYco3NwhSJEsMjjK_JDRyxwuSoKH_8y17x-RBl3exM,645
-hestia_earth/models/impact_assessment/post_checks/__init__.py,sha256=9YvfW2TxavG0d2YcbBfUd-Z-U6VPflq4b-OZ8nYRJbE,354
+hestia_earth/models/impact_assessment/post_checks/__init__.py,sha256=HxrbR27W7ylvYnHfbmrZvYckQdJGAuii26sFHbqUl4Y,396
 hestia_earth/models/impact_assessment/post_checks/cycle.py,sha256=hXtG_EJIAP6i-kOa6UrYrD8r4GkYcZiEDaorWvKn-kU,588
 hestia_earth/models/impact_assessment/post_checks/remove_cache_fields.py,sha256=tLNS3r--qoXcoTSMyvEkHBiorazPBf4CGLfYVArqCsY,267
+hestia_earth/models/impact_assessment/post_checks/remove_no_value.py,sha256=YN72IrJ-2lMtno-ud4GLDVeuXSAVVjQzL5plUGZjGa4,333
 hestia_earth/models/impact_assessment/post_checks/site.py,sha256=3o4wABsdQKU9b72Oa_Ry6mcSYTxFkbYIk4zWxOohgpg,581
 hestia_earth/models/impact_assessment/pre_checks/__init__.py,sha256=rkHO4Z3Zz8LCT1OoDgHmUuGURvXsdzh2nQqgU2M4tjU,304
 hestia_earth/models/impact_assessment/pre_checks/cache_emissionsResourceUse.py,sha256=Yr4mCm11ERJ2dSC-4MG4xHe3-KXaSXXMyiw1DhKSFYc,862
@@ -297,12 +298,12 @@ hestia_earth/models/ipcc2019/aboveGroundBiomass.py,sha256=T50NcJoyGrHYUSzJBXJKAO
 hestia_earth/models/ipcc2019/aboveGroundCropResidueTotal.py,sha256=GSI-FmYZuOE12iUyrtIFeo3ctDrw_P0jjZwWvwG4Ffc,3468
 hestia_earth/models/ipcc2019/belowGroundBiomass.py,sha256=WN3R5kUIc5Ij4HxMFcTGKeNRoPChRY6ws0x3nQNeEMw,19421
 hestia_earth/models/ipcc2019/belowGroundCropResidue.py,sha256=qbfsLBPaMIt4oQzYAzbsZdkJozTbwuztNr48TLYC5-Y,3507
-hestia_earth/models/ipcc2019/biocharOrganicCarbonPerHa.py,sha256=6zZOhhDIJVfvvsJfoyBtZsM4akWizQUciVnKHlufMnA,13414
+hestia_earth/models/ipcc2019/biocharOrganicCarbonPerHa.py,sha256=69_pIEDOTs3Ed_4d9K9GKw8jAFV85nmeWwIx2ztC5Jc,13446
 hestia_earth/models/ipcc2019/biomass_utils.py,sha256=NkTPGMl-0tqvhUZKZ1rxW0XTBnZOvgFJki_IPzEEyu0,15796
 hestia_earth/models/ipcc2019/carbonContent.py,sha256=XhXDu6DRQxANBsRsCEgw4f0UJDOgWsvhVyEwK1-4YT0,7263
 hestia_earth/models/ipcc2019/ch4ToAirAquacultureSystems.py,sha256=JeyF4tUPn3KIDbXwgM_MFp18hnTZjLBBqMFMH_ciZ1Q,3529
 hestia_earth/models/ipcc2019/ch4ToAirEntericFermentation.py,sha256=b9FIMIGMGcpOhYHhD6yFsiatHsPe_KoF5yB3Rm6AKwA,12525
-hestia_earth/models/ipcc2019/ch4ToAirExcreta.py,sha256=4GI_d4sTlskQiSK7xR2f1EaFhBt5Mu7sx0Xq9eUhiJk,6608
+hestia_earth/models/ipcc2019/ch4ToAirExcreta.py,sha256=a1wu_MWxxcD8VFgyI6ZUIqnS1a8fGL9qFDvqtS9dZIE,6665
 hestia_earth/models/ipcc2019/ch4ToAirFloodedRice.py,sha256=26WZtckmb7b3sbUN7hpshEdaSdvJpL3-Oer60III_KU,10225
 hestia_earth/models/ipcc2019/ch4ToAirOrganicSoilCultivation.py,sha256=oXK35mLD6rkHG0Zv5F0Atyn0OxQgwuUs6Pkr7E7_qcg,9544
 hestia_earth/models/ipcc2019/co2ToAirAboveGroundBiomassStockChange.py,sha256=WJVfdTBgLI-RsKAd2V-AF7rTnYfR1qUbLkWS5i1gGqo,4559
@@ -342,10 +343,10 @@ hestia_earth/models/ipcc2019/no3ToGroundwaterOrganicFertiliser.py,sha256=px2SN-u
 hestia_earth/models/ipcc2019/nonCo2EmissionsToAirNaturalVegetationBurning.py,sha256=-IwHMQvCEDCyDamNegyxFvLk6B72b5BK6XaEQCAokuQ,34636
 hestia_earth/models/ipcc2019/noxToAirInorganicFertiliser.py,sha256=fmmFgjtvOD2TrrLY03jYly_KvDnCsAXqhL_tmZQQt-A,4480
 hestia_earth/models/ipcc2019/noxToAirOrganicFertiliser.py,sha256=9dx_MRTwJGxJRq6mj2EJQMdQ2w6j7lw0fQk0If_cIGc,4152
-hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=D8Lph5clGjXb5F7sk-jlnqE30C2lokhqndpA0hUMwTk,7791
-hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1.py,sha256=kuLVIW5rJ7UuPepTplxC5HDX9u9ko-DPD9M9ODCtXM4,79137
+hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=E2w8HAuFmglNpKM4X79Zt8jG7j-AHarntGvQDwRVQMs,8010
+hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1.py,sha256=NZn4UP4qwkY852ylfDjJVZTgsYEkcVVeTtvMrz1MuPQ,79073
 hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2.py,sha256=vvrwSI9oZIVlLLGMyPoSKW3lOgc2VmF8G-HJJHbgYRc,69220
-hestia_earth/models/ipcc2019/organicCarbonPerHa_utils.py,sha256=DumXAbH8P97tDyP1nAbtgVrDEceFy0b_xRNZG2h0kbQ,9843
+hestia_earth/models/ipcc2019/organicCarbonPerHa_utils.py,sha256=Ui4G7B6jWWSCe-0IgNQ790Ld2QJmBejCk6gDs73sDeI,10335
 hestia_earth/models/ipcc2019/organicSoilCultivation_utils.py,sha256=mJCKYZxqk5vFknckjIjGw478BjZbvKC_xQ-zYpvJ8xM,5628
 hestia_earth/models/ipcc2019/pastureGrass.py,sha256=JijV-UnA_ofB53yPqGPkhf7lMKi_GumfMXVPYGLjBXI,10206
 hestia_earth/models/ipcc2019/pastureGrass_utils.py,sha256=so5AFrr_0eKXkUoyBpYhHgSXhTQ5z2XADahm2At4RR0,14285
@@ -467,7 +468,7 @@ hestia_earth/models/linkedImpactAssessment/utils.py,sha256=DM6ZUnw23KH0oMKS3jA5q
 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=sBCAlfkTrr6TPjUfn0hxVo26RpdIooNBnzX-XI_lTm8,103847
+hestia_earth/models/mocking/search-results.json,sha256=cWBFErlqbVSoQqjuoikJ0ARQKOgKOs_BmRWOtOMj3TA,103843
 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
@@ -578,7 +579,7 @@ hestia_earth/models/site/pre_checks/__init__.py,sha256=Bt14IKDWnpxjeoVn8aXMfOLOR
 hestia_earth/models/site/pre_checks/cache_geospatialDatabase.py,sha256=NK75zG9At5_ClRQv7lDI2iVq8_prKslCTzXOb0F-1W8,5615
 hestia_earth/models/site/pre_checks/cache_sources.py,sha256=VrIprhnHhVFJIifXwDf3c41KEAlgZzg2WnNpGD-V2uc,180
 hestia_earth/models/site/pre_checks/cache_years.py,sha256=GSMwQ4MdlCbVEEA_Z8onE-bQ7UfohwMd1ctpiNTln5Q,787
-hestia_earth/models/site/pre_checks/country.py,sha256=SDaIOxK1aoJROnOYSCXCr_LI4uR3yS6lBN3vgdL3XTA,224
+hestia_earth/models/site/pre_checks/country.py,sha256=7sNu6p5aiZNxvu2vQngj3f8SNj_J9F8cHn7-z1tMJ1w,216
 hestia_earth/models/stehfestBouwman2006/__init__.py,sha256=EhvD4NK6oEPevusLb1WdYV3GT_fCtQx4gvdMhK_dEIQ,420
 hestia_earth/models/stehfestBouwman2006/n2OToAirCropResidueDecompositionDirect.py,sha256=6BDeQUwC2tgvZGB8FbyPVLCDqxH-h1RGM73RXucwkuo,2733
 hestia_earth/models/stehfestBouwman2006/n2OToAirExcretaDirect.py,sha256=k7LZrHUDzgBNlqBxMhSurDVhAeLdE_ZM9BdoItLqurw,2913
@@ -609,14 +610,14 @@ hestia_earth/models/transformation/product/__init__.py,sha256=47DEQpj8HBSa-_TImW
 hestia_earth/models/transformation/product/excreta.py,sha256=zYts6AKQizoy9NQf5PwMttuPePe8-U0d8QthC_sSM1E,5389
 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=ml-Q7AqPFHeeF_Pvid63BHLH2R-1ML-xWxjMP6r8kn0,7280
+hestia_earth/models/utils/__init__.py,sha256=7Ym52Yfi-bYpXMketblHYudtMkoVSJVeBdCOml81JTk,7421
 hestia_earth/models/utils/aggregated.py,sha256=wS9S8GljTuUYkueyoHaFRIGf-FcoBnRMznsi-7-sbKE,3044
 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=0AmrKgV_ajVVhj8wwEIOwRfK5CwpYbS03E4eFGOY6h8,6959
-hestia_earth/models/utils/blank_node.py,sha256=BU5L76uGpUhBIa-_7h3CMwOLy4EonXeOXnYgx54vZGA,55922
+hestia_earth/models/utils/blank_node.py,sha256=wrJXlPQbMVZatox8ctvnJs-fOlhD5vIj3n5us117MQU,56018
 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/completeness.py,sha256=1FtDzl1dQ-AZ4nCn1vfGqR4RK3yHItfkksVqsJzIWR0,1256
 hestia_earth/models/utils/constant.py,sha256=DmB3VVuoh7Pz2QDBJqiUG6yAML2i0fOy1BPuPHmhT1w,3442
 hestia_earth/models/utils/crop.py,sha256=GbYwrz3Zd4JU-cwUBijc8GeAK0XgurV3ubwcFIgxhcU,2721
 hestia_earth/models/utils/cropResidue.py,sha256=uEXMnP7qxuH5xFNABlwWeQ-q5jsWfyik-9x1OKgNFHA,1506
@@ -624,31 +625,31 @@ hestia_earth/models/utils/cropResidueManagement.py,sha256=nIDFjf39rDD10UHSVudfDy
 hestia_earth/models/utils/currency.py,sha256=f_ArJANb--pZq4LL49SXQ1AMX_oKroqwBXKRRQqZwsM,578
 hestia_earth/models/utils/cycle.py,sha256=WBDKaLqQtxxhvhPm3Sz_3tVSgVFm5zONkANx6hRFra0,16222
 hestia_earth/models/utils/ecoClimateZone.py,sha256=kJmXtRiq8-vWF7S1rNIA6WpWkPtt8JoNfWgG9azM_ts,4269
-hestia_earth/models/utils/emission.py,sha256=aIQA3mFbGYlnD2DqDx6GY8qd2bzcjUjfvz8wnzmQ6Tc,4227
+hestia_earth/models/utils/emission.py,sha256=QQvv8bXBDhtyUENWGKrT27vKjNjWCYD7Ba5NK72tkOU,4245
 hestia_earth/models/utils/excretaManagement.py,sha256=PNZoaf6nvdt1t7B8Apa638rU8T4hI5VW2fy1fAoC64k,2265
 hestia_earth/models/utils/feedipedia.py,sha256=ETJx80zf_qGFWASE1u4kmpYncCz-7xSFlQ-vDyHAVVk,4033
 hestia_earth/models/utils/fertiliser.py,sha256=9Kv7czDEPDvZ5Bz6Rr_2vy2MsXrPDvBC3921cEJSks8,810
 hestia_earth/models/utils/fuel.py,sha256=XzOELV3dn506PkMKjFQ_ZKVZInd2lL2x6PKdsa6Po4M,1429
 hestia_earth/models/utils/impact_assessment.py,sha256=AfIZo_ykkkqWYY2AG-kLzGtd3fwzGIQXxnEKEzL_oGk,8516
-hestia_earth/models/utils/indicator.py,sha256=b3aRJ73p_y4VmL2_ZY9eXVDJxrQEP0WathuLKbSaluk,958
+hestia_earth/models/utils/indicator.py,sha256=IY4aQjkqnwx98mRnHrNtn5DUqo5_uYnsELCggSWxumk,976
 hestia_earth/models/utils/inorganicFertiliser.py,sha256=2Uq6ATWwb_YYRzBCMdrlVWyCDDtWVApUxgxDEN3-3OA,1782
-hestia_earth/models/utils/input.py,sha256=61aaJV6QApJQIQT5TMsBww46cBYpJdf__krnwV95KsY,6160
+hestia_earth/models/utils/input.py,sha256=778Uclp9Yi5qRLqhfrre6L_ETunIfvuJgncsl9ieyD4,6178
 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=f_04Te0O6WgLXFrCXGVmCKUj0vAo8IaYCGgC-EKDzzk,8105
-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
+hestia_earth/models/utils/management.py,sha256=-BuevrSzusRoqXHUREGqgF0N3Brlu4GjCZLrEhKkKkU,394
+hestia_earth/models/utils/measurement.py,sha256=RsZQQ_S6Y7QmYxJmFK5AwVegP4313fr-fR2tREo-COM,11779
+hestia_earth/models/utils/method.py,sha256=c_HnijbjCTiIK0Juhf34gvXtseCyi0ox8NMoOURIQW8,757
 hestia_earth/models/utils/organicFertiliser.py,sha256=2HY-a0EBzUw4DkEAXClLMXVCEZTKYf0BwFHBo7lQ5Tg,363
 hestia_earth/models/utils/pesticideAI.py,sha256=DQIAjgkWjKPyuMLUvnEgVkeQGCEOBjyJJktWU747b00,2047
-hestia_earth/models/utils/practice.py,sha256=GEu2G2yMPbcIHldOzgv5OFp8bQ1Jt9OFgj0c_0F_kUc,372
-hestia_earth/models/utils/product.py,sha256=Oha4lMvediC1Lc5DksA6sAUT94Q1Cs9F4LFVe_uaqP4,11177
+hestia_earth/models/utils/practice.py,sha256=3roFVmvAm8HKDHtLhtV4wGOsJGpWhQIF9QlxCEBvaZY,390
+hestia_earth/models/utils/product.py,sha256=e3lt2z48SBEyL4pXefoL-TcGwralfKquvmq7C4b9PSA,11212
 hestia_earth/models/utils/productivity.py,sha256=KIyrIuGcf8QgdBY54i7i038ZPXGqArM6mCzi2vwU3pI,601
-hestia_earth/models/utils/property.py,sha256=glfINBxB59d6dRRfN09C9U3CxfFyM_dTEWdlPi6_l0c,5422
+hestia_earth/models/utils/property.py,sha256=bgQNSXNdJsc0iqmm96LCHrq7In75xZyzYrnhcy8iHr8,5457
 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
-hestia_earth/models/utils/term.py,sha256=EJFj7Vt5Yjz1OSYQGXo9sDVrKLVvmYEJVVSg1aCi334,21473
+hestia_earth/models/utils/term.py,sha256=JMVF63qcux3vc5-95IwjCkcf6JNffnYUrX7hB2Kawm8,20547
 hestia_earth/models/utils/time_series.py,sha256=vuv033qUZ1gAw3T3wlLNG7vJmXCCsHEzciYbxw_b_NI,3223
 hestia_earth/models/utils/transformation.py,sha256=nyT5Mz4_VgFwhkL8JoNX9kxxow0zuxzsYl3W8xOu2p0,370
 hestia_earth/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=Niv7ZFMBCwThlbCKGOwA17QdkpOUDFrqrFItGNqnZAA,434
@@ -849,7 +850,7 @@ tests/models/haversineFormula/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 tests/models/haversineFormula/transport/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/haversineFormula/transport/test_distance.py,sha256=tNYMl4d6nlrztjiqQVDS1PWrAFCcycbalYAUxqKjfr4,963
 tests/models/hestia/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/hestia/test_aboveGroundCropResidue.py,sha256=FjYKk9wp04h5NiPkSRGyWv4Gxp1jzgfdk_1K2f10kXI,2123
+tests/models/hestia/test_aboveGroundCropResidue.py,sha256=J0fJlrGZ4lIygmizS52bvGwpxOUb28QrCtv3MW3v_dg,1426
 tests/models/hestia/test_aboveGroundCropResidueTotal.py,sha256=rcd8QGcHkvnqeXeUFIAIhvAsLfr5fFoJc6-ZAPmhT7I,1312
 tests/models/hestia/test_brackishWater.py,sha256=_ofSKiJuaejsRLYqPUxRWmEnsuebi3SCMj24awLKA5k,988
 tests/models/hestia/test_cationExchangeCapacityPerKgSoil.py,sha256=pcwEtPjfIHiSc0ZVYaHCpSe_0czsiZZe9B6LtBs7gwQ,1077
@@ -871,7 +872,7 @@ tests/models/hestia/test_histosol.py,sha256=7g-3wQPZok2O8mExcnKZxO_T2Ye_h3UHv3HG
 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=D72asF018FkZfvivbsYsKyWmTrBK85QYupHS11jFVis,11410
-tests/models/hestia/test_landOccupationDuringCycle.py,sha256=pJmLUrC1CDFFhVE-00jz_eNF6XL9o71IC_w-lM3-vTA,2254
+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_liveAnimal.py,sha256=3K9cL1fwr6LlBl1_D8zIaeCOuiExqkDEU7BXx1JK_dk,2139
@@ -918,6 +919,8 @@ tests/models/impact_assessment/test_post_checks.py,sha256=B-KVdkWaG8v-9aT1fNDQ9s
 tests/models/impact_assessment/test_pre_checks.py,sha256=1oXCdhldG7O7fntwbUqbCheVhuHgf5N3BionfEGC7Nc,308
 tests/models/impact_assessment/post_checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/impact_assessment/post_checks/test_cycle.py,sha256=hyXqTi-VvQ2eR4w6NVexfdiNnJtmbF0CNPJ5AGqfo-k,727
+tests/models/impact_assessment/post_checks/test_remove_cache_fields.py,sha256=yd7EN50e-7ZQ3hjeghanOWit20LnoUseP2y1la-KieQ,191
+tests/models/impact_assessment/post_checks/test_remove_no_value.py,sha256=PekEoZL307Qr_bS2tDnPzL3nKHRL9yJGt35JQzizVo4,354
 tests/models/impact_assessment/post_checks/test_site.py,sha256=RgwyUHp6cj79PcSF2tCefvgh-W4y--rpnlKUQwTsfq0,710
 tests/models/impact_assessment/pre_checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/impact_assessment/pre_checks/test_cycle.py,sha256=zQ2Cshx-QBSkyGIKA7wrpMc4kGPGVJlUEnDEZhzH87M,967
@@ -992,7 +995,7 @@ tests/models/ipcc2019/test_nonCo2EmissionsToAirNaturalVegetationBurning.py,sha25
 tests/models/ipcc2019/test_noxToAirInorganicFertiliser.py,sha256=NZBSBJLM_j2PEpHRON2ysgKNF8x5sHfQVoAKQdGsfzk,1537
 tests/models/ipcc2019/test_noxToAirOrganicFertiliser.py,sha256=LR5pjV5vRbgSSQAw8kYRp_ij4CHInzgaDS6EggQuBiw,1104
 tests/models/ipcc2019/test_organicCarbonPerHa.py,sha256=g_uOqzj6EiyvoAZRpd4PakMYQ7Vfn0QiDGLCTVz92A8,15607
-tests/models/ipcc2019/test_organicCarbonPerHa_tier_1.py,sha256=lSGxHvfz84etnXbu6cJU0Fh06H_lI3yIlSiF3Wg9tec,20683
+tests/models/ipcc2019/test_organicCarbonPerHa_tier_1.py,sha256=6DzuqTllZ_Zv3Xuic-3ZIaIik1rYd2eQZk7nysbLCxk,20687
 tests/models/ipcc2019/test_organicCarbonPerHa_tier_2.py,sha256=VYNtsuFDURzqvKH1_5_6_lSQrqTxWnLdopN5ULfrzMg,5486
 tests/models/ipcc2019/test_organicCarbonPerHa_utils.py,sha256=Zd2QlN_Q3k9djuByOH62A00tryVzlvNtsd46N79TTeU,1778
 tests/models/ipcc2019/test_pastureGrass.py,sha256=6B8ZmuI1w4rA4wGduWx0l6e0BgGz8b2knTUIcT0GDOg,2725
@@ -1286,8 +1289,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.74.8.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
-hestia_earth_models-0.74.8.dist-info/METADATA,sha256=kLmC8rxTUHDttCJHvLGZzZCh8BEcnMHtNKm4bAoqZ_w,4037
-hestia_earth_models-0.74.8.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_models-0.74.8.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.74.8.dist-info/RECORD,,
+hestia_earth_models-0.74.9.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
+hestia_earth_models-0.74.9.dist-info/METADATA,sha256=l_JfMElW9NHSHecDa6Jf6UzWK_JqW5dzU-ggjgGZ-Vo,4037
+hestia_earth_models-0.74.9.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hestia_earth_models-0.74.9.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.74.9.dist-info/RECORD,,

tests/models/hestia/test_aboveGroundCropResidue.py

@@ -1,11 +1,14 @@
-from unittest.mock import patch
+import os
 import json
+import pytest
+from unittest.mock import patch
 from tests.utils import fixtures_path, fake_new_product
 
-from hestia_earth.models.hestia.aboveGroundCropResidue import MODEL, run, _should_run
+from hestia_earth.models.hestia.aboveGroundCropResidue import MODEL, MODEL_KEY, run, _should_run
 
-class_path = f"hestia_earth.models.{MODEL}.aboveGroundCropResidue"
-fixtures_folder = f"{fixtures_path}/{MODEL}/aboveGroundCropResidue"
+class_path = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"
+_folders = [d for d in os.listdir(fixtures_folder) if os.path.isdir(os.path.join(fixtures_folder, d))]
 
 
 @patch(f"{class_path}._is_term_type_incomplete", return_value=True)
@@ -17,46 +20,21 @@ def test_should_run(*args):
     assert not should_run
 
     # product with total crop residue => run
-    with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
+    with open(f"{fixtures_folder}/with-total/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
     should_run, *args = _should_run(cycle)
     assert should_run is True
 
 
+@pytest.mark.parametrize('folder', _folders)
 @patch(f"{class_path}._is_term_type_incomplete", return_value=True)
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
-def test_run(*args):
-    with open(f"{fixtures_folder}/cycle.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
-
-
-@patch(f"{class_path}._is_term_type_incomplete", return_value=True)
-@patch(f"{class_path}._new_product", side_effect=fake_new_product)
-def test_run_no_total(*args):
-    with open(f"{fixtures_folder}/no-total/cycle.jsonld", encoding='utf-8') as f:
-        cycle = json.load(f)
-
-    with open(f"{fixtures_folder}/no-total/result.jsonld", encoding='utf-8') as f:
-        expected = json.load(f)
-
-    value = run(cycle)
-    assert value == expected
-
-
-@patch(f"{class_path}._is_term_type_incomplete", return_value=True)
-@patch(f"{class_path}._new_product", side_effect=fake_new_product)
-def test_run_with_leftOnField(*args):
-    with open(f"{fixtures_folder}/with-left-on-field-value/cycle.jsonld", encoding='utf-8') as f:
+def test_run(mock_new_product, mock_complete, folder: str):
+    with open(f"{fixtures_folder}/{folder}/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
 
-    with open(f"{fixtures_folder}/with-left-on-field-value/result.jsonld", encoding='utf-8') as f:
+    with open(f"{fixtures_folder}/{folder}/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
     value = run(cycle)
-    assert value == expected
+    assert value == expected, folder