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

hestia_earth/models/poschEtAl2008/terrestrialAcidificationPotentialAccumulatedExceedance.py

@@ -36,8 +36,8 @@ def _indicator(value: float):
 
 def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv",
-                                 country_fallback=True, default_no_emissions=0)
+                                 country_fallback=True)
     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/poschEtAl2008/terrestrialEutrophicationPotentialAccumulatedExceedance.py

@@ -36,8 +36,8 @@ def _indicator(value: float):
 
 def run(impact_assessment: dict):
     value = impact_country_value(MODEL, TERM_ID, impact_assessment, f"{list(LOOKUPS.keys())[0]}.csv",
-                                 country_fallback=True, default_no_emissions=0)
+                                 country_fallback=True)
     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/preload_requests.py

@@ -5,7 +5,7 @@ import json
 import os
 
 from .log import logger
-from .mocking.mock_search import create_search_results
+from .mocking.build_mock_search import create_search_results
 from .mocking import RESULTS_PATH, enable_mock as _mock
 
 

hestia_earth/models/recipe2016Egalitarian/ecosystemDamageOzoneFormation.py

@@ -1,7 +1,7 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils import sum_values
 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 hestia_earth.models.utils.pesticideAI import impact_lookup_value as pesticides_lookup_value
 from . import MODEL
 
@@ -34,7 +34,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    emissions_value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    emissions_value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     emissions_value=emissions_value)
 

hestia_earth/models/recipe2016Egalitarian/freshwaterEutrophicationPotential.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/recipe2016Egalitarian/humanDamageOzoneFormation.py

@@ -1,7 +1,7 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils import sum_values
 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 hestia_earth.models.utils.pesticideAI import impact_lookup_value as pesticides_lookup_value
 from . import MODEL
 
@@ -34,7 +34,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    emissions_value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    emissions_value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     emissions_value=emissions_value)
 

hestia_earth/models/recipe2016Egalitarian/marineEutrophicationPotential.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/recipe2016Egalitarian/ozoneDepletionPotential.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/recipe2016Egalitarian/terrestrialAcidificationPotential.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/recipe2016Hierarchist/ecosystemDamageOzoneFormation.py

@@ -1,7 +1,7 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils import sum_values
 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 hestia_earth.models.utils.pesticideAI import impact_lookup_value as pesticides_lookup_value
 from . import MODEL
 
@@ -34,7 +34,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    emissions_value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    emissions_value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     emissions_value=emissions_value)
 

hestia_earth/models/recipe2016Hierarchist/freshwaterEutrophicationPotential.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/recipe2016Hierarchist/humanDamageOzoneFormation.py

@@ -1,7 +1,7 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils import sum_values
 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 hestia_earth.models.utils.pesticideAI import impact_lookup_value as pesticides_lookup_value
 from . import MODEL
 
@@ -34,7 +34,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    emissions_value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    emissions_value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     emissions_value=emissions_value)
 

hestia_earth/models/recipe2016Hierarchist/marineEutrophicationPotential.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/recipe2016Hierarchist/ozoneDepletionPotential.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/recipe2016Hierarchist/terrestrialAcidificationPotential.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/recipe2016Individualist/ecosystemDamageOzoneFormation.py

@@ -1,7 +1,7 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils import sum_values
 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 hestia_earth.models.utils.pesticideAI import impact_lookup_value as pesticides_lookup_value
 from . import MODEL
 
@@ -34,7 +34,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    emissions_value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    emissions_value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     emissions_value=emissions_value)
 

hestia_earth/models/recipe2016Individualist/freshwaterEutrophicationPotential.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/recipe2016Individualist/humanDamageOzoneFormation.py

@@ -1,7 +1,7 @@
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils import sum_values
 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 hestia_earth.models.utils.pesticideAI import impact_lookup_value as pesticides_lookup_value
 from . import MODEL
 
@@ -34,7 +34,7 @@ def _indicator(value: float):
 
 
 def run(impact_assessment: dict):
-    emissions_value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
+    emissions_value = impact_emission_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['emission'])
     logRequirements(impact_assessment, model=MODEL, term=TERM_ID,
                     emissions_value=emissions_value)
 

hestia_earth/models/recipe2016Individualist/marineEutrophicationPotential.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/recipe2016Individualist/ozoneDepletionPotential.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/recipe2016Individualist/terrestrialAcidificationPotential.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/schmidt2007/utils.py

@@ -3,14 +3,23 @@ from hestia_earth.utils.model import filter_list_term_type
 from hestia_earth.utils.tools import non_empty_list
 
 from hestia_earth.models.utils.completeness import _is_term_type_complete
-from hestia_earth.models.utils.lookup import factor_value
+from hestia_earth.models.utils.lookup import all_factor_value
+from . import MODEL
 
 
 def get_waste_values(term_id: str, cycle: dict, lookup_col: str):
     products = filter_list_term_type(cycle.get('products', []), TermTermType.WASTE)
-    values = non_empty_list(map(factor_value(None, term_id, f"{TermTermType.WASTE.value}.csv", lookup_col), products))
+    value = all_factor_value(
+        model=MODEL,
+        term_id=term_id,
+        node=cycle,
+        lookup_name=f"{TermTermType.WASTE.value}.csv",
+        lookup_col=lookup_col,
+        blank_nodes=products,
+        default_no_values=None
+    )
     return [0] if all([
-        len(values) == 0,
+        value is None,
         _is_term_type_complete(cycle, TermTermType.WASTE),
         cycle.get('@type', cycle.get('type')) == NodeType.CYCLE.value  # ignore adding 0 value for Transformation
-    ]) else values
+    ]) else non_empty_list([value])

hestia_earth/models/utils/blank_node.py

@@ -28,14 +28,14 @@ from hestia_earth.utils.tools import (
 )
 
 from . import is_from_model, _filter_list_term_unit, is_iterable, full_date_str
-from .constant import Units
+from .constant import Units, get_atomic_conversion
 from .lookup import (
     is_model_siteType_allowed,
     is_siteType_allowed,
     is_product_id_allowed, is_product_termType_allowed,
-    is_input_id_allowed, is_input_termType_allowed
+    is_input_id_allowed, is_input_termType_allowed, _node_value
 )
-from .property import get_node_property, get_node_property_value
+from .property import get_node_property, get_node_property_value, find_term_property
 from .term import get_lookup_value
 from ..log import debugValues, log_as_table
 
@@ -1387,3 +1387,73 @@ def most_relevant_blank_node_by_id(nodes: list, term_id: str, date: str):
     return {} if len(filtered_nodes) == 0 \
         else _shallowest_node(_most_recent_nodes(filtered_nodes, date)) \
         if date and len(filtered_nodes) > 1 else filtered_nodes[0]
+
+
+PROPERTY_UNITS_CONVERSIONS = {
+    Units.KG.value: {
+        Units.MJ.value: [
+            'energyContentHigherHeatingValue',  # "kg" to "mj"
+        ]
+    },
+    Units.M3.value: {
+        Units.MJ.value: [
+            'density',  # "m3" to "kg"
+            'energyContentHigherHeatingValue',  # "kg" to "mj"
+        ]
+    }
+}
+
+
+def _convert_via_property(node: dict, node_value: Union[int, float], property_field: str) -> Optional[float]:
+    """
+    Converts a node_value number from one unit to another using a property_field  associated
+    with a term inside term node such as "density" or 'energyContentHigherHeatingValue' or listed
+    in https://www.hestia.earth/glossary?page=1&termType=property
+
+    Will return none if the property_field is not found
+
+    Parameters
+    ----------
+    node: a dict containing a term
+    node_value: value to be converted as float or int
+    property_field: str such as "density"
+
+    Returns float or None
+    -------
+    """
+    node_property = find_term_property(node, property_field, default={}, keep_in_memory=True)
+    node_property_value = safe_parse_float(node_property.get("value", 0))
+
+    return node_value * node_property_value if node_value is not None and bool(node_property_value) else None
+
+
+def convert_unit(node, dest_unit: Units, node_value: Union[int, float] = None) -> Optional[Union[int, float]]:
+    """
+    Convert a number `value` inside a node or a optional `node_value` belonging to a term `node`, to unit `dest_unit`
+    using the ATOMIC_WEIGHT_CONVERSIONS map or failing that, the PROPERTY_UNITS_CONVERSIONS map and lookups
+    """
+    src_unit = node.get("units", "")
+
+    node_value = _node_value(node) if node_value is None else node_value
+
+    return node_value if src_unit == dest_unit.value else (
+        node_value * get_atomic_conversion(src_unit, dest_unit)
+        if get_atomic_conversion(src_unit, dest_unit, default_value=None) is not None
+        else convert_unit_properties(node_value, node, dest_unit)
+    ) if node_value else None
+
+
+def convert_unit_properties(node_value: Union[int, float], node: dict, dest_unit: Units) -> Optional[Union[int, float]]:
+    """
+    Convert a number `node_value` belonging to a term `node`, to unit `to_units` by chaining multiple unit conversions
+    together.
+    Uses terms properties for the conversion.
+    Uses cached calls to download_hestia() internally for speedup
+    Returns None if no conversion possible.
+    """
+    src_unit = node.get('units', '')
+    conversions = PROPERTY_UNITS_CONVERSIONS.get(src_unit, {}).get(dest_unit.value, [])
+    return reduce(
+        lambda value, conversion_property_field: _convert_via_property(node, value, conversion_property_field),
+        conversions, node_value
+    ) if conversions else None

hestia_earth/models/utils/constant.py

@@ -1,4 +1,5 @@
 from enum import Enum
+
 from hestia_earth.utils.tools import list_sum
 
 
@@ -35,6 +36,9 @@ class Units(Enum):
     PERCENTAGE_AREA = '% area'
     TO_C = '-C'
     TO_N = '-N'
+    KW_H = 'kWh'
+    MJ = 'MJ'
+    M3 = "m3"
 
 
 C = 12.012
@@ -93,7 +97,10 @@ ATOMIC_WEIGHT_CONVERSIONS = {
     },
     Units.KG_NH4.value: {
         Units.TO_N.value: (N + H*4) / N  # Conv_Mol_NH4N_NH4
-    }
+    },
+    Units.KW_H.value: {
+        Units.MJ.value: 3.6
+    },
 }
 
 

hestia_earth/models/utils/cycle.py

@@ -3,7 +3,7 @@ from hestia_earth.utils.model import filter_list_term_type, find_term_match, fin
 from hestia_earth.utils.tools import list_sum, safe_parse_float, safe_parse_date, non_empty_list
 
 from ..log import logRequirements, debugValues
-from .lookup import factor_value, is_siteType_allowed
+from .lookup import all_factor_value, is_siteType_allowed
 from .term import get_lookup_value
 from .property import get_node_property
 from .completeness import _is_term_type_complete
@@ -386,9 +386,7 @@ def cycle_end_year(cycle: dict):
     return date.year if date else None
 
 
-def impact_lookup_value(
-    model: str, term_id: str, blank_nodes: list, lookup_col: str, allow_missing: bool = True
-) -> float:
+def impact_lookup_value(model: str, term_id: str, cycle: dict, blank_nodes: list, lookup_col: str) -> float:
     """
     Calculate the value of the impact based on lookup factors and cycle values.
 
@@ -409,15 +407,14 @@ def impact_lookup_value(
         The impact total value.
     """
     term_type = blank_nodes[0].get('term', {}).get('termType') if len(blank_nodes) > 0 else None
-    get_factor_value = factor_value(model, term_id, f"{term_type}.csv", lookup_col)
-    factors = [(node.get('term', {}).get('@id'), get_factor_value(node)) for node in blank_nodes]
-    values = [value for (_term, value) in factors if value is not None]
-    missing_values = set([term for (term, value) in factors if value is None])
-    all_nodes_have_value = len(values) == len(factors)
-    debugValues({'type': 'Cycle'}, model=model, term=term_id,
-                missing_lookup_factor=';'.join(missing_values),
-                **{f"all_{term_type}_have_lookup_value": all_nodes_have_value})
-    return list_sum(values) if len(values) > 0 and (allow_missing or all_nodes_have_value) else None
+    return all_factor_value(
+        model=model,
+        term_id=term_id,
+        node=cycle,
+        lookup_name=f"{term_type}.csv",
+        lookup_col=lookup_col,
+        blank_nodes=blank_nodes
+    )
 
 
 def get_ecoClimateZone(cycle: dict) -> int:

hestia_earth/models/utils/fuel.py

@@ -13,7 +13,7 @@ def impact_lookup_value(model: str, term_id: str, impact_assessment: dict, looku
     fuels = filter_list_term_type(cycle.get('inputs', []), TermTermType.FUEL)
     has_fuels_inputs = len(fuels) > 0
     fuels_total_value = convert_value_from_cycle(
-        product, cycle_lookup_value(model, term_id, fuels, lookup_col), model=model, term_id=term_id
+        product, cycle_lookup_value(model, term_id, cycle, fuels, lookup_col), model=model, term_id=term_id
     ) if has_fuels_inputs else None
     logRequirements(impact_assessment, model=model, term=term_id,
                     term_type_electricityFuel_complete=fuel_complete,