hestia-earth-models 0.65.3__py3-none-any.whl → 0.65.5__py3-none-any.whl

hestia_earth/models/linkedImpactAssessment/utils.py

@@ -1,43 +1,44 @@
-from functools import reduce
 from hestia_earth.utils.tools import non_empty_list, flatten, list_sum
 
-from hestia_earth.models.log import log_as_table, logRequirements, logShouldRun
-from hestia_earth.models.utils import sum_values, _include
+from hestia_earth.models.log import log_as_table, debugValues, logRequirements, logShouldRun
+from hestia_earth.models.utils import group_by, sum_values, _include
 from hestia_earth.models.utils.indicator import _new_indicator
 from hestia_earth.models.utils.impact_assessment import get_product, convert_value_from_cycle
 from hestia_earth.models.utils.input import load_impacts
 from . import MODEL
 
 
-def _indicator(term_id: str, value: float):
+def _indicator(term_id: str, value: float, input: dict):
     indicator = _new_indicator(term_id, MODEL)
     indicator['value'] = value
+    indicator['inputs'] = [input]
     return indicator
 
 
-def _run_indicators(product: dict, term_id: str):
+def _run_indicators(impact_assessment: dict, product: dict, term_id: str):
     def run(values: list):
+        input = values[0].get('input').get('term', {})
         indicator = values[0].get('indicator')
         values_from_cycle = non_empty_list([
             list_sum(value.get('input').get('value')) * value.get('indicator').get('value')
             for value in values
         ])
-        value = convert_value_from_cycle(product, sum_values(values_from_cycle), model=MODEL, term_id=term_id)
+        value = convert_value_from_cycle(
+            impact_assessment, product, sum_values(values_from_cycle), model=MODEL, term_id=term_id
+        )
+
+        # show values per input in the logs
+        debugValues(impact_assessment, model=MODEL, term=term_id,
+                    value=value,
+                    coefficient=1,
+                    input=input.get('@id'))
+
         return (
-            _indicator(term_id, value) | _include(indicator, ['landCover', 'previousLandCover'])
+            _indicator(term_id, value, input) | _include(indicator, ['landCover', 'previousLandCover'])
         ) if value is not None else None
     return run
 
 
-def _group_indicator(group: dict, value: dict):
-    group_key = ';'.join(non_empty_list([
-        value.get('indicator').get('landCover', {}).get('@id'),
-        value.get('indicator').get('previousLandCover', {}).get('@id')
-    ]))
-    group[group_key] = group.get(group_key, []) + [value]
-    return group
-
-
 def _run_inputs_production(impact_assessment: dict, product: dict, term_id: str):
     cycle = impact_assessment.get('cycle', {})
 
@@ -61,11 +62,13 @@ def _run_inputs_production(impact_assessment: dict, product: dict, term_id: str)
         value
         for value in all_indicators
         if all([
-            value.get('indicator').get('value', -1) > 0,
-            list_sum(value.get('input').get('value', [-1]), 0) > 0
+            (value.get('indicator').get('value') or -1) > 0,
+            (list_sum(value.get('input').get('value')) or -1) > 0
         ])
     ]
-    grouped_indicators = reduce(_group_indicator, valid_indicators, {})
+    grouped_indicators = group_by(valid_indicators, [
+        'input.term.@id', 'indicator.landCover.@id', 'indicator.previousLandCover.@id'
+    ])
     has_indicators = bool(valid_indicators)
 
     logRequirements(impact_assessment, model=MODEL, term=term_id,
@@ -82,7 +85,9 @@ def _run_inputs_production(impact_assessment: dict, product: dict, term_id: str)
     should_run = all([has_indicators])
     logShouldRun(impact_assessment, MODEL, term_id, should_run)
 
-    return non_empty_list(flatten(map(_run_indicators(product, term_id), grouped_indicators.values())))
+    return non_empty_list(flatten(
+        map(_run_indicators(impact_assessment, product, term_id), grouped_indicators.values())
+    ))
 
 
 def _should_run_inputs_production(impact_assessment: dict, term_id: str):