hestia-earth-utils 0.15.7__py3-none-any.whl → 0.15.9__py3-none-any.whl

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/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/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/version.py

@@ -1 +1 @@
-VERSION = '0.15.7'
+VERSION = '0.15.9'

{hestia_earth_utils-0.15.7.dist-info → hestia_earth_utils-0.15.9.dist-info}/METADATA

@@ -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.dist-info → hestia_earth_utils-0.15.9.dist-info}/RECORD

@@ -1,7 +1,7 @@
 hestia_earth/__init__.py,sha256=G-d438vPx7m_ks5e9XTtM3u7LDRO5dSSukibukWmyPM,56
 hestia_earth/utils/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3hk,76
 hestia_earth/utils/api.py,sha256=y0gw5pCCHNnFIhM62Hok_5eDtH3QDAZdkye_1mANMNs,9654
-hestia_earth/utils/blank_node.py,sha256=COmhDWc9mdk2EyXJIQHw_reGM_0Drs1Onh4lNP8rxa4,7345
+hestia_earth/utils/blank_node.py,sha256=1wc9zUkOvFhJS-YmuKexfIdYxfsp5KyJczLmHlW559Q,7375
 hestia_earth/utils/calculation_status.py,sha256=X7lbgVMD9luH1gj9lEcxd3_P2-u7e8ZPGCvX1czPZUo,2238
 hestia_earth/utils/cycle.py,sha256=rFLRL9X4KQ1UrE6fEPA_gV8KmwzrZpR3Ce56zg41lRk,1326
 hestia_earth/utils/date.py,sha256=SPQ69uxHiv1o3BqIkBKkM5XX_CmS20CB7g6u2rhsdh8,1807
@@ -16,22 +16,22 @@ hestia_earth/utils/stats.py,sha256=4t3op10xDJbGxWJEY1Jtyl302PYWyMFwLpsSkMlzQn8,3
 hestia_earth/utils/table.py,sha256=RrTt-KF_QzjKiCpaAueoG6La1FG-Iusxw5NMDpoRBpQ,2861
 hestia_earth/utils/term.py,sha256=6LiUSc6KX3IOkfWF6fYkQ2tENCO8ENljcdDypxU6WtA,1060
 hestia_earth/utils/tools.py,sha256=eCppZ0gFR6RPF7TEraMLwLJnUCJb93xP0iEzFPcYpK0,4685
-hestia_earth/utils/version.py,sha256=i5A1ArkQoPMA4s7B-G-hGfkzKEbUchANXOd9RxkRefg,19
+hestia_earth/utils/version.py,sha256=bYJDMWJ5fpHePjK8_SqlY-xcn41Nz654Q1jc3TykHC8,19
 hestia_earth/utils/pivot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hestia_earth/utils/pivot/_shared.py,sha256=sRE_PGe9u0-sFnCb0mdeM7vPOkFWt3-kDs8WSGQTQGk,875
+hestia_earth/utils/pivot/_shared.py,sha256=MB9074xkgKO9D_B6tWM-pdOlpjP_9itWpAHAzkA_1to,914
 hestia_earth/utils/pivot/pivot_csv.py,sha256=Ed-sCKEqVIFJu71AncS7zlMkHbw5V15QLd5c5B_uxiE,12296
-hestia_earth/utils/pivot/pivot_json.py,sha256=Rm4_mNaEgx-Jmq8sGIq_-jYMtZO78YXGxwdz1_y886I,9497
+hestia_earth/utils/pivot/pivot_json.py,sha256=Ld0SmUa-2aJ2pHOyicLujBP8KpBT_FnYNcy6FDbjLBY,9737
 hestia_earth/utils/storage/__init__.py,sha256=uNX6_EHWWnNUIm4Ng7L43-cQmuc6NGFAxXye85saIXQ,922
 hestia_earth/utils/storage/_azure_client.py,sha256=sevCZni04eknMql2DgUsWG23f7u0KvsXP7me1ZUBy00,1274
 hestia_earth/utils/storage/_local_client.py,sha256=IbzziUKY0QS3ybHFfgEpELqvafa7hQnZ-DdGdjQuypE,515
 hestia_earth/utils/storage/_s3_client.py,sha256=aWt4i_vObcTDWcwyzOOnBBnMv1rxPZV3AJZQMn96Hok,2975
 hestia_earth/utils/storage/_sns_client.py,sha256=LowUatj78Egu6_Id6Rr7hZjfZx1WguS3lozB3yAwSps,347
-hestia_earth_utils-0.15.7.data/scripts/hestia-format-upload,sha256=IhLAHHPJqRgUcht-M_EUEsRMbRbMfshig07o488zscM,703
-hestia_earth_utils-0.15.7.data/scripts/hestia-pivot-csv,sha256=0YBuGuyPO8rytod6iwWEKiQdSlr9JLuD001k6U5t6no,1163
+hestia_earth_utils-0.15.9.data/scripts/hestia-format-upload,sha256=IhLAHHPJqRgUcht-M_EUEsRMbRbMfshig07o488zscM,703
+hestia_earth_utils-0.15.9.data/scripts/hestia-pivot-csv,sha256=0YBuGuyPO8rytod6iwWEKiQdSlr9JLuD001k6U5t6no,1163
 tests/pivot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/pivot/test_pivot_csv.py,sha256=aYni7o3QDPSgtVxVCspEetotgpYHY7Lz5VHf-DR89gw,8131
 tests/pivot/test_pivot_json.py,sha256=UYTAN4AZhzVicIYsU1A2VgJcctUXohjHppg6s-pqwcg,8287
-hestia_earth_utils-0.15.7.dist-info/METADATA,sha256=W0cayfO2MCTpjomFghq9yc6hMceA2J6qNTKcgUm5770,1757
-hestia_earth_utils-0.15.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_utils-0.15.7.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_utils-0.15.7.dist-info/RECORD,,
+hestia_earth_utils-0.15.9.dist-info/METADATA,sha256=4jCktvV_bF4-K0KgGIb-i9wQk2T6CrgzMY7jAJxrZaw,1757
+hestia_earth_utils-0.15.9.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hestia_earth_utils-0.15.9.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_utils-0.15.9.dist-info/RECORD,,