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

tests/models/site/test_management.py

@@ -18,10 +18,7 @@ _LAND_COVER_TERM_BY_SITE_TYPE = {
 _folders = [d for d in os.listdir(fixtures_folder) if os.path.isdir(os.path.join(fixtures_folder, d))]
 
 
-@pytest.mark.parametrize(
-    "folder",
-    _folders
-)
+@pytest.mark.parametrize('folder', _folders)
 @patch(
     f"{class_path}.get_landCover_term_id_from_site_type",
     side_effect=lambda site_type: _LAND_COVER_TERM_BY_SITE_TYPE[site_type]

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

@@ -30,178 +30,26 @@ from hestia_earth.models.utils.blank_node import (
 
 
 class_path = "hestia_earth.models.utils.blank_node"
-measurement_fixtures_folder = f"{fixtures_path}/utils/measurement"
+fixtures_folder = os.path.join(fixtures_path, 'utils', 'blank_node')
+measurement_fixtures_folder = os.path.join(fixtures_path, 'utils', 'measurement')
+
+condense_fixtures_folder = os.path.join(fixtures_folder, 'condense-nodes')
+condense_folders = [
+    d for d in os.listdir(condense_fixtures_folder) if os.path.isdir(os.path.join(condense_fixtures_folder, d))
+]
 
-fixtures_path = os.path.join(fixtures_path, 'utils', 'blank_node')
 
+@pytest.mark.parametrize('folder', condense_folders)
+def test_condense_nodes(folder: str):
+    fixture_path = os.path.join(condense_fixtures_folder, folder)
 
-def test_condense_nodes():
-    with open(f"{fixtures_path}/condense-nodes/original.jsonld", encoding='utf-8') as f:
+    with open(f"{fixture_path}/original.jsonld", encoding='utf-8') as f:
         original = json.load(f)
-    with open(f"{fixtures_path}/condense-nodes/result.jsonld", encoding='utf-8') as f:
+    with open(f"{fixture_path}/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
     value = condense_nodes(original)
-    assert value == expected
-
-
-@pytest.mark.parametrize(
-    "test_name,input_nodes,expected_output_nodes",
-    [
-        (
-            "No match",
-            [
-                {"startDate": "2001", "endDate": "2002", "term": {"@id": "treeNutTree", "units": "% area"},
-                 "value": [2]},
-                {"startDate": "2003", "endDate": "2004", "term": {"@id": "bananaPlant", "units": "% area"},
-                 "value": [2]},
-            ],
-            [
-                {"startDate": "2001", "endDate": "2002", "term": {"@id": "treeNutTree", "units": "% area"},
-                 "value": [2]},
-                {"startDate": "2003", "endDate": "2004", "term": {"@id": "bananaPlant", "units": "% area"},
-                 "value": [2]},
-            ],
-        ),
-        (
-            "No continuity",
-            [
-                {"startDate": "2001", "endDate": "2002", "term": {"@id": "treeNutTree", "units": "% area"},
-                 "value": [2]},
-                {"startDate": "2004", "endDate": "2005", "term": {"@id": "treeNutTree", "units": "% area"},
-                 "value": [2]},
-            ],
-            [
-                {"startDate": "2001", "endDate": "2002", "term": {"@id": "treeNutTree", "units": "% area"},
-                 "value": [2]},
-                {"startDate": "2004", "endDate": "2005", "term": {"@id": "treeNutTree", "units": "% area"},
-                 "value": [2]},
-            ],
-        ),
-        (
-            "No continuity (multiple values differ)",
-            [
-                {"startDate": "2001", "endDate": "2002", "term": {"@id": "treeNutTree", "units": "% area"},
-                 "value": [10, 20]},
-                {"startDate": "2003", "endDate": "2004", "term": {"@id": "treeNutTree", "units": "% area"},
-                 "value": [10, 30]},
-            ],
-            [
-                {"startDate": "2001", "endDate": "2002", "term": {"@id": "treeNutTree", "units": "% area"},
-                 "value": [10, 20]},
-                {"startDate": "2003", "endDate": "2004", "term": {"@id": "treeNutTree", "units": "% area"},
-                 "value": [10, 30]},
-            ],
-        ),
-        (
-            "2-1 condense (YYYY dates)",
-            [
-                {"startDate": "2001", "endDate": "2001", "term": {"@id": "treeNutTree", "units": "% area"},
-                 "value": [10, 20]},
-                {"startDate": "2002", "endDate": "2002", "term": {"@id": "treeNutTree", "units": "% area"},
-                 "value": [10, 20]},
-            ],
-            [
-                {"startDate": "2001", "endDate": "2002", "term": {"@id": "treeNutTree", "units": "% area"},
-                 "value": [10, 20]}
-            ],
-        ),
-        (
-            "4-2 condense (YYYY-MM dates)",
-            [
-                {"startDate": "2001-01", "endDate": "2002-01", "term": {"@id": "treeNutTree", "units": "% area"},
-                 "value": [2]},
-                {"startDate": "2002-01", "endDate": "2002-03", "term": {"@id": "treeNutTree", "units": "% area"},
-                 "value": [2]},
-            ],
-            [
-                {"startDate": "2001-01", "endDate": "2002-03", "term": {"@id": "treeNutTree", "units": "% area"},
-                 "value": [2]}
-            ],
-        ),
-        (
-            "2-1 condense (YYYY-MM-DD dates)",
-            [
-                {"startDate": "2001-01-01", "endDate": "2001-12-31", "term": {"@id": "treeNutTree", "units": "% area"},
-                 "value": [2]},
-                {"startDate": "2002-01-01", "endDate": "2002-05-04", "term": {"@id": "treeNutTree", "units": "% area"},
-                 "value": [2]},
-            ],
-            [
-                {"startDate": "2001-01-01", "endDate": "2002-05-04", "term": {"@id": "treeNutTree", "units": "% area"},
-                 "value": [2]}
-            ],
-        ),
-        (
-            "3-1-condense",
-            [
-                {"startDate": "2001-01-01", "endDate": "2001-12-31", "term": {"@id": "bananaPlant", "units": "% area"},
-                 "value": [9]},
-                {"startDate": "2002-01-01", "endDate": "2002-10-31", "term": {"@id": "bananaPlant", "units": "% area"},
-                 "value": [9]},
-                {"startDate": "2002-11-01", "endDate": "2004-04-05", "term": {"@id": "bananaPlant", "units": "% area"},
-                 "value": [9]},
-            ],
-            [
-                {"startDate": "2001-01-01", "endDate": "2004-04-05", "term": {"@id": "bananaPlant", "units": "% area"},
-                 "value": [9]}
-            ],
-        ),
-        (
-            "3-2-partial-condense",
-            [
-                {"startDate": "2001-01-01", "endDate": "2001-12-31", "term": {"@id": "bananaPlant", "units": "% area"},
-                 "value": [9]},
-                {"startDate": "2012-02-01", "endDate": "2012-12-31", "term": {"@id": "bananaPlant", "units": "% area"},
-                 "value": [9]},
-                {"startDate": "2002-01-01", "endDate": "2003-12-31", "term": {"@id": "bananaPlant", "units": "% area"},
-                 "value": [9]},
-            ],
-            [
-                {"startDate": "2001-01-01", "endDate": "2003-12-31", "term": {"@id": "bananaPlant", "units": "% area"},
-                 "value": [9]},
-                {"startDate": "2012-02-01", "endDate": "2012-12-31", "term": {"@id": "bananaPlant", "units": "% area"},
-                 "value": [9]},
-            ],
-        ),
-        (
-            "7-2-multi-condense",
-            [
-                {"startDate": "2001-01-01", "endDate": "2001-11-30", "term": {"@id": "bananaPlant", "units": "% area"},
-                 "value": [7]},
-                {"startDate": "2012-02-01", "endDate": "2012-12-31", "term": {"@id": "bananaPlant", "units": "% area"},
-                 "value": [7]},
-                {"startDate": "2001-12-01", "endDate": "2001-12-31", "term": {"@id": "bananaPlant", "units": "% area"},
-                 "value": [7]},
-                {"startDate": "2002-01-01", "endDate": "2002-12-31", "term": {"@id": "bananaPlant", "units": "% area"},
-                 "value": [7]},
-                {"startDate": "2013-01-01", "endDate": "2013-05-20", "term": {"@id": "bananaPlant", "units": "% area"},
-                 "value": [7]},
-            ],
-            [
-                {"startDate": "2001-01-01", "endDate": "2002-12-31", "term": {"@id": "bananaPlant", "units": "% area"},
-                 "value": [7]},
-                {"startDate": "2012-02-01", "endDate": "2013-05-20", "term": {"@id": "bananaPlant", "units": "% area"},
-                 "value": [7]}
-            ],
-        ),
-        (
-            "same-blank-nodes-sum",
-            [
-                {"startDate": "2001-01-01", "endDate": "2001-11-30", "term": {"@id": "bananaPlant", "units": "% area"},
-                 "value": [50]},
-                {"startDate": "2001-01-01", "endDate": "2001-11-30", "term": {"@id": "bananaPlant", "units": "% area"},
-                 "value": [50]}
-            ],
-            [
-                {"startDate": "2001-01-01", "endDate": "2001-11-30", "term": {"@id": "bananaPlant", "units": "% area"},
-                 "value": [100]}
-            ]
-        )
-    ]
-)
-def test_condense_nodes_(test_name, input_nodes, expected_output_nodes):
-    assert condense_nodes(input_nodes) == expected_output_nodes
+    assert value == expected, folder
 
 
 def test_run_required():

tests/orchestrator/models/test_transformations.py

@@ -2,13 +2,16 @@ from unittest.mock import patch
 import json
 import os
 
-from tests.utils import fixtures_path
+from tests.utils import fixtures_path, fake_new_emission, fake_new_product, fake_new_input
 from hestia_earth.orchestrator.models.transformations import run, _include_practice
 
 folder_path = os.path.join(fixtures_path, 'orchestrator', 'transformation')
 
 
 @patch('hestia_earth.orchestrator.strategies.merge._merge_version', return_value='0.0.0')
+@patch('hestia_earth.models.transformation.input.excreta._new_input', side_effect=fake_new_input)
+@patch('hestia_earth.models.transformation.product.excreta._new_product', side_effect=fake_new_product)
+@patch('hestia_earth.models.ipcc2019.n2OToAirExcretaDirect._new_emission', side_effect=fake_new_emission)
 def test_run(*args):
     with open(os.path.join(folder_path, 'config.json'), encoding='utf-8') as f:
         config = json.load(f)

tests/models/environmentalFootprintV3/test_soilQualityIndexLandTransformation.py

@@ -1,164 +0,0 @@
-import json
-from unittest.mock import Mock, patch
-
-from pytest import mark
-
-from hestia_earth.models.environmentalFootprintV3.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}"
-
-
-def fake_rounded_indicator(value: float):
-    indicator = fake_new_indicator(TERM_ID, MODEL)
-    indicator['value'] = round(value, 7)
-    return indicator
-
-
-crop_land = {"@id": "cropland", "termType": "landCover"}
-sea_land_cover = {"@id": "seaOrOcean", "termType": "landCover"}
-forest = {"@id": "forest", "termType": "landCover"}
-indicator = {
-    "@id": "landTransformation20YearAverageInputsProduction",
-    "termType": "resourceUse",
-    "units": "m2 / year"
-}
-wrong_indicator = {"term": {"@id": "NOT_VALID_INDICATOR_ID", "termType": "resourceUse", "units": "m2 / year"},
-                   "value": 0.5, "landCover": crop_land, "previousLandCover": forest}
-
-indicator_no_land_cover = {
-    "term": indicator,
-    "previousLandCover": forest,
-    "value": 0.5}
-
-indicator_no_previous_land_cover = {
-    "term": indicator,
-    "landCover": crop_land,
-    "value": 0.5}
-
-indicator_bad_area_value = {
-    "term": indicator,
-    "value": -10,
-    "previousLandCover": forest,
-    "landCover": crop_land}
-
-inputs_production_indicator_from_forest_to_no_cf = {
-    "term": indicator,
-    "value": 0.5,
-    "previousLandCover": forest,
-    "landCover": sea_land_cover}
-
-good_inputs_production_indicator_from_forest_to_cropland = {
-    "term": indicator,
-    "value": 0.5,
-    "previousLandCover": forest,
-    "landCover": crop_land}
-
-good_inputs_production_indicator_from_forest_to_forest = {
-    "term": indicator,
-    "value": 0.5,
-    "previousLandCover": forest,
-    "landCover": forest}
-
-good_during_cycle_indicator_from_forest_to_cropland = {
-    "term": indicator | {'@id': 'landTransformation20YearAverageDuringCycle'},
-    "value": 0.5,
-    "previousLandCover": forest,
-    "landCover": crop_land}
-
-good_during_cycle_indicator_from_forest_to_forest = {
-    "term": indicator | {'@id': 'landTransformation20YearAverageDuringCycle'},
-    "value": 0.5,
-    "previousLandCover": forest,
-    "landCover": forest}
-
-
-@mark.parametrize(
-    "resources, expected, num_inputs",
-    [
-        ([], 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),
-        ([good_during_cycle_indicator_from_forest_to_cropland], True, 1),
-        ([good_during_cycle_indicator_from_forest_to_forest], True, 1),
-        ([good_inputs_production_indicator_from_forest_to_cropland], True, 1),
-        ([good_inputs_production_indicator_from_forest_to_forest], True, 1),
-        ([inputs_production_indicator_from_forest_to_no_cf], True, 0),  # todo check
-        ([good_inputs_production_indicator_from_forest_to_cropland,
-          good_during_cycle_indicator_from_forest_to_cropland], True, 2)
-    ],
-    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",
-         "One good during cycle transformation => run, 1 dict",
-         "One 0 during cycle transformation => run, 1 dict",
-         "One good inputs production transformation => run, 1 dict",
-         "One 0 inputs production transformation => run, 1 dict",
-         "One good from transformation and One with no CF (ocean) => run, 2 dict",  # todo
-         "Multiple good indicators => run, 2 dict",
-         ]
-)
-def test_should_run(resources: list, expected: bool, num_inputs: int):
-    with open(f"{fixtures_folder}/multipleTransformations/impact-assessment.jsonld", encoding='utf-8') as f:
-        impact = json.load(f)
-
-    impact['emissionsResourceUse'] = resources
-
-    should_run, resources_with_cf = _should_run(impact)
-    assert should_run is expected
-    assert len(resources_with_cf) == num_inputs
-
-
-@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
-def test_run(*args):
-    with open(f"{fixtures_folder}/multipleTransformations/impact-assessment.jsonld", encoding='utf-8') as f:
-        impact = json.load(f)
-
-    with open(f"{fixtures_folder}/multipleTransformations/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_italy(*args):
-    with open(f"{fixtures_folder}/Italy/impact-assessment.jsonld", encoding='utf-8') as f:
-        impact = json.load(f)
-
-    with open(f"{fixtures_folder}/Italy/result.jsonld", encoding='utf-8') as f:
-        expected = json.load(f)
-
-    value = run(impact)
-    assert value == expected
-
-
-@mark.parametrize(
-    "added_data",
-    [
-        {"country": {}},
-        {"country": {"@id": "region-europe", "@type": "Term", "name": "Europe"}},
-    ],
-    ids=["No country/region => default to region world",
-         "region-europe not in the lookup file => default to region world"]
-)
-@patch(f"{class_path}._indicator", side_effect=fake_rounded_indicator)
-def test_run_with_country_fallback(mocked_indicator: Mock, added_data: dict):
-    """
-    When given valid sub-region or country not in the lookup file, default to country 'region-world' with value 574.56
-    """
-
-    with open(f"{fixtures_folder}/multipleTransformations/impact-assessment.jsonld", encoding='utf-8') as f:
-        impact = json.load(f)
-
-    impact = impact | added_data
-
-    value = run(impact)
-    assert value['value'] == 574.56