hestia-earth-utils 0.15.7__tar.gz → 0.15.9__tar.gz

{hestia_earth_utils-0.15.7 → hestia_earth_utils-0.15.9}/PKG-INFO

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

{hestia_earth_utils-0.15.7 → hestia_earth_utils-0.15.9}/hestia_earth/utils/blank_node.py

@@ -6,7 +6,7 @@ from statistics import mode, mean
 from hestia_earth.schema import TermTermType
 
 from .lookup import download_lookup, get_table_value, column_name
-from .tools import non_empty_list, flatten
+from .tools import non_empty_list, non_empty_value, flatten
 from .emission import cycle_emissions_in_system_boundary
 from .model import filter_list_term_type
 
@@ -145,7 +145,7 @@ def get_node_value(
 
     return reducer(value) if reducer else (
         value if any([isinstance(value, float), isinstance(value, int), isinstance(value, bool)]) else
-        default if value is None else
+        default if not non_empty_value(value) else
         value
     )
 

{hestia_earth_utils-0.15.7 → hestia_earth_utils-0.15.9}/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.7 → hestia_earth_utils-0.15.9}/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.9/hestia_earth/utils/version.py

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

{hestia_earth_utils-0.15.7 → hestia_earth_utils-0.15.9}/hestia_earth_utils.egg-info/PKG-INFO

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

hestia_earth_utils-0.15.7/hestia_earth/utils/version.py

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