hestia-earth-models 0.69.0__py3-none-any.whl → 0.70.0__py3-none-any.whl

tests/models/ipcc2019/test_ch4ToAirEntericFermentation.py

@@ -13,11 +13,13 @@ TERMS_BY_ID = {
     'energyDigestibilityPoultry': {'units': '%'},
     'neutralDetergentFibreContent': {'units': '%'}
 }
+IONOPHORE_TERMS = ['ionophores', 'ionophoreAntibiotics']
 
 
 def fake_download_term(term_id: str, *args): return TERMS_BY_ID[term_id]
 
 
+@patch(f"{class_path}.get_ionophore_terms", return_value=IONOPHORE_TERMS)
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
 @patch(f"{class_path}.get_default_digestibility", return_value=70)
 @patch(f"{class_path}.find_primary_product", return_value={'term': {'@id': 'pig'}})
@@ -52,6 +54,7 @@ def test_should_run(mock_feed, mock_lookup_value, *args):
     assert should_run is True
 
 
+@patch(f"{class_path}.get_ionophore_terms", return_value=IONOPHORE_TERMS)
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
 @patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
@@ -68,6 +71,7 @@ def test_run(*args):
     assert result == expected
 
 
+@patch(f"{class_path}.get_ionophore_terms", return_value=IONOPHORE_TERMS)
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
 @patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
@@ -84,6 +88,7 @@ def test_run_dairy(*args):
     assert result == expected
 
 
+@patch(f"{class_path}.get_ionophore_terms", return_value=IONOPHORE_TERMS)
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=['milkYieldPerBuffaloRaw'])
 @patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
@@ -100,6 +105,7 @@ def test_run_with_milkYield(*args):
     assert result == expected
 
 
+@patch(f"{class_path}.get_ionophore_terms", return_value=IONOPHORE_TERMS)
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
 @patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
@@ -116,6 +122,7 @@ def test_run_non_dairy(*args):
     assert result == expected
 
 
+@patch(f"{class_path}.get_ionophore_terms", return_value=IONOPHORE_TERMS)
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
 @patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
@@ -132,6 +139,7 @@ def test_run_with_ionophores(*args):
     assert result == expected
 
 
+@patch(f"{class_path}.get_ionophore_terms", return_value=IONOPHORE_TERMS)
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
 @patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
@@ -148,6 +156,7 @@ def test_run_without_ionophores(*args):
     assert result == expected
 
 
+@patch(f"{class_path}.get_ionophore_terms", return_value=IONOPHORE_TERMS)
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
 @patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
@@ -161,6 +170,7 @@ def test_run_no_feed(*args):
     assert result == []
 
 
+@patch(f"{class_path}.get_ionophore_terms", return_value=IONOPHORE_TERMS)
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
 @patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
@@ -177,6 +187,7 @@ def test_run_with_system(*args):
     assert result == expected
 
 
+@patch(f"{class_path}.get_ionophore_terms", return_value=IONOPHORE_TERMS)
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
 @patch("hestia_earth.models.utils.property.download_term", return_value={})
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)

tests/models/ipcc2019/test_nonCo2EmissionsToAirNaturalVegetationBurning.py

@@ -6,10 +6,19 @@ 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"
+from hestia_earth.models.ipcc2019.nonCo2EmissionsToAirNaturalVegetationBurning import MODEL, run, _should_run
+
+class_path = f"hestia_earth.models.{MODEL}.nonCo2EmissionsToAirNaturalVegetationBurning"
+fixtures_folder = f"{fixtures_path}/{MODEL}/nonCo2EmissionsToAirNaturalVegetationBurning"
+biomass_utils_path = f"hestia_earth.models.{MODEL}.biomass_utils"
+
+COVER_CROP_PROPERTY_TERM_IDS = [
+    "catchCrop",
+    "coverCrop",
+    "groundCover",
+    "longFallowCrop",
+    "shortFallowCrop"
+]
 
 
 def _load_fixture(path: str, default=None):
@@ -40,11 +49,13 @@ 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"{biomass_utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
 @patch(f"{class_path}.related_cycles")
 @patch(f"{class_path}._get_site")
 def test_run(
     get_site_mock: MagicMock,
     related_cycles_mock: MagicMock,
+    _get_cover_crop_property_terms_mock: MagicMock,
     _new_emission_mock: MagicMock,
     subfolder: str,
     num_cycles: int,
@@ -66,7 +77,8 @@ def test_run(
     assert order_list(result) == order_list(expected)
 
 
-def test_should_run_no_data():
+@patch(f"{biomass_utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
+def test_should_run_no_data(*args):
     CYCLE = {}
     EXPECTED = False
 
@@ -74,8 +86,9 @@ def test_should_run_no_data():
     assert result == EXPECTED
 
 
+@patch(f"{biomass_utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
-def test_run_no_data(*_):
+def test_run_no_data(*args):
     CYCLE = {}
     EXPECTED = []
 

tests/models/ipcc2019/test_organicCarbonPerHa.py

@@ -216,7 +216,8 @@ PARAMS_SHOULD_RUN = [
     ("tier-2/with-manure-liquid-kg-mass", True),                     # Closes issue 763
     ("tier-2/with-manure-dry-kg-n", True),                           # Closes issue 763
     ("tier-2/with-manure-fresh-kg-n", True),                         # Closes issue 763
-    ("tier-2/with-manure-liquid-kg-n", True)                         # Closes issue 763
+    ("tier-2/with-manure-liquid-kg-n", True),                        # Closes issue 763
+    ("tier-2/with-split-years", True)                                # Closes issue 1177
 ]
 IDS_SHOULD_RUN = [p[0] for p in PARAMS_SHOULD_RUN]
 
@@ -268,12 +269,13 @@ def test_should_run(
 
 
 @patch(f"{tier_2_utils_path}.related_cycles", return_value=[])
+@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}.download_term")
 def test_should_run_no_data(
     download_term_mock: MagicMock,
     search_mock: MagicMock,
-    _related_cycles_mock: MagicMock
+    *args
 ):
     SITE = {}
     EXPECTED = []

tests/models/pooreNemecek2018/test_landOccupationDuringCycle.py

@@ -9,6 +9,7 @@ class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
+@patch(f"{class_path}.get_landCover_term_id_from_site_type", return_value='cropland')
 @patch(f"{class_path}.get_landCover_term_id", return_value='cropland')
 @patch(f"{class_path}.land_occupation_per_kg", return_value=None)
 def test_should_run(mock_land_occupation, *args):
@@ -23,6 +24,7 @@ def test_should_run(mock_land_occupation, *args):
     assert should_run is True
 
 
+@patch(f"{class_path}.get_landCover_term_id_from_site_type", return_value='cropland')
 @patch(f"{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:
@@ -35,6 +37,7 @@ def test_run(*args):
     assert value == expected
 
 
+@patch(f"{class_path}.get_landCover_term_id_from_site_type", return_value='cropland')
 @patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
 def test_run_with_plantation(*args):
     with open(f"{fixtures_folder}/with-orchard-crop/impact-assessment.jsonld", encoding='utf-8') as f:

tests/models/site/pre_checks/test_country.py

@@ -1,12 +1,13 @@
 from unittest.mock import Mock, patch
+from hestia_earth.schema import TermTermType
 
 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):
+@patch(f"{class_path}.download_term")
+def test_run(mock_download_term: Mock):
     site = {'country': {'@type': 'Term', '@id': 'GADM-GBR'}}
     run(site)
-    mock_download_hestia.assert_called_once_with('GADM-GBR')
+    mock_download_term.assert_called_once_with('GADM-GBR', TermTermType.REGION)

tests/models/test_ecoinventV3.py

@@ -39,12 +39,12 @@ TERMS_BY_ID = {
 }
 
 
-def fake_download_hestia(term, *args):
+def fake_download_term(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('hestia_earth.models.utils.blank_node.download_term', side_effect=fake_download_term)
 @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_source.py

@@ -13,11 +13,21 @@ search_results = [{
 
 def test_list_sources():
     sources = _list_sources()
-    # test `BIBLIO_TITLE`
-    assert 'Soil organic carbon sequestration rates in vineyard agroecosystems under different soil management practices: A meta-analysis' in sources  # noqa: E501
-    # test `OTHER_BIBLIO_TITLES`
-    assert '2006 IPCC Guidelines for National Greenhouse Gas Inventories' in sources
-    assert 'COMMISSION DECISION of 10 June 2010 on guidelines for the calculation of land carbon stocks for the purpose of Annex V to Directive 2009/28/EC' in sources  # noqa: E501
+    assert sorted(sources) == [
+        '2006 IPCC Guidelines for National Greenhouse Gas Inventories',
+        '2019 Refinement to the 2006 IPCC Guidelines for National Greenhouse Gas Inventories',
+        'A critical review of the conventional SOC to SOM conversion factor',
+        'An Enhanced Global Elevation Model Generalized From Multiple Higher Resolution Source Datasets',
+        'Biofuels: a new methodology to estimate GHG emissions from global land use change',
+        'COMMISSION DECISION of 10 June 2010 on guidelines for the calculation of land carbon stocks for the purpose of Annex V to Directive 2009/28/EC',  # noqa: E501
+        'Contribution of Organic Matter and Clay to Soil Cation-Exchange Capacity as Affected by the pH of the Saturating Solution',  # noqa: E501
+        'ERA5: Fifth generation of ECMWF atmospheric reanalyses of the global climate',
+        'Harmonized World Soil Database Version 1.2. Food and Agriculture Organization of the United Nations (FAO).',  # noqa: E501
+        'Harmonized World Soil Database Version 2.0.',
+        'Modelling spatially explicit impacts from phosphorus emissions in agriculture',
+        'Reducing food’s environmental impacts through producers and consumers',
+        'Soil organic carbon sequestration rates in vineyard agroecosystems under different soil management practices: A meta-analysis',  # noqa: E501
+    ]
 
 
 @patch(f"{class_path}.search", return_value=search_results)

tests/orchestrator/test_models.py

@@ -10,6 +10,7 @@ class_path = 'hestia_earth.orchestrator.models'
 folder_path = os.path.join(fixtures_path, 'orchestrator', 'cycle')
 
 
+@patch('hestia_earth.models.utils.source.find_sources', return_value=[])
 @patch('hestia_earth.orchestrator.strategies.merge._merge_version', return_value='0.0.0')
 def test_run(*args):
     with open(os.path.join(folder_path, 'config.json'), encoding='utf-8') as f: