hestia-earth-models 0.73.8__py3-none-any.whl → 0.74.1__py3-none-any.whl

tests/models/aware2_0/test_scarcityWeightedWaterUse.py

@@ -0,0 +1,58 @@
+from unittest.mock import patch
+import json
+from tests.utils import fixtures_path, fake_new_indicator, fake_load_impacts
+
+from hestia_earth.models.aware2_0 import MODEL_FOLDER
+from hestia_earth.models.aware2_0.scarcityWeightedWaterUse import TERM_ID, run
+
+class_path = f"hestia_earth.models.{MODEL_FOLDER}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL_FOLDER}/{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:
+        impact = json.load(f)
+
+    with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(impact)
+    assert value == expected
+
+
+@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
+def test_run_site_cropland(*args):
+    with open(f"{fixtures_folder}/with-site-cropland/impact-assessment.jsonld", encoding='utf-8') as f:
+        impact = json.load(f)
+
+    with open(f"{fixtures_folder}/with-site-cropland/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(impact)
+    assert value == expected
+
+
+@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
+def test_run_country(*args):
+    with open(f"{fixtures_folder}/with-country/impact-assessment.jsonld", encoding='utf-8') as f:
+        impact = json.load(f)
+
+    with open(f"{fixtures_folder}/with-country/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(impact)
+    assert value == expected
+
+
+@patch('hestia_earth.models.utils.input.load_impacts', side_effect=fake_load_impacts)
+@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
+def test_run_with_inputs(*args):
+    with open(f"{fixtures_folder}/with-inputs/impact-assessment.jsonld", encoding='utf-8') as f:
+        impact = json.load(f)
+
+    with open(f"{fixtures_folder}/with-inputs/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(impact)
+    assert value == expected

tests/models/{test_ecoinventV3.py → ecoinventV3/test_cycle.py}

@@ -3,10 +3,10 @@ import json
 from unittest.mock import patch
 
 from tests.utils import fixtures_path, fake_new_emission
-from hestia_earth.models.ecoinventV3 import MODEL, run
+from hestia_earth.models.ecoinventV3.cycle import MODEL, run
 
-class_path = f"hestia_earth.models.{MODEL}"
-fixtures_folder = os.path.join(fixtures_path, MODEL)
+class_path = f"hestia_earth.models.{MODEL}.cycle"
+fixtures_folder = os.path.join(fixtures_path, MODEL, 'cycle')
 
 TERMS_BY_ID = {
     '24EpibrassinolideTgai': {
@@ -53,7 +53,7 @@ def test_run(*args):
     with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
-    result = run('all', cycle)
+    result = run(cycle)
     assert result == expected
 
 
@@ -65,5 +65,5 @@ def test_run_ember(*args):
     with open(f"{fixtures_folder}/ember-comparison/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
-    result = run('all', cycle)
+    result = run(cycle)
     assert result == expected

tests/models/{test_ecoinventV3AndEmberClimate.py → ecoinventV3AndEmberClimate/test_cycle.py}

@@ -1,11 +1,12 @@
+import os
 import json
 from unittest.mock import patch
 
 from tests.utils import fixtures_path, fake_new_emission
-from hestia_earth.models.ecoinventV3AndEmberClimate import MODEL, run
+from hestia_earth.models.ecoinventV3AndEmberClimate.cycle import MODEL, run
 
-class_path = f"hestia_earth.models.{MODEL}"
-fixtures_folder = f"{fixtures_path}/{MODEL}"
+class_path = f"hestia_earth.models.{MODEL}.cycle"
+fixtures_folder = os.path.join(fixtures_path, MODEL, 'cycle')
 
 ELECTRICITY_TERMS = [
     'electricityGridMarketMix',
@@ -22,5 +23,6 @@ def test_run(*args):
     with open(f"{fixtures_folder}/result.jsonld", encoding="utf-8") as f:
         expected = json.load(f)
 
-    result = run('all', cycle)
+    result = run(cycle)
+    print(json.dumps(result, indent=2))
     assert result == expected

tests/models/environmentalFootprintV3_1/test_environmentalFootprintSingleOverallScore.py

@@ -72,7 +72,7 @@ ionising_radiation_indicator_radon = {
     "@type": "Indicator",
     "term": {"@id": "ionisingRadiationKbqU235Eq", "termType": "characterisedIndicator"},
     "value": 0.11156637927360424,
-    "inputs": [{"@id": "radon222"}],
+    "key": {"@id": "radon222"},
     "methodModel": methodModelfrischknechtEtAl2000
 }
 
@@ -80,7 +80,7 @@ ionising_radiation_indicator_plutonium238 = {
     "@type": "Indicator",
     "term": {"@id": "ionisingRadiationKbqU235Eq", "termType": "characterisedIndicator"},
     "value": 8.567909489437642e-13,
-    "inputs": [{"@id": "plutonium238"}],
+    "key": {"@id": "plutonium238"},
     "methodModel": methodModelfrischknechtEtAl2000
 }
 

tests/models/frischknechtEtAl2000/test_ionisingRadiationKbqU235Eq.py

@@ -22,55 +22,48 @@ wrong_indicator = {
         "termType": "emission",
     },
     "value": 3,
-    "inputs": [hydrogen3_input],
+    "key": hydrogen3_input
 }
 
-indicator_no_inputs = {
+indicator_no_key = {
     "term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
-    "value": 3,
-    "inputs": [],
-}
-
-indicator_2_inputs = {
-    "term": {"@id": "ionisingCompoundsToWaterInputsProduction", "termType": "emission"},
-    "value": 3,
-    "inputs": [cesium134_input, cesium137_input],
+    "value": 3
 }
 
 indicator_no_unit = {
     "term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
     "value": 3,
-    "inputs": [{"@id": "hydrogen3", "termType": "waste"}],
+    "key": {"@id": "hydrogen3", "termType": "waste"}
 }
 
 indicator_wrong_unit = {
     "term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
     "value": 3,
-    "inputs": [{"@id": "hydrogen3", "termType": "waste", "units": "not_a_unit"}],
+    "key": {"@id": "hydrogen3", "termType": "waste", "units": "not_a_unit"}
 }
 
 indicator_no_cf_input = {
     "term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
     "value": 3,
-    "inputs": [no_cf_input],
+    "key": no_cf_input
 }
 
 indicator_hydrogen3_input = {
     "term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
     "value": 3,
-    "inputs": [hydrogen3_input],
+    "key": hydrogen3_input
 }
 
 indicator_cesium137_water = {
     "term": {"@id": "ionisingCompoundsToWaterInputsProduction", "termType": "emission"},
     "value": 3,
-    "inputs": [cesium137_input],
+    "key": cesium137_input
 }
 
 indicator_cesium137_air = {
     "term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
     "value": 3,
-    "inputs": [cesium137_input],
+    "key": cesium137_input
 }
 
 indicator_cesium137_salt_water = {
@@ -79,7 +72,7 @@ indicator_cesium137_salt_water = {
         "termType": "emission",
     },
     "value": 3,
-    "inputs": [cesium137_input],
+    "key": cesium137_input
 }
 
 indicator_uranium234_input = {
@@ -88,17 +81,16 @@ indicator_uranium234_input = {
         "termType": "emission",
     },
     "value": 3,
-    "inputs": [uranium234_input],
+    "key": uranium234_input
 }
 
 
 @pytest.mark.parametrize(
-    "resources, expected, num_inputs",
+    "resources, expected, num_key",
     [
-        ([], True, 0),
-        ([wrong_indicator], True, 0),
-        ([indicator_no_inputs], False, 0),
-        ([indicator_2_inputs], False, 0),
+        ([], False, 0),
+        ([wrong_indicator], False, 0),
+        ([indicator_no_key], False, 0),
         ([indicator_no_unit], False, 0),
         ([indicator_wrong_unit], False, 0),
         ([indicator_no_cf_input], True, 0),
@@ -111,8 +103,7 @@ indicator_uranium234_input = {
     ],
     ids=["No emissionsResourceUse => run, empty input",
          "Wrong indicator termid => run, empty input",
-         "Indicator no inputs => no run",
-         "Indicator 2 inputs => no run",
+         "Indicator no key => no run",
          "Missing unit => no run",
          "Wrong unit => no run",
          "Input with no cf => run, empty input",
@@ -124,7 +115,7 @@ indicator_uranium234_input = {
          "3 different indicators common input => run 3 input",
          ]
 )
-def test_should_run(resources, expected, num_inputs):
+def test_should_run(resources, expected, num_key):
     with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:
         impactassessment = json.load(f)
 
@@ -132,7 +123,7 @@ def test_should_run(resources, expected, num_inputs):
 
     should_run, resources_with_cf = _should_run(impactassessment)
     assert should_run is expected
-    assert len(resources_with_cf) == num_inputs
+    assert len(resources_with_cf) == num_key
 
 
 @patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)

tests/models/hestia/test_landCover.py

@@ -12,7 +12,7 @@ from hestia_earth.models.faostat2018.utils import MODEL as FAOSTAT_MODEL
 from hestia_earth.models.hestia.landCover import (
     MODEL, MODEL_KEY, _get_changes, _estimate_maximum_forest_change,
     run, site_area_sum_to_100, _get_sums_of_crop_expansion, _get_sum_for_land_category, scale_values_to_one,
-    _get_most_common_or_alphabetically_first, _get_land_cover_lookup_suffix
+    _get_most_common_or_alphabetically_first, _get_land_cover_lookup_suffix, _get_ratio_between_land_use_types
 )
 
 CLASS_PATH = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
@@ -263,6 +263,16 @@ def test_get_land_cover_lookup_suffix(land_type: str, expected: str):
     assert _get_land_cover_lookup_suffix(land_type=land_type) == expected, land_type
 
 
+def test_get_ratio_between_land_use_types():
+    result = _get_ratio_between_land_use_types(
+        country_id="GADM-ZWE",
+        end_year=2004,
+        first_land_use_term="Arable land",
+        second_land_use_term="Permanent crops"
+    )
+    assert result == (3800.0, 58.843)
+
+
 @pytest.mark.parametrize("subfolder", _folders)
 @patch(f"{CLASS_PATH}._new_management", side_effect=fake_new_management)
 def test_run(mock, subfolder: str):
@@ -303,10 +313,10 @@ def test_landCover_from_lookup_run(mock_mgmt, mock_region_lookup, caplog):
     )
     expected_message = ("site=Brazil-example, requirements=true, model=hestia, model_key=landCover, "
                         "has_management_nodes=True, land_use_type=Arable land, allowed_land_use_types=Arable land;"
-                        "Permanent crops;Permanent meadows and pastures, has_no_prior_land_cover_data=True, "
-                        "management_nodes=value:100_id:maizePlant_land-use-type:Arable land_endDate:2010-12-31"
-                        "_startDate:2010-01-01, landCover_from_lookups=Forest land:0.55;Arable land:0.55;"
-                        "Permanent crops:0.55;Permanent meadows and pastures:0.55;Other land:0.55, "
-                        "should_run_nodes=True")
+                        "Permanent crops;Permanent meadows and pastures;Cropland, has_no_prior_land_cover_data=True, "
+                        "management_nodes=value:100_id:maizePlant_land-use-type:Arable land"
+                        "_endDate:2010-12-31_startDate:2010-01-01, landCover_from_lookups=Forest land:0.55;"
+                        "Arable land:0.55;Permanent crops:0.55;Permanent meadows and pastures:0.55;Other land:0.55,"
+                        " should_run_nodes=True")
     assert expected_message in [r.msg for r in caplog.records]
     assert result == expected

tests/models/site/pre_checks/test_cache_geospatialDatabase.py

@@ -11,10 +11,10 @@ def test_list_rasters():
 @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),
+        ('without values', {}, 4),
+        ('with region', {'region': 'region'}, 3),
+        ('with ecoregion', {'ecoregion': 'ecoregion'}, 3),
+        ('with awareWaterBasinId', {'awareWaterBasinId': 'awareWaterBasinId'}, 3),
     ]
 )
 def test_list_vectors(name: str, site: dict, expected_len: int):

tests/models/test_config.py

@@ -4,8 +4,15 @@ import pytest
 from hestia_earth.utils.tools import flatten
 
 from hestia_earth.models.config import (
-    load_config, config_max_stage, _is_aggregated_model, _remove_aggregated, load_run_config, load_trigger_config,
-    get_max_stage
+    load_config,
+    config_max_stage,
+    _is_aggregated_model,
+    _remove_aggregated,
+    _use_aware_1,
+    load_run_config,
+    load_trigger_config,
+    get_max_stage,
+    AWARE_VERSION
 )
 
 _aggregated_model = {
@@ -29,6 +36,27 @@ def test_load_config_error():
         load_config(node_type)
 
 
+def test_load_config_skip_aggregated_models():
+    node_type = 'Cycle'
+    all_models = load_config(node_type, skip_aggregated_models=False).get('models')
+    models_no_aggregated = load_config(node_type, skip_aggregated_models=True).get('models')
+    assert all_models != models_no_aggregated
+
+
+def test_load_config_use_aware_v1_site():
+    node_type = 'Site'
+    v1_models = load_config(node_type, use_aware_version=AWARE_VERSION.V1).get('models')
+    v2_models = load_config(node_type, use_aware_version=AWARE_VERSION.V2).get('models')
+    assert v1_models != v2_models
+
+
+def test_load_config_use_aware_v1_impact_assessment():
+    node_type = 'ImpactAssessment'
+    v1_models = load_config(node_type, use_aware_version=AWARE_VERSION.V1).get('models')
+    v2_models = load_config(node_type, use_aware_version=AWARE_VERSION.V2).get('models')
+    assert v1_models != v2_models
+
+
 def test_config_max_stage():
     node_type = 'Cycle'
     config = load_config(node_type)
@@ -48,11 +76,29 @@ def test_remove_aggregated():
     assert _remove_aggregated(models) == [[_other_model], _other_model]
 
 
-def test_load_config_skip_aggregated_models():
-    node_type = 'Cycle'
-    all_models = load_config(node_type, skip_aggregated_models=False).get('models')
-    models_no_aggregated = load_config(node_type, skip_aggregated_models=True).get('models')
-    assert all_models != models_no_aggregated
+def test_use_aware_1():
+    scarcity_model = {
+        "model": "aware2-0",
+        "value": "scarcityWeightedWaterUse"
+    }
+    basinid_model = {
+        "model": "geospatialDatabase",
+        "value": "awareWaterBasinId"
+    }
+    models = [
+        [scarcity_model],
+        basinid_model
+    ]
+    assert _use_aware_1(models) == [
+        [{
+            "model": "aware",
+            "value": "scarcityWeightedWaterUse"
+        }],
+        {
+            "model": "geospatialDatabase",
+            "value": "awareWaterBasinId_v1"
+        }
+    ]
 
 
 def test_load_run_config():

tests/models/{ecoalimV9/test_utils.py → utils/test_background_emissions.py}

@@ -1,9 +1,9 @@
-from hestia_earth.models.ecoalimV9.utils import _values_from_column
+from hestia_earth.models.utils.background_emissions import _values_from_column
 
 
 def test_values_from_column():
     column = 'landTransformation+landCover[pond]+previousLandCover[permanentCropland]+country[GADM-BRA]'
-    assert _values_from_column(column, '10') == {
+    assert _values_from_column('', column, '10') == {
         'landTransformation': {
             'value': 10,
             'landCover': 'pond',