hestia-earth-models 0.64.9__py3-none-any.whl → 0.64.11__py3-none-any.whl

hestia_earth/models/lcImpactCertainEffectsInfinite/damageToHumanHealthStratosphericOzoneDepletion.py

@@ -1,6 +1,6 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.impact_assessment import impact_lookup_value
+from hestia_earth.models.utils.impact_assessment import impact_emission_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -26,7 +26,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, True)

hestia_earth/models/lcImpactCertainEffectsInfinite/damageToHumanHealthWaterStress.py

@@ -47,5 +47,5 @@ def run(impact_assessment: dict):
     )
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactCertainEffectsInfinite/damageToMarineEcosystemsMarineEutrophication.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystemsClimateChange.py

@@ -1,6 +1,6 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.indicator import _new_indicator
-from hestia_earth.models.utils.impact_assessment import impact_lookup_value
+from hestia_earth.models.utils.impact_assessment import impact_emission_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {
@@ -26,7 +26,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
     logShouldRun(impact_assessment, MODEL, TERM_ID, True)

hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystemsPhotochemicalOzoneFormation.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystemsTerrestrialAcidification.py

@@ -33,5 +33,5 @@ def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv")
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     value=value)
-    logShouldRun(impact_assessment, MODEL, TERM_ID, True)
-    return _indicator(value)
+    logShouldRun(impact_assessment, MODEL, TERM_ID, value is not None)
+    return None if value is None else _indicator(value)

hestia_earth/models/mocking/build_mock_search.py

@@ -0,0 +1,44 @@
+from inspect import getmembers, isfunction
+from hestia_earth.utils.tools import flatten
+
+from hestia_earth.models.utils import term
+
+_IGNORE_FUNC = ['get_lookup_value', 'get_table_value']
+_original_search_func = term.search
+_original_find_node_func = term.find_node
+
+
+def _map_results(results):
+    # returning the whole term
+    return [results] if isinstance(results, dict) else (
+        {'@type': 'Term', '@id': results} if isinstance(results, str) else
+        flatten(map(_map_results, results)) if isinstance(results, list) else
+        None
+    )
+
+
+def _create_search_result(data: tuple):
+    search_query = {}
+
+    def new_search(query: dict, *_a, **_b):
+        nonlocal search_query
+        search_query = query
+        return _original_search_func(query, *_a, **_b)
+
+    term.search = new_search
+
+    def new_find_node(_n, query: dict, *_a, **_b):
+        nonlocal search_query
+        search_query = query
+        return _original_find_node_func(_n, query, *_a, **_b)
+
+    term.find_node = new_find_node
+
+    function_name, func = data
+    res = func()
+    return {'name': function_name, 'query': search_query, 'results': _map_results(res)}
+
+
+def create_search_results():
+    funcs = list(filter(lambda v: v[0].startswith('get_') and not v[0] in _IGNORE_FUNC, getmembers(term, isfunction)))
+    return list(map(_create_search_result, funcs))

hestia_earth/models/mocking/mock_search.py

@@ -1,48 +1,9 @@
-from inspect import getmembers, isfunction
 import json
-from hestia_earth.utils.tools import flatten
 
 from hestia_earth.models.utils import term
 
-IGNORE_FUNC = ['get_lookup_value', 'get_table_value']
-
-
-def _map_results(results):
-    # returning the whole term
-    return [results] if isinstance(results, dict) else (
-        {'@type': 'Term', '@id': results} if isinstance(results, str) else
-        flatten(map(_map_results, results)) if isinstance(results, list) else
-        None
-    )
-
-
-def _create_search_result(data: tuple):
-    search_query = {}
-
-    original_search = term.search
-
-    def new_search(query: dict, *_a, **_b):
-        nonlocal search_query
-        search_query = query
-        return original_search(query, *_a, **_b)
-    term.search = new_search
-
-    original_find_node = term.find_node
-
-    def new_find_node(_n, query: dict, *_a, **_b):
-        nonlocal search_query
-        search_query = query
-        return original_find_node(_n, query, *_a, **_b)
-    term.find_node = new_find_node
-
-    function_name, func = data
-    res = func()
-    return {'name': function_name, 'query': search_query, 'results': _map_results(res)}
-
-
-def create_search_results():
-    funcs = list(filter(lambda v: v[0].startswith('get_') and not v[0] in IGNORE_FUNC, getmembers(term, isfunction)))
-    return list(map(_create_search_result, funcs))
+_original_search_func = term.search
+_original_find_node_func = term.find_node
 
 
 def _load_results(filepath: str):
@@ -56,22 +17,20 @@ def _find_search_result(filepath: str, query: dict):
     return None if res is None else res.get('results', [])
 
 
-def _mocked_search(original_func, filepath: str):
+def _mocked_search(filepath: str):
     def mock(query: dict, **kwargs):
         result = _find_search_result(filepath, query)
-        return original_func(query, **kwargs) if result is None else result
+        return _original_search_func(query, **kwargs) if result is None else result
     return mock
 
 
-def _mocked_find_node(original_func, filepath: str):
+def _mocked_find_node(filepath: str):
     def mock(node_type: str, query: dict, **kwargs):
         result = _find_search_result(filepath, query)
-        return original_func(node_type, query, **kwargs) if result is None else result
+        return _original_find_node_func(node_type, query, **kwargs) if result is None else result
     return mock
 
 
 def mock(filepath: str):
-    original_search = term.search
-    term.search = _mocked_search(original_search, filepath)
-    original_find_node = term.find_node
-    term.find_node = _mocked_find_node(original_find_node, filepath)
+    term.search = _mocked_search(filepath)
+    term.find_node = _mocked_find_node(filepath)