hestia-earth-models 0.64.14__py3-none-any.whl → 0.65.1__py3-none-any.whl

tests/models/ipcc2019/test_organicCarbonPerHa_tier_1_utils.py

@@ -162,13 +162,15 @@ LAND_USE_CATEGORY_PARAMS = [
     LAND_USE_CATEGORY_PARAMS,
     ids=[params[0] for params in LAND_USE_CATEGORY_PARAMS]
 )
-@patch(f"{term_path}.search")
-@patch(f"{utils_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
+@patch(f"{class_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
 @patch(f"{utils_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
+@patch(f"{utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
+@patch(f"{term_path}.search")
 def test_assign_ipcc_land_use_category(
-    mock_get_irrigated_terms: MagicMock,
-    mock_get_upland_rice_land_cover_terms: MagicMock,
-    mock_search: MagicMock,
+    search_mock: MagicMock,
+    _get_cover_crop_property_terms_mock: MagicMock,
+    _get_irrigated_terms_mock: MagicMock,
+    _get_upland_rice_land_cover_terms_mock: MagicMock,
     subfolder: str,
     soil_category: IpccSoilCategory,
     expected: IpccLandUseCategory
@@ -179,14 +181,10 @@ def test_assign_ipcc_land_use_category(
         site = json.load(f)
 
     result = _assign_ipcc_land_use_category(site.get("management", []), soil_category)
-
-    # Ensure that API calls to retrieve term IDs are properly cached.
-    mock_get_irrigated_terms.call_count <= 1
-    mock_get_upland_rice_land_cover_terms.call_count <= 1
-
-    mock_search.assert_not_called()  # Ensure that the term utils are properly mocked.
     assert result == expected
 
+    search_mock.assert_not_called()  # Ensure that the term utils are properly mocked.
+
 
 # subfolder, land_use_category, expected
 MANAGEMENT_CATEGORY_PARAMS = [
@@ -225,15 +223,15 @@ def test_assign_ipcc_management_category(
 
 
 @mark.parametrize("key", [1, 2, 3, 4], ids=lambda key: f"scenario-{key}")
-@patch(f"{term_path}.search")
-@patch(f"{utils_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
+@patch(f"{class_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_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
+@patch(f"{term_path}.search")
 def test_check_cropland_medium_category(
-    mock_get_cover_crop_property_terms: MagicMock,
-    mock_get_irrigated_terms: MagicMock,
-    mock_get_residue_removed_or_burnt_terms: MagicMock,
-    mock_search: MagicMock,
+    search_mock: MagicMock,
+    _get_cover_crop_property_terms_mock: MagicMock,
+    _get_irrigated_terms_mock: MagicMock,
+    _get_residue_removed_or_burnt_terms_mock: MagicMock,
     key: int
 ):
     """
@@ -246,26 +244,21 @@ def test_check_cropland_medium_category(
         site = json.load(f)
 
     result = _check_cropland_medium_category(**_get_carbon_input_kwargs(site.get("management", [])))
-
-    # Ensure that API calls to retrieve term IDs are properly cached.
-    mock_get_cover_crop_property_terms.call_count <= 1
-    mock_get_irrigated_terms.call_count <= 1
-    mock_get_residue_removed_or_burnt_terms.call_count <= 1
-
-    mock_search.assert_not_called()  # Ensure that the term utils are properly mocked.
     assert result == key
 
+    search_mock.assert_not_called()  # Ensure that the term utils are properly mocked.
+
 
 @mark.parametrize("key", [1, 2, 3], ids=lambda key: f"scenario-{key}")
-@patch(f"{term_path}.search")
-@patch(f"{utils_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
+@patch(f"{class_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_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
+@patch(f"{term_path}.search")
 def test_check_cropland_low_category(
-    mock_get_cover_crop_property_terms: MagicMock,
-    mock_get_irrigated_terms: MagicMock,
-    mock_get_residue_removed_or_burnt_terms: MagicMock,
-    mock_search: MagicMock,
+    search_mock: MagicMock,
+    _get_cover_crop_property_terms_mock: MagicMock,
+    _get_irrigated_terms_mock: MagicMock,
+    _get_residue_removed_or_burnt_terms_mock: MagicMock,
     key: int
 ):
     """
@@ -278,15 +271,10 @@ def test_check_cropland_low_category(
         site = json.load(f)
 
     result = _check_cropland_low_category(**_get_carbon_input_kwargs(site.get("management", [])))
-
-    # Ensure that API calls to retrieve term IDs are properly cached.
-    mock_get_cover_crop_property_terms.call_count <= 1
-    mock_get_irrigated_terms.call_count <= 1
-    mock_get_residue_removed_or_burnt_terms.call_count <= 1
-
-    mock_search.assert_not_called()  # Ensure that the term utils are properly mocked.
     assert result == key
 
+    search_mock.assert_not_called()  # Ensure that the term utils are properly mocked.
+
 
 # subfolder, management_category, expected
 CARBON_INPUT_CATEGORY_PARAMS = [
@@ -331,15 +319,15 @@ CARBON_INPUT_CATEGORY_PARAMS = [
     CARBON_INPUT_CATEGORY_PARAMS,
     ids=[params[0] for params in CARBON_INPUT_CATEGORY_PARAMS]
 )
-@patch(f"{term_path}.search")
-@patch(f"{utils_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
+@patch(f"{class_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_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
+@patch(f"{term_path}.search")
 def test_assign_ipcc_carbon_input_category(
-    mock_get_cover_crop_property_terms: MagicMock,
-    mock_get_irrigated_terms: MagicMock,
-    mock_get_residue_removed_or_burnt_terms: MagicMock,
-    mock_search: MagicMock,
+    search_mock: MagicMock,
+    _get_cover_crop_property_terms_mock: MagicMock,
+    _get_irrigated_terms_mock: MagicMock,
+    _get_residue_removed_or_burnt_terms_mock: MagicMock,
     subfolder: str,
     management_category: IpccManagementCategory,
     expected: IpccCarbonInputCategory
@@ -350,15 +338,10 @@ def test_assign_ipcc_carbon_input_category(
         site = json.load(f)
 
     result = _assign_ipcc_carbon_input_category(site.get("management", []), management_category)
-
-    # Ensure that API calls to retrieve term IDs are properly cached.
-    mock_get_cover_crop_property_terms.call_count <= 1
-    mock_get_irrigated_terms.call_count <= 1
-    mock_get_residue_removed_or_burnt_terms.call_count <= 1
-
-    mock_search.assert_not_called()  # Ensure that the term utils are properly mocked.
     assert result == expected
 
+    search_mock.assert_not_called()  # Ensure that the term utils are properly mocked.
+
 
 TIMESTAMPS_CALC_SOC_STOCK = [1990, 1995, 2000, 2005, 2010, 2015, 2020]
 

tests/models/ipcc2019/test_organicCarbonPerHa_tier_2_utils.py

@@ -25,58 +25,6 @@ YEARS = 100
 MONTHS = 12
 
 
-IRRIGATED_TERM_IDS = [
-    "rainfedDeepWater",
-    "rainfedDeepWaterWaterDepth100Cm",
-    "rainfedDeepWaterWaterDepth50100Cm",
-    "irrigatedTypeUnspecified",
-    "irrigatedCenterPivotIrrigation",
-    "irrigatedContinuouslyFlooded",
-    "irrigatedDripIrrigation",
-    "irrigatedFurrowIrrigation",
-    "irrigatedLateralMoveIrrigation",
-    "irrigatedLocalizedIrrigation",
-    "irrigatedManualIrrigation",
-    "irrigatedSurfaceIrrigationMultipleDrainagePeriods",
-    "irrigatedSurfaceIrrigationSingleDrainagePeriod",
-    "irrigatedSprinklerIrrigation",
-    "irrigatedSubIrrigation",
-    "irrigatedSurfaceIrrigationDrainageRegimeUnspecified"
-]
-
-
-UPLAND_RICE_LAND_COVER_TERM_IDS = [
-    "ricePlantUpland"
-]
-
-UPLAND_RICE_CROP_TERM_IDS = [
-    "riceGrainInHuskUpland"
-]
-
-DEFAULT_PROPERTIES = {
-    "manureDryKgMass": {
-        "carbonContent": {
-            "value": 38.4
-        },
-        "nitrogenContent": {
-            "value": 2.65
-        },
-        "ligninContent": {
-            "value": 9.67
-        }
-    }
-}
-
-
-def fake_find_term_property(term: dict, property: str, *_):
-    term_id = term.get('@id', None)
-    return DEFAULT_PROPERTIES.get(term_id, {}).get(property, {})
-
-
-def fake_calc_descriptive_stats(arr: NDArray, *_args, **_kwargs):
-    return {"value": [row[0] for row in arr]}
-
-
 def assert_elements_between(arr: NDArray, min: float, max: float):
     assert ((min <= arr) & (arr <= max)).all()
 

tests/models/linkedImpactAssessment/test_freshwaterWithdrawalsInputsProduction.py

@@ -4,12 +4,14 @@ from tests.utils import fixtures_path, fake_new_indicator, fake_load_impacts
 
 from hestia_earth.models.linkedImpactAssessment.freshwaterWithdrawalsInputsProduction import TERM_ID, run
 
-class_path = f"hestia_earth.models.linkedImpactAssessment.{TERM_ID}"
-fixtures_folder = f"{fixtures_path}/linkedImpactAssessment/{TERM_ID}"
+from hestia_earth.models.linkedImpactAssessment import MODEL
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+utils_class_path = f"hestia_earth.models.{MODEL}.utils"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
-@patch('hestia_earth.models.utils.input.load_impacts', side_effect=fake_load_impacts)
-@patch('hestia_earth.models.linkedImpactAssessment.utils._new_indicator', side_effect=fake_new_indicator)
+@patch(f"{utils_class_path}.load_impacts", side_effect=fake_load_impacts)
+@patch(f"{utils_class_path}._new_indicator", side_effect=fake_new_indicator)
 def test_run(*args):
     with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:
         impact = json.load(f)

tests/models/linkedImpactAssessment/test_landOccupationInputsProduction.py

@@ -2,14 +2,16 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_indicator, fake_load_impacts
 
+from hestia_earth.models.linkedImpactAssessment import MODEL
 from hestia_earth.models.linkedImpactAssessment.landOccupationInputsProduction import TERM_ID, run
 
-class_path = f"hestia_earth.models.linkedImpactAssessment.{TERM_ID}"
-fixtures_folder = f"{fixtures_path}/linkedImpactAssessment/{TERM_ID}"
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+utils_class_path = f"hestia_earth.models.{MODEL}.utils"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
-@patch('hestia_earth.models.utils.input.load_impacts', side_effect=fake_load_impacts)
-@patch('hestia_earth.models.linkedImpactAssessment.utils._new_indicator', side_effect=fake_new_indicator)
+@patch(f"{utils_class_path}.load_impacts", side_effect=fake_load_impacts)
+@patch(f"{utils_class_path}._new_indicator", side_effect=fake_new_indicator)
 def test_run(*args):
     with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:
         impact = json.load(f)

tests/models/linkedImpactAssessment/{test_landTransformationFromForest100YearAverageInputsProduction.py → test_landTransformation100YearAverageInputsProduction.py}

@@ -2,16 +2,18 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_indicator, fake_load_impacts
 
-from hestia_earth.models.linkedImpactAssessment.landTransformationFromForest100YearAverageInputsProduction import (
+from hestia_earth.models.linkedImpactAssessment import MODEL
+from hestia_earth.models.linkedImpactAssessment.landTransformation100YearAverageInputsProduction import (
     TERM_ID, run
 )
 
-class_path = f"hestia_earth.models.linkedImpactAssessment.{TERM_ID}"
-fixtures_folder = f"{fixtures_path}/linkedImpactAssessment/{TERM_ID}"
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+utils_class_path = f"hestia_earth.models.{MODEL}.utils"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
-@patch('hestia_earth.models.utils.input.load_impacts', side_effect=fake_load_impacts)
-@patch('hestia_earth.models.linkedImpactAssessment.utils._new_indicator', side_effect=fake_new_indicator)
+@patch(f"{utils_class_path}.load_impacts", side_effect=fake_load_impacts)
+@patch(f"{utils_class_path}._new_indicator", side_effect=fake_new_indicator)
 def test_run(*args):
     with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:
         impact = json.load(f)

tests/models/linkedImpactAssessment/{test_landTransformationFromForest20YearAverageInputsProduction.py → test_landTransformation20YearAverageInputsProduction.py}

@@ -2,16 +2,18 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_indicator, fake_load_impacts
 
-from hestia_earth.models.linkedImpactAssessment.landTransformationFromForest20YearAverageInputsProduction import (
+from hestia_earth.models.linkedImpactAssessment import MODEL
+from hestia_earth.models.linkedImpactAssessment.landTransformation20YearAverageInputsProduction import (
     TERM_ID, run
 )
 
-class_path = f"hestia_earth.models.linkedImpactAssessment.{TERM_ID}"
-fixtures_folder = f"{fixtures_path}/linkedImpactAssessment/{TERM_ID}"
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+utils_class_path = f"hestia_earth.models.{MODEL}.utils"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
-@patch('hestia_earth.models.utils.input.load_impacts', side_effect=fake_load_impacts)
-@patch('hestia_earth.models.linkedImpactAssessment.utils._new_indicator', side_effect=fake_new_indicator)
+@patch(f"{utils_class_path}.load_impacts", side_effect=fake_load_impacts)
+@patch(f"{utils_class_path}._new_indicator", side_effect=fake_new_indicator)
 def test_run(*args):
     with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:
         impact = json.load(f)

tests/models/pooreNemecek2018/test_excretaKgN.py

@@ -28,7 +28,7 @@ def test_should_run(mock_animal_produced, mock_get_feed, *args):
     should_run, *args = _should_run(cycle)
     assert not should_run
 
-    # completeness True => no run
+    # completeness True => run
     cycle = {
         'completeness': {
             'animalFeed': True,
@@ -38,7 +38,7 @@ def test_should_run(mock_animal_produced, mock_get_feed, *args):
     mock_get_feed.return_value = 5
     mock_animal_produced.return_value = 5
     should_run, *args = _should_run(cycle)
-    assert not should_run
+    assert should_run is True
 
     # excreta already present with no value => run
     cycle['products'] = [

tests/models/pooreNemecek2018/test_excretaKgVs.py

@@ -58,7 +58,7 @@ def test_should_run(*args):
         ]
     })
     should_run, *args = _should_run(cycle)
-    assert not should_run
+    assert should_run is True
 
     # excreta already present with no value => run
     cycle['products'] = [

tests/models/pooreNemecek2018/test_utils.py

@@ -0,0 +1,26 @@
+import os
+import json
+import pytest
+from tests.utils import fixtures_path
+
+from hestia_earth.models.pooreNemecek2018.utils import MODEL, get_excreta_product_with_ratio
+
+fixtures_folder = os.path.join(fixtures_path, MODEL, 'utils')
+
+
+@pytest.mark.parametrize(
+    'folder',
+    [
+        ('no-system'),
+        ('single-system'),
+        ('multiple-systems'),
+    ]
+)
+def test_get_excreta_product_with_ratio(folder: str):
+    with open(os.path.join(fixtures_folder, folder, 'cycle.jsonld'), 'r') as f:
+        cycle = json.load(f)
+
+    with open(os.path.join(fixtures_folder, folder, 'result.jsonld'), 'r') as f:
+        expected = json.load(f)
+
+    assert get_excreta_product_with_ratio(cycle, lookup='excretaKgNTermIds') == expected, folder

tests/models/site/test_management.py

@@ -1,43 +1,25 @@
+import os
 import json
-from unittest.mock import Mock, patch
 import pytest
+from unittest.mock import Mock, patch
 from hestia_earth.schema import SiteSiteType
 
 from tests.utils import fixtures_path, fake_new_management
 from hestia_earth.models.site.management import MODEL, MODEL_KEY, run
 
 class_path = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
-fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"
+fixtures_folder = os.path.join(fixtures_path, MODEL, MODEL_KEY)
 
 _LAND_COVER_TERM_BY_SITE_TYPE = {
     SiteSiteType.ANIMAL_HOUSING.value: "animalHousing",
     SiteSiteType.CROPLAND.value: "cropland"
 }
+_folders = [d for d in os.listdir(fixtures_folder) if os.path.isdir(os.path.join(fixtures_folder, d))]
 
 
 @pytest.mark.parametrize(
-    "test_name,fixture_path",
-    [
-        ("Products and practices", f"{fixtures_folder}"),
-        ("Example 1", f"{fixtures_folder}/inputs/example1"),
-        ("Example 2", f"{fixtures_folder}/inputs/example2"),
-        ("Example 3", f"{fixtures_folder}/inputs/example3"),
-        ("Example 4", f"{fixtures_folder}/inputs/example4"),
-        ("Condense Nodes", f"{fixtures_folder}/inputs/condense_nodes"),
-        # Expected:
-        #   - appleTree (81) x 3 condenses 2020-03-01 to 2021-02-15
-        #   - animalManureUsed (true) x 2 condenses 2001-04-01 to 2001-12-31
-        #   - treeNutTree, lebbekTree (82) does not condense [different terms]
-        #   - organicFertiliserUsed (true|false) does not condense [different values]
-        #   - glassOrHighAccessibleCover (83) does not condense [different date ranges (overlapping)]
-        #   - durianTree (84) does not condense [different date ranges (disjoint)]
-        #   - irrigatedSurfaceIrrigationContinuouslyFlooded (85) does not condense ["%" units]
-        #   - sassafrasTree (86) x 2 condenses 2001-01-01 to 2004-12-31
-        #   - bananaPlant (87) does not condense [non-consecutive years]
-        #   - durianTree (89) does not condense [dates overwritten See 808]
-        ("Site Type", f"{fixtures_folder}/inputs/site_type"),
-        ("Multiple products but only 1 with landCover id", f"{fixtures_folder}/multiple-products"),
-    ]
+    "folder",
+    _folders
 )
 @patch(
     f"{class_path}.get_landCover_term_id_from_site_type",
@@ -49,9 +31,10 @@ def test_run(
         mock_related_cycles: Mock,
         mock_new_management: Mock,
         mock_land_cover_lookup: Mock,
-        test_name: str,
-        fixture_path: str
+        folder: str
 ):
+    fixture_path = os.path.join(fixtures_folder, folder)
+
     with open(f"{fixture_path}/cycles.jsonld", encoding='utf-8') as f:
         cycles = json.load(f)
     mock_related_cycles.return_value = cycles
@@ -67,4 +50,4 @@ def test_run(
         expected = json.load(f)
 
     result = run(site)
-    assert result == expected, test_name
+    assert result == expected, fixture_path

tests/models/test_cache_sites.py

@@ -16,22 +16,36 @@ def test_run(mock_run_query, *args):
         data = json.load(f)
     with open(f"{fixtures_folder}/cache.json", encoding='utf-8') as f:
         cache = json.load(f)
-    with open(f"{fixtures_folder}/params.json", encoding='utf-8') as f:
-        params = json.load(f)
 
-    mock_run_query.return_value = [10] * len(params.get('rasters', []) + params.get('vectors', []))
+    with open(f"{fixtures_folder}/rasters-no-years.json", encoding='utf-8') as f:
+        rasters_no_years = json.load(f)
+    with open(f"{fixtures_folder}/rasters-years.json", encoding='utf-8') as f:
+        rasters_years = json.load(f)
+    with open(f"{fixtures_folder}/vectors.json", encoding='utf-8') as f:
+        vectors = json.load(f)
 
-    sites = run(data.get('nodes', []), [2019, 2020], include_region=False)
+    mock_run_query.side_effect = [
+        [10] * len(rasters_no_years),
+        [10] * len(vectors),
+        [10] * len(rasters_years)
+    ]
+
+    sites = run(sites=data.get('nodes', []), years=[2019, 2020], include_region=False)
 
     mock_run_query.assert_has_calls([
         call({
             "ee_type": "raster",
-            "collections": params.get('rasters', []),
+            "collections": rasters_no_years,
             "coordinates": coordinates
         }),
         call({
             "ee_type": "vector",
-            "collections": params.get('vectors', []),
+            "collections": vectors,
+            "coordinates": coordinates
+        }),
+        call({
+            "ee_type": "raster",
+            "collections": rasters_years,
             "coordinates": coordinates
         })
     ])
@@ -44,22 +58,36 @@ def test_run(mock_run_query, *args):
 def test_run_include_region(mock_run_query, *args):
     with open(f"{fixtures_folder}/data.json", encoding='utf-8') as f:
         data = json.load(f)
-    with open(f"{fixtures_folder}/params.json", encoding='utf-8') as f:
-        params = json.load(f)
 
-    mock_run_query.return_value = [10] * len(params.get('rasters', []) + params.get('vectors', []))
+    with open(f"{fixtures_folder}/rasters-no-years.json", encoding='utf-8') as f:
+        rasters_no_years = json.load(f)
+    with open(f"{fixtures_folder}/rasters-years.json", encoding='utf-8') as f:
+        rasters_years = json.load(f)
+    with open(f"{fixtures_folder}/vectors-with-regions.json", encoding='utf-8') as f:
+        vectors_with_regions = json.load(f)
 
-    run(data.get('nodes', []), [2019, 2020], include_region=True)
+    mock_run_query.side_effect = [
+        [10] * len(rasters_no_years),
+        [10] * len(vectors_with_regions),
+        [10] * len(rasters_years)
+    ]
+
+    run(sites=data.get('nodes', []), years=[2019, 2020], include_region=True)
 
     mock_run_query.assert_has_calls([
         call({
             "ee_type": "raster",
-            "collections": params.get('rasters', []),
+            "collections": rasters_no_years,
             "coordinates": coordinates
         }),
         call({
             "ee_type": "vector",
-            "collections": params.get('vectors-with-regions', []),
+            "collections": vectors_with_regions,
+            "coordinates": coordinates
+        }),
+        call({
+            "ee_type": "raster",
+            "collections": rasters_years,
             "coordinates": coordinates
         })
     ])

tests/models/utils/test_blank_node.py

@@ -216,14 +216,6 @@ def test_run_required():
         'site': {'siteType': SiteSiteType.POND.value}
     }) is True
 
-    term = {
-        '@id': 'landTransformationFromCropland20YearAverageDuringCycle',
-        'termType': 'resourceUse'
-    }
-    assert not _run_required('hyde32', term, {
-        'site': {'siteType': SiteSiteType.CROPLAND.value}
-    })
-
 
 def test_run_model_required():
     term = {

tests/models/utils/test_cache_sources.py

@@ -0,0 +1,21 @@
+from unittest.mock import patch
+
+from hestia_earth.models.utils.cache_sources import CACHE_KEY, CACHE_SOURCES_KEY, _has_value, cache_sources
+
+class_path = 'hestia_earth.models.utils.cache_sources'
+sources = {'source a': {'@type': 'Source', '@id': 'source-1'}}
+
+
+def test_should_run():
+    # no existing cache => run
+    assert not _has_value({CACHE_KEY: {}})
+    assert not _has_value({CACHE_KEY: {CACHE_SOURCES_KEY: {}}})
+
+    # with existing cache => no run
+    assert _has_value({CACHE_KEY: {CACHE_SOURCES_KEY: {'sample': 'a'}}}) is True
+
+
+@patch(f"{class_path}.find_sources", return_value=sources)
+def test_run(*args):
+    result = cache_sources({})
+    assert result.get(CACHE_KEY).get(CACHE_SOURCES_KEY) == sources

hestia_earth/models/blonkConsultants2016/landTransformationFromForest20YearAverageDuringCycle.py

@@ -1,90 +0,0 @@
-from hestia_earth.models.log import debugValues, logRequirements, logShouldRun
-from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.impact_assessment import get_product, get_site
-from hestia_earth.models.utils.cycle import land_occupation_per_kg
-from .utils import get_emission_factor
-from . import MODEL
-
-REQUIREMENTS = {
-    "ImpactAssessment": {
-        "product": {"@type": "Product", "term": {"@type": "Term"}},
-        "site": {
-            "@type": "Site",
-            "siteType": ""
-        },
-        "cycle": {
-            "@type": "Cycle",
-            "products": [{
-                "@type": "Product",
-                "primary": "True",
-                "value": "> 0",
-                "economicValueShare": "> 0"
-            }],
-            "or": [
-                {
-                    "@doc": "if the [cycle.functionalUnit](https://hestia.earth/schema/Cycle#functionalUnit) = 1 ha, additional properties are required",  # noqa: E501
-                    "cycleDuration": "",
-                    "practices": [{"@type": "Practice", "value": "", "term.@id": "longFallowRatio"}]
-                },
-                {
-                    "@doc": "for plantations, additional properties are required",
-                    "practices": [
-                        {"@type": "Practice", "value": "", "term.@id": "nurseryDensity"},
-                        {"@type": "Practice", "value": "", "term.@id": "nurseryDuration"},
-                        {"@type": "Practice", "value": "", "term.@id": "plantationProductiveLifespan"},
-                        {"@type": "Practice", "value": "", "term.@id": "plantationDensity"},
-                        {"@type": "Practice", "value": "", "term.@id": "plantationLifespan"},
-                        {"@type": "Practice", "value": "", "term.@id": "rotationDuration"}
-                    ]
-                }
-            ]
-        }
-    }
-}
-LOOKUPS = {
-    "crop": "cropGroupingFaostatArea",
-    "region-crop-cropGroupingFaostatArea-landTransformation20YearsAverage": "use crop grouping above or default to site.siteType"  # noqa: E501
-}
-RETURNS = {
-    "Indicator": [{
-        "value": ""
-    }]
-}
-TERM_ID = 'landTransformationFromForest20YearAverageDuringCycle'
-
-
-def _indicator(term_id: str, value: float):
-    indicator = _new_indicator(term_id, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
-def _run(impact_assessment: dict, land_occupation_m2: float, factor: float):
-    value = land_occupation_m2 * (factor or 0)
-    debugValues(impact_assessment, model=MODEL, term=TERM_ID,
-                value=value)
-    return _indicator(TERM_ID, value)
-
-
-def _should_run(impact_assessment: dict):
-    cycle = impact_assessment.get('cycle', {})
-    product = get_product(impact_assessment)
-    site = get_site(impact_assessment)
-    land_occupation_m2_kg = land_occupation_per_kg(MODEL, TERM_ID, cycle, site, product)
-    land_transformation_factor = get_emission_factor(TERM_ID, cycle, 'landTransformation20YearsAverage')
-
-    logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
-                    land_occupation_m2_kg=land_occupation_m2_kg,
-                    land_transformation_factor=land_transformation_factor)
-
-    should_run = all([
-        land_occupation_m2_kg is not None,
-        land_occupation_m2_kg == 0 or land_transformation_factor is not None
-    ])
-    logShouldRun(impact_assessment, MODEL, TERM_ID, should_run)
-    return should_run, land_occupation_m2_kg, land_transformation_factor
-
-
-def run(impact_assessment: dict):
-    should_run, land_occupation_m2, factor = _should_run(impact_assessment)
-    return [_run(impact_assessment, land_occupation_m2, factor)] if should_run else []