hestia-earth-models 0.71.0__py3-none-any.whl → 0.72.0__py3-none-any.whl

hestia_earth/models/config/Site.json

@@ -88,6 +88,14 @@
         "runStrategy": "add_blank_node_if_missing",
         "mergeStrategy": "list",
         "stage": 1
+      },
+      {
+        "key": "measurements",
+        "model": "hestia",
+        "value": "histosol",
+        "runStrategy": "add_blank_node_if_missing",
+        "mergeStrategy": "list",
+        "stage": 1
       }
     ],
     [

hestia_earth/models/geospatialDatabase/histosol.py

@@ -1,7 +1,7 @@
-from hestia_earth.schema import MeasurementMethodClassification, TermTermType
+from hestia_earth.schema import MeasurementMethodClassification
 
 from hestia_earth.models.log import logRequirements, logShouldRun
-from hestia_earth.models.utils.measurement import _new_measurement
+from hestia_earth.models.utils.measurement import _new_measurement, total_other_soilType_value
 from hestia_earth.models.utils.source import get_source
 from .utils import download, has_geospatial_data, should_download
 from . import MODEL
@@ -14,7 +14,13 @@ REQUIREMENTS = {
             {"region": {"@type": "Term", "termType": "region"}}
         ],
         "none": {
-            "measurements": [{"@type": "Measurement", "value": "", "term.termType": "soilType"}]
+            "measurements": [{
+                "@type": "Measurement",
+                "value": "100",
+                "depthUpper": "0",
+                "depthLower": "30",
+                "term.termType": "soilType"
+            }]
         }
     }
 }
@@ -50,17 +56,18 @@ def _run(site: dict):
 
 
 def _should_run(site: dict):
-    measurements = site.get('measurements', [])
-    no_soil_type = all([m.get('term', {}).get('termType') != TermTermType.SOILTYPE.value for m in measurements])
     contains_geospatial_data = has_geospatial_data(site)
     below_max_area_size = should_download(TERM_ID, site)
 
+    total_measurements_value = total_other_soilType_value(site.get('measurements', []), TERM_ID)
+
     logRequirements(site, model=MODEL, term=TERM_ID,
                     contains_geospatial_data=contains_geospatial_data,
                     below_max_area_size=below_max_area_size,
-                    no_soil_type=no_soil_type)
+                    total_soilType_measurements_value=total_measurements_value,
+                    total_soilType_measurements_value_is_0=total_measurements_value == 0)
 
-    should_run = all([contains_geospatial_data, below_max_area_size, no_soil_type])
+    should_run = all([contains_geospatial_data, below_max_area_size, total_measurements_value == 0])
     logShouldRun(site, MODEL, TERM_ID, should_run)
     return should_run
 

hestia_earth/models/hestia/histosol.py

@@ -0,0 +1,53 @@
+from hestia_earth.schema import MeasurementMethodClassification
+
+from hestia_earth.models.log import logRequirements, logShouldRun
+from hestia_earth.models.utils.measurement import _new_measurement, total_other_soilType_value
+from . import MODEL
+
+REQUIREMENTS = {
+    "Site": {
+        "measurements": [{
+            "@type": "Measurement",
+            "value": "100",
+            "depthUpper": "0",
+            "depthLower": "30",
+            "term.termType": "soilType"
+        }]
+    }
+}
+RETURNS = {
+    "Measurement": [{
+        "value": "0",
+        "depthUpper": "0",
+        "depthLower": "30",
+        "methodClassification": "modelled using other measurements"
+    }]
+}
+LOOKUPS = {
+    "soilType": "sumMax100Group"
+}
+TERM_ID = 'histosol'
+
+
+def _measurement():
+    measurement = _new_measurement(TERM_ID)
+    measurement['value'] = [0]
+    measurement['depthUpper'] = 0
+    measurement['depthLower'] = 30
+    measurement['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
+    return measurement
+
+
+def _should_run(site: dict):
+    total_measurements_value = total_other_soilType_value(site.get('measurements', []), TERM_ID)
+
+    logRequirements(site, model=MODEL, term=TERM_ID,
+                    total_soilType_measurements_value=total_measurements_value,
+                    total_soilType_measurements_value_is_100=total_measurements_value == 100)
+
+    should_run = all([total_measurements_value == 100])
+    logShouldRun(site, MODEL, TERM_ID, should_run)
+    return should_run
+
+
+def run(site: dict): return [_measurement()] if _should_run(site) else []

hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1.py

@@ -3,17 +3,18 @@ from functools import reduce
 from numpy import empty_like, random, vstack
 from numpy.typing import NDArray
 from pydash.objects import merge
-from typing import Callable, Optional, Union
+from typing import Callable, Literal, Optional, Union
 
 from hestia_earth.schema import MeasurementMethodClassification, SiteSiteType, TermTermType
-from hestia_earth.utils.model import find_term_match, filter_list_term_type
 from hestia_earth.utils.blank_node import get_node_value
+from hestia_earth.utils.model import find_term_match, filter_list_term_type
+from hestia_earth.utils.tools import non_empty_list
 
 from hestia_earth.models.utils import split_on_condition
 from hestia_earth.models.utils.array_builders import gen_seed
 from hestia_earth.models.utils.blank_node import (
-    cumulative_nodes_match, cumulative_nodes_lookup_match, cumulative_nodes_term_match, node_lookup_match,
-    node_term_match, group_nodes_by_year, validate_start_date_end_date
+    cumulative_nodes_match, cumulative_nodes_lookup_match, cumulative_nodes_term_match, group_by_term,
+    node_lookup_match, node_term_match, group_nodes_by_year, validate_start_date_end_date
 )
 from hestia_earth.models.utils.ecoClimateZone import EcoClimateZone, get_eco_climate_zone_value
 from hestia_earth.models.utils.descriptive_stats import calc_descriptive_stats
@@ -1031,8 +1032,8 @@ def _assign_ipcc_soil_category(
     IpccSoilCategory
         The assigned IPCC soil category.
     """
-    soil_types = filter_list_term_type(measurement_nodes, TermTermType.SOILTYPE)
-    usda_soil_types = filter_list_term_type(measurement_nodes, TermTermType.USDASOILTYPE)
+    soil_types = _get_soil_type_measurements(measurement_nodes, TermTermType.SOILTYPE)
+    usda_soil_types = _get_soil_type_measurements(measurement_nodes, TermTermType.USDASOILTYPE)
 
     clay_content = get_node_value(find_term_match(measurement_nodes, _CLAY_CONTENT_TERM_ID))
     sand_content = get_node_value(find_term_match(measurement_nodes, _SAND_CONTENT_TERM_ID))
@@ -1053,6 +1054,20 @@ def _assign_ipcc_soil_category(
     ) if len(soil_types) > 0 or len(usda_soil_types) > 0 else default
 
 
+def _get_soil_type_measurements(
+    nodes: list[dict], term_type: Literal[TermTermType.SOILTYPE, TermTermType.USDASOILTYPE]
+) -> list[dict]:
+    grouped = group_by_term(filter_list_term_type(nodes, term_type))
+
+    def depth_distance(node):
+        upper, lower = node.get("depthUpper", 0), node.get("depthLower", 100)
+        return abs(upper - DEPTH_UPPER) + abs(lower - DEPTH_LOWER)
+
+    return non_empty_list(
+        min(nodes_, key=depth_distance) for key in grouped if (nodes_ := grouped.get(key, []))
+    )
+
+
 def _check_soil_category(
     *,
     key: IpccSoilCategory,
@@ -1461,7 +1476,7 @@ Value: Corresponding decision tree for IPCC management categories based on land
 """
 
 _IPCC_LAND_USE_CATEGORY_TO_DEFAULT_IPCC_MANAGEMENT_CATEGORY = {
-    IpccLandUseCategory.GRASSLAND: IpccManagementCategory.NOMINALLY_MANAGED,
+    IpccLandUseCategory.GRASSLAND: IpccManagementCategory.UNKNOWN,
     IpccLandUseCategory.ANNUAL_CROPS_WET: IpccManagementCategory.UNKNOWN,
     IpccLandUseCategory.ANNUAL_CROPS: IpccManagementCategory.UNKNOWN
 }