hestia-earth-models 0.61.5__tar.gz → 0.61.7__tar.gz

{hestia-earth-models-0.61.5/hestia_earth_models.egg-info → hestia-earth-models-0.61.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.61.5
+Version: 0.61.7
 Summary: Hestia's set of modules for filling gaps in the activity data using external datasets (e.g. populating soil properties with a geospatial dataset using provided coordinates) and internal lookups (e.g. populating machinery use from fuel use). Includes rules for when gaps should be filled versus not (e.g. never gap fill yield, gap fill crop residue if yield provided etc.).
 Home-page: https://gitlab.com/hestia-earth/hestia-engine-models
 Author: Hestia Team
@@ -46,6 +46,13 @@ from hestia_earth.models.pooreNemecek2018 import run
 run('no3ToGroundwaterSoilFlux', cycle_data)
 ```
 
+Additionally, to reduce the number of queries to the HESTIA API and run the models faster, prefetching can be enabled:
+```python
+from hestia_earth.models.preload_requests import enable_preload
+
+enable_preload()
+```
+
 ### Using Spatial Models
 
 We have models that can gap-fill geographical information on a `Site`. If you want to use these models:

{hestia-earth-models-0.61.5 → hestia-earth-models-0.61.7}/README.md

@@ -31,6 +31,13 @@ from hestia_earth.models.pooreNemecek2018 import run
 run('no3ToGroundwaterSoilFlux', cycle_data)
 ```
 
+Additionally, to reduce the number of queries to the HESTIA API and run the models faster, prefetching can be enabled:
+```python
+from hestia_earth.models.preload_requests import enable_preload
+
+enable_preload()
+```
+
 ### Using Spatial Models
 
 We have models that can gap-fill geographical information on a `Site`. If you want to use these models:

{hestia-earth-models-0.61.5 → hestia-earth-models-0.61.7}/hestia_earth/models/cycle/input/hestiaAggregatedData.py

@@ -10,7 +10,7 @@ from hestia_earth.schema import TermTermType
 from hestia_earth.utils.model import find_primary_product, find_term_match, linked_node
 
 from hestia_earth.models.log import debugValues, logRequirements, logShouldRun
-from hestia_earth.models.utils.cycle import valid_site_type
+from hestia_earth.models.utils.crop import valid_site_type
 from hestia_earth.models.utils.term import get_generic_crop
 from hestia_earth.models.utils.aggregated import (
     should_link_input_to_impact, link_inputs_to_impact, find_closest_impact, aggregated_end_date

{hestia-earth-models-0.61.5 → hestia-earth-models-0.61.7}/hestia_earth/models/ipcc2019/animal/weightAtMaturity.py

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

{hestia-earth-models-0.61.5 → hestia-earth-models-0.61.7}/hestia_earth/models/ipcc2019/co2ToAirSoilOrganicCarbonStockChangeManagementChange.py

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

{hestia-earth-models-0.61.5 → hestia-earth-models-0.61.7}/hestia_earth/models/ipcc2019/organicCarbonPerHa.py

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

{hestia-earth-models-0.61.5 → hestia-earth-models-0.61.7}/hestia_earth/models/mocking/__init__.py

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

{hestia-earth-models-0.61.5 → hestia-earth-models-0.61.7}/hestia_earth/models/mocking/mock_search.py

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