hestia-earth-models 0.73.1__py3-none-any.whl → 0.73.3__py3-none-any.whl

tests/models/frischknechtEtAl2000/test_ionisingRadiationKbqU235Eq.py

@@ -1,9 +1,10 @@
 import json
-import pytest
 from unittest.mock import patch
-from tests.utils import fixtures_path, fake_new_indicator
+
+import pytest
 
 from hestia_earth.models.frischknechtEtAl2000.ionisingRadiationKbqU235Eq 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}"
@@ -15,32 +16,80 @@ uranium234_input = {"@id": "uranium234", "termType": "waste", "units": "kg"}
 iodine129_input = {"@id": "iodine129", "termType": "waste", "units": "kg"}
 no_cf_input = {"@id": "oilPalmMillEffluentWaste", "termType": "waste", "units": "kg"}
 
-wrong_indicator = {"term": {"@id": "co2ToAirSoilOrganicCarbonStockChangeManagementChange", "termType": "emission"},
-                   "value": 3, "inputs": [hydrogen3_input]}
-
-indicator_no_inputs = {"term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
-                       "value": 3, "inputs": []}
-
-indicator_2_inputs = {"term": {"@id": "ionisingCompoundsToWaterInputsProduction", "termType": "emission"},
-                      "value": 3, "inputs": [cesium134_input, cesium137_input]}
-
-indicator_no_unit = {"term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
-                     "value": 3, "inputs": [{"@id": "hydrogen3", "termType": "waste"}]}
-
-indicator_wrong_unit = {"term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
-                        "value": 3, "inputs": [{"@id": "hydrogen3", "termType": "waste", "units": "not_a_unit"}]}
-
-indicator_no_cf_input = {"term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
-                         "value": 3, "inputs": [no_cf_input]}
-
-indicator_hydrogen3_input = {"term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
-                             "value": 3, "inputs": [hydrogen3_input]}
-
-indicator_cesium137_input = {"term": {"@id": "ionisingCompoundsToWaterInputsProduction", "termType": "emission"},
-                             "value": 3, "inputs": [cesium137_input]}
-
-indicator_uranium234_input = {"term": {"@id": "ionisingCompoundsToSaltwaterInputsProduction", "termType": "emission"},
-                              "value": 3, "inputs": [uranium234_input]}
+wrong_indicator = {
+    "term": {
+        "@id": "co2ToAirSoilOrganicCarbonStockChangeManagementChange",
+        "termType": "emission",
+    },
+    "value": 3,
+    "inputs": [hydrogen3_input],
+}
+
+indicator_no_inputs = {
+    "term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
+    "value": 3,
+    "inputs": [],
+}
+
+indicator_2_inputs = {
+    "term": {"@id": "ionisingCompoundsToWaterInputsProduction", "termType": "emission"},
+    "value": 3,
+    "inputs": [cesium134_input, cesium137_input],
+}
+
+indicator_no_unit = {
+    "term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
+    "value": 3,
+    "inputs": [{"@id": "hydrogen3", "termType": "waste"}],
+}
+
+indicator_wrong_unit = {
+    "term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
+    "value": 3,
+    "inputs": [{"@id": "hydrogen3", "termType": "waste", "units": "not_a_unit"}],
+}
+
+indicator_no_cf_input = {
+    "term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
+    "value": 3,
+    "inputs": [no_cf_input],
+}
+
+indicator_hydrogen3_input = {
+    "term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
+    "value": 3,
+    "inputs": [hydrogen3_input],
+}
+
+indicator_cesium137_water = {
+    "term": {"@id": "ionisingCompoundsToWaterInputsProduction", "termType": "emission"},
+    "value": 3,
+    "inputs": [cesium137_input],
+}
+
+indicator_cesium137_air = {
+    "term": {"@id": "ionisingCompoundsToAirInputsProduction", "termType": "emission"},
+    "value": 3,
+    "inputs": [cesium137_input],
+}
+
+indicator_cesium137_salt_water = {
+    "term": {
+        "@id": "ionisingCompoundsToSaltwaterInputsProduction",
+        "termType": "emission",
+    },
+    "value": 3,
+    "inputs": [cesium137_input],
+}
+
+indicator_uranium234_input = {
+    "term": {
+        "@id": "ionisingCompoundsToSaltwaterInputsProduction",
+        "termType": "emission",
+    },
+    "value": 3,
+    "inputs": [uranium234_input],
+}
 
 
 @pytest.mark.parametrize(
@@ -54,9 +103,11 @@ indicator_uranium234_input = {"term": {"@id": "ionisingCompoundsToSaltwaterInput
         ([indicator_wrong_unit], False, 0),
         ([indicator_no_cf_input], True, 0),
         ([indicator_hydrogen3_input], True, 1),
-        ([indicator_cesium137_input], True, 1),
+        ([indicator_cesium137_water], True, 1),
         ([indicator_uranium234_input], True, 1),
-        ([indicator_cesium137_input, indicator_no_cf_input], True, 1),
+        ([indicator_cesium137_water, indicator_no_cf_input], True, 1),
+        ([indicator_cesium137_water, indicator_cesium137_water], True, 2),
+        ([indicator_cesium137_water, indicator_cesium137_salt_water, indicator_cesium137_air], True, 3),
     ],
     ids=["No emissionsResourceUse => run, empty input",
          "Wrong indicator termid => run, empty input",
@@ -68,7 +119,10 @@ indicator_uranium234_input = {"term": {"@id": "ionisingCompoundsToSaltwaterInput
          "Good input ionisingCompoundsToAirInputsProduction => run, 1 input",
          "Good input ionisingCompoundsToWaterInputsProduction => run, 1 input",
          "Good input ionisingCompoundsToSaltwaterInputsProduction => run, 1 input",
-         "One good input => run, 1 input"]
+         "One good input => run, 1 input",
+         "2 identical indicators => run 2 input",
+         "3 different indicators common input => run 3 input",
+         ]
 )
 def test_should_run(resources, expected, num_inputs):
     with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:

tests/models/geospatialDatabase/test_utils.py

@@ -1,9 +1,13 @@
+import json
 from unittest.mock import patch
 from hestia_earth.schema import TermTermType
+from tests.utils import fixtures_path
 
-from hestia_earth.models.geospatialDatabase.utils import get_region_factor, get_area_size
+from hestia_earth.models.geospatialDatabase import MODEL
+from hestia_earth.models.geospatialDatabase.utils import get_region_factor, get_area_size, _get_boundary_area_size
 
 class_path = 'hestia_earth.models.geospatialDatabase.utils'
+fixtures_folder = f"{fixtures_path}/{MODEL}/utils"
 
 AREA = 1000
 COUNTRY = {
@@ -26,3 +30,10 @@ def test_get_area_size(*args):
     site['boundary'] = {'type': 'Polygon'}
     site['boundaryArea'] = AREA
     assert get_area_size(site) == AREA
+
+
+def test_get_boundary_area_size():
+    with open(f"{fixtures_folder}/site.jsonld", encoding='utf-8') as f:
+        site = json.load(f)
+
+    assert _get_boundary_area_size(boundary=site.get('boundary')) == 4896.1559583013795

tests/models/ipcc2019/test_organicCarbonPerHa_tier_2.py

@@ -3,7 +3,7 @@ from numpy.testing import assert_array_almost_equal
 from numpy.typing import NDArray
 from pytest import mark
 
-from hestia_earth.models.utils.array_builders import discrete_uniform_2d, repeat_single
+from hestia_earth.utils.stats import discrete_uniform_2d, repeat_single
 
 from hestia_earth.models.ipcc2019.organicCarbonPerHa import MODEL, TERM_ID
 from hestia_earth.models.ipcc2019.organicCarbonPerHa_tier_2 import (

tests/models/utils/test_array_builders.py

@@ -3,7 +3,7 @@ from numpy.testing import assert_array_equal, assert_allclose
 from numpy.typing import NDArray
 from pytest import mark
 
-from hestia_earth.models.utils.array_builders import (
+from hestia_earth.utils.stats import (
     avg_run_in_columnwise, avg_run_in_rowwise, correlated_normal_2d, discrete_uniform_1d, discrete_uniform_2d,
     gen_seed, grouped_avg, normal_1d, normal_2d, plus_minus_uncertainty_to_normal_1d,
     plus_minus_uncertainty_to_normal_2d, repeat_1d_array_as_columns, repeat_array_as_columns, repeat_array_as_rows,