hestia-earth-utils 0.15.2__py3-none-any.whl → 0.15.4__py3-none-any.whl

hestia_earth/utils/lookup.py

@@ -90,10 +90,15 @@ def _download_lookup_data(filename: str):
 
 def _build_index(array: numpy.recarray):
     columns = list(array.dtype.names)
-    return {
-        row[_INDEX_COL]: {col: row[col] for col in columns}
-        for row in array
-    } if _INDEX_COL in columns else array
+    try:
+        return {
+            row[_INDEX_COL]: {col: row[col] for col in columns}
+            for row in array
+        } if _INDEX_COL in columns else array
+    except TypeError:
+        return {
+            array[_INDEX_COL].item(): {col: array[col].item() for col in columns}
+        } if _INDEX_COL in columns else array
 
 
 def download_lookup(filename: str, keep_in_memory: bool = True, build_index: bool = False):

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')

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.2'
+VERSION = '0.15.4'

{hestia_earth_utils-0.15.2.dist-info → hestia_earth_utils-0.15.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-utils
-Version: 0.15.2
+Version: 0.15.4
 Summary: HESTIA's utils library
 Home-page: https://gitlab.com/hestia-earth/hestia-utils
 Author: HESTIA Team
@@ -13,7 +13,8 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: hestia-earth.schema>=24.3.0
 Requires-Dist: requests>=2.24.0
-Requires-Dist: python-dateutil
+Requires-Dist: urllib3~=1.26.0
+Requires-Dist: python-dateutil>=2.8.1
 Requires-Dist: numpy<2,>=1.25.0
 Requires-Dist: flatten-json
 

{hestia_earth_utils-0.15.2.dist-info → hestia_earth_utils-0.15.4.dist-info}/RECORD

@@ -7,15 +7,16 @@ hestia_earth/utils/cycle.py,sha256=rFLRL9X4KQ1UrE6fEPA_gV8KmwzrZpR3Ce56zg41lRk,1
 hestia_earth/utils/date.py,sha256=SPQ69uxHiv1o3BqIkBKkM5XX_CmS20CB7g6u2rhsdh8,1807
 hestia_earth/utils/descriptive_stats.py,sha256=EMVwFvg2OnZgKRAfireAoWY2EbrSvqR0V0bK9B53p28,1583
 hestia_earth/utils/emission.py,sha256=crHAJOQRI0NRHht0fFOFjEqcarsFqzbV4pDgk90dfME,1595
-hestia_earth/utils/lookup.py,sha256=2_89Anu0MS05JnqHSNSJovzF4wsBQB9dupO_Lt5n6A0,10152
+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=mQeGffV3-2_jI-m_8TZB_entAbFRci3vNl9BYdayLv0,9198
 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=py8EcQWmLHI9QpYSeHYpDfaMPYVcPAY0q5q91lWLM0g,19
+hestia_earth/utils/version.py,sha256=wfstim2Kb8lTIW3BkKHomKCdWgFQuGpqTdKGYJFloNc,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.2.data/scripts/hestia-format-upload,sha256=IhLAHHPJqRgUcht-M_EUEsRMbRbMfshig07o488zscM,703
-hestia_earth_utils-0.15.2.data/scripts/hestia-pivot-csv,sha256=0YBuGuyPO8rytod6iwWEKiQdSlr9JLuD001k6U5t6no,1163
+hestia_earth_utils-0.15.4.data/scripts/hestia-format-upload,sha256=IhLAHHPJqRgUcht-M_EUEsRMbRbMfshig07o488zscM,703
+hestia_earth_utils-0.15.4.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.2.dist-info/METADATA,sha256=nf_fdIKfJG9RXVsjxcdxJLbSKTJ3MPpRrZ6wR1lYeDM,1719
-hestia_earth_utils-0.15.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_utils-0.15.2.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_utils-0.15.2.dist-info/RECORD,,
+hestia_earth_utils-0.15.4.dist-info/METADATA,sha256=uQOWL4blG7K_tv2SfIQ427ZsVXdvjStPk5fkgpUU-Es,1757
+hestia_earth_utils-0.15.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hestia_earth_utils-0.15.4.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_utils-0.15.4.dist-info/RECORD,,