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

tests/models/cml2001Baseline/test_abioticResourceDepletionFossilFuels.py

@@ -17,7 +17,7 @@ def fake_rounded_indicator(value: float):
     return indicator
 
 
-def fake_download_hestia(filename, column_name):
+def fake_get_terms(filename, column_name):
     data = {
         'fuel.csv': ["lignite", "conventionalCrudeOil", "naturalGas", "coalTar"],
         'electricity.csv': ['electricityGridMarketMix', 'electricityGridHardCoal', 'electricityProducedOnSiteHardCoal',
@@ -105,7 +105,7 @@ good_nuclear_indicator_mj = {
          "good nuclear fuel use indicator in mj",
          ]
 )
-@patch(f"{class_path}.get_all_non_renewable_terms", side_effect=fake_download_hestia)
+@patch(f"{class_path}.get_all_non_renewable_terms", side_effect=fake_get_terms)
 def test_should_run(mock_get_all_non_renewable_terms, resources, expected, num_inputs):
     with open(f"{fixtures_folder}/impactassessment.jsonld", encoding='utf-8') as f:
         impactassessment = json.load(f)
@@ -117,7 +117,7 @@ def test_should_run(mock_get_all_non_renewable_terms, resources, expected, num_i
     assert len(resources) == num_inputs
 
 
-@patch(f"{class_path}.get_all_non_renewable_terms", side_effect=fake_download_hestia)
+@patch(f"{class_path}.get_all_non_renewable_terms", side_effect=fake_get_terms)
 @patch(f"{class_path}._indicator", side_effect=fake_rounded_indicator)
 def test_run(*args):
     with open(f"{fixtures_folder}/impactassessment.jsonld", encoding='utf-8') as f:

tests/models/cml2001Baseline/test_resourceUseEnergyDepletionDuringCycle.py

@@ -112,7 +112,7 @@ input_nuclear_fuel_kwh = {
         "bad indicator input in kg no property to convert to mj"
     ]
 )
-@patch('hestia_earth.models.utils.property.download_hestia', return_value={})
+@patch('hestia_earth.models.utils.property.download_term', return_value={})
 def test_should_run(mock_download, inputs, expected, num_inputs):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)

tests/models/cycle/test_coldCarcassWeightPerHead.py

@@ -34,7 +34,7 @@ def test_should_run():
     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_property", side_effect=fake_new_property)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:

tests/models/cycle/test_coldDressedCarcassWeightPerHead.py

@@ -34,7 +34,7 @@ def test_should_run():
     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_property", side_effect=fake_new_property)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:

tests/models/cycle/test_concentrateFeed.py

@@ -37,7 +37,7 @@ def test_should_run(mock_primary_product, *args):
     assert should_run is True
 
 
-@patch('hestia_earth.models.utils.property.download_hestia', return_value={})  # make sure default props are not loaded
+@patch('hestia_earth.models.utils.property.download_term', return_value={})  # make sure default props are not loaded
 @patch(f"{class_path}.get_energy_digestibility_terms", return_value=ED_TERM_IDS)
 @patch(f"{class_path}.get_digestible_energy_terms", return_value=DE_TERM_IDS)
 @patch(f"{class_path}._new_property", side_effect=fake_new_property)

tests/models/cycle/test_energyContentLowerHeatingValue.py

@@ -24,7 +24,7 @@ def test_should_run_input():
     assert _should_run_input({})(input) 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_wood_fuel_terms", return_value=['woodPellets', 'woodFuel'])
 @patch(f"{class_path}._new_property", side_effect=fake_new_property)
 def test_run(*args):

tests/models/cycle/test_excretaKgMass.py

@@ -84,7 +84,7 @@ def test_should_run():
     assert should_run is True
 
 
-@patch(f"{class_path}.download_hestia", side_effect=lambda id, *args: TERMS[id])
+@patch(f"{class_path}.download_term", side_effect=lambda id, *args: TERMS[id])
 @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:

tests/models/cycle/test_feedConversionRatio.py

@@ -14,7 +14,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"{class_path}.get_total_value_converted_with_min_ratio", return_value=10)
@@ -37,7 +37,7 @@ def test_should_run(*args):
     assert should_run is True
 
 
-@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(f"{class_path}.is_run_required", return_value=True)
 @patch(f"{class_path}._new_practice", side_effect=fake_new_practice)
 def test_run(*args):
@@ -51,7 +51,7 @@ def test_run(*args):
     assert value == expected
 
 
-@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(f"{class_path}.is_run_required", return_value=True)
 @patch(f"{class_path}._new_practice", side_effect=fake_new_practice)
 def test_run_with_carcass(*args):

tests/models/cycle/test_pastureGrass.py

@@ -18,7 +18,7 @@ def test_should_run():
     assert _should_run(cycle) is True
 
 
-@patch(f"{class_path}.download_hestia", return_value={'@type': 'Term', '@id': KEY_TERM_ID})
+@patch(f"{class_path}.download_term", return_value={'@type': 'Term', '@id': KEY_TERM_ID})
 @patch(f"{class_path}._new_practice", side_effect=fake_new_practice)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:

tests/models/cycle/test_readyToCookWeightPerHead.py

@@ -34,7 +34,7 @@ def test_should_run():
     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_property", side_effect=fake_new_property)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:

tests/models/environmentalFootprintV3_1/test_photochemicalOzoneCreationPotentialHumanHealthNmvocEq.py

@@ -0,0 +1,30 @@
+import json
+from unittest.mock import patch
+
+from hestia_earth.models.environmentalFootprintV3_1 import MODEL_FOLDER
+from hestia_earth.models.environmentalFootprintV3_1.photochemicalOzoneCreationPotentialHumanHealthNmvocEq import (
+    TERM_ID,
+    run,
+)
+from tests.utils import fixtures_path, fake_new_indicator
+
+class_path = f"hestia_earth.models.{MODEL_FOLDER}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL_FOLDER}/{TERM_ID}"
+
+
+@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
+def test_run(*args):
+    with open(
+            f"{fixtures_path}/impact_assessment/emissions/impact-assessment.jsonld",
+            encoding="utf-8",
+    ) as f:
+        impact = json.load(f)
+    with open(f"{fixtures_folder}/emissions.jsonld", encoding="utf-8") as f:
+        emissions = json.load(f)
+
+    with open(f"{fixtures_folder}/result.jsonld", encoding="utf-8") as f:
+        expected = json.load(f)
+
+    impact["emissionsResourceUse"] = emissions
+    value = run(impact)
+    assert value == expected

tests/models/environmentalFootprintV3_1/test_soilQualityIndexTotalLandUseEffects.py

@@ -10,14 +10,37 @@ from tests.utils import fixtures_path, fake_new_indicator
 class_path = f"hestia_earth.models.{MODEL_FOLDER}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL_FOLDER}/{TERM_ID}"
 
-transform_indicator = {'term': {'@id': 'soilQualityIndexLandTransformation'}, 'value': 10}
-occupation_indicator = {'term': {'@id': 'soilQualityIndexLandOccupation'}, 'value': 10}
-missing_value_indicator = {'term': {'@id': 'soilQualityIndexLandOccupation'}}
-bad_value_indicator = {'term': {'@id': 'soilQualityIndexLandOccupation'}, 'value': "42"}
+transform_indicator = {
+    "term": {
+        "@id": "soilQualityIndexLandTransformation",
+        "termType": "characterisedIndicator",
+    },
+    "value": 10,
+}
+occupation_indicator = {
+    "term": {
+        "@id": "soilQualityIndexLandOccupation",
+        "termType": "characterisedIndicator",
+    },
+    "value": 10,
+}
+missing_value_indicator = {
+    "term": {
+        "@id": "soilQualityIndexLandOccupation",
+        "termType": "characterisedIndicator",
+    }
+}
+bad_value_indicator = {
+    "term": {
+        "@id": "soilQualityIndexLandOccupation",
+        "termType": "characterisedIndicator",
+    },
+    "value": "42",
+}
 
 
 @mark.parametrize(
-    "emissions_resource_use, expected, num_expected",
+    "impacts, expected, num_expected",
     [
         ([], False, 0),
         ([transform_indicator], False, 1),
@@ -32,11 +55,11 @@ bad_value_indicator = {'term': {'@id': 'soilQualityIndexLandOccupation'}, 'value
     ids=["Empty", "missing obligatory occupation", "duplicate entry", "no value in entry", "bad value in entry",
          "correct assessment", "just occupation", "multiple occupations and transformations"]
 )
-def test_should_run(emissions_resource_use, expected, num_expected):
+def test_should_run(impacts, expected, num_expected):
     with open(f"{fixtures_folder}/impactassessment.jsonld", encoding='utf-8') as f:
         impactassessment = json.load(f)
 
-    impactassessment['emissionsResourceUse'] = emissions_resource_use
+    impactassessment['impacts'] = impacts
 
     should_run, indicators = _should_run(impactassessment)
     assert should_run is expected

tests/models/faostat2018/product/test_price.py

@@ -9,12 +9,13 @@ fixtures_folder = f"{fixtures_path}/{MODEL}/product/{MODEL_KEY}"
 
 
 def test_lookup_data():
-    assert _lookup_data('cocoaSeedDehulled', 'Cocoa beans', 'GADM-GHA', 2000, term_type='crop') == 412.9
+    country = {'@id': 'GADM-GHA'}
+    assert _lookup_data('cocoaSeedDehulled', 'Cocoa beans', country, 2000, term_type='crop') == 412.9
     # average price per tonne as year value is missing
-    assert _lookup_data('cocoaSeedDehulled', 'Cocoa beans', 'GADM-GHA', 2012, term_type='crop') == 844.0571428571428
+    assert _lookup_data('cocoaSeedDehulled', 'Cocoa beans', country, 2012, term_type='crop') == 844.0571428571428
 
 
-@patch(f"{class_path}.download_hestia", return_value={})
+@patch(f"{class_path}.download_term", return_value={})
 def test_run_crop(*args):
     with open(f"{fixtures_folder}/crop/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
@@ -26,7 +27,19 @@ def test_run_crop(*args):
     assert value == expected
 
 
-@patch(f"{class_path}.download_hestia", return_value={})
+@patch(f"{class_path}.download_term", return_value={})
+def test_run_missing_country_price(*args):
+    with open(f"{fixtures_folder}/missing-country-price/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/missing-country-price/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(cycle)
+    assert value == expected
+
+
+@patch(f"{class_path}.download_term", return_value={})
 def test_run_animalProduct_kg(*args):
     with open(f"{fixtures_folder}/animalProduct/kg/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
@@ -38,7 +51,7 @@ def test_run_animalProduct_kg(*args):
     assert value == expected
 
 
-@patch(f"{class_path}.download_hestia", return_value={})
+@patch(f"{class_path}.download_term", return_value={})
 def test_run_animalProduct_number(*args):
     with open(f"{fixtures_folder}/animalProduct/number/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
@@ -50,15 +63,15 @@ def test_run_animalProduct_number(*args):
     assert value == expected
 
 
-@patch(f"{class_path}.download_hestia")
-def test_run_liveAnimal_chicken(mock_download_hestia):
+@patch(f"{class_path}.download_term")
+def test_run_liveAnimal_chicken(mock_download_term):
     with open(f"{fixtures_folder}/liveAnimal/chicken/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
 
     with open(f"{fixtures_folder}/liveAnimal/chicken/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
-    mock_download_hestia.return_value = {
+    mock_download_term.return_value = {
         "@id": "meatChickenLiveweight",
         "@type": "Term",
         "units": "kg liveweight",
@@ -68,15 +81,15 @@ def test_run_liveAnimal_chicken(mock_download_hestia):
     assert value == expected
 
 
-@patch(f"{class_path}.download_hestia")
-def test_run_liveAnimal_pig(mock_download_hestia):
+@patch(f"{class_path}.download_term")
+def test_run_liveAnimal_pig(mock_download_term):
     with open(f"{fixtures_folder}/liveAnimal/pig/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
 
     with open(f"{fixtures_folder}/liveAnimal/pig/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
-    mock_download_hestia.return_value = {
+    mock_download_term.return_value = {
         "@id": "meatPigLiveweight",
         "@type": "Term",
         "units": "kg liveweight",
@@ -86,15 +99,15 @@ def test_run_liveAnimal_pig(mock_download_hestia):
     assert value == expected
 
 
-@patch(f"{class_path}.download_hestia")
-def test_run_liveAnimal_sheepLamb(mock_download_hestia):
+@patch(f"{class_path}.download_term")
+def test_run_liveAnimal_sheepLamb(mock_download_term):
     with open(f"{fixtures_folder}/liveAnimal/sheepLamb/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
 
     with open(f"{fixtures_folder}/liveAnimal/sheepLamb/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
-    mock_download_hestia.return_value = {
+    mock_download_term.return_value = {
         "@id": "meatSheepLiveweight",
         "@type": "Term",
         "units": "kg liveweight",

tests/models/faostat2018/test_faostat_utils.py

@@ -1,30 +1,14 @@
-from unittest.mock import patch
-
-import numpy
-
-from hestia_earth.models.faostat2018.utils import (get_sum_of_columns, MODEL, get_land_ratio,
-                                                   get_change_in_harvested_area_for_crop)
+from hestia_earth.models.faostat2018.utils import (
+    MODEL, get_sum_of_columns, get_land_ratio, get_change_in_harvested_area_for_crop
+)
 from tests.utils import fixtures_path
 
 CLASS_PATH = f"hestia_earth.models.{MODEL}.utils"
 fixtures_folder = f"{fixtures_path}/{MODEL}/utils"
 
 
-def _afg_download_fixture():
-    with open(f"{fixtures_folder}/gadm-afg.csv") as f:
-        afg_lookup = numpy.recfromcsv(
-            fname=f,
-            missing_values="",
-            filling_values="",
-            delimiter=",",
-            encoding="utf-8"
-        )
-    return afg_lookup
-
-
 def test_get_sum_of_columns():
     result = get_sum_of_columns(
-        lookup=_afg_download_fixture(),
         country="GADM-AFG",
         year=1975,
         columns_list=["Arable land", "Permanent crops"]
@@ -38,14 +22,12 @@ def test_check_sums_for_columns():
     """
     for year in range(1961, 2021):
         sum_arab_perm = get_sum_of_columns(
-            lookup=_afg_download_fixture(),
             country="GADM-AFG",
             year=year,
             columns_list=["Arable land", "Permanent crops"]
         )
 
         cropland_value = get_sum_of_columns(
-            lookup=_afg_download_fixture(),
             country="GADM-AFG",
             year=year,
             columns_list=["Cropland"]
@@ -53,9 +35,7 @@ def test_check_sums_for_columns():
         assert sum_arab_perm == cropland_value
 
 
-@patch(f"{CLASS_PATH}.download_lookup")
-def test_get_land_ratio(mock_lookup):
-    mock_lookup.return_value = _afg_download_fixture()
+def test_get_land_ratio():
     result = get_land_ratio(
         country="GADM-AFG",
         start_year=1990,

tests/models/faostat2018/test_liveweightPerHead.py

@@ -22,15 +22,15 @@ def test_run_animalProduct(*args):
 
 
 @patch(f"{class_path}._new_property", side_effect=fake_new_property)
-@patch(f"{class_path}.download_hestia")
-def test_run_liveAnimal_chicken(mock_download_hestia, *args):
+@patch(f"{class_path}.download_term")
+def test_run_liveAnimal_chicken(mock_download_term, *args):
     with open(f"{fixtures_folder}/liveAnimal/chicken/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
 
     with open(f"{fixtures_folder}/liveAnimal/chicken/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
-    mock_download_hestia.return_value = {
+    mock_download_term.return_value = {
         "@id": "meatChickenReadyToCookWeight",
         "@type": "Term",
         "units": "kg ready-to-cook weight",
@@ -64,15 +64,15 @@ def test_run_liveAnimal_chicken(mock_download_hestia, *args):
 
 
 @patch(f"{class_path}._new_property", side_effect=fake_new_property)
-@patch(f"{class_path}.download_hestia")
-def test_run_liveAnimal_pig(mock_download_hestia, *args):
+@patch(f"{class_path}.download_term")
+def test_run_liveAnimal_pig(mock_download_term, *args):
     with open(f"{fixtures_folder}/liveAnimal/pig/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
 
     with open(f"{fixtures_folder}/liveAnimal/pig/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
-    mock_download_hestia.return_value = {
+    mock_download_term.return_value = {
         "@id": "meatPigColdDressedCarcassWeight",
         "@type": "Term",
         "units": "kg cold dressed carcass weight",
@@ -95,15 +95,15 @@ def test_run_liveAnimal_pig(mock_download_hestia, *args):
 
 
 @patch(f"{class_path}._new_property", side_effect=fake_new_property)
-@patch(f"{class_path}.download_hestia")
-def test_run_liveAnimal_sheepLamb(mock_download_hestia, *args):
+@patch(f"{class_path}.download_term")
+def test_run_liveAnimal_sheepLamb(mock_download_term, *args):
     with open(f"{fixtures_folder}/liveAnimal/sheepLamb/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
 
     with open(f"{fixtures_folder}/liveAnimal/sheepLamb/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
-    mock_download_hestia.return_value = {
+    mock_download_term.return_value = {
         "@id": "meatSheepColdDressedCarcassWeight",
         "@type": "Term",
         "units": "kg cold dressed carcass weight",

tests/models/globalCropWaterModel2008/test_rootingDepth.py

@@ -1,7 +1,7 @@
 from unittest.mock import patch
 import json
 from hestia_earth.schema import CycleFunctionalUnit
-from tests.utils import fixtures_path, fake_new_property, fake_download
+from tests.utils import fixtures_path, fake_new_property
 
 from hestia_earth.models.globalCropWaterModel2008.rootingDepth import (
     MODEL, TERM_ID, run, _should_run, _should_run_product
@@ -16,6 +16,10 @@ TERMS = [
 ]
 
 
+def fake_download_term(node_id, *args):
+    return {"@type": "Term", "@id": node_id}
+
+
 @patch(f"{class_path}.get_irrigation_terms", return_value=TERMS)
 def test_should_run(*args):
     cycle = {'products': []}
@@ -53,7 +57,7 @@ def test_should_run_product(mock_get_value, *args):
 
 
 @patch(f"{class_path}.get_irrigation_terms", return_value=TERMS)
-@patch(f"{class_path}.download_hestia", side_effect=fake_download)
+@patch(f"{class_path}.download_term", side_effect=fake_download_term)
 @patch(f"{class_path}._new_property", side_effect=fake_new_property)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
@@ -67,7 +71,7 @@ def test_run(*args):
 
 
 @patch(f"{class_path}.get_irrigation_terms", return_value=TERMS)
-@patch(f"{class_path}.download_hestia", side_effect=fake_download)
+@patch(f"{class_path}.download_term", side_effect=fake_download_term)
 @patch(f"{class_path}._new_property", side_effect=fake_new_property)
 def test_gap_fill_with_irrigation(*args):
     with open(f"{fixtures_folder}/with-irrigation/cycle.jsonld", encoding='utf-8') as f:

tests/models/haversineFormula/transport/test_distance.py

@@ -16,7 +16,7 @@ def fake_download_hestia(id: str, *args):
 
 
 @patch(f"{class_path}.download_hestia", side_effect=fake_download_hestia)
-@patch(f"{class_path}._include_methodModel", side_effect=_set_methodModel)
+@patch(f"{class_path}.include_methodModel", side_effect=_set_methodModel)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)

tests/models/hestia/test_landCover.py

@@ -8,7 +8,7 @@ from tests.utils import fixtures_path, fake_new_management
 from hestia_earth.models.faostat2018.utils import MODEL as FAOSTAT_MODEL
 from hestia_earth.models.hestia.landCover import (
     MODEL, MODEL_KEY, get_changes, _estimate_maximum_forest_change,
-    run, site_area_sum_to_100, _get_sums_of_crop_expansion
+    run, site_area_sum_to_100, _get_sums_of_crop_expansion, _get_sum_for_land_category, scale_values_to_one
 )
 
 CLASS_PATH = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
@@ -55,9 +55,7 @@ def _download_fixture(filepath: str):
     return recfromcsv_mod(filename=filepath)
 
 
-@patch(f"{FAOSTAT_CLASS_PATH}.download_lookup")
-def test_get_changes(mock_lookup):
-    mock_lookup.return_value = _download_fixture(f"{faostat_fixtures_folder}/gadm-afg.csv")
+def test_get_changes():
     result, missing_values = get_changes(
         country_id="GADM-AFG",
         end_year=2010
@@ -185,6 +183,55 @@ def test_get_sums_of_crop_expansion():
     assert result == (940270.0, 28139.0)
 
 
+def test_get_sum_for_land_category():
+    values = {
+        "mangoes_guavas_and_mangosteens": "2022:5",
+        "kiwi_fruit": "2020:4",
+        "maize_corn": "2020:3",
+        "other_beans_green": "2021:2",
+        "olives": "2020:-1"
+    }
+    fao_stat_to_ipcc_type = {
+            "mangoes_guavas_and_mangosteens": "Perennial crops",
+            'kiwi_fruit': "Perennial crops",
+            'maize_corn': "Annual crops",
+            'other_beans_green': "Annual crops",
+            'olives': "Perennial crops"
+    }
+    result = _get_sum_for_land_category(
+        values=values,
+        year=2020,
+        ipcc_land_use_category="Perennial crops",
+        fao_stat_to_ipcc_type=fao_stat_to_ipcc_type,
+        include_negatives=True
+    )
+    assert result == 3.0
+
+
+@pytest.mark.parametrize(
+    "dictionary,expected_result",
+    [
+        (
+            {"a": 0, "b": 0, "c": 0},
+            {"a": 0, "b": 0, "c": 0}
+        ),
+        (
+            {"a": 1000},
+            {"a": 1}
+        ),
+        (
+            {"a": 10, "b": 5, "c": 3},
+            {"a": 0.5556, "b": 0.2778, "c": 0.1667}
+        )
+    ]
+)
+def test_scale_values_to_one(dictionary, expected_result):
+    result = scale_values_to_one(dictionary)
+    for k, v in result.items():
+        assert k in expected_result
+        assert round(v, 3) == round(expected_result[k], 3)
+
+
 @pytest.mark.parametrize(
     "subfolder",
     [
@@ -199,7 +246,8 @@ def test_get_sums_of_crop_expansion():
         "prior_landCover",
         "nigeria_cassava",
         "cover_crops",
-        "missing_fao_date"
+        "missing_fao_date",
+        "iran_sistan"
     ]
 )
 @patch(f"{CLASS_PATH}._new_management", side_effect=fake_new_management)

tests/models/ipcc2019/animal/test_pastureGrass.py

@@ -10,11 +10,13 @@ class_path_utils = f"hestia_earth.models.{MODEL}.pastureGrass_utils"
 fixtures_folder = f"{fixtures_path}/{MODEL}/animal/{MODEL_KEY}"
 
 
-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)
@@ -30,7 +32,7 @@ def test_run_with_feed(*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/ipcc2019/test_aboveGroundCropResidueTotal.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: