hestia-earth-utils 0.15.3__tar.gz → 0.15.4__tar.gz

{hestia_earth_utils-0.15.3 → hestia_earth_utils-0.15.4}/PKG-INFO

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

{hestia_earth_utils-0.15.3 → hestia_earth_utils-0.15.4}/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-0.15.4/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-0.15.4/hestia_earth/utils/version.py

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

{hestia_earth_utils-0.15.3 → hestia_earth_utils-0.15.4}/hestia_earth_utils.egg-info/PKG-INFO

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

{hestia_earth_utils-0.15.3 → hestia_earth_utils-0.15.4}/hestia_earth_utils.egg-info/SOURCES.txt

@@ -19,6 +19,7 @@ hestia_earth/utils/pipeline.py
 hestia_earth/utils/request.py
 hestia_earth/utils/stats.py
 hestia_earth/utils/table.py
+hestia_earth/utils/term.py
 hestia_earth/utils/tools.py
 hestia_earth/utils/version.py
 hestia_earth/utils/pivot/__init__.py

hestia_earth_utils-0.15.3/hestia_earth/utils/version.py

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