hestia-earth-utils 0.15.8__tar.gz → 0.15.10__tar.gz

{hestia_earth_utils-0.15.8 → hestia_earth_utils-0.15.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia_earth_utils
-Version: 0.15.8
+Version: 0.15.10
 Summary: HESTIA's utils library
 Home-page: https://gitlab.com/hestia-earth/hestia-utils
 Author: HESTIA Team

{hestia_earth_utils-0.15.8 → hestia_earth_utils-0.15.10}/hestia_earth/utils/emission.py

@@ -5,6 +5,7 @@ from .lookup import download_lookup, lookup_term_ids
 from .lookup_utils import (
     is_in_system_boundary,
     is_siteType_allowed,
+    is_site_measurement_id_allowed,
     is_product_termType_allowed,
     is_product_id_allowed,
     is_input_termType_allowed,
@@ -30,6 +31,7 @@ def cycle_emission_is_in_system_boundary(cycle: dict):
     def filter_term(term_id: str):
         return is_in_system_boundary(term_id) and all(map(lambda check: check(cycle, term_id), [
             is_siteType_allowed,
+            is_site_measurement_id_allowed,
             is_product_termType_allowed,
             is_product_id_allowed,
             is_input_termType_allowed,

{hestia_earth_utils-0.15.8 → hestia_earth_utils-0.15.10}/hestia_earth/utils/lookup_utils.py

@@ -30,6 +30,11 @@ def _get_site_types(node: dict):
     return non_empty_list([site.get('siteType') for site in sites])
 
 
+def _get_site_measurements(node: dict):
+    sites = [node] if _is_site(node) else _get_sites(node)
+    return non_empty_list([site.get('measurements', []) for site in sites])
+
+
 @lru_cache()
 def _allowed_model_mapping(model: str, term_id: str, column: str):
     mapping = _allowed_mapping_data()
@@ -76,6 +81,16 @@ def is_siteType_allowed(data: dict, term_id: str):
     ])
 
 
+def is_site_measurement_id_allowed(data: dict, term_id: str):
+    measurements = _get_site_measurements(data)
+    values = non_empty_list([v.get('term', {}).get('@id') for v in measurements])
+    allowed_values = _allowed_mapping(term_id, 'siteMeasurementIdsAllowed')
+    return True if any([
+        _ALLOW_ALL in allowed_values,
+        len(values) == 0
+    ]) else any([value in allowed_values for value in values])
+
+
 def is_product_termType_allowed(data: dict, term_id: str):
     products = data.get('products', [])
     values = non_empty_list([p.get('term', {}).get('termType') for p in products])

{hestia_earth_utils-0.15.8 → hestia_earth_utils-0.15.10}/hestia_earth/utils/pivot/_shared.py

@@ -3,7 +3,12 @@ import numpy as np
 
 
 EXCLUDE_FIELDS = ["@type", "type", "@context"]
-EXCLUDE_PRIVATE_FIELDS = ["added", "addedVersion", "updated", "updatedVersion", "_cache"]
+EXCLUDE_PRIVATE_FIELDS = [
+    "added", "addedVersion",
+    "updated", "updatedVersion",
+    "aggregatedVersion",
+    "_cache"
+]
 
 
 def _with_csv_formatting(dct):

{hestia_earth_utils-0.15.8 → hestia_earth_utils-0.15.10}/hestia_earth/utils/pivot/pivot_json.py

@@ -38,10 +38,15 @@ def _combine_node_ids(nodes: list):
     return {"@id": ";".join([node.get("@id", node.get("id")) for node in nodes])}
 
 
-def _base_pivoted_value(value):
+def _base_pivoted_value(key: str, value, is_top_level: bool):
     # handle list of Nodes
     return (
-        _combine_node_ids(value) if isinstance(value[0], dict) and value[0].get('@type') in NODE_TYPES else value
+        _combine_node_ids(value) if isinstance(value[0], dict) and value[0].get('@type') in NODE_TYPES else
+        json.dumps(value, separators=(',', ':')) if any([
+            is_top_level,
+            key in ['distribution']
+        ]) else
+        value
     ) if isinstance(value, list) else value
 
 
@@ -51,11 +56,12 @@ def _do_pivot(node, parent_node_type=None, parent_field=None, level=0):  # noqa:
     if node_type not in ADAPTED_UNIQUENESS_FIELDS:
         return node
     pivoted_node = {
-        field: _base_pivoted_value(value)
+        field: _base_pivoted_value(field, value, level==0)
         for field, value in node.items()
         if all([
             field not in ADAPTED_UNIQUENESS_FIELDS[node_type],
-            node_type != 'Term' or field not in term_exclude_fields
+            node_type != 'Term' or field not in term_exclude_fields,
+            field not in EXCLUDE_PRIVATE_FIELDS
         ])
     }
 

hestia_earth_utils-0.15.10/hestia_earth/utils/version.py

@@ -0,0 +1 @@
+VERSION = '0.15.10'

{hestia_earth_utils-0.15.8 → hestia_earth_utils-0.15.10}/hestia_earth_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-utils
-Version: 0.15.8
+Version: 0.15.10
 Summary: HESTIA's utils library
 Home-page: https://gitlab.com/hestia-earth/hestia-utils
 Author: HESTIA Team

hestia_earth_utils-0.15.8/hestia_earth/utils/version.py

@@ -1 +0,0 @@
-VERSION = '0.15.8'