hestia-earth-aggregation 0.21.14__tar.gz → 0.21.15__tar.gz

{hestia_earth_aggregation-0.21.14/hestia_earth_aggregation.egg-info → hestia_earth_aggregation-0.21.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hestia_earth_aggregation
-Version: 0.21.14
+Version: 0.21.15
 Summary: HESTIA's aggregation engine.
 Home-page: https://gitlab.com/hestia-earth/hestia-aggregation-engine
 Author: HESTIA Team

{hestia_earth_aggregation-0.21.14 → hestia_earth_aggregation-0.21.15}/hestia_earth/aggregation/utils/aggregate_country_nodes.py

@@ -61,7 +61,11 @@ from .site import (
     format_site_description,
     site_parent_region_id,
 )
-from .emission import get_method_tier, get_method_model
+from .emission import (
+    get_method_tier,
+    get_method_model,
+    has_value_without_transformation,
+)
 from .property import aggregate_properties
 from .distribution import generate_blank_node_distribution
 from .covariance import add_covariance_cycles, generate_covariance_cycles
@@ -110,6 +114,8 @@ class BlankNodeFormatted(TypedDict, total=False):
     completeness_key: Optional[str]
     start_date: Optional[str]
     end_date: str
+    inputs: List[dict]
+    transformation: List[dict]
 
 
 # --- Cycle
@@ -243,6 +249,8 @@ def _group_cycle_blank_node(cycle: dict, product: dict, product_value: float):
                 "economicValueShare": non_empty_list([_blank_node_evs(blank_nodes)]),
                 # needed for background emissions
                 "inputs": _map_values(blank_nodes, "inputs"),
+                # needed to exclude emissions with only transformation value
+                "transformation": _map_values(blank_nodes, "transformation"),
                 "properties": _map_values(blank_nodes, "properties"),
                 "methodTier": _map_values(blank_nodes, "methodTier"),
                 "methodModel": _map_values(blank_nodes, "methodModel"),
@@ -300,7 +308,9 @@ def _group_cycle_blank_nodes(
         )
         # after combining all values, need to compute the final statistical values
         group[list_key] = {
-            k: v | _compute_blank_node_stats(v) for k, v in values.items()
+            k: v | _compute_blank_node_stats(v)
+            for k, v in values.items()
+            if list_key != "emissions" or has_value_without_transformation(v)
         }
         logger.debug(
             "function=_group_cycle_blank_nodes, list_key=%s, time=%s",

{hestia_earth_aggregation-0.21.14 → hestia_earth_aggregation-0.21.15}/hestia_earth/aggregation/utils/emission.py

@@ -69,3 +69,18 @@ def get_method_model(emissions: list):
     values = non_empty_list(flatten([e.get("methodModel", []) for e in emissions]))
     values = list({v["@id"]: v for v in values}.values())
     return values[0] if len(values) == 1 else None
+
+
+def has_value_without_transformation(blank_node: dict):
+    values = blank_node.get("value", [])
+    transformations = blank_node.get("transformation", [])
+    return (
+        not transformations
+        or len(transformations) != len(values)
+        or any(
+            [
+                value is not None and transformations[index] is None
+                for index, value in enumerate(values)
+            ]
+        )
+    )

hestia_earth_aggregation-0.21.15/hestia_earth/aggregation/version.py

@@ -0,0 +1 @@
+VERSION = "0.21.15"

{hestia_earth_aggregation-0.21.14 → hestia_earth_aggregation-0.21.15/hestia_earth_aggregation.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hestia_earth_aggregation
-Version: 0.21.14
+Version: 0.21.15
 Summary: HESTIA's aggregation engine.
 Home-page: https://gitlab.com/hestia-earth/hestia-aggregation-engine
 Author: HESTIA Team

hestia_earth_aggregation-0.21.14/hestia_earth/aggregation/version.py

@@ -1 +0,0 @@
-VERSION = "0.21.14"