hestia-earth-models 0.59.3__tar.gz → 0.59.4__tar.gz

{hestia-earth-models-0.59.3/hestia_earth_models.egg-info → hestia-earth-models-0.59.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.59.3
+Version: 0.59.4
 Summary: Hestia's set of modules for filling gaps in the activity data using external datasets (e.g. populating soil properties with a geospatial dataset using provided coordinates) and internal lookups (e.g. populating machinery use from fuel use). Includes rules for when gaps should be filled versus not (e.g. never gap fill yield, gap fill crop residue if yield provided etc.).
 Home-page: https://gitlab.com/hestia-earth/hestia-engine-models
 Author: Hestia Team

hestia-earth-models-0.59.4/hestia_earth/models/geospatialDatabase/potentialEvapotranspirationMonthly.py

@@ -0,0 +1,98 @@
+"""
+Must be associated with at least 1 `Cycle` that has an
+[endDate](https://hestia.earth/schema/Cycle#endDate) after `1979-01-01` and before `2020-06-01`.
+"""
+from hestia_earth.schema import MeasurementMethodClassification
+from hestia_earth.utils.tools import flatten, non_empty_list
+
+from hestia_earth.models.log import logRequirements, logShouldRun
+from hestia_earth.models.utils import first_day_of_month, last_day_of_month
+from hestia_earth.models.utils.measurement import _new_measurement
+from hestia_earth.models.utils.source import get_source
+from hestia_earth.models.utils.site import related_years
+from .utils import KELVIN_0, download, has_geospatial_data, should_download
+from . import MODEL
+
+REQUIREMENTS = {
+    "Site": {
+        "or": [
+            {"latitude": "", "longitude": ""},
+            {"boundary": {}},
+            {"region": {"@type": "Term", "termType": "region"}}
+        ]
+    }
+}
+RETURNS = {
+    "Measurement": [{
+        "value": "",
+        "dates": "",
+        "methodClassification": "geospatial dataset"
+    }]
+}
+TERM_ID = 'potentialEvapotranspirationMonthly'
+EE_PARAMS = {
+    'collection': 'IDAHO_EPSCOR/TERRACLIMATE',
+    'band_name': 'pet',
+    'ee_type': 'raster',
+    'reducer': 'mean',
+    'reducer_annual': 'sum'
+}
+BIBLIO_TITLE = 'ERA5: Fifth generation of ECMWF atmospheric reanalyses of the global climate'
+
+
+def _measurement(site: dict, value: list, dates: list):
+    measurement = _new_measurement(TERM_ID)
+    measurement['value'] = value
+    measurement['dates'] = dates
+    measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value
+    return measurement | get_source(site, BIBLIO_TITLE)
+
+
+def _to_celcius(kelvin_value: int): return kelvin_value - KELVIN_0 if kelvin_value else None
+
+
+def _download(site: dict,  start_date: str, end_date: str):
+    return download(
+        TERM_ID,
+        site,
+        {
+            **EE_PARAMS,
+            'start_date': start_date,
+            'end_date': end_date
+        }
+    )
+
+
+def _run(site: dict, years: list):
+    # fetch from first year to last
+    years = range(years[0], years[-1] + 1) if len(years) > 1 else years
+
+    dates = flatten([
+        [
+            (first_day_of_month(year, month).strftime('%Y-%m-%d'), last_day_of_month(year, month).strftime('%Y-%m-%d'))
+            for month in range(1, 13)
+        ] for year in years
+    ])
+    values = non_empty_list([
+        (_to_celcius(_download(site, start_date, end_date)), start_date[0:7]) for start_date, end_date in dates
+    ])
+    return _measurement(site, [v for v, d in values], [d for v, d in values])
+
+
+def run(site: dict):
+    contains_geospatial_data = has_geospatial_data(site)
+    below_max_area_size = should_download(TERM_ID, site)
+
+    years = related_years(site)
+    has_years = len(years) > 0
+
+    logRequirements(site, model=MODEL, term=TERM_ID,
+                    contains_geospatial_data=contains_geospatial_data,
+                    below_max_area_size=below_max_area_size,
+                    has_years=has_years,
+                    years=';'.join(map(lambda y: str(y), years)))
+
+    should_run = all([contains_geospatial_data, below_max_area_size, has_years])
+    logShouldRun(site, MODEL, TERM_ID, should_run)
+
+    return _run(site, years) if should_run else []

hestia-earth-models-0.59.4/hestia_earth/models/geospatialDatabase/precipitationMonthly.py

@@ -0,0 +1,98 @@
+"""
+Must be associated with at least 1 `Cycle` that has an
+[endDate](https://hestia.earth/schema/Cycle#endDate) after `1979-01-01` and before `2020-06-01`.
+"""
+from hestia_earth.schema import MeasurementMethodClassification
+from hestia_earth.utils.tools import flatten, non_empty_list
+
+from hestia_earth.models.log import logRequirements, logShouldRun
+from hestia_earth.models.utils import first_day_of_month, last_day_of_month
+from hestia_earth.models.utils.measurement import _new_measurement
+from hestia_earth.models.utils.source import get_source
+from hestia_earth.models.utils.site import related_years
+from .utils import KELVIN_0, download, has_geospatial_data, should_download
+from . import MODEL
+
+REQUIREMENTS = {
+    "Site": {
+        "or": [
+            {"latitude": "", "longitude": ""},
+            {"boundary": {}},
+            {"region": {"@type": "Term", "termType": "region"}}
+        ]
+    }
+}
+RETURNS = {
+    "Measurement": [{
+        "value": "",
+        "dates": "",
+        "methodClassification": "geospatial dataset"
+    }]
+}
+TERM_ID = 'precipitationMonthly'
+EE_PARAMS = {
+    'collection': 'ECMWF/ERA5/MONTHLY',
+    'band_name': 'total_precipitation',
+    'ee_type': 'raster',
+    'reducer': 'mean',
+    'reducer_annual': 'sum'
+}
+BIBLIO_TITLE = 'ERA5: Fifth generation of ECMWF atmospheric reanalyses of the global climate'
+
+
+def _measurement(site: dict, value: list, dates: list):
+    measurement = _new_measurement(TERM_ID)
+    measurement['value'] = value
+    measurement['dates'] = dates
+    measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value
+    return measurement | get_source(site, BIBLIO_TITLE)
+
+
+def _to_celcius(kelvin_value: int): return kelvin_value - KELVIN_0 if kelvin_value else None
+
+
+def _download(site: dict,  start_date: str, end_date: str):
+    return download(
+        TERM_ID,
+        site,
+        {
+            **EE_PARAMS,
+            'start_date': start_date,
+            'end_date': end_date
+        }
+    )
+
+
+def _run(site: dict, years: list):
+    # fetch from first year to last
+    years = range(years[0], years[-1] + 1) if len(years) > 1 else years
+
+    dates = flatten([
+        [
+            (first_day_of_month(year, month).strftime('%Y-%m-%d'), last_day_of_month(year, month).strftime('%Y-%m-%d'))
+            for month in range(1, 13)
+        ] for year in years
+    ])
+    values = non_empty_list([
+        (_to_celcius(_download(site, start_date, end_date)), start_date[0:7]) for start_date, end_date in dates
+    ])
+    return _measurement(site, [v for v, d in values], [d for v, d in values])
+
+
+def run(site: dict):
+    contains_geospatial_data = has_geospatial_data(site)
+    below_max_area_size = should_download(TERM_ID, site)
+
+    years = related_years(site)
+    has_years = len(years) > 0
+
+    logRequirements(site, model=MODEL, term=TERM_ID,
+                    contains_geospatial_data=contains_geospatial_data,
+                    below_max_area_size=below_max_area_size,
+                    has_years=has_years,
+                    years=';'.join(map(lambda y: str(y), years)))
+
+    should_run = all([contains_geospatial_data, below_max_area_size, has_years])
+    logShouldRun(site, MODEL, TERM_ID, should_run)
+
+    return _run(site, years) if should_run else []

{hestia-earth-models-0.59.3 → hestia-earth-models-0.59.4}/hestia_earth/models/geospatialDatabase/temperatureAnnual.py

@@ -9,7 +9,7 @@ from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.measurement import _new_measurement
 from hestia_earth.models.utils.source import get_source
 from hestia_earth.models.utils.site import related_years
-from .utils import download, has_geospatial_data, should_download
+from .utils import KELVIN_0, download, has_geospatial_data, should_download
 from . import MODEL
 
 REQUIREMENTS = {
@@ -38,7 +38,6 @@ EE_PARAMS = {
     'reducer_annual': 'mean'
 }
 BIBLIO_TITLE = 'ERA5: Fifth generation of ECMWF atmospheric reanalyses of the global climate'
-KELVIN_0 = 273.15
 
 
 def _measurement(site: dict, value: float, year: int):

hestia-earth-models-0.59.4/hestia_earth/models/geospatialDatabase/temperatureMonthly.py

@@ -0,0 +1,98 @@
+"""
+Must be associated with at least 1 `Cycle` that has an
+[endDate](https://hestia.earth/schema/Cycle#endDate) after `1979-01-01` and before `2020-06-01`.
+"""
+from hestia_earth.schema import MeasurementMethodClassification
+from hestia_earth.utils.tools import flatten, non_empty_list
+
+from hestia_earth.models.log import logRequirements, logShouldRun
+from hestia_earth.models.utils import first_day_of_month, last_day_of_month
+from hestia_earth.models.utils.measurement import _new_measurement
+from hestia_earth.models.utils.source import get_source
+from hestia_earth.models.utils.site import related_years
+from .utils import KELVIN_0, download, has_geospatial_data, should_download
+from . import MODEL
+
+REQUIREMENTS = {
+    "Site": {
+        "or": [
+            {"latitude": "", "longitude": ""},
+            {"boundary": {}},
+            {"region": {"@type": "Term", "termType": "region"}}
+        ]
+    }
+}
+RETURNS = {
+    "Measurement": [{
+        "value": "",
+        "dates": "",
+        "methodClassification": "geospatial dataset"
+    }]
+}
+TERM_ID = 'temperatureMonthly'
+EE_PARAMS = {
+    'collection': 'ECMWF/ERA5/MONTHLY',
+    'band_name': 'mean_2m_air_temperature',
+    'ee_type': 'raster',
+    'reducer': 'mean',
+    'reducer_annual': 'mean'
+}
+BIBLIO_TITLE = 'ERA5: Fifth generation of ECMWF atmospheric reanalyses of the global climate'
+
+
+def _measurement(site: dict, value: list, dates: list):
+    measurement = _new_measurement(TERM_ID)
+    measurement['value'] = value
+    measurement['dates'] = dates
+    measurement['methodClassification'] = MeasurementMethodClassification.GEOSPATIAL_DATASET.value
+    return measurement | get_source(site, BIBLIO_TITLE)
+
+
+def _to_celcius(kelvin_value: int): return kelvin_value - KELVIN_0 if kelvin_value else None
+
+
+def _download(site: dict,  start_date: str, end_date: str):
+    return download(
+        TERM_ID,
+        site,
+        {
+            **EE_PARAMS,
+            'start_date': start_date,
+            'end_date': end_date
+        }
+    )
+
+
+def _run(site: dict, years: list):
+    # fetch from first year to last
+    years = range(years[0], years[-1] + 1) if len(years) > 1 else years
+
+    dates = flatten([
+        [
+            (first_day_of_month(year, month).strftime('%Y-%m-%d'), last_day_of_month(year, month).strftime('%Y-%m-%d'))
+            for month in range(1, 13)
+        ] for year in years
+    ])
+    values = non_empty_list([
+        (_to_celcius(_download(site, start_date, end_date)), start_date[0:7]) for start_date, end_date in dates
+    ])
+    return _measurement(site, [v for v, d in values], [d for v, d in values])
+
+
+def run(site: dict):
+    contains_geospatial_data = has_geospatial_data(site)
+    below_max_area_size = should_download(TERM_ID, site)
+
+    years = related_years(site)
+    has_years = len(years) > 0
+
+    logRequirements(site, model=MODEL, term=TERM_ID,
+                    contains_geospatial_data=contains_geospatial_data,
+                    below_max_area_size=below_max_area_size,
+                    has_years=has_years,
+                    years=';'.join(map(lambda y: str(y), years)))
+
+    should_run = all([contains_geospatial_data, below_max_area_size, has_years])
+    logShouldRun(site, MODEL, TERM_ID, should_run)
+
+    return _run(site, years) if should_run else []

{hestia-earth-models-0.59.3 → hestia-earth-models-0.59.4}/hestia_earth/models/geospatialDatabase/utils.py

@@ -1,6 +1,7 @@
 import os
 from hestia_earth.schema import TermTermType
 from hestia_earth.utils.api import download_hestia
+from hestia_earth.utils.tools import non_empty_list
 
 from hestia_earth.models.log import debugValues, logErrorRun, logRequirements
 from hestia_earth.models.utils.site import cached_value, region_factor, region_level_1_id
@@ -19,6 +20,7 @@ GEOPANDAS_COLLECTION_NAME = {
     'gadm36_4': 'gadm/gadm36_4',
     'gadm36_5': 'gadm/gadm36_5'
 }
+KELVIN_0 = 273.15
 
 
 def use_geopandas(): return os.getenv('HEE_USE_GEOPANDAS', 'false') == 'true'
@@ -131,8 +133,13 @@ def _parse_run_query(term: str, query: dict):
 
 def _get_cached_data(term: str, site: dict, data: dict):
     cache = _cached_value(site, term)
+    cache_sub_key = '-'.join(non_empty_list([
+        data.get('year'),
+        data.get('start_date'),
+        data.get('end_date')
+    ]))
     # data can be grouped by year when required
-    value = cache.get(data.get('year')) if data.get('year') and cache is not None else cache
+    value = cache.get(cache_sub_key) if cache_sub_key and cache is not None else cache
     if value is not None:
         debugValues(site, model=MODEL, term=term, value_from_cache=value)
     return value

{hestia-earth-models-0.59.3 → hestia-earth-models-0.59.4}/hestia_earth/models/ipcc2019/organicCarbonPerHa.py

@@ -18,15 +18,12 @@ from typing import (
 from hestia_earth.schema import (
     CycleFunctionalUnit,
     MeasurementMethodClassification,
-    SchemaType,
     SiteSiteType,
     TermTermType,
 )
-from hestia_earth.utils.api import find_related
 from hestia_earth.utils.model import find_term_match, filter_list_term_type
 from hestia_earth.utils.tools import flatten, list_sum, non_empty_list
 
-from hestia_earth.models.utils import _load_calculated_node
 from hestia_earth.models.log import log_as_table, logRequirements, logShouldRun
 from hestia_earth.models.utils.blank_node import (
     cumulative_nodes_match,
@@ -54,7 +51,7 @@ from hestia_earth.models.utils.term import (
     get_upland_rice_crop_terms,
     get_upland_rice_land_cover_terms
 )
-
+from hestia_earth.models.utils.site import related_cycles
 from .utils import check_consecutive
 from . import MODEL
 
@@ -3554,7 +3551,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 = _calculated_cycles(site.get("@id"))
+    cycles = related_cycles(site.get("@id"))
 
     has_management = len(management_nodes) > 0
     has_measurements = len(measurement_nodes) > 0
@@ -3611,26 +3608,6 @@ def _should_run(site: dict) -> tuple[bool, dict]:
     return should_run_tier_1, should_run_tier_2, inventory, kwargs
 
 
-def _calculated_cycles(site_id: str):
-    """
-    Get the list of `Cycle`s related to the `Site`. Gets the `recalculated` data if available, else `original`.
-
-    Parameters
-    ----------
-    site_id : str
-        The `@id` of the `Site`.
-
-    Returns
-    -------
-    list[dict]
-        The related `Cycle`s as `dict`.
-    """
-    nodes = find_related(SchemaType.SITE, site_id, SchemaType.CYCLE)
-    return list(
-        map(lambda node: _load_calculated_node(node, SchemaType.CYCLE), nodes or [])
-    )
-
-
 def _should_run_tier_1(
     inventory: dict,
     *,

{hestia-earth-models-0.59.3 → hestia-earth-models-0.59.4}/hestia_earth/models/mocking/search-results.json

@@ -918,11 +918,11 @@
       },
       {
         "@type": "Term",
-        "@id": "residueIncorporated"
+        "@id": "residueIncorporatedMoreThan30DaysBeforeCultivation"
       },
       {
         "@type": "Term",
-        "@id": "residueIncorporatedMoreThan30DaysBeforeCultivation"
+        "@id": "residueIncorporated"
       },
       {
         "@type": "Term",
@@ -1299,7 +1299,7 @@
         "@type": "Term",
         "name": "Generic crop, seed",
         "@id": "genericCropSeed",
-        "_score": 23.9092
+        "_score": 23.910892
       }
     ]
   },
@@ -1405,11 +1405,11 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "waterMarine"
+        "@id": "waterDrainageCanal"
       },
       {
         "@type": "Term",
-        "@id": "waterDrainageCanal"
+        "@id": "waterMarine"
       },
       {
         "@type": "Term",
@@ -1740,15 +1740,15 @@
       },
       {
         "@type": "Term",
-        "@id": "fullInversionTillage"
+        "@id": "fullTillage"
       },
       {
         "@type": "Term",
-        "@id": "fullTillage"
+        "@id": "minimumTillage"
       },
       {
         "@type": "Term",
-        "@id": "minimumTillage"
+        "@id": "fullInversionTillage"
       },
       {
         "@type": "Term",

{hestia-earth-models-0.59.3 → hestia-earth-models-0.59.4}/hestia_earth/models/site/management.py

@@ -9,9 +9,9 @@ from hestia_earth.utils.model import filter_list_term_type, linked_node
 from hestia_earth.utils.tools import flatten
 
 from hestia_earth.models.log import logRequirements, logShouldRun, log_blank_nodes_id
-from hestia_earth.models.utils.site import related_cycles
 from hestia_earth.models.utils.term import get_lookup_value
 from hestia_earth.models.utils.blank_node import get_node_value
+from hestia_earth.models.utils.site import related_cycles
 from . import MODEL
 
 REQUIREMENTS = {
@@ -96,7 +96,7 @@ def _get_items_with_relevant_term_type(cycles: List[dict], item_name: str, relev
     )
 
 
-def should_run(site: dict):
+def _should_run(site: dict):
     # Only get related cycles once.
     cycles = related_cycles(site.get("@id"))
 
@@ -158,11 +158,11 @@ def should_run(site: dict):
         practice_ids=log_blank_nodes_id(practices)
     )
 
-    _should_run = any(products_crop_forage + products_land_cover + practices)
+    should_run = any(products_crop_forage + products_land_cover + practices)
     logShouldRun(site, MODEL, None, should_run=_should_run, model_key=MODEL_KEY)
-    return _should_run, products_crop_forage + products_land_cover, practices
+    return should_run, products_crop_forage + products_land_cover, practices
 
 
 def run(site: dict):
-    _should_run, products, practices = should_run(site)
-    return list(map(management, products + practices)) if _should_run else []
+    should_run, products, practices = _should_run(site)
+    return list(map(management, products + practices)) if should_run else []

{hestia-earth-models-0.59.3 → hestia-earth-models-0.59.4}/hestia_earth/models/site/pre_checks/cache_geospatialDatabase.py

@@ -4,10 +4,10 @@ Pre Checks Cache Geospatial Database
 This model caches results from Geospatial Database.
 """
 from functools import reduce
-from hestia_earth.utils.tools import flatten
+from hestia_earth.utils.tools import flatten, non_empty_list
 
 from hestia_earth.models.log import debugValues
-from hestia_earth.models.utils import CACHE_KEY, cached_value
+from hestia_earth.models.utils import CACHE_KEY, cached_value, first_day_of_month, last_day_of_month
 from hestia_earth.models.utils.site import CACHE_YEARS_KEY
 from hestia_earth.models.geospatialDatabase.utils import (
     MAX_AREA_SIZE, CACHE_VALUE, CACHE_AREA_SIZE,
@@ -34,7 +34,12 @@ def cache_site_results(results: list, collections: list, area_size: int = None):
         collection = collections[index]
         name = collection.get('name')
         value = results[index]
-        data = (group.get(name, {}) | {collection.get('year'): value}) if 'year' in collection else value
+        cache_sub_key = '-'.join(non_empty_list([
+            collection.get('year'),
+            collection.get('start_date'),
+            collection.get('end_date')
+        ]))
+        data = (group.get(name, {}) | {cache_sub_key: value} if cache_sub_key else value)
         return group | {name: data}
 
     return reduce(_combine_result, range(0, len(results)), {}) | (
@@ -42,13 +47,28 @@ def cache_site_results(results: list, collections: list, area_size: int = None):
     )
 
 
+def _extend_collection_by_month(year: int):
+    return [{
+        'start_date': first_day_of_month(year, month).strftime('%Y-%m-%d'),
+        'end_date': last_day_of_month(year, month).strftime('%Y-%m-%d')
+    } for month in range(1, 13)]
+
+
 def _extend_collection(name: str, collection: dict, years: list = []):
     data = collection | {'name': name, 'collection': _collection_name(collection.get('collection'))}
+
+    year_params = [{'year': str(year)} for year in years]
+    # fetch from first year to last
+    month_years = range(years[0], years[-1] + 1) if len(years) > 1 else years
+    month_params = flatten(map(_extend_collection_by_month, month_years))
+
     return [
-        data | {
-            'year': str(year)
-        } for year in years
-    ] if 'reducer_annual' in collection and 'reducer_period' not in collection else [data]
+        (data | params) for params in year_params
+    ] if name.endswith('Annual') else [
+        (data | params) for params in month_params
+    ] if name.endswith('Monthly') else [
+        data
+    ]
 
 
 def _extend_collections(values: list, years: list = []):

{hestia-earth-models-0.59.3 → hestia-earth-models-0.59.4}/hestia_earth/models/site/utils.py

@@ -1,10 +1,9 @@
 from functools import reduce
-import datetime
 from hestia_earth.schema import TermTermType
 from hestia_earth.utils.tools import non_empty_list
 from hestia_earth.utils.date import DAY
 
-from hestia_earth.models.utils import _omit
+from hestia_earth.models.utils import _omit, first_day_of_month, last_day_of_month
 from hestia_earth.models.utils.measurement import _new_measurement, measurement_value, has_all_months
 
 
@@ -68,10 +67,7 @@ def _group_by_month(term_id: str, dates: list, values: list):
 
     def map_to_month(data: list, year: int, month: int):
         # make sure we got all the necessary days
-        first_day_of_month = datetime.date(year, month, 1)
-        last_day_of_month = datetime.date(year + int(month / 12), (month % 12) + 1, 1) - datetime.timedelta(days=1)
-
-        difference = last_day_of_month - first_day_of_month
+        difference = last_day_of_month(year, month) - first_day_of_month(year, month)
         days_in_month = round(difference.days + difference.seconds / DAY, 1) + 1
 
         return measurement_value({

{hestia-earth-models-0.59.3 → hestia-earth-models-0.59.4}/hestia_earth/models/utils/__init__.py

@@ -1,5 +1,6 @@
 from os.path import dirname, abspath
 import sys
+import datetime
 from functools import reduce
 import operator
 from typing import Any
@@ -126,3 +127,11 @@ def _get_by_key(x, y):
 
 
 def get_dict_key(value: dict, key: str): return reduce(lambda x, y: _get_by_key(x, y), key.split('.'), value)
+
+
+def first_day_of_month(year: int, month: int):
+    return datetime.date(int(year), int(month), 1)
+
+
+def last_day_of_month(year: int, month: int):
+    return datetime.date(int(year) + int(int(month) / 12), (int(month) % 12) + 1, 1) - datetime.timedelta(days=1)

{hestia-earth-models-0.59.3 → hestia-earth-models-0.59.4}/hestia_earth/models/utils/site.py

@@ -1,10 +1,10 @@
 from hestia_earth.schema import SchemaType, SiteSiteType, TermTermType
-from hestia_earth.utils.api import download_hestia, find_related
+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
 
 from hestia_earth.models.log import debugMissingLookup
-from . import cached_value
+from . import cached_value, _load_calculated_node
 
 CACHE_YEARS_KEY = 'years'
 WATER_TYPES = [
@@ -47,8 +47,7 @@ def is_site(site: dict): return site.get('@type', site.get('type')) == SchemaTyp
 def related_cycles(site_id: str):
     """
     Get the list of `Cycle` related to the `Site`.
-
-    In Hestia, a `Cycle` must have a link to a `Site`, therefore a `Site` can be related to many `Cycle`s.
+    Gets the `recalculated` data if available, else `original`.
 
     Parameters
     ----------
@@ -61,7 +60,7 @@ def related_cycles(site_id: str):
         The related `Cycle`s as `dict`.
     """
     nodes = find_related(SchemaType.SITE, site_id, SchemaType.CYCLE)
-    return non_empty_list(map(lambda node: download_hestia(node.get('@id'), SchemaType.CYCLE), nodes or []))
+    return non_empty_list(map(lambda node: _load_calculated_node(node, SchemaType.CYCLE), nodes or []))
 
 
 def _cycle_end_year(cycle: dict):
@@ -75,6 +74,10 @@ def related_years(site: dict):
     )
 
 
+def related_months(site: dict):
+    return cached_value(site)
+
+
 def valid_site_type(site: dict, site_types=[SiteSiteType.CROPLAND.value, SiteSiteType.PERMANENT_PASTURE.value]):
     """
     Check if the site `siteType` is allowed.

hestia-earth-models-0.59.4/hestia_earth/models/version.py

@@ -0,0 +1 @@
+VERSION = '0.59.4'

{hestia-earth-models-0.59.3 → hestia-earth-models-0.59.4/hestia_earth_models.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.59.3
+Version: 0.59.4
 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