hestia-earth-aggregation 0.21.12__tar.gz → 0.21.13__tar.gz

{hestia_earth_aggregation-0.21.12/hestia_earth_aggregation.egg-info → hestia_earth_aggregation-0.21.13}/PKG-INFO

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

{hestia_earth_aggregation-0.21.12 → hestia_earth_aggregation-0.21.13}/hestia_earth/aggregation/aggregate_cycles.py

@@ -1,38 +1,38 @@
 from typing import Tuple
 from hestia_earth.utils.tools import non_empty_list
 
-from hestia_earth.aggregation.log import logger, log_memory_usage
-from hestia_earth.aggregation.utils import CYCLE_AGGREGATION_KEYS, SITE_AGGREGATION_KEYS
-from hestia_earth.aggregation.utils.term import is_global
-from hestia_earth.aggregation.utils.queries import (
+from .log import logger, log_memory_usage
+from .utils import CYCLE_AGGREGATION_KEYS, SITE_AGGREGATION_KEYS
+from .utils.term import is_global
+from .utils.queries import (
     find_global_nodes,
     find_country_nodes,
     download_site,
 )
-from hestia_earth.aggregation.utils.group import group_blank_nodes
-from hestia_earth.aggregation.utils.blank_node import cleanup_node_blank_nodes
-from hestia_earth.aggregation.utils.aggregate_weighted import (
+from .utils.group import group_blank_nodes
+from .utils.blank_node import cleanup_node_blank_nodes
+from .utils.aggregate_weighted import (
     aggregate as aggregate_weighted,
 )
-from hestia_earth.aggregation.utils.aggregate_country_nodes import aggregate_cycles
-from hestia_earth.aggregation.utils.weights import (
+from .utils.aggregate_country_nodes import aggregate_cycles
+from .utils.weights import (
     country_weights,
     country_weight_node_id,
     world_weights,
     world_weight_node_id,
 )
-from hestia_earth.aggregation.utils.site import (
+from .utils.site import (
     format_site,
     format_site_description_weighted,
 )
-from hestia_earth.aggregation.utils.cycle import (
+from .utils.cycle import (
     aggregate_with_matrix,
     format_for_grouping,
     format_terms_results,
     format_country_results,
     update_cycle,
 )
-from hestia_earth.aggregation.utils.covariance import (
+from .utils.covariance import (
     init_covariance_files,
     remove_covariance_files,
     generate_covariance_country,
@@ -83,7 +83,9 @@ def _aggregate_country(
         sites, weights, use_description=not is_global(country)
     )
 
-    cycle_data = format_country_results(cycle_data, product, country, aggregated_site)
+    cycle_data = format_country_results(
+        cycle_data, product, country, aggregated_site, weights
+    )
     aggregated_cycle = update_cycle(
         country, start_year, end_year, source, functional_unit, False
     )(cycle_data)

{hestia_earth_aggregation-0.21.12 → hestia_earth_aggregation-0.21.13}/hestia_earth/aggregation/utils/aggregate_weighted.py

@@ -14,10 +14,7 @@ from .emission import get_method_tier, get_method_model
 from .property import aggregate_properties
 from .completeness import blank_node_completeness_key
 from .distribution import sample_weighted_distributions, _nb_iterations
-
-
-def _format_weight_key(key: str):
-    return ", ".join(key.split("_")).capitalize()
+from .weights import format_weights
 
 
 def _format_description(completeness_key: str, weights: dict):
@@ -26,14 +23,7 @@ def _format_description(completeness_key: str, weights: dict):
         for w in weights.values()
         if w.get("completeness", {}).get(completeness_key, False)
     ]
-    total = list_sum(non_empty_list([w.get("weight") for w in complete_weights]))
-    description = ";".join(
-        [
-            f"{_format_weight_key(weight.get('key'))}: {round(weight.get('weight') * 100 / total, 2)}"
-            for weight in complete_weights
-            if weight.get("key")
-        ]
-    )
+    description = format_weights(complete_weights)
     return {"description": description}
 
 

{hestia_earth_aggregation-0.21.12 → hestia_earth_aggregation-0.21.13}/hestia_earth/aggregation/utils/cycle.py

@@ -39,6 +39,7 @@ from .emission import new_emission
 from .input import new_input
 from .practice import new_practice, organic_practice
 from .product import new_product
+from .weights import format_weights
 
 _MEAN_DATE_DESCRIPTION = (
     "Additional notes: the mean endDate of all aggregated Cycles is "
@@ -61,6 +62,11 @@ def _combine_mean_dates(cycles: list):
     return _mean_date(dates)
 
 
+def _aggregated_weights(weights: dict):
+    description = format_weights(weights.values())
+    return ("Sub-aggregation weighting: " + description) if description else ""
+
+
 def is_organic(cycle: dict):
     term_type = TermTermType.STANDARDSLABELS
     practices = filter_list_term_type(cycle.get("practices", []), term_type)
@@ -234,7 +240,9 @@ def format_terms_results(data: dict, product: dict, country: dict):
     return None
 
 
-def format_country_results(data: dict, product: dict, country: dict, site: dict):
+def format_country_results(
+    data: dict, product: dict, country: dict, site: dict, weights: dict
+):
     inputs = data.get("inputs", [])
     practices = data.get("practices", [])
     products = data.get("products", [])
@@ -247,7 +255,14 @@ def format_country_results(data: dict, product: dict, country: dict, site: dict)
         completeness = aggregate_completeness(data.get("node-completeness", []))
         return remove_empty_fields(
             {
-                "description": _MEAN_DATE_DESCRIPTION + _combine_mean_dates(cycles),
+                "description": ". ".join(
+                    non_empty_list(
+                        [
+                            _aggregated_weights(weights),
+                            _MEAN_DATE_DESCRIPTION + _combine_mean_dates(cycles),
+                        ]
+                    )
+                ),
                 "name": _cycle_name(cycle, primary_product, False, False, False),
                 "id": _cycle_id(cycle, primary_product, False, False, False),
                 **_format_results(

{hestia_earth_aggregation-0.21.12 → hestia_earth_aggregation-0.21.13}/hestia_earth/aggregation/utils/weights.py

@@ -1,6 +1,6 @@
 from functools import reduce, lru_cache
 from hestia_earth.utils.lookup import download_lookup, get_table_value
-from hestia_earth.utils.tools import to_precision, non_empty_list
+from hestia_earth.utils.tools import to_precision, non_empty_list, list_sum
 
 from hestia_earth.aggregation.log import debugWeights, debugRequirements
 from .lookup import (
@@ -16,6 +16,21 @@ from .term import (
 )
 
 
+def _format_weight_key(key: str):
+    return ", ".join(key.split("_")).capitalize()
+
+
+def format_weights(weights: list):
+    total = list_sum(non_empty_list([w.get("weight") for w in weights]))
+    return ";".join(
+        [
+            f"{_format_weight_key(weight.get('key'))}: {round(weight.get('weight') * 100 / total, 2)}"
+            for weight in weights
+            if weight.get("key")
+        ]
+    )
+
+
 def _country_organic_weight(country_id: str, start_year: int, end_year: int):
     lookup = download_lookup("region-standardsLabels-isOrganic.csv")
     data = get_table_value(lookup, "term.id", country_id, "organic")

hestia_earth_aggregation-0.21.13/hestia_earth/aggregation/version.py

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

{hestia_earth_aggregation-0.21.12 → hestia_earth_aggregation-0.21.13/hestia_earth_aggregation.egg-info}/PKG-INFO

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

hestia_earth_aggregation-0.21.12/hestia_earth/aggregation/version.py

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