hestia-earth-models 0.62.2__py3-none-any.whl → 0.62.4__py3-none-any.whl

hestia_earth/models/geospatialDatabase/utils.py

@@ -152,7 +152,7 @@ def _get_cached_data(term: str, site: dict, data: dict):
 
 def download(term: str, site: dict, data: dict, only_coordinates=False) -> dict:
     """
-    Downloads data from Hestia Earth Engine API.
+    Downloads data from HESTIA Earth Engine API.
 
     Returns
     -------

hestia_earth/models/ipcc2019/aboveGroundCropResidueTotal.py

@@ -2,7 +2,7 @@ from hestia_earth.schema import TermTermType
 from hestia_earth.utils.model import filter_list_term_type
 from hestia_earth.utils.tools import list_sum
 
-from hestia_earth.models.log import debugValues, logRequirements, logShouldRun
+from hestia_earth.models.log import debugValues, logRequirements, logShouldRun, log_as_table
 from hestia_earth.models.utils.completeness import _is_term_type_incomplete
 from hestia_earth.models.utils.product import _new_product
 from hestia_earth.models.utils.property import get_node_property
@@ -46,16 +46,21 @@ def _product_value(product: dict):
     value = list_sum(product.get('value'))
     dm = get_node_property(product, PROPERTY_KEY).get('value', 0)
     yield_dm = get_yield_dm(TERM_ID, term) or 0
-    debugValues(product, model=MODEL, term=TERM_ID,
-                product=term_id,
-                value=value,
-                dryMatter=dm,
-                ratio_yield_dm=yield_dm)
-    return value * dm / 100 * yield_dm
+    total = value * dm / 100 * yield_dm
+    return {
+        'id': term_id,
+        'value': value,
+        'dryMatter': dm,
+        'RatioYieldDM': yield_dm,
+        'total': total
+    }
 
 
-def _run(products: list):
-    value = sum(map(_product_value, products))
+def _run(cycle: dict, products: list):
+    values = list(map(_product_value, products))
+    debugValues(cycle, model=MODEL, term=TERM_ID,
+                details=log_as_table(values))
+    value = sum([value.get('total', 0) for value in values])
     return [_product(value)]
 
 
@@ -85,4 +90,4 @@ def _should_run(cycle: dict):
 
 def run(cycle: dict):
     should_run, products = _should_run(cycle)
-    return _run(products) if should_run else []
+    return _run(cycle, products) if should_run else []

hestia_earth/models/ipcc2019/belowGroundCropResidue.py

@@ -2,7 +2,7 @@ from hestia_earth.schema import TermTermType
 from hestia_earth.utils.model import filter_list_term_type
 from hestia_earth.utils.tools import list_sum, safe_parse_float
 
-from hestia_earth.models.log import debugValues, logRequirements, logShouldRun
+from hestia_earth.models.log import debugValues, logRequirements, logShouldRun, log_as_table
 from hestia_earth.models.utils.completeness import _is_term_type_incomplete
 from hestia_earth.models.utils.product import _new_product
 from hestia_earth.models.utils.property import get_node_property
@@ -52,17 +52,22 @@ def _product_value(product: dict):
     dm = get_node_property(product, PROPERTY_KEY).get('value', 0)
     yield_dm = get_yield_dm(TERM_ID, term) or 0
     ratio = _get_lookup_value(term, 'IPCC_2019_Ratio_BGRes_AGRes') or 0
-    debugValues(product, model=MODEL, term=TERM_ID,
-                product=term_id,
-                value=value,
-                dryMatter=dm,
-                ratio_yield_dm=yield_dm,
-                ratio=ratio)
-    return value * dm / 100 * yield_dm * ratio
+    total = value * dm / 100 * yield_dm * ratio
+    return {
+        'id': term_id,
+        'value': value,
+        'dryMatter': dm,
+        'RatioYieldDM': yield_dm,
+        'RatioAboveGroundToBelowGround': ratio,
+        'total': total
+    }
 
 
-def _run(products: list):
-    value = sum(map(_product_value, products))
+def _run(cycle: dict, products: list):
+    values = list(map(_product_value, products))
+    debugValues(cycle, model=MODEL, term=TERM_ID,
+                details=log_as_table(values))
+    value = sum([value.get('total', 0) for value in values])
     return [_product(value)]
 
 
@@ -92,4 +97,4 @@ def _should_run(cycle: dict):
 
 def run(cycle: dict):
     should_run, products = _should_run(cycle)
-    return _run(products) if should_run else []
+    return _run(cycle, products) if should_run else []

hestia_earth/models/ipcc2019/carbonContent.py

@@ -114,7 +114,7 @@ def _multiple_product_values(crop: dict, residue_id: str):
     # LIGNIN_CONTENT_AG_CROP_RESIDUE or LIGNIN_CONTENT_BG_CROP_RESIDUE
     c_content = _get_lookup_value(term, _crop_residue_lookup_col(residue_id))
     ratio = _get_lookup_value(term, 'IPCC_2019_Ratio_BGRes_AGRes') if residue_id == 'belowGroundCropResidue' else 1
-    debugValues(crop, model=MODEL, term=residue_id,
+    debugValues(crop, model=MODEL, term=residue_id, property=TERM_ID,
                 crop=term_id,
                 dryMatter=dm,
                 ratio_yield_dm=yield_dm,

hestia_earth/models/ipcc2019/croppingDuration.py

@@ -80,11 +80,11 @@ def _should_run(cycle: dict):
     logRequirements(cycle, model=MODEL, term=TERM_ID,
                     country=country,
                     has_flooded_rice=flooded_rice,
-                    cycleDuration=cycleDuration,
+                    cycleDuration=cycle.get('cycleDuration'),
                     croppingDuration=croppingDuration,
                     croppingDuration_below_cycleDuration=croppingDuration_below_cycleDuration)
 
-    should_run = all([country, cycleDuration, flooded_rice])
+    should_run = all([country, cycleDuration > 0, croppingDuration_below_cycleDuration, flooded_rice])
     logShouldRun(cycle, MODEL, TERM_ID, should_run)
     return should_run, country
 

hestia_earth/models/ipcc2019/ligninContent.py

@@ -114,7 +114,7 @@ def _multiple_product_values(crop: dict, residue_id: str):
     # LIGNIN_CONTENT_AG_CROP_RESIDUE or LIGNIN_CONTENT_BG_CROP_RESIDUE
     l_content = _get_lookup_value(term, _crop_residue_lookup_col(residue_id))
     ratio = _get_lookup_value(term, 'IPCC_2019_Ratio_BGRes_AGRes') if residue_id == 'belowGroundCropResidue' else 1
-    debugValues(crop, model=MODEL, term=residue_id,
+    debugValues(crop, model=MODEL, term=residue_id, property=TERM_ID,
                 crop=term_id,
                 dryMatter=dm,
                 ratio_yield_dm=yield_dm,

hestia_earth/models/ipcc2019/nitrogenContent.py

@@ -114,7 +114,7 @@ def _multiple_product_value(crop: dict, residue_id: str):
     # N_Content_AG_Residue or N_Content_BG_Residue
     n_content = _get_lookup_value(term, _crop_residue_lookup_col(residue_id))
     ratio = _get_lookup_value(term, 'IPCC_2019_Ratio_BGRes_AGRes') if residue_id == 'belowGroundCropResidue' else 1
-    debugValues(crop, model=MODEL, term=residue_id,
+    debugValues(crop, model=MODEL, term=residue_id, property=TERM_ID,
                 crop=term_id,
                 dryMatter=dm,
                 ratio_yield_dm=yield_dm,

hestia_earth/models/ipcc2019/organicCarbonPerHa.py

@@ -8,7 +8,7 @@ Both tier methodologies are run as Monte Carlo simulations with 10000 iterations
 
 The requirements in this file are for the Tier 1 methodology only, as it has simpler requirements. The requirements for
 the Tier 2 methodology can be found in the
-[Hestia SOC wiki](https://gitlab.com/hestia-earth/hestia-engine-models/-/wikis/Soil-organic-carbon-modelling)
+[HESTIA SOC wiki](https://gitlab.com/hestia-earth/hestia-engine-models/-/wikis/Soil-organic-carbon-modelling)
 alongside data recommendations, examples and explanations for both tiers.
 """
 from functools import reduce
@@ -130,12 +130,12 @@ def run(site: dict) -> list[dict]:
     Parameters
     ----------
     site : dict
-        A Hestia `Site` node, see: https://www.hestia.earth/schema/Site.
+        A HESTIA `Site` node, see: https://www.hestia.earth/schema/Site.
 
     Returns
     -------
     list[dict]
-        A list of Hestia `Measurement` nodes containing the calculated SOC stocks and additional relevant data.
+        A list of HESTIA `Measurement` nodes containing the calculated SOC stocks and additional relevant data.
     """
     should_run, run_data = _should_run(site)
     _log_data(site, should_run, run_data)

hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1_utils.py

@@ -5,7 +5,7 @@ management changes.
 The model cannot not run on Sites with polar moist (ecoClimateZone 5) or polar dry (ecoClimateZone 6).
 
 More information on this model, including data requirements **and** recommendations, and examples can be found in the
-[Hestia SOC wiki](https://gitlab.com/hestia-earth/hestia-engine-models/-/wikis/Soil-organic-carbon-modelling).
+[HESTIA SOC wiki](https://gitlab.com/hestia-earth/hestia-engine-models/-/wikis/Soil-organic-carbon-modelling).
 
 Source: [IPCC 2019, Vol. 4, Chapter 2](https://www.ipcc-nggip.iges.or.jp/public/2019rf/vol4.html).
 """
@@ -92,7 +92,7 @@ def _measurement(
     descriptive_stats_dict: dict
 ) -> dict:
     """
-    Build a Hestia `Measurement` node to contain a value and descriptive statistics calculated by the models.
+    Build a HESTIA `Measurement` node to contain a value and descriptive statistics calculated by the models.
 
     The `descriptive_stats_dict` parameter should include the following keys and values from the
     [Measurement](https://www-staging.hestia.earth/schema/Measurement) schema:
@@ -117,7 +117,7 @@ def _measurement(
     Returns
     -------
     dict
-        A valid Hestia `Measurement` node, see: https://www.hestia.earth/schema/Measurement.
+        A valid HESTIA `Measurement` node, see: https://www.hestia.earth/schema/Measurement.
     """
     measurement = _new_measurement(_TERM_ID) | descriptive_stats_dict
     measurement["dates"] = [f"{year}-12-31" for year in timestamps]
@@ -640,7 +640,7 @@ def should_run(site: dict) -> tuple[bool, dict, dict]:
     Parameters
     ----------
     site : dict
-        A Hestia `Site` node, see: https://www.hestia.earth/schema/Site.
+        A HESTIA `Site` node, see: https://www.hestia.earth/schema/Site.
 
     Returns
     -------
@@ -694,7 +694,7 @@ def run(
 ) -> list[dict]:
     """
     Run the IPCC (2019) Tier 1 methodology for calculating SOC stocks (in kg C ha-1) for each year in the inventory
-    and wrap each of the calculated values in Hestia measurement nodes. To avoid any errors, the `inventory` parameter
+    and wrap each of the calculated values in HESTIA measurement nodes. To avoid any errors, the `inventory` parameter
     must be pre-validated by the `should_run` function.
 
     See [IPCC (2019) Vol. 4, Ch. 2](https://www.ipcc-nggip.iges.or.jp/public/2019rf/vol4.html) for more information.

hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2_utils.py

@@ -3,7 +3,7 @@ The IPCC Tier 2 methodology for estimating soil organic carbon stock changes in
 management changes.
 
 More information on this model, including data requirements **and** recommendations, and examples can be found in the
-[Hestia SOC wiki](https://gitlab.com/hestia-earth/hestia-engine-models/-/wikis/Soil-organic-carbon-modelling).
+[HESTIA SOC wiki](https://gitlab.com/hestia-earth/hestia-engine-models/-/wikis/Soil-organic-carbon-modelling).
 
 Source: [IPCC 2019, Vol. 4, Chapter 5](https://www.ipcc-nggip.iges.or.jp/public/2019rf/vol4.html).
 """
@@ -105,7 +105,7 @@ def _measurement(
     descriptive_stats_dict: dict
 ) -> dict:
     """
-    Build a Hestia `Measurement` node to contain a value and descriptive statistics calculated by the models.
+    Build a HESTIA `Measurement` node to contain a value and descriptive statistics calculated by the models.
 
     The `descriptive_stats_dict` parameter should include the following keys and values from the
     [Measurement](https://www-staging.hestia.earth/schema/Measurement) schema:
@@ -130,7 +130,7 @@ def _measurement(
     Returns
     -------
     dict
-        A valid Hestia `Measurement` node, see: https://www.hestia.earth/schema/Measurement.
+        A valid HESTIA `Measurement` node, see: https://www.hestia.earth/schema/Measurement.
     """
     measurement = _new_measurement(_TERM_ID) | descriptive_stats_dict
     measurement["dates"] = [f"{year}-12-31" for year in timestamps]
@@ -384,7 +384,7 @@ def should_run(site: dict) -> tuple[bool, dict, dict]:
     Parameters
     ----------
     site : dict
-        A Hestia `Site` node, see: https://www.hestia.earth/schema/Site.
+        A HESTIA `Site` node, see: https://www.hestia.earth/schema/Site.
 
     Returns
     -------
@@ -1318,12 +1318,12 @@ def _get_carbon_sources(cycle: dict) -> list[CarbonSource]:
     """
     Extract and format the carbon source data from a cycle's inputs and products.
 
-    Carbon sources can be either a Hestia `Product` node (e.g. crop residue) or `Input` node (e.g. organic amendment).
+    Carbon sources can be either a HESTIA `Product` node (e.g. crop residue) or `Input` node (e.g. organic amendment).
 
     Parameters
     ----------
     cycle : list[dict]
-        A Hestia `Cycle` node, see: https://www.hestia.earth/schema/Cycle.
+        A HESTIA `Cycle` node, see: https://www.hestia.earth/schema/Cycle.
 
     Returns
     -------
@@ -1346,7 +1346,7 @@ def _should_run_carbon_source_ag_residue(node: dict) -> bool:
     Parameters
     ----------
     node : dict
-        A Hestia [Input](https://www.hestia.earth/schema/Input) or [Product](https://www.hestia.earth/schema/Product)
+        A HESTIA [Input](https://www.hestia.earth/schema/Input) or [Product](https://www.hestia.earth/schema/Product)
         node.
 
     Returns
@@ -1368,7 +1368,7 @@ def _calc_carbon_source_ag_crop_residue(node: dict, cycle: dict) -> Union[Carbon
     Parameters
     ----------
     node : dict
-        A Hestia [Product](https://www.hestia.earth/schema/Product) node with `term.termType` == `landCover`.
+        A HESTIA [Product](https://www.hestia.earth/schema/Product) node with `term.termType` == `landCover`.
 
     Returns
     -------
@@ -1397,7 +1397,7 @@ def _should_run_carbon_source_cover_crop(node: dict) -> bool:
     Parameters
     ----------
     node : dict
-        A Hestia [Input](https://www.hestia.earth/schema/Input) or [Product](https://www.hestia.earth/schema/Product)
+        A HESTIA [Input](https://www.hestia.earth/schema/Input) or [Product](https://www.hestia.earth/schema/Product)
         node.
 
     Returns
@@ -1427,7 +1427,7 @@ def _calc_carbon_source_cover_crop(node: dict, *_) -> Union[CarbonSource, None]:
     Parameters
     ----------
     node : dict
-        A Hestia [Product](https://www.hestia.earth/schema/Product) node with `term.termType` == `landCover`.
+        A HESTIA [Product](https://www.hestia.earth/schema/Product) node with `term.termType` == `landCover`.
 
     Returns
     -------
@@ -1451,7 +1451,7 @@ def _should_run_carbon_source(node: dict) -> bool:
     Parameters
     ----------
     node : dict
-        A Hestia [Input](https://www.hestia.earth/schema/Input) or [Product](https://www.hestia.earth/schema/Product)
+        A HESTIA [Input](https://www.hestia.earth/schema/Input) or [Product](https://www.hestia.earth/schema/Product)
         node.
 
     Returns
@@ -1472,7 +1472,7 @@ def _calc_carbon_source(node: dict, *_) -> Union[CarbonSource, None]:
     Parameters
     ----------
     node : dict
-        A Hestia [Input](https://www.hestia.earth/schema/Input) or [Product](https://www.hestia.earth/schema/Product)
+        A HESTIA [Input](https://www.hestia.earth/schema/Input) or [Product](https://www.hestia.earth/schema/Product)
         node.
 
     Returns
@@ -1496,7 +1496,7 @@ def _retrieve_carbon_source_properties(node: dict) -> tuple[float, float, float]
     Parameters
     ----------
     node : dict
-        A Hestia [Input](https://www.hestia.earth/schema/Input) or [Product](https://www.hestia.earth/schema/Product)
+        A HESTIA [Input](https://www.hestia.earth/schema/Input) or [Product](https://www.hestia.earth/schema/Product)
         node.
 
     Returns
@@ -1619,12 +1619,12 @@ def _assign_tier_2_ipcc_tillage_management_category(
     default: IpccManagementCategory = IpccManagementCategory.OTHER
 ) -> IpccManagementCategory:
     """
-    Assigns a tillage `IpccManagementCategory` to a list of Hestia `Cycle`s.
+    Assigns a tillage `IpccManagementCategory` to a list of HESTIA `Cycle`s.
 
     Parameters
     ----------
     cycles : list[dict])
-        A list of Hestia `Cycle` nodes, see: https://www.hestia.earth/schema/Cycle.
+        A list of HESTIA `Cycle` nodes, see: https://www.hestia.earth/schema/Cycle.
 
     Returns
     -------
@@ -1668,7 +1668,7 @@ def _check_cycle_tillage_management_category(
     Parameters
     ----------
     cycle : dict
-        A Hestia `Cycle` node, see: https://www.hestia.earth/schema/Cycle.
+        A HESTIA `Cycle` node, see: https://www.hestia.earth/schema/Cycle.
     key : IpccManagementCategory
         The `IpccManagementCategory` to match.
 
@@ -1703,7 +1703,7 @@ def _check_zero_tillages(practices: list[dict]) -> bool:
     Parameters
     ----------
     practices : list[dict]
-        A list of Hestia `Practice` nodes, see: https://www.hestia.earth/schema/Practice.
+        A list of HESTIA `Practice` nodes, see: https://www.hestia.earth/schema/Practice.
 
     Returns
     -------

hestia_earth/models/koble2014/cropResidueManagement.py

@@ -2,7 +2,7 @@
 Residue
 
 Re-scale all [crop residue management](https://hestia.earth/glossary?termType=cropResidueManagement) Practices
-to make sure they all add up to 100%. Note: only practices added by Hestia will be recalculated.
+to make sure they all add up to 100%. Note: only practices added by HESTIA will be recalculated.
 """
 from hestia_earth.schema import TermTermType
 from hestia_earth.utils.model import filter_list_term_type

hestia_earth/models/linkedImpactAssessment/emissions.py

@@ -8,7 +8,7 @@ from hestia_earth.schema import EmissionMethodTier
 from hestia_earth.utils.lookup import download_lookup, get_table_value, column_name
 from hestia_earth.utils.tools import flatten, list_sum
 
-from hestia_earth.models.log import debugValues, logRequirements, logShouldRun, log_as_table
+from hestia_earth.models.log import logShouldRun, debugValues, log_as_table
 from hestia_earth.models.utils.emission import _new_emission
 from hestia_earth.models.utils.input import load_impacts
 from hestia_earth.models.utils.blank_node import group_by_keys
@@ -65,25 +65,29 @@ def _emission(model: str, term_id: str, value: float, input: dict, operation={},
     return emission
 
 
-def _run_emission(cycle: dict, term_id: str, data: dict):
+def _run_emission(cycle: dict, emission_term_id: str, data: dict):
     def run_input(values: dict):
         value = values.get('value', 0)
-        term = values.get('term', {})
+        input_term = values.get('term', {})
+        input_term_id = input_term.get('@id')
         operation = values.get('operation', {})
         animal = values.get('animal', {})
         is_aggregated = any(values.get('aggregated', []))
         model = MODEL_AGGREGATED if is_aggregated else MODEL
 
-        details = values.get('details', {})
-        logRequirements(cycle, model=model, term=term_id, key=MODEL_KEY,
-                        values=log_as_table([{'impact-assessment-id': key} | value for key, value in details.items()]))
+        logShouldRun(cycle, model, input_term_id, True, methodTier=TIER)
 
-        logShouldRun(cycle, model, term_id, True, methodTier=TIER, key=MODEL_KEY,
-                     input=term.get('@id'),
-                     operation=operation.get('@id'),
-                     animal=animal.get('@id'))
+        # log run on each emission so we know it did run
+        details = values.get('details', {})
+        debugValues(cycle, model=model, term=emission_term_id,
+                    value=value,
+                    coefficient=1,
+                    details=log_as_table([{'impact-assessment-id': key} | value for key, value in details.items()]),
+                    input=input_term_id,
+                    operation=operation.get('@id'),
+                    animal=animal.get('@id'))
 
-        return _emission(model, term_id, value, input=term, operation=operation, animal=animal)
+        return _emission(model, emission_term_id, value, input=input_term, operation=operation, animal=animal)
 
     return list(map(run_input, data.values()))
 
@@ -158,9 +162,6 @@ def run(cycle: dict):
     inputs = reduce(group_by_keys(['term', 'operation', 'animal']), inputs, {})
     inputs = {key: list(map(_group_input_emissions, value)) for key, value in inputs.items()}
 
-    debugValues(cycle, model=MODEL, key=MODEL_KEY,
-                nb_inputs=len(inputs))
-
     # finally group everything by emission so we can log inputs together
     # emissions = {'co2ToAirInputsProduct': {'group-id':{'term':{},'value':10,'details':{}}}}
     emissions = reduce(_group_inputs, inputs.items(), {})

hestia_earth/models/log.py

@@ -63,7 +63,7 @@ def logShouldRun(log_node: dict, model: str, term: Union[str, None], should_run:
 
 
 def debugMissingLookup(lookup_name: str, row: str, row_value: str, col: str, value, **kwargs):
-    if value is None:
+    if value is None or value == '':
         extra = (', ' + _join_args(**kwargs)) if len(kwargs.keys()) > 0 else ''
         logger.warn('Missing lookup=%s, %s=%s, column=%s' + extra, lookup_name, row, row_value, col)
 

hestia_earth/models/mocking/search-results.json

@@ -1219,19 +1219,11 @@
     "results": [
       {
         "@type": "Term",
-        "name": "Electricity, grid, market mix",
-        "termType": "electricity",
-        "@id": "electricityGridMarketMix",
-        "units": "kWh",
-        "_score": 29.020527
+        "@id": "electricityGridMarketMix"
       },
       {
         "@type": "Term",
-        "name": "Electricity, grid, renewable mix",
-        "termType": "electricity",
-        "@id": "electricityGridRenewableMix",
-        "units": "kWh",
-        "_score": 29.020527
+        "@id": "electricityGridRenewableMix"
       }
     ]
   },
@@ -1494,7 +1486,7 @@
         "@type": "Term",
         "name": "Generic crop, seed",
         "@id": "genericCropSeed",
-        "_score": 25.96846
+        "_score": 25.968466
       }
     ]
   },
@@ -1736,7 +1728,7 @@
         "@type": "Term",
         "name": "River or stream",
         "@id": "riverOrStream",
-        "_score": 50.0667
+        "_score": 50.06671
       },
       {
         "@type": "Term",
@@ -1748,7 +1740,7 @@
         "@type": "Term",
         "name": "Natural forest",
         "@id": "naturalForest",
-        "_score": 31.25247
+        "_score": 31.252472
       },
       {
         "@type": "Term",
@@ -1760,7 +1752,7 @@
         "@type": "Term",
         "name": "Animal housing",
         "@id": "animalHousing",
-        "_score": 26.769756
+        "_score": 26.769783
       },
       {
         "@type": "Term",
@@ -1772,13 +1764,13 @@
         "@type": "Term",
         "name": "High intensity grazing pasture",
         "@id": "highIntensityGrazingPasture",
-        "_score": 23.502651
+        "_score": 23.502655
       },
       {
         "@type": "Term",
         "name": "Permanent cropland",
         "@id": "permanentCropland",
-        "_score": 20.467478
+        "_score": 20.467493
       },
       {
         "@type": "Term",

hestia_earth/models/pooreNemecek2018/longFallowPeriod.py

@@ -45,7 +45,7 @@ def _should_run(cycle: dict):
     product = next((p for p in cycle.get('products', []) if _should_run_product(p)), None)
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
-                    product_id=(product or {}).get('term', {}).get('@id'))
+                    crop_product_id=(product or {}).get('term', {}).get('@id'))
 
     should_run = all([product])
     logShouldRun(cycle, MODEL, TERM_ID, should_run)

hestia_earth/models/preload_requests.py

@@ -10,7 +10,7 @@ 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.
+    Prefetch calls to HESTIA API in a local file.
 
     Parameters
     ----------

hestia_earth/models/requirements.py

@@ -353,7 +353,7 @@ def get_single_returns(model: str, key: str):
     Returns
     -------
     list
-        The returned data following Hestia's schema.
+        The returned data following HESTIA's schema.
     """
     returns = _model_returns({'model': model, 'key': key})
     return_type = list(returns.keys())[0] if returns else None
@@ -368,7 +368,7 @@ def list_models(
     termType: str = None, tier: str = None, productTermId: str = None, productTermType: str = None, siteType: str = None
 ) -> list:
     """
-    Return list of models present in Hestia.
+    Return list of models present in HESTIA.
 
     Parameters
     ----------
@@ -410,7 +410,7 @@ def get_models(termId: str):
     Returns
     -------
     list
-        The list of modelscurrently in Hestia that are matching this Term (as `{"model": model, "key": key}`).
+        The list of modelscurrently in HESTIA that are matching this Term (as `{"model": model, "key": key}`).
     """
     return list(filter(lambda m: m.get('key') == termId, ALL_MODELS))
 
@@ -420,7 +420,7 @@ def get_all(
     termType: str = None, tier: str = None, productTermId: str = None, productTermType: str = None, siteType: str = None
 ) -> list:
     """
-    Get the requirements to run all the models in Hestia.
+    Get the requirements to run all the models in HESTIA.
 
     Parameters
     ----------
@@ -441,7 +441,7 @@ def get_all(
     Returns
     -------
     list
-        The data requirements following Hestia's schema as multiple nodes.
+        The data requirements following HESTIA's schema as multiple nodes.
     """
     models = list_models(
         termType=termType, tier=tier, productTermId=productTermId, productTermType=productTermType, siteType=siteType
@@ -469,7 +469,7 @@ def get_single(model: str, key: str) -> list:
     Returns
     -------
     list
-        The data requirements following Hestia's schema as multiple nodes.
+        The data requirements following HESTIA's schema as multiple nodes.
     """
     model = {'model': model, 'key': key}
     linked_models = _recursive_linked_models(model)