hestia-earth-models 0.73.8__py3-none-any.whl → 0.74.0__py3-none-any.whl

hestia_earth/models/impact_assessment/emissions.py

@@ -46,7 +46,7 @@ def _indicator(impact_assessment: dict, product: dict):
         if len(emission.get('inputs', [])):
             indicator['inputs'] = emission['inputs']
 
-        return indicator | _include(emission, ['operation', 'transformation', 'country', 'key'])
+        return indicator | _include(emission, ['animals', 'operation', 'transformation', 'country', 'key'])
     return run
 
 

hestia_earth/models/linkedImpactAssessment/emissions.py

@@ -2,12 +2,12 @@ from functools import reduce
 from hestia_earth.schema import EmissionMethodTier
 from hestia_earth.utils.lookup import download_lookup, get_table_value, column_name
 from hestia_earth.utils.tools import flatten, list_sum
+from hestia_earth.utils.blank_node import group_by_keys
 
 from hestia_earth.models.log import logShouldRun, debugValues, log_as_table
 from hestia_earth.models.utils import _include
 from hestia_earth.models.utils.emission import _new_emission
 from hestia_earth.models.utils.input import load_impacts
-from hestia_earth.models.utils.blank_node import group_by_keys
 from . import MODEL
 
 REQUIREMENTS = {
@@ -167,7 +167,7 @@ def run(cycle: dict):
 
     # group inputs with same term/key/operation/animal to avoid adding emissions twice
     # inputs = {'group-id': [{'term': {},'value':[10],'impactAssessment': {}}]}
-    inputs = reduce(group_by_keys(_GROUP_BY_KEYS), inputs, {})
+    inputs = group_by_keys(inputs, _GROUP_BY_KEYS)
     inputs = {key: list(map(_group_input_emissions, value)) for key, value in inputs.items()}
 
     # finally group everything by emission so we can log inputs together

hestia_earth/models/log.py

@@ -4,6 +4,8 @@ import logging
 from typing import Union, List
 
 LOG_LEVEL = os.getenv('LOG_LEVEL', 'INFO')
+_EXTENDED_LOGS = os.getenv('LOG_EXTENDED', 'true') == 'true'
+_LOG_DATE_FORMAT = os.getenv('LOG_DATE_FORMAT', '%Y-%m-%dT%H:%M:%S%z')
 
 # disable root logger
 root_logger = logging.getLogger()
@@ -26,9 +28,12 @@ def log_to_file(filepath: str):
         Path of the file.
     """
     formatter = logging.Formatter(
-        '{"timestamp": "%(asctime)s", "level": "%(levelname)s", "logger": "%(name)s", '
-        '"filename": "%(filename)s", "message": "%(message)s"}',
-        '%Y-%m-%dT%H:%M:%S%z')
+        '{"timestamp": "%(asctime)s", "level": "%(levelname)s", "logger": "%(name)s", "message": "%(message)s"}',
+        _LOG_DATE_FORMAT
+    ) if _EXTENDED_LOGS else logging.Formatter(
+        '{"logger": "%(name)s", "message": "%(message)s"}',
+        _LOG_DATE_FORMAT
+    )
     handler = logging.FileHandler(filepath, encoding='utf-8')
     handler.setFormatter(formatter)
     handler.setLevel(logging.getLevelName(LOG_LEVEL))