hestia-earth-models 0.73.8__py3-none-any.whl → 0.74.0__py3-none-any.whl

hestia_earth/models/utils/__init__.py

@@ -43,6 +43,9 @@ def _omit(values: dict, keys: list) -> dict: return {k: v for k, v in values.ite
 def _include(value: dict, keys: list) -> dict: return {k: v for k, v in value.items() if k in keys}
 
 
+def unique_values(values: list, key='@id'): return list({v[key]: v for v in values}.values())
+
+
 def _run_in_serie(data: dict, models: list): return reduce(lambda prev, model: model(prev), models, data)
 
 

hestia_earth/models/utils/background_emissions.py

@@ -1,16 +1,19 @@
-from hestia_earth.schema import TermTermType
+from functools import reduce
+from typing import Callable, Tuple
+from hestia_earth.schema import TermTermType, EmissionMethodTier
+from hestia_earth.utils.lookup import _is_missing_value, lookup_columns
 from hestia_earth.utils.model import find_term_match, filter_list_term_type
-from hestia_earth.utils.tools import flatten, non_empty_list
+from hestia_earth.utils.tools import flatten, non_empty_list, safe_parse_float
 from hestia_earth.utils.emission import cycle_emissions_in_system_boundary
 
-from hestia_earth.models.log import logShouldRun, debugValues
-from . import is_from_model
+from hestia_earth.models.log import logShouldRun, logRequirements, debugValues
+from . import is_from_model, _omit
 from .term import get_lookup_value
 
 
 def _animal_inputs(animal: dict):
     inputs = animal.get('inputs', [])
-    return [(input | {'animal': animal.get('term', {})}) for input in inputs]
+    return [(input | {'animalId': animal['animalId'], 'animal': animal.get('term', {})}) for input in inputs]
 
 
 def _should_run_input(products: list):
@@ -58,21 +61,24 @@ def no_gap_filled_background_emissions(
     return check_input
 
 
-def all_background_emission_term_ids(node: dict, termType: TermTermType):
+def _all_background_emission_term_ids(node: dict, termType: TermTermType):
     term_ids = cycle_emissions_in_system_boundary(node, termType=termType)
-    return list(set([
+    background_ids = list(set([
         get_lookup_value({'termType': termType.value, '@id': term_id}, 'inputProductionGroupId')
         for term_id in term_ids
     ]))
+    # make sure input production emission is itself in the system boundary
+    return [term_id for term_id in background_ids if term_id in term_ids]
 
 
 def log_missing_emissions(node: dict, termType: TermTermType = TermTermType.EMISSION, **log_args):
-    all_emission_term_ids = all_background_emission_term_ids(node, termType)
+    all_emission_term_ids = _all_background_emission_term_ids(node, termType)
 
     def log_input(input_term_id: str, included_emission_term_ids: list, **extra_log_args):
         missing_emission_term_ids = non_empty_list([
             term_id for term_id in all_emission_term_ids if term_id not in included_emission_term_ids
         ])
+
         for emission_id in missing_emission_term_ids:
             # debug value on the emission itself so it appears for the input
             debugValues(node, term=emission_id,
@@ -81,7 +87,101 @@ def log_missing_emissions(node: dict, termType: TermTermType = TermTermType.EMIS
                         input=input_term_id,
                         **log_args,
                         **extra_log_args)
-            logShouldRun(node, term=input_term_id, should_run=False, emission_id=emission_id,
+            logRequirements(node, term=input_term_id,
+                            emission_id=emission_id,
+                            has_emission_factor=False,
+                            **log_args,
+                            **extra_log_args)
+            logShouldRun(node, term=input_term_id, should_run=False,
+                         emission_id=emission_id,
                          **log_args,
                          **extra_log_args)
     return log_input
+
+
+_KEY_TO_FIELD = {
+    'inputs': 'key'
+}
+
+
+def _key_to_field(key: str): return _KEY_TO_FIELD.get(key) or key
+
+
+def _values_from_column(index_column: str, column: str, value: str):
+    values = column.split('+')
+    term_id = values[0]
+    value = safe_parse_float(value, default=None)
+    return {
+        term_id: {
+            'value': value
+        } | {
+            _key_to_field(v.split('[')[0]): v.split('[')[1][:-1] for v in values[1:]
+        }
+    } if all([
+        column != index_column,
+        not column.startswith('ecoinvent'),
+        not column.startswith('ecoalim'),
+        not _is_missing_value(value)
+    ]) else {}
+
+
+def convert_background_lookup(lookup, index_column: str):
+    columns = lookup_columns(lookup)
+    return {
+        row[index_column]: reduce(
+            lambda prev, curr: prev | _values_from_column(index_column, curr, row[curr]),
+            columns,
+            {}
+        )
+        for row in lookup
+    }
+
+
+def parse_term_id(term_id: str): return term_id.split('-')[0]
+
+
+def join_term_id(term_id: str, data: dict):
+    return '-'.join(non_empty_list([term_id] + list(_omit(data, ['value']).values())))
+
+
+def _process_mapping(
+    node: dict,
+    input: dict,
+    term_type: TermTermType,
+    extract_mapping: Callable[[Tuple, TermTermType], Tuple[dict, float]],
+    **log_args
+) -> dict:
+    input_term_id = input.get('term', {}).get('@id')
+    operation_term_id = input.get('operation', {}).get('@id')
+    animal_term_id = input.get('animal', {}).get('@id')
+
+    def add(prev: dict, mapping: Tuple):
+        values, coefficient = extract_mapping(mapping, term_type)
+        for term_id, data in values:
+            # log run on each node so we know it did run
+            logShouldRun(node, term=input_term_id, should_run=True,
+                         methodTier=EmissionMethodTier.BACKGROUND.value,
+                         emission_id=term_id,
+                         **log_args)
+            debugValues(node, term=term_id,
+                        value=data.get('value'),
+                        coefficient=coefficient,
+                        input=input_term_id,
+                        operation=operation_term_id,
+                        animal=animal_term_id,
+                        **log_args)
+            group_id = join_term_id(term_id, data)
+            prev[group_id] = prev.get(group_id, []) + [data | {'coefficient': coefficient}]
+        return prev
+    return add
+
+
+def process_input_mappings(
+    node: dict,
+    input: dict,
+    mappings: list,
+    term_type: TermTermType,
+    extract_mapping: Callable[[tuple, TermTermType], Tuple[dict, float]],
+    **log_args
+):
+    return reduce(_process_mapping(node, input, term_type, extract_mapping, **log_args), mappings, {})

hestia_earth/models/utils/blank_node.py

@@ -111,17 +111,6 @@ def properties_logs(blank_nodes: list, properties: Union[dict, list]):
     return log_as_table(logs)
 
 
-def group_by_keys(group_keys: list = ['term']):
-    def run(group: dict, node: dict):
-        group_key = '-'.join(non_empty_list([
-            node.get(v, {}).get('@id') if isinstance(node.get(v), dict) else node.get(v)
-            for v in group_keys
-        ]))
-        group[group_key] = group.get(group_key, []) + [node]
-        return group
-    return run
-
-
 def _module_term_id(term_id: str, module):
     term_id_str = term_id.split('.')[-1] if '.' in term_id else term_id
     return getattr(module, 'TERM_ID', term_id_str).split(',')[0]
@@ -1337,6 +1326,7 @@ def get_inputs_from_properties(input: dict, term_types: Union[TermTermType, List
         {
             'term': p.get('key'),
             'value': [(p.get('value') / 100) * (p.get('share', 100) / 100) * input_value],
+            # for grouping
             'parent': term
         } for p in (properties or []) if all([p.get('key'), p.get('value')])
     ]) if input_value > 0 else []

hestia_earth/models/utils/feedipedia.py

@@ -47,7 +47,7 @@ def _map_properties(lookup, term_id: str, column_prefix: str):
     return {'value': value, 'sd': sd, 'min': min, 'max': max}
 
 
-def rescale_properties_from_dryMatter(model: str, node: dict, blank_nodes: list):
+def rescale_properties_from_dryMatter(model: str, node: dict, blank_nodes: list, **log_args):
     properties = get_feedipedia_properties()
     # download all to save time
     term_types = [blank_node.get('term', {}).get('termType') for blank_node in blank_nodes]
@@ -78,7 +78,7 @@ def rescale_properties_from_dryMatter(model: str, node: dict, blank_nodes: list)
             ])
         ])
         for prop in new_properties:
-            logShouldRun(node, model, term_id, True, property=prop.get('term', {}).get('@id'))
+            logShouldRun(node, model, term_id, True, property=prop.get('term', {}).get('@id'), **log_args)
         return (
             blank_node | {'properties': merge_blank_nodes(all_properties, new_properties)}
         ) if new_properties else blank_node

hestia_earth/models/utils/impact_assessment.py

@@ -219,10 +219,8 @@ def impact_aware_value(model: str, term_id: str, impact: dict, lookup: str, grou
     blank_nodes = impact.get('emissionsResourceUse', [])
     site = get_site(impact)
     aware_id = site.get('awareWaterBasinId')
-    if aware_id is None:
-        return None
 
-    return all_factor_value(
+    return None if aware_id is None else all_factor_value(
         logs_model=model,
         logs_term_id=term_id,
         node=impact,

hestia_earth/models/utils/lookup.py

@@ -93,7 +93,7 @@ def aware_factor_value(model: str, term_id: str, lookup_name: str, aware_id: str
                             node=node_term_id,
                             value=value,
                             coefficient=coefficient)
-        except ValueError:  # factor does not exist
+        except Exception:  # factor does not exist
             coefficient = None
 
         return {'id': node_term_id, 'value': value, 'coefficient': coefficient}

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.73.8'
+VERSION = '0.74.0'

hestia_earth/orchestrator/log.py

@@ -3,6 +3,8 @@ import sys
 import logging
 
 LOG_LEVEL = os.getenv('LOG_LEVEL', 'INFO')
+_EXTENDED_LOGS = os.getenv('LOG_EXTENDED', 'true') == 'true'
+_LOG_DATE_FORMAT = os.getenv('LOG_DATE_FORMAT', '%Y-%m-%dT%H:%M:%S%z')
 
 # disable root logger
 root_logger = logging.getLogger()
@@ -25,9 +27,12 @@ def log_to_file(filepath: str):
         Path of the file.
     """
     formatter = logging.Formatter(
-        '{"timestamp": "%(asctime)s", "level": "%(levelname)s", "logger": "%(name)s", '
-        '"filename": "%(filename)s", "message": "%(message)s"}',
-        '%Y-%m-%dT%H:%M:%S%z')
+        '{"timestamp": "%(asctime)s", "level": "%(levelname)s", "logger": "%(name)s", "message": "%(message)s"}',
+        _LOG_DATE_FORMAT
+    ) if _EXTENDED_LOGS else logging.Formatter(
+        '{"logger": "%(name)s", "message": "%(message)s"}',
+        _LOG_DATE_FORMAT
+    )
     handler = logging.FileHandler(filepath, encoding='utf-8')
     handler.setFormatter(formatter)
     handler.setLevel(logging.getLevelName(LOG_LEVEL))

{hestia_earth_models-0.73.8.dist-info → hestia_earth_models-0.74.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.73.8
+Version: 0.74.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
@@ -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<34.0.0,>=33.4.0
+Requires-Dist: hestia-earth-schema<34.0.0,>=33.5.0
 Requires-Dist: hestia-earth-utils>=0.15.1
 Requires-Dist: python-dateutil>=2.8.1
 Requires-Dist: CurrencyConverter==0.16.8

{hestia_earth_models-0.73.8.dist-info → hestia_earth_models-0.74.0.dist-info}/RECORD

@@ -2,10 +2,10 @@ 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/log.py,sha256=eRuH86v7Thuw-QXdKqaqVmA_MkwnOCo0UBEwtuDq4Oc,3554
+hestia_earth/models/log.py,sha256=LQ6nRMc5q8-xs8DsAx9h8drWhWLkqDG9dFlG9OzFbeA,3780
 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=RjO6hNJ9JTVFwVNMGHDNmvua92wU_hvx1vjlQtMYN6s,19
+hestia_earth/models/version.py,sha256=dr8LfdHIp0dVXgtrKmeyU5v4tY5NawYAi2uFcqYX_K0,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
@@ -17,7 +17,9 @@ hestia_earth/models/akagiEtAl2011/pm25ToAirCropResidueBurning.py,sha256=88LaJnez
 hestia_earth/models/akagiEtAl2011/so2ToAirCropResidueBurning.py,sha256=hoymFUx3TxzwhlOV65RzOx43IK-CGM8jYfWLH6ibHNo,791
 hestia_earth/models/akagiEtAl2011/utils.py,sha256=Fh9BydxPV42xSMg17R-Hf9ehkZR1o9PbCi5UedcCoBQ,1932
 hestia_earth/models/aware/__init__.py,sha256=F8XRo9nRiX-fHAqyeMARYtFmJWRPs-hnIaCiHcZhyMw,406
-hestia_earth/models/aware/scarcityWeightedWaterUse.py,sha256=HO3ic8xFXs_ez13N7kG1JuYit2S8YTi5WgeP9cOyOqc,3936
+hestia_earth/models/aware/scarcityWeightedWaterUse.py,sha256=yVVwPbsIcRZQxqxGPyHX6BFNPNt5f1MfvOarC7lmbyI,4055
+hestia_earth/models/aware2_0/__init__.py,sha256=eAVMFlxXvbFGsn9qDZV4ZXthQjVe92JUMh_pNPh1B30,455
+hestia_earth/models/aware2_0/scarcityWeightedWaterUse.py,sha256=kY_WlPITZJe6TnSrHXS83Dh73UKn4cg6dUiVa571SCc,4138
 hestia_earth/models/chaudharyBrooks2018/__init__.py,sha256=LKxQu7-6gyWPpdXaYHDTawzsBNm7CpDrk98I5_TTLhA,420
 hestia_earth/models/chaudharyBrooks2018/damageToTerrestrialEcosystemsLandOccupation.py,sha256=qsOClIL45FT9qbglvyB5NPOHlWLm8TZl8LDT0duQyfw,3905
 hestia_earth/models/chaudharyBrooks2018/damageToTerrestrialEcosystemsLandTransformation.py,sha256=34WuvMQa3ERW-D9WEv3kbfLbCywaRqGAuXt85wTstUQ,3358
@@ -35,10 +37,10 @@ hestia_earth/models/cml2001Baseline/terrestrialAcidificationPotentialIncludingFa
 hestia_earth/models/cml2001NonBaseline/__init__.py,sha256=vI8wp8Og_e8DiJqYYvp33YoI3t4ffAC31LWlnV20JTg,419
 hestia_earth/models/cml2001NonBaseline/eutrophicationPotentialIncludingFateAverageEurope.py,sha256=lcgyRHY08KCBFPERJNqV4DYGEJCvyHBDnJXD0kEkVqM,1097
 hestia_earth/models/cml2001NonBaseline/terrestrialAcidificationPotentialExcludingFate.py,sha256=xcrxfs9UoV_EWvV-XzMt35oPWCUsTzqg2SGA3j2MFIw,1091
-hestia_earth/models/config/Cycle.json,sha256=sS1OhNU_2-jQYKXOMsAEA4QMGF2CPlM-vxBQhLUshsM,60324
-hestia_earth/models/config/ImpactAssessment.json,sha256=UsjAlJIgF74aG_MIwhlD3kZ1aAQwEy9d1lpltsVWS7I,60297
+hestia_earth/models/config/Cycle.json,sha256=jnCp-cI4Bcg0REa6hW9f9lHrVzmiFp6s2SuRrjM7HLw,60340
+hestia_earth/models/config/ImpactAssessment.json,sha256=8RtgFdfFd0t8gb6sM4iyfHFE2dKgMld5Qg-cykapabY,60300
 hestia_earth/models/config/Site.json,sha256=4DPSziHnDIngyub3Of8OvDEKa446q3Yx48R2Eobqk24,14374
-hestia_earth/models/config/__init__.py,sha256=l1WqL7ezlank86ABP4zUia_hIvM9ba-sOE3z6wNrea8,2333
+hestia_earth/models/config/__init__.py,sha256=7ZqOGd4dO2Stonte6fbktVZqbY7vp8Ls_LifgofCu8I,3009
 hestia_earth/models/config/run-calculations.json,sha256=e3nJ4M6CP1iFzfv8ou_ZUFbFxYkDxJgwuNDXTm4PBDc,615
 hestia_earth/models/config/trigger-calculations.json,sha256=3dmn2bRuj6QEtSTOLdIy31ho7thgUXyDsnqZzPV9rAQ,623
 hestia_earth/models/cycle/__init__.py,sha256=VowO3kOHb0LpURsljNaJsYO7s6vgjhul6bF_85UjUEI,406
@@ -52,13 +54,13 @@ hestia_earth/models/cycle/siteUnusedDuration.py,sha256=AHhU57E8R3i9pkTKQ37yMv6WK
 hestia_earth/models/cycle/startDate.py,sha256=F42dxaRUFsd2tr8Wm3gJCstfLvpFP50LcmE7tYdNhxY,2509
 hestia_earth/models/cycle/startDateDefinition.py,sha256=2sD4V6Jv-yGLM1nkA4eT-RHTnTNfPpl4L5p4jPKzmLo,1991
 hestia_earth/models/cycle/transformation.py,sha256=s4vlje5g-pMKEMF-IqcrjfPOagBS3v8VItoU19EBc0A,1150
-hestia_earth/models/cycle/utils.py,sha256=cobuyIyG_sVMNSzeczHp9xBlswmFPcBropXOEgr5cjM,1137
+hestia_earth/models/cycle/utils.py,sha256=FTlGBd3FQcuiF6RqmQ11BHzX9DYntENDTZ7cYJimF9Y,1209
 hestia_earth/models/cycle/animal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hestia_earth/models/cycle/animal/milkYield.py,sha256=A4l8Ir02Kifvv3NW83lKaodlPpS_fSQN5QhmDQ8hIFw,2137
+hestia_earth/models/cycle/animal/milkYield.py,sha256=4j7B0f2OWMUaf-pGs9jMeKw3rp-_INmKIXzFRog9PlY,2237
 hestia_earth/models/cycle/animal/properties.py,sha256=KYCjznw9-e0BOLh3jep86DC_BmDGaZ0Y6TG-m3YnxHE,466
 hestia_earth/models/cycle/animal/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hestia_earth/models/cycle/animal/input/hestiaAggregatedData.py,sha256=pb5tKzH1Gwl9PfYmWjui5zYscosrd2dMVAEryB-9K80,2197
-hestia_earth/models/cycle/animal/input/properties.py,sha256=PoW8qBlPuWSQRBNK4iBhI6dNaCF74LKdM_4HEGyLqxk,3174
+hestia_earth/models/cycle/animal/input/hestiaAggregatedData.py,sha256=1ZN_c7qj5GL8DuX9NDW_baoWLTx7fKnUEN_RYTFDjWo,2263
+hestia_earth/models/cycle/animal/input/properties.py,sha256=rqmwFznfgc-719vHfXNNleRMkpBmCSfjuNJUpIOFXa0,3286
 hestia_earth/models/cycle/completeness/__init__.py,sha256=bQ-tpeCbUsIdSPGla06Mg2IZWpGp7TgWXlgZTYeLsKk,1512
 hestia_earth/models/cycle/completeness/animalFeed.py,sha256=_qUJcQ2ggdy0fBCBkHmeRDL71HuX4b9KfnSm7JqPgFM,830
 hestia_earth/models/cycle/completeness/cropResidue.py,sha256=7SNfYvP4erJ2keem3DHdOzuzzuAsrj15iffacWNgJHE,2653
@@ -95,16 +97,18 @@ hestia_earth/models/cycle/product/value.py,sha256=JYHlfmOakU1xgDcgGWc78WzRd50HYq
 hestia_earth/models/dammgen2009/__init__.py,sha256=dZ8tIXl6e3ZEixYrWiW7rzoqRJVFOoxi4RPvM3N0L1E,412
 hestia_earth/models/dammgen2009/noxToAirExcreta.py,sha256=LeTrgk4I1S8kNseNKXVYnn3VPyz2D2N_22S6Dsf29zA,1632
 hestia_earth/models/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hestia_earth/models/data/ecoinventV3/__init__.py,sha256=DK1avgh58KlsUJY4nOTAaRlKsISJF4MOrrxdByHDr4o,1240
+hestia_earth/models/data/ecoinventV3/__init__.py,sha256=9JGjfmDMxjdP_AMftq5f2koPDdK2OD9hba4K8KquKsc,629
 hestia_earth/models/deRuijterEtAl2010/__init__.py,sha256=lbH6mB98dmZZlwdZctNYtEmVwAow957l80Dv7JSPDsI,418
 hestia_earth/models/deRuijterEtAl2010/nh3ToAirCropResidueDecomposition.py,sha256=2z10WqMsGUDDO8xJ3lmXvSUHgzz2t6PPRDha5NHoT5s,3291
 hestia_earth/models/ecoalimV9/__init__.py,sha256=_evwL-DZejYohms9PUi4TNqLic44-UbOzw178wak7Pk,410
-hestia_earth/models/ecoalimV9/cycle.py,sha256=qsfr1U7A7VWT2QlBlIXGCZe6UU0MPZxkzhE6NXO_FhE,4282
-hestia_earth/models/ecoalimV9/impact_assessment.py,sha256=Y_8oFr5kZ8aCCHKKrF2-AhoxWge9L9ox0EIloWnTAG8,4320
-hestia_earth/models/ecoalimV9/utils.py,sha256=Qqcl3y3qgKgpvtqZymKiCFSOWBt70S99m-EXb40Uyvg,3426
-hestia_earth/models/ecoinventV3/__init__.py,sha256=VSnrjvUTr4Ig_0IQCCvMCyp5W1n3TK_DTFVb0uEkbYw,5736
-hestia_earth/models/ecoinventV3/utils.py,sha256=RxqaHB9hr0RdTKSjfvDN0pC8DIOyxMCr4I_xjas1POw,460
-hestia_earth/models/ecoinventV3AndEmberClimate/__init__.py,sha256=fSFKMzDDRJi8OvKdhRMFRrGcD07hWDNMTjDa-_Yp-C0,5951
+hestia_earth/models/ecoalimV9/cycle.py,sha256=vS70XsPxWzEIRaPq1G7r_CUibQAyPzU0nbS8_64AJmQ,4936
+hestia_earth/models/ecoalimV9/impact_assessment.py,sha256=6V2EPCQl2ssb88BwdHbL59_kkylFl7uMcyNSmMnEy-M,5035
+hestia_earth/models/ecoalimV9/utils.py,sha256=EvzVfllJUbHfl2Q79ojK9fCdYLl58U48ql3PonNqLmI,1348
+hestia_earth/models/ecoinventV3/__init__.py,sha256=ucIV9cYq4nH-BTMiDerL6_XvTAGlyU8On-2RnxJRghc,412
+hestia_earth/models/ecoinventV3/cycle.py,sha256=l3geRHuVUzmh8F2BWCoybMujsnzykb7jmfxezAHAgGc,5317
+hestia_earth/models/ecoinventV3/utils.py,sha256=1bCssR0Ffof_Lf56898vGZKX7PXYbKMNTmrQcSEDEMA,1385
+hestia_earth/models/ecoinventV3AndEmberClimate/__init__.py,sha256=EQf8RtJQKpkOU0PqZA9qNYm8xzc0S2R1zWnXSvj02Ok,427
+hestia_earth/models/ecoinventV3AndEmberClimate/cycle.py,sha256=63DIlQMIU5YAjj_izRqX2Kr2yBBCG7g0Pb16opmcJZc,5929
 hestia_earth/models/ecoinventV3AndEmberClimate/utils.py,sha256=6niH2MArBK4KFzW-PeT09RZJElDtb-ILWqBEMU1SqXA,1141
 hestia_earth/models/edip2003/__init__.py,sha256=nyB0CI2gNmRAXj-203aJHQMmETYhcY-dHbMABOhJ7YI,409
 hestia_earth/models/edip2003/ozoneDepletionPotential.py,sha256=YkBct4eDUidGukaVdd2iaEouq_FckuG8l_7pgBQgCBw,1033
@@ -118,10 +122,10 @@ hestia_earth/models/emepEea2019/pm10ToAirAnimalHousing.py,sha256=7LhOEQokWMWEPsp
 hestia_earth/models/emepEea2019/pm25ToAirAnimalHousing.py,sha256=IzGQrRv9Pk0o1Vq18HRWZ10jhmjFG59ijfn_VYAUJIA,1384
 hestia_earth/models/emepEea2019/so2ToAirFuelCombustion.py,sha256=OC53aE0uCmUxgZcqQjyhjjFPZ5U5Rdfv8l8wYihcYY4,1833
 hestia_earth/models/emepEea2019/tspToAirAnimalHousing.py,sha256=TaT5GyYK6MyJQHKApBe-u4fMjqXXdmuBEtUcRYnkhac,1381
-hestia_earth/models/emepEea2019/utils.py,sha256=yynKXlW2qi46xSiPuJ6JaFg21S6a1KkP2dUqkMlBJx0,5651
+hestia_earth/models/emepEea2019/utils.py,sha256=MWIH4jTwzXMMvfX5FBpnb5sdGvSUSrCkPnMkXGfEpcQ,5603
 hestia_earth/models/emissionNotRelevant/__init__.py,sha256=yAunIZI_4nGV0khRiGhbZAmXmMiuICzEH-pvzWX1lpM,3000
 hestia_earth/models/environmentalFootprintV3_1/__init__.py,sha256=tF2WrWiV1Wzi2vnRiNXdfPWfmVxgVu9w9-7eA6PA7-s,473
-hestia_earth/models/environmentalFootprintV3_1/environmentalFootprintSingleOverallScore.py,sha256=TojoseslBok28v--yID-Xi2WTEQU2S8SK620ICWYaRo,5804
+hestia_earth/models/environmentalFootprintV3_1/environmentalFootprintSingleOverallScore.py,sha256=i7Er5qYAj14MuiUvWSTi6OjQ4P7pwrslQxSFUYGM0zg,5718
 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/photochemicalOzoneCreationPotentialHumanHealthNmvocEq.py,sha256=47raZTA3aUbBpgClTzKnzUI8Vfy9qUwYNdFDUKM3hJ0,1101
@@ -143,10 +147,11 @@ hestia_earth/models/faostat2018/utils.py,sha256=bxd4dtML0z5D5LP7peZTcvt7U6GLxGdX
 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/frischknechtEtAl2000/__init__.py,sha256=Fixyy9UwoCGP5-MHyJu_ctS40SQ2imfvZo8a547029U,421
-hestia_earth/models/frischknechtEtAl2000/ionisingRadiationKbqU235Eq.py,sha256=4umFLvT0Pvr80E1qgtgRprG_3yO7l4VnzkWrDhXHjbs,4700
+hestia_earth/models/frischknechtEtAl2000/ionisingRadiationKbqU235Eq.py,sha256=LVHTTauExpp2xTUaJtqEggj38-RIY1nKuAQ4d-AnCVA,4443
 hestia_earth/models/geospatialDatabase/__init__.py,sha256=TH-FW3aoL7r1GquRChr7rde7uQonKQRDR00udG8tDrQ,957
 hestia_earth/models/geospatialDatabase/altitude.py,sha256=B9FOuAIXLV4ip3MkTxFBm3xMex2BkELsOGybnsHkXVc,2015
-hestia_earth/models/geospatialDatabase/awareWaterBasinId.py,sha256=_4HFoZR5PQrEYZegMjj33rjUFR_kktt69D4J_moZXHo,1249
+hestia_earth/models/geospatialDatabase/awareWaterBasinId.py,sha256=Yjr8Oe5rdg_WaUVj78rE596wCQosbOvUI8TLZY2wNO4,1261
+hestia_earth/models/geospatialDatabase/awareWaterBasinId_v1.py,sha256=xuUD-isJSDdiVON07RJGZIpXh1norXWknWfjPmUNTYs,1252
 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
@@ -192,8 +197,8 @@ hestia_earth/models/hestia/coldDressedCarcassWeightPerHead.py,sha256=NE1aw4-rmKs
 hestia_earth/models/hestia/concentrateFeed.py,sha256=HnuG3zAECtFVdPRbTATGz5ImO2Ve1NruqD8brbrO2c4,6647
 hestia_earth/models/hestia/cropResidueManagement.py,sha256=VlubB0q5MtvBM2dQSWdrENBMOYpvFbGu36TEwxoDl7A,2301
 hestia_earth/models/hestia/croppingIntensity.py,sha256=xev3GOE06nBJ8ZY3XtbnE0eR2YR_kqAFPnrTuKFtLrQ,1777
-hestia_earth/models/hestia/default_emissions.py,sha256=b_7i0tHuNyKZWbIX0-ARcpbLfFRKI0HjVwPnGBsDKxw,3356
-hestia_earth/models/hestia/default_resourceUse.py,sha256=LQ-pTxLWI-34B1kaxCwvCj-3RzBbR5cIRYzik_POTn0,3689
+hestia_earth/models/hestia/default_emissions.py,sha256=UaG__VXbsa2f3lU_wD7Pz0hYWhABSTmyx8wwT3MQG1w,3546
+hestia_earth/models/hestia/default_resourceUse.py,sha256=uV4yawZTDoDNyb_NojOEzRZgjy-tWzXCzaxgAT1BGTs,3880
 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/excretaKgN.py,sha256=J2TuRGzA8KHDgsRnZflF8LMcd8993YPguY-cdbQOJ8Y,2878
@@ -203,7 +208,7 @@ hestia_earth/models/hestia/freshWater.py,sha256=Q-dmFJLZfyYEyFyYkJUOjgmQR3G5YXCX
 hestia_earth/models/hestia/histosol.py,sha256=IexiWTSlSJYGjrdpYmRooW6v8LjhYATPQ8smMz1UZBA,1612
 hestia_earth/models/hestia/inorganicFertiliser.py,sha256=We4PBaTXyGwEQTfhX0-J8Xt03p-FB9i9j3tEK5JQ8uE,9026
 hestia_earth/models/hestia/irrigatedTypeUnspecified.py,sha256=VdYzfYxcRzWv21qxRkDn9HBid7-Bt_CgIv4iyXJH03g,1929
-hestia_earth/models/hestia/landCover.py,sha256=MIW2-zOlIL4SVt5Ti8kO30HM4W6PJns2azvqsx8YANM,35513
+hestia_earth/models/hestia/landCover.py,sha256=9TLHpxjF0ceZYWiOSs96TCoOmIO4Bq0ELepNS9ApquE,39474
 hestia_earth/models/hestia/landTransformation100YearAverageDuringCycle.py,sha256=hF7_DDvrs7swH6ott_ihgYx13UzEKHH6pccYCtzrN8o,1069
 hestia_earth/models/hestia/landTransformation20YearAverageDuringCycle.py,sha256=05SCH6ZjEV3mIleRusBg677zu0xgu5YK0f9FCddgNPg,1067
 hestia_earth/models/hestia/liveAnimal.py,sha256=d7HuUi40c-7TN1kecdRuqbht8PAe7x4ps0NhSuWG34Q,3868
@@ -240,9 +245,9 @@ hestia_earth/models/hestia/temperatureAnnual.py,sha256=IhMoO-SkSp1JBxgu9bSr1OCtr
 hestia_earth/models/hestia/temperatureMonthly.py,sha256=sY4MrjCTm7X3BoDTUC0ZkxD7CWxvl51JW2UxDykCKzg,1842
 hestia_earth/models/hestia/totalNitrogenPerKgSoil.py,sha256=hpyYqMwO9TvZjrpQuSBA3uRFrOk_PPZEo9ev4QeECI4,1956
 hestia_earth/models/hestia/unknownPreSeasonWaterRegime.py,sha256=Ix7Eg4NVW1iKvPKIOqOdSkahn7BlJNtPM8nlrogrfcM,1460
-hestia_earth/models/hestia/utils.py,sha256=oTdk7VKuaxDTKj9Cz4t3qp3RZ5wSt3bZXpPiImgIIto,4768
+hestia_earth/models/hestia/utils.py,sha256=CMBo5wR47fyPkIH6k3ihWhFB-XyQfkv7O4CJOm_rJOc,4888
 hestia_earth/models/hestia/waterDepth.py,sha256=gnvd1kwbTCt9HjgxlKzuCGkPi8Sq7nQiHFbk8xBAZV0,1251
-hestia_earth/models/hestia/waterSalinity.py,sha256=3-2PX7LZ5YBGvNYqkJHnNLiKoN01BYaawTFoxe7GsM0,3010
+hestia_earth/models/hestia/waterSalinity.py,sha256=YkiLEljMd4xHT0bKv-nXbgOXcaEQmLDlSwpFrfg49ow,2962
 hestia_earth/models/hestia/feedConversionRatio/__init__.py,sha256=G4T1jfN1OqERsywiWyrBiFneUZs5QXpChz7dgGfg9Ko,2512
 hestia_earth/models/hestia/feedConversionRatio/feedConversionRatioCarbon.py,sha256=21_PXoKXJCxPOPOspKqqq-E7dh-2tVQnR4cnGZ9JGj8,1992
 hestia_earth/models/hestia/feedConversionRatio/feedConversionRatioDryMatter.py,sha256=zf-v-cAPLpSe7sr1auzUUXkjXwpXRTVvsCrzbZrwBI8,2388
@@ -251,7 +256,7 @@ hestia_earth/models/hestia/feedConversionRatio/feedConversionRatioFedWeight.py,s
 hestia_earth/models/hestia/feedConversionRatio/feedConversionRatioNitrogen.py,sha256=RV7lLd4PiFRCkH83-DvuZKnOCA9bXbYOcDHea8Wz4LY,2603
 hestia_earth/models/impact_assessment/__init__.py,sha256=B6UO8z3NR6JjIycyT7adZbnNKcBC49qnF2bOhVcufy4,355
 hestia_earth/models/impact_assessment/allocationMethod.py,sha256=x52IjSmyu8vSyr9_IfMzF00w_DcQyav4WBqnHOdkJHA,1090
-hestia_earth/models/impact_assessment/emissions.py,sha256=RquAfyIbuCaDKEfJVXs762twBOVRf8q38LoQOYP9AUI,3762
+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=rkHO4Z3Zz8LCT1OoDgHmUuGURvXsdzh2nQqgU2M4tjU,304
@@ -445,7 +450,7 @@ hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystems
 hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystemsTerrestrialAcidification.py,sha256=mILJfHIobDE9EkW72Go731EFrfb6umF9Fa3Sy7sAqw0,1222
 hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystemsTerrestrialEcotoxicity.py,sha256=dyUfAD74qEzfIGFei1IcI2RfQXgkjns7AhJ0iYzgCBk,963
 hestia_earth/models/linkedImpactAssessment/__init__.py,sha256=SPP09DMS4zUThyQfcgLpivFwsey4WSt77CDMYHJPKWE,423
-hestia_earth/models/linkedImpactAssessment/emissions.py,sha256=hyX01-7xaVkSIOwG4nECZ2v0aXbfqw-mvYod2N2YqVU,6566
+hestia_earth/models/linkedImpactAssessment/emissions.py,sha256=5BvqmKVZcZVH6tTf3j73Qbzfgu5qrPGP3qLVNUKU9rk,6547
 hestia_earth/models/linkedImpactAssessment/freshwaterWithdrawalsInputsProduction.py,sha256=OTWVjPikOsZTbzgTzCJBkL6fH4Zbprq5SrV5LSLc4C0,1137
 hestia_earth/models/linkedImpactAssessment/landOccupationInputsProduction.py,sha256=M1_QXTxCdWccXPaO7YjOtBa6WkmiQj3Xs89lYIUrM7w,1141
 hestia_earth/models/linkedImpactAssessment/landTransformation100YearAverageInputsProduction.py,sha256=IqQ76I05IC79g2GXY91iWFqEeXk8Fhw-hcrifCaAbiI,1228
@@ -454,7 +459,7 @@ hestia_earth/models/linkedImpactAssessment/utils.py,sha256=DM6ZUnw23KH0oMKS3jA5q
 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=QayyLiVrhPbG_HauM9pyyhxRlWkXQc3ho0INGexQ7f8,162692
+hestia_earth/models/mocking/search-results.json,sha256=pRDsDH9bmR8SC3v5C9AaXutnxXdrmx5LqPW4GAEpp1E,162763
 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
@@ -596,12 +601,12 @@ hestia_earth/models/transformation/product/__init__.py,sha256=47DEQpj8HBSa-_TImW
 hestia_earth/models/transformation/product/excreta.py,sha256=tggXIoUujzu8O949_3KFog219k_bQ0IcytpCsJ8oMcc,5384
 hestia_earth/models/usetoxV2/__init__.py,sha256=pK37V3H-KvYcvRKw4Mv8CWrB2N0LFLzmv0jKLdhGGqs,409
 hestia_earth/models/usetoxV2/freshwaterEcotoxicityPotentialCtue.py,sha256=pPX8u-Aq6Pg5Y9xw0CS0S2WkAHQpOMl0lL2tLQwwOuU,918
-hestia_earth/models/utils/__init__.py,sha256=0v-wjG9xzJeitWEUN3XRleM_is1AkVm2r7WkApB7-ho,7136
+hestia_earth/models/utils/__init__.py,sha256=W6LxMNLCfcviL6X8XMAExj_Z-E2x84HQw27_uQD5M18,7232
 hestia_earth/models/utils/aggregated.py,sha256=G7FNJfHqJ_eoXB66kGdjLyZGDOI_gsF56o7VnyW3bqA,4801
 hestia_earth/models/utils/animalProduct.py,sha256=M5IunAKGY6oZv3j1Ascl34ywyeLWApqOIlBzbtlA2FE,721
 hestia_earth/models/utils/aquacultureManagement.py,sha256=dxrbC1Xf140cohxTbSw6TxLAnAASWTdNZwBBam4yQnw,171
-hestia_earth/models/utils/background_emissions.py,sha256=7-56BRsOpDSoBlyNXUsoIySMaiT_CumYmUObUzfr2CU,3554
-hestia_earth/models/utils/blank_node.py,sha256=Y4Q1wnddrMyo9NEqKFcmt43LKHPWDlbe9l1seDcU8K0,56105
+hestia_earth/models/utils/background_emissions.py,sha256=0AmrKgV_ajVVhj8wwEIOwRfK5CwpYbS03E4eFGOY6h8,6959
+hestia_earth/models/utils/blank_node.py,sha256=-nNzm0Ky34cE9ZEIQzECeZ0hvMC9uW0A76TTDO5Ntjk,55768
 hestia_earth/models/utils/cache_sources.py,sha256=MBkrPpjwNiC4ApDjeYVHZjWBbpvAerXRDrMHpjasAZ0,377
 hestia_earth/models/utils/completeness.py,sha256=iRG4uviOAQQ4T2Nr4LlelPVTS_F1felGZNJYxek_JG8,1239
 hestia_earth/models/utils/constant.py,sha256=DmB3VVuoh7Pz2QDBJqiUG6yAML2i0fOy1BPuPHmhT1w,3442
@@ -613,16 +618,16 @@ hestia_earth/models/utils/cycle.py,sha256=J8ATBSDkhkEPRMRC0ufO8eC_JeGCpkpdvSz2xS
 hestia_earth/models/utils/ecoClimateZone.py,sha256=kJmXtRiq8-vWF7S1rNIA6WpWkPtt8JoNfWgG9azM_ts,4269
 hestia_earth/models/utils/emission.py,sha256=aIQA3mFbGYlnD2DqDx6GY8qd2bzcjUjfvz8wnzmQ6Tc,4227
 hestia_earth/models/utils/excretaManagement.py,sha256=PNZoaf6nvdt1t7B8Apa638rU8T4hI5VW2fy1fAoC64k,2265
-hestia_earth/models/utils/feedipedia.py,sha256=fVyEx2C5CSu0pv--tG6dOfQQ7WzThPoVuzM_FW9jP18,4009
+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=QQjiuKC_3kwAWzUlFw2agjzSZg-5U9h3u4P5_e5Zryw,8447
+hestia_earth/models/utils/impact_assessment.py,sha256=1gA7KstClbVEWfO5Uc0zNgxYOrmd2VOaPMeY6ZI83Fk,8432
 hestia_earth/models/utils/indicator.py,sha256=Vb5L2ziXKXiL558M0K5V5ihaDTuvX3BLJP1SCbQ_B5E,1009
 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/landCover.py,sha256=8-nfynzCx9gf9YfhpuoH6Cn4kQwWFpYA5RmoGW-0ETE,300
 hestia_earth/models/utils/liveAnimal.py,sha256=-ufUs00ALXRKGbrRJi7a7eTWVvkEj_pxLDWYbMJmx2g,1770
-hestia_earth/models/utils/lookup.py,sha256=w019IjC3-rve6u3tSH6cyMU-yKSqLcFGJV-6jnRQwlA,7768
+hestia_earth/models/utils/lookup.py,sha256=USNU2wMokNhollPezuNsyqMq7zs6d6RFoe86cTEA-iI,7767
 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
@@ -641,7 +646,7 @@ 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=C45LGnZ_3I2SHqX75JFnkK1yYmfh5mkDLF4GcZRxXo4,2440
 hestia_earth/orchestrator/utils.py,sha256=LAMUTyIQ-90TR6CUljWPbCNBsAMeukOhW4zoPy7LzuU,4111
 hestia_earth/orchestrator/models/__init__.py,sha256=TCQjmMiAOvayPwqvIwzx7gEvyiUlUc69gMECkoHUNE8,4534
 hestia_earth/orchestrator/models/transformations.py,sha256=zJwfVXabudLXhdyz0Hsk4IV_2OjgMtaYEZbD9kuZtLk,4128
@@ -660,9 +665,7 @@ hestia_earth/orchestrator/strategies/run/always.py,sha256=D0In6_kr28s-fgqspawgvj
 tests/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/test_cache_nodes.py,sha256=lSSoBGFVXpNv_TePSetls6QbnhfLC7dNLmfiFqT6WuY,1043
 tests/models/test_cache_sites.py,sha256=eZkbgAhfA-67GhPgE4lk8byHnYvX2Ate1KPsE6jH1-c,2954
-tests/models/test_config.py,sha256=w27OA_pk9NuDbxzMD--l72Ea97SL1HS6bos6mOUCy8k,3386
-tests/models/test_ecoinventV3.py,sha256=SvBn1ZomoturZhjj4BE2EU46Sq0il-tOJIqutmGadWs,2023
-tests/models/test_ecoinventV3AndEmberClimate.py,sha256=_7sX0s07Xr00uNcVk78L1AdSqI1OpUV3tkkG1hVSY2w,803
+tests/models/test_config.py,sha256=wMzRHRtu_H61haAQpT-UtN6nxOQw-JAFrAf-jiIWkiQ,4578
 tests/models/test_emissionNotRelevant.py,sha256=TsIV47lpn7joLGx-LlPVqWbshcLf2c6pUvB3FZwLvwY,1023
 tests/models/test_resourceUseNotRelevant.py,sha256=z1zY3pJdffongIsBJaLB7WToBrMiE4wYuHSsAbGEJ7w,983
 tests/models/test_utils.py,sha256=Caa9sCyz25egPrSlu7FQhjXD2vNcQW9gea_ppUYOsEs,186
@@ -678,6 +681,8 @@ tests/models/akagiEtAl2011/test_so2ToAirCropResidueBurning.py,sha256=kWoTSIMoGIp
 tests/models/akagiEtAl2011/test_utils.py,sha256=bB-YcpJNcsGX1W6vaPao4_PeLS3Hx78ZCrHCJdqbajk,600
 tests/models/aware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/aware/test_scarcityWeightedWaterUse.py,sha256=Tl888UE-v5xQCInOXxn291Tkx3Qyz_bKkd5inVwlDNc,2003
+tests/models/aware2_0/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/models/aware2_0/test_scarcityWeightedWaterUse.py,sha256=rg4Qi9gt11NI9LA-8Ne2fuq1pe6o-Xtll_ybEw_OGGI,2067
 tests/models/chaudharyBrooks2018/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/chaudharyBrooks2018/test_damageToTerrestrialEcosystemsLandOccupation.py,sha256=zHIig6bQWb9XxAjcS-jRXQZxRfG5DwpTLNk9lCD_KMw,1908
 tests/models/chaudharyBrooks2018/test_damageToTerrestrialEcosystemsLandTransformation.py,sha256=lcyMTaNMbIjzZrbPxejujfYyAEj2XOH5Ei9pmAQAi7k,1912
@@ -752,7 +757,10 @@ tests/models/deRuijterEtAl2010/test_nh3ToAirCropResidueDecomposition.py,sha256=k
 tests/models/ecoalimV9/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/ecoalimV9/test_cycle.py,sha256=BWaZhVSt9zNFnju12m809Nxa2edj5OkWxSUn6FT7V7U,653
 tests/models/ecoalimV9/test_impact_assessment.py,sha256=5h9jx7wSPah_FvRDyT-NEejRKlXc5ZmtVucHfkxVMQ8,862
-tests/models/ecoalimV9/test_utils.py,sha256=styD2B9ZM4WppVcjEVh3Edw4X2KnH_jQWi36uv24WhY,450
+tests/models/ecoinventV3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/models/ecoinventV3/test_cycle.py,sha256=jOX-1Xmp8rFzGammioA3zPwPq-w5CS3GeEJ5vUoX0JU,2030
+tests/models/ecoinventV3AndEmberClimate/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/models/ecoinventV3AndEmberClimate/test_cycle.py,sha256=sHCrAGyJ6GCOjlElFpH4NiSQPVn_v7932ovIGS0ORkQ,875
 tests/models/edip2003/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/edip2003/test_ozoneDepletionPotential.py,sha256=z0kimdTxzSr8_K5eScbkxq2SB9nbBp41IHqVNR4Nh4Y,688
 tests/models/emepEea2019/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -767,7 +775,7 @@ tests/models/emepEea2019/test_so2ToAirFuelCombustion.py,sha256=RkC_ux5bxo6bIdcXI
 tests/models/emepEea2019/test_tspToAirAnimalHousing.py,sha256=4MNDsxIeUk5_3IvZwEZslxgoPNyQN9OQFDNY3uGNX6E,714
 tests/models/emepEea2019/test_utils.py,sha256=MUIeHgcCHLhbYWgleKIiKqO2Q4RX321J53YpOt9cogA,7060
 tests/models/environmentalFootprintV3_1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/environmentalFootprintV3_1/test_environmentalFootprintSingleOverallScore.py,sha256=yJXnquW4sUfBz_1uX5Qzhyqheoqthh47uQ2tBhgyReg,5863
+tests/models/environmentalFootprintV3_1/test_environmentalFootprintSingleOverallScore.py,sha256=F-asu8FDzxTN4RWXwSm1zxTrLu2VijgQCcNZHDpArv4,5853
 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_photochemicalOzoneCreationPotentialHumanHealthNmvocEq.py,sha256=Z4KGhYmnao0J1rC_jY9P_8Lu9UKe-_RyrdO5k56EIsg,1022
@@ -790,7 +798,7 @@ tests/models/faostat2018/test_utils.py,sha256=G4pOEwcM5k6FRbkE_4x6_G8vQxzDexNZnl
 tests/models/faostat2018/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/faostat2018/product/test_price.py,sha256=zehnEQjwggit9su5jd5q3TTlyNxcswbxJCNaKaw1ZI0,3903
 tests/models/frischknechtEtAl2000/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/frischknechtEtAl2000/test_ionisingRadiationKbqU235Eq.py,sha256=r3ZaTBvmzh4KUl1OZhJBAaVBR0_kijzkLj9Ru91Zj8w,5050
+tests/models/frischknechtEtAl2000/test_ionisingRadiationKbqU235Eq.py,sha256=sy_nP0EYoaZuz_UBdgybivpYX8yZmUny6vQKXN5WQAw,4697
 tests/models/geospatialDatabase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/geospatialDatabase/test_awareWaterBasinId.py,sha256=f9y70Yz5C3wX7mmc1KwC50gk_PWoD1iEZPRMGMbqPtc,869
 tests/models/geospatialDatabase/test_clayContent.py,sha256=GqFAPIOkXfDpJFkI-vK6l3hK0Ap36lLCWGhXCly-DME,1797
@@ -850,7 +858,7 @@ tests/models/hestia/test_freshWater.py,sha256=v2UD69csKrniKP3MXkOEHxQeE6O3-lvIVi
 tests/models/hestia/test_histosol.py,sha256=7g-3wQPZok2O8mExcnKZxO_T2Ye_h3UHv3HG3Kn8orM,888
 tests/models/hestia/test_inorganicFertiliser.py,sha256=v2Zs1Ig-ChOaq9gXuurcBt12izkH2bRUUuzW6rh3rqQ,643
 tests/models/hestia/test_irrigatedTypeUnspecified.py,sha256=bluZADFagxfXW4QyI0CIJzG97D2V33w333Z9Vwjqo0M,2015
-tests/models/hestia/test_landCover.py,sha256=usfFMcVUvZDFpYoo53NdsinbhZjwlEnjtWNuNli03eE,9889
+tests/models/hestia/test_landCover.py,sha256=ekZsv-l8xMXJu384sO2UE8TbU0bUXvW3r5KMcuKwJDs,10216
 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
@@ -1190,7 +1198,7 @@ tests/models/site/post_checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 tests/models/site/post_checks/test_cache.py,sha256=g34PQgfyzYveRT-gVKJl0euyBp-Kav8JnBVk-bod1WA,191
 tests/models/site/post_checks/test_country.py,sha256=LENeyFF5V440H06l-gYxl9fozBmOsp1W1nAu9kBu80o,239
 tests/models/site/pre_checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/site/pre_checks/test_cache_geospatialDatabase.py,sha256=2t8XSo12yGu1e7mmbKLiyomwHFBcvHbyOsCfxNWTwSg,658
+tests/models/site/pre_checks/test_cache_geospatialDatabase.py,sha256=YMBowk5qBKPzvZfRUmABfCU1BhGVeIvv4Xo782Crqec,658
 tests/models/site/pre_checks/test_cache_years.py,sha256=sU0OhXGa4wC2DKduzlcxQVc51srS0Oks3L1gh1nJGf8,756
 tests/models/site/pre_checks/test_country.py,sha256=f96w3K1kxt-2_D39P7ekhdAyytXOeZR-blQvXL5hTlo,439
 tests/models/stehfestBouwman2006/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1221,6 +1229,7 @@ tests/models/usetoxV2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 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=_ZxbKVReS9U2s6PhnXRqSKCsa9j-2Bxl8p_Fr7KHMBk,8418
+tests/models/utils/test_background_emissions.py,sha256=0C7sl0UWIN9V_gcjB7HM6alMO72T4vj80Xf8uJ2xeOI,465
 tests/models/utils/test_blank_node.py,sha256=F5pCV-5bKxqsrubjN1W-PACltBljF7z84_7lFBcDFJs,32871
 tests/models/utils/test_cache_sources.py,sha256=xcGMVbYoV23YC4HLBTL_4qZP1ME2cp3DFebgJMxI2TE,721
 tests/models/utils/test_crop.py,sha256=d508vQdtB_Q_6hEahNueXed5PaEiLeN7ScbwZIKCiDI,862
@@ -1263,8 +1272,8 @@ tests/orchestrator/strategies/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 tests/orchestrator/strategies/run/test_add_blank_node_if_missing.py,sha256=K4xg4UAXfNhSaLyknKVPO7MGBF44Z_gD7CuZ_pe28gU,3512
 tests/orchestrator/strategies/run/test_add_key_if_missing.py,sha256=hKwvk1ohcBVnQUCTiDhRW99J0xEa29BpwFi1KC0yWLE,329
 tests/orchestrator/strategies/run/test_always.py,sha256=w5-Dhp6yLzgZGAeMRz3OrqZbbAed9gZ1O266a3z9k7w,134
-hestia_earth_models-0.73.8.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
-hestia_earth_models-0.73.8.dist-info/METADATA,sha256=hfNbFbfhpKzoty2_KclgDzWXlgqHKy3p5yGc2paMgqI,4075
-hestia_earth_models-0.73.8.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_models-0.73.8.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.73.8.dist-info/RECORD,,
+hestia_earth_models-0.74.0.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
+hestia_earth_models-0.74.0.dist-info/METADATA,sha256=xYHvi1dvF2aIr7WVyYCoZSJTjjzlAGt36kx_-PAUQ0U,4075
+hestia_earth_models-0.74.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hestia_earth_models-0.74.0.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.74.0.dist-info/RECORD,,