hestia-earth-utils 0.16.15__tar.gz → 0.16.17__tar.gz

{hestia_earth_utils-0.16.15 → hestia_earth_utils-0.16.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hestia_earth_utils
-Version: 0.16.15
+Version: 0.16.17
 Summary: HESTIA's utils library
 Home-page: https://gitlab.com/hestia-earth/hestia-utils
 Author: HESTIA Team
@@ -13,7 +13,7 @@ Requires-Dist: hestia-earth-schema>=35.0.1
 Requires-Dist: requests>=2.24.0
 Requires-Dist: urllib3~=1.26.0
 Requires-Dist: python-dateutil>=2.8.1
-Requires-Dist: pandas>=2
+Requires-Dist: pandas<3,>=2
 Requires-Dist: flatten_json
 Dynamic: author
 Dynamic: author-email

{hestia_earth_utils-0.16.15 → hestia_earth_utils-0.16.17}/hestia_earth/utils/pivot/_shared.py

@@ -6,7 +6,6 @@ from flatten_json import flatten as flatten_json
 
 from ..tools import list_sum
 
-
 EXCLUDE_FIELDS = ["@type", "type", "@context"]
 EXCLUDE_PRIVATE_FIELDS = [
     "added",

{hestia_earth_utils-0.16.15 → hestia_earth_utils-0.16.17}/hestia_earth/utils/pivot/pivot_json.py

@@ -51,6 +51,13 @@ def _combine_node_ids(nodes: list):
     return {"@id": ";".join([node.get("@id", node.get("id")) for node in nodes])}
 
 
+_COMPACT_JSON_KEYS = ["boundary", "distribution", "covarianceMatrix"]
+
+
+def _combine_json_compact(key: str, value: dict):
+    return json.dumps(value).replace(" ", "") if key in _COMPACT_JSON_KEYS else value
+
+
 def _base_pivoted_value(key: str, value, is_top_level: bool):
     # handle list of Nodes
     return (
@@ -58,13 +65,13 @@ def _base_pivoted_value(key: str, value, is_top_level: bool):
             _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"]])
+                _combine_json_compact(key, value)
+                if any([is_top_level, key in _COMPACT_JSON_KEYS])
                 else value
             )
         )
         if isinstance(value, list)
-        else value
+        else _combine_json_compact(key, value)
     )
 
 

hestia_earth_utils-0.16.17/hestia_earth/utils/version.py

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

{hestia_earth_utils-0.16.15 → hestia_earth_utils-0.16.17}/hestia_earth_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hestia_earth_utils
-Version: 0.16.15
+Version: 0.16.17
 Summary: HESTIA's utils library
 Home-page: https://gitlab.com/hestia-earth/hestia-utils
 Author: HESTIA Team
@@ -13,7 +13,7 @@ Requires-Dist: hestia-earth-schema>=35.0.1
 Requires-Dist: requests>=2.24.0
 Requires-Dist: urllib3~=1.26.0
 Requires-Dist: python-dateutil>=2.8.1
-Requires-Dist: pandas>=2
+Requires-Dist: pandas<3,>=2
 Requires-Dist: flatten_json
 Dynamic: author
 Dynamic: author-email

{hestia_earth_utils-0.16.15 → hestia_earth_utils-0.16.17}/hestia_earth_utils.egg-info/requires.txt

@@ -2,5 +2,5 @@ hestia-earth-schema>=35.0.1
 requests>=2.24.0
 urllib3~=1.26.0
 python-dateutil>=2.8.1
-pandas>=2
+pandas<3,>=2
 flatten_json

{hestia_earth_utils-0.16.15 → hestia_earth_utils-0.16.17}/tests/test_api.py

@@ -17,7 +17,6 @@ from hestia_earth.utils.api import (
     find_term_ids_by_names,
 )
 
-
 fake_related_response = {"results": [[{"@id": "related_id"}]]}
 fake_download_response = {"@id": "id", "@type": "type"}
 

{hestia_earth_utils-0.16.15 → hestia_earth_utils-0.16.17}/tests/test_blank_node.py

@@ -1,14 +1,14 @@
 import os
+import json
+from pytest import mark
+from unittest.mock import patch
+from hestia_earth.schema import TermTermType
 
-# import json
-# from pytest import mark
-# from hestia_earth.schema import TermTermType
-
-from tests.utils import fixtures_path
+from tests.utils import EMISSION_IDS, fixtures_path
 from hestia_earth.utils.blank_node import (
     get_node_value,
     ArrayTreatment,
-    # get_blank_nodes_calculation_status,
+    get_blank_nodes_calculation_status,
 )
 
 fixtures_folder = os.path.join(fixtures_path, "blank_node")
@@ -57,18 +57,33 @@ def test_get_node_value():
     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
+@mark.parametrize(
+    "folder,list_key,termType",
+    [
+        ("cycle", "emissions", TermTermType.EMISSION),
+        ("cycle-with-transformations", "emissions", TermTermType.EMISSION),
+    ],
+)
+@patch(
+    "hestia_earth.utils.blank_node.cycle_emissions_in_system_boundary",
+    return_value=EMISSION_IDS,
+)
+def test_get_blank_nodes_calculation_status(
+    mock_, 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
+    )
+    print(json.dumps(result, indent=2))
+    assert result == expected, folder

{hestia_earth_utils-0.16.15 → hestia_earth_utils-0.16.17}/tests/test_calculation_status.py

@@ -13,28 +13,18 @@ def test_emissions_with_status():
 
     result = _emissions_with_status(nodes[0])
     assert result == {
-        "emissions-total": 195,
+        "emissions-total": 202,
         "emissions-complete": 55,
-        "emissions-incomplete": 0,
-        "emissions-missing": 140,
+        "emissions-incomplete": 1,
+        "emissions-missing": 146,
         "emissions": result["emissions"],  # ignore
     }
 
     result = _emissions_with_status(nodes[1])
     assert result == {
-        "emissions-total": 195,
+        "emissions-total": 202,
         "emissions-complete": 0,
         "emissions-incomplete": 13,
-        "emissions-missing": 182,
+        "emissions-missing": 189,
         "emissions": result["emissions"],  # ignore
     }
-
-
-# def test_get_nodes_calculations_status_dataframe():
-#     with open(os.path.join(fixtures_folder, 'nodes.json')) as f:
-#         nodes = json.load(f)
-
-#     expected = open(os.path.join(fixtures_folder, 'result.csv'), 'r').read()
-
-#     df = get_nodes_calculations_status_dataframe(nodes, file_format='csv')
-#     assert df.to_csv(None, index=None) == expected

{hestia_earth_utils-0.16.15 → hestia_earth_utils-0.16.17}/tests/test_cycle.py

@@ -1,8 +1,9 @@
 import os
 import json
 import pytest
+from unittest.mock import patch
 
-from tests.utils import fixtures_path
+from tests.utils import EMISSION_IDS, fixtures_path
 from hestia_earth.utils.cycle import get_cycle_emissions_calculation_status
 
 fixtures_folder = os.path.join(fixtures_path, "blank_node", "calculation_status")
@@ -14,7 +15,11 @@ _folders = [
 
 
 @pytest.mark.parametrize("folder", _folders)
-def test_get_cycle_emissions_calculation_status(folder: str):
+@patch(
+    "hestia_earth.utils.blank_node.cycle_emissions_in_system_boundary",
+    return_value=EMISSION_IDS,
+)
+def test_get_cycle_emissions_calculation_status(mock_, folder: str):
     with open(
         os.path.join(fixtures_folder, folder, "node.jsonld"), encoding="utf-8"
     ) as f:

hestia_earth_utils-0.16.15/hestia_earth/utils/version.py

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