hestia-earth-models 0.74.10__py3-none-any.whl → 0.74.12__py3-none-any.whl

hestia_earth/models/recipe2016Individualist/terrestrialAcidificationPotential.py

@@ -19,15 +19,9 @@ LOOKUPS = {
 TERM_ID = 'terrestrialAcidificationPotential'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 def run(impact_assessment: dict):
     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, value is not None)
-    return _indicator(value) if value is not None else None
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)

hestia_earth/models/recipe2016Individualist/terrestrialEcotoxicityPotential14Dcbeq.py

@@ -22,12 +22,6 @@ LOOKUPS = {
 TERM_ID = 'terrestrialEcotoxicityPotential14Dcbeq'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 def run(impact_assessment: dict):
     value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['pesticideAI'])
-    return _indicator(value) if value is not None else None
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)

hestia_earth/models/resourceUseNotRelevant/__init__.py

@@ -28,12 +28,6 @@ LOOKUPS = {
 MODEL = 'resourceUseNotRelevant'
 
 
-def _indicator(term_id: str, land_cover_id: str):
-    indicator = _new_indicator(term_id, MODEL, land_cover_id)
-    indicator['value'] = 0
-    return indicator
-
-
 def _resourceUse_ids():
     return lookup_term_ids(download_lookup(f"{TermTermType.RESOURCEUSE.value}.csv"))
 
@@ -58,5 +52,5 @@ def _should_run_resourceUse(impact: dict):
 def run(_, impact: dict):
     term_ids = _resourceUse_ids()
     term_ids = list(filter(_should_run_resourceUse(impact), term_ids))
-    land_cover_term_id = get_land_cover_term_id(get_site(impact).get('siteType'))
-    return [_indicator(term_id, land_cover_term_id) for term_id in term_ids]
+    land_cover_id = get_land_cover_term_id(get_site(impact).get('siteType'))
+    return [_new_indicator(term=term_id, model=MODEL, value=0, land_cover_id=land_cover_id) for term_id in term_ids]

hestia_earth/models/schererPfister2015/nErosionSoilFlux.py

@@ -51,8 +51,7 @@ TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/schererPfister2015/pErosionSoilFlux.py

@@ -51,8 +51,7 @@ TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/schererPfister2015/pToDrainageWaterSoilFlux.py

@@ -45,8 +45,7 @@ TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/schererPfister2015/pToGroundwaterSoilFlux.py

@@ -33,8 +33,7 @@ TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/schererPfister2015/pToSurfaceWaterSoilFlux.py

@@ -46,8 +46,7 @@ TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/schmidt2007/ch4ToAirWasteTreatment.py

@@ -25,8 +25,7 @@ TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/schmidt2007/h2SToAirWasteTreatment.py

@@ -25,8 +25,7 @@ TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/schmidt2007/n2OToAirWasteTreatmentDirect.py

@@ -25,8 +25,7 @@ TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/schmidt2007/nh3ToAirWasteTreatment.py

@@ -25,8 +25,7 @@ TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/site/grouped_measurement.py

@@ -1,9 +1,8 @@
 from functools import reduce
 from hestia_earth.schema import MeasurementMethodClassification
-from hestia_earth.utils.tools import non_empty_list, flatten, is_number, list_sum
+from hestia_earth.utils.tools import non_empty_list, flatten, is_number, list_sum, pick
 
 from hestia_earth.models.log import logRequirements, logShouldRun
-from hestia_earth.models.utils import _include
 from hestia_earth.models.utils.measurement import _new_measurement
 from hestia_earth.models.utils.term import get_lookup_value
 from . import MODEL
@@ -31,7 +30,7 @@ MODEL_KEY = 'grouped_measurement'
 
 
 def _measurement(term_id: str, measurement: dict):
-    data = _new_measurement(term_id) | _include(measurement, [
+    data = _new_measurement(term_id) | pick(measurement, [
         'depthUpper', 'depthLower', 'startDate', 'endDate', 'dates'
     ])
     data["value"] = [0]

hestia_earth/models/stehfestBouwman2006/n2OToAirCropResidueDecompositionDirect.py

@@ -45,8 +45,7 @@ TIER = EmissionMethodTier.TIER_2.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/stehfestBouwman2006/n2OToAirExcretaDirect.py

@@ -52,8 +52,7 @@ TIER = EmissionMethodTier.TIER_2.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/stehfestBouwman2006/n2OToAirInorganicFertiliserDirect.py

@@ -55,8 +55,7 @@ TIER = EmissionMethodTier.TIER_2.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/stehfestBouwman2006/n2OToAirOrganicFertiliserDirect.py

@@ -55,8 +55,7 @@ TIER = EmissionMethodTier.TIER_2.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/stehfestBouwman2006/n2OToAirSoilFlux_utils.py

@@ -71,8 +71,7 @@ N2O_FACTORS_BY_CROP = {
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/stehfestBouwman2006/noxToAirCropResidueDecomposition.py

@@ -40,8 +40,7 @@ TIER = EmissionMethodTier.TIER_2.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/stehfestBouwman2006/noxToAirExcreta.py

@@ -47,8 +47,7 @@ TIER = EmissionMethodTier.TIER_2.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/stehfestBouwman2006/noxToAirInorganicFertiliser.py

@@ -50,8 +50,7 @@ TIER = EmissionMethodTier.TIER_2.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/stehfestBouwman2006/noxToAirOrganicFertiliser.py

@@ -50,8 +50,7 @@ TIER = EmissionMethodTier.TIER_2.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/stehfestBouwman2006/noxToAirSoilFlux_utils.py

@@ -56,8 +56,7 @@ TIER = EmissionMethodTier.TIER_2.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/stehfestBouwman2006GisImplementation/noxToAirCropResidueDecomposition.py

@@ -37,8 +37,7 @@ TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/stehfestBouwman2006GisImplementation/noxToAirExcreta.py

@@ -44,8 +44,7 @@ TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/stehfestBouwman2006GisImplementation/noxToAirInorganicFertiliser.py

@@ -47,8 +47,7 @@ TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/stehfestBouwman2006GisImplementation/noxToAirOrganicFertiliser.py

@@ -47,8 +47,7 @@ TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/stehfestBouwman2006GisImplementation/noxToAirSoilFlux_utils.py

@@ -51,8 +51,7 @@ TIER = EmissionMethodTier.TIER_1.value
 
 
 def _emission(value: float):
-    emission = _new_emission(TERM_ID, MODEL)
-    emission['value'] = [value]
+    emission = _new_emission(term=TERM_ID, model=MODEL, value=value)
     emission['methodTier'] = TIER
     return emission
 

hestia_earth/models/transformation/input/excreta.py

@@ -1,10 +1,10 @@
 from functools import reduce
 from hestia_earth.schema import NodeType, TermTermType, Input, Product
 from hestia_earth.utils.model import filter_list_term_type, find_term_match
-from hestia_earth.utils.tools import list_sum
+from hestia_earth.utils.tools import list_sum, omit
 
 from hestia_earth.models.log import logShouldRun
-from hestia_earth.models.utils import _omit, term_id_prefix
+from hestia_earth.models.utils import term_id_prefix
 from hestia_earth.models.utils.blank_node import merge_blank_nodes
 from hestia_earth.models.utils.input import _new_input
 from hestia_earth.models.utils.transformation import previous_transformation
@@ -40,10 +40,12 @@ def _to_input(transformation: dict):
     def new_input(values: tuple):
         product, ratio = values
         # omit all keys in Product but not in Input
-        data = _omit(product, list(Product().fields.keys() - Input().fields.keys()))
+        data = omit(product, list(Product().fields.keys() - Input().fields.keys()))
         logShouldRun(transformation, MODEL_LOG, product.get('term', {}).get('@id'), True)
-        return data | _new_input(product.get('term')) | {
-            'value': [v * ratio for v in product.get('value', [])],
+        return data | _new_input(
+            term=product.get('term'),
+            value=[v * ratio for v in product.get('value', [])]
+        ) | {
             'fromCycle': True
         }
     return new_input

hestia_earth/models/transformation/product/excreta.py

@@ -1,9 +1,9 @@
 from hestia_earth.schema import SchemaType, TermTermType
-from hestia_earth.utils.tools import list_sum, non_empty_list
+from hestia_earth.utils.tools import list_sum, non_empty_list, omit
 from hestia_earth.utils.model import filter_list_term_type
 
 from hestia_earth.models.log import debugValues, logRequirements, logShouldRun
-from hestia_earth.models.utils import get_kg_term_units, _omit, sum_values
+from hestia_earth.models.utils import get_kg_term_units, sum_values
 from hestia_earth.models.utils.product import _new_product
 from hestia_earth.models.utils.constant import Units, convert_to_N
 from hestia_earth.models.utils.term import get_lookup_value
@@ -69,8 +69,8 @@ def _add_product(transformation: dict, units: str, inputs: list, emissions: list
     should_run = all([has_value])
     logShouldRun(transformation, MODEL_LOG, term_id, should_run)
     return {
-        **_omit(input_same_units, ['fromCycle']),
-        **_new_product(term_id, _product_value(input_same_units, emissions))
+        **omit(input_same_units, ['fromCycle']),
+        **_new_product(term=term_id, value=_product_value(input_same_units, emissions))
     } if should_run else None
 
 

hestia_earth/models/usetoxV2/freshwaterEcotoxicityPotentialCtue.py

@@ -22,12 +22,6 @@ LOOKUPS = {
 TERM_ID = 'freshwaterEcotoxicityPotentialCtue'
 
 
-def _indicator(value: float):
-    indicator = _new_indicator(TERM_ID, MODEL)
-    indicator['value'] = value
-    return indicator
-
-
 def run(impact_assessment: dict):
     value = impact_lookup_value(MODEL, TERM_ID, impact_assessment, LOOKUPS['pesticideAI'])
-    return _indicator(value) if value is not None else None
+    return _new_indicator(term=TERM_ID, model=MODEL, value=value)

hestia_earth/models/utils/__init__.py

@@ -8,11 +8,13 @@ import datetime
 from functools import reduce
 import operator
 from pydash.objects import get
-from typing import Union, List, Callable
-from hestia_earth.schema import SchemaType
+from typing import Union, List, Callable, Any, Optional
+from hestia_earth.schema import SchemaType, TermTermType
 from hestia_earth.utils.api import download_hestia
-from hestia_earth.utils.tools import flatten, non_empty_list, safe_parse_date
+from hestia_earth.utils.tools import flatten, non_empty_list, safe_parse_date, to_precision, is_number
 from hestia_earth.utils.date import is_in_days, is_in_months
+from hestia_earth.utils.model import linked_node
+from hestia_earth.utils.term import download_term
 
 from .constant import Units
 
@@ -35,16 +37,33 @@ def group_by(values: list, keys: list):
     return reduce(_group_by, values, {})
 
 
-def _term_id(term): return term.get('@id') if isinstance(term, dict) else term
+def value_with_precision(value):
+    def _to_precision(value):
+        return to_precision(value) if is_number(value) and value else value
+
+    return list(map(_to_precision, value)) if isinstance(value, list) else _to_precision(value)
+
 
+def set_node_value(key: str, value: Any, is_list: bool = False):
+    return ({
+        key: ([
+            value_with_precision(value)
+        ] if is_list and not isinstance(value, list) else value_with_precision(value))
+    } if value is not None else {})
 
-def _omit(values: dict, keys: list) -> dict: return {k: v for k, v in values.items() if k not in keys}
 
+def set_node_stats(node: dict):
+    include_stats = any([key in node for key in ['min', 'max', 'sd']])
+    return ({'statsDefinition': 'modelled'} if include_stats else {}) | node
 
-def _include(value: dict, keys: list) -> dict: return {k: v for k, v in value.items() if k in keys}
+
+def set_node_term(key: str, term_id: str, term_type: Optional[TermTermType] = None):
+    return {
+        key: linked_node(download_term(term_id, term_type))
+    } if term_id else {}
 
 
-def unique_values(values: list, key='@id'): return list({v[key]: v for v in values}.values())
+def _term_id(term): return term.get('@id') if isinstance(term, dict) else term
 
 
 def _run_in_serie(data: dict, models: list): return reduce(lambda prev, model: model(prev), models, data)

hestia_earth/models/utils/background_emissions.py

@@ -3,11 +3,11 @@ from typing import Callable, Tuple
 from hestia_earth.schema import TermTermType, EmissionMethodTier
 from hestia_earth.utils.lookup import _is_missing_value, lookup_columns
 from hestia_earth.utils.model import find_term_match, filter_list_term_type
-from hestia_earth.utils.tools import flatten, non_empty_list, safe_parse_float
+from hestia_earth.utils.tools import flatten, non_empty_list, safe_parse_float, omit
 from hestia_earth.utils.emission import cycle_emissions_in_system_boundary
 
 from hestia_earth.models.log import logShouldRun, logRequirements, debugValues
-from . import is_from_model, _omit
+from . import is_from_model
 from .term import get_lookup_value
 
 
@@ -141,7 +141,7 @@ def parse_term_id(term_id: str): return term_id.split('-')[0]
 
 
 def join_term_id(term_id: str, data: dict):
-    return '-'.join(non_empty_list([term_id] + list(_omit(data, ['value']).values())))
+    return '-'.join(non_empty_list([term_id] + list(omit(data, ['value']).values())))
 
 
 def _process_mapping(

hestia_earth/models/utils/blank_node.py

@@ -28,6 +28,7 @@ from hestia_earth.utils.lookup_utils import (
     is_model_siteType_allowed,
     is_model_product_id_allowed,
     is_siteType_allowed,
+    is_site_measurement_id_allowed,
     is_product_id_allowed,
     is_product_termType_allowed,
     is_input_id_allowed,
@@ -132,18 +133,22 @@ def _run_model_required(model: str, term_id: str, data: dict, skip_logs: bool =
 
 def _run_required(model: str, term_id: str, data: dict):
     siteType_allowed = is_siteType_allowed(data, term_id)
+    site_measurement_id_allowed = is_site_measurement_id_allowed(data, term_id)
     product_id_allowed = is_product_id_allowed(data, term_id)
     product_termType_allowed = is_product_termType_allowed(data, term_id)
     input_id_allowed = is_input_id_allowed(data, term_id)
     input_termType_allowed = is_input_termType_allowed(data, term_id)
 
     run_required = all([
-        siteType_allowed, product_id_allowed, product_termType_allowed, input_id_allowed, input_termType_allowed
+        siteType_allowed, site_measurement_id_allowed,
+        product_id_allowed, product_termType_allowed,
+        input_id_allowed, input_termType_allowed
     ])
     # model is only used for logs here, skip logs if model not provided
     if model:
         debugValues(data, model=model, term=term_id,
                     siteType_allowed=siteType_allowed,
+                    site_measurement_id_allowed=site_measurement_id_allowed,
                     product_id_allowed=product_id_allowed,
                     product_termType_allowed=product_termType_allowed,
                     input_id_allowed=input_id_allowed,
@@ -228,7 +233,7 @@ def get_total_value(nodes: list):
     return list(map(lambda node: list_sum(node.get('value', []), None), nodes))
 
 
-def _value_as(term_id: str, convert_to_property=True):
+def _value_as(term_id: str, convert_to_property: bool = True, **log_args):
     def get_value(node: dict):
         factor = get_node_property_value(
             None, node, term_id, default=0, handle_percents=False
@@ -240,11 +245,23 @@ def _value_as(term_id: str, convert_to_property=True):
         value = list_sum(node.get('value', []))
         property = get_node_property(node, term_id, find_default_property=False, download_from_hestia=True)
         ratio = factor / 100 if property.get('term', {}).get('units', '') == '%' else factor
+
+        if log_args.get('log_node'):
+            debugValues(**log_args, **{
+                'convert_value': value,
+                f"conversion_with_{term_id}": factor
+            })
+
         return 0 if ratio == 0 else (value * ratio if convert_to_property else value / ratio)
     return get_value
 
 
-def get_total_value_converted(nodes: list, conversion_property: Union[List[str], str], convert_to_property=True):
+def get_total_value_converted(
+    nodes: list,
+    conversion_property: Union[List[str], str],
+    convert_to_property: bool = True,
+    **log_args
+):
     """
     Get the total `value` of a list of Blank Nodes converted using a property of each Blank Node.
 
@@ -266,13 +283,14 @@ def get_total_value_converted(nodes: list, conversion_property: Union[List[str],
     def convert_multiple(node: dict):
         value = 0
         for prop in conversion_property:
-            value = _value_as(prop, convert_to_property)(node)
+            value = _value_as(prop, convert_to_property, **log_args)(node)
             node['value'] = [value]
         return value
 
     return [
-        _value_as(conversion_property, convert_to_property)(node) if isinstance(conversion_property, str) else
-        convert_multiple(node) for node in nodes
+        _value_as(conversion_property, convert_to_property, **log_args)(node) if isinstance(conversion_property, str)
+        else convert_multiple(node)
+        for node in nodes
     ]
 
 
@@ -285,19 +303,20 @@ def get_total_value_converted_with_min_ratio(
 ):
     values = [
         (
+            blank_node.get('@type'),
             blank_node.get('term', {}).get('@id'),
             list_sum(blank_node.get('value', [])),
             get_node_property_value(model, blank_node, prop_id)
         ) for blank_node in blank_nodes
     ]
     value_logs = log_as_table([{
-        'node-id': term_id,
-        'node-value': value,
+        f"{node_type}-id": term_id,
+        f"{node_type}-value": value,
         f"{prop_id}-value": prop_value
-    } for term_id, value, prop_value in values])
+    } for node_type, term_id, value, prop_value in values])
 
-    total_value = list_sum([value for term_id, value, prop_value in values])
-    total_value_with_property = list_sum([value for term_id, value, prop_value in values if prop_value])
+    total_value = list_sum([value for node_type, term_id, value, prop_value in values])
+    total_value_with_property = list_sum([value for node_type, term_id, value, prop_value in values if prop_value])
     total_value_ratio = total_value_with_property / total_value if total_value > 0 else 0
 
     logs = {
@@ -313,7 +332,7 @@ def get_total_value_converted_with_min_ratio(
                 **logs)
 
     total_converted_value = list_sum([
-        value * prop_value for term_id, value, prop_value in values if all([value, prop_value])
+        value * prop_value for node_type, term_id, value, prop_value in values if all([value, prop_value])
     ])
 
     return (