hestia-earth-aggregation 0.21.16__tar.gz → 0.21.17__tar.gz

{hestia_earth_aggregation-0.21.16/hestia_earth_aggregation.egg-info → hestia_earth_aggregation-0.21.17}/PKG-INFO

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

hestia_earth_aggregation-0.21.17/hestia_earth/aggregation/config/Cycle/processedFood.json

@@ -0,0 +1,63 @@
+{
+  "models": [
+    {
+      "key": "inputs",
+      "model": "cycle",
+      "value": "input.hestiaAggregatedData",
+      "runStrategy": "always",
+      "mergeStrategy": "list"
+    },
+    {
+      "key": "emissions",
+      "model": "linkedImpactAssessment",
+      "value": "emissions",
+      "runStrategy": "always",
+      "mergeStrategy": "list",
+      "mergeArgs": {
+        "replaceThreshold": ["value", 0.01]
+      }
+    },
+    {
+      "key": "emissions",
+      "model": "ecoalimV9",
+      "value": "cycle",
+      "runStrategy": "always",
+      "mergeStrategy": "list",
+      "mergeArgs": {
+        "replaceThreshold": ["value", 0.01]
+      }
+    },
+    {
+      "key": "emissions",
+      "model": "worldSteel",
+      "value": "cycle",
+      "runStrategy": "always",
+      "mergeStrategy": "list",
+      "mergeArgs": {
+        "replaceThreshold": ["value", 0.01]
+      },
+      "stage": 2
+    },
+    {
+      "key": "emissions",
+      "model": "bafu2025",
+      "value": "cycle",
+      "runStrategy": "always",
+      "mergeStrategy": "list",
+      "mergeArgs": {
+        "replaceThreshold": ["value", 0.01]
+      },
+      "stage": 2
+    },
+    {
+      "key": "emissions",
+      "model": "ecoinventV3AndEmberClimate",
+      "value": "cycle",
+      "runStrategy": "always",
+      "mergeStrategy": "list",
+      "mergeArgs": {
+        "replaceThreshold": ["value", 0.01]
+      }
+    }
+  ]
+}

{hestia_earth_aggregation-0.21.16 → hestia_earth_aggregation-0.21.17}/hestia_earth/aggregation/recalculate_cycles.py

@@ -4,10 +4,11 @@ from hestia_earth.orchestrator import run
 
 CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
 CONFIG_PATH = os.path.join(CURRENT_DIR, "config", "Cycle")
+_TERM_TYPES = os.listdir(CONFIG_PATH)
 
 
 def should_recalculate(product: dict):
-    return f"{product.get('termType')}.json" in os.listdir(CONFIG_PATH)
+    return f"{product.get('termType')}.json" in _TERM_TYPES
 
 
 def recalculate(cycle: dict, product: dict):

{hestia_earth_aggregation-0.21.16 → hestia_earth_aggregation-0.21.17}/hestia_earth/aggregation/utils/aggregate_country_nodes.py

@@ -65,6 +65,7 @@ from .emission import (
     get_method_tier,
     get_method_model,
     has_value_without_transformation,
+    include_emission,
 )
 from .property import aggregate_properties
 from .distribution import generate_blank_node_distribution
@@ -205,6 +206,10 @@ def _group_cycle_blank_node(cycle: dict, product: dict, product_value: float):
         term_id = term.get("@id")
         group_key = blank_node_group_key(blank_node)
 
+        # skip background emissions when recalculated
+        if node_type == "Emission" and not include_emission(blank_node, product):
+            return group
+
         is_aggregated_product = node_type == "Product" and term_id == product.get("@id")
 
         site_type = cycle.get("site", {}).get("siteType")
@@ -223,9 +228,9 @@ def _group_cycle_blank_node(cycle: dict, product: dict, product_value: float):
             is_aggregated_product=is_aggregated_product,
         )
 
-        # only primary data can be incomplete, otherwise skip the blank node
         if all(
             [
+                # only primary data can be incomplete, otherwise skip the blank node
                 complete is False,
                 not blank_node_data.get("primary"),
                 blank_node_data.get("primaryPercent", 0) <= 0,

{hestia_earth_aggregation-0.21.16 → hestia_earth_aggregation-0.21.17}/hestia_earth/aggregation/utils/cycle.py

@@ -68,7 +68,7 @@ def _combine_mean_dates(cycles: list):
 def _aggregated_weights(weights: dict):
     description = format_weights(weights.values(), include_default_combinations=True)
     return (
-        f"This aggregation uses the following weights on sub-systems: ({description})"
+        f"This aggregation uses the following weights on sub-systems: {description}"
         if description
         else ""
     )
@@ -177,9 +177,7 @@ def _format_results(
         "products": non_empty_list(map(_format_aggregate(new_product), products)),
     }
     # aggregate emissions after as it needs inputs and products
-    cycle["emissions"] = non_empty_list(
-        map(_format_aggregate(new_emission(product)), emissions)
-    )
+    cycle["emissions"] = non_empty_list(map(_format_aggregate(new_emission), emissions))
 
     # set the primary product
     primary_product = find_term_match(cycle.get("products", []), product.get("@id"))

hestia_earth_aggregation-0.21.17/hestia_earth/aggregation/utils/emission.py

@@ -0,0 +1,82 @@
+from hestia_earth.schema import (
+    EmissionMethodTier,
+    SchemaType,
+    EmissionStatsDefinition,
+)
+from hestia_earth.utils.model import linked_node
+from hestia_earth.utils.lookup_utils import is_in_system_boundary
+from hestia_earth.utils.tools import flatten, non_empty_list
+
+from hestia_earth.aggregation.recalculate_cycles import should_recalculate
+from . import _unique_nodes, _set_dict_single
+from .term import METHOD_MODEL
+
+_DEFAULT_TIER = EmissionMethodTier.TIER_1.value
+
+
+def include_emission(emission: dict, product: dict):
+    return any(
+        [
+            emission.get("methodTier") != EmissionMethodTier.BACKGROUND.value,
+            not should_recalculate(product),
+        ]
+    )
+
+
+def new_emission(data: dict):
+    term = data.get("term", {})
+    # only add emissions included in the System Boundary
+    if is_in_system_boundary(term.get("@id")):
+        node = {"@type": SchemaType.EMISSION.value}
+        node["term"] = linked_node(term)
+        value = data.get("value")
+        if value is not None:
+            node["value"] = [value]
+            node["statsDefinition"] = EmissionStatsDefinition.CYCLES.value
+
+        node["methodTier"] = data.get("methodTier") or _DEFAULT_TIER
+        node["methodModel"] = data.get("methodModel") or METHOD_MODEL
+
+        inputs = data.get("inputs", [])
+        # compute list of unique inputs, required for `background` emissions
+        if inputs:
+            _set_dict_single(
+                node,
+                "inputs",
+                list(map(linked_node, _unique_nodes(inputs))),
+                strict=True,
+            )
+
+        if node.get("methodTier") != EmissionMethodTier.NOT_RELEVANT.value:
+            _set_dict_single(
+                node, "distribution", data.get("distribution"), strict=True
+            )
+
+        _set_dict_single(node, "description", data.get("description"), strict=True)
+        return node
+
+
+def get_method_tier(emissions: list):
+    values = non_empty_list(set(flatten([e.get("methodTier", []) for e in emissions])))
+    return values[0] if len(values) == 1 else None
+
+
+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.17/hestia_earth/aggregation/version.py

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

{hestia_earth_aggregation-0.21.16 → hestia_earth_aggregation-0.21.17/hestia_earth_aggregation.egg-info}/PKG-INFO

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

{hestia_earth_aggregation-0.21.16 → hestia_earth_aggregation-0.21.17}/hestia_earth_aggregation.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ hestia_earth/aggregation/aggregate_cycles.py
 hestia_earth/aggregation/log.py
 hestia_earth/aggregation/recalculate_cycles.py
 hestia_earth/aggregation/version.py
+hestia_earth/aggregation/config/Cycle/crop.json
 hestia_earth/aggregation/config/Cycle/processedFood.json
 hestia_earth/aggregation/utils/__init__.py
 hestia_earth/aggregation/utils/aggregate_country_nodes.py

hestia_earth_aggregation-0.21.16/hestia_earth/aggregation/utils/emission.py

@@ -1,86 +0,0 @@
-from hestia_earth.schema import (
-    EmissionMethodTier,
-    SchemaType,
-    EmissionStatsDefinition,
-    TermTermType,
-)
-from hestia_earth.utils.model import linked_node
-from hestia_earth.utils.lookup_utils import is_in_system_boundary
-from hestia_earth.utils.tools import flatten, non_empty_list
-
-from . import _unique_nodes, _set_dict_single
-from .term import METHOD_MODEL
-
-_DEFAULT_TIER = EmissionMethodTier.TIER_1.value
-_SKIP_BACKGROUND_EMISSIONS = [TermTermType.PROCESSEDFOOD.value]
-
-
-def _include_emission(emission: dict, product: dict):
-    return any(
-        [
-            emission.get("methodTier") != EmissionMethodTier.BACKGROUND.value,
-            product.get("termType") not in _SKIP_BACKGROUND_EMISSIONS,
-        ]
-    )
-
-
-def new_emission(product: dict):
-    def emission(data: dict):
-        term = data.get("term", {})
-        # only add emissions included in the System Boundary
-        if is_in_system_boundary(term.get("@id")):
-            node = {"@type": SchemaType.EMISSION.value}
-            node["term"] = linked_node(term)
-            value = data.get("value")
-            if value is not None:
-                node["value"] = [value]
-                node["statsDefinition"] = EmissionStatsDefinition.CYCLES.value
-
-            node["methodTier"] = data.get("methodTier") or _DEFAULT_TIER
-            node["methodModel"] = data.get("methodModel") or METHOD_MODEL
-
-            inputs = data.get("inputs", [])
-            # compute list of unique inputs, required for `background` emissions
-            if inputs:
-                _set_dict_single(
-                    node,
-                    "inputs",
-                    list(map(linked_node, _unique_nodes(inputs))),
-                    strict=True,
-                )
-
-            if node.get("methodTier") != EmissionMethodTier.NOT_RELEVANT.value:
-                _set_dict_single(
-                    node, "distribution", data.get("distribution"), strict=True
-                )
-
-            _set_dict_single(node, "description", data.get("description"), strict=True)
-            return node if _include_emission(node, product) else None
-
-    return emission
-
-
-def get_method_tier(emissions: list):
-    values = non_empty_list(set(flatten([e.get("methodTier", []) for e in emissions])))
-    return values[0] if len(values) == 1 else None
-
-
-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.16/hestia_earth/aggregation/version.py

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