hestia-earth-utils 0.16.10__tar.gz → 0.16.12__tar.gz

{hestia_earth_utils-0.16.10/hestia_earth_utils.egg-info → hestia_earth_utils-0.16.12}/PKG-INFO

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

{hestia_earth_utils-0.16.10 → hestia_earth_utils-0.16.12}/hestia_earth/utils/blank_node.py

@@ -176,7 +176,6 @@ def get_node_value(
                     isinstance(value, float),
                     isinstance(value, int),
                     isinstance(value, bool),
-                    value is None,
                 ]
             )
             else default if not non_empty_value(value) else value

{hestia_earth_utils-0.16.10 → hestia_earth_utils-0.16.12}/hestia_earth/utils/tools.py

@@ -8,9 +8,14 @@ from hestia_earth.schema import NodeType
 
 
 def to_precision(number: float, digits: int = 3) -> float:
-    return (
-        0 if not number else round(number, digits - int(floor(log10(abs(number)))) - 1)
-    )
+    try:
+        return (
+            0
+            if not number
+            else round(number, digits - int(floor(log10(abs(number)))) - 1)
+        )
+    except ValueError:
+        return number
 
 
 def non_empty_value(value) -> bool:
@@ -156,7 +161,8 @@ def is_number(value):
     """
     return all(
         [
-            not isinstance(value, bool),  # True is apparently considered an `int`
+            # True is apparently considered an `int`
+            not isinstance(value, bool),
             any([isinstance(value, int), isinstance(value, float)]),
         ]
     )

hestia_earth_utils-0.16.12/hestia_earth/utils/version.py

@@ -0,0 +1 @@
+VERSION = "0.16.12"

{hestia_earth_utils-0.16.10 → hestia_earth_utils-0.16.12/hestia_earth_utils.egg-info}/PKG-INFO

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

hestia_earth_utils-0.16.12/tests/test_blank_node.py

@@ -0,0 +1,74 @@
+import os
+
+# import json
+# from pytest import mark
+# from hestia_earth.schema import TermTermType
+
+from tests.utils import fixtures_path
+from hestia_earth.utils.blank_node import (
+    get_node_value,
+    ArrayTreatment,
+    # get_blank_nodes_calculation_status,
+)
+
+fixtures_folder = os.path.join(fixtures_path, "blank_node")
+calculation_status_folder = os.path.join(fixtures_folder, "calculation_status")
+
+
+def test_get_node_value():
+    assert get_node_value(None) == 0
+
+    blank_node = {"term": {"termType": "crop", "@id": "wheatGrain"}, "value": [10]}
+    assert get_node_value(blank_node, "value", default=None) == 10
+
+    blank_node = {"term": {"termType": "crop", "@id": "wheatGrain"}, "value": [0]}
+    assert get_node_value(blank_node, "value", default=None) == 0
+
+    blank_node = {"term": {"termType": "crop", "@id": "wheatGrain"}}
+    assert get_node_value(blank_node, "value", default=None) is None
+
+    blank_node = {"term": {"termType": "crop", "@id": "wheatGrain"}, "value": [10, 20]}
+    assert get_node_value(blank_node, "value", default=None) == 30
+
+    blank_node = {"term": {"termType": "crop", "@id": "wheatGrain"}, "value": True}
+    assert get_node_value(blank_node, "value", default=None) is True
+
+    blank_node = {"term": {"termType": "crop", "@id": "wheatGrain"}, "value": 10}
+    assert get_node_value(blank_node, "value", default=None) == 10
+
+    blank_node = {"term": {"termType": "crop", "@id": "wheatGrain"}, "value": None}
+    assert get_node_value(blank_node, "value", default=None) is None
+
+    blank_node = {"term": {"termType": "crop", "@id": "wheatGrain"}, "value": None}
+    assert get_node_value(blank_node, "value", default=0) == 0
+
+    blank_node = {
+        "term": {"termType": "crop", "@id": "wheatGrain"},
+        "value": [10, None, 20],
+    }
+    assert (
+        get_node_value(blank_node, "value", array_treatment=ArrayTreatment.MEAN) == 15
+    )
+
+    blank_node = {
+        "term": {"termType": "crop", "@id": "wheatGrain"},
+        "value": [10, None, 20],
+    }
+    assert get_node_value(blank_node, "value", array_treatment=ArrayTreatment.SUM) == 30
+
+
+# @mark.parametrize(
+#     'folder,list_key,termType',
+#     [
+#         ('cycle', 'emissions', TermTermType.EMISSION),
+#     ]
+# )
+# def test_get_blank_nodes_calculation_status(folder: str, list_key: str, termType: TermTermType):
+#     with open(f"{calculation_status_folder}/{folder}/node.jsonld", encoding='utf-8') as f:
+#         node = json.load(f)
+
+#     with open(f"{calculation_status_folder}/{folder}/{list_key}-{termType.value}.json", encoding='utf-8') as f:
+#         expected = json.load(f)
+
+#     result = get_blank_nodes_calculation_status(node, list_key=list_key, termType=termType)
+#     assert result == expected, folder

hestia_earth_utils-0.16.10/hestia_earth/utils/version.py

@@ -1 +0,0 @@
-VERSION = "0.16.10"

hestia_earth_utils-0.16.10/tests/test_blank_node.py

@@ -1,59 +0,0 @@
-# import os
-# import json
-# from pytest import mark
-# from hestia_earth.schema import TermTermType
-
-# from tests.utils import fixtures_path
-# from hestia_earth.utils.blank_node import get_node_value, ArrayTreatment, get_blank_nodes_calculation_status
-
-# fixtures_folder = os.path.join(fixtures_path, 'blank_node')
-# calculation_status_folder = os.path.join(fixtures_folder, 'calculation_status')
-
-
-# def test_get_node_value():
-#     blank_node = {'term': {'termType': 'crop', '@id': 'wheatGrain'}, 'value': [10]}
-#     assert get_node_value(blank_node, 'value', default=None) == 10
-
-#     blank_node = {'term': {'termType': 'crop', '@id': 'wheatGrain'}, 'value': [0]}
-#     assert get_node_value(blank_node, 'value', default=None) == 0
-
-#     blank_node = {'term': {'termType': 'crop', '@id': 'wheatGrain'}}
-#     assert get_node_value(blank_node, 'value', default=None) is None
-
-#     blank_node = {'term': {'termType': 'crop', '@id': 'wheatGrain'}, 'value': [10, 20]}
-#     assert get_node_value(blank_node, 'value', default=None) == 15
-
-#     blank_node = {'term': {'termType': 'crop', '@id': 'wheatGrain'}, 'value': True}
-#     assert get_node_value(blank_node, 'value', default=None) is True
-
-#     blank_node = {'term': {'termType': 'crop', '@id': 'wheatGrain'}, 'value': 10}
-#     assert get_node_value(blank_node, 'value', default=None) == 10
-
-#     blank_node = {'term': {'termType': 'crop', '@id': 'wheatGrain'}, 'value': None}
-#     assert get_node_value(blank_node, 'value', default=None) is None
-
-#     blank_node = {'term': {'termType': 'crop', '@id': 'wheatGrain'}, 'value': None}
-#     assert get_node_value(blank_node, 'value', default=0) == 0
-
-#     blank_node = {'term': {'termType': 'crop', '@id': 'wheatGrain'}, 'value': [10, None, 20]}
-#     assert get_node_value(blank_node, 'value', default=None) == 15
-
-#     blank_node = {'term': {'termType': 'crop', '@id': 'wheatGrain'}, 'value': [10, None, 20]}
-#     assert get_node_value(blank_node, 'value', array_treatment=ArrayTreatment.SUM) == 30
-
-
-# @mark.parametrize(
-#     'folder,list_key,termType',
-#     [
-#         ('cycle', 'emissions', TermTermType.EMISSION),
-#     ]
-# )
-# def test_get_blank_nodes_calculation_status(folder: str, list_key: str, termType: TermTermType):
-#     with open(f"{calculation_status_folder}/{folder}/node.jsonld", encoding='utf-8') as f:
-#         node = json.load(f)
-
-#     with open(f"{calculation_status_folder}/{folder}/{list_key}-{termType.value}.json", encoding='utf-8') as f:
-#         expected = json.load(f)
-
-#     result = get_blank_nodes_calculation_status(node, list_key=list_key, termType=termType)
-#     assert result == expected, folder