hestia-earth-models 0.61.6__py3-none-any.whl → 0.61.8__py3-none-any.whl

tests/models/ipcc2019/test_organicCarbonPerHa.py

@@ -1,38 +1,25 @@
-from unittest.mock import patch
 import json
-from numpy.testing import assert_almost_equal
+from numpy.typing import NDArray
+from os.path import isfile
 from pytest import mark
-import random
-
-from tests.utils import (
-    fixtures_path,
-    fake_new_measurement,
-)
-from hestia_earth.models.ipcc2019.organicCarbonPerHa import (
-    _assign_ipcc_carbon_input_category,
-    _assign_ipcc_land_use_category,
-    _assign_ipcc_management_category,
-    _assign_ipcc_soil_category,
-    _calc_temperature_factor,
-    _calc_tier_1_soc_stocks,
-    _calc_water_factor,
-    _check_cropland_low_category,
-    _check_cropland_medium_category,
-    _get_carbon_input_kwargs,
-    _iterate_soc_equilibriums,
-    _should_run,
-    IpccCarbonInputCategory,
-    IpccLandUseCategory,
-    IpccManagementCategory,
-    IpccSoilCategory,
-    MODEL,
-    run,
-    TERM_ID
-)
+from unittest.mock import MagicMock, patch
+
+from hestia_earth.models.ipcc2019.organicCarbonPerHa import _should_run, MODEL, run, TERM_ID
+from hestia_earth.models.ipcc2019.organicCarbonPerHa_utils import sample_constant
+
+from tests.utils import fake_new_measurement, fixtures_path
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+tier_1_path = f"hestia_earth.models.{MODEL}.{TERM_ID}_tier_1_utils"
+tier_2_path = f"hestia_earth.models.{MODEL}.{TERM_ID}_tier_2_utils"
+utils_path = f"hestia_earth.models.{MODEL}.{TERM_ID}_utils"
+term_path = "hestia_earth.models.utils.term"
+property_path = "hestia_earth.models.utils.property"
+
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
+ITERATIONS = 1000
+
 COVER_CROP_PROPERTY_TERM_IDS = [
     "catchCrop",
     "coverCrop",
@@ -73,14 +60,14 @@ RESIDUE_REMOVED_OR_BURNT_TERM_IDS = [
     "residueRemoved"
 ]
 
-UPLAND_RICE_LAND_COVER_TERM_IDS = [
-    "ricePlantUpland"
-]
-
 UPLAND_RICE_CROP_TERM_IDS = [
     "riceGrainInHuskUpland"
 ]
 
+UPLAND_RICE_LAND_COVER_TERM_IDS = [
+    "ricePlantUpland"
+]
+
 DEFAULT_PROPERTIES = {
     "manureDryKgMass": {
         "carbonContent": {
@@ -96,69 +83,76 @@ DEFAULT_PROPERTIES = {
 }
 
 
-def find_term_property_side_effect(term: dict, property: str, *_):
+def fake_calc_descriptive_stats(arr: NDArray, *_args, **_kwargs):
+    return {"value": [row[0] for row in arr]}
+
+
+def fake_find_term_property(term: dict, property: str, *_):
     term_id = term.get('@id', None)
     return DEFAULT_PROPERTIES.get(term_id, {}).get(property, {})
 
 
-# --- TIER 1 & TIER 2 TESTS ---
-
-
-# subfolder, load_cycles, should_run
-SHOULD_RUN_SUBFOLDERS = [
-    ("tier-1-and-2/cropland", True, True),
-    ("tier-1-and-2/with-zero-carbon-input", True, True),  # Closes issue 777
-    ("tier-2/with-generalised-monthly-measurements", True, False),  # Closes issue 600
-    ("tier-2/with-incomplete-climate-data", True, False),  # Closes issue 599
-    ("tier-2/with-initial-soc", True, True),
-    ("tier-2/with-multi-year-cycles", True, True),
-    ("tier-2/with-multi-year-cycles-and-missing-properties", True, True),  # Closes issue 734
-    ("tier-2/without-any-measurements", True, False),  # Closes issue 594
-    ("tier-2/without-initial-soc", True, True),
-    ("tier-2/with-irrigation", True, True),
-    ("tier-2/with-irrigation-dates", True, True),
-    ("tier-2/with-paddy-rice", True, False),
-    ("tier-2/with-sand-without-date", True, True),  # Closes issue 739
-    ("tier-2/with-irrigated-upland-rice", True, False),
-    ("tier-1/cropland-depth-as-float", False, True),
-    ("tier-1/cropland-with-measured-soc", False, True),
-    ("tier-1/cropland-without-measured-soc", False, True),
-    ("tier-1/permanent-pasture", False, True),
-    ("tier-1/should-not-run", False, False),
-    ("tier-1/without-management-with-measured-soc", False, False),
-    ("tier-1/land-use-change", False, True),  # Closes issue 755
-    ("tier-1/run-with-site-type", False, True),  # Closes issue 755
-    ("tier-1/cropland-polar", False, False)  # Closes issue 794
+def order_list(values: list[dict]) -> list[dict]:
+    return sorted(values, key=lambda node: (
+        node.get("term", {}).get('@id', ""),   # sort by `term.@id`
+        node.get("methodClassification", ""),  # then by `methodClassifaction`
+        node.get("dates", [])                  # then by `dates[0]`
+    ))
+
+
+# subfolder, should_run
+PARAMS_SHOULD_RUN = [
+    ("tier-1-and-2/cropland", True),
+    ("tier-1-and-2/with-zero-carbon-input", True),                   # Closes issue 777
+    ("tier-1/cropland-depth-as-float", True),
+    ("tier-1/cropland-with-measured-soc", True),
+    ("tier-1/cropland-without-measured-soc", True),
+    ("tier-1/permanent-pasture", True),
+    ("tier-1/should-not-run", False),
+    ("tier-1/without-management-with-measured-soc", False),
+    ("tier-1/land-use-change", True),                                # Closes issue 755
+    ("tier-1/run-with-site-type", True),                             # Closes issue 755
+    ("tier-1/cropland-polar", False),                                # Closes issue 794
+    ("tier-2/with-generalised-monthly-measurements", False),         # Closes issue 600
+    ("tier-2/with-incomplete-climate-data", False),                  # Closes issue 599
+    ("tier-2/with-initial-soc", True),
+    ("tier-2/with-multi-year-cycles", True),
+    ("tier-2/with-multi-year-cycles-and-missing-properties", True),  # Closes issue 734
+    ("tier-2/without-any-measurements", False),                      # Closes issue 594
+    ("tier-2/without-initial-soc", True),
+    ("tier-2/with-irrigation", True),                                # Closes issue 716
+    ("tier-2/with-irrigation-dates", True),                          # Closes issue 716
+    ("tier-2/with-paddy-rice", False),                               # Closes issue 718
+    ("tier-2/with-sand-without-date", True),                         # Closes issue 739
+    ("tier-2/with-irrigated-upland-rice", False)                     # Closes issue 718
 ]
-
-
-@mark.parametrize(
-    "subfolder, load_cycles, should_run",
-    SHOULD_RUN_SUBFOLDERS,
-    ids=[params[0] for params in SHOULD_RUN_SUBFOLDERS]
-)
-@patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)
-@patch(f"{class_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
-@patch(f"{class_path}.get_crop_residue_incorporated_or_left_on_field_terms", return_value=CROP_RESIDUE_INCORP_TERM_IDS)
-@patch(f"{class_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
-@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}.related_cycles")
-@patch("hestia_earth.models.utils.property.find_term_property", side_effect=find_term_property_side_effect)
+IDS_SHOULD_RUN = [p[0] for p in PARAMS_SHOULD_RUN]
+
+
+@mark.parametrize("subfolder, should_run", PARAMS_SHOULD_RUN, ids=IDS_SHOULD_RUN)
+@patch(f"{term_path}.search")
+@patch(f"{property_path}.download_hestia")
+@patch(f"{property_path}.find_term_property", side_effect=fake_find_term_property)
+@patch(f"{utils_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
+@patch(f"{utils_path}.get_upland_rice_crop_terms", return_value=UPLAND_RICE_CROP_TERM_IDS)
+@patch(f"{utils_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
+@patch(f"{utils_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
+@patch(f"{utils_path}.get_crop_residue_incorporated_or_left_on_field_terms", return_value=CROP_RESIDUE_INCORP_TERM_IDS)
+@patch(f"{utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
+@patch(f"{tier_2_path}.related_cycles")
 def test_should_run(
-    mock_find_term_property,
-    mock_related_cycles,
-    _mock_get_upland_rice_crop_terms,
-    _mock_get_upland_rice_land_cover_terms,
-    _mock_get_residue_removed_or_burnt_terms,
-    _mock_get_irrigated_terms,
-    _mock_get_crop_residue_incorporated_or_left_on_field_terms,
-    _mock_get_cover_crop_property_terms,
-    _mock_new_measurement,
-    subfolder,
-    load_cycles,
-    should_run
+    mock_related_cycles: MagicMock,
+    mock_get_cover_crop_property_terms: MagicMock,  # utils mocks
+    mock_get_crop_residue_incorporated_or_left_on_field_terms: MagicMock,
+    mock_get_irrigated_terms: MagicMock,
+    mock_get_residue_removed_or_burnt_terms: MagicMock,
+    mock_get_upland_rice_crop_terms: MagicMock,
+    mock_get_upland_rice_land_cover_terms: MagicMock,
+    _mock_find_term_property: MagicMock,
+    mock_download_hestia: MagicMock,
+    mock_search: MagicMock,
+    subfolder: str,
+    should_run: bool
 ):
     folder = f"{fixtures_folder}/{subfolder}"
 
@@ -166,67 +160,86 @@ def test_should_run(
         with open(f"{folder}/cycles.jsonld", encoding='utf-8') as f:
             return json.load(f)
 
-    mock_related_cycles.return_value = load_cycles_from_file() if load_cycles else []
+    mock_related_cycles.return_value = (
+        load_cycles_from_file() if isfile(f"{folder}/cycles.jsonld") else []
+    )
 
     with open(f"{folder}/site.jsonld", encoding='utf-8') as f:
         site = json.load(f)
 
-    should_run_tier_1, should_run_tier_2, *_ = _should_run(site)
-    should_run_ = should_run_tier_1 or should_run_tier_2
+    result, _ = _should_run(site)
 
-    assert should_run_ == should_run
+    # Ensure that API calls to retrieve term IDs are properly cached.
+    mock_get_cover_crop_property_terms.call_count <= 1
+    mock_get_crop_residue_incorporated_or_left_on_field_terms.call_count <= 1
+    mock_get_irrigated_terms.call_count <= 1
+    mock_get_residue_removed_or_burnt_terms.call_count <= 1
+    mock_get_upland_rice_crop_terms.call_count <= 1
+    mock_get_upland_rice_land_cover_terms.call_count <= 1
 
+    # Ensure that the property and term utils are properly mocked.
+    mock_download_hestia.assert_not_called()
+    mock_search.assert_not_called()
 
-@patch(f"{class_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
-@patch(f"{class_path}.get_crop_residue_incorporated_or_left_on_field_terms", return_value=CROP_RESIDUE_INCORP_TERM_IDS)
-@patch(f"{class_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
-@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}.related_cycles", return_value=[])
-@patch("hestia_earth.models.utils.property.find_term_property", side_effect=find_term_property_side_effect)
-def test_should_run_no_data(*args):
-    SITE = {}
-    EXPECTED = False
+    assert result == should_run
 
-    should_run_tier_1, should_run_tier_2, *_ = _should_run(SITE)
-    should_run = should_run_tier_1 or should_run_tier_2
 
-    assert should_run == EXPECTED
+@patch(f"{term_path}.search")
+@patch(f"{property_path}.download_hestia")
+@patch(f"{tier_2_path}.related_cycles", return_value=[])
+def test_should_run_no_data(
+    _mock_related_cycles: MagicMock,
+    mock_download_hestia: MagicMock,
+    mock_search: MagicMock
+):
+    SITE = {}
+    EXPECTED = []
 
+    result = run(SITE)
 
-RUN_SUBFOLDERS = [
-    (subfolder, load_cycles) for subfolder, load_cycles, should_run in SHOULD_RUN_SUBFOLDERS
-    if should_run
-]
+    mock_download_hestia.assert_not_called()
+    mock_search.assert_not_called()
+    assert result == EXPECTED
 
 
-@mark.parametrize(
-    "subfolder, load_cycles",
-    RUN_SUBFOLDERS,
-    ids=[params[0] for params in RUN_SUBFOLDERS]
-)
-@patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)
-@patch(f"{class_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
-@patch(f"{class_path}.get_crop_residue_incorporated_or_left_on_field_terms", return_value=CROP_RESIDUE_INCORP_TERM_IDS)
-@patch(f"{class_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
-@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}.related_cycles")
-@patch("hestia_earth.models.utils.property.find_term_property", side_effect=find_term_property_side_effect)
+PARAMS_RUN = [subfolder for subfolder, should_run in PARAMS_SHOULD_RUN if should_run]
+
+
+@mark.parametrize("subfolder", PARAMS_RUN)
+@patch(f"{term_path}.search")
+@patch(f"{property_path}.download_hestia")
+@patch(f"{property_path}.find_term_property", side_effect=fake_find_term_property)
+@patch(f"{utils_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
+@patch(f"{utils_path}.get_upland_rice_crop_terms", return_value=UPLAND_RICE_CROP_TERM_IDS)
+@patch(f"{utils_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
+@patch(f"{utils_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
+@patch(f"{utils_path}.get_crop_residue_incorporated_or_left_on_field_terms", return_value=CROP_RESIDUE_INCORP_TERM_IDS)
+@patch(f"{utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
+@patch(f"{tier_2_path}.related_cycles")
+@patch(f"{tier_2_path}.calc_descriptive_stats", side_effect=fake_calc_descriptive_stats)
+@patch(f"{tier_2_path}._new_measurement", side_effect=fake_new_measurement)
+@patch(f"{tier_2_path}._get_sample_func", return_value=sample_constant)
+@patch(f"{tier_1_path}.calc_descriptive_stats", side_effect=fake_calc_descriptive_stats)
+@patch(f"{tier_1_path}._new_measurement", side_effect=fake_new_measurement)
+@patch(f"{tier_1_path}._get_sample_func", return_value=sample_constant)
 def test_run(
-    mock_find_term_property,
-    mock_related_cycles,
-    _mock_get_upland_rice_crop_terms,
-    _mock_get_upland_rice_land_cover_terms,
-    _mock_get_residue_removed_or_burnt_terms,
-    _mock_get_irrigated_terms,
-    _mock_get_crop_residue_incorporated_or_left_on_field_terms,
-    _mock_get_cover_crop_property_terms,
-    _mock_new_measurement,
-    subfolder,
-    load_cycles
+    _mock_get_sample_func_t1: MagicMock,
+    _mock_new_measurement_t1: MagicMock,
+    _mock_calc_descriptive_stats_t1: MagicMock,
+    _mock_get_sample_func_t2: MagicMock,
+    _mock_new_measurement_t2: MagicMock,
+    _mock_calc_descriptive_stats_t2: MagicMock,
+    mock_related_cycles: MagicMock,
+    mock_get_cover_crop_property_terms: MagicMock,  # utils mocks
+    mock_get_crop_residue_incorporated_or_left_on_field_terms: MagicMock,
+    mock_get_irrigated_terms: MagicMock,
+    mock_get_residue_removed_or_burnt_terms: MagicMock,
+    mock_get_upland_rice_crop_terms: MagicMock,
+    mock_get_upland_rice_land_cover_terms: MagicMock,
+    _mock_find_term_property: MagicMock,
+    mock_download_hestia: MagicMock,
+    mock_search: MagicMock,
+    subfolder: str
 ):
     folder = f"{fixtures_folder}/{subfolder}"
 
@@ -234,7 +247,9 @@ def test_run(
         with open(f"{folder}/cycles.jsonld", encoding='utf-8') as f:
             return json.load(f)
 
-    mock_related_cycles.return_value = load_cycles_from_file() if load_cycles else []
+    mock_related_cycles.return_value = (
+        load_cycles_from_file() if isfile(f"{folder}/cycles.jsonld") else []
+    )
 
     with open(f"{folder}/site.jsonld", encoding='utf-8') as f:
         site = json.load(f)
@@ -242,345 +257,89 @@ def test_run(
     with open(f"{folder}/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
-    result = run(site)
-    assert result == expected
-
-
-# --- TIER 2 TESTS: SUB-MODELS ---
-
-
-def test_calc_temperature_factor():
-    NUM_RANDOM = 9999
-    MIN_T, MAX_T = -60, 60
-    MIN_FAC, MAX_FAC = 0, 1
-
-    temperatures = [random.uniform(MIN_T, MAX_T) for _ in range(0, NUM_RANDOM)]
-    results = [
-        _calc_temperature_factor(t) for t in temperatures
-    ]
-
-    assert all(MIN_FAC <= result <= MAX_FAC for result in results)
-
-
-def test_calc_water_factor():
-    NUM_RANDOM = 9999
-    MIN, MAX = 0, 9999
-    MIN_FAC, MAX_FAC = 0.2129, 1.5
-    IRR_FAC = 0.775
-
-    precipitations = [random.uniform(MIN, MAX) for _ in range(0, NUM_RANDOM)]
-    pets = [random.uniform(MIN, MAX) for _ in range(0, NUM_RANDOM)]
-
-    results = [
-        _calc_water_factor(pre, pet) for pre, pet in zip(precipitations, pets)
-    ]
-    irr_results = [
-        _calc_water_factor(pre, pet, is_irrigated=True) for pre, pet in zip(precipitations, pets)
-    ]
-
-    assert all(MIN_FAC <= result <= MAX_FAC for result in results)
-    assert all(result == IRR_FAC for result in irr_results)
-    assert _calc_water_factor(1, 1) == _calc_water_factor(1000, 1000)
-
-
-def test_calc_water_factor_zero():
-    """
-    Closes issue 771. Function should not raise 0 error and should return the maximum water factor.
-    """
-    assert _calc_water_factor(0, 0) == 1.49961875
-
-
-# --- IPCC SOIL CATEGORY TESTS ---
-
-
-# subfolder, expected
-SOIL_CATEGORY_PARAMS = [
-    ("fractional", IpccSoilCategory.WETLAND_SOILS),
-    ("no-measurements", IpccSoilCategory.LOW_ACTIVITY_CLAY_SOILS),
-    ("sandy-override", IpccSoilCategory.SANDY_SOILS),
-    ("soilType/hac", IpccSoilCategory.HIGH_ACTIVITY_CLAY_SOILS),
-    ("soilType/lac", IpccSoilCategory.LOW_ACTIVITY_CLAY_SOILS),
-    ("soilType/org", IpccSoilCategory.ORGANIC_SOILS),
-    ("soilType/pod", IpccSoilCategory.SPODIC_SOILS),
-    ("soilType/san", IpccSoilCategory.SANDY_SOILS),
-    ("soilType/vol", IpccSoilCategory.VOLCANIC_SOILS),
-    ("soilType/wet", IpccSoilCategory.WETLAND_SOILS),
-    ("usdaSoilType/hac", IpccSoilCategory.HIGH_ACTIVITY_CLAY_SOILS),
-    ("usdaSoilType/lac", IpccSoilCategory.LOW_ACTIVITY_CLAY_SOILS),
-    ("usdaSoilType/org", IpccSoilCategory.ORGANIC_SOILS),
-    ("usdaSoilType/pod", IpccSoilCategory.SPODIC_SOILS),
-    ("usdaSoilType/san", IpccSoilCategory.SANDY_SOILS),
-    ("usdaSoilType/vol", IpccSoilCategory.VOLCANIC_SOILS),
-    ("usdaSoilType/wet", IpccSoilCategory.WETLAND_SOILS)
-]
-
-
-@mark.parametrize(
-    "subfolder, expected",
-    SOIL_CATEGORY_PARAMS,
-    ids=[params[0] for params in SOIL_CATEGORY_PARAMS]
-)
-def test_assign_ipcc_soil_category(subfolder, expected):
-    folder = f"{fixtures_folder}/IpccSoilCategory/{subfolder}"
-
-    with open(f"{folder}/site.jsonld", encoding='utf-8') as f:
-        site = json.load(f)
+    with patch(f"{class_path}.ITERATIONS", ITERATIONS):
+        result = run(site)
 
-    result = _assign_ipcc_soil_category(site.get("measurements", []))
-    assert result == expected
+    # Ensure that API calls to retrieve term IDs are properly cached.
+    mock_get_cover_crop_property_terms.call_count <= 1
+    mock_get_crop_residue_incorporated_or_left_on_field_terms.call_count <= 1
+    mock_get_irrigated_terms.call_count <= 1
+    mock_get_residue_removed_or_burnt_terms.call_count <= 1
+    mock_get_upland_rice_crop_terms.call_count <= 1
+    mock_get_upland_rice_land_cover_terms.call_count <= 1
 
+    # Ensure that the property and term utils are properly mocked.
+    mock_download_hestia.assert_not_called()
+    mock_search.assert_not_called()
 
-# --- IPCC LAND USE CATEGORY TESTS ---
+    assert order_list(result) == order_list(expected)
 
 
-# subfolder, soil_category, expected
-LAND_USE_CATEGORY_PARAMS = [
-    ("annual-crops", IpccSoilCategory.LOW_ACTIVITY_CLAY_SOILS, IpccLandUseCategory.ANNUAL_CROPS),
-    ("annual-crops-wet", IpccSoilCategory.WETLAND_SOILS, IpccLandUseCategory.ANNUAL_CROPS_WET),
-    ("forest", IpccSoilCategory.LOW_ACTIVITY_CLAY_SOILS, IpccLandUseCategory.FOREST),
-    ("fractional", IpccSoilCategory.LOW_ACTIVITY_CLAY_SOILS, IpccLandUseCategory.PERENNIAL_CROPS),
-    ("grassland", IpccSoilCategory.LOW_ACTIVITY_CLAY_SOILS, IpccLandUseCategory.GRASSLAND),
-    ("irrigated-upland-rice", IpccSoilCategory.LOW_ACTIVITY_CLAY_SOILS, IpccLandUseCategory.PADDY_RICE_CULTIVATION),
-    ("native", IpccSoilCategory.LOW_ACTIVITY_CLAY_SOILS, IpccLandUseCategory.NATIVE),
-    ("other", IpccSoilCategory.LOW_ACTIVITY_CLAY_SOILS, IpccLandUseCategory.OTHER),
-    ("paddy-rice-cultivation", IpccSoilCategory.LOW_ACTIVITY_CLAY_SOILS, IpccLandUseCategory.PADDY_RICE_CULTIVATION),
-    ("perennial-crops", IpccSoilCategory.LOW_ACTIVITY_CLAY_SOILS, IpccLandUseCategory.PERENNIAL_CROPS),
-    ("set-aside", IpccSoilCategory.LOW_ACTIVITY_CLAY_SOILS, IpccLandUseCategory.SET_ASIDE),
-    ("set-aside-override", IpccSoilCategory.LOW_ACTIVITY_CLAY_SOILS, IpccLandUseCategory.SET_ASIDE),
-    ("upland-rice", IpccSoilCategory.LOW_ACTIVITY_CLAY_SOILS, IpccLandUseCategory.ANNUAL_CROPS),
+PARAMS_RUN_WITH_STATS = [
+    "tier-1-and-2/with-stats",              # Closes issue 753
+    "tier-1/cropland-with-stats",           # Closes issue 753
+    "tier-1/land-use-change-with-stats",    # Closes issue 753
+    "tier-2/with-stats"                     # Closes issue 753
 ]
 
 
-@mark.parametrize(
-    "subfolder, soil_category, expected",
-    LAND_USE_CATEGORY_PARAMS,
-    ids=[params[0] for params in LAND_USE_CATEGORY_PARAMS]
-)
-@patch(f"{class_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
-@patch(f"{class_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
-def test_assign_ipcc_land_use_category(
-    _mock_get_upland_rice_land_cover_terms,
-    _mock_get_irrigated_terms,
-    subfolder,
-    soil_category,
-    expected
-):
-    folder = f"{fixtures_folder}/IpccLandUseCategory/{subfolder}"
-
-    with open(f"{folder}/site.jsonld", encoding='utf-8') as f:
-        site = json.load(f)
-
-    result = _assign_ipcc_land_use_category(site.get("management", []), soil_category)
-    assert result == expected
-
-
-# --- IPCC MANAGEMENT CATEGORY TESTS ---
-
-
-# subfolder, land_use_category, expected
-MANAGEMENT_CATEGORY_PARAMS = [
-    ("fractional-annual-crops", IpccLandUseCategory.ANNUAL_CROPS, IpccManagementCategory.REDUCED_TILLAGE),
-    ("fractional-annual-crops-wet", IpccLandUseCategory.ANNUAL_CROPS_WET, IpccManagementCategory.REDUCED_TILLAGE),
-    ("fractional-grassland", IpccLandUseCategory.GRASSLAND, IpccManagementCategory.IMPROVED_GRASSLAND),
-    ("full-tillage", IpccLandUseCategory.ANNUAL_CROPS, IpccManagementCategory.FULL_TILLAGE),
-    ("high-intensity-grazing", IpccLandUseCategory.GRASSLAND, IpccManagementCategory.HIGH_INTENSITY_GRAZING),
-    ("improved-grassland", IpccLandUseCategory.GRASSLAND, IpccManagementCategory.IMPROVED_GRASSLAND),
-    ("no-management/annual-crops", IpccLandUseCategory.ANNUAL_CROPS, IpccManagementCategory.FULL_TILLAGE),
-    ("no-management/annual-crops-wet", IpccLandUseCategory.ANNUAL_CROPS_WET, IpccManagementCategory.FULL_TILLAGE),
-    ("no-management/grassland", IpccLandUseCategory.GRASSLAND, IpccManagementCategory.NOMINALLY_MANAGED),
-    ("no-tillage", IpccLandUseCategory.ANNUAL_CROPS, IpccManagementCategory.NO_TILLAGE),
-    ("nominally-managed", IpccLandUseCategory.GRASSLAND, IpccManagementCategory.NOMINALLY_MANAGED),
-    ("other", IpccLandUseCategory.OTHER, IpccManagementCategory.OTHER),
-    ("reduced-tillage", IpccLandUseCategory.ANNUAL_CROPS, IpccManagementCategory.REDUCED_TILLAGE),
-    ("severely-degraded", IpccLandUseCategory.GRASSLAND, IpccManagementCategory.SEVERELY_DEGRADED),
-]
-
-
-@mark.parametrize(
-    "subfolder, land_use_category, expected",
-    MANAGEMENT_CATEGORY_PARAMS,
-    ids=[params[0] for params in MANAGEMENT_CATEGORY_PARAMS]
-)
-def test_assign_ipcc_management_category(subfolder, land_use_category, expected):
-    folder = f"{fixtures_folder}/IpccManagementCategory/{subfolder}"
-
-    with open(f"{folder}/site.jsonld", encoding='utf-8') as f:
-        site = json.load(f)
-
-    result = _assign_ipcc_management_category(site.get("management", []), land_use_category)
-    assert result == expected
-
-
-# --- IPCC CARBON INPUT CATEGORY TESTS ---
-
-
-@mark.parametrize("key", [1, 2, 3, 4], ids=lambda key: f"scenario-{key}")
-@patch(f"{class_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
-@patch(f"{class_path}.get_crop_residue_incorporated_or_left_on_field_terms", return_value=CROP_RESIDUE_INCORP_TERM_IDS)
-@patch(f"{class_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
-@patch(f"{class_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
-def test_check_cropland_medium_category(
-    _mock_get_residue_removed_or_burnt_terms,
-    _mock_get_irrigated_terms,
-    _mock_get_crop_residue_incorporated_or_left_on_field_terms,
-    _mock_get_cover_crop_property_terms,
-    key
+@mark.parametrize("subfolder", PARAMS_RUN_WITH_STATS)
+@patch(f"{term_path}.search")
+@patch(f"{property_path}.download_hestia")
+@patch(f"{property_path}.find_term_property", side_effect=fake_find_term_property)
+@patch(f"{utils_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
+@patch(f"{utils_path}.get_upland_rice_crop_terms", return_value=UPLAND_RICE_CROP_TERM_IDS)
+@patch(f"{utils_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
+@patch(f"{utils_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
+@patch(f"{utils_path}.get_crop_residue_incorporated_or_left_on_field_terms", return_value=CROP_RESIDUE_INCORP_TERM_IDS)
+@patch(f"{utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
+@patch(f"{tier_2_path}.related_cycles")
+@patch(f"{tier_2_path}._new_measurement", side_effect=fake_new_measurement)
+@patch(f"{tier_1_path}._new_measurement", side_effect=fake_new_measurement)
+def test_run_with_stats(
+    _mock_new_measurement_t1: MagicMock,
+    _mock_new_measurement_t2: MagicMock,
+    mock_related_cycles: MagicMock,
+    mock_get_cover_crop_property_terms: MagicMock,  # utils mocks
+    mock_get_crop_residue_incorporated_or_left_on_field_terms: MagicMock,
+    mock_get_irrigated_terms: MagicMock,
+    mock_get_residue_removed_or_burnt_terms: MagicMock,
+    mock_get_upland_rice_crop_terms: MagicMock,
+    mock_get_upland_rice_land_cover_terms: MagicMock,
+    _mock_find_term_property: MagicMock,
+    mock_download_hestia: MagicMock,
+    mock_search: MagicMock,
+    subfolder: str
 ):
-    """
-    Tests each set of cropland medium conditions against a list of nodes that such satisfy it. The function returns the
-    key of the matching condition set, which should match the suffix of the fixtures subfolder.
-    """
-    folder = f"{fixtures_folder}/IpccCarbonInputCategory/cropland-medium/scenario-{key}"
-
-    with open(f"{folder}/site.jsonld", encoding='utf-8') as f:
-        site = json.load(f)
-
-    result = _check_cropland_medium_category(**_get_carbon_input_kwargs(site.get("management", [])))
-    assert result == key
-
-
-@mark.parametrize("key", [1, 2, 3], ids=lambda key: f"scenario-{key}")
-@patch(f"{class_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
-@patch(f"{class_path}.get_crop_residue_incorporated_or_left_on_field_terms", return_value=CROP_RESIDUE_INCORP_TERM_IDS)
-@patch(f"{class_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
-@patch(f"{class_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
-def test_check_cropland_low_category(
-    _mock_get_residue_removed_or_burnt_terms,
-    _mock_get_irrigated_terms,
-    _mock_get_crop_residue_incorporated_or_left_on_field_terms,
-    _mock_get_cover_crop_property_terms,
-    key
-):
-    """
-    Tests each set of cropland low conditions against a list of nodes that such satisfy it. The function returns the
-    key of the matching condition set, which should match the suffix of the fixtures subfolder.
-    """
-    folder = f"{fixtures_folder}/IpccCarbonInputCategory/cropland-low/scenario-{key}"
+    folder = f"{fixtures_folder}/{subfolder}"
 
-    with open(f"{folder}/site.jsonld", encoding='utf-8') as f:
-        site = json.load(f)
+    def load_cycles_from_file():
+        with open(f"{folder}/cycles.jsonld", encoding='utf-8') as f:
+            return json.load(f)
 
-    result = _check_cropland_low_category(**_get_carbon_input_kwargs(site.get("management", [])))
-    assert result == key
-
-
-# subfolder, management_category, expected
-CARBON_INPUT_CATEGORY_PARAMS = [
-    (
-        "cropland-high-with-manure",
-        IpccManagementCategory.FULL_TILLAGE,
-        IpccCarbonInputCategory.CROPLAND_HIGH_WITH_MANURE
-    ),
-    (
-        "cropland-high-without-manure/organic-fertiliser",  # Closes issue 743
-        IpccManagementCategory.FULL_TILLAGE,
-        IpccCarbonInputCategory.CROPLAND_HIGH_WITHOUT_MANURE
-    ),
-    (
-        "cropland-high-without-manure/soil-amendment",  # Closes issue 743
-        IpccManagementCategory.FULL_TILLAGE,
-        IpccCarbonInputCategory.CROPLAND_HIGH_WITHOUT_MANURE
-    ),
-    ("cropland-low/scenario-1", IpccManagementCategory.FULL_TILLAGE, IpccCarbonInputCategory.CROPLAND_LOW),
-    ("cropland-low/scenario-2", IpccManagementCategory.FULL_TILLAGE, IpccCarbonInputCategory.CROPLAND_LOW),
-    ("cropland-low/scenario-3", IpccManagementCategory.FULL_TILLAGE, IpccCarbonInputCategory.CROPLAND_LOW),
-    ("cropland-medium/scenario-1", IpccManagementCategory.FULL_TILLAGE, IpccCarbonInputCategory.CROPLAND_MEDIUM),
-    ("cropland-medium/scenario-2", IpccManagementCategory.FULL_TILLAGE, IpccCarbonInputCategory.CROPLAND_MEDIUM),
-    ("cropland-medium/scenario-3", IpccManagementCategory.FULL_TILLAGE, IpccCarbonInputCategory.CROPLAND_MEDIUM),
-    ("cropland-medium/scenario-4", IpccManagementCategory.FULL_TILLAGE, IpccCarbonInputCategory.CROPLAND_MEDIUM),
-    ("grassland-high", IpccManagementCategory.IMPROVED_GRASSLAND, IpccCarbonInputCategory.GRASSLAND_HIGH),
-    (
-        "grassland-medium/0-improvements",
-        IpccManagementCategory.IMPROVED_GRASSLAND,
-        IpccCarbonInputCategory.GRASSLAND_MEDIUM
-    ),
-    (
-        "grassland-medium/1-improvements",
-        IpccManagementCategory.IMPROVED_GRASSLAND,
-        IpccCarbonInputCategory.GRASSLAND_MEDIUM
+    mock_related_cycles.return_value = (
+        load_cycles_from_file() if isfile(f"{folder}/cycles.jsonld") else []
     )
-]
-
-
-@mark.parametrize(
-    "subfolder, management_category, expected",
-    CARBON_INPUT_CATEGORY_PARAMS,
-    ids=[params[0] for params in CARBON_INPUT_CATEGORY_PARAMS]
-)
-@patch(f"{class_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
-@patch(f"{class_path}.get_crop_residue_incorporated_or_left_on_field_terms", return_value=CROP_RESIDUE_INCORP_TERM_IDS)
-@patch(f"{class_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
-@patch(f"{class_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
-def test_assign_ipcc_carbon_input_category(
-    _mock_get_residue_removed_or_burnt_terms,
-    _mock_get_irrigated_terms,
-    _mock_get_crop_residue_incorporated_or_left_on_field_terms,
-    _mock_get_cover_crop_property_terms,
-    subfolder,
-    management_category,
-    expected
-):
-    folder = f"{fixtures_folder}/IpccCarbonInputCategory/{subfolder}"
 
     with open(f"{folder}/site.jsonld", encoding='utf-8') as f:
         site = json.load(f)
 
-    result = _assign_ipcc_carbon_input_category(site.get("management", []), management_category)
-    assert result == expected
-
-
-# --- TIER 1 TESTS ---
-
-
-@mark.parametrize(
-    "soc_equilibriums, expected",
-    [
-        (
-            [77.000, 70.840, 70.840, 70.840, 70.840, 70.840, 70.840],
-            [77.000, 75.460, 73.920, 72.380, 70.840, 70.840, 70.840]
-        ),
-        (
-            [77.000, 70.840, 70.840, 70.840, 80.850, 80.850, 80.850],
-            [77.000, 75.460, 73.920, 72.380, 74.498, 76.615, 78.733]
-        ),
-        (
-            [80.850, 70.840, 70.840, 70.840, 70.840, 80.850, 80.850],
-            [80.850, 78.348, 75.845, 73.343, 70.840, 73.343, 75.845]
-        ),
-        (
-            [80.850, 80.850, 77.000, 77.000, 77.000, 77.000, 77.000],
-            [80.850, 80.850, 79.888, 78.925, 77.963, 77.000, 77.000]
-        ),
-        (
-            [70.840, 70.840, 70.840, 70.840, 80.850, 80.850, 80.850],
-            [70.840, 70.840, 70.840, 70.840, 73.343, 75.845, 78.348]
-        ),
-        (
-            [70.840, 70.840, 80.850, 80.850, 80.850, 70.840, 80.850],
-            [70.840, 70.840, 73.343, 75.845, 78.348, 76.471, 77.565]
-        ),
-    ],
-    ids=["land-unit-1", "land-unit-2", "land-unit-3", "land-unit-4", "land-unit-5", "land-unit-6"]
-)
-def test_run_tier_1_soc_stocks(soc_equilibriums, expected):
-    """
-    Test the interpolation between SOC equilibriums using test data provided in IPCC (2019).
-    """
-    TIMESTAMPS = [1990, 1995, 2000, 2005, 2010, 2015, 2020]
-    result = _calc_tier_1_soc_stocks(
-        TIMESTAMPS, soc_equilibriums
-    )
-    assert_almost_equal(result, expected, decimal=3)
+    with open(f"{folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
 
+    with patch(f"{class_path}.ITERATIONS", ITERATIONS):
+        result = run(site)
 
-def test_iterate_soc_equilibriums():
-    TIMESTAMPS = [1990, 2020]
-    SOC_EQUILIBRIUMS = [20000, 40000]
+    # Ensure that API calls to retrieve term IDs are properly cached.
+    mock_get_cover_crop_property_terms.call_count <= 1
+    mock_get_crop_residue_incorporated_or_left_on_field_terms.call_count <= 1
+    mock_get_irrigated_terms.call_count <= 1
+    mock_get_residue_removed_or_burnt_terms.call_count <= 1
+    mock_get_upland_rice_crop_terms.call_count <= 1
+    mock_get_upland_rice_land_cover_terms.call_count <= 1
 
-    EXPECTED = (
-        [1990, 2010, 2020],
-        [20000, 40000, 40000]
-    )
+    # Ensure that the property and term utils are properly mocked.
+    mock_download_hestia.assert_not_called()
+    mock_search.assert_not_called()
 
-    result = _iterate_soc_equilibriums(TIMESTAMPS, SOC_EQUILIBRIUMS)
-    assert result == EXPECTED
+    assert order_list(result) == order_list(expected)