hestia-earth-models 0.61.5__py3-none-any.whl → 0.61.7__py3-none-any.whl

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/schererPfister2015/pToDrainageWaterSoilFlux.py

@@ -53,7 +53,7 @@ def _emission(value: float):
 
 def _run(cycle: dict, drainageClass: list):
     P_total, _ = get_liquid_slurry_sludge_P_total(cycle)
-    value = 0.07 * (1 + P_total * 0.2/80) * (6 if drainageClass > 3 else 0)
+    value = 0.07 * (1 + P_total * 0.2/80) * (6 if drainageClass > 4 else 0)
     return [_emission(value)]
 
 

hestia_earth/models/schererPfister2015/pToGroundwaterSoilFlux.py

@@ -41,7 +41,7 @@ def _emission(value: float):
 
 def _run(cycle: dict, drainageClass: list):
     P_total, _ = get_liquid_slurry_sludge_P_total(cycle)
-    value = 0.07 * (1 + P_total * 0.2/80) * (0 if drainageClass > 3 else 1)
+    value = 0.07 * (1 + P_total * 0.2/80) * (0 if drainageClass > 4 else 1)
     return [_emission(value)]
 
 

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/site/soilMeasurement.py

@@ -114,13 +114,14 @@ def _group_measurements_by_date_method_term(measurements):
     return group_by_result
 
 
-def _run_harmonisation(measurements: list, needed_depths: list):
+def _run_harmonisation(measurements: list) -> list:
     results = []
     grouped_measurements = _group_measurements_by_date_method_term(
         _expand_multiple_measurements(measurements)
     )
 
     for (date, method, term_id), measurements_list in grouped_measurements.items():
+        needed_depths = _get_depths_from_measurements(measurements_list)
         # For a target depth
         for depth_upper, depth_lower in needed_depths:
             modelled_value = _harmonise_measurements(
@@ -144,13 +145,9 @@ def _run_harmonisation(measurements: list, needed_depths: list):
     return results
 
 
-def _run_gap_fill_depths(measurements_missing_depths: list) -> list:
-    return [dict(m, **{"depthUpper": 0, "depthLower": 30}) for m in measurements_missing_depths]
-
-
-def _get_needed_depths(site: dict) -> list:
+def _get_depths_from_measurements(measurements: list) -> list:
     needed_depths = list(STANDARD_DEPTHS)
-    for measurement in site.get("measurements", []):
+    for measurement in measurements:
         if (measurement.get("depthUpper"), measurement.get("depthLower")) in needed_depths:
             needed_depths.remove((int(measurement["depthUpper"]), int(measurement["depthLower"])))
 
@@ -164,34 +161,19 @@ def _should_run(site: dict, model_key: str):
         m.get('value', [])
     ])]
 
-    measurements_with_depths = [m for m in measurements if all([
-        "depthUpper" in m,
-        "depthLower" in m,
-        (int(m.get("depthUpper", 0)), int(m.get("depthLower", 0))) not in STANDARD_DEPTHS
-    ])]
+    measurements_with_depths = [m for m in measurements if "depthUpper" in m and "depthLower" in m]
     has_measurements_with_depths = len(measurements_with_depths) > 0
 
-    measurements_missing_depth_recommended = [m for m in measurements if all([
-        "depthUpper" not in m,
-        "depthLower" not in m,
-        not get_lookup_value(m.get("term", {}), LOOKUPS["measurement"][1], model=MODEL, model_key=model_key)
-    ])]
-
     logRequirements(site, model=MODEL, model_key=model_key,
-                    has_measurements_with_depths=has_measurements_with_depths,
-                    has_missing_depths=bool(measurements_missing_depth_recommended))
+                    has_measurements_with_depths=has_measurements_with_depths)
 
-    should_run = has_measurements_with_depths or bool(measurements_missing_depth_recommended)
-    for measurement in measurements_with_depths + measurements_missing_depth_recommended:
+    should_run = has_measurements_with_depths
+    for measurement in measurements_with_depths:
         term_id = measurement.get("term", {}).get("@id", {})
         logShouldRun(site, MODEL, term_id, should_run)
-    return should_run, measurements_with_depths, measurements_missing_depth_recommended
+    return should_run, measurements_with_depths
 
 
 def run(site: dict):
-    should_run, measurements_with_depths, measurements_missing_depth = _should_run(site=site, model_key=MODEL_KEY)
-    needed_depths = _get_needed_depths(site)
-    return non_empty_list(flatten(
-        _run_harmonisation(measurements=measurements_with_depths, needed_depths=needed_depths)
-        + _run_gap_fill_depths(measurements_missing_depths=measurements_missing_depth)
-    )) if should_run else []
+    should_run, measurements_with_depths = _should_run(site=site, model_key=MODEL_KEY)
+    return non_empty_list(flatten(_run_harmonisation(measurements=measurements_with_depths))) if should_run else []

hestia_earth/models/utils/aquacultureManagement.py

@@ -1,4 +1,4 @@
-from .site import WATER_TYPES
+from .site import WATER_TYPES, valid_site_type as site_valid_site_type
 
 
-def valid_site_type(cycle: dict): return cycle.get('site', {}).get('siteType') in WATER_TYPES
+def valid_site_type(cycle: dict): return site_valid_site_type(cycle.get('site', {}), WATER_TYPES)

hestia_earth/models/utils/crop.py

@@ -1,8 +1,9 @@
-from hestia_earth.schema import TermTermType
+from hestia_earth.schema import TermTermType, SiteSiteType
 from hestia_earth.utils.model import find_primary_product
 from hestia_earth.utils.tools import safe_parse_float
 
 from .term import get_lookup_value
+from .site import valid_site_type as site_valid_site_type
 
 FAO_LOOKUP_COLUMN = 'cropGroupingFAO'
 FAOSTAT_AREA_LOOKUP_COLUMN = 'cropGroupingFaostatArea'
@@ -34,3 +35,25 @@ def get_N2ON_fertiliser_coeff_from_primary_product(model: str, log_id: str, cycl
 
 def is_plantation(model: str, log_id: str, term_id: str):
     return get_crop_lookup_value(model, log_id, term_id, 'isPlantation')
+
+
+def valid_site_type(cycle: dict, include_permanent_pasture=False):
+    """
+    Check if the `site.siteType` of the cycle is `cropland`.
+
+    Parameters
+    ----------
+    cycle : dict
+        The `Cycle`.
+    include_permanent_pasture : bool
+        If set to `True`, `permanent pasture` is also allowed. Defaults to `False`.
+
+    Returns
+    -------
+    bool
+        `True` if `siteType` matches the allowed values, `False` otherwise.
+    """
+    site_types = [SiteSiteType.CROPLAND.value] + (
+        [SiteSiteType.PERMANENT_PASTURE.value] if include_permanent_pasture else []
+    )
+    return site_valid_site_type(cycle.get('site', {}), site_types)

hestia_earth/models/utils/cycle.py

@@ -9,7 +9,6 @@ from .property import get_node_property
 from .completeness import _is_term_type_complete
 from .blank_node import get_N_total, get_P2O5_total
 from .measurement import most_relevant_measurement_value
-from .site import valid_site_type as site_valid_site_type
 from .crop import is_plantation
 from .currency import DEFAULT_CURRENCY
 from .inorganicFertiliser import get_cycle_inputs as get_inorganicFertiliser_inputs
@@ -330,28 +329,6 @@ def land_occupation_per_kg(model: str, term_id: str, cycle: dict, site: dict, pr
     )
 
 
-def valid_site_type(cycle: dict, include_permanent_pasture=False):
-    """
-    Check if the `site.siteType` of the cycle is `cropland`.
-
-    Parameters
-    ----------
-    cycle : dict
-        The `Cycle`.
-    include_permanent_pasture : bool
-        If set to `True`, `permanent pasture` is also allowed. Defaults to `False`.
-
-    Returns
-    -------
-    bool
-        `True` if `siteType` matches the allowed values, `False` otherwise.
-    """
-    site_types = [SiteSiteType.CROPLAND.value] + (
-        [SiteSiteType.PERMANENT_PASTURE.value] if include_permanent_pasture else []
-    )
-    return site_valid_site_type(cycle.get('site', {}), site_types)
-
-
 def is_organic(cycle: dict):
     """
     Check if the `Cycle` is organic, i.e. if it contains an organic standard label `Practice`.

hestia_earth/models/utils/lookup.py

@@ -1,10 +1,10 @@
+from hestia_earth.schema import SchemaType
 from hestia_earth.utils.lookup import (
     download_lookup, get_table_value, column_name, extract_grouped_data, _get_single_table_value
 )
 from hestia_earth.utils.tools import list_sum, safe_parse_float, non_empty_list
 
 from ..log import debugValues
-from .site import is_site
 
 
 def _node_value(node):
@@ -73,6 +73,9 @@ def _aware_factor_value(model: str, term_id: str, lookup_name: str, aware_id: st
 _ALLOW_ALL = 'all'
 
 
+def _is_site(site: dict): return site.get('@type', site.get('type')) == SchemaType.SITE.value
+
+
 def _model_lookup_values(model: str, term: dict, restriction: str):
     lookup = download_lookup(f"{term.get('termType')}-model-{restriction}.csv")
     values = get_table_value(lookup, 'termid', term.get('@id'), column_name(model))
@@ -80,7 +83,7 @@ def _model_lookup_values(model: str, term: dict, restriction: str):
 
 
 def is_model_siteType_allowed(model: str, term: dict, data: dict):
-    site = data if is_site(data) else data.get('site', data.get('cycle', {}).get('site')) or {}
+    site = data if _is_site(data) else data.get('site', data.get('cycle', {}).get('site')) or {}
     site_type = site.get('siteType')
     allowed_values = _model_lookup_values(model, term, 'siteTypesAllowed')
     return True if _ALLOW_ALL in allowed_values or not site_type else site_type in allowed_values
@@ -93,7 +96,7 @@ def _lookup_values(term: dict, column: str):
 
 
 def is_siteType_allowed(data: dict, term: dict):
-    site = data if is_site(data) else data.get('site', data.get('cycle', {}).get('site')) or {}
+    site = data if _is_site(data) else data.get('site', data.get('cycle', {}).get('site')) or {}
     site_type = site.get('siteType')
     allowed_values = _lookup_values(term, 'siteTypesAllowed')
     return True if _ALLOW_ALL in allowed_values or not site_type else site_type in allowed_values

hestia_earth/models/utils/site.py

@@ -1,7 +1,7 @@
 from hestia_earth.schema import SchemaType, SiteSiteType, TermTermType
 from hestia_earth.utils.api import find_related
 from hestia_earth.utils.lookup import download_lookup, get_table_value, column_name
-from hestia_earth.utils.tools import non_empty_list, safe_parse_date, flatten
+from hestia_earth.utils.tools import non_empty_list, flatten, safe_parse_date
 
 from hestia_earth.models.log import debugMissingLookup
 from . import cached_value, _load_calculated_node
@@ -41,10 +41,32 @@ def region_level_1_id(term_id: str):
     )
 
 
-def is_site(site: dict): return site.get('@type', site.get('type')) == SchemaType.SITE.value
+def _cycle_year(cycle: dict, key: str):
+    date = safe_parse_date(cycle.get(key))
+    return date.year if date else None
+
+
+def years_from_cycles(cycles: list):
+    """
+    Get the list of years available for all cycles.
 
+    Parameters
+    ----------
+    cycles : list
+        List of Cycle as dict.
 
-def related_cycles(site_id: str):
+    Returns
+    -------
+    list[int]
+        List of years available.
+    """
+    return sorted(non_empty_list(set(flatten([
+        _cycle_year(cycle, 'startDate'),
+        _cycle_year(cycle, 'endDate')
+    ] for cycle in cycles))))
+
+
+def related_cycles(site: dict):
     """
     Get the list of `Cycle` related to the `Site`.
     Gets the `recalculated` data if available, else `original`.
@@ -59,22 +81,13 @@ 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 []))
-
-
-def _cycle_year(cycle: dict, key: str):
-    date = safe_parse_date(cycle.get(key))
-    return date.year if date else None
+    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 related_years(site: dict):
-    return cached_value(site, CACHE_YEARS_KEY) or (
-        sorted(non_empty_list(set(flatten([
-            _cycle_year(cycle, 'startDate'),
-            _cycle_year(cycle, 'endDate')
-        ] for cycle in related_cycles(site.get('@id'))))))
-    )
+    return cached_value(site, CACHE_YEARS_KEY) or years_from_cycles(related_cycles(site))
 
 
 def related_months(site: dict):

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.61.5'
+VERSION = '0.61.7'

{hestia_earth_models-0.61.5.dist-info → hestia_earth_models-0.61.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.61.5
+Version: 0.61.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
@@ -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.5.dist-info → hestia_earth_models-0.61.7.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=B-nNMbNCza5Xs1ctuDa5VlUAhx8D4prlU9I-wHx7Hcg,19
+hestia_earth/models/version.py,sha256=6Nws4L3uBOwihJSLvy9rIuRjo77dHISAduPpMkcqB_Y,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
@@ -79,7 +80,7 @@ hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioEnergy.py,sha25
 hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioFedWeight.py,sha256=7Dss1AIbG7GimQ3-Ecv2wsx1PrblZhHFYhMHWoyvPc4,2140
 hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioNitrogen.py,sha256=Mgur-o_ki1deMukBS5-ngeqdCIYVBE36kOiY-jB42EY,2581
 hestia_earth/models/cycle/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hestia_earth/models/cycle/input/hestiaAggregatedData.py,sha256=X3Tnr6eKXrjFOgBEIyvLjBReHoLAzxeU50j31EXYJXc,5036
+hestia_earth/models/cycle/input/hestiaAggregatedData.py,sha256=7WhSOTUKq9A6mrDwOu5gMOHtkhK0oby8n-DAO4LaWLs,5035
 hestia_earth/models/cycle/input/properties.py,sha256=r5EF18b_KW8evmdlev0mLQyqwBVgSicKEyilGaBRF6I,3017
 hestia_earth/models/cycle/input/value.py,sha256=kolH9Fc5GIn9OVH2DgHEaW8ksS4xisy0LerS3WkKK9E,1550
 hestia_earth/models/cycle/post_checks/__init__.py,sha256=j1d2dVgWbngIemn9ePf7jS-FMdg_MHomFCmaBtm9we4,304
@@ -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=B_ATXOyeP_zVhQRktqJP5BZfLFCzE09o9XqDitkggG8,2086
-hestia_earth/models/mocking/search-results.json,sha256=kD4tqX17b_Nijn8P4aPLe6E8Otipufy2XV-zLqEyhd0,41184
+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=-avKhbyd4WJc1by-WLUYhAjV_adov3NNKLkDYKHa9oY,43544
 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
@@ -443,8 +444,8 @@ hestia_earth/models/recipe2016Individualist/terrestrialEcotoxicityPotential14Dcb
 hestia_earth/models/schererPfister2015/__init__.py,sha256=_6FJKfWeAbbS3jFzQ8gEVzoX1LZdPWUTLrow6Hz90U0,419
 hestia_earth/models/schererPfister2015/nErosionSoilFlux.py,sha256=0l2AByDtq8Ci-36duTnwFvjeelnQ-_TOaeah5A2Yv8U,4924
 hestia_earth/models/schererPfister2015/pErosionSoilFlux.py,sha256=aWvcphQU4JMGiISXjPLqnakTObFn0VOn1T9z8e4xds0,5029
-hestia_earth/models/schererPfister2015/pToDrainageWaterSoilFlux.py,sha256=P-rlpEyfm7JVhStYLDZEe4m7Rn3b-5qRhQCiZqJkoSg,2310
-hestia_earth/models/schererPfister2015/pToGroundwaterSoilFlux.py,sha256=8krSt0i8gZBqv4pd82rKcJpVSJM-BPT4KQ-s60GnvaM,1972
+hestia_earth/models/schererPfister2015/pToDrainageWaterSoilFlux.py,sha256=iQs5lLLgGr1thOQ0ZnTLJDJjX7RBwPdu--8p81BZ988,2310
+hestia_earth/models/schererPfister2015/pToGroundwaterSoilFlux.py,sha256=tH-jyd8PFGvEVCO9u4coyVhghYcZyPgbPWQXQsTmDMg,1972
 hestia_earth/models/schererPfister2015/pToSurfaceWaterSoilFlux.py,sha256=evd2jmFZ9lq-uwXiBTgP5wJ-KTjNBVztjSp8eW9-8qg,2947
 hestia_earth/models/schererPfister2015/utils.py,sha256=lb2s_RL8Y3i6DRitpsd8Ri3HSyT442MmUHsBPqXb13U,3150
 hestia_earth/models/schmidt2007/__init__.py,sha256=xheSN6LOGXpWx7Hnv83onhe60Xk1_jk1PJg1nH_aZOQ,412
@@ -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
@@ -472,7 +473,7 @@ hestia_earth/models/site/precipitationMonthly.py,sha256=yGUbiUCu1Prp3qVHuZodGrcf
 hestia_earth/models/site/rainfallAnnual.py,sha256=Ix_B8Ny7IIRkJ_3lUvoHOjPgqCyR9I0U3_ADUUtMqsY,2003
 hestia_earth/models/site/rainfallMonthly.py,sha256=2Uo8F-YxnTK0_txlHmiAyVp1bGfWD4bneRKyg4tdQkI,1881
 hestia_earth/models/site/salineWater.py,sha256=HO31JcUBw5WQYGu9zHNqbARasBubNFgJ7OxSVrK3D2o,1255
-hestia_earth/models/site/soilMeasurement.py,sha256=q5CJ4caCqH8pSbQxen0IqTjrFyMRLrrCU2M2BMUgzTE,7851
+hestia_earth/models/site/soilMeasurement.py,sha256=-yWmvl4vZYguVDd2bKdnGB_P4s1XZO_n9u4_aQ6xPLQ,6953
 hestia_earth/models/site/temperatureAnnual.py,sha256=Q3b1RH2_hpA0JWwOYA5nKgMGcXHjV8-akXT9vB0cbwc,2012
 hestia_earth/models/site/temperatureMonthly.py,sha256=yXwpFCGT2tUqvVBNedaPyBmN_KlzZqo5yv2TWem1pBk,1890
 hestia_earth/models/site/totalNitrogenPerKgSoil.py,sha256=8ERrTZpN_yCRUyFg_EYaX4abE9jLcyX3lx3MO4Bi6CE,1938
@@ -519,15 +520,15 @@ hestia_earth/models/usetoxV2/freshwaterEcotoxicityPotentialCtue.py,sha256=oYNwTh
 hestia_earth/models/utils/__init__.py,sha256=5FY8tpFa7QjwAIsMTt2-QLB5_0Gy5AkAKk_BsKjE1CY,4400
 hestia_earth/models/utils/aggregated.py,sha256=sz6usleZmo_tC_hIvmGgYsX8-H0dulXmmhHK4EkA5Kg,4946
 hestia_earth/models/utils/animalProduct.py,sha256=M5IunAKGY6oZv3j1Ascl34ywyeLWApqOIlBzbtlA2FE,721
-hestia_earth/models/utils/aquacultureManagement.py,sha256=3uSTSMDNNPa26NTJGZCYwByv3QZVyxj6bh2aFCoBzHk,126
+hestia_earth/models/utils/aquacultureManagement.py,sha256=dxrbC1Xf140cohxTbSw6TxLAnAASWTdNZwBBam4yQnw,171
 hestia_earth/models/utils/blank_node.py,sha256=VcWvWRG4hlurgQG8PzklIa7SiZnuR6fnhC_TpE_9wuM,41977
 hestia_earth/models/utils/completeness.py,sha256=2-GusD9UycobDZq8y5jar0ZcOjyqnSbzPRT_5XMc4YA,1259
 hestia_earth/models/utils/constant.py,sha256=5H7odhRwU_LmUhYwf8c1LsdqXSYbLWkuknvtRDqUBTQ,3194
-hestia_earth/models/utils/crop.py,sha256=S8UycHpkgx_TznW3Q7pchEMlCQ623T_SqU6V5fBLBLc,1520
+hestia_earth/models/utils/crop.py,sha256=kG054fryqPSBpmzvJFBy_CLiOdjrt7RMk5uTItO5ADg,2246
 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
-hestia_earth/models/utils/cycle.py,sha256=FMUqDnklfirQwode4dtgk5NyApBCHzPNKn9Jyvt3Wg8,16639
+hestia_earth/models/utils/cycle.py,sha256=QgTmfds-SGEqGJNqEZ5A1iAxCZ54Ac0QPSmqECHPFeg,15927
 hestia_earth/models/utils/ecoClimateZone.py,sha256=NHFt-A9EiWXC6tUNIxkgOWUZOjj4I4uwJIP9ddDZegw,1112
 hestia_earth/models/utils/emission.py,sha256=AVp-ngrb4VHYT8BG1QA5EEb17edT3cLonsXV3cNm04U,1576
 hestia_earth/models/utils/excretaManagement.py,sha256=NuWPQjFZxMVt9sYgBjcqhGWCFk_OKb3sA9Ovcff3fRQ,428
@@ -539,7 +540,7 @@ hestia_earth/models/utils/indicator.py,sha256=fPq38ifd53xWbuOfoiVwiA0Nwa7jVPJLSA
 hestia_earth/models/utils/inorganicFertiliser.py,sha256=wTQKnr_fPse-G8aP3Dxrj8mzNSQgXvNL9auy_RWzY5Q,1894
 hestia_earth/models/utils/input.py,sha256=YycsAbSBfVDMu6PftDsisMFGnEp87wOj-3rrnHnOgzo,4927
 hestia_earth/models/utils/liveAnimal.py,sha256=GnajBPZw5d94raf80KtLloaOqlfqGAPwUtP9bRlGWeE,1754
-hestia_earth/models/utils/lookup.py,sha256=3tXnOaTGF91NhL9NsM0hQ05Vm_bQQG6aNgC5dEq0KdQ,6255
+hestia_earth/models/utils/lookup.py,sha256=9yAw8JILIeAmnAC0dL1Yi6xB4h9quzV3GJQGUKe8ers,6370
 hestia_earth/models/utils/measurement.py,sha256=c0Zkz0a5hWxpYJ83aWsWTeSsukfh-dzjKlCmuj1vCY4,8070
 hestia_earth/models/utils/organicFertiliser.py,sha256=2HY-a0EBzUw4DkEAXClLMXVCEZTKYf0BwFHBo7lQ5Tg,363
 hestia_earth/models/utils/pesticideAI.py,sha256=6f8b-dFm3qr-eY049_eOvj_iDk4XBam61csozdDAvyA,2361
@@ -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=yei3qk7edxb_boag9h8j713r06KGstjTBWdb1KjqMus,3602
 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
@@ -1007,7 +1008,7 @@ tests/models/site/test_precipitationMonthly.py,sha256=iccr-_ZrseM_OT3AKZbTNQhRFS
 tests/models/site/test_rainfallAnnual.py,sha256=4YYna66qjJptPJ_URvdcQuRC3dri9SB0xmWP8DFwslM,986
 tests/models/site/test_rainfallMonthly.py,sha256=A3gIe2Yxt9CLtLcAJNCQ0-8aRB49VdfKBLBy-7eDgJw,985
 tests/models/site/test_salineWater.py,sha256=by_goKU4q5Dr-ctqosfrjFPZsG9KeG26Y_xMWEHBhpA,985
-tests/models/site/test_soilMeasurement.py,sha256=IMSnjbyBYAqWicXGgpdNPpJ_OQw6QEJEmfHJxyF4iec,4887
+tests/models/site/test_soilMeasurement.py,sha256=AC4wyRlSdxcjRvq--CCmZd0Jxz2bfhFNmrg9SoWbKE0,4917
 tests/models/site/test_temperatureAnnual.py,sha256=nOJG9ZJ8NCMM8T47uxxBeloIYLFN6-xtvUBqJsqt8xk,992
 tests/models/site/test_temperatureMonthly.py,sha256=C2lv-lpYqH7VUGOlxNLE6d7k_dFS6NYe8BvMlrJorCw,991
 tests/models/site/test_totalNitrogenPerKgSoil.py,sha256=2ILrA0jQKGniiKwS5FF3ZLtudgUgjcMnzFtrHpJKPTc,1161
@@ -1050,9 +1051,9 @@ 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_blank_node.py,sha256=hgom8mJPWqylnf4AfLgVlbYgAHAEcH8DngOdFidFMcw,34343
+tests/models/utils/test_crop.py,sha256=ve_BqT2XuLTWAH-8YOnVY4nzMUSXYYXPB8S-5RtGlf4,463
 tests/models/utils/test_cropResidueManagement.py,sha256=RQt8lexeJzCyxZceIutgDpw7BpcqmjsUB0C0yZC2QpY,930
 tests/models/utils/test_currency.py,sha256=BPsojPsY9QW2aj8vgbjkPQXU8GU6wDwwtPZ3HdC4KTU,277
-tests/models/utils/test_cycle.py,sha256=evTHH73ftNVhv5vHlYE2973msKE4pSCd3D0GfX1ZPUA,465
 tests/models/utils/test_dataCompleteness.py,sha256=mW6rA7ddhtjZsLxwo5xDnvBdxmqTsivy4RTIU-2Lvk0,1713
 tests/models/utils/test_emission.py,sha256=lQczTe39tVHbk3BEanZGU_rq9HDST2uDReKof-SV37Y,829
 tests/models/utils/test_feedipedia.py,sha256=S7c1W4bJ5xWXPh42pPbl3R7lDX_iEeaEtFaPXgB7hgE,906
@@ -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.5.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
-hestia_earth_models-0.61.5.dist-info/METADATA,sha256=ysVUlLWO6-b7GOw12O3oUg5q9uC43Fy3GeMDawIAHEQ,3134
-hestia_earth_models-0.61.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-hestia_earth_models-0.61.5.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.61.5.dist-info/RECORD,,
+hestia_earth_models-0.61.7.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
+hestia_earth_models-0.61.7.dist-info/METADATA,sha256=iynJo-vSse0wSWslH4jZ2jN5MzzWntK8WyH9rDPDtiE,3350
+hestia_earth_models-0.61.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+hestia_earth_models-0.61.7.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.61.7.dist-info/RECORD,,

tests/models/site/test_soilMeasurement.py

@@ -160,7 +160,8 @@ def lookup_side_effect(*args, **kwargs):
         "simple-soilPh",
         "clayContent",
         "non-unique-measurements",
-        "arrays"
+        "arrays",
+        "standard-intervals"
     ]
 )
 @patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)

tests/models/utils/{test_cycle.py → test_crop.py}

@@ -1,8 +1,8 @@
 from hestia_earth.schema import SiteSiteType
 
-from hestia_earth.models.utils.cycle import valid_site_type
+from hestia_earth.models.utils.crop import valid_site_type
 
-class_path = 'hestia_earth.models.utils.cycle'
+class_path = 'hestia_earth.models.utils.crop'
 
 
 def test_valid_site_type():

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():