hestia-earth-models 0.61.4__py3-none-any.whl → 0.61.6__py3-none-any.whl

hestia_earth/models/ecoinventV3AndEmberClimate/__init__.py

@@ -7,6 +7,7 @@ from functools import reduce
 from typing import Tuple
 
 from hestia_earth.utils.tools import list_sum, flatten
+from hestia_earth.utils.model import linked_node
 from hestia_earth.schema import EmissionMethodTier
 
 from hestia_earth.models.log import logShouldRun, logRequirements, log_blank_nodes_id
@@ -14,6 +15,7 @@ from hestia_earth.models.utils.emission import _new_emission
 from hestia_earth.models.utils.blank_node import group_by_keys
 from hestia_earth.models.utils.completeness import _is_term_type_complete
 from hestia_earth.models.utils.term import get_electricity_grid_mix_terms
+from hestia_earth.models.utils.cycle import cycle_end_year
 from .utils import get_emission, get_all_emission_terms
 
 REQUIREMENTS = {
@@ -52,7 +54,7 @@ def _emission(value: float, term_id: str, inputs: list, operation: dict) -> dict
     emission = _new_emission(term_id, MODEL)
     emission['value'] = [value]
     emission['methodTier'] = TIER
-    emission["inputs"] = list(inputs)
+    emission['inputs'] = list(map(linked_node, inputs))
     if operation:
         emission["operation"] = operation
     return emission
@@ -65,23 +67,34 @@ def _grid_inputs(inputs: list, electricity_grid_terms: list):
     ]
 
 
-def _run_input(cycle: dict, inputs: list, emission_term_id: str, input_term: dict):
-    inputs = _grid_inputs(inputs, [input_term])
-    return [
-        _emission(
-            value=get_emission(
-                term_id=emission_term_id,
-                country=cycle.get("site", {}).get("country", {}).get("@id", ""),
-                energy=list_sum(flatten([i.get("value", []) for i in op_inputs])),
-                year=cycle.get("endDate", ""),
-                model=MODEL
-            ),
+def _run_input(cycle: dict, inputs: list, emission_term_id: str, electricity_grid_term: dict):
+    electricity_grid_inputs = [electricity_grid_term]
+    inputs = _grid_inputs(inputs, electricity_grid_inputs)
+
+    def run(grouped_inputs: list):
+        input = grouped_inputs[0]
+        term_id = input.get('term', {}).get('@id')
+        input_value = list_sum(flatten(input.get('value', []) for input in grouped_inputs))
+        country_id = cycle.get("site", {}).get("country", {}).get("@id")
+        year = cycle_end_year(cycle)
+        value = get_emission(
             term_id=emission_term_id,
-            inputs=[input_term],
-            operation=op_inputs[0].get("operation")
+            country=country_id,
+            energy=input_value,
+            year=year,
+            model=MODEL
         )
-        for op_inputs in _group_by_operation(inputs).values()
-    ] if inputs else []
+
+        logRequirements(cycle, model=MODEL, term=term_id,
+                        input_value=input_value,
+                        emission_value=value)
+
+        should_run = all([input_value > 0, value])
+        logShouldRun(cycle, MODEL, term_id, should_run, methodTier=TIER)
+
+        return _emission(value, emission_term_id, electricity_grid_inputs, input.get("operation"))
+
+    return list(map(run, _group_by_operation(inputs).values() if inputs else []))
 
 
 def _group_by_operation(inputs: list) -> dict:
@@ -94,8 +107,8 @@ def _run_emission(cycle: dict, electricity_grid_terms: list, inputs: list, emiss
             cycle=cycle,
             inputs=inputs,
             emission_term_id=emission_term_id,
-            input_term=input_term
-        ) for input_term in electricity_grid_terms
+            electricity_grid_term=electricity_grid_term
+        ) for electricity_grid_term in electricity_grid_terms
     ])
 
 
@@ -104,11 +117,16 @@ def _should_run_emission(cycle: dict, electricity_grid_terms: list, term_id: str
     inputs = _grid_inputs(cycle.get('inputs', []), electricity_grid_terms)
     has_relevant_inputs = bool(inputs)
     has_country = bool(cycle.get("site", {}).get("country", {}))
+    has_end_date = bool(cycle.get("endDate"))
 
     logRequirements(cycle, model=MODEL, term=term_id,
-                    input_ids=log_blank_nodes_id(inputs))
+                    term_type_electricityFuel_complete=term_type_complete,
+                    input_ids=log_blank_nodes_id(inputs),
+                    has_relevant_inputs=has_relevant_inputs,
+                    has_country=has_country,
+                    has_end_date=has_end_date)
 
-    should_run = all([term_type_complete, has_relevant_inputs, has_country])
+    should_run = all([term_type_complete, has_relevant_inputs, has_country, has_end_date])
     logShouldRun(cycle, MODEL, term_id, should_run, methodTier=TIER)
     return should_run, inputs
 

hestia_earth/models/ecoinventV3AndEmberClimate/utils.py

@@ -10,27 +10,18 @@ from hestia_earth.models.data.ecoinventV3 import ecoinventV3_emissions
 EMBER_ECOINVENT_LOOKUP_NAME = "ember-ecoinvent-mapping.csv"
 
 
-def _lookup_data(term_id: str, grouping: str, country_id: str, year: int, lookup_name: str, **log_args):
+def _lookup_data(term_id: str, grouping: str, country_id: str, year: str, lookup_name: str, **log_args):
     lookup = download_lookup(lookup_name)
-    data = get_table_value(lookup, 'termid', country_id, column_name(grouping))
-    debugMissingLookup(lookup_name, 'termid', country_id, grouping, data, term=term_id, **log_args)
-    percentage = extract_grouped_data(data, str(year))
+    column = column_name(grouping)
+    data = get_table_value(lookup, 'termid', country_id, column)
+    percentage = extract_grouped_data(data, year)
+    debugMissingLookup(lookup_name, 'termid', country_id, column, percentage, year=year, term=term_id, **log_args)
     return safe_parse_float(percentage, None)
 
 
 def _convert_name(name: str) -> str: return name.replace(";", ",")
 
 
-def _safe_parse_int(value: str, default=0):
-    """
-    Parse a string into an int.
-    """
-    try:
-        return int(value)
-    except ValueError:
-        return default
-
-
 def _zero_from_non_numeric(value: Any) -> float:
     try:
         return float(value)
@@ -62,7 +53,7 @@ def _get_emission_rate_per_source(ember_ecoinvent_mapping: Dict, emission_term_i
     }
 
 
-def get_emission(term_id: str, country: str, year: str, energy: float, model: str) -> float:
+def get_emission(term_id: str, country: str, year: int, energy: float, model: str) -> float:
     """
     Get the <term_id> emissions in kg for the energy consumed.
         a: ecoInventId of each source        - from "ember-ecoinvent-mapping.csv"
@@ -89,7 +80,7 @@ def get_emission(term_id: str, country: str, year: str, energy: float, model: st
             term_id=source,
             grouping=source,
             country_id=country,
-            year=_safe_parse_int(year),
+            year=str(year),
             lookup_name="region-ember-energySources.csv",
             model=model
         )

hestia_earth/models/ipcc2019/animal/weightAtMaturity.py

@@ -91,7 +91,11 @@ def _should_run(cycle: dict):
                         weightAtMaturity=lookup_value,
                         liveweightPerHead=liveweightPerHead_value)
 
-        should_run = all([country_id, value.get('value') is not None, lookup_value >= liveweightPerHead_value])
+        should_run = all([
+            country_id,
+            lookup_value is not None,
+            lookup_value is None or liveweightPerHead_value is None or lookup_value >= liveweightPerHead_value
+        ])
         logShouldRun(cycle, MODEL, term_id, should_run)
 
         return should_run

hestia_earth/models/ipcc2019/co2ToAirSoilOrganicCarbonStockChangeManagementChange.py

@@ -694,7 +694,7 @@ def _should_run(cycle: dict) -> tuple:
     """
     cycle_id = cycle.get("@id")
     site = get_site(cycle)
-    cycles = related_cycles(site.get("@id"))
+    cycles = related_cycles(site)
 
     grouped_soc_stocks = _get_grouped_soc_stocks(site)
     grouped_soc_stock_changes = _calc_grouped_soc_stock_changes(grouped_soc_stocks)

hestia_earth/models/ipcc2019/organicCarbonPerHa.py

@@ -1891,11 +1891,12 @@ def _get_carbon_sources_from_cycles(cycles: dict) -> list[CarbonSource]:
     inputs_and_products = non_empty_list(flatten(
         [cycle.get("inputs", []) + cycle.get("products", []) for cycle in cycles]
     ))
+    crop_residue_terms = get_crop_residue_incorporated_or_left_on_field_terms()
 
     return non_empty_list([
         _iterate_carbon_source(node) for node in inputs_and_products
         if any([
-            node.get("term", {}).get("@id") in get_crop_residue_incorporated_or_left_on_field_terms(),
+            node.get("term", {}).get("@id") in crop_residue_terms,
             node.get("term", {}).get("termType") in CARBON_SOURCE_TERM_TYPES
         ])
     ])
@@ -3236,9 +3237,10 @@ def _get_carbon_input_kwargs(
         cumulative_threshold=MIN_AREA_THRESHOLD
     )
 
+    cover_crop_property_terms = get_cover_crop_property_terms()
     has_cover_crop = cumulative_nodes_match(
         lambda node: any(
-            get_node_property(node, term_id, False).get("value", False) for term_id in get_cover_crop_property_terms()
+            get_node_property(node, term_id, False).get("value", False) for term_id in cover_crop_property_terms
         ),
         land_cover_nodes,
         cumulative_threshold=MIN_AREA_THRESHOLD
@@ -3515,7 +3517,7 @@ def _should_run(site: dict) -> tuple[bool, dict]:
     site_type = site.get("siteType", "")
     management_nodes = site.get("management", [])
     measurement_nodes = site.get("measurements", [])
-    cycles = related_cycles(site.get("@id"))
+    cycles = related_cycles(site)
 
     has_management = len(management_nodes) > 0
     has_measurements = len(measurement_nodes) > 0
@@ -3768,14 +3770,16 @@ def _get_grouped_climate_measurements(grouped_measurements: dict) -> dict:
 
 
 def _get_grouped_irrigated_monthly(grouped_cycles: dict) -> dict:
+    irrigated_terms = get_irrigated_terms()
+
     return {
         year: {
-            _InventoryKey.IRRIGATED_MONTHLY: _get_irrigated_monthly(year, cycles)
+            _InventoryKey.IRRIGATED_MONTHLY: _get_irrigated_monthly(year, cycles, irrigated_terms)
         } for year, cycles in grouped_cycles.items()
     }
 
 
-def _get_irrigated_monthly(year: int, cycles: list[dict]) -> list[bool]:
+def _get_irrigated_monthly(year: int, cycles: list[dict], irrigated_terms: list[str]) -> list[bool]:
     # Get practice nodes and add "startDate" and "endDate" from cycle if missing.
     irrigation_nodes = non_empty_list(flatten([
         [
@@ -3793,7 +3797,7 @@ def _get_irrigated_monthly(year: int, cycles: list[dict]) -> list[bool]:
     return [
         cumulative_nodes_term_match(
             grouped_nodes.get(year, {}).get(month, []),
-            target_term_ids=get_irrigated_terms(),
+            target_term_ids=irrigated_terms,
             cumulative_threshold=MIN_AREA_THRESHOLD
         ) for month in range(1, 13)
     ]
@@ -3862,12 +3866,13 @@ def _check_is_paddy_rice(cycles: list[dict]) -> bool:
         default_node_value=MIN_YIELD_THRESHOLD
     ) for cycle in cycles)
 
+    reice_terms = get_upland_rice_crop_terms() + get_upland_rice_land_cover_terms()
     has_upland_rice_products = any(cumulative_nodes_term_match(
         filter_list_term_type(
             cycle.get("products", []) + cycle.get("practices", []),
             [TermTermType.CROP, TermTermType.FORAGE, TermTermType.LANDCOVER]
         ),
-        target_term_ids=get_upland_rice_crop_terms() + get_upland_rice_land_cover_terms(),
+        target_term_ids=reice_terms,
         cumulative_threshold=MIN_YIELD_THRESHOLD,
         default_node_value=MIN_YIELD_THRESHOLD
     ) for cycle in cycles)

hestia_earth/models/mocking/__init__.py

@@ -1,23 +1,20 @@
+import os
 from hestia_earth.models.utils import measurement, site
 
 from .mock_search import mock as mock_search
 
+CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
+RESULTS_PATH = os.path.join(CURRENT_DIR, 'search-results.json')
 
-def enable_mock(node: dict = None):
-    """
-    Mock calls to Hestia API using pre-loaded search results.
 
-    Parameters
-    ----------
-    node : dict
-        Optional - The node used to run calculations. This is especially useful when running calculations on a Site.
-    """
+def enable_mock(filepath: str, node: dict = None):
     # apply mocks on search results
-    mock_search()
-    # skip fetch bibliography data
-    measurement.include_source = lambda v, *args: v
+    mock_search(filepath)
 
     if node is not None:
+        # skip fetch bibliography data
+        measurement.include_source = lambda v, *args: v
+
         # mock related cycles to return the current node
         fake_node = {'@id': 'fake-cycle', **node}
         site.download_hestia = lambda *args: fake_node

hestia_earth/models/mocking/mock_search.py

@@ -1,12 +1,9 @@
-import os
 from inspect import getmembers, isfunction
 import json
+from hestia_earth.utils.tools import flatten
 
-from hestia_earth.models.log import logger
 from hestia_earth.models.utils import term
 
-CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
-RESULTS_PATH = os.path.join(CURRENT_DIR, 'search-results.json')
 IGNORE_FUNC = ['get_lookup_value', 'get_table_value']
 
 
@@ -14,7 +11,7 @@ def _map_results(results):
     # returning the whole term
     return [results] if isinstance(results, dict) else (
         {'@type': 'Term', '@id': results} if isinstance(results, str) else
-        list(map(_map_results, results)) if isinstance(results, list) else
+        flatten(map(_map_results, results)) if isinstance(results, list) else
         None
     )
 
@@ -48,24 +45,27 @@ def create_search_results():
     return list(map(_create_search_result, funcs))
 
 
-def _load_results():
-    with open(RESULTS_PATH) as f:
+def _load_results(filepath: str):
+    with open(filepath) as f:
         return json.load(f)
 
 
-def _find_search_result(query: dict):
-    search_results = _load_results()
+def _find_search_result(filepath: str, query: dict):
+    search_results = _load_results(filepath)
     res = next((n for n in search_results if n['query'] == query), {})
-    logger.debug('mocking search result: %s', res)
     return res.get('results', [])
 
 
-def _fake_search(query: dict, *_a, **_b): return _find_search_result(query)
+def _fake_search(filepath: str):
+    def mock(query: dict, *_a, **_b): return _find_search_result(filepath, query)
+    return mock
 
 
-def _fake_find_node(_n, query: dict, *_a, **_b): return _find_search_result(query)
+def _fake_find_node(filepath: str):
+    def mock(_n, query: dict, *_a, **_b): return _find_search_result(filepath, query)
+    return mock
 
 
-def mock():
-    term.search = _fake_search
-    term.find_node = _fake_find_node
+def mock(filepath: str):
+    term.search = _fake_search(filepath)
+    term.find_node = _fake_find_node(filepath)

hestia_earth/models/mocking/search-results.json

@@ -1113,26 +1113,22 @@
       }
     },
     "results": [
-      [
-        {
-          "@type": "Term",
-          "name": "Electricity, grid, renewable mix",
-          "termType": "electricity",
-          "@id": "electricityGridRenewableMix",
-          "units": "kWh",
-          "_score": 27.711746
-        }
-      ],
-      [
-        {
-          "@type": "Term",
-          "name": "Electricity, grid, market mix",
-          "termType": "electricity",
-          "@id": "electricityGridMarketMix",
-          "units": "kWh",
-          "_score": 27.711746
-        }
-      ]
+      {
+        "@type": "Term",
+        "name": "Electricity, grid, renewable mix",
+        "termType": "electricity",
+        "@id": "electricityGridRenewableMix",
+        "units": "kWh",
+        "_score": 27.711746
+      },
+      {
+        "@type": "Term",
+        "name": "Electricity, grid, market mix",
+        "termType": "electricity",
+        "@id": "electricityGridMarketMix",
+        "units": "kWh",
+        "_score": 27.711746
+      }
     ]
   },
   {
@@ -1394,7 +1390,7 @@
         "@type": "Term",
         "name": "Generic crop, seed",
         "@id": "genericCropSeed",
-        "_score": 25.694489
+        "_score": 25.694498
       }
     ]
   },

hestia_earth/models/preload_requests.py

@@ -0,0 +1,32 @@
+"""
+Preload all search requests to avoid making the same searches many times while running models.
+"""
+import json
+
+from .log import logger
+from .mocking.mock_search import create_search_results
+from .mocking import RESULTS_PATH, enable_mock as _mock
+
+
+def enable_preload(filepath: str = RESULTS_PATH, node: dict = None):
+    """
+    Prefetch calls to Hestia API in a local file.
+
+    Parameters
+    ----------
+    filepath : str
+        The path of the file containing the search results. Defaults to current library folder.
+    node : dict
+        Optional - The node used to run calculations. This is especially useful when running calculations on a Site.
+    """
+    logger.debug('Preloading search results and storing in %s', filepath)
+
+    # build the search results
+    data = create_search_results()
+
+    # store in file
+    with open(filepath, 'w') as f:
+        f.write(json.dumps(data, indent=2, ensure_ascii=False))
+
+    # enable mock search results from file
+    _mock(filepath=filepath, node=node)

hestia_earth/models/site/management.py

@@ -198,7 +198,7 @@ def _get_relevant_inputs(cycles: List[dict]) -> List:
 
 def _should_run(site: dict):
     # Only get related cycles once.
-    cycles = related_cycles(site.get("@id"))
+    cycles = related_cycles(site)
 
     products_land_cover = [
         _extract_node_value(

hestia_earth/models/utils/site.py

@@ -44,7 +44,7 @@ def region_level_1_id(term_id: str):
 def is_site(site: dict): return site.get('@type', site.get('type')) == SchemaType.SITE.value
 
 
-def related_cycles(site_id: str):
+def related_cycles(site: dict):
     """
     Get the list of `Cycle` related to the `Site`.
     Gets the `recalculated` data if available, else `original`.
@@ -59,8 +59,9 @@ def related_cycles(site_id: str):
     list[dict]
         The related `Cycle`s as `dict`.
     """
-    nodes = find_related(SchemaType.SITE, site_id, SchemaType.CYCLE)
-    return non_empty_list(map(lambda node: _load_calculated_node(node, SchemaType.CYCLE), nodes or []))
+    cached_nodes = [n for n in cached_value(site, 'related', []) if n.get('@type') == SchemaType.CYCLE.value]
+    related_nodes = cached_nodes or find_related(SchemaType.SITE, site.get('@id'), SchemaType.CYCLE) or []
+    return non_empty_list(map(lambda node: _load_calculated_node(node, SchemaType.CYCLE), related_nodes))
 
 
 def _cycle_year(cycle: dict, key: str):
@@ -73,7 +74,7 @@ def related_years(site: dict):
         sorted(non_empty_list(set(flatten([
             _cycle_year(cycle, 'startDate'),
             _cycle_year(cycle, 'endDate')
-        ] for cycle in related_cycles(site.get('@id'))))))
+        ] for cycle in related_cycles(site)))))
     )
 
 

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.61.4'
+VERSION = '0.61.6'

{hestia_earth_models-0.61.4.dist-info → hestia_earth_models-0.61.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.61.4
+Version: 0.61.6
 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 ==28.*
-Requires-Dist: hestia-earth.utils >=0.12.6
+Requires-Dist: hestia-earth.utils >=0.13.0
 Requires-Dist: python-dateutil >=2.8.1
 Requires-Dist: CurrencyConverter ==0.16.8
 Requires-Dist: haversine >=2.7.0
@@ -53,6 +53,13 @@ from hestia_earth.models.pooreNemecek2018 import run
 run('no3ToGroundwaterSoilFlux', cycle_data)
 ```
 
+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
+
+enable_preload()
+```
+
 ### Using Spatial Models
 
 We have models that can gap-fill geographical information on a `Site`. If you want to use these models:

{hestia_earth_models-0.61.4.dist-info → hestia_earth_models-0.61.6.dist-info}/RECORD

@@ -2,8 +2,9 @@ hestia_earth/__init__.py,sha256=G-d438vPx7m_ks5e9XTtM3u7LDRO5dSSukibukWmyPM,56
 hestia_earth/models/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3hk,76
 hestia_earth/models/cache_sites.py,sha256=KQp9cUKE-aIcYJoMWEtKFYS8gBFfsx5LKQhqoWpUSoM,6065
 hestia_earth/models/log.py,sha256=b63I3qyTtQs17xxbq8RI0Fv2lvZ1oDZ9k0njhxqiFFk,3459
+hestia_earth/models/preload_requests.py,sha256=elhYQTxBVuFlZROWvZ3yErDzzMLdMUIjBhmpdaTUSi8,1012
 hestia_earth/models/requirements.py,sha256=znNZJAhwX2iYiKcAQXPftY7z_1MsNa0QxCXkXyHm_U0,17363
-hestia_earth/models/version.py,sha256=bmj37UzUxTNwdA4_HAC8XTpOEahYZizn-7UE1L4CEyc,19
+hestia_earth/models/version.py,sha256=dBBOYPfbTEoLiqkPnN90IsOKd58x-WvuZYLLtlCWK5k,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=mrh8seYSYdTgcMDCETLiknuPeJehg071YoG4UiyW0yU,4404
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=_Rbngu0DzHKa62JwBl58ZC_ui1zLF2que_nB7ukhOQc,3392
@@ -106,8 +107,8 @@ hestia_earth/models/data/ecoinventV3/__init__.py,sha256=oevyurRuioXy_CsQCtG-S_FX
 hestia_earth/models/deRuijterEtAl2010/__init__.py,sha256=lbH6mB98dmZZlwdZctNYtEmVwAow957l80Dv7JSPDsI,418
 hestia_earth/models/deRuijterEtAl2010/nh3ToAirCropResidueDecomposition.py,sha256=2z10WqMsGUDDO8xJ3lmXvSUHgzz2t6PPRDha5NHoT5s,3291
 hestia_earth/models/ecoinventV3/__init__.py,sha256=nSktsE0c9ohx1FyDEEi-YlnGgMGNd-actCwPs_htzC0,6309
-hestia_earth/models/ecoinventV3AndEmberClimate/__init__.py,sha256=-5FCTS2EA8D7hbuqsTN0E1SOTPwJ5ChfJBDJapbtzGc,4388
-hestia_earth/models/ecoinventV3AndEmberClimate/utils.py,sha256=Vh8cGkgvbcq3b8tE8Y_8LI1PYqrt9E53fPwInKoYmaY,4577
+hestia_earth/models/ecoinventV3AndEmberClimate/__init__.py,sha256=H5fxfUy6HLHxRgvG3oPZ8pnLbq3Axm0Ejkp9CQ2UGlM,5306
+hestia_earth/models/ecoinventV3AndEmberClimate/utils.py,sha256=mV55GMUxe_fORBVDWGBxOqmH2JVDKhLoKodJ7UzC38c,4420
 hestia_earth/models/emepEea2019/__init__.py,sha256=l90-pWrqIzt1ap1WNk0gF4iZeF5_TSG62hE83bIi4rQ,412
 hestia_earth/models/emepEea2019/co2ToAirFuelCombustion.py,sha256=DfoGlB5HjA1gafO0OutJjfsA6yPP_PsAd-p16evwCiQ,1609
 hestia_earth/models/emepEea2019/n2OToAirFuelCombustionDirect.py,sha256=R3lRF5-Md4Jd7irvTe8WJZJPc9-wa1pD6UWVk7lnGtQ,1616
@@ -219,7 +220,7 @@ hestia_earth/models/ipcc2019/ch4ToAirEntericFermentation.py,sha256=khX90Njkmlvos
 hestia_earth/models/ipcc2019/ch4ToAirExcreta.py,sha256=IzYHdnzT8Z-WQGoZIt9-O98VqriA5rKr38He_TbYadk,6723
 hestia_earth/models/ipcc2019/ch4ToAirFloodedRice.py,sha256=TJ4J7VA5n4RPrJYZQeR3lc3ZoCw7T1E5Cb1XJewr834,7331
 hestia_earth/models/ipcc2019/co2ToAirLimeHydrolysis.py,sha256=7z0zdqiiWQwkyJCgSNMoK2mft3cJkTRlqwKrMuSKdWI,2454
-hestia_earth/models/ipcc2019/co2ToAirSoilOrganicCarbonStockChangeManagementChange.py,sha256=kWrWxhr-48jmbyt57EIjth8IWsl5-Yt1I-uTBSUqFuA,25381
+hestia_earth/models/ipcc2019/co2ToAirSoilOrganicCarbonStockChangeManagementChange.py,sha256=X-pUmOa7oy6uvgr0cMDeKRLVIQvh-4bjjrronvd0F3k,25370
 hestia_earth/models/ipcc2019/co2ToAirUreaHydrolysis.py,sha256=071H3ykjzJFW2K5PKvbAaeIj0aL8LTzMiG_pIeYEpEc,3520
 hestia_earth/models/ipcc2019/croppingDuration.py,sha256=_jlFrTNDOARH2_g8s4dzuaCoLHSX2BHzSQd3uuQN32Y,3173
 hestia_earth/models/ipcc2019/ligninContent.py,sha256=wp5EbCthCDAKyvPBfZULS9-uKEY58TQQ8ey1pf-juv8,7267
@@ -240,13 +241,13 @@ hestia_earth/models/ipcc2019/no3ToGroundwaterInorganicFertiliser.py,sha256=eyPfy
 hestia_earth/models/ipcc2019/no3ToGroundwaterOrganicFertiliser.py,sha256=px2SN-uaus2cftXzlsYCUAxLuon6BnDXmaFI9xhQrgU,3347
 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=omxrtnAZ58qHQYIhi38R7VFn7SRzf8Kk89KgP0VELFQ,141507
+hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=x2U3FwZuM-lVDCzXmj5eCFOt8b3DIszeebnYIFWCeBc,141712
 hestia_earth/models/ipcc2019/pastureGrass.py,sha256=Q3uX7IcTk0PmzxqEhU3JAcHb5LnUymZbmdRFP9xXsfo,8713
 hestia_earth/models/ipcc2019/pastureGrass_utils.py,sha256=nUJYYkovzF7QD4LeUqhV5mBYFKdrhxeG4gyPRv0Xpuk,16002
 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/pastureGrass.py,sha256=xPtuTiKeAvBhv9d7B6Upw_cbP6YxKykVJ3_p0S_EtZg,10689
-hestia_earth/models/ipcc2019/animal/weightAtMaturity.py,sha256=PlT11hX2nBIwDMsQs3E0XeJZ5BCA023_ibpXPreTncI,3558
+hestia_earth/models/ipcc2019/animal/weightAtMaturity.py,sha256=5smSAmKVCIlELCD6S_3I16YuSWNFhcClGDOdvrIuYsE,3657
 hestia_earth/models/ipcc2021/__init__.py,sha256=VTgGFKhwMmk_nuI1RRq0in27fHYVPBonlXlPK00K8no,409
 hestia_earth/models/ipcc2021/gwp100.py,sha256=v-DYU-11XnWI1Ns1GEiKrJqL3JafxvhTsLmuBuFcxJU,1021
 hestia_earth/models/jarvisAndPain1994/__init__.py,sha256=ercUwy29sV7oPIESj8UjsGB5lqiBCss9OZcbjxeeG8E,418
@@ -357,9 +358,9 @@ hestia_earth/models/linkedImpactAssessment/landTransformationFromOtherNaturalVeg
 hestia_earth/models/linkedImpactAssessment/landTransformationFromPermanentPasture100YearAverageInputsProduction.py,sha256=7btlXl5PL47qIjfs-w_xLZY_nsRnJAwTREtt8LpY6UI,1052
 hestia_earth/models/linkedImpactAssessment/landTransformationFromPermanentPasture20YearAverageInputsProduction.py,sha256=pdluhfRQuJK0EHq-L0s0TOf37tvOQYB-M-wZiuSbarw,1050
 hestia_earth/models/linkedImpactAssessment/utils.py,sha256=dGwGc2d-8_WQElTpfyPmz5vQtL-LHQRmiZnCTuPXMDs,1876
-hestia_earth/models/mocking/__init__.py,sha256=kmSeOTSvurMUxw7Ajhf3G-SVPQ1NgmirMTk4TSOEicY,765
-hestia_earth/models/mocking/mock_search.py,sha256=V-ycVBTkJu7PP37Ivy_16hpKBV4aEtJb5S9DfChPNSU,2038
-hestia_earth/models/mocking/search-results.json,sha256=FuWHaK_s8PNp46cP3fBfE7kwkm4Tu_HlMGz8Y62UWLk,41248
+hestia_earth/models/mocking/__init__.py,sha256=n3Fkkrvh8zHNWiJZmnfQ7WZ91JRzAO9P6pSG1JpwtXo,687
+hestia_earth/models/mocking/mock_search.py,sha256=dBCDRfbZmbMLKP21u_VYkxyimomqs-zztjX-_ZNKuuM,2036
+hestia_earth/models/mocking/search-results.json,sha256=Em88H12lmHhXF5ocZ0Qtm1ALNqW5GZXl2gRhtATc3Wk,41184
 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
@@ -458,7 +459,7 @@ hestia_earth/models/site/brackishWater.py,sha256=dl-R_vwFlXwAkir3grhCYZTLf05FYrf
 hestia_earth/models/site/cationExchangeCapacityPerKgSoil.py,sha256=0eH4A-tXJ0hvIkiYXWxlx8TfrdbIKUGYUDk97-yQJgg,3653
 hestia_earth/models/site/flowingWater.py,sha256=0ZuSXMr3EUTY3wsy8hdfuXeZcNX-n3D45MfX3dwyaeA,1728
 hestia_earth/models/site/freshWater.py,sha256=z-C_Il0U6UhZUQUPwh72Z0vixmSrUNEmBN5Lz-nl9_w,1254
-hestia_earth/models/site/management.py,sha256=F_zcXlW100pwdSfRyT8GxB_l1LMnAWzyVMe40qjV9ws,8843
+hestia_earth/models/site/management.py,sha256=o9WIvbxip6B-jbQdgko6H2l1neQ0Z5ZpcPJmM5gcYlw,8832
 hestia_earth/models/site/netPrimaryProduction.py,sha256=UIIQkYd911qVzrWjxBLrC37e-RARIVgDwLdARY9BuLw,1849
 hestia_earth/models/site/organicCarbonPerHa.py,sha256=-qQWy1BI4vZJJNMS1RCluZ34dOTqR0lblXSOZLjkhOo,14362
 hestia_earth/models/site/organicCarbonPerKgSoil.py,sha256=t--wAshiAKS-JvEKhLFRadGvgSBv5NFZ68jdyms_wh4,1945
@@ -547,7 +548,7 @@ hestia_earth/models/utils/practice.py,sha256=tNadOzsrNlCEt801B815XaruJXzZ5yPASam
 hestia_earth/models/utils/product.py,sha256=H9UqJNzTqtMWXDQnbRkZlTpv_hg4s-Tya469fBk8InA,10143
 hestia_earth/models/utils/productivity.py,sha256=bUBVCZInGqHuHZvHDSYPQkjWXQxOtTjEk-1-f_BsFOo,594
 hestia_earth/models/utils/property.py,sha256=gHPEmy3Sw599ox64Gv-LCvjhP1THlBXBaBlTOK5lvog,5060
-hestia_earth/models/utils/site.py,sha256=oLuai82WdN_qAAG09XmLEbhf7-jr7AT7BGxRBUs1Bno,3292
+hestia_earth/models/utils/site.py,sha256=XIpPGqByjpfrPxxcqt9iMAcIpsPUBfAENFnf8fz0iEE,3429
 hestia_earth/models/utils/source.py,sha256=HhZkvQoFdy6j6FC2cwP5EbHXHFM4pif9gpnuzeDwEh4,1746
 hestia_earth/models/utils/temperature.py,sha256=ljlG4-yCgFFb6LRZweb18cZKLrr7K2mqd4E4Hz_D1f8,476
 hestia_earth/models/utils/term.py,sha256=n_T1Qp_0z9ZUgrbVACNKue-5yDePOCkDw8g8dlMKSTM,17763
@@ -557,7 +558,7 @@ hestia_earth/models/webbEtAl2012AndSintermannEtAl2012/nh3ToAirOrganicFertiliser.
 tests/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/test_cache_sites.py,sha256=AsZSGb4ruFqag74wRaQxpoZxbMxexPY8q8sMb2ergzg,1986
 tests/models/test_ecoinventV3.py,sha256=gde7ny9ThMmezkDcTmS3ZKn82MNOaNSrpMcbkTjFJxk,1491
-tests/models/test_ecoinventV3AndEmberClimate.py,sha256=hMyCkDMLzUihfQpSTVPlycerqiDplBCJZlW1SrJxGjo,3622
+tests/models/test_ecoinventV3AndEmberClimate.py,sha256=_V4d01j6itpwa_22H2GbSlRfOLN5KZLCxCIjkPdwoNg,3660
 tests/models/test_emissionNotRelevant.py,sha256=YXTdRfcdR_JepHuj2P3Y3r0aFMKNOmsXQHY48tmLTQo,1316
 tests/models/agribalyse2016/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/agribalyse2016/test_fuelElectricity.py,sha256=u_wNlqngJc8NELPr16kYsYQ-_2PcL8BnrfJucY7dccU,1353
@@ -1064,13 +1065,13 @@ tests/models/utils/test_measurement.py,sha256=UGCUzuc3gHltehpuOA7dj0DJJY4xcVrQOJ
 tests/models/utils/test_practice.py,sha256=ILaxkb3qICor9AquAGYiOtA-YKnq0hppmJQzNC_VNyA,612
 tests/models/utils/test_product.py,sha256=kwvgAeeEoRgkeStX0zQcFd-4DJhoUhX6Apaks0MU2L0,2305
 tests/models/utils/test_property.py,sha256=t2npw86IK7C6G4ypiPtanFi0db4PB7G5VBR1GjRGl34,618
-tests/models/utils/test_site.py,sha256=5nCW3onTk6GF_N-h4NYDrlSoxHhXY2GVMbjaDsicbSE,1187
+tests/models/utils/test_site.py,sha256=9MXbP5JXl0mYaH-yVHJINnZu_MYwj-ogsJWZ3XTHxas,1196
 tests/models/utils/test_source.py,sha256=mv3vHZV5cjpoLA2I1109-YUkuzAiuhbRSnv_76_f0CA,631
 tests/models/utils/test_term.py,sha256=M5Sa26v2gzQYbZ4H_fo7DspnaCx__-WtL-MULGapCWk,3509
 tests/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/webbEtAl2012AndSintermannEtAl2012/test_nh3ToAirOrganicFertiliser.py,sha256=qi2FNXS5Af2WDtm7nq_FsprH3BfCF0XxnE0XHmC4aIY,2244
-hestia_earth_models-0.61.4.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
-hestia_earth_models-0.61.4.dist-info/METADATA,sha256=KxbGs2wQWB_3PbEeCUhb6j5W5DB9X6C-IJVMuFC7P8A,3134
-hestia_earth_models-0.61.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-hestia_earth_models-0.61.4.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.61.4.dist-info/RECORD,,
+hestia_earth_models-0.61.6.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
+hestia_earth_models-0.61.6.dist-info/METADATA,sha256=1nFjqi4tnhv8KZF_xP_-yxVdOx2dZZjeadqlh3M_QW4,3350
+hestia_earth_models-0.61.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+hestia_earth_models-0.61.6.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.61.6.dist-info/RECORD,,

tests/models/test_ecoinventV3AndEmberClimate.py

@@ -10,8 +10,8 @@ from hestia_earth.models.ecoinventV3AndEmberClimate import MODEL, _should_run_em
 class_path = f"hestia_earth.models.{MODEL}"
 fixtures_folder = f"{fixtures_path}/{MODEL}"
 
-cycle_with_country = {"site": {"country": {"@type": "Term", "termType": "region"}}}
-cycle_without_country = {"site": {"country": {}}}
+cycle_with_country = {"endDate": "2010", "site": {"country": {"@type": "Term", "termType": "region"}}}
+cycle_without_country = {"endDate": "2010", "site": {"country": {}}}
 ELECTRICITY_TERMS = [
     {"@type": "Term", "@id": "electricityGridMarketMix"},
     {"@type": "Term", "@id": "electricityGridRenewableMix"}

tests/models/utils/test_site.py

@@ -21,7 +21,7 @@ def test_region_level_1_id():
 @patch(f"{class_path}.find_related", return_value=[CYCLE])
 @patch(f"{class_path}._load_calculated_node", return_value=CYCLE)
 def test_related_cycles(*args):
-    assert related_cycles('id') == [CYCLE]
+    assert related_cycles({'@id': 'id'}) == [CYCLE]
 
 
 def test_valid_site_type():