hestia-earth-models 0.67.1__py3-none-any.whl → 0.68.1__py3-none-any.whl

tests/models/ipcc2019/test_belowGroundCropResidue.py

@@ -16,7 +16,7 @@ CROP_RESIDUE_TERM = {
 }
 
 
-@patch('hestia_earth.models.utils.completeness.download_hestia', return_value=CROP_RESIDUE_TERM)
+@patch('hestia_earth.models.utils.completeness.download_term', return_value=CROP_RESIDUE_TERM)
 @patch(f"{class_path}._should_run_product", return_value=True)
 def test_should_run(*args):
     crop_product = {'term': {'termType': TermTermType.CROP.value}}
@@ -33,7 +33,7 @@ def test_should_run(*args):
     assert should_run is True
 
 
-@patch('hestia_earth.models.utils.completeness.download_hestia', return_value=CROP_RESIDUE_TERM)
+@patch('hestia_earth.models.utils.completeness.download_term', return_value=CROP_RESIDUE_TERM)
 @patch(f"{class_path}.get_yield_dm", return_value=None)
 def test_should_run_product(mock_get_yield_dm, *args):
     product = {'term': {'@id': 'maizeGrain'}}
@@ -51,7 +51,7 @@ def test_should_run_product(mock_get_yield_dm, *args):
     assert _should_run_product(product) is True
 
 
-@patch('hestia_earth.models.utils.completeness.download_hestia', return_value=CROP_RESIDUE_TERM)
+@patch('hestia_earth.models.utils.completeness.download_term', return_value=CROP_RESIDUE_TERM)
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
 def test_run_crop(*args):
     with open(f"{fixtures_folder}/crop/cycle.jsonld", encoding='utf-8') as f:
@@ -64,7 +64,7 @@ def test_run_crop(*args):
     assert value == expected
 
 
-@patch('hestia_earth.models.utils.completeness.download_hestia', return_value=CROP_RESIDUE_TERM)
+@patch('hestia_earth.models.utils.completeness.download_term', return_value=CROP_RESIDUE_TERM)
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
 def test_run_forage(*args):
     with open(f"{fixtures_folder}/forage/cycle.jsonld", encoding='utf-8') as f:

tests/models/ipcc2019/test_ch4ToAirEntericFermentation.py

@@ -15,7 +15,7 @@ TERMS_BY_ID = {
 }
 
 
-def fake_download_hestia(term_id: str, *args): return TERMS_BY_ID[term_id]
+def fake_download_term(term_id: str, *args): return TERMS_BY_ID[term_id]
 
 
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
@@ -53,7 +53,7 @@ def test_should_run(mock_feed, mock_lookup_value, *args):
 
 
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
-@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
+@patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
 @patch('hestia_earth.models.utils.property.get_node_property', return_value=None)
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
@@ -69,7 +69,7 @@ def test_run(*args):
 
 
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
-@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
+@patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
 @patch('hestia_earth.models.utils.property.get_node_property', return_value=None)
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
@@ -85,7 +85,7 @@ def test_run_dairy(*args):
 
 
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=['milkYieldPerBuffaloRaw'])
-@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
+@patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
 @patch('hestia_earth.models.utils.property.get_node_property', return_value={})
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
@@ -101,7 +101,7 @@ def test_run_with_milkYield(*args):
 
 
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
-@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
+@patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
 @patch('hestia_earth.models.utils.property.get_node_property', return_value={})
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
@@ -117,7 +117,7 @@ def test_run_non_dairy(*args):
 
 
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
-@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
+@patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
 @patch('hestia_earth.models.utils.property.get_node_property', return_value={})
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
@@ -133,7 +133,7 @@ def test_run_with_ionophores(*args):
 
 
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
-@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
+@patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
 @patch('hestia_earth.models.utils.property.get_node_property', return_value={})
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
@@ -149,7 +149,7 @@ def test_run_without_ionophores(*args):
 
 
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
-@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
+@patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
 @patch('hestia_earth.models.utils.property.get_node_property', return_value={})
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
@@ -162,7 +162,7 @@ def test_run_no_feed(*args):
 
 
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
-@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
+@patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
 @patch('hestia_earth.models.utils.property.get_node_property', return_value={})
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
@@ -178,7 +178,7 @@ def test_run_with_system(*args):
 
 
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
-@patch("hestia_earth.models.utils.property.download_hestia", return_value={})
+@patch("hestia_earth.models.utils.property.download_term", return_value={})
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run_default(*args):
     with open(f"{fixtures_folder}/default-value/cycle.jsonld", encoding="utf-8") as f:

tests/models/ipcc2019/test_croppingDuration.py

@@ -8,7 +8,7 @@ class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
-@patch(f"{class_path}.get_table_value", return_value='0')
+@patch(f"{class_path}.get_region_lookup_value", return_value='0')
 @patch(f"{class_path}.has_flooded_rice", return_value=False)
 def test_should_run(mock_flooded_rice, *args):
     # no cycleDuration => no run

tests/models/ipcc2019/test_nonCo2EmissionsToAirNaturalVegetationBurning.py

@@ -0,0 +1,83 @@
+from functools import reduce
+import json
+from pytest import mark
+from os.path import isfile
+from unittest.mock import MagicMock, patch
+
+from tests.utils import fake_new_emission, fixtures_path, order_list
+
+from hestia_earth.models.ipcc2019.nonCo2EmissionsToAirNaturalVegetationBurning import run, _should_run
+
+class_path = 'hestia_earth.models.ipcc2019.nonCo2EmissionsToAirNaturalVegetationBurning'
+fixtures_folder = f"{fixtures_path}/ipcc2019/nonCo2EmissionsToAirNaturalVegetationBurning"
+
+
+def _load_fixture(path: str, default=None):
+    if isfile(path):
+        with open(path, encoding="utf-8") as f:
+            return json.load(f)
+    return default
+
+
+RUN_SCENARIOS = [
+    ("forest-to-cropland", 4),
+    ("historical-land-cover-mix", 3),
+    ("deforestation-reforestation", 1),  # gains should not offset losses
+    ("no-clearance-via-fire", 1),  # LUC in the UK, which has a percentage burned factor of 0
+    ("forest-to-cropland-with-ground-cover", 4)  # Cover crops/ground covers should be ignored
+]
+
+
+RUN_PARAMS = reduce(
+    lambda params, scenario: params + [(scenario[0], scenario[1], i) for i in range(scenario[1])],
+    RUN_SCENARIOS,
+    list()
+)
+"""List of (subfolder: str, num_cycles: int, cycle_index: int)."""
+
+RUN_IDS = [f"{param[0]}, cycle{param[2]}" for param in RUN_PARAMS]
+
+
+@mark.parametrize("subfolder, num_cycles, cycle_index", RUN_PARAMS, ids=RUN_IDS)
+@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+@patch(f"{class_path}.related_cycles")
+@patch(f"{class_path}._get_site")
+def test_run(
+    get_site_mock: MagicMock,
+    related_cycles_mock: MagicMock,
+    _new_emission_mock: MagicMock,
+    subfolder: str,
+    num_cycles: int,
+    cycle_index: int
+):
+    """
+    Test `run` function for each cycle in each scenario.
+    """
+    site = _load_fixture(f"{fixtures_folder}/{subfolder}/site.jsonld")
+    cycle = _load_fixture(f"{fixtures_folder}/{subfolder}/cycle{cycle_index}.jsonld")
+    expected = _load_fixture(f"{fixtures_folder}/{subfolder}/result{cycle_index}.jsonld", default=[])
+
+    cycles = [_load_fixture(f"{fixtures_folder}/{subfolder}/cycle{i}.jsonld") for i in range(num_cycles)]
+
+    get_site_mock.return_value = site
+    related_cycles_mock.return_value = cycles
+
+    result = run(cycle)
+    assert order_list(result) == order_list(expected)
+
+
+def test_should_run_no_data():
+    CYCLE = {}
+    EXPECTED = False
+
+    result, *_ = _should_run(CYCLE)
+    assert result == EXPECTED
+
+
+@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+def test_run_no_data(*_):
+    CYCLE = {}
+    EXPECTED = []
+
+    result = run(CYCLE)
+    assert result == EXPECTED

tests/models/ipcc2019/test_organicCarbonPerHa.py

@@ -231,9 +231,9 @@ IDS_SHOULD_RUN = [p[0] for p in PARAMS_SHOULD_RUN]
 @patch(f"{utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
 @patch(f"{term_path}.search")
 @patch(f"{property_path}.find_term_property", side_effect=fake_find_term_property)
-@patch(f"{property_path}.download_hestia")
+@patch(f"{property_path}.download_term")
 def test_should_run(
-    download_hestia_mock: MagicMock,
+    download_term_mock: MagicMock,
     _find_term_property_mock: MagicMock,
     search_mock: MagicMock,
     _get_cover_crop_property_terms_mock: MagicMock,
@@ -263,15 +263,15 @@ def test_should_run(
     assert result == should_run
 
     # Ensure that the property and term utils are properly mocked.
-    download_hestia_mock.assert_not_called()
+    download_term_mock.assert_not_called()
     search_mock.assert_not_called()
 
 
 @patch(f"{tier_2_utils_path}.related_cycles", return_value=[])
 @patch(f"{term_path}.search")
-@patch(f"{property_path}.download_hestia")
+@patch(f"{property_path}.download_term")
 def test_should_run_no_data(
-    download_hestia_mock: MagicMock,
+    download_term_mock: MagicMock,
     search_mock: MagicMock,
     _related_cycles_mock: MagicMock
 ):
@@ -280,7 +280,7 @@ def test_should_run_no_data(
 
     result = run(SITE)
 
-    download_hestia_mock.assert_not_called()
+    download_term_mock.assert_not_called()
     search_mock.assert_not_called()
     assert result == EXPECTED
 
@@ -304,9 +304,9 @@ PARAMS_RUN = [subfolder for subfolder, should_run in PARAMS_SHOULD_RUN if should
 @patch(f"{utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
 @patch(f"{term_path}.search")
 @patch(f"{property_path}.find_term_property", side_effect=fake_find_term_property)
-@patch(f"{property_path}.download_hestia")
+@patch(f"{property_path}.download_term")
 def test_run(
-    download_hestia_mock: MagicMock,
+    download_term_mock: MagicMock,
     _find_term_property_mock: MagicMock,
     search_mock: MagicMock,
     _get_cover_crop_property_terms_mock: MagicMock,
@@ -346,7 +346,7 @@ def test_run(
     assert order_list(result) == order_list(expected)
 
     # Ensure that the property and term utils are properly mocked.
-    download_hestia_mock.assert_not_called()
+    download_term_mock.assert_not_called()
     search_mock.assert_not_called()
 
 
@@ -371,9 +371,9 @@ PARAMS_RUN_WITH_STATS = [
 @patch(f"{utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
 @patch(f"{term_path}.search")
 @patch(f"{property_path}.find_term_property", side_effect=fake_find_term_property)
-@patch(f"{property_path}.download_hestia")
+@patch(f"{property_path}.download_term")
 def test_run_with_stats(
-    download_hestia_mock: MagicMock,
+    download_term_mock: MagicMock,
     _find_term_property_mock: MagicMock,
     search_mock: MagicMock,
     _get_cover_crop_property_terms_mock: MagicMock,
@@ -409,5 +409,5 @@ def test_run_with_stats(
     assert order_list(result) == order_list(expected)
 
     # Ensure that the property and term utils are properly mocked.
-    download_hestia_mock.assert_not_called()
+    download_term_mock.assert_not_called()
     search_mock.assert_not_called()

tests/models/ipcc2019/test_pastureGrass.py

@@ -31,11 +31,13 @@ TERMS_BY_ID = {
 }
 
 
-def fake_download_hestia(term_id: str, *args): return TERMS_BY_ID.get(term_id, {})
+def fake_download_hestia(term, *args):
+    term_id = term.get('@id') if isinstance(term, dict) else term
+    return TERMS_BY_ID.get(term_id, {})
 
 
 @patch(f"{class_path_utils}.download_hestia", side_effect=fake_download_hestia)
-@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
+@patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_hestia)
 @patch(f"{class_path}.get_wool_terms", return_value=WOOL_TERMS)
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=MILK_YIELD_TERMS)
 @patch(f"{class_path}._new_input", side_effect=fake_new_input)
@@ -51,7 +53,7 @@ def test_run(*args):
 
 
 @patch(f"{class_path_utils}.download_hestia", side_effect=fake_download_hestia)
-@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
+@patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_hestia)
 @patch(f"{class_path}.get_wool_terms", return_value=WOOL_TERMS)
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=MILK_YIELD_TERMS)
 @patch(f"{class_path}._new_input", side_effect=fake_new_input)

tests/models/pooreNemecek2018/test_excretaKgN.py

@@ -59,7 +59,7 @@ def test_should_run(mock_animal_produced, mock_get_feed, *args):
     assert should_run is True
 
 
-@patch("hestia_earth.models.utils.property.download_hestia", return_value={'units': '%'})
+@patch("hestia_earth.models.utils.property.download_term", return_value={'units': '%'})
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
@@ -72,7 +72,7 @@ def test_run(*args):
     assert value == expected
 
 
-@patch("hestia_earth.models.utils.property.download_hestia", return_value={'units': '%'})
+@patch("hestia_earth.models.utils.property.download_term", return_value={'units': '%'})
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
 def test_run_with_liveweight(*args):
     with open(f"{fixtures_folder}/with-liveweight/cycle.jsonld", encoding='utf-8') as f:
@@ -85,7 +85,7 @@ def test_run_with_liveweight(*args):
     assert value == expected
 
 
-@patch("hestia_earth.models.utils.property.download_hestia", return_value={'units': '%'})
+@patch("hestia_earth.models.utils.property.download_term", return_value={'units': '%'})
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
 def test_run_with_carcass(*args):
     with open(f"{fixtures_folder}/with-carcass/cycle.jsonld", encoding='utf-8') as f:
@@ -98,7 +98,7 @@ def test_run_with_carcass(*args):
     assert value == expected
 
 
-@patch("hestia_earth.models.utils.property.download_hestia", return_value={'units': '%'})
+@patch("hestia_earth.models.utils.property.download_term", return_value={'units': '%'})
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
 def test_run_with_head(*args):
     with open(f"{fixtures_folder}/with-head/cycle.jsonld", encoding='utf-8') as f:
@@ -111,7 +111,7 @@ def test_run_with_head(*args):
     assert value == expected
 
 
-@patch("hestia_earth.models.utils.property.download_hestia", return_value={'units': '%'})
+@patch("hestia_earth.models.utils.property.download_term", return_value={'units': '%'})
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
 def test_run_with_liveAquaticSpecies(*args):
     with open(f"{fixtures_folder}/with-liveAquaticSpecies/cycle.jsonld", encoding='utf-8') as f:

tests/models/pooreNemecek2018/test_excretaKgVs.py

@@ -79,7 +79,7 @@ def test_should_run(*args):
     assert should_run is True
 
 
-@patch("hestia_earth.models.utils.property.download_hestia", return_value={'units': '%'})
+@patch("hestia_earth.models.utils.property.download_term", return_value={'units': '%'})
 @patch(f"{class_path}.get_node_property", return_value={'value': 1490.6951744738524})
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
 def test_run(*args):
@@ -93,7 +93,7 @@ def test_run(*args):
     assert value == expected
 
 
-@patch("hestia_earth.models.utils.property.download_hestia", return_value={'units': '%'})
+@patch("hestia_earth.models.utils.property.download_term", return_value={'units': '%'})
 @patch(f"{class_path}.get_node_property", return_value={'value': 1490.6951744738524})
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
 def test_run_excretaKgN(*args):

tests/models/site/post_checks/test_country.py

@@ -0,0 +1,6 @@
+from hestia_earth.models.site.post_checks.country import run
+
+
+def test_run():
+    site = {'country': {'@type': 'Term', '@id': 'GADM-GBR', 'defaultProperties': []}}
+    assert run(site) == {'country': {'@type': 'Term', '@id': 'GADM-GBR'}}

tests/models/site/pre_checks/test_cache_geospatialDatabase.py

@@ -5,7 +5,7 @@ from hestia_earth.models.site.pre_checks.cache_geospatialDatabase import list_ra
 
 def test_list_rasters():
     rasters = list_rasters(years=[2010])
-    assert len(rasters) == 72
+    assert len(rasters) == 73
 
 
 @pytest.mark.parametrize(

tests/models/site/pre_checks/test_country.py

@@ -0,0 +1,12 @@
+from unittest.mock import Mock, patch
+
+from hestia_earth.models.site.pre_checks.country import run
+
+class_path = 'hestia_earth.models.site.pre_checks.country'
+
+
+@patch(f"{class_path}.download_hestia")
+def test_run(mock_download_hestia: Mock):
+    site = {'country': {'@type': 'Term', '@id': 'GADM-GBR'}}
+    run(site)
+    mock_download_hestia.assert_called_once_with('GADM-GBR')

tests/models/test_ecoinventV3.py

@@ -8,8 +8,7 @@ from hestia_earth.models.ecoinventV3 import MODEL, run
 class_path = f"hestia_earth.models.{MODEL}"
 fixtures_folder = os.path.join(fixtures_path, MODEL)
 
-
-TERM_BY_ID = {
+TERMS_BY_ID = {
     '24EpibrassinolideTgai': {
         "defaultProperties": [{
             "@type": "Property",
@@ -40,7 +39,12 @@ TERM_BY_ID = {
 }
 
 
-@patch('hestia_earth.models.utils.blank_node.download_hestia', side_effect=lambda id, *args: TERM_BY_ID[id])
+def fake_download_hestia(term, *args):
+    term_id = term.get('@id') if isinstance(term, dict) else term
+    return TERMS_BY_ID.get(term_id, {})
+
+
+@patch('hestia_earth.models.utils.blank_node.download_term', side_effect=fake_download_hestia)
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:

tests/models/utils/test_blank_node.py

@@ -53,27 +53,19 @@ def test_condense_nodes(folder: str):
 
 
 def test_run_required():
-    term = {
-        '@id': 'ch4ToAirAquacultureSystems',
-        'termType': 'emission'
-    }
-    assert not _run_required('model', term, {
+    assert not _run_required('model', 'ch4ToAirAquacultureSystems', {
         'site': {'siteType': SiteSiteType.CROPLAND.value}
     })
-    assert _run_required('model', term, {
+    assert _run_required('model', 'ch4ToAirAquacultureSystems', {
         'site': {'siteType': SiteSiteType.POND.value}
     }) is True
 
 
 def test_run_model_required():
-    term = {
-        '@id': 'netPrimaryProduction',
-        'termType': 'measurement'
-    }
-    assert _run_model_required('pooreNemecek2018', term, {
+    assert _run_model_required('pooreNemecek2018', 'netPrimaryProduction', {
         'site': {'siteType': SiteSiteType.POND.value}
     }) is True
-    assert not _run_model_required('pooreNemecek2018', term, {
+    assert not _run_model_required('pooreNemecek2018', 'netPrimaryProduction', {
         'site': {'siteType': SiteSiteType.CROPLAND.value}
     })
 

tests/models/utils/test_dataCompleteness.py

@@ -1,4 +1,4 @@
-from unittest.mock import patch
+from unittest.mock import Mock, patch
 from hestia_earth.schema import TermTermType
 
 from hestia_earth.models.utils.completeness import _is_term_type_complete, _is_term_type_incomplete
@@ -6,8 +6,8 @@ from hestia_earth.models.utils.completeness import _is_term_type_complete, _is_t
 class_path = 'hestia_earth.models.utils.completeness'
 
 
-@patch(f"{class_path}.download_hestia")
-def test_is_term_type_complete(mock_download):
+@patch(f"{class_path}.download_term")
+def test_is_term_type_complete(mock_download: Mock):
     cycle = {'completeness': {}}
 
     cycle['completeness'][TermTermType.CROPRESIDUE.value] = True
@@ -29,8 +29,8 @@ def test_is_term_type_complete(mock_download):
     assert not _is_term_type_complete(cycle, 'termid')
 
 
-@patch(f"{class_path}.download_hestia")
-def test_is_term_type_incomplete(mock_download):
+@patch(f"{class_path}.download_term")
+def test_is_term_type_incomplete(mock_download: Mock):
     cycle = {'completeness': {}}
 
     cycle['completeness'][TermTermType.CROPRESIDUE.value] = True

tests/models/utils/test_emission.py

@@ -9,8 +9,8 @@ from hestia_earth.models.utils.emission import _new_emission, min_emission_metho
 class_path = 'hestia_earth.models.utils.emission'
 
 
-@patch(f'{class_path}._include_methodModel', side_effect=lambda n, x: n)
-@patch(f'{class_path}.download_hestia', return_value=TERM)
+@patch(f'{class_path}.include_methodModel', side_effect=lambda n, x: n)
+@patch(f'{class_path}.download_term', return_value=TERM)
 def test_new_emission(*args):
     # with a Term as string
     emission = _new_emission('term')

tests/models/utils/test_indicator.py

@@ -6,8 +6,8 @@ from hestia_earth.models.utils.indicator import _new_indicator
 class_path = 'hestia_earth.models.utils.indicator'
 
 
-@patch(f"{class_path}._include_methodModel", side_effect=lambda n, x: n)
-@patch(f"{class_path}.download_hestia", return_value=TERM)
+@patch(f"{class_path}.include_methodModel", side_effect=lambda n, x: n)
+@patch(f"{class_path}.download_term", return_value=TERM)
 def test_new_indicator(*args):
     # with a Term as string
     indicator = _new_indicator('term')

tests/models/utils/test_input.py

@@ -8,8 +8,8 @@ from hestia_earth.models.utils.input import _new_input, get_feed_inputs
 class_path = 'hestia_earth.models.utils.input'
 
 
-@patch(f"{class_path}._include_model", side_effect=lambda n, x: n)
-@patch(f"{class_path}.download_hestia", return_value=TERM)
+@patch(f"{class_path}.include_model", side_effect=lambda n, x: n)
+@patch(f"{class_path}.download_term", return_value=TERM)
 def test_new_input(*args):
     # with a Term as string
     input = _new_input('term')

tests/models/utils/test_measurement.py

@@ -1,11 +1,9 @@
 import json
 from pytest import mark
 from unittest.mock import patch
-
 from hestia_earth.schema import MeasurementMethodClassification
 
 from tests.utils import fixtures_path, TERM
-
 from hestia_earth.models.utils.measurement import (
     _new_measurement, most_relevant_measurement_value, min_measurement_method_classification
 )
@@ -14,8 +12,8 @@ class_path = 'hestia_earth.models.utils.measurement'
 fixtures_folder = f"{fixtures_path}/utils/measurement"
 
 
-@patch(f"{class_path}._include_method", side_effect=lambda n, **kwargs: n)
-@patch(f"{class_path}.download_hestia", return_value=TERM)
+@patch(f"{class_path}.include_methodModel", side_effect=lambda n, **kwargs: n)
+@patch(f"{class_path}.download_term", return_value=TERM)
 def test_new_measurement(*args):
     # with a Term as string
     measurement = _new_measurement('term')

tests/models/utils/test_practice.py

@@ -3,9 +3,11 @@ from tests.utils import TERM
 
 from hestia_earth.models.utils.practice import _new_practice
 
+class_path = 'hestia_earth.models.utils.practice'
 
-@patch('hestia_earth.models.utils.practice._include_model', side_effect=lambda n, x: n)
-@patch('hestia_earth.models.utils.practice.download_hestia', return_value=TERM)
+
+@patch(f"{class_path}.include_model", side_effect=lambda n, x: n)
+@patch(f"{class_path}.download_term", return_value=TERM)
 def test_new_practice(*args):
     # with a Term as string
     practice = _new_practice('term')

tests/models/utils/test_product.py

@@ -10,8 +10,8 @@ class_path = 'hestia_earth.models.utils.product'
 fixtures_folder = f"{fixtures_path}/utils/product"
 
 
-@patch(f"{class_path}._include_model", side_effect=lambda n, x: n)
-@patch(f"{class_path}.download_hestia", return_value=TERM)
+@patch(f"{class_path}.include_model", side_effect=lambda n, x: n)
+@patch(f"{class_path}.download_term", return_value=TERM)
 def test_new_product(*args):
     # with a Term as string
     product = _new_product('term', 10)

tests/models/utils/test_property.py

@@ -3,9 +3,11 @@ from tests.utils import TERM
 
 from hestia_earth.models.utils.property import _new_property
 
+class_path = 'hestia_earth.models.utils.property'
 
-@patch('hestia_earth.models.utils.property._include_methodModel', side_effect=lambda n, x: n)
-@patch('hestia_earth.models.utils.property.download_hestia', return_value=TERM)
+
+@patch(f'{class_path}.include_methodModel', side_effect=lambda n, x: n)
+@patch(f'{class_path}.download_term', return_value=TERM)
 def test_new_property(*args):
     # with a Term as string
     property = _new_property('term')

tests/models/utils/test_site.py

@@ -25,6 +25,13 @@ def test_related_cycles(*args):
     assert related_cycles({'@id': 'id'}) == [CYCLE]
 
 
+@patch(f"{class_path}.find_related", return_value=[CYCLE])
+@patch(f"{class_path}._load_calculated_node")
+def test_related_cycles_with_mapping(_load_calculated_node_mock, find_related_mock):
+    assert related_cycles({'@id': 'id'}, {'id': CYCLE}) == [CYCLE]
+    _load_calculated_node_mock.assert_not_called()  # Confirm the load function is not used for nodes in mapping
+
+
 def test_valid_site_type():
     site = {'siteType': SiteSiteType.CROPLAND.value}
     assert valid_site_type(site) is True

tests/orchestrator/strategies/run/test_add_blank_node_if_missing.py

@@ -3,7 +3,7 @@ from unittest.mock import patch
 from hestia_earth.orchestrator.strategies.run.add_blank_node_if_missing import should_run
 
 class_path = 'hestia_earth.orchestrator.strategies.run.add_blank_node_if_missing'
-FAKE_EMISSION = {'@id': 'n2OToAirExcretaDirect', 'termType': 'emission'}
+FAKE_EMISSION = {'@id': 'n2OToAirCropResidueDecompositionIndirect', 'termType': 'emission'}
 
 
 @patch(f"{class_path}.get_required_model_param", return_value='')
@@ -95,20 +95,15 @@ def test_should_run_runNonMeasured(mock_node_exists, *args):
     assert should_run(data, model) is True
 
 
-@patch(f"{class_path}.get_table_value", return_value='Cycle')
-@patch(f"{class_path}.download_hestia", return_value=FAKE_EMISSION)
-@patch(f"{class_path}.get_required_model_param", return_value='')
+@patch(f"{class_path}.get_required_model_param", return_value=FAKE_EMISSION.get('@id'))
 @patch(f"{class_path}.find_term_match")
 def test_should_run_check_typeAllowed(mock_node_exists, *args):
-    data = {}
     node = {'term': FAKE_EMISSION}
     mock_node_exists.return_value = node
     model = {}
 
     # type is not allowed => no run
-    data['@type'] = 'Transformation'
-    assert not should_run(data, model)
+    assert not should_run({'type': 'Transformation'}, model)
 
     # type is allowed => run
-    data['@type'] = 'Cycle'
-    assert should_run(data, model) is True
+    assert should_run({'type': 'Cycle'}, model) is True