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

tests/orchestrator/strategies/run/test_add_blank_node_if_missing.py

@@ -3,7 +3,7 @@ from unittest.mock import patch
 from hestia_earth.orchestrator.strategies.run.add_blank_node_if_missing import should_run
 
 class_path = 'hestia_earth.orchestrator.strategies.run.add_blank_node_if_missing'
-FAKE_EMISSION = {'@id': 'n2OToAirExcretaDirect', 'termType': 'emission'}
+FAKE_EMISSION = {'@id': 'n2OToAirCropResidueDecompositionIndirect', 'termType': 'emission'}
 
 
 @patch(f"{class_path}.get_required_model_param", return_value='')
@@ -95,20 +95,15 @@ def test_should_run_runNonMeasured(mock_node_exists, *args):
     assert should_run(data, model) is True
 
 
-@patch(f"{class_path}.get_table_value", return_value='Cycle')
-@patch(f"{class_path}.download_hestia", return_value=FAKE_EMISSION)
-@patch(f"{class_path}.get_required_model_param", return_value='')
+@patch(f"{class_path}.get_required_model_param", return_value=FAKE_EMISSION.get('@id'))
 @patch(f"{class_path}.find_term_match")
 def test_should_run_check_typeAllowed(mock_node_exists, *args):
-    data = {}
     node = {'term': FAKE_EMISSION}
     mock_node_exists.return_value = node
     model = {}
 
     # type is not allowed => no run
-    data['@type'] = 'Transformation'
-    assert not should_run(data, model)
+    assert not should_run({'type': 'Transformation'}, model)
 
     # type is allowed => run
-    data['@type'] = 'Cycle'
-    assert should_run(data, model) is True
+    assert should_run({'type': 'Cycle'}, model) is True

hestia_earth/models/environmentalFootprintV3_1/utils.py

@@ -1,17 +0,0 @@
-from typing import Optional
-from hestia_earth.utils.lookup import download_lookup
-from hestia_earth.utils.lookup import get_table_value, column_name
-
-from hestia_earth.models.log import debugMissingLookup
-from . import MODEL
-
-
-def get_coefficient_factor(lookup_name: str, country_id: str, occupation_type: Optional[str], term_id: str):
-    """
-    Gets the EU PEF Characteristic factor for a given eu site type and country
-    """
-    coefficient = get_table_value(download_lookup(lookup_name), 'termid', country_id, column_name(occupation_type))
-    debugMissingLookup(
-        lookup_name, 'termid', country_id, occupation_type, coefficient, model=MODEL, term=term_id
-    )
-    return coefficient

tests/models/utils/test_lookup.py

@@ -1,10 +0,0 @@
-from hestia_earth.models.utils.lookup import is_siteType_allowed
-
-
-def test_is_siteType_allowed():
-    term = {'@id': 'pastureGrass', 'termType': 'landUseManagement'}
-    site = {'@type': 'Site', 'siteType': 'cropland'}
-    assert not is_siteType_allowed(site, term)
-
-    cycle = {'otherSites': [{'@type': 'Site', 'siteType': 'permanent pasture'}]}
-    assert is_siteType_allowed(cycle, term) is True