hestia-earth-models 0.63.0__py3-none-any.whl → 0.64.1__py3-none-any.whl

tests/models/geospatialDatabase/test_sandContent.py

@@ -1,4 +1,4 @@
-from unittest.mock import patch
+from unittest.mock import patch, call
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
@@ -32,4 +32,18 @@ def test_run(mock_download, *args):
         site = json.load(f)
 
     run(site)
-    mock_download.assert_called_once()
+    base_params = {'ee_type': 'raster', 'reducer': 'mean'}
+    mock_download.assert_has_calls([
+        call(TERM_ID, site, base_params | {
+            'collection': 'T_SAND_v2_depth_1', 'depthUpper': 0, 'depthLower': 20
+        }),
+        call(TERM_ID, site, base_params | {
+            'collection': 'T_SAND_v2_depth_2', 'depthUpper': 20, 'depthLower': 40
+        }),
+        call(TERM_ID, site, base_params | {
+            'collection': 'T_SAND_v2_depth_3', 'depthUpper': 40, 'depthLower': 60
+        }),
+        call(TERM_ID, site, base_params | {
+            'collection': 'T_SAND_v2_depth_4', 'depthUpper': 60, 'depthLower': 80
+        })
+    ])

tests/models/geospatialDatabase/test_siltContent.py

@@ -17,8 +17,8 @@ def test_should_run():
 
     # with measumrents => run
     site['measurements'] = [
-        {'term': {'@id': 'clayContent'}, 'value': [10]},
-        {'term': {'@id': 'sandContent'}, 'value': [20]}
+        {'term': {'@id': 'clayContent'}, 'value': [10], 'depthUpper': 0, 'depthLower': 20},
+        {'term': {'@id': 'sandContent'}, 'value': [20], 'depthUpper': 0, 'depthLower': 20}
     ]
     should_run, *_ = _should_run(site)
     assert should_run is True

tests/models/geospatialDatabase/test_soilPh.py

@@ -1,4 +1,4 @@
-from unittest.mock import patch
+from unittest.mock import patch, call
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
@@ -26,4 +26,18 @@ def test_run(mock_download, *args):
         site = json.load(f)
 
     run(site)
-    mock_download.assert_called_once()
+    base_params = {'ee_type': 'raster', 'reducer': 'mean'}
+    mock_download.assert_has_calls([
+        call(TERM_ID, site, base_params | {
+            'collection': 'T_PH_H2O_v2_depth_1', 'depthUpper': 0, 'depthLower': 20
+        }),
+        call(TERM_ID, site, base_params | {
+            'collection': 'T_PH_H2O_v2_depth_2', 'depthUpper': 20, 'depthLower': 40
+        }),
+        call(TERM_ID, site, base_params | {
+            'collection': 'T_PH_H2O_v2_depth_3', 'depthUpper': 40, 'depthLower': 60
+        }),
+        call(TERM_ID, site, base_params | {
+            'collection': 'T_PH_H2O_v2_depth_4', 'depthUpper': 60, 'depthLower': 80
+        })
+    ])

tests/models/geospatialDatabase/test_totalNitrogenPerKgSoil.py

@@ -1,4 +1,4 @@
-from unittest.mock import patch
+from unittest.mock import patch, call
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
@@ -26,4 +26,18 @@ def test_run(mock_download, *args):
         site = json.load(f)
 
     run(site)
-    mock_download.assert_called_once()
+    base_params = {'ee_type': 'raster', 'reducer': 'mean'}
+    mock_download.assert_has_calls([
+        call(TERM_ID, site, base_params | {
+            'collection': 'T_N_v2_depth_1', 'depthUpper': 0, 'depthLower': 20
+        }),
+        call(TERM_ID, site, base_params | {
+            'collection': 'T_N_v2_depth_2', 'depthUpper': 20, 'depthLower': 40
+        }),
+        call(TERM_ID, site, base_params | {
+            'collection': 'T_N_v2_depth_3', 'depthUpper': 40, 'depthLower': 60
+        }),
+        call(TERM_ID, site, base_params | {
+            'collection': 'T_N_v2_depth_4', 'depthUpper': 60, 'depthLower': 80
+        })
+    ])

tests/models/hyde32/test_landTransformationFromCropland100YearAverageDuringCycle.py

@@ -8,6 +8,7 @@ class_path = f"hestia_earth.models.hyde32.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/hyde32/{TERM_ID}"
 
 
+@patch('hestia_earth.models.hyde32.utils.get_land_cover_term_id', return_value='cropland')
 @patch('hestia_earth.models.hyde32.utils._new_indicator', side_effect=fake_new_indicator)
 def test_run(*args):
     with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:

tests/models/hyde32/test_landTransformationFromCropland20YearAverageDuringCycle.py

@@ -8,6 +8,7 @@ class_path = f"hestia_earth.models.hyde32.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/hyde32/{TERM_ID}"
 
 
+@patch('hestia_earth.models.hyde32.utils.get_land_cover_term_id', return_value='cropland')
 @patch('hestia_earth.models.hyde32.utils._new_indicator', side_effect=fake_new_indicator)
 def test_run(*args):
     with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:

tests/models/hyde32/test_landTransformationFromForest100YearAverageDuringCycle.py

@@ -8,6 +8,7 @@ class_path = f"hestia_earth.models.hyde32.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/hyde32/{TERM_ID}"
 
 
+@patch('hestia_earth.models.hyde32.utils.get_land_cover_term_id', return_value='cropland')
 @patch('hestia_earth.models.hyde32.utils._new_indicator', side_effect=fake_new_indicator)
 def test_run(*args):
     with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:

tests/models/hyde32/test_landTransformationFromForest20YearAverageDuringCycle.py

@@ -8,6 +8,7 @@ class_path = f"hestia_earth.models.hyde32.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/hyde32/{TERM_ID}"
 
 
+@patch('hestia_earth.models.hyde32.utils.get_land_cover_term_id', return_value='cropland')
 @patch('hestia_earth.models.hyde32.utils._new_indicator', side_effect=fake_new_indicator)
 def test_run(*args):
     with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:

tests/models/hyde32/test_landTransformationFromOtherNaturalVegetation100YearAverageDuringCycle.py

@@ -10,6 +10,7 @@ class_path = f"hestia_earth.models.hyde32.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/hyde32/{TERM_ID}"
 
 
+@patch('hestia_earth.models.hyde32.utils.get_land_cover_term_id', return_value='cropland')
 @patch('hestia_earth.models.hyde32.utils._new_indicator', side_effect=fake_new_indicator)
 def test_run(*args):
     with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:

tests/models/hyde32/test_landTransformationFromOtherNaturalVegetation20YearAverageDuringCycle.py

@@ -8,6 +8,7 @@ class_path = f"hestia_earth.models.hyde32.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/hyde32/{TERM_ID}"
 
 
+@patch('hestia_earth.models.hyde32.utils.get_land_cover_term_id', return_value='cropland')
 @patch('hestia_earth.models.hyde32.utils._new_indicator', side_effect=fake_new_indicator)
 def test_run(*args):
     with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:

tests/models/hyde32/test_landTransformationFromPermanentPasture100YearAverageDuringCycle.py

@@ -8,6 +8,7 @@ class_path = f"hestia_earth.models.hyde32.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/hyde32/{TERM_ID}"
 
 
+@patch('hestia_earth.models.hyde32.utils.get_land_cover_term_id', return_value='cropland')
 @patch('hestia_earth.models.hyde32.utils._new_indicator', side_effect=fake_new_indicator)
 def test_run(*args):
     with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:

tests/models/hyde32/test_landTransformationFromPermanentPasture20YearAverageDuringCycle.py

@@ -8,6 +8,7 @@ class_path = f"hestia_earth.models.hyde32.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/hyde32/{TERM_ID}"
 
 
+@patch('hestia_earth.models.hyde32.utils.get_land_cover_term_id', return_value='cropland')
 @patch('hestia_earth.models.hyde32.utils._new_indicator', side_effect=fake_new_indicator)
 def test_run(*args):
     with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:

tests/models/impact_assessment/test_allocationMethod.py

@@ -0,0 +1,48 @@
+import json
+import pytest
+from tests.utils import fixtures_path
+
+from hestia_earth.models.impact_assessment.allocationMethod import MODEL_KEY, run, _should_run
+
+fixtures_folder = f"{fixtures_path}/impact_assessment/{MODEL_KEY}"
+
+
+@pytest.mark.parametrize(
+    'test_name,impact,expected_should_run',
+    [
+        (
+            'no updated/modified => no run',
+            {},
+            False
+        ),
+        (
+            'updated organic => no run',
+            {'updated': ['organic']},
+            False
+        ),
+        (
+            'updated impacts => run',
+            {'updated': ['impacts']},
+            True
+        ),
+        (
+            'added emissions => run',
+            {'updated': ['emissionsResourceUse']},
+            True
+        )
+    ]
+)
+def test_should_run(test_name, impact, expected_should_run):
+    should_run = _should_run(impact)
+    assert should_run == expected_should_run, test_name
+
+
+def test_run():
+    with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:
+        impact = json.load(f)
+
+    with open(f"{fixtures_folder}/result.txt", encoding='utf-8') as f:
+        expected = f.read().strip()
+
+    result = run(impact)
+    assert result == expected

tests/models/poschEtAl2008/test_terrestrialAcidificationPotentialAccumulatedExceedance.py

@@ -0,0 +1,45 @@
+import json
+from unittest.mock import patch
+
+from hestia_earth.models.poschEtAl2008.terrestrialAcidificationPotentialAccumulatedExceedance import MODEL, TERM_ID, run
+from tests.utils import fixtures_path, fake_new_indicator
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+
+
+@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:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(cycle)
+    assert value == expected
+
+
+@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
+def test_lookup_to_bad_country(*args):
+    with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+    cycle['country']['@id'] = "example-land-not-real"
+
+    value = run(cycle)
+    assert value['value'] is None
+
+
+@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
+def test_lookup_no_term_type(*args):
+    """
+    We currently do not filter out bad termTypes so this is expected behavior.
+    """
+    with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+    del cycle['emissionsResourceUse'][0]['term']['termType']
+    del cycle['emissionsResourceUse'][1]['term']['termType']
+    cycle['emissionsResourceUse'][2]['term']['termType'] = "wrong-type"
+
+    value = run(cycle)
+    assert value['value'] == 0.085

tests/models/test_cache_sites.py

@@ -10,7 +10,7 @@ fixtures_folder = os.path.join(fixtures_path, 'cache_sites')
 coordinates = [{"latitude": 46.47, "longitude": 2.94}]
 
 
-@patch(f"{class_path}._run_query", return_value=[10] * 100)
+@patch(f"{class_path}._run_query")
 def test_run(mock_run_query, *args):
     with open(f"{fixtures_folder}/data.json", encoding='utf-8') as f:
         data = json.load(f)
@@ -19,9 +19,9 @@ def test_run(mock_run_query, *args):
     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', []))
+
     sites = run(data.get('nodes', []), [2019, 2020], include_region=False)
-    expected = [site | {'_cache': cache} for site in data.get('nodes', [])]
-    assert sites == expected
 
     mock_run_query.assert_has_calls([
         call({
@@ -36,15 +36,21 @@ def test_run(mock_run_query, *args):
         })
     ])
 
+    expected = [site | {'_cache': cache} for site in data.get('nodes', [])]
+    assert sites == expected
+
 
-@patch(f"{class_path}._run_query", return_value=[10] * 100)
+@patch(f"{class_path}._run_query")
 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', []))
+
     run(data.get('nodes', []), [2019, 2020], include_region=True)
+
     mock_run_query.assert_has_calls([
         call({
             "ee_type": "raster",

tests/models/test_ecoinventV3.py

@@ -50,6 +50,7 @@ def test_run(*args):
         expected = json.load(f)
 
     result = run('all', cycle)
+    # print(json.dumps(result, indent=2))
     assert result == expected
 
 

tests/models/utils/test_source.py

@@ -12,7 +12,7 @@ search_results = [{
 
 
 def test_list_sources():
-    assert len(_list_sources()) == 11
+    assert len(_list_sources()) == 10
 
 
 @patch(f"{class_path}.search", return_value=search_results)