hestia-earth-models 0.65.11__py3-none-any.whl → 0.66.0__py3-none-any.whl

tests/models/ipcc2019/test_organicCarbonPerHa.py

@@ -71,6 +71,93 @@ DEFAULT_PROPERTIES = {
         },
         "ligninContent": {
             "value": 9.67
+        },
+        "dryMatter": {
+            "value": 100
+        }
+    },
+    "cattleSolidManureDryKgMass": {
+        "carbonContent": {
+            "value": 46.4
+        },
+        "nitrogenContent": {
+            "value": 2.65
+        },
+        "ligninContent": {
+            "value": 11
+        },
+        "dryMatter": {
+            "value": 100
+        }
+    },
+    "cattleSolidManureFreshKgMass": {
+        "carbonContent": {
+            "value": 9.27
+        },
+        "nitrogenContent": {
+            "value": 0.53
+        },
+        "ligninContent": {
+            "value": 2.2
+        },
+        "dryMatter": {
+            "value": 20
+        }
+    },
+    "cattleLiquidManureKgMass": {
+        "carbonContent": {
+            "value": 4.3
+        },
+        "nitrogenContent": {
+            "value": 0.245
+        },
+        "ligninContent": {
+            "value": 1.02
+        },
+        "dryMatter": {
+            "value": 9.18
+        }
+    },
+    "cattleSolidManureDryKgN": {
+        "carbonContent": {
+            "value": 1750
+        },
+        "nitrogenContent": {
+            "value": 100
+        },
+        "ligninContent": {
+            "value": 415
+        },
+        "dryMatter": {
+            "value": 3773.585
+        }
+    },
+    "cattleSolidManureFreshKgN": {
+        "carbonContent": {
+            "value": 1750
+        },
+        "nitrogenContent": {
+            "value": 100
+        },
+        "ligninContent": {
+            "value": 415
+        },
+        "dryMatter": {
+            "value": 3775.611
+        }
+    },
+    "cattleLiquidManureKgN": {
+        "carbonContent": {
+            "value": 1750
+        },
+        "nitrogenContent": {
+            "value": 100
+        },
+        "ligninContent": {
+            "value": 415
+        },
+        "dryMatter": {
+            "value": 3738.968
         }
     }
 }
@@ -111,6 +198,7 @@ PARAMS_SHOULD_RUN = [
     ("tier-1/with-gapfilled-start-date-end-date", False),            # Closes issue 972
     ("tier-1/forest-to-orchard-with-ground-cover", True),            # Closes 989
     ("tier-1/forest-to-other-with-ground-cover", True),              # Closes 989
+    ("tier-1/land-use-change-with-unknown-management", True),        # Closes issue 1007
     ("tier-2/with-generalised-monthly-measurements", False),         # Closes issue 600
     ("tier-2/with-incomplete-climate-data", False),                  # Closes issue 599
     ("tier-2/with-initial-soc", True),
@@ -123,7 +211,12 @@ PARAMS_SHOULD_RUN = [
     ("tier-2/with-paddy-rice", False),                               # Closes issue 718
     ("tier-2/with-sand-without-date", True),                         # Closes issue 739
     ("tier-2/with-irrigated-upland-rice", False),                    # Closes issue 718
-    ("tier-1/land-use-change-with-unknown-management", True)         # Closes issue 1007
+    ("tier-2/with-manure-dry-kg-mass", True),                        # Closes issue 763
+    ("tier-2/with-manure-fresh-kg-mass", True),                      # Closes issue 763
+    ("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
 ]
 IDS_SHOULD_RUN = [p[0] for p in PARAMS_SHOULD_RUN]
 

tests/models/site/pre_checks/test_cache_geospatialDatabase.py

@@ -0,0 +1,22 @@
+import pytest
+
+from hestia_earth.models.site.pre_checks.cache_geospatialDatabase import list_rasters, list_vectors
+
+
+def test_list_rasters():
+    rasters = list_rasters(years=[2010])
+    assert len(rasters) == 72
+
+
+@pytest.mark.parametrize(
+    'name,site,expected_len',
+    [
+        ('without values', {}, 3),
+        ('with region', {'region': 'region'}, 2),
+        ('with ecoregion', {'ecoregion': 'ecoregion'}, 2),
+        ('with awareWaterBasinId', {'awareWaterBasinId': 'awareWaterBasinId'}, 2),
+    ]
+)
+def test_list_vectors(name: str, site: dict, expected_len: int):
+    vectors = list_vectors([site])
+    assert len(vectors) == expected_len, name

tests/models/site/test_defaultMethodClassification.py

@@ -16,3 +16,9 @@ def test_run():
 
     result = run(site)
     assert result == expected
+
+
+def test_run_no_value():
+    site = {'management': [{'@type': 'Management'}]}
+    result = run(site)
+    assert result == 'modelled'

tests/models/site/test_defaultMethodClassificationDescription.py

@@ -16,3 +16,9 @@ def test_run():
 
     result = run(site)
     assert result == expected
+
+
+def test_run_no_value():
+    site = {'management': [{'@type': 'Management'}]}
+    result = run(site)
+    assert result == 'Data calculated by merging real land use histories and modelled land use histories for each Site.'

tests/models/site/test_management.py

@@ -29,10 +29,10 @@ _folders = [d for d in os.listdir(fixtures_folder) if os.path.isdir(os.path.join
 @patch(f"{class_path}._new_management", side_effect=fake_new_management)
 @patch(f"{class_path}.related_cycles")
 def test_run(
-        mock_related_cycles: Mock,
-        mock_new_management: Mock,
-        mock_land_cover_lookup: Mock,
-        folder: str
+    mock_related_cycles: Mock,
+    mock_new_management: Mock,
+    mock_land_cover_lookup: Mock,
+    folder: str
 ):
     fixture_path = os.path.join(fixtures_folder, folder)
 

tests/models/test_cache_sites.py

@@ -30,7 +30,7 @@ def test_run(mock_run_query, *args):
         [10] * len(rasters_years)
     ]
 
-    sites = run(sites=data.get('nodes', []), years=[2019, 2020], include_region=False)
+    sites = run(sites=data.get('nodes', []), years=[2019, 2020])
 
     mock_run_query.assert_has_calls([
         call({
@@ -72,7 +72,7 @@ def test_run_include_region(mock_run_query, *args):
         [10] * len(rasters_years)
     ]
 
-    run(sites=data.get('nodes', []), years=[2019, 2020], include_region=True)
+    run(sites=data.get('nodes', []), years=[2019, 2020])
 
     mock_run_query.assert_has_calls([
         call({

tests/orchestrator/strategies/merge/test_merge_list.py

@@ -1,12 +1,22 @@
 from unittest.mock import patch
 import pydash
 
-from hestia_earth.orchestrator.strategies.merge.merge_list import merge
+from hestia_earth.orchestrator.strategies.merge.merge_list import merge, _get_value
 
 class_path = 'hestia_earth.orchestrator.strategies.merge.merge_list'
 version = '1'
 
 
+def test_get_value():
+    assert _get_value({'startDate': '2020-01-01'}, 'startDate', {}) == '2020-01-01'
+    assert _get_value({'startDate': '2020-01-01'}, 'startDate', {'matchDatesFormat': '%Y'}) == '2020'
+    assert _get_value({'startDate': '2020-01-01'}, 'startDate', {'matchDatesFormat': '%Y-%m'}) == '2020-01'
+    assert _get_value({'startDate': '2020-01-01'}, 'startDate', {'matchDatesFormat': '%Y-%m-%d'}) == '2020-01-01'
+    assert _get_value({'value': 500}, 'value') == 500
+    assert _get_value({'value': 500}, 'value', {'matchDatesFormat': '%Y-%m-%d'}) == 500
+    assert _get_value({'value': 'test'}, 'value') == 'test'
+
+
 def _default_merge(a, b, *args): return pydash.objects.merge({}, a, b)