hestia-earth-models 0.59.6__py3-none-any.whl → 0.60.0__py3-none-any.whl

tests/models/pooreNemecek2018/test_excretaKgN.py

@@ -59,6 +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(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:
@@ -71,6 +72,7 @@ def test_run(*args):
     assert value == expected
 
 
+@patch("hestia_earth.models.utils.property.download_hestia", 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:
@@ -83,6 +85,7 @@ def test_run_with_liveweight(*args):
     assert value == expected
 
 
+@patch("hestia_earth.models.utils.property.download_hestia", 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:
@@ -95,6 +98,7 @@ def test_run_with_carcass(*args):
     assert value == expected
 
 
+@patch("hestia_earth.models.utils.property.download_hestia", 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:
@@ -107,6 +111,7 @@ def test_run_with_head(*args):
     assert value == expected
 
 
+@patch("hestia_earth.models.utils.property.download_hestia", 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

@@ -8,6 +8,7 @@ class_path = f"hestia_earth.models.{MODEL}.excretaKgVs"
 fixtures_folder = f"{fixtures_path}/{MODEL}/excretaKgVs"
 
 
+@patch(f"{class_path}.get_node_property", return_value={'value': 1490.6951744738524})
 @patch(f"{class_path}.convert_to_carbon", return_value=5)
 @patch(f"{class_path}._get_carbonContent", return_value=5)
 @patch(f"{class_path}._get_conv_aq_ocsed", return_value=0.35)
@@ -78,6 +79,8 @@ def test_should_run(*args):
     assert should_run is True
 
 
+@patch("hestia_earth.models.utils.property.download_hestia", 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):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
@@ -90,6 +93,8 @@ def test_run(*args):
     assert value == expected
 
 
+@patch("hestia_earth.models.utils.property.download_hestia", 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):
     with open(f"{fixtures_folder}/with-excretaKgN/cycle.jsonld", encoding='utf-8') as f:

tests/models/pooreNemecek2018/test_no3ToGroundwaterSoilFlux.py

@@ -8,6 +8,7 @@ class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
+@patch(f"{class_path}.get_rice_paddy_terms", return_value=FLOODED_RICE_TERMS)
 @patch(f"{class_path}.find_primary_product", return_value={'term': {'@id': 'product'}})
 @patch(f"{class_path}.get_crop_residue_decomposition_N_total", return_value=10)
 @patch(f"{class_path}.most_relevant_measurement_value", return_value=0)

tests/models/test_cache_sites.py

@@ -7,13 +7,14 @@ from hestia_earth.models.cache_sites import run
 
 class_path = 'hestia_earth.models.cache_sites'
 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)
 def test_run(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}/result.json", encoding='utf-8') as 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)
@@ -22,9 +23,6 @@ def test_run(mock_run_query, *args):
     expected = [site | {'_cache': cache} for site in data.get('nodes', [])]
     assert sites == expected
 
-    # unique list of coordinates
-    coordinates = [{"latitude": 46.47, "longitude": 2.94}]
-
     mock_run_query.assert_has_calls([
         call({
             "ee_type": "raster",
@@ -37,9 +35,15 @@ def test_run(mock_run_query, *args):
             "coordinates": coordinates
         })
     ])
-    mock_run_query.reset_mock()
 
-    # with regions
+
+@patch(f"{class_path}._run_query", return_value=[10] * 100)
+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)
+
     run(data.get('nodes', []), [2019, 2020], include_region=True)
     mock_run_query.assert_has_calls([
         call({
@@ -53,4 +57,15 @@ def test_run(mock_run_query, *args):
             "coordinates": coordinates
         })
     ])
-    mock_run_query.reset_mock()
+
+
+@patch(f"{class_path}._run_query", return_value=[10] * 100)
+def test_run_years_only(*args):
+    with open(f"{fixtures_folder}/data.json", encoding='utf-8') as f:
+        data = json.load(f)
+    with open(f"{fixtures_folder}/years-only/cache.json", encoding='utf-8') as f:
+        cache = json.load(f)
+
+    sites = run(data.get('nodes', []), [2019, 2020], years_only=True)
+    expected = [site | {'_cache': cache} for site in data.get('nodes', [])]
+    assert sites == expected