hestia-earth-models 0.59.3__py3-none-any.whl → 0.59.4__py3-none-any.whl

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/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/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/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/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/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/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/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/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/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/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/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/version.py

@@ -1 +1 @@
-VERSION = '0.59.3'
+VERSION = '0.59.4'

{hestia_earth_models-0.59.3.dist-info → hestia_earth_models-0.59.4.dist-info}/METADATA

@@ -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
@@ -18,7 +18,7 @@ Requires-Dist: CurrencyConverter ==0.16.8
 Requires-Dist: haversine >=2.7.0
 Requires-Dist: pydash
 Provides-Extra: spatial
-Requires-Dist: hestia-earth.earth-engine >=0.4.2 ; extra == 'spatial'
+Requires-Dist: hestia-earth.earth-engine >=0.4.7 ; extra == 'spatial'
 
 # Hestia Engine Models
 

{hestia_earth_models-0.59.3.dist-info → hestia_earth_models-0.59.4.dist-info}/RECORD

@@ -3,7 +3,7 @@ hestia_earth/models/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3
 hestia_earth/models/cache_sites.py,sha256=kp_3D09P-JdAn9vt7eU-KKTwd6BAXWKQL_0UQCDsH2s,4798
 hestia_earth/models/log.py,sha256=b63I3qyTtQs17xxbq8RI0Fv2lvZ1oDZ9k0njhxqiFFk,3459
 hestia_earth/models/requirements.py,sha256=znNZJAhwX2iYiKcAQXPftY7z_1MsNa0QxCXkXyHm_U0,17363
-hestia_earth/models/version.py,sha256=CbLC-bytMU-XpY8CM5H7SMZR8Ap_SRMUQNvt55nruo0,19
+hestia_earth/models/version.py,sha256=dVCy68c5An9e5A-5RC7W7zhxXlwTjzAHL1hfZj8TunQ,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
@@ -143,19 +143,22 @@ hestia_earth/models/geospatialDatabase/nutrientLossToAquaticEnvironment.py,sha25
 hestia_earth/models/geospatialDatabase/organicCarbonPerKgSoil.py,sha256=gt3-crrUN0HPtIKY7Hf9dUteCXkegSICVjO-jufDqas,2196
 hestia_earth/models/geospatialDatabase/potentialEvapotranspirationAnnual.py,sha256=UlCBvAD-6H-4sdryfPuX1YDlOsGPOI8T9y0q4O0Tau8,2544
 hestia_earth/models/geospatialDatabase/potentialEvapotranspirationLongTermAnnualMean.py,sha256=uGMCkSZk8gJ6gFHhaiV1PtQxuP0Gzt4m3is0vkQSiXU,2122
+hestia_earth/models/geospatialDatabase/potentialEvapotranspirationMonthly.py,sha256=vNO0cJLE8LGrFeEF2PPRCJWFbdOxHIDG7KH8BTe4cg4,3284
 hestia_earth/models/geospatialDatabase/precipitationAnnual.py,sha256=8_lMKVUPClnp7tetHrsoUY2ZGG2J7c-cXqJD8rznp0Q,2803
 hestia_earth/models/geospatialDatabase/precipitationLongTermAnnualMean.py,sha256=fS5knfil5f2QP8-gxFdXuoGTxXpzoJQZ9h4UjWIWjCA,2376
+hestia_earth/models/geospatialDatabase/precipitationMonthly.py,sha256=SbsldfQS4bePegyvJERc13zH8Xy3VVdLFuAKCx6JbME,3279
 hestia_earth/models/geospatialDatabase/region.py,sha256=rdywdsI4OglcO05tih0UQx0qbnm8BAn7mP-x74iV03c,1462
 hestia_earth/models/geospatialDatabase/sandContent.py,sha256=BZUn2z4BN1HgCGZ2Xsifca2CRTaZ4gdcaZ8A1_UoPQM,2704
 hestia_earth/models/geospatialDatabase/siltContent.py,sha256=0GnBZHjqS_Py4730s4LqzQ_GikBSxFyUGYG4dEiXiGs,2162
 hestia_earth/models/geospatialDatabase/slope.py,sha256=g1SpuYks60injv2w-CMjESNfu8KM1JsiYnRT9XZfSuY,1859
 hestia_earth/models/geospatialDatabase/slopeLength.py,sha256=6pGr1qR0EiiUKkeflpYut7eI6UsnXAzHDoHhAzXKFJk,1864
 hestia_earth/models/geospatialDatabase/soilPh.py,sha256=egvtnVPCL0El2J9oVLAFxl6HoZQsK-RrNobA0LMAtOY,2109
-hestia_earth/models/geospatialDatabase/temperatureAnnual.py,sha256=PJGFvudYZgYiwVoY2h8jkO8tJb-hoBgVTzupemPH1WQ,2814
+hestia_earth/models/geospatialDatabase/temperatureAnnual.py,sha256=0UwONdo7ClGQ6mxg44ghT_KGpDXXoJwesDHTv-yZAyk,2806
 hestia_earth/models/geospatialDatabase/temperatureLongTermAnnualMean.py,sha256=G276JqkPwZsMH7fexrjPCwVfWGYzS7mHLag2UsiqjIs,2261
+hestia_earth/models/geospatialDatabase/temperatureMonthly.py,sha256=LtYPegS3m8K8ZQ3HVBcca5Pr-ffIaAF62hwPGVe-vCo,3282
 hestia_earth/models/geospatialDatabase/totalNitrogenPerKgSoil.py,sha256=kjP3ue-tlzMQNx2hBM56_CBBRa8Pcosmd2BPgyiNVW4,2081
 hestia_earth/models/geospatialDatabase/totalPhosphorusPerKgSoil.py,sha256=5oasLMYgfnPwSse0D8EEe_pV57AMusac853BgVSUh5E,2070
-hestia_earth/models/geospatialDatabase/utils.py,sha256=zCwT9PfC38gTbmhMI-Pz-AM0JAEOYG2j_4s_pxonBlc,5876
+hestia_earth/models/geospatialDatabase/utils.py,sha256=VmzT7r-o_7wnABlnu49q-H6CAVJD5D9Zmz-Po2jkNe4,6081
 hestia_earth/models/geospatialDatabase/waterDepth.py,sha256=Xy2UxwAJrgdOkcw59NetEHMt5vgRYE6qg4fgXb1ptlU,1643
 hestia_earth/models/globalCropWaterModel2008/__init__.py,sha256=vQxexzFCl2Uv2RiIJfcppkRi9RgzBsJ68yhVDK4GvAU,425
 hestia_earth/models/globalCropWaterModel2008/rootingDepth.py,sha256=pajS-6UWxqIqnzW0IjkgNm-2Vl3bMor2UZOQtQQERuc,4096
@@ -245,7 +248,7 @@ hestia_earth/models/ipcc2019/no3ToGroundwaterInorganicFertiliser.py,sha256=wTvMB
 hestia_earth/models/ipcc2019/no3ToGroundwaterOrganicFertiliser.py,sha256=zOhp6NhYUuUNU_LMMwhZBP78YC2XRWRlGnajBUX2AN8,3095
 hestia_earth/models/ipcc2019/noxToAirInorganicFertiliser.py,sha256=D-UyzY55mOiIcXRzEtvPY-r1bDFgb9YqA08SmHsQeNA,4226
 hestia_earth/models/ipcc2019/noxToAirOrganicFertiliser.py,sha256=SVgVNp76bIv9oUjrZZuI6xYLo4Gw2DRU5tbp14gydOE,3911
-hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=9zWmAolHbFuvw2dxK4zZ8bW-1VDy7j44DYPmspJ0U-M,142577
+hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=QmSoBEmkrukZz4rwXDRoW_vDrfF5yopBrrFcf10BGio,141999
 hestia_earth/models/ipcc2019/pastureGrass.py,sha256=CpDEtdnbKd_8eaDLcflJ-dGik3t879HIoEIzuaHNmC0,23168
 hestia_earth/models/ipcc2019/utils.py,sha256=MSDMu15D9DnilFUgi4_6jYXC0FaKso3OODauGTMB6hs,6229
 hestia_earth/models/ipcc2021/__init__.py,sha256=VTgGFKhwMmk_nuI1RRq0in27fHYVPBonlXlPK00K8no,409
@@ -348,7 +351,7 @@ hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystems
 hestia_earth/models/linkedImpactAssessment/__init__.py,sha256=GZb-7uylALKNabUQaPjwekZHqBBeVCuL3wG2OzHeEo8,4565
 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=lqiVVybBoRY40119-ykY8FND8RfzK0WLCcBKlQzHE-8,39777
+hestia_earth/models/mocking/search-results.json,sha256=TUYddNUVoFlEpTTglJq5Xkg4nt0pZTSSadUzh6Ehrsw,39779
 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
@@ -441,7 +444,7 @@ hestia_earth/models/schmidt2007/utils.py,sha256=pQ76IBWMwi10Wa5PjsehtdnOMw-GVgDt
 hestia_earth/models/site/__init__.py,sha256=aVuLLhq0OQVm-_MZoq4JAKMidqexUWJBg_7mmojmDzc,405
 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/management.py,sha256=3jZuDfBVoSuG9xCXYVv3yVLmzxvQvejvZ23FZTkGeO8,5402
+hestia_earth/models/site/management.py,sha256=3xKv2DCsSSqjJCaOqB1JzhGgV-yywk6Pu1CqgILCh-A,5400
 hestia_earth/models/site/netPrimaryProduction.py,sha256=UIIQkYd911qVzrWjxBLrC37e-RARIVgDwLdARY9BuLw,1849
 hestia_earth/models/site/organicCarbonPerHa.py,sha256=gcmhZavc2EWvkroKkpFM5xXowPTgyXGh1XL6lgs3CX4,14303
 hestia_earth/models/site/organicCarbonPerKgSoil.py,sha256=t--wAshiAKS-JvEKhLFRadGvgSBv5NFZ68jdyms_wh4,1945
@@ -458,14 +461,14 @@ hestia_earth/models/site/soilMeasurement.py,sha256=pFh7-lpcBrvpOZ071XhadpuK_5Aoy
 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
-hestia_earth/models/site/utils.py,sha256=sX-U-Edomaw5hhXZVQJ5ugWJmk8-jpdgWts6xDaulRo,3303
+hestia_earth/models/site/utils.py,sha256=b5y6jNmTclC1Vs8FzwW22u3sVyFsvs5if3NJzvLZQLs,3176
 hestia_earth/models/site/waterDepth.py,sha256=uasApPdOzibZMiOyKNKr_ajAkzwUEEPm1j0FNEy49TY,1293
 hestia_earth/models/site/measurement/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/models/site/measurement/value.py,sha256=7IhUbIj7n5vB7yXoNxXsWbliEJjg1Ww3T5g_P2IyNCU,1661
 hestia_earth/models/site/post_checks/__init__.py,sha256=CkExxesk1GuG8NjrbKfix1iDuVUgU-9i1ccM_X7MZn4,284
 hestia_earth/models/site/post_checks/cache.py,sha256=_MZsNsclecUdHDT2MsYx4cEsVUXydIasddgZNA6SU4k,284
 hestia_earth/models/site/pre_checks/__init__.py,sha256=fjv6nU5fiL-CLyaa-cBpiLB-xujgPzeK7i7ZJuTOjCI,394
-hestia_earth/models/site/pre_checks/cache_geospatialDatabase.py,sha256=9JwbsKl8Pgmh4HuHZcRUnObBViWom0wZFGTOHN_Iaao,4078
+hestia_earth/models/site/pre_checks/cache_geospatialDatabase.py,sha256=XmAJAohSQQwbjqx-xTqB6LuU4lyz5lcG8njVuWFDGsU,4820
 hestia_earth/models/site/pre_checks/cache_sources.py,sha256=RzvSgHJTpVkAB3mEvRju_irDQmdJRK7GUdU6PhS2Gaw,904
 hestia_earth/models/site/pre_checks/cache_years.py,sha256=qGwTaHlWxnVT7iVxXVcpJ-oG6M-VH4ZpCDTdTixUHR4,883
 hestia_earth/models/stehfestBouwman2006/__init__.py,sha256=EhvD4NK6oEPevusLb1WdYV3GT_fCtQx4gvdMhK_dEIQ,420
@@ -498,7 +501,7 @@ hestia_earth/models/transformation/product/__init__.py,sha256=47DEQpj8HBSa-_TImW
 hestia_earth/models/transformation/product/excreta.py,sha256=Yj9wMF5if-zivb6qbN3vy1X51ZNYxvoyG9f4KPp3Y18,5700
 hestia_earth/models/usetoxV2/__init__.py,sha256=pK37V3H-KvYcvRKw4Mv8CWrB2N0LFLzmv0jKLdhGGqs,409
 hestia_earth/models/usetoxV2/freshwaterEcotoxicityPotentialCtue.py,sha256=oYNwThnMXjZymif5buyHiczFiOq_61jOdDMOAyy8vwQ,1018
-hestia_earth/models/utils/__init__.py,sha256=ooBopT4rd4fO_zx07tJ2-RTCaLpuQzoh-xIwAb5kCG4,3997
+hestia_earth/models/utils/__init__.py,sha256=-kuwCLmQOihU3n1RxqhojRa3Izd6PGOqA30k7qKl4vc,4275
 hestia_earth/models/utils/aggregated.py,sha256=sz6usleZmo_tC_hIvmGgYsX8-H0dulXmmhHK4EkA5Kg,4946
 hestia_earth/models/utils/animalProduct.py,sha256=JA-xGQiwsz-VPR_8UfI5hKa918bpQOWIok3--b_iVuM,681
 hestia_earth/models/utils/aquacultureManagement.py,sha256=3uSTSMDNNPa26NTJGZCYwByv3QZVyxj6bh2aFCoBzHk,126
@@ -527,7 +530,7 @@ hestia_earth/models/utils/practice.py,sha256=tNadOzsrNlCEt801B815XaruJXzZ5yPASam
 hestia_earth/models/utils/product.py,sha256=XwxrRwdREWc4N5cE0oLJbLdEucKFRKgKNDj-Kd8mZEQ,9837
 hestia_earth/models/utils/productivity.py,sha256=bUBVCZInGqHuHZvHDSYPQkjWXQxOtTjEk-1-f_BsFOo,594
 hestia_earth/models/utils/property.py,sha256=7UV9pxSX49RnUsbEqOeohzxyXXShao1XAnEYCCVKS0k,4923
-hestia_earth/models/utils/site.py,sha256=4i6rjvFIzOEcsNcF1B9I8OFdVR_iFDODcWgq2_XFXfc,3155
+hestia_earth/models/utils/site.py,sha256=OhSpyDqVwnIglBtoa3iUImzVr0Xj254oYR1wMiAiOHs,3176
 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=_DahtnHIS5wtyEXew3gpV52QjnsAWQZmyxnz4fu6mrI,17780
@@ -668,8 +671,10 @@ tests/models/geospatialDatabase/test_nutrientLossToAquaticEnvironment.py,sha256=
 tests/models/geospatialDatabase/test_organicCarbonPerKgSoil.py,sha256=WomlRdVl4f6ooJz2YctPf0YGiNs-9To6XFwTdtpm0SQ,1024
 tests/models/geospatialDatabase/test_potentialEvapotranspirationAnnual.py,sha256=6s4XDmKi__njKE_3tFMIAHr0a1w7X4t8uFRtihN_cm4,706
 tests/models/geospatialDatabase/test_potentialEvapotranspirationLongTermAnnualMean.py,sha256=KzIXuYeO5IZ8l4tKsIEaWcFeV_vSPDSpR6xiuvt_x4o,1003
+tests/models/geospatialDatabase/test_potentialEvapotranspirationMonthly.py,sha256=iu8HWAwl52fWDQJ_Nz5AZIAzbuMAjQfiQwxCHlciI-o,762
 tests/models/geospatialDatabase/test_precipitationAnnual.py,sha256=OhN7dbLZUG8ofvV7C56RKE_hGFXGtOuzXYz3EwFcQyg,744
 tests/models/geospatialDatabase/test_precipitationLongTermAnnualMean.py,sha256=wGGKXGemg3OEgDRRXy52oFf5p8jU57iraTgQMWDzusQ,1033
+tests/models/geospatialDatabase/test_precipitationMonthly.py,sha256=FTmnMXqwxuV_FwNzx8ZJsF5DCdaOdXPNV9UQ5gFKALs,748
 tests/models/geospatialDatabase/test_region.py,sha256=5q3q5TK7yzvoZI2gknf-TPNcmDqVkMo0D3-KY401J2k,882
 tests/models/geospatialDatabase/test_sandContent.py,sha256=hvV0Z51hKPLoSBNsjLJ18upGSt3FUHYbp2ofx7fBUvU,1177
 tests/models/geospatialDatabase/test_siltContent.py,sha256=udJDh2gidlkQVkotxWjCCsXRkbvAQxfpFAjEj5dtNJE,1124
@@ -678,6 +683,7 @@ tests/models/geospatialDatabase/test_slopeLength.py,sha256=56iCm-qn41NpeVHU9dKtA
 tests/models/geospatialDatabase/test_soilPh.py,sha256=Xi-SQ9HesSbvpaUd97n7KbDhxLVZLh07mQ-YtOR0FZU,1008
 tests/models/geospatialDatabase/test_temperatureAnnual.py,sha256=1hW0fHUlFOAWiPqYZm4ZbTGqjpOAmLb1mkucnAaTrIQ,742
 tests/models/geospatialDatabase/test_temperatureLongTermAnnualMean.py,sha256=Wrz9dbDvXM0OgBA3mXpzY0WZk-yqIp980JRKenxFqno,1031
+tests/models/geospatialDatabase/test_temperatureMonthly.py,sha256=eUaI1TZ-9sXFxWR2UoKBbca8dzW21zp5jGcfbooTt3M,746
 tests/models/geospatialDatabase/test_totalNitrogenPerKgSoil.py,sha256=_U3j5hqwYezG7e9v2WyO9ik2QJ9MqjM1QWPGkDChP7M,1024
 tests/models/geospatialDatabase/test_totalPhosphorusPerKgSoil.py,sha256=N5Vqf3YKlxHxWRe1PP3Kpbd30bhPOsB8eYr2IGS7quk,1026
 tests/models/geospatialDatabase/test_utils.py,sha256=2AOTtxs7KjPUVQXyErHsm7578523a5WNODVbbuxafAY,758
@@ -769,7 +775,7 @@ tests/models/ipcc2019/test_no3ToGroundwaterInorganicFertiliser.py,sha256=e7REnQ9
 tests/models/ipcc2019/test_no3ToGroundwaterOrganicFertiliser.py,sha256=e1ZViD12qB3bLdH3TJw3GbBP8iqMen-UJbcFkytb3VQ,1609
 tests/models/ipcc2019/test_noxToAirInorganicFertiliser.py,sha256=NZBSBJLM_j2PEpHRON2ysgKNF8x5sHfQVoAKQdGsfzk,1537
 tests/models/ipcc2019/test_noxToAirOrganicFertiliser.py,sha256=LR5pjV5vRbgSSQAw8kYRp_ij4CHInzgaDS6EggQuBiw,1104
-tests/models/ipcc2019/test_organicCarbonPerHa.py,sha256=g6EYKDiotsmod8zup2316g3auvy3cdGncaZ_2rO03Fg,21876
+tests/models/ipcc2019/test_organicCarbonPerHa.py,sha256=QTo8GL_jXNRH_r8fgt0K9Z_QEP9PjuRN6N0fyyebAj0,21346
 tests/models/ipcc2019/test_pastureGrass.py,sha256=pE4PWdR541v4xWDYihP7Dou8V1iqg5GwD5_rjGRzrds,2292
 tests/models/ipcc2021/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/ipcc2021/test_gwp100.py,sha256=JRklKMSg-OXopb9ZufGgl94deuMuJSsfNXRZDBtOZrE,1119
@@ -958,7 +964,7 @@ tests/models/schmidt2007/test_utils.py,sha256=rmtOV3xiFynjgx8lQNGsJqquG8HDxz3LDm
 tests/models/site/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/site/test_cationExchangeCapacityPerKgSoil.py,sha256=tNMhN998vcjQ15I-5mNnFh2d7mHzEBIBO6o1VSfQNUE,1075
 tests/models/site/test_flowingWater.py,sha256=t_rxvdlmUVDsFBoDF20_zDM-0iiLKkNCV7knO9l1T7o,1370
-tests/models/site/test_management.py,sha256=wwXuaIaGz5kh65PPXqp9WvvlKYSCNFZQoHJMU-mKJ-4,3779
+tests/models/site/test_management.py,sha256=dY_1QlIbnm-cQruD7DQT6fhWezC63X3B4yknq8d6RIQ,3774
 tests/models/site/test_netPrimaryProduction.py,sha256=JCxG0MODbKVvl3hOqmKzh4FjHYn3Xs9KsVod6LvKQII,1108
 tests/models/site/test_organicCarbonPerHa.py,sha256=6Qtc0Xmveir7MmNF4Ekv5YkV92TNp8GfDnURPVg05-4,3471
 tests/models/site/test_organicCarbonPerKgSoil.py,sha256=0M-NMg_T3UXzGT_VlKOKhSxg4cZ0_zhd3FRgY5Hpj6o,1087
@@ -1028,13 +1034,13 @@ tests/models/utils/test_measurement.py,sha256=Sl5dPZgu1Nrb7kliFiUpx-kEH81v7MdxiH
 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=cSKrkLeerymMLZAwCnbQce38NwgxXojQHAVm9DPUTpg,1181
+tests/models/utils/test_site.py,sha256=5nCW3onTk6GF_N-h4NYDrlSoxHhXY2GVMbjaDsicbSE,1187
 tests/models/utils/test_source.py,sha256=mv3vHZV5cjpoLA2I1109-YUkuzAiuhbRSnv_76_f0CA,631
 tests/models/utils/test_term.py,sha256=JJmzyHnhVGeQ7tG-T6DjE7CoIJPH0guH-y2kjGeZiJY,3756
 tests/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/webbEtAl2012AndSintermannEtAl2012/test_nh3ToAirOrganicFertiliser.py,sha256=qi2FNXS5Af2WDtm7nq_FsprH3BfCF0XxnE0XHmC4aIY,2244
-hestia_earth_models-0.59.3.dist-info/LICENSE,sha256=EFSZhfUdZCTsCIYdHzTGewMKfRfp7X9t1s2aaKxm8O0,1154
-hestia_earth_models-0.59.3.dist-info/METADATA,sha256=gyNoaOgImXrijST_O_SKIa6sDSY9vSDOJA0716l11uU,3134
-hestia_earth_models-0.59.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-hestia_earth_models-0.59.3.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.59.3.dist-info/RECORD,,
+hestia_earth_models-0.59.4.dist-info/LICENSE,sha256=EFSZhfUdZCTsCIYdHzTGewMKfRfp7X9t1s2aaKxm8O0,1154
+hestia_earth_models-0.59.4.dist-info/METADATA,sha256=GRtBR9ZzqxPAH4asis3_RYiwPtga8Kk-Rs5Yfefk318,3134
+hestia_earth_models-0.59.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+hestia_earth_models-0.59.4.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.59.4.dist-info/RECORD,,

tests/models/geospatialDatabase/test_potentialEvapotranspirationMonthly.py

@@ -0,0 +1,20 @@
+from unittest.mock import patch
+import json
+from tests.utils import fixtures_path, fake_new_measurement
+
+from hestia_earth.models.geospatialDatabase.potentialEvapotranspirationMonthly import MODEL, TERM_ID, run
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+
+
+@patch(f"{class_path}.get_source", return_value={})
+@patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)
+@patch(f"{class_path}.related_years", return_value=['2009'])
+@patch(f"{class_path}.download", return_value=None)
+def test_run(mock_download, *args):
+    with open(f"{fixtures_path}/{MODEL}/site.jsonld", encoding='utf-8') as f:
+        site = json.load(f)
+
+    run(site)
+    assert mock_download.call_count == 12

tests/models/geospatialDatabase/test_precipitationMonthly.py

@@ -0,0 +1,20 @@
+from unittest.mock import patch
+import json
+from tests.utils import fixtures_path, fake_new_measurement
+
+from hestia_earth.models.geospatialDatabase.precipitationMonthly import MODEL, TERM_ID, run
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+
+
+@patch(f"{class_path}.get_source", return_value={})
+@patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)
+@patch(f"{class_path}.related_years", return_value=['2009'])
+@patch(f"{class_path}.download", return_value=None)
+def test_run(mock_download, *args):
+    with open(f"{fixtures_path}/{MODEL}/site.jsonld", encoding='utf-8') as f:
+        site = json.load(f)
+
+    run(site)
+    assert mock_download.call_count == 12

tests/models/geospatialDatabase/test_temperatureMonthly.py

@@ -0,0 +1,20 @@
+from unittest.mock import patch
+import json
+from tests.utils import fixtures_path, fake_new_measurement
+
+from hestia_earth.models.geospatialDatabase.temperatureMonthly import MODEL, TERM_ID, run
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+
+
+@patch(f"{class_path}.get_source", return_value={})
+@patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)
+@patch(f"{class_path}.related_years", return_value=['2009'])
+@patch(f"{class_path}.download", return_value=None)
+def test_run(mock_download, *args):
+    with open(f"{fixtures_path}/{MODEL}/site.jsonld", encoding='utf-8') as f:
+        site = json.load(f)
+
+    run(site)
+    assert mock_download.call_count == 12

tests/models/ipcc2019/test_organicCarbonPerHa.py

@@ -16,7 +16,6 @@ from hestia_earth.models.ipcc2019.organicCarbonPerHa import (
     _calc_temperature_factor,
     _calc_tier_1_soc_stocks,
     _calc_water_factor,
-    _calculated_cycles,
     _check_cropland_low_category,
     _check_cropland_medium_category,
     _get_carbon_input_kwargs,
@@ -146,11 +145,11 @@ RUN_SUBFOLDERS = [
 @patch(f"{class_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
 @patch(f"{class_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
 @patch(f"{class_path}.get_upland_rice_crop_terms", return_value=UPLAND_RICE_CROP_TERM_IDS)
-@patch(f"{class_path}._calculated_cycles")
+@patch(f"{class_path}.related_cycles")
 @patch("hestia_earth.models.utils.property.find_term_property")
 def test_run(
     mock_find_term_property,
-    mock_calculated_cycles,
+    mock_related_cycles,
     _mock_get_upland_rice_crop_terms,
     _mock_get_upland_rice_land_cover_terms,
     _mock_get_residue_removed_or_burnt_terms,
@@ -169,7 +168,7 @@ def test_run(
             return json.load(f)
 
     mock_find_term_property.side_effect = find_term_property_side_effect
-    mock_calculated_cycles.return_value = load_cycles_from_file() if load_cycles else []
+    mock_related_cycles.return_value = load_cycles_from_file() if load_cycles else []
 
     with open(f"{folder}/site.jsonld", encoding='utf-8') as f:
         site = json.load(f)
@@ -189,7 +188,7 @@ def test_run(
 @patch(f"{class_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
 @patch(f"{class_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
 @patch(f"{class_path}.get_upland_rice_crop_terms", return_value=UPLAND_RICE_CROP_TERM_IDS)
-@patch(f"{class_path}._calculated_cycles", return_value=[])
+@patch(f"{class_path}.related_cycles", return_value=[])
 def test_run_no_data(*args):
     SITE = {}
     EXPECTED = []
@@ -234,22 +233,6 @@ def test_calc_water_factor():
     assert _calc_water_factor(1, 1) == _calc_water_factor(1000, 1000)
 
 
-@patch(f"{class_path}.find_related")
-@patch("hestia_earth.models.utils.download_hestia")
-def test_calculated_cycles(mock_download_hestia, mock_find_related):
-    CYCLES = [{"@id": "cycle"}]
-    EXPECTED = [{"@id": "cycle", "@type": "Cycle"}]
-
-    mock_download_hestia.side_effect = lambda node_id, node_type, **_: {
-        "@type": node_type.value,
-        "@id": node_id
-    }
-    mock_find_related.return_value = CYCLES
-
-    result = _calculated_cycles({})
-    assert EXPECTED == result
-
-
 # --- IPCC SOIL CATEGORY TESTS ---
 
 

tests/models/site/test_management.py

@@ -2,7 +2,7 @@ import json
 from unittest.mock import patch
 from hestia_earth.schema import TermTermType
 
-from hestia_earth.models.site.management import MODEL, MODEL_KEY, run, should_run
+from hestia_earth.models.site.management import MODEL, MODEL_KEY, run, _should_run
 from tests.utils import fixtures_path
 
 CLASS_PATH = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
@@ -18,13 +18,13 @@ TERM_BY_ID = {
 def test_should_run(mock_related_cycles, *args):
     # no cycles => do not run
     mock_related_cycles.return_value = []
-    _should_run, *args = should_run({})
-    assert _should_run is False
+    should_run, *args = _should_run({})
+    assert should_run is False
 
     # no products => do not run
     mock_related_cycles.return_value = [{"products": []}]
-    _should_run, *args = should_run({})
-    assert _should_run is False
+    should_run, *args = _should_run({})
+    assert should_run is False
 
     # with irrelevant termType => do not run
     mock_related_cycles.return_value = [
@@ -37,8 +37,8 @@ def test_should_run(mock_related_cycles, *args):
             "endDate": "2022"
         }
     ]
-    _should_run, *args = should_run({})
-    assert _should_run is False
+    should_run, *args = _should_run({})
+    assert should_run is False
 
     # products and practices but no relevant terms/termTypes => do not run
     mock_related_cycles.return_value = [
@@ -53,8 +53,8 @@ def test_should_run(mock_related_cycles, *args):
             ]
         }
     ]
-    _should_run, *args = should_run({})
-    assert _should_run is False
+    should_run, *args = _should_run({})
+    assert should_run is False
 
     # # practices with relevant termType => run
     mock_related_cycles.return_value = [
@@ -67,8 +67,8 @@ def test_should_run(mock_related_cycles, *args):
             "endDate": "2022"
         }
     ]
-    _should_run, *args = should_run({})
-    assert _should_run is True
+    should_run, *args = _should_run({})
+    assert should_run is True
 
     # with relevant product => run
     mock_related_cycles.return_value = [
@@ -89,8 +89,8 @@ def test_should_run(mock_related_cycles, *args):
             "endDate": "2022"
         }
     ]
-    _should_run, *args = should_run({})
-    assert _should_run is True
+    should_run, *args = _should_run({})
+    assert should_run is True
     assert args[0] == [{
         'term': TERM_BY_ID['genericCropPlant'],
         'value': 100,

tests/models/utils/test_site.py

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