hestia-earth-utils 0.15.3__py3-none-any.whl → 0.15.5__py3-none-any.whl

hestia_earth/utils/blank_node.py

@@ -144,8 +144,9 @@ def get_node_value(
     )] if isinstance(value, list) and len(value) > 0 else None
 
     return reducer(value) if reducer else (
-        value if any([isinstance(value, float), isinstance(value, int), isinstance(value, bool)])
-        else (value or default)
+        value if any([isinstance(value, float), isinstance(value, int), isinstance(value, bool)]) else
+        default if value is None else
+        value
     )
 
 

hestia_earth/utils/pipeline.py

@@ -25,7 +25,7 @@ class NpEncoder(json.JSONEncoder):
         return super(NpEncoder, self).default(obj)
 
 
-def to_string(data: dict): return json.dumps(data, ensure_ascii=False, cls=NpEncoder)
+def to_string(data: dict, indent: int = None): return json.dumps(data, indent=indent, ensure_ascii=False, cls=NpEncoder)
 
 
 def to_bytes(data: dict): return to_string(data).encode('utf8')
@@ -156,15 +156,15 @@ def _node_id(node: dict): return node.get('@id', node.get('id'))
 def _node_path(node: dict, folder: str = ''): return join(folder, _node_type(node), f"{_node_id(node)}.jsonld")
 
 
-def is_calculating(bucket: str, node: dict):
-    return _read_metadata(bucket, _node_path(node)).get(METADATA_PROGRESS_KEY, 'false') == 'true'
+def is_calculating(bucket: str, node: dict, folder: str = ''):
+    return _read_metadata(bucket, _node_path(node, folder)).get(METADATA_PROGRESS_KEY, 'false') == 'true'
 
 
-def set_calculating(bucket: str, node: dict, in_progress: bool):
-    return _update_metadata(bucket, _node_path(node), {METADATA_PROGRESS_KEY: str(in_progress).lower()})
+def set_calculating(bucket: str, node: dict, in_progress: bool, folder: str = ''):
+    return _update_metadata(bucket, _node_path(node, folder), {METADATA_PROGRESS_KEY: str(in_progress).lower()})
 
 
-def get_stage(bucket: str, node: dict):
+def get_stage(bucket: str, node: dict, folder: str = CALC_FOLDER):
     stage = _read_metadata(bucket, _node_path(node, folder=CALC_FOLDER)).get(METADATA_STAGE_KEY)
     return int(stage) if stage else stage
 

hestia_earth/utils/term.py

@@ -0,0 +1,31 @@
+import json
+from functools import lru_cache
+from typing import Union
+from hestia_earth.schema import TermTermType
+
+from .storage import _load_from_storage
+from .api import download_hestia
+
+
+@lru_cache()
+def _load_term_file(term_type: str):
+    try:
+        filepath = f"glossary/{term_type}.json"
+        nodes = json.loads(_load_from_storage(filepath, glossary=True))
+        return {node.get('@id'): node for node in nodes}
+    except Exception:
+        return {}
+
+
+def download_term(term: Union[str, dict], termType: Union[str, TermTermType] = None):
+    """
+    Download a Term, using the glossary file if available, or default to the standard download.
+    """
+    term_id = term.get('@id', term.get('id')) if isinstance(term, dict) else term
+    term_type = (
+        termType if isinstance(termType, str) else termType.value
+    ) if termType else (
+        term.get('termType') if isinstance(term, dict) else None
+    )
+    cached_nodes = _load_term_file(term_type) if term_type else {}
+    return cached_nodes.get(term_id) or download_hestia(term_id)

hestia_earth/utils/version.py

@@ -1 +1 @@
-VERSION = '0.15.3'
+VERSION = '0.15.5'

{hestia_earth_utils-0.15.3.dist-info → hestia_earth_utils-0.15.5.dist-info}/METADATA

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

{hestia_earth_utils-0.15.3.dist-info → hestia_earth_utils-0.15.5.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=8BeKKzKRZXvwMpJ13p41kVL7KAju9tY1Le_RUmca2Ig,7320
+hestia_earth/utils/blank_node.py,sha256=COmhDWc9mdk2EyXJIQHw_reGM_0Drs1Onh4lNP8rxa4,7345
 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
@@ -10,12 +10,13 @@ hestia_earth/utils/emission.py,sha256=crHAJOQRI0NRHht0fFOFjEqcarsFqzbV4pDgk90dfM
 hestia_earth/utils/lookup.py,sha256=0RLqy3HPzkbhkRaO7fYoHU0jKhAYzI6QHMptMEbqTlg,10344
 hestia_earth/utils/lookup_utils.py,sha256=9pkJUKo3NEBspoN9yRPoDCzkxcbpnbLpC7Z0I6HiP7I,5369
 hestia_earth/utils/model.py,sha256=uUcrF07XmBzqLni8VSaP0HoebJnQ57kk0EOmhwYMbfI,4637
-hestia_earth/utils/pipeline.py,sha256=tTAyyJlpNsq7zdNeE-1ETBWv1PFwvCHntMh_JtHXdoo,9163
+hestia_earth/utils/pipeline.py,sha256=KDA1PBimFIUJKVytbxaXh33QGFW55I-2kcVDCRbYxn4,9277
 hestia_earth/utils/request.py,sha256=bu7hkWKmFdXl2_Feawiam_x32whlclA9oP0asJyC69k,626
 hestia_earth/utils/stats.py,sha256=4t3op10xDJbGxWJEY1Jtyl302PYWyMFwLpsSkMlzQn8,34667
 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=hLVHxDXaHRJkp3GyxChJ7hdO6Bfi56LSrfl3kHEh7ds,19
+hestia_earth/utils/version.py,sha256=pY2Xj289NO4A3rIbFygWGENP2l3wteL9fyCFESz8zI0,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/pivot_csv.py,sha256=Ed-sCKEqVIFJu71AncS7zlMkHbw5V15QLd5c5B_uxiE,12296
@@ -25,12 +26,12 @@ hestia_earth/utils/storage/_azure_client.py,sha256=sevCZni04eknMql2DgUsWG23f7u0K
 hestia_earth/utils/storage/_local_client.py,sha256=IbzziUKY0QS3ybHFfgEpELqvafa7hQnZ-DdGdjQuypE,515
 hestia_earth/utils/storage/_s3_client.py,sha256=sR_HkvNmDFpLYislSUw1nffHicznCcPo1p_5cve2ExU,2216
 hestia_earth/utils/storage/_sns_client.py,sha256=LowUatj78Egu6_Id6Rr7hZjfZx1WguS3lozB3yAwSps,347
-hestia_earth_utils-0.15.3.data/scripts/hestia-format-upload,sha256=IhLAHHPJqRgUcht-M_EUEsRMbRbMfshig07o488zscM,703
-hestia_earth_utils-0.15.3.data/scripts/hestia-pivot-csv,sha256=0YBuGuyPO8rytod6iwWEKiQdSlr9JLuD001k6U5t6no,1163
+hestia_earth_utils-0.15.5.data/scripts/hestia-format-upload,sha256=IhLAHHPJqRgUcht-M_EUEsRMbRbMfshig07o488zscM,703
+hestia_earth_utils-0.15.5.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.3.dist-info/METADATA,sha256=-q7en-j-NiVkaxpr40KNmAlpDRtC26-G6eQ37td17JI,1757
-hestia_earth_utils-0.15.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_utils-0.15.3.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_utils-0.15.3.dist-info/RECORD,,
+hestia_earth_utils-0.15.5.dist-info/METADATA,sha256=EbkWkjevuBFHeiPK6aBme7mppB5H0HsN0cooulyOK_w,1757
+hestia_earth_utils-0.15.5.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hestia_earth_utils-0.15.5.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_utils-0.15.5.dist-info/RECORD,,