hestia-earth-models 0.65.5__py3-none-any.whl → 0.65.7__py3-none-any.whl

hestia_earth/orchestrator/strategies/merge/merge_list.py

@@ -0,0 +1,103 @@
+import pydash
+from hestia_earth.schema import UNIQUENESS_FIELDS
+
+from hestia_earth.orchestrator.utils import _non_empty_list, update_node_version
+from .merge_node import merge as merge_node
+
+_METHOD_MODEL_KEY = 'methodModel.@id'
+
+
+def _matching_properties(model: dict, node_type: str):
+    return UNIQUENESS_FIELDS.get(node_type, {}).get(model.get('key'), [])
+
+
+def _has_property(value: dict, key: str):
+    keys = key.split('.')
+    is_list = len(keys) >= 2 and isinstance(pydash.objects.get(value, keys[0]), list)
+    values = [
+        pydash.objects.get(v, '.'.join(keys[1:])) for v in pydash.objects.get(value, keys[0])
+    ] if is_list else [
+        pydash.objects.get(value, key)
+    ]
+    return all([v is not None for v in values])
+
+
+def _values_have_property(values: list, key: str): return any([_has_property(v, key) for v in values])
+
+
+def _match_list_el(source: list, dest: list, key: str):
+    src_value = sorted(_non_empty_list([pydash.objects.get(x, key) for x in source]))
+    dest_value = sorted(_non_empty_list([pydash.objects.get(x, key) for x in dest]))
+    return src_value == dest_value
+
+
+def _match_el(source: dict, dest: dict, keys: list):
+    def match(key: str):
+        keys = key.split('.')
+        src_value = pydash.objects.get(source, key)
+        dest_value = pydash.objects.get(dest, key)
+        is_list = len(keys) >= 2 and (
+            isinstance(pydash.objects.get(source, keys[0]), list) or
+            isinstance(pydash.objects.get(dest, keys[0]), list)
+        )
+        return _match_list_el(
+            pydash.objects.get(source, keys[0], []),
+            pydash.objects.get(dest, keys[0], []),
+            '.'.join(keys[1:])
+        ) if is_list else src_value == dest_value
+
+    source_properties = [p for p in keys if _has_property(source, p)]
+    dest_properties = [p for p in keys if _has_property(dest, p)]
+
+    return all(map(match, source_properties)) if source_properties == dest_properties else False
+
+
+def _handle_local_property(values: list, properties: list, local_id: str):
+    # Handle "impactAssessment.@id" if present in the data
+    existing_id = local_id.replace('.id', '.@id')
+
+    if local_id in properties:
+        # remove if not used
+        if not _values_have_property(values, local_id):
+            properties.remove(local_id)
+
+        # add if used
+        if _values_have_property(values, existing_id):
+            properties.append(existing_id)
+
+    return properties
+
+
+def _find_match_el_index(values: list, el: dict, same_methodModel: bool, model: dict, node_type: str):
+    """
+    Find an element in the values that match the new element, based on the unique properties.
+    To find a matching element:
+
+    1. Update list of properties to handle `methodModel.@id` and `impactAssessment.@id`
+    2. Filter values that have the same unique properties as el
+    3. Make sure all shared unique properties are identical
+    """
+    properties = _matching_properties(model, node_type)
+    properties = list(set(properties + [_METHOD_MODEL_KEY])) if same_methodModel else [
+        p for p in properties if p != _METHOD_MODEL_KEY
+    ]
+    properties = _handle_local_property(values, properties, 'impactAssessment.id')
+
+    return next((i for i in range(len(values)) if _match_el(values[i], el, properties)), None) if properties else None
+
+
+def merge(source: list, merge_with: list, version: str, model: dict = {}, merge_args: dict = {}, node_type: str = ''):
+    source = source if source is not None else []
+
+    # only merge node if it has the same `methodModel`
+    same_methodModel = merge_args.get('sameMethodModel', False)
+    # only merge if the
+    skip_same_term = merge_args.get('skipSameTerm', False)
+
+    for el in _non_empty_list(merge_with):
+        source_index = _find_match_el_index(source, el, same_methodModel, model, node_type)
+        if source_index is None:
+            source.append(update_node_version(version, el))
+        elif not skip_same_term:
+            source[source_index] = merge_node(source[source_index], el, version, model, merge_args)
+    return source

hestia_earth/orchestrator/strategies/merge/merge_node.py

@@ -0,0 +1,59 @@
+import pydash
+from hestia_earth.schema import EmissionMethodTier
+
+from hestia_earth.orchestrator.log import logger, logShouldMerge
+from hestia_earth.orchestrator.utils import update_node_version, _average
+
+_METHOD_TIER_ORDER = [
+    EmissionMethodTier.NOT_RELEVANT.value,
+    EmissionMethodTier.TIER_1.value,
+    EmissionMethodTier.TIER_2.value,
+    EmissionMethodTier.TIER_3.value,
+    EmissionMethodTier.MEASURED.value,
+    EmissionMethodTier.BACKGROUND.value
+]
+
+
+def _has_threshold_diff(source: dict, dest: dict, key: str, threshold: float):
+    term_id = dest.get('term', {}).get('@id', dest.get('@id'))
+    source_value = _average(source.get(key), None)
+    dest_value = _average(dest.get(key), None)
+    delta = None if any([source_value is None, dest_value is None]) else (
+        abs(source_value - dest_value) / (1 if source_value == 0 else source_value)
+    )
+    should_merge = source_value is None or (delta is not None and delta > threshold)
+    logger.debug('merge %s for %s with threshold=%s, delta=%s: %s', key, term_id, threshold, delta, should_merge)
+    return should_merge
+
+
+def _should_merge_threshold(source: dict, dest: dict, args: dict):
+    [key, threshold] = args.get('replaceThreshold', [None, 0])
+    return True if key is None else _has_threshold_diff(source, dest, key, threshold)
+
+
+def _should_merge_lower_tier(source: dict, dest: dict, args: dict):
+    source_tier = _METHOD_TIER_ORDER.index(source.get('methodTier', _METHOD_TIER_ORDER[0]))
+    dest_tier = _METHOD_TIER_ORDER.index(dest.get('methodTier', _METHOD_TIER_ORDER[-1]))
+    term_id = dest.get('term', {}).get('@id', dest.get('@id'))
+    should_merge = args.get('replaceLowerTier', False) or dest_tier >= source_tier
+    logger.debug('merge for %s with original tier=%s, new tier=%s: %s',
+                 term_id, source.get('methodTier'), dest.get('methodTier'), should_merge)
+    return should_merge
+
+
+_MERGE_FROM_ARGS = {
+    'replaceThreshold': _should_merge_threshold,
+    'replaceLowerTier': _should_merge_lower_tier
+}
+
+
+def merge(source: dict, dest: dict, version: str, model: dict = {}, merge_args: dict = {}, *args):
+    merge_args = {
+        key: func(source, dest, merge_args) for key, func in _MERGE_FROM_ARGS.items()
+    } if source is not None else {}
+    term_id = dest.get('term', {}).get('@id', dest.get('@id'))
+
+    should_merge = all([v for _k, v in merge_args.items()])
+    logShouldMerge(source, model.get('model'), term_id, should_merge, key=model.get('key'), value=term_id, **merge_args)
+
+    return update_node_version(version, pydash.objects.merge({}, source, dest), source) if should_merge else source

hestia_earth/orchestrator/strategies/run/__init__.py

@@ -0,0 +1,8 @@
+import importlib
+
+from hestia_earth.orchestrator.utils import get_required_model_param
+
+
+def should_run(data: dict, model: dict):
+    strategy = get_required_model_param(model, 'runStrategy')
+    return importlib.import_module(f"hestia_earth.orchestrator.strategies.run.{strategy}").should_run(data, model)

hestia_earth/orchestrator/strategies/run/add_blank_node_if_missing.py

@@ -0,0 +1,85 @@
+from hestia_earth.utils.lookup import download_lookup, get_table_value, column_name
+from hestia_earth.utils.api import download_hestia
+
+from hestia_earth.orchestrator.log import debugValues, logShouldRun
+from hestia_earth.orchestrator.utils import get_required_model_param, find_term_match
+
+_ALLOW_ALL = 'all'
+
+
+def _lookup_values(term: dict, column: str):
+    term_id = term.get('@id')
+    term_type = term.get('termType')
+    lookup = download_lookup(f"{term_type}.csv")
+    values = get_table_value(lookup, 'termid', term_id, column_name(column))
+    return (values or _ALLOW_ALL).split(';')
+
+
+def _is_node_type_allowed(data: dict, term_id: str):
+    node_type = data.get('@type', data.get('type'))
+    term = download_hestia(term_id)
+    allowed_types = _lookup_values(term, 'typesAllowed') if term else [_ALLOW_ALL]
+    return True if _ALLOW_ALL in allowed_types or not node_type else node_type in allowed_types
+
+
+def _run_required(data: dict, model: str, term_id: str):
+    node_type_allowed = _is_node_type_allowed(data, term_id)
+
+    run_required = all([node_type_allowed])
+    debugValues(data, model=model, term=term_id,
+                run_required=run_required,
+                node_type_allowed=node_type_allowed)
+    return run_required
+
+
+_RUN_FROM_ARGS = {
+    'runNonAddedTerm': lambda node: 'term' not in node.get('added', []),
+    'runNonMeasured': lambda node: node.get('methodTier') != 'measured'
+}
+
+
+def _is_empty(node: dict, skip_empty_value: bool = False):
+    return node is None or all([
+        not skip_empty_value,
+        node.get('value') is None or node.get('value') == []
+    ])
+
+
+def _run_aggregated(data: dict, skip_aggregated: bool = False):
+    return not data.get('aggregated', False) or not skip_aggregated
+
+
+def _is_0_emission(node: dict):
+    # emissions are set to 0 when not required to run, but we should still run for every model
+    return node is not None and all([
+        node.get('@type', node.get('type')) == 'Emission',
+        'value' in node.get('added', [])
+    ]) and node.get('value', [])[0] == 0
+
+
+def should_run(data: dict, model: dict):
+    key = get_required_model_param(model, 'key')
+    term_id = get_required_model_param(model, 'value')
+    args = model.get('runArgs', {})
+    node = find_term_match(data.get(key, []), args.get('termId', term_id), None)
+
+    # run if: value is empty or force run from args
+    is_empty = _is_empty(node, args.get('skipEmptyValue', False))
+    is_0_emission = _is_0_emission(node)
+    run_is_aggregated = _run_aggregated(data, args.get('skipAggregated', False))
+    run_args = {
+        key: func(node) for key, func in _RUN_FROM_ARGS.items() if node and args.get(key, False) is True
+    }
+    run = any([
+        is_empty,
+        is_0_emission,
+        (len(run_args.keys()) > 0 and all([v for _k, v in run_args.items()]))
+    ]) and _run_required(data, model.get('model'), term_id) and run_is_aggregated
+
+    logShouldRun(data, model.get('model'), term_id, run, key=key, value=term_id,
+                 is_empty=is_empty,
+                 is_0_emission=is_0_emission,
+                 run_is_aggregated=run_is_aggregated,
+                 **run_args)
+
+    return run

hestia_earth/orchestrator/strategies/run/add_key_if_missing.py

@@ -0,0 +1,9 @@
+from hestia_earth.orchestrator.log import logShouldRun
+from hestia_earth.orchestrator.utils import get_required_model_param
+
+
+def should_run(data: dict, model: dict):
+    key = get_required_model_param(model, 'key')
+    run = data.get(key) is None
+    logShouldRun(data, model.get('model'), None, run, key=key, value=model.get('value'))
+    return run

hestia_earth/orchestrator/strategies/run/always.py

@@ -0,0 +1,6 @@
+from hestia_earth.orchestrator.log import logShouldRun
+
+
+def should_run(data: dict, model: dict):
+    logShouldRun(data, model.get('model'), None, True, key=model.get('key'), value=model.get('value'))
+    return True

hestia_earth/orchestrator/utils.py

@@ -0,0 +1,116 @@
+from typing import Union
+import re
+from statistics import mean
+from functools import reduce
+
+EXCLUDED_VERSION_KEYS = [
+    '@type'
+]
+
+
+def get_required_model_param(model, key: str):
+    if key not in model:
+        raise KeyError(f"Missing required '{key}' in model")
+    return model[key]
+
+
+def _lowercase(string): return str(string).lower()
+
+
+def _snakecase(string):
+    string = re.sub(r"[\-\.\s]", '_', str(string))
+    if not string:
+        return string
+    return _lowercase(string[0]) + re.sub(r"[A-Z]", lambda matched: '_' + _lowercase(matched.group(0)), string[1:])
+
+
+def _average(value, default=0): return mean(value) if value is not None and isinstance(value, list) else default
+
+
+def find_term_match(values: list, term_id: str, default_val={}):
+    return next((v for v in values if v.get('term', {}).get('@id') == term_id), default_val)
+
+
+def _non_empty(value): return value != '' and value is not None and value != []
+
+
+def _non_empty_list(values):
+    return list(filter(_non_empty, values)) if isinstance(values, list) else _non_empty(values)
+
+
+def _filter_by_keys(values, keys: list): return {key: values[key] for key in keys if values.get(key) is not None}
+
+
+_SKIP_KEYS = ['added', 'addedVersion', 'updated', 'updatedVersion']
+
+
+def _update_key_version(version: str, node: dict, key: str, is_update=True):
+    def update(field: str):
+        if key not in _SKIP_KEYS:
+            if key in node.get(field, []):
+                node.get(f"{field}Version")[node[field].index(key)] = version
+            else:
+                node[field] = node.get(field, []) + [key]
+                node[f"{field}Version"] = node.get(f"{field}Version", []) + [version]
+        return node
+
+    return update('updated' if is_update else 'added')
+
+
+def _safe_deep_update_list_version(version: str, new_data: list, prev_data: list, index: int):
+    try:
+        new_data[index] = update_node_version(version, new_data[index], prev_data[index])
+    except Exception:
+        try:
+            # try again with an empty value as old data
+            new_data[index] = update_node_version(version, new_data[index], {})
+        except Exception:
+            pass
+
+
+def _deep_update_node_version(version: str, new_data: Union[dict, list], prev_data: Union[dict, list]):
+    if isinstance(new_data, list) and all([isinstance(v, dict) for v in new_data]):
+        for index, v in enumerate(new_data):
+            _safe_deep_update_list_version(version, new_data, prev_data, index)
+    if isinstance(new_data, dict):
+        new_data = update_node_version(version, new_data, prev_data)
+
+
+def update_node_version(version: str, new_data: dict, prev_data: dict = {}):
+    """
+    Update the node `added` and `updated` fields by comparing the previous fields with the new ones.
+    The version of the model adding/updating the fields will be used by default.
+
+    Parameters
+    ----------
+    version : str
+        The version to use in the `addedVersion` or `updatedVersion` field.
+    new_data : dict
+        The new data.
+    prev_data : dict
+        Optional - the previous data. If not set, a default empty dictionary will be used as previous value,
+        so every field will be marked as "added".
+
+    Returns
+    -------
+    dict
+        The new data with additional `added`, `addedVersion`, `updated` and `updatedVersion` fields.
+    """
+    def update(prev, key):
+        # TODO: do a better comparison
+        is_updated = key in prev_data and prev_data.get(key) != new_data.get(key)
+        is_added = key not in prev_data
+        value = _update_key_version(version, prev, key, is_updated) if is_updated or is_added else prev
+        _deep_update_node_version(version, new_data.get(key), prev_data.get(key))
+        return value
+
+    keys = [key for key in new_data.keys() if key not in EXCLUDED_VERSION_KEYS]
+    return new_data if any([
+        prev_data is None,
+        # do not add fields on Term
+        (prev_data or {}).get('@type') == 'Term',
+        new_data.get('@type') == 'Term'
+    ]) else reduce(update, keys, new_data)
+
+
+def new_practice(term: dict): return {'@type': 'Practice', 'term': term}

{hestia_earth_models-0.65.5.dist-info → hestia_earth_models-0.65.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.65.5
+Version: 0.65.7
 Summary: HESTIA's set of modules for filling gaps in the activity data using external datasets (e.g. populating soil properties with a geospatial dataset using provided coordinates) and internal lookups (e.g. populating machinery use from fuel use). Includes rules for when gaps should be filled versus not (e.g. never gap fill yield, gap fill crop residue if yield provided etc.).
 Home-page: https://gitlab.com/hestia-earth/hestia-engine-models
 Author: HESTIA Team
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: hestia-earth-schema==30.*
-Requires-Dist: hestia-earth-utils>=0.13.14
+Requires-Dist: hestia-earth-utils>=0.13.16
 Requires-Dist: python-dateutil>=2.8.1
 Requires-Dist: CurrencyConverter==0.16.8
 Requires-Dist: haversine>=2.7.0
@@ -49,10 +49,14 @@ WEB_URL=https://hestia.earth
 ```python
 from hestia_earth.models.pooreNemecek2018 import run
 
+cycle_data = {"@type": "Cycle", ...}
 # cycle is a JSONLD node Cycle
-run('no3ToGroundwaterSoilFlux', cycle_data)
+result = run('no3ToGroundwaterSoilFlux', cycle_data)
+print(result)
 ```
 
+This will display only the result of the `no3ToGroundwaterSoilFlux` model (Emission).
+
 Additionally, to reduce the number of queries to the HESTIA API and run the models faster, prefetching can be enabled:
 ```python
 from hestia_earth.models.preload_requests import enable_preload
@@ -60,13 +64,31 @@ from hestia_earth.models.preload_requests import enable_preload
 enable_preload()
 ```
 
-### Using Spatial Models
+#### Using the orchestrator
+
+The models come with an "orchestrator", which allows you to run a pre-configured set of models instead of a single one.
+
+The configuration for each Node (Cycle, Site or ImpactAssessment) can be found in the [config](./config) folder.
+
+Usage:
+```python
+from hestia_earth.orchestrator import run
+from hestia_earth.models.config import load_config
+
+cycle_data = {"@type": "Cycle", ...}
+result = run(cycle, load_config(cycle))
+print(result)
+```
+
+This will display the Cycle recalculated with all HESTIA default models running.
+
+#### Using Spatial Models
 
 We have models that can gap-fill geographical information on a `Site`. If you want to use these models:
 1. Install the library: `pip install hestia_earth.earth_engine`
 2. Follow the [Getting Started instructions](https://gitlab.com/hestia-earth/hestia-earth-engine#getting-started).
 
-### Using the ecoinventV3 model
+#### Using the ecoinventV3 model
 
 ecoinvent is a consistent, transparent, and well validated life cycle inventory database.
 We use ecoinvent data to ascertain the environmental impacts of activities that occur outside of our system boundary, for example data on the environmental impacts of extracting oil and producing diesel, or the impacts of manufacturing plastics.

{hestia_earth_models-0.65.5.dist-info → hestia_earth_models-0.65.7.dist-info}/RECORD

@@ -4,7 +4,7 @@ hestia_earth/models/cache_sites.py,sha256=Llo2SH1Lp-R8x1JRxJ2Ta-vw5RbdUj2FHXUP-c
 hestia_earth/models/log.py,sha256=_zAfyOkL_VknEnMFvcpvenSMghadlDfZhiSx28545Gk,3558
 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=FC1vYE-igSWHH_kAACO4-kmSuUUvTiLpGWVaBEvQW50,19
+hestia_earth/models/version.py,sha256=stR4pjKHfSb4U3BpRBryv63I9rlfGch2ifjxGb-dZps,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,13 +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=dpAnytPCO8FfCFbJ9CuplsZqvkZabYdmHDd-L8WMZPs,7919
+hestia_earth/models/cml2001Baseline/abioticResourceDepletionFossilFuels.py,sha256=nRAwh5UljL7Tg0BGlYsA6nrIGzIlizVPeangtjHOIQE,7869
 hestia_earth/models/cml2001Baseline/abioticResourceDepletionMineralsAndMetals.py,sha256=4p9Ui78F69yhZkXCwcM6lwbpaNLdpO9p_uJDnLqYhRM,5919
 hestia_earth/models/cml2001Baseline/eutrophicationPotentialExcludingFate.py,sha256=nUWKsn3COqAOrYNmiBKnA2rUs88pj4o3k4fHKA0TVbU,1068
 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=JSrcDhzYLyQ1M7oDfY39pxOgWCScz3dXFSjNNPWvMTo,56546
+hestia_earth/models/config/ImpactAssessment.json,sha256=EB8O8_GZ182upCP-Rpko7I48Tdf30ScK-ZZ3rf4DQQI,57585
+hestia_earth/models/config/Site.json,sha256=FfuME8DLLyoHYJ2uBgnueTIK9E7m9aV7iPT8TBoqlzk,12565
+hestia_earth/models/config/__init__.py,sha256=UZZdwfnxTqnZLG4hNecu6sfKvMLvctjdWFraE_9H438,2130
+hestia_earth/models/config/run-calculations.json,sha256=c-WhY3Rd6UinTxz9ht-1O5_rwe2L7DmX6tFaiVGJ0VY,615
+hestia_earth/models/config/trigger-calculations.json,sha256=pAlb_6GN1HVv9OZwQr8togx7y2ygabGmisJLWILMq_A,623
 hestia_earth/models/cycle/__init__.py,sha256=VowO3kOHb0LpURsljNaJsYO7s6vgjhul6bF_85UjUEI,406
 hestia_earth/models/cycle/aboveGroundCropResidueTotal.py,sha256=9swq4YEeJQ2YjVOmghgBYWkMZWdNU4MKCUBY5FsmBSU,3088
 hestia_earth/models/cycle/coldCarcassWeightPerHead.py,sha256=fQ7huuxyS5PQkRmR_tRCOz9rV3LJwLfLQJjH_TcTz6k,2955
@@ -200,7 +206,7 @@ hestia_earth/models/haversineFormula/__init__.py,sha256=o155nR-XI67iCSBVNYIu4sPR
 hestia_earth/models/haversineFormula/transport/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/models/haversineFormula/transport/distance.py,sha256=163KrmKzlEQuKYT1ZvpPgmKlv_-mmvxp0A1_uKya99w,4203
 hestia_earth/models/hestia/__init__.py,sha256=o5vAmPzSaK9XPgL8GCne3-lugfCOgZhHELYolNgqyyY,407
-hestia_earth/models/hestia/landCover.py,sha256=qWTZ16E1qntPkzmabtMzezayUqIjIg8TNz-Lovh7UKU,27589
+hestia_earth/models/hestia/landCover.py,sha256=10wiHdIBhvWjK2ctHusgOcD2aqTNo8MmJVPW2_DQwu0,29409
 hestia_earth/models/hestia/landTransformation100YearAverageDuringCycle.py,sha256=-7ToRvCVPD6AAcjxorPS5jSWio7JAglHrdSS9PPyPqQ,1551
 hestia_earth/models/hestia/landTransformation20YearAverageDuringCycle.py,sha256=TCskVLhYXBMxdeZM-gN4Tdixk5ua7eVn-o5dfIT_H7o,1543
 hestia_earth/models/hestia/resourceUse_utils.py,sha256=1ySn4d-qkDeU8Ss_80l-uOypPoWsmDsqnS6IM8wkI34,7113
@@ -284,6 +290,7 @@ hestia_earth/models/ipcc2019/pastureGrass_utils.py,sha256=nL31uS3c77PH_5nA2E2MvB
 hestia_earth/models/ipcc2019/utils.py,sha256=MSDMu15D9DnilFUgi4_6jYXC0FaKso3OODauGTMB6hs,6229
 hestia_earth/models/ipcc2019/animal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/models/ipcc2019/animal/fatContent.py,sha256=T-wWzxzPdy4pexS8ivQSeH9Z6U6qRGYfCiEwQDujcww,1003
+hestia_earth/models/ipcc2019/animal/hoursWorkedPerDay.py,sha256=f-zcslXkbIY9ef-pia2PFmxPEDWiMgp4wxJafSGFLe0,985
 hestia_earth/models/ipcc2019/animal/liveweightGain.py,sha256=UElmAdB4yQEFAOT5RrURn0Yt7U3gB2qiCWvNXyLk8Hw,971
 hestia_earth/models/ipcc2019/animal/liveweightPerHead.py,sha256=cq88VTxPYVPyEr2NLPb0Zmmppn_eMp9Xtw6Nxnta4-M,984
 hestia_earth/models/ipcc2019/animal/milkYieldPerAnimal.py,sha256=XxgSvQLi1Xu6ZpUg1a-7OFZEkItkUK-nVPTDxApUnuY,2777
@@ -399,7 +406,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=OY_InmRuCXqEN3EUQTW60UiT0rnkshvCeyiJtrLAHqU,101989
+hestia_earth/models/mocking/search-results.json,sha256=D2Ule1jJAIeLu4ojLX0pXd4YmUDGxW1BduwqcDbpcUw,102056
 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
@@ -501,7 +508,7 @@ hestia_earth/models/site/brackishWater.py,sha256=vLEhIZv5PUKwzwvIuYrWi7K---fq7ZX
 hestia_earth/models/site/cationExchangeCapacityPerKgSoil.py,sha256=0eH4A-tXJ0hvIkiYXWxlx8TfrdbIKUGYUDk97-yQJgg,3653
 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=ffrXelDxwBuCVy7cZbhYQA0SKymMhCogPQES13ySSYE,11679
+hestia_earth/models/site/management.py,sha256=jZqcYxflJWsPef2NrQgPxoKNPKAL3gs616HeMMmQUDY,14503
 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
@@ -568,7 +575,7 @@ hestia_earth/models/utils/blank_node.py,sha256=-IURt-nrVCJUk2Q51Ar46iEYv4Cn3aSdl
 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
-hestia_earth/models/utils/crop.py,sha256=imVLCFGB-h4kAktyg3lJPjXCXDQY3Lr5M0Gz_SqXNOg,2573
+hestia_earth/models/utils/crop.py,sha256=szbmQFIfKAgH18PXkwx4FcmSsYOzDM3AHN5z0aYK9OU,2696
 hestia_earth/models/utils/cropResidue.py,sha256=_0Q35CrliJeo31xGHsPWe8A2oHxijdIsOrf3gBEqhlA,612
 hestia_earth/models/utils/cropResidueManagement.py,sha256=nIDFjf39rDD10UHSVudfDyu-EiL261g8jyrgS-2aDKw,347
 hestia_earth/models/utils/currency.py,sha256=f_ArJANb--pZq4LL49SXQ1AMX_oKroqwBXKRRQqZwsM,578
@@ -604,8 +611,26 @@ hestia_earth/models/utils/time_series.py,sha256=vuv033qUZ1gAw3T3wlLNG7vJmXCCsHEz
 hestia_earth/models/utils/transformation.py,sha256=nyT5Mz4_VgFwhkL8JoNX9kxxow0zuxzsYl3W8xOu2p0,370
 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/utils.py,sha256=LAMUTyIQ-90TR6CUljWPbCNBsAMeukOhW4zoPy7LzuU,4111
+hestia_earth/orchestrator/models/__init__.py,sha256=wVFqISTf8dKAjsvL9bcqxZx7szn8Gycvuey7Dkxg0fM,4126
+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
+hestia_earth/orchestrator/strategies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+hestia_earth/orchestrator/strategies/merge/__init__.py,sha256=9fytXEII6aSbc0edEp0Dg1QMVayU3eMUXdwKYVky_24,1416
+hestia_earth/orchestrator/strategies/merge/merge_append.py,sha256=5xJ8fqu2UqCDotVkSxj7yRDRdw0RM2tERsA4j_1Zlu8,915
+hestia_earth/orchestrator/strategies/merge/merge_default.py,sha256=ssKq5ZIoQr4k2HHpkyPqHJSQQj-AGqu8zUzEQIRafv8,45
+hestia_earth/orchestrator/strategies/merge/merge_list.py,sha256=JioJi4HajpiYHtYE7xbTWQHOQtu3pWIo512VtaxSsDw,4067
+hestia_earth/orchestrator/strategies/merge/merge_node.py,sha256=iAgxHVVR7y2kXtR_pdNzS4Fq-iLmwaqNHXMfjIBG6eE,2622
+hestia_earth/orchestrator/strategies/run/__init__.py,sha256=At0V8CI4vyiSY-Vh2PHMhTYfnp7vl31gq78RyCeIqJk,307
+hestia_earth/orchestrator/strategies/run/add_blank_node_if_missing.py,sha256=dfmS2AC_d3LjlBT962grygvHK38I4y12K3bl_CT_zlo,3166
+hestia_earth/orchestrator/strategies/run/add_key_if_missing.py,sha256=t3U-v87XpbtpsvjA_r0Ftm7MhNkGB0kcUSGFlKBIK_I,352
+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=vuEVZh_mkuI2cPotX2GB88lURJm2giOQ3yu2Cn4iLoI,2997
+tests/models/test_config.py,sha256=WFz1OGhJE6kpcYe3kTPBpv4Jn59yeOCAvz1hqnbI_7o,3113
 tests/models/test_ecoinventV3.py,sha256=_BqfWiYFaw-Y7A-EeabHEnja3d7yb4Ed7gGGvu3Srpw,1936
 tests/models/test_ecoinventV3AndEmberClimate.py,sha256=_EOxdrdavXP6L5_LtvaVbXb_-56UJXSaiPhpGntmwVc,801
 tests/models/test_emissionNotRelevant.py,sha256=YXTdRfcdR_JepHuj2P3Y3r0aFMKNOmsXQHY48tmLTQo,1316
@@ -630,7 +655,7 @@ 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=a6TF9qQmpcHCndcF3-xyhrVd4F2KFr1gZzaIw8gimQ0,8805
+tests/models/cml2001Baseline/test_abioticResourceDepletionFossilFuels.py,sha256=-913Bo7_IC8vz3Fi1tYqN0mSx6HzwWmHcQs-jpuRm80,8801
 tests/models/cml2001Baseline/test_abioticResourceDepletionMineralsAndMetals.py,sha256=xBoSGZaNCSpfDdNFIbyJhJslDJD5A_eTywz01GDqFNM,4513
 tests/models/cml2001Baseline/test_eutrophicationPotentialExcludingFate.py,sha256=ZIIx_EiYbUxUoAS7NuQrxqwTFS3rXQm9_1AsqF_bhB8,894
 tests/models/cml2001Baseline/test_terrestrialAcidificationPotentialIncludingFateAverageEurope.py,sha256=t3WBdg_aTYSLfaqeXUDyvQJ8ZqbvKwv9RKaZyRzj61k,925
@@ -791,7 +816,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=hqzIOA1nGao8uiBE16J0ou52McwV4w30ZLpEAqtfi9k,970
 tests/models/hestia/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/hestia/test_landCover.py,sha256=pEy8AgHsOH7K6kUdwzDFt6-estJU7xcCFDbKL8x48SI,6051
+tests/models/hestia/test_landCover.py,sha256=MP5sKjForlG1FGHl6W9zGEV5iQu4DoswrQa_ZhMqGDg,6078
 tests/models/hestia/test_landTransformation100YearAverageDuringCycle.py,sha256=3qa4rWUFqP1VM5-vm_182rhiBYJDxPqJwWtBqJ5K028,956
 tests/models/hestia/test_landTransformation20YearAverageDuringCycle.py,sha256=257nCGseM8IEc7i3c2lvx0AsJOpk5Cy633PlZZQYRGo,956
 tests/models/hestia/test_seed_emissions.py,sha256=dCUuJBkhwNFBhhcypQN7eMqrWZ9iGCnypoidO5DfQYw,921
@@ -872,6 +897,7 @@ tests/models/ipcc2019/test_organicCarbonPerHa_utils.py,sha256=Zd2QlN_Q3k9djuByOH
 tests/models/ipcc2019/test_pastureGrass.py,sha256=mKx8NnTtMT9TrXxRNLv73wD1TWBaiRZzA1xh2ukb-HI,2667
 tests/models/ipcc2019/animal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/ipcc2019/animal/test_fatContent.py,sha256=Emp8jGudRGA_dJaLMR5Jxsv3Gc57rMAnP0CDqswrmlM,775
+tests/models/ipcc2019/animal/test_hoursWorkedPerDay.py,sha256=gFgCd5hXS_fBhu1f8hbZCci4uTGdpFLjIuER73LY_4A,782
 tests/models/ipcc2019/animal/test_liveweightGain.py,sha256=KmRZyrjrXZcgff1QFtfu1WphNuJW_nHx1GguD8xB2ls,779
 tests/models/ipcc2019/animal/test_liveweightPerHead.py,sha256=nfNAcUEIPQeKyjKYttI5W6hiHBMXLZ9Vbz0nfj81ZvA,782
 tests/models/ipcc2019/animal/test_milkYieldPerAnimal.py,sha256=98rslTxLk92smiUfxRfxB6kjmQAm6085GV9NqWCGpVo,713
@@ -1160,8 +1186,26 @@ tests/models/utils/test_term.py,sha256=M5Sa26v2gzQYbZ4H_fo7DspnaCx__-WtL-MULGapC
 tests/models/utils/test_time_series.py,sha256=LMhRPf8rp3nAriKAC-2K3FDkrMWntRTUUCERw7Lt68g,2686
 tests/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/webbEtAl2012AndSintermannEtAl2012/test_nh3ToAirOrganicFertiliser.py,sha256=qi2FNXS5Af2WDtm7nq_FsprH3BfCF0XxnE0XHmC4aIY,2244
-hestia_earth_models-0.65.5.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
-hestia_earth_models-0.65.5.dist-info/METADATA,sha256=-IzI9Vpy_Cx1mhf771Yldw8ryByRbTygSrCA78-a_ik,3344
-hestia_earth_models-0.65.5.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_models-0.65.5.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.65.5.dist-info/RECORD,,
+tests/orchestrator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/orchestrator/test_models.py,sha256=v5VnyELmrSEcTOtw4lyk2U0r016z8Xx34EFs0FJm5AA,1972
+tests/orchestrator/test_orchestrator.py,sha256=dlO4CKn04m__SZhDtvy1npvQUavVNhdcRe4Unj7wg6g,742
+tests/orchestrator/test_utils.py,sha256=Sqysl2ocifLUeSbgGUdeRn0Sof0xVEeH4dgoXfe18yw,3050
+tests/orchestrator/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/orchestrator/models/test_transformations.py,sha256=cQdk8rEtSJJr27th8SmacsOpC7BP_YVXDrmFDDY4Iks,1080
+tests/orchestrator/models/emissions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/orchestrator/models/emissions/test_deleted.py,sha256=55WOjXR2oeKxdRgXmJg4DgIY3f0asPMvez8b5fkT7LI,767
+tests/orchestrator/strategies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/orchestrator/strategies/merge/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/orchestrator/strategies/merge/test_merge_append.py,sha256=T6_y3qDb4ZmZixzSZMNCYD-dbkIHFfvpayXo1K9-lNA,800
+tests/orchestrator/strategies/merge/test_merge_default.py,sha256=iEia74Z7RflmxDZ3XzubN9yR8n5DR_CDSMyLIW1e8PU,198
+tests/orchestrator/strategies/merge/test_merge_list.py,sha256=KIObPP7AFT0oOE7669UUnYYMSCHX4fQSrb1VFevkQmk,9081
+tests/orchestrator/strategies/merge/test_merge_node.py,sha256=yCaIKFFdJcIANidQBJb95f50OPgm9wwTsuTEzhHumA0,3203
+tests/orchestrator/strategies/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+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.65.7.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
+hestia_earth_models-0.65.7.dist-info/METADATA,sha256=WBcWi-w_mq-nLFKriqoNmPd5Gb2dbMDGRAttdzZIzn4,4046
+hestia_earth_models-0.65.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hestia_earth_models-0.65.7.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.65.7.dist-info/RECORD,,

tests/models/cml2001Baseline/test_abioticResourceDepletionFossilFuels.py

@@ -193,4 +193,4 @@ def test_download_all_non_renewable_terms(*args):
     fuel_terms = download_all_non_renewable_terms("fuel.csv")
 
     assert "coalTar" in fuel_terms
-    assert "sodPeat" not in fuel_terms
+    assert "sodPeat" in fuel_terms

tests/models/hestia/test_landCover.py

@@ -195,7 +195,8 @@ def test_get_sums_of_crop_expansion():
         "zimbabwe_example",
         "brazil_empty_example",
         "gbr_example",
-        "malaysia"
+        "malaysia",
+        "prior_landCover"
     ]
 )
 @patch(f"{CLASS_PATH}._new_management", side_effect=fake_new_management)