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

tests/models/{environmentalFootprintV3 → environmentalFootprintV3_1}/test_soilQualityIndexLandTransformation.py

@@ -3,13 +3,14 @@ from unittest.mock import Mock, patch
 
 from pytest import mark
 
-from hestia_earth.models.environmentalFootprintV3.soilQualityIndexLandTransformation import (
+from hestia_earth.models.environmentalFootprintV3_1 import MODEL_FOLDER
+from hestia_earth.models.environmentalFootprintV3_1.soilQualityIndexLandTransformation import (
     MODEL, TERM_ID, run, _should_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}"
+class_path = f"hestia_earth.models.{MODEL_FOLDER}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL_FOLDER}/{TERM_ID}"
 
 
 def fake_rounded_indicator(value: float):
@@ -79,8 +80,8 @@ good_during_cycle_indicator_from_forest_to_forest = {
 @mark.parametrize(
     "resources, expected, num_inputs",
     [
-        ([], True, 0),
-        ([wrong_indicator], True, 0),
+        ([], False, 0),
+        ([wrong_indicator], False, 0),
         ([indicator_no_land_cover], False, 0),
         ([indicator_no_previous_land_cover], False, 0),
         ([indicator_bad_area_value], False, 0),
@@ -92,8 +93,8 @@ good_during_cycle_indicator_from_forest_to_forest = {
         ([good_inputs_production_indicator_from_forest_to_cropland,
           good_during_cycle_indicator_from_forest_to_cropland], True, 2)
     ],
-    ids=["No emissionsResourceUse => run, 0 dict",
-         "Wrong indicator termid => run, 0 dict",
+    ids=["No emissionsResourceUse => no run, 0 dict",
+         "Wrong indicator termid => no run, 0 dict",
          "Indicator no landcover terms => no run",
          "Indicator no previousLandCover terms => no run",
          "Bad m2 / year value => no run",
@@ -162,18 +163,3 @@ def test_run_with_country_fallback(mocked_indicator: Mock, added_data: dict):
 
     value = run(impact)
     assert value['value'] == 574.56
-
-
-@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
-def test_run_no_transformation(*args):
-    """
-    Impact assessment with no transformations should return a indicator of 0
-    """
-    with open(f"{fixtures_folder}/multipleTransformations/impact-assessment.jsonld", encoding='utf-8') as f:
-        impact = json.load(f)
-
-    impact['emissionsResourceUse'] = []
-
-    value = run(impact)
-
-    assert value['value'] == 0

tests/models/{environmentalFootprintV3 → environmentalFootprintV3_1}/test_soilQualityIndexTotalLandUseEffects.py

@@ -3,12 +3,12 @@ from unittest.mock import patch
 
 from pytest import mark
 
-from hestia_earth.models.environmentalFootprintV3.soilQualityIndexTotalLandUseEffects import MODEL, TERM_ID, run, \
-    _should_run
+from hestia_earth.models.environmentalFootprintV3_1 import MODEL_FOLDER
+from hestia_earth.models.environmentalFootprintV3_1.soilQualityIndexTotalLandUseEffects import TERM_ID, run, _should_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}"
+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}

tests/models/faostat2018/product/test_price.py

@@ -11,7 +11,7 @@ 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
     # average price per tonne as year value is missing
-    assert _lookup_data('cocoaSeedDehulled', 'Cocoa beans', 'GADM-GHA', 2012, term_type='crop') == 843.5571428571428
+    assert _lookup_data('cocoaSeedDehulled', 'Cocoa beans', 'GADM-GHA', 2012, term_type='crop') == 844.0571428571428
 
 
 @patch(f"{class_path}.download_hestia", return_value={})

tests/models/geospatialDatabase/{test_aware.py → test_awareWaterBasinId.py}

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path
 
-from hestia_earth.models.geospatialDatabase.aware import MODEL, MODEL_KEY, run, _should_run
+from hestia_earth.models.geospatialDatabase.awareWaterBasinId import MODEL, MODEL_KEY, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"

tests/models/hestia/test_landCover.py

@@ -58,7 +58,7 @@ def _download_fixture(filepath: str):
 @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")
-    result = get_changes(
+    result, missing_values = get_changes(
         country_id="GADM-AFG",
         end_year=2010
     )
@@ -199,6 +199,7 @@ def test_get_sums_of_crop_expansion():
         "prior_landCover",
         "nigeria_cassava",
         "cover_crops",
+        "missing_fao_date"
     ]
 )
 @patch(f"{CLASS_PATH}._new_management", side_effect=fake_new_management)

tests/models/hestia/test_landTransformation20YearAverageDuringCycle.py

@@ -15,7 +15,8 @@ fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
     "subfolder",
     [
         "maize_brazil",
-        "orange_iran"
+        "orange_iran",
+        "aggregated"
     ]
 )
 @patch("hestia_earth.models.hestia.resourceUse_utils._new_indicator", side_effect=fake_new_indicator)

tests/models/hestia/test_residueRemoved.py

@@ -0,0 +1,20 @@
+from unittest.mock import patch
+import json
+
+from tests.utils import fixtures_path, fake_new_practice
+from hestia_earth.models.hestia.residueRemoved import MODEL, TERM_ID, run
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{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:
+        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

tests/models/impact_assessment/test_emissions.py

@@ -28,5 +28,4 @@ def test_run(*args):
         expected = json.load(f)
 
     value = run(impact)
-    print(json.dumps(value))
     assert value == expected

tests/models/ipcc2019/test_aboveGroundBiomass.py

@@ -53,7 +53,9 @@ PARAMS_SHOULD_RUN = [
     ("historical-argentina-pasture", True),
     ("historical-brazil-maize", True),
     ("perennial-to-grassland-with-pasture-condition", True),
-    ("with-gapfilled-start-date-end-date", False)  # Closes #972
+    ("with-gapfilled-start-date-end-date", False),  # Closes #972
+    ("forest-to-cropland-with-missing-equilibrium-year-a", True),  # Closes #1076
+    ("forest-to-cropland-with-missing-equilibrium-year-b", True)  # Closes #1076
 ]
 IDS_SHOULD_RUN = [p[0] for p in PARAMS_SHOULD_RUN]
 

tests/models/ipcc2019/test_belowGroundBiomass.py

@@ -47,13 +47,15 @@ PARAMS_SHOULD_RUN = [
     ("forest-to-cropland-lcc-q4", True),
     ("forest-to-gohac", False),
     ("forest-to-orchard", True),
-    ("forest-to-orchard-with-ground-cover", True),  # Closes 989
+    ("forest-to-orchard-with-ground-cover", True),                 # Closes 989
     ("forest-to-orchard-with-in-category-lcc", True),
     ("historical-land-cover-mix", True),
     ("historical-argentina-pasture", True),
     ("historical-brazil-maize", True),
     ("perennial-to-grassland-with-pasture-condition", True),
-    ("with-gapfilled-start-date-end-date", False)  # Closes #972
+    ("with-gapfilled-start-date-end-date", False),                 # Closes #972
+    ("forest-to-cropland-with-missing-equilibrium-year-a", True),  # Closes #1076
+    ("forest-to-cropland-with-missing-equilibrium-year-b", True)   # Closes #1076
 ]
 IDS_SHOULD_RUN = [p[0] for p in PARAMS_SHOULD_RUN]
 

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/models/test_config.py

@@ -1,5 +1,6 @@
-import pytest
 import importlib
+
+import pytest
 from hestia_earth.utils.tools import flatten
 
 from hestia_earth.models.config import (
@@ -7,7 +8,6 @@ from hestia_earth.models.config import (
     get_max_stage
 )
 
-
 _aggregated_model = {
     "value": "input.hestiaAggregatedData"
 }
@@ -89,7 +89,7 @@ _ignore_values = [None, '', 'all']
 
 
 def _model_path(model: dict):
-    name = model.get('model')
+    name = model.get('model').replace('-', '_')
     value = model.get('value')
     suffix = f"hestia_earth.models.{name}"
     return f"{suffix}.{value}" if value not in _ignore_values else suffix

tests/models/test_ecoinventV3.py

@@ -50,7 +50,6 @@ 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_array_builders.py

@@ -242,8 +242,8 @@ def test_avg_run_in_rowwise():
 
 def test_gen_seed():
     NODE = {"@id": "site"}
-    EXPECTED = 2926675914
-    result = gen_seed(NODE)
+    EXPECTED = 1209943397
+    result = gen_seed(NODE, "model", "term")
     assert result == EXPECTED
 
 

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)