hestia-earth-models 0.66.0__py3-none-any.whl → 0.67.0__py3-none-any.whl

hestia_earth/models/site/management.py

@@ -110,7 +110,7 @@ _PRACTICES_TERM_TYPES = [
     TermTermType.LANDUSEMANAGEMENT,
     TermTermType.SYSTEM
 ]
-_PRACTICES_COMPLETENESS_MAPPING = COMPLETENESS_MAPPING.get(SchemaType.PRACTICE.value)
+_PRACTICES_COMPLETENESS_MAPPING = COMPLETENESS_MAPPING.get(SchemaType.PRACTICE.value, {})
 _ANIMAL_MANURE_USED_TERM_ID = "animalManureUsed"
 _INORGANIC_NITROGEN_FERTILISER_USED_TERM_ID = "inorganicNitrogenFertiliserUsed"
 _ORGANIC_FERTILISER_USED_TERM_ID = "organicFertiliserUsed"
@@ -242,7 +242,7 @@ def _get_relevant_items(cycle: dict, item_name: str, term_types: List[TermTermTy
         term_type for term_type in term_types
         if any([
             not completeness_mapping.get(term_type.value),
-            cycle.get('completeness').get(completeness_mapping.get(term_type.value), False)
+            cycle.get('completeness', {}).get(completeness_mapping.get(term_type.value), False)
         ])
     ]
     blank_nodes = filter_list_term_type(cycle.get(item_name, []), complete_term_types)

hestia_earth/models/utils/__init__.py

@@ -165,6 +165,12 @@ def last_day_of_month(year: int, month: int):
     )
 
 
+def current_date(): return datetime.datetime.now().date().strftime('%Y-%m-%d')
+
+
+def current_year(): return int(current_date()[:4])
+
+
 def flatten_args(args) -> list:
     """
     Flatten the input args into a single list.

hestia_earth/models/utils/aggregated.py

@@ -6,7 +6,8 @@ from hestia_earth.utils.model import find_term_match, linked_node
 from hestia_earth.utils.tools import safe_parse_date, non_empty_list
 
 from hestia_earth.models.log import debugValues, logShouldRun
-from hestia_earth.models.utils.cycle import is_organic
+from . import current_year
+from .cycle import is_organic
 
 MODEL_KEY = 'impactAssessment'
 MATCH_WORLD_QUERY = {'match': {'country.name.keyword': {'query': 'World', 'boost': 1}}}
@@ -14,7 +15,7 @@ MATCH_WORLD_QUERY = {'match': {'country.name.keyword': {'query': 'World', 'boost
 
 def aggregated_end_date(end_date: str):
     year = safe_parse_date(end_date).year
-    return round(math.floor(year / 10) * 10) + 9
+    return min([round(math.floor(year / 10) * 10) + 9, current_year()])
 
 
 def _match_region_country(region: dict, country: dict):
@@ -36,8 +37,7 @@ def _match_region_country(region: dict, country: dict):
     }
 
 
-def find_closest_impact(cycle: dict, end_date: str, input: dict, region: dict, country: dict, must_queries=[]):
-    term = input.get('term', {})
+def find_closest_impact(cycle: dict, end_date: str, term: dict, region: dict, country: dict, must_queries=[]):
     query = {
         'bool': {
             'must': non_empty_list([
@@ -74,21 +74,24 @@ def find_closest_impact(cycle: dict, end_date: str, input: dict, region: dict, c
 
 def _link_input_to_impact(model: str, cycle: dict, date: int):
     def run(input: dict):
-        term_id = input.get('term', {}).get('@id')
+        term = input.get('term', {})
+        term_id = term.get('@id')
         region = input.get('region')
         country = input.get('country')
-        impact = find_closest_impact(cycle, date, input, region, country)
+        impact = find_closest_impact(cycle, date, term, region, country)
 
+        search_by_region_id = (region or country or {}).get('@id') or 'region-world'
         debugValues(cycle, model=model, term=term_id, key=MODEL_KEY,
-                    input_region=(region or {}).get('@id'),
-                    input_country=(country or {}).get('@id'),
-                    impact=(impact or {}).get('@id'))
+                    search_by_input_term_id=term_id,
+                    search_by_region_id=search_by_region_id,
+                    search_by_end_date=str(date),
+                    impact_assessment_id_found=(impact or {}).get('@id'))
 
         should_run = all([impact is not None])
         logShouldRun(cycle, model, term_id, should_run)
         logShouldRun(cycle, model, term_id, should_run, key=MODEL_KEY)  # show specifically under Input
 
-        return {**input, MODEL_KEY: linked_node(impact), 'impactAssessmentIsProxy': True} if impact else None
+        return input | {MODEL_KEY: linked_node(impact), 'impactAssessmentIsProxy': True} if impact else None
     return run
 
 

hestia_earth/models/utils/array_builders.py

@@ -527,12 +527,13 @@ def avg_run_in_rowwise(arr: NDArray, n: int):
     return avg_run_in_columnwise(arr.transpose(), n).transpose()
 
 
-def gen_seed(node: dict) -> int:
+def gen_seed(node: dict, *args: tuple[str]) -> int:
     """
-    Generate a seed based on a node's `@id` so that rng is the same each time the model is re-run.
+    Generate a seed based on a node's `@id` and optional args so that rng is the same each time the model is re-run.
     """
     node_id = node.get("@id", "")
-    hashed = hashlib.shake_128(node_id.encode(), usedforsecurity=False).hexdigest(4)
+    seed_str = "".join([node_id] + [str(arg) for arg in args])
+    hashed = hashlib.shake_128(seed_str.encode(), usedforsecurity=False).hexdigest(4)
     return abs(int(hashed, 16))
 
 

hestia_earth/models/utils/blank_node.py

@@ -35,7 +35,7 @@ from .lookup import (
     is_product_id_allowed, is_product_termType_allowed,
     is_input_id_allowed, is_input_termType_allowed, _node_value
 )
-from .property import get_node_property, get_node_property_value, find_term_property
+from .property import get_node_property, get_node_property_value
 from .term import get_lookup_value
 from ..log import debugValues, log_as_table
 
@@ -1468,16 +1468,20 @@ def _convert_via_property(node: dict, node_value: Union[int, float], property_fi
 
     Parameters
     ----------
-    node: a dict containing a term
-    node_value: value to be converted as float or int
-    property_field: str such as "density"
+    node: dict
+        Blank node containing a term
+    node_value: int | float
+        Value to be converted as float or int
+    property_field: str
+        E.g., "density"
 
-    Returns float or None
+    Returns
     -------
+        Float or None
     """
-    node_property = find_term_property(node, property_field, default={}, keep_in_memory=True)
-    node_property_value = safe_parse_float(node_property.get("value", 0))
-
+    node_property_value = get_node_property_value(
+        model=None, node=node, prop_id=property_field, default=0, handle_percents=False
+    )
     return node_value * node_property_value if node_value is not None and bool(node_property_value) else None
 
 
@@ -1486,7 +1490,7 @@ def convert_unit(node, dest_unit: Units, node_value: Union[int, float] = None) -
     Convert a number `value` inside a node or a optional `node_value` belonging to a term `node`, to unit `dest_unit`
     using the ATOMIC_WEIGHT_CONVERSIONS map or failing that, the PROPERTY_UNITS_CONVERSIONS map and lookups
     """
-    src_unit = node.get("units", "")
+    src_unit = node.get("units") or node.get('term', {}).get('units', "")
 
     node_value = _node_value(node) if node_value is None else node_value
 
@@ -1505,7 +1509,7 @@ def convert_unit_properties(node_value: Union[int, float], node: dict, dest_unit
     Uses cached calls to download_hestia() internally for speedup
     Returns None if no conversion possible.
     """
-    src_unit = node.get('units', '')
+    src_unit = node.get("units") or node.get('term', {}).get('units', "")
     conversions = PROPERTY_UNITS_CONVERSIONS.get(src_unit, {}).get(dest_unit.value, [])
     return reduce(
         lambda value, conversion_property_field: _convert_via_property(node, value, conversion_property_field),

hestia_earth/models/utils/lookup.py

@@ -49,6 +49,7 @@ def all_factor_value(
 ):
     values = list(map(_factor_value(model, term_id, lookup_name, lookup_col, grouped_key), blank_nodes))
 
+    has_values = len(values) > 0
     missing_values = set([v.get('id') for v in values if v.get('value') is not None and v.get('coefficient') is None])
     all_with_factors = all([v.get('coefficient') is not None for v in values if v.get('value') is not None])
 
@@ -58,13 +59,14 @@ def all_factor_value(
     debugValues(node, model=model, term=term_id,
                 all_with_factors=all_with_factors,
                 missing_lookup_factor=';'.join(missing_values),
+                has_values=has_values,
                 values_used=log_as_table(values))
 
     values = [float((v.get('value') or 0) * (v.get('coefficient') or 0)) for v in values]
 
     # fail if some factors are missing
     return None if not all_with_factors else (
-        list_sum(values) if len(values) > 0 else default_no_values
+        list_sum(values) if has_values else default_no_values
     )
 
 

hestia_earth/models/utils/property.py

@@ -57,7 +57,8 @@ def find_term_property(term, property: str, default=None, keep_in_memory=False)
     return find_term_match(props, property, default)
 
 
-def get_node_property(node: dict, property: str, find_default_property: bool = True):
+def get_node_property(node: dict, property: str, find_default_property: bool = True,
+                      keep_in_memory: bool = False) -> dict:
     """
     Get the property by `@id` linked to the Blank Node in the glossary.
 
@@ -73,6 +74,8 @@ def get_node_property(node: dict, property: str, find_default_property: bool = T
         The `term.@id` of the property. Example: `nitrogenContent`.
     find_default_property : bool
         Default to fetching the property from the `defaultProperties` of the `Term`.
+    keep_in_memory:
+        If True and find_default_property is True, will cache this term_id call to api
 
     Returns
     -------
@@ -80,7 +83,7 @@ def get_node_property(node: dict, property: str, find_default_property: bool = T
         The property if found, `None` otherwise.
     """
     prop = find_term_match(node.get('properties', []), property, None)
-    return find_term_property(node.get('term', {}), property, {}) if all([
+    return find_term_property(node.get('term', {}), property, {}, keep_in_memory) if all([
         find_default_property,
         prop is None
     ]) else (prop or {})

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.66.0'
+VERSION = '0.67.0'

hestia_earth/orchestrator/log.py

@@ -1,5 +1,7 @@
 import os
 import sys
+import platform
+import resource
 import logging
 
 LOG_LEVEL = os.getenv('LOG_LEVEL', 'INFO')
@@ -42,6 +44,15 @@ if LOG_FILENAME is not None:
 def _join_args(**kwargs): return ', '.join([f"{key}={value}" for key, value in kwargs.items()])
 
 
+def log_memory_usage(**kwargs):
+    factor = 1024 * (
+        1024 if platform.system() in ['Darwin', 'Windows'] else 1
+    )
+    value = resource.getrusage(resource.RUSAGE_SELF).ru_maxrss / factor
+    extra = (', ' + _join_args(**kwargs)) if len(kwargs.keys()) > 0 else ''
+    logger.info('memory used=%s, unit=MB' + extra, value)
+
+
 def _log_node_suffix(node: dict = {}):
     node_type = node.get('@type', node.get('type')) if node else None
     node_id = node.get('@id', node.get('id', node.get('term', {}).get('@id'))) if node else None

hestia_earth/orchestrator/models/__init__.py

@@ -7,7 +7,7 @@ from copy import deepcopy
 from hestia_earth.utils.tools import non_empty_list
 
 from hestia_earth.models.version import VERSION
-from ..log import logger
+from ..log import logger, log_memory_usage
 from ..utils import get_required_model_param, _snakecase
 from ..strategies.run import should_run
 from ..strategies.merge import merge
@@ -76,10 +76,15 @@ def _run_post_checks(data: dict):
 
 
 def _run_model(data: dict, model: dict, all_models: list):
-    module = _import_model(get_required_model_param(model, 'model'))
-    # if no value is provided, use all the models but this one
+    model_id = get_required_model_param(model, 'model')
     model_value = model.get('value') or _list_except_item(all_models, model)
+    log_memory_usage(model_model=model_id, model_value=model_value, step='before')
+
+    module = _import_model(model_id.replace('-', '_'))
+    # if no value is provided, use all the models but this one
     result = module.get('run')(model_value, data)
+
+    log_memory_usage(model_model=model_id, model_value=model_value, step='after')
     return {'data': data, 'model': model, 'version': module.get('version'), 'result': result}
 
 

{hestia_earth_models-0.66.0.dist-info → hestia_earth_models-0.67.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.66.0
+Version: 0.67.0
 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.66.0.dist-info → hestia_earth_models-0.67.0.dist-info}/RECORD

@@ -4,7 +4,7 @@ hestia_earth/models/cache_sites.py,sha256=tApCGZ55bRG3rl7a-jjwZokgF3dxGbg8WlKfwo
 hestia_earth/models/log.py,sha256=3NzkAEgxMGCMolQbC6nDuAJEb7ZpQNXLekhbRNjedSo,3561
 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=BvGgKIxig5TeeXiVMjrtK52tJU8MKBp9mZri02j09mQ,19
+hestia_earth/models/version.py,sha256=AtpxzttjHgdl8EuXNyJH8_i6hGILXOxlpbooRi2a3sE,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=rm5ZaRAzJ08m2y4BxkGh-RjudkDWgozmg3XumoRm-fQ,4511
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=BPjnWmg73i_OxM2ouCdMTWZtPIqyoUAXrvutntyteE0,3390
@@ -27,15 +27,19 @@ hestia_earth/models/chaudharyBrooks2018/damageToTerrestrialEcosystemsLandTransfo
 hestia_earth/models/chaudharyBrooks2018/damageToTerrestrialEcosystemsTotalLandUseEffects.py,sha256=11H8j9i2h2zChea92CdzPodWZfdegkAnQx6qYC6Ym9A,2623
 hestia_earth/models/chaudharyBrooks2018/utils.py,sha256=Z0IrvVv-dKsRt09LmT7sc6e1bWnhjZ-WBrO-namIngo,1539
 hestia_earth/models/cml2001Baseline/__init__.py,sha256=0uGrCKDNUH-MUkpvts9MyPMnZKao-M03gU8uKquUozQ,416
-hestia_earth/models/cml2001Baseline/abioticResourceDepletionFossilFuels.py,sha256=K3IfNziLDGvfmHsWBUXCwAl1k2Z6p-02Vi7HG3jZRhI,7708
+hestia_earth/models/cml2001Baseline/abioticResourceDepletionFossilFuels.py,sha256=6CvHcrSANH4UAWY58y2Ow00DzqitJVAteCzjsmi5cwA,6070
 hestia_earth/models/cml2001Baseline/abioticResourceDepletionMineralsAndMetals.py,sha256=yXie6UW0_I4VQcADn7Uvk4n1RmrFAauJ7ZVh7OgBUyA,5952
 hestia_earth/models/cml2001Baseline/eutrophicationPotentialExcludingFate.py,sha256=nUWKsn3COqAOrYNmiBKnA2rUs88pj4o3k4fHKA0TVbU,1068
+hestia_earth/models/cml2001Baseline/resourceUseEnergyDepletionDuringCycle.py,sha256=3MGkwcuyQ8LcIrqb0gCs0PYr0Im0L_r4SWrdoRXr05k,5686
+hestia_earth/models/cml2001Baseline/resourceUseEnergyDepletionInputsProduction.py,sha256=hXGdx1IA5yeVLHrRrSZWCP0s7ucSRWelYNr6aQ9YTyU,1205
+hestia_earth/models/cml2001Baseline/resourceUseMineralsAndMetalsDuringCycle.py,sha256=WUIA2tDBoAdTQ6Aa5GgEpvOGyR-O6KuJeeIffUpTh2U,2708
+hestia_earth/models/cml2001Baseline/resourceUseMineralsAndMetalsInputsProduction.py,sha256=WfFL9n_KyR2XXPwliHu6gpgixFrOWB4XAO1VsJWgIio,1200
 hestia_earth/models/cml2001Baseline/terrestrialAcidificationPotentialIncludingFateAverageEurope.py,sha256=N8neIISqeTAS7VGTNWbbbozOtfCb816qwwHCnv7Nnpw,1113
 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=pl90Wepb0ocERsRm2ZTeXYXJvBrAwfIjjLQQQQheNmM,56452
-hestia_earth/models/config/ImpactAssessment.json,sha256=AAa3VMREvIDUwrqmRq67VQcB-wxEQTlZWiewBoVuow4,57936
+hestia_earth/models/config/ImpactAssessment.json,sha256=vASduDfQQaYjRR1GRG_gXCqP7j5j5InkNBdXK04VF5g,55628
 hestia_earth/models/config/Site.json,sha256=i25vGzBYcaGnU6BvNE2cdmpo6DJolXKKogyCfXaMTuQ,13146
 hestia_earth/models/config/__init__.py,sha256=l1WqL7ezlank86ABP4zUia_hIvM9ba-sOE3z6wNrea8,2333
 hestia_earth/models/config/run-calculations.json,sha256=e3nJ4M6CP1iFzfv8ou_ZUFbFxYkDxJgwuNDXTm4PBDc,615
@@ -99,7 +103,7 @@ hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioEnergy.py,sha25
 hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioFedWeight.py,sha256=7Dss1AIbG7GimQ3-Ecv2wsx1PrblZhHFYhMHWoyvPc4,2140
 hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioNitrogen.py,sha256=RV7lLd4PiFRCkH83-DvuZKnOCA9bXbYOcDHea8Wz4LY,2603
 hestia_earth/models/cycle/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hestia_earth/models/cycle/input/hestiaAggregatedData.py,sha256=_YYV49HtJqGB8cnjTG5DRCrHyUT2DP3gzcw8He3FqWI,6031
+hestia_earth/models/cycle/input/hestiaAggregatedData.py,sha256=LQ53JfQqM4IHSChxxYKyjJNyCqny28PU4xMWMbRWqFs,6286
 hestia_earth/models/cycle/input/properties.py,sha256=xJojLiaMSqFVunJi8aOiTtn8wzkizduinMSxsGGhKN4,3187
 hestia_earth/models/cycle/input/value.py,sha256=kolH9Fc5GIn9OVH2DgHEaW8ksS4xisy0LerS3WkKK9E,1550
 hestia_earth/models/cycle/post_checks/__init__.py,sha256=5ThdvGKp7ilFOzn8Tq23c4XXqhA345PYIe63yOtGJTY,336
@@ -145,13 +149,15 @@ hestia_earth/models/emepEea2019/so2ToAirFuelCombustion.py,sha256=8B1GVsn5gEXVW3i
 hestia_earth/models/emepEea2019/tspToAirAnimalHousing.py,sha256=hHHhu_EZWhxAKhGJgrHY3vNI7Kuy6h8-JyOuas7KRXk,1524
 hestia_earth/models/emepEea2019/utils.py,sha256=oTHjbRRwJZv_tpO9MOlfpyQRmN0a1kvEZsVHUPliZpQ,4014
 hestia_earth/models/emissionNotRelevant/__init__.py,sha256=NkP635TDNs7bQBv2n9tUTLwScZHfUkSC4XzLVwjxWtg,2240
-hestia_earth/models/environmentalFootprintV3/__init__.py,sha256=lzg9qccwd9tbspw0lQ58YPprnvvSLTn3QV5T2-tPcC4,425
-hestia_earth/models/environmentalFootprintV3/environmentalFootprintSingleOverallScore.py,sha256=Jlenb5nh0DKCoh8Pdd6-3Bxvyg9fB3bw1ww3_y7nE9w,5796
-hestia_earth/models/environmentalFootprintV3/freshwaterEcotoxicityPotentialCtue.py,sha256=N_gw2aNoCMW5Z1XM-uAyCF1kfpZUI07giv_bo3Lmr5Q,918
-hestia_earth/models/environmentalFootprintV3/soilQualityIndexLandOccupation.py,sha256=r3GV2pspKWAlKU46TMh_6D_rrXtY_onhk3RnukzJjD8,5095
-hestia_earth/models/environmentalFootprintV3/soilQualityIndexLandTransformation.py,sha256=D_le-V9J0JFcCT5YBXYWv_Z1IQ67EjvwDiaoDuVeJ6w,7072
-hestia_earth/models/environmentalFootprintV3/soilQualityIndexTotalLandUseEffects.py,sha256=SIjFYPv4n3mziohW2nlycaMssHQ3ws79hqHa4i3sCVI,2997
-hestia_earth/models/environmentalFootprintV3/utils.py,sha256=fZ99_G0Kh4OUW5wH-LglzCrKp8l2plKuCs4yvUH_3hs,699
+hestia_earth/models/environmentalFootprintV3_1/__init__.py,sha256=tF2WrWiV1Wzi2vnRiNXdfPWfmVxgVu9w9-7eA6PA7-s,473
+hestia_earth/models/environmentalFootprintV3_1/environmentalFootprintSingleOverallScore.py,sha256=Jlenb5nh0DKCoh8Pdd6-3Bxvyg9fB3bw1ww3_y7nE9w,5796
+hestia_earth/models/environmentalFootprintV3_1/freshwaterEcotoxicityPotentialCtue.py,sha256=N_gw2aNoCMW5Z1XM-uAyCF1kfpZUI07giv_bo3Lmr5Q,918
+hestia_earth/models/environmentalFootprintV3_1/marineEutrophicationPotential.py,sha256=UM9pezQeETfk9i0FtOBRdreaaJ9OqL6G4gYljrKOz-0,1063
+hestia_earth/models/environmentalFootprintV3_1/scarcityWeightedWaterUse.py,sha256=2m_vX-Ziy8rrVqf1fBpKzLc1FFXs48XQRygvCKS7i-0,1263
+hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandOccupation.py,sha256=r3GV2pspKWAlKU46TMh_6D_rrXtY_onhk3RnukzJjD8,5095
+hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandTransformation.py,sha256=D_le-V9J0JFcCT5YBXYWv_Z1IQ67EjvwDiaoDuVeJ6w,7072
+hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexTotalLandUseEffects.py,sha256=SIjFYPv4n3mziohW2nlycaMssHQ3ws79hqHa4i3sCVI,2997
+hestia_earth/models/environmentalFootprintV3_1/utils.py,sha256=fZ99_G0Kh4OUW5wH-LglzCrKp8l2plKuCs4yvUH_3hs,699
 hestia_earth/models/epa2014/__init__.py,sha256=ckGf_6X7CCzI_18OqchEkuJAXKXM1x7V53u480ckknM,408
 hestia_earth/models/epa2014/no3ToGroundwaterExcreta.py,sha256=fN4fOOcjBg3tl0lzNeJ8mzg6mrvQRxilx-R5Gc4l4Nw,1724
 hestia_earth/models/fantkeEtAl2016/__init__.py,sha256=NtOlRmjTA4e8i0nW8erwdm-DDtfYlbLiARqqv82bkU4,415
@@ -227,7 +233,7 @@ hestia_earth/models/impact_assessment/pre_checks/cycle.py,sha256=2kg2_X1PRNxevAr
 hestia_earth/models/impact_assessment/pre_checks/site.py,sha256=GMse3nBIXBFMJqMUq6C_Sqw8uWm7ykh46enMtmHPYbU,911
 hestia_earth/models/impact_assessment/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/models/impact_assessment/product/economicValueShare.py,sha256=EFVAQ6ZDC_jPRMA3K3lVVLR6Ow3nzMeG6zhNlwICef8,1470
-hestia_earth/models/impact_assessment/product/value.py,sha256=opBfdXZ8GfTxdMkr_XeOFb3gZ4slGpUNE9RXHH1QUHw,1332
+hestia_earth/models/impact_assessment/product/value.py,sha256=K88uLQ7m_vvoVuTXjolV9fdzds6DO6VHRB-1f3CA7eY,1331
 hestia_earth/models/ipcc2006/__init__.py,sha256=ReUFPLqIyp16QEOGaiHmz41QbuwYBQYDKVtw6KuRDIA,409
 hestia_earth/models/ipcc2006/aboveGroundCropResidueRemoved.py,sha256=6FDgMH5eiO1mEn20oerYpWty6t9058JS3MCdfVmeY_o,2714
 hestia_earth/models/ipcc2006/aboveGroundCropResidueTotal.py,sha256=vD_kpvOJmjTOjDEnlqSYBSZxjuPGvzpmCr0JIC84GKE,3431
@@ -248,9 +254,9 @@ hestia_earth/models/ipcc2013ExcludingFeedbacks/gwp100.py,sha256=2fFEHTXxel_XPiMX
 hestia_earth/models/ipcc2013IncludingFeedbacks/__init__.py,sha256=VJ16KIGQQHybzZiTvu3mpZy_3j0xcd06RHHCfPrCMgU,427
 hestia_earth/models/ipcc2013IncludingFeedbacks/gwp100.py,sha256=HR2vnOc64mg_fxe9m5NmqxBZ8-aFuKb44gmItyuRL1s,1041
 hestia_earth/models/ipcc2019/__init__.py,sha256=LdRpu8KbEc-MroIwXfKDjfj-xbgmfUYgctjKVvtpRfQ,409
-hestia_earth/models/ipcc2019/aboveGroundBiomass.py,sha256=rOPA-pdNXq6Cg1AlloDqYl7QMKQc2OzJtUiGcqRQ1Rw,19940
+hestia_earth/models/ipcc2019/aboveGroundBiomass.py,sha256=3OizoSpsHtHG2evmH9A-kxVl3FqqrIfZeFcVCv9BOi8,19956
 hestia_earth/models/ipcc2019/aboveGroundCropResidueTotal.py,sha256=lT2QVV5c2LvQqZRfPEvFT_bMTayMXgIsFLnx8I6iYzw,3089
-hestia_earth/models/ipcc2019/belowGroundBiomass.py,sha256=dBvu1--OfIr2GwoF4eznG8MY7MBajWyMLX2VSoLztvM,18945
+hestia_earth/models/ipcc2019/belowGroundBiomass.py,sha256=VpYI_BT4D4R5dASC13kn9_QPxVMiojY_gc32StUPvwM,18961
 hestia_earth/models/ipcc2019/belowGroundCropResidue.py,sha256=7AFU2Q0qPAvv6uEKWByS38jl77FvjTPbGm2GQ53waGg,3499
 hestia_earth/models/ipcc2019/biomass_utils.py,sha256=R7t-YWq5K-AMHihlWh8hWHfhaoGZMmDf8SNFM6-wGdU,15895
 hestia_earth/models/ipcc2019/carbonContent.py,sha256=tlQvu4Auhpjmaz7XrZz86xwxVrJhsYYf8DFA_aQeev4,7255
@@ -260,7 +266,7 @@ hestia_earth/models/ipcc2019/ch4ToAirExcreta.py,sha256=WnKmSQSqr1Jv7_95DLgtufPYG
 hestia_earth/models/ipcc2019/ch4ToAirFloodedRice.py,sha256=TJ4J7VA5n4RPrJYZQeR3lc3ZoCw7T1E5Cb1XJewr834,7331
 hestia_earth/models/ipcc2019/co2ToAirAboveGroundBiomassStockChange.py,sha256=s0zViR8Ab_b_sMDwMzopN4SAWdm6wpzGs-Hf_TtWaiw,6641
 hestia_earth/models/ipcc2019/co2ToAirBelowGroundBiomassStockChange.py,sha256=trinj_A8H6H_zMaQMjYXcBePvjDKXhbqmIpeet0lW6g,6691
-hestia_earth/models/ipcc2019/co2ToAirCarbonStockChange_utils.py,sha256=SjE2QtBBV6DMM5sp5RGBoKcShojZFmSZwMGUSXXHtAY,57884
+hestia_earth/models/ipcc2019/co2ToAirCarbonStockChange_utils.py,sha256=SeBGZr3qucktpRMfvIRMqFnW0C2QQxQnRfHYNoHshZ4,57933
 hestia_earth/models/ipcc2019/co2ToAirLimeHydrolysis.py,sha256=7z0zdqiiWQwkyJCgSNMoK2mft3cJkTRlqwKrMuSKdWI,2454
 hestia_earth/models/ipcc2019/co2ToAirSoilOrganicCarbonStockChange.py,sha256=UQjmccUsKxsycG_htbD1-T2xw6AklKqIR3u8KIMGBOY,6709
 hestia_earth/models/ipcc2019/co2ToAirUreaHydrolysis.py,sha256=Ofld5SuRKndcKB3FFFoUdzSgNq-gc4kmiNyyrPKQ3Io,3580
@@ -284,8 +290,8 @@ hestia_earth/models/ipcc2019/no3ToGroundwaterOrganicFertiliser.py,sha256=px2SN-u
 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=C9ef41fd-gYixEV3sTs9VMHHdnSZJ14kbEEmMG116hY,8653
-hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1_utils.py,sha256=hgMh3p7tflTo06LJjAkoz8btrl8Rc6lYYvZp1ooJIaI,76214
-hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2_utils.py,sha256=ICeEoCR334zzV3CfvvMf_d00jtREkRO1t_gNlB83Avw,64003
+hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1_utils.py,sha256=NNiFGHRErIgyYw7l9uoMaUNpAd0OhkUOKEqwQ1863xM,76251
+hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2_utils.py,sha256=4VSVL0qHVzwvi7lVAY5VMkGscUsu3PIyvJENFyTKYgM,64040
 hestia_earth/models/ipcc2019/organicCarbonPerHa_utils.py,sha256=FFcjdkYq5NJwAu4bWZJUao4MoDHvgbXmXCnUNKD-a3w,9842
 hestia_earth/models/ipcc2019/pastureGrass.py,sha256=HWRkpYpGqvMfol2dPb9pFkNzoGj7n6sRpyIjGSVM9lQ,10306
 hestia_earth/models/ipcc2019/pastureGrass_utils.py,sha256=KvjIQ3xwbq1rk3thHlkGgQaWKgh0hCkNnzC53JW9634,14178
@@ -408,7 +414,7 @@ hestia_earth/models/linkedImpactAssessment/utils.py,sha256=S1zlux02gU2Lajrtoq-zQ
 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=u-tcKGaNFryejlnVJTsBNXbfDmzoS3ncapYQiS55-nk,102053
+hestia_earth/models/mocking/search-results.json,sha256=4Lktf7Rv2YObXMbIxFDPQ1jynfsn14WXh9EptNX5P9U,102054
 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=JT0RybbvWVlo01FO8K0Yj41HrEaJT3Kj1xfayr2X-xw,2315
@@ -512,7 +518,7 @@ hestia_earth/models/site/defaultMethodClassification.py,sha256=dd8d8agEGZxnDhZWb
 hestia_earth/models/site/defaultMethodClassificationDescription.py,sha256=PfViyDtpMfBZTea4XkuG5SK1Ac3x3RkK9lA_ogiNJNg,1474
 hestia_earth/models/site/flowingWater.py,sha256=v3g5722GIA4zQAUQI9yGFiZvFvI1QAVZqlQrY-6_B3A,1731
 hestia_earth/models/site/freshWater.py,sha256=FXs3Vt8V4e-wn325_dwSTOKlZtn5ksNUpvYGDeLJShY,1255
-hestia_earth/models/site/management.py,sha256=6MY67jam6JFnPnXnua2DJ6Mxpu8tffELaLr9q8uYw4A,15722
+hestia_earth/models/site/management.py,sha256=MJgbfphil6asmbXR7K2Y0kIokxSd1fLQCfLGAFYZ-Uk,15730
 hestia_earth/models/site/netPrimaryProduction.py,sha256=UIIQkYd911qVzrWjxBLrC37e-RARIVgDwLdARY9BuLw,1849
 hestia_earth/models/site/organicCarbonPerHa.py,sha256=F2ShinHf0m9qKa1nCYBspsDkRY6jzOl0wM8mSDre22I,14916
 hestia_earth/models/site/organicCarbonPerKgSoil.py,sha256=t--wAshiAKS-JvEKhLFRadGvgSBv5NFZ68jdyms_wh4,1945
@@ -570,12 +576,12 @@ hestia_earth/models/transformation/product/__init__.py,sha256=47DEQpj8HBSa-_TImW
 hestia_earth/models/transformation/product/excreta.py,sha256=Yj9wMF5if-zivb6qbN3vy1X51ZNYxvoyG9f4KPp3Y18,5700
 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=ADtNs74scoLRPsBF8J9K-QE6WcNB2qFhBmR8abJAYh8,7302
-hestia_earth/models/utils/aggregated.py,sha256=01V5RDvO9EZAEiApY7M2dUoR4GcGxvAH5lvtIK_qjyI,4946
+hestia_earth/models/utils/__init__.py,sha256=nFFkL46giQRAakpUmhlWq57f_M3UI36NMLYKJbC8nWg,7436
+hestia_earth/models/utils/aggregated.py,sha256=cTUzS60t44_viF1wMnTTVpFq8-6cKJTQuQXPHGq6RgY,5102
 hestia_earth/models/utils/animalProduct.py,sha256=M5IunAKGY6oZv3j1Ascl34ywyeLWApqOIlBzbtlA2FE,721
 hestia_earth/models/utils/aquacultureManagement.py,sha256=dxrbC1Xf140cohxTbSw6TxLAnAASWTdNZwBBam4yQnw,171
-hestia_earth/models/utils/array_builders.py,sha256=QEkM7e75Y9aq5yEPEk3R8md36IuvCDkpekdGm3uA0uk,19397
-hestia_earth/models/utils/blank_node.py,sha256=M7ioDaUQn2_JjYamseIzTGpTcP8uU8Ii2DKqUDWVDjA,52180
+hestia_earth/models/utils/array_builders.py,sha256=ko1pDZKaUudZqxOZ99vJamKAdoR6ND4ZmxVrYH6YjPc,19498
+hestia_earth/models/utils/blank_node.py,sha256=p0ikM08UygbF-zXfJsf_OtePCxkCMjkBqTpmFhshHSQ,52261
 hestia_earth/models/utils/cache_sources.py,sha256=MBkrPpjwNiC4ApDjeYVHZjWBbpvAerXRDrMHpjasAZ0,377
 hestia_earth/models/utils/completeness.py,sha256=2-GusD9UycobDZq8y5jar0ZcOjyqnSbzPRT_5XMc4YA,1259
 hestia_earth/models/utils/constant.py,sha256=6wLx8xb2R8HtpEpVy5e-PbioOo7QCu2n-W72fs6OvgE,3411
@@ -597,7 +603,7 @@ hestia_earth/models/utils/inorganicFertiliser.py,sha256=_dLBY-otGkLr8PobR5dQ89bF
 hestia_earth/models/utils/input.py,sha256=gsVFKTC9WF8dO6YAg_-H_GAOQTnvAr49Ox5-eTH8zf8,5145
 hestia_earth/models/utils/landCover.py,sha256=8-nfynzCx9gf9YfhpuoH6Cn4kQwWFpYA5RmoGW-0ETE,300
 hestia_earth/models/utils/liveAnimal.py,sha256=GnajBPZw5d94raf80KtLloaOqlfqGAPwUtP9bRlGWeE,1754
-hestia_earth/models/utils/lookup.py,sha256=VMdoPiNDuN90JNDDgYuv3iAQFk_cXu3p1ZonPi9QBFw,8726
+hestia_earth/models/utils/lookup.py,sha256=IkVB-T2Ab_jA7RTZUKn6yp3VBIvmqes26JbAG-Obnd8,8793
 hestia_earth/models/utils/management.py,sha256=W5M9k0arraVUGh4ZccVqgb8rSSLxHM6rkmi4MSzV6Dw,413
 hestia_earth/models/utils/measurement.py,sha256=izEiPszUcPA22zaIc0OuF7Yk82JWu5cxi0Sbz_9YgBo,11142
 hestia_earth/models/utils/organicFertiliser.py,sha256=2HY-a0EBzUw4DkEAXClLMXVCEZTKYf0BwFHBo7lQ5Tg,363
@@ -605,7 +611,7 @@ hestia_earth/models/utils/pesticideAI.py,sha256=_mlhKnA1TxF-x39CPNnOGXk6754SoSQq
 hestia_earth/models/utils/practice.py,sha256=tNadOzsrNlCEt801B815XaruJXzZ5yPASam7B3sWpXE,1091
 hestia_earth/models/utils/product.py,sha256=DhDgiReR8k9n9aaRM2xk3PIY3nfoE1ISKg9pKsBVzVQ,10143
 hestia_earth/models/utils/productivity.py,sha256=rTJX_nemxHpOcPN7jiM2hFHknoLUIW8y-hFxVxIkg70,593
-hestia_earth/models/utils/property.py,sha256=qtn1BLh3V8wlUE0KR9AZQ4qFD-ztFmvyG9kiUhUUzQk,5402
+hestia_earth/models/utils/property.py,sha256=-qQTdGLmH3v_5IS2pOkZV9RIaYbJ97oWPUni3uTiHz4,5585
 hestia_earth/models/utils/site.py,sha256=MyWh_jhY1XbN2EZRdJsHzNJW0PGQqEC1wAmiie4nQy0,3905
 hestia_earth/models/utils/source.py,sha256=Y-CcO5Y3q5Hz4A4RdX35C1EUjL9w1NKnOrzVfOWQ7nU,1748
 hestia_earth/models/utils/stats.py,sha256=-0vvhSDAhp4ZYXD1l6sO2hdok8_HgUM6OjCSYGSTHqU,15291
@@ -616,9 +622,9 @@ hestia_earth/models/utils/transformation.py,sha256=nyT5Mz4_VgFwhkL8JoNX9kxxow0zu
 hestia_earth/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=Niv7ZFMBCwThlbCKGOwA17QdkpOUDFrqrFItGNqnZAA,434
 hestia_earth/models/webbEtAl2012AndSintermannEtAl2012/nh3ToAirOrganicFertiliser.py,sha256=TGXyusrRd9shT842iqbrI6MkQhICgw7uYdrl4jsDrg8,4193
 hestia_earth/orchestrator/__init__.py,sha256=ntPWzdomHMdKejrnUlVPCUrLw0P2C9UIt3jRJD_Gwn4,1402
-hestia_earth/orchestrator/log.py,sha256=rvuc221TZCXB1s_Qxme_lTPAI9cZWkmTvnZHGqSDtWY,2214
+hestia_earth/orchestrator/log.py,sha256=ZVqekPDbXw9zIzxaiGZ86PdMhVK7w99eu-Rvs28VCeo,2580
 hestia_earth/orchestrator/utils.py,sha256=LAMUTyIQ-90TR6CUljWPbCNBsAMeukOhW4zoPy7LzuU,4111
-hestia_earth/orchestrator/models/__init__.py,sha256=LdoDX-_wv6ZUCNomEuUMPZrr2jmfsiU_LIcUF8V1Px8,4010
+hestia_earth/orchestrator/models/__init__.py,sha256=0YtIyaNyhavK8Vq_y5a3smynLNXaGnuaZte5HROlNFc,4237
 hestia_earth/orchestrator/models/transformations.py,sha256=zJwfVXabudLXhdyz0Hsk4IV_2OjgMtaYEZbD9kuZtLk,4128
 hestia_earth/orchestrator/models/emissions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/orchestrator/models/emissions/deleted.py,sha256=KC6J1bdMJC1rBFlWW5SD1NhbN8kyBPFdncbtY9OfYBU,575
@@ -634,8 +640,8 @@ hestia_earth/orchestrator/strategies/run/add_key_if_missing.py,sha256=t3U-v87Xpb
 hestia_earth/orchestrator/strategies/run/always.py,sha256=D0In6_kr28s-fgqspawgvj5cgFClxGvepZYqtYsjWVE,217
 tests/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/test_cache_sites.py,sha256=eZkbgAhfA-67GhPgE4lk8byHnYvX2Ate1KPsE6jH1-c,2954
-tests/models/test_config.py,sha256=JhO7T3bNh2Dl61pKAyM4iEPKybfue02qdneHcJTO2Ck,3368
-tests/models/test_ecoinventV3.py,sha256=_BqfWiYFaw-Y7A-EeabHEnja3d7yb4Ed7gGGvu3Srpw,1936
+tests/models/test_config.py,sha256=w27OA_pk9NuDbxzMD--l72Ea97SL1HS6bos6mOUCy8k,3386
+tests/models/test_ecoinventV3.py,sha256=ojL19T8kFNCiM5i-EgvXniLWBxU4RCsBOgIQ-sbGaMM,1894
 tests/models/test_ecoinventV3AndEmberClimate.py,sha256=_EOxdrdavXP6L5_LtvaVbXb_-56UJXSaiPhpGntmwVc,801
 tests/models/test_emissionNotRelevant.py,sha256=YXTdRfcdR_JepHuj2P3Y3r0aFMKNOmsXQHY48tmLTQo,1316
 tests/models/agribalyse2016/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -659,9 +665,13 @@ tests/models/chaudharyBrooks2018/test_damageToTerrestrialEcosystemsLandOccupatio
 tests/models/chaudharyBrooks2018/test_damageToTerrestrialEcosystemsLandTransformation.py,sha256=lcyMTaNMbIjzZrbPxejujfYyAEj2XOH5Ei9pmAQAi7k,1912
 tests/models/chaudharyBrooks2018/test_damageToTerrestrialEcosystemsTotalLandUseEffects.py,sha256=NTc3PZZRc9ZqGpaARdbuzLWR5bB0HCPw5AMdGmwVsRg,704
 tests/models/cml2001Baseline/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/cml2001Baseline/test_abioticResourceDepletionFossilFuels.py,sha256=lR2PX0mmppnSMWj9-vAD1XUBXQab5w-xS5CbWbNl1Uk,8369
+tests/models/cml2001Baseline/test_abioticResourceDepletionFossilFuels.py,sha256=XseqzU8JE3MOeIM_3cBIlNhTInucG_VNfgyUIpKAdrU,5663
 tests/models/cml2001Baseline/test_abioticResourceDepletionMineralsAndMetals.py,sha256=y-E5t5x2VcgPsy3cPFBWyULd6vieaGjDY_J2GVJMtUo,4081
 tests/models/cml2001Baseline/test_eutrophicationPotentialExcludingFate.py,sha256=ZIIx_EiYbUxUoAS7NuQrxqwTFS3rXQm9_1AsqF_bhB8,894
+tests/models/cml2001Baseline/test_resourceUseEnergyDepletionDuringCycle.py,sha256=kgtJd2sI6BwL-pOGnNA6b-huPpJGgcO6cbZdme_lKmQ,4772
+tests/models/cml2001Baseline/test_resourceUseEnergyDepletionInputsProduction.py,sha256=KPEC2CXgO78Kkcbi_Iu0AzKRZMYJSfkeEV-kspSyLYA,910
+tests/models/cml2001Baseline/test_resourceUseMineralsAndMetalsDuringCycle.py,sha256=kko6cV3YRmcxfYdJ8xQuTeo9Bro9BuBbgGBO2gklxWM,2085
+tests/models/cml2001Baseline/test_resourceUseMineralsAndMetalsInputsProduction.py,sha256=_UqFak1-DX6b-brX2xt3zpfYUhjFPRoUMhgF9l3cw3I,912
 tests/models/cml2001Baseline/test_terrestrialAcidificationPotentialIncludingFateAverageEurope.py,sha256=t3WBdg_aTYSLfaqeXUDyvQJ8ZqbvKwv9RKaZyRzj61k,925
 tests/models/cml2001NonBaseline/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/cml2001NonBaseline/test_eutrophicationPotentialIncludingFateAverageEurope.py,sha256=Snt0zwI1fF2_ome79rTRZjl5Oc8dZfbcqX8lXwxabVs,910
@@ -759,12 +769,14 @@ tests/models/emepEea2019/test_pm25ToAirAnimalHousing.py,sha256=cs3UaJ7ucCryOaQy0
 tests/models/emepEea2019/test_so2ToAirFuelCombustion.py,sha256=zRTyeeQM1fRdRVFWbtCNndaddDbKHU1xLzmp_psDceE,1518
 tests/models/emepEea2019/test_tspToAirAnimalHousing.py,sha256=4MNDsxIeUk5_3IvZwEZslxgoPNyQN9OQFDNY3uGNX6E,714
 tests/models/emepEea2019/test_utils.py,sha256=G6z8tEfWM0OPnUBaFCQgQyEi5-kRF_DqsqdYaPnzR_I,8761
-tests/models/environmentalFootprintV3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/environmentalFootprintV3/test_environmentalFootprintSingleOverallScore.py,sha256=BMmUURDMn6z3gd3bchwwwrNyft0hYemieJe-855GOyc,3349
-tests/models/environmentalFootprintV3/test_freshwaterEcotoxicityPotentialCtue.py,sha256=ZPDKM23qlLMe_ZzeA-QIutSkFlod3BsmjloA9WA8nug,845
-tests/models/environmentalFootprintV3/test_soilQualityIndexLandOccupation.py,sha256=pgauGmFl52lQJVPaDHryrUU3LSmjWC-Al_XBqQj33u4,6116
-tests/models/environmentalFootprintV3/test_soilQualityIndexLandTransformation.py,sha256=pZPeduNitr0VCfsNtg0M84EhiCpjTwUZ1qnj_7tWSeQ,5797
-tests/models/environmentalFootprintV3/test_soilQualityIndexTotalLandUseEffects.py,sha256=j6V2AE1I98hi-Cv_-L5Rc2zzL0au9SWW4XnMkSuV7yo,2314
+tests/models/environmentalFootprintV3_1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/models/environmentalFootprintV3_1/test_environmentalFootprintSingleOverallScore.py,sha256=B0cXRUV66Qs5nq9etFxWRrmNJgm3bDFEDje7u7UFroo,3437
+tests/models/environmentalFootprintV3_1/test_freshwaterEcotoxicityPotentialCtue.py,sha256=WE-DcerljCjXMYE4f3Sv5ZCVHP0oTjbWkOGuvaa4p10,926
+tests/models/environmentalFootprintV3_1/test_marineEutrophicationPotential.py,sha256=kY_pu_7SjSZl_l41mttMn4BpKl13TTV9jQYSHFMNXhI,968
+tests/models/environmentalFootprintV3_1/test_scarcityWeightedWaterUse.py,sha256=zEdWXjtlZv5Nyv0EZxvLxe4BQ-4_ME38bMfNvFZXjl8,1169
+tests/models/environmentalFootprintV3_1/test_soilQualityIndexLandOccupation.py,sha256=-E8Q5JxIdfF11oqGwRJqcqGO0Ao_Bva164ELMR7sRsI,6197
+tests/models/environmentalFootprintV3_1/test_soilQualityIndexLandTransformation.py,sha256=OqVVxAbfXEdqzgEcPx1wQbTrsjT9ENYG-KW8HP0rTOc,5885
+tests/models/environmentalFootprintV3_1/test_soilQualityIndexTotalLandUseEffects.py,sha256=oeLb8kQ2yabnlCaBw7MYF_fMfVNea4ogr9lWJ-u3SXM,2389
 tests/models/epa2014/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/epa2014/test_no3ToGroundwaterExcreta.py,sha256=ESVz4UURvQfhjGBTxjuAV_bymMBcvGNfLAkYMvNup9U,1217
 tests/models/fantkeEtAl2016/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -828,7 +840,7 @@ tests/models/hestia/test_residueRemoved.py,sha256=WkyWaW_Ym-KBXFYJHcMR-mliiQX4vw
 tests/models/hestia/test_seed_emissions.py,sha256=dCUuJBkhwNFBhhcypQN7eMqrWZ9iGCnypoidO5DfQYw,921
 tests/models/impact_assessment/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/impact_assessment/test_allocationMethod.py,sha256=HkUt6oWdEyFSdxMpx8y_Oxk0nO2Fi9B_kUZcVte9tzg,1223
-tests/models/impact_assessment/test_emissions.py,sha256=K6Mi800irxajDfsmG7RHV-Y89U2KoCT_k3VR-RqCV24,1019
+tests/models/impact_assessment/test_emissions.py,sha256=nygoe5JeuQ1rbMQSqAr8oBSm6jC4ygZb2XNHyEx85lo,990
 tests/models/impact_assessment/test_irrigated.py,sha256=3elSWEN1NE05JO1OMfJ7uf0JmU-fqLpazCvS6FVxMQE,377
 tests/models/impact_assessment/test_oganic.py,sha256=Ei73bkB2MzKlr3jZmg8Cimxw_ImJSBdB3xKBn6ZCRx8,375
 tests/models/impact_assessment/test_post_checks.py,sha256=B-KVdkWaG8v-9aT1fNDQ9sml3q9I5XPo38NKxear1nY,310
@@ -1168,7 +1180,7 @@ tests/models/transformation/product/test_excreta.py,sha256=Q9OQpk8qVPv3alIz2i5XQ
 tests/models/usetoxV2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/usetoxV2/test_freshwaterEcotoxicityPotentialCtue.py,sha256=eq7Gcmfya9g0eOKKkuBhz8vq7xi_CmZ_LTSxueBwZt4,835
 tests/models/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/utils/test_array_builders.py,sha256=uHxO4beJhdJD-1lI5aPEAsYziQP8SN7AJ9PEY67DpaI,8417
+tests/models/utils/test_array_builders.py,sha256=4giHf3bTNd2ReAgcKinKjLpQOOcmfF0qSInngW7UdYc,8434
 tests/models/utils/test_blank_node.py,sha256=G_hH-Gk3__1ZtHQcsdYMbUMwVNSTmYcVBs5jcReIYGM,39945
 tests/models/utils/test_cache_sources.py,sha256=xcGMVbYoV23YC4HLBTL_4qZP1ME2cp3DFebgJMxI2TE,721
 tests/models/utils/test_crop.py,sha256=d508vQdtB_Q_6hEahNueXed5PaEiLeN7ScbwZIKCiDI,862
@@ -1213,8 +1225,8 @@ tests/orchestrator/strategies/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 tests/orchestrator/strategies/run/test_add_blank_node_if_missing.py,sha256=lGqeebvgAwGathB8NLZ14Js5JV_-KyHueaD6I8IH8mU,3615
 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.66.0.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
-hestia_earth_models-0.66.0.dist-info/METADATA,sha256=BmZGBMAEEnQGVkzLqh-_iHelje1yM0FHCXo_Ji4a010,4046
-hestia_earth_models-0.66.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_models-0.66.0.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.66.0.dist-info/RECORD,,
+hestia_earth_models-0.67.0.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
+hestia_earth_models-0.67.0.dist-info/METADATA,sha256=c4dTeGL714DeJCCzVf5M-SuXV8p8SBIKVbyDHnY_67Q,4046
+hestia_earth_models-0.67.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hestia_earth_models-0.67.0.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.67.0.dist-info/RECORD,,