hestia-earth-utils 0.16.14__py3-none-any.whl → 0.16.16__py3-none-any.whl

hestia_earth/utils/blank_node.py

@@ -186,6 +186,38 @@ def get_node_value(
 _BLANK_NODE_GROUPING_KEYS = {TermTermType.EMISSION: ["methodModel"]}
 
 
+def _pluralize_key(key: str):
+    return key + ("" if key.endswith("s") else "s")
+
+
+def _blank_node_ids(values: list):
+    return sorted(list(set(list(map(lambda v: v.get("@id"), values)))))
+
+
+def _blank_node_sub_values(blank_nodes: list, key: str):
+    values = flatten(map(lambda v: v.get(key, []), blank_nodes))
+    return {_pluralize_key(key): _blank_node_ids(values)} if values else {}
+
+
+def _blank_node_data(blank_nodes: list):
+    value = get_node_value(
+        {
+            "term": blank_nodes[0].get("term"),
+            "value": list(map(get_node_value, blank_nodes)),
+        }
+    )
+    sub_values = ["inputs", "operation", "transformation"]
+    has_cycle_value = any(
+        [
+            all([get_node_value(v) is not None, not v.get("transformation")])
+            for v in blank_nodes
+        ]
+    )
+    return {"value": value, "hasCycleValue": has_cycle_value} | reduce(
+        lambda p, c: p | _blank_node_sub_values(blank_nodes, c), sub_values, {}
+    )
+
+
 def get_blank_nodes_calculation_status(
     node: dict, list_key: str, termType: TermTermType
 ):
@@ -214,20 +246,6 @@ def get_blank_nodes_calculation_status(
     blank_nodes_by_term = group_by_keys(blank_nodes, ["term"])
     blank_nodes_grouping_keys = _BLANK_NODE_GROUPING_KEYS.get(termType) or []
 
-    def blank_node_data(blank_nodes: list):
-        value = get_node_value(
-            {
-                "term": blank_nodes[0].get("term"),
-                "value": list(map(get_node_value, blank_nodes)),
-            }
-        )
-        inputs = flatten(map(lambda v: v.get("inputs", []), blank_nodes))
-        return {"value": value} | (
-            {"inputs": sorted(list(map(lambda v: v.get("@id"), inputs)))}
-            if inputs
-            else {}
-        )
-
     def map_blank_node(term_id: str):
         values = blank_nodes_by_term.get(term_id, [])
         grouped_blank_nodes = (
@@ -239,9 +257,9 @@ def get_blank_nodes_calculation_status(
             {}
             if not values
             else (
-                {k: blank_node_data(v) for k, v in grouped_blank_nodes.items()}
+                {k: _blank_node_data(v) for k, v in grouped_blank_nodes.items()}
                 if grouped_blank_nodes
-                else blank_node_data([values[0]])
+                else _blank_node_data([values[0]])
             )
         )
 

hestia_earth/utils/cycle.py

@@ -4,10 +4,16 @@ from .tools import flatten
 from .blank_node import get_blank_nodes_calculation_status
 
 
-def _extend_missing_inputs(value: dict, input_ids: set):
-    included_inputs = set(flatten([v.get("inputs", []) for v in value.values()]))
-    missing_inputs = input_ids - included_inputs
-    return {"missingInputs": sorted(list(missing_inputs))} if missing_inputs else {}
+def _extend_missing_values(
+    value: dict, all_values: set, key: str, must_have_key: bool = False
+):
+    included_values = set(flatten([v.get(key, []) for v in value.values()]))
+    missing_values = all_values - included_values
+    return (
+        {"missing" + key.capitalize(): sorted(list(missing_values))}
+        if all([missing_values, not must_have_key or included_values])
+        else {}
+    )
 
 
 def get_cycle_emissions_calculation_status(cycle: dict):
@@ -30,7 +36,20 @@ def get_cycle_emissions_calculation_status(cycle: dict):
         cycle, "emissions", TermTermType.EMISSION
     )
     input_ids = set([v.get("term", {}).get("@id") for v in cycle.get("inputs", [])])
+    transformation_ids = set(
+        [v.get("term", {}).get("@id") for v in cycle.get("transformations", [])]
+    )
     return {
-        k: v | (_extend_missing_inputs(v, input_ids) if "InputsProduction" in k else {})
+        k: v
+        | (
+            _extend_missing_values(v, input_ids, "inputs")
+            if "InputsProduction" in k
+            else {}
+        )
+        | (
+            _extend_missing_values(
+                v, transformation_ids, "transformations", must_have_key=True
+            )
+        )
         for k, v in status.items()
     }

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/version.py

@@ -1 +1 @@
-VERSION = "0.16.14"
+VERSION = "0.16.16"

{hestia_earth_utils-0.16.14.dist-info → hestia_earth_utils-0.16.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hestia_earth_utils
-Version: 0.16.14
+Version: 0.16.16
 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.14.dist-info → hestia_earth_utils-0.16.16.dist-info}/RECORD

@@ -1,8 +1,8 @@
 hestia_earth/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/utils/api.py,sha256=b6g87ylAgdWvwPlDeZDv74UGfXVe1KFXap5-Rv5daSE,9929
-hestia_earth/utils/blank_node.py,sha256=K_8wWACiwOqEJR71ClQFInzsIdDH3UUSwrtCZoh9V-o,7854
+hestia_earth/utils/blank_node.py,sha256=-ABKV9eiDIxzGWma1tTWxaupF_yQ1SvE6wfItR8OZCs,8368
 hestia_earth/utils/calculation_status.py,sha256=f5b05cEFXMfFI1clirIt7v3Y9H2Nja66GYv1NCyZjf0,2381
-hestia_earth/utils/cycle.py,sha256=oo0CesLMblL8ewI4s7eXdyNjr9R9df4Vyr0iRXCYFu4,1326
+hestia_earth/utils/cycle.py,sha256=MbIK4qOMceAb9mV_Un8UsxmmmAtvGwSE9saYHROIPjQ,1788
 hestia_earth/utils/date.py,sha256=cwcGtYVh2K5rH7k5uO1Olovy-hzIDrvsfaiR94ZlyO0,16165
 hestia_earth/utils/descriptive_stats.py,sha256=YvDI6EWCcZWw8yCxYhqyzMCDqCu2X8DjvygmMK_AVvc,1633
 hestia_earth/utils/emission.py,sha256=rHHf5vwe-RxTOaOJ9N0MuyJOLpDnPjjxv6MHYSpPgcU,2165
@@ -15,9 +15,9 @@ hestia_earth/utils/stats.py,sha256=vTNyKcMKmX0DoodM9QEG7HF8qm2Wf-4ckMWQFWZ1VgE,3
 hestia_earth/utils/table.py,sha256=MOJDo5fQPRDogAty_UXbO9-EXFwz97m0f7--mOM17lQ,2363
 hestia_earth/utils/term.py,sha256=aBVYuYv55nPqJPyt5mN4Fz652s_1hwUPckNUZX0pMP8,1064
 hestia_earth/utils/tools.py,sha256=WMx05cBtBR8mYQnLLBA2cgF1x2tI41514diFDeX4gLQ,7533
-hestia_earth/utils/version.py,sha256=R_I9V6MKTrP_WY9UKq_aQBdaU5xIiWzkcyC-foZlSnM,20
+hestia_earth/utils/version.py,sha256=SGKvksJDyfirCQnk3wbuotlbC2CvazXTR8lJe6kBC6U,20
 hestia_earth/utils/pivot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hestia_earth/utils/pivot/_shared.py,sha256=ob8T7bziZ6YffpRx_srzzH0h96z2GZJB5uVe9NxALIg,2828
+hestia_earth/utils/pivot/_shared.py,sha256=ZBmZRLbDN2JHODvQAh9jH_61Koh7Ts0C52xmiw_Bhpo,2827
 hestia_earth/utils/pivot/pivot_csv.py,sha256=1zGYuC_xlrLoX5FYSG3mt5HSc03CO-0p8J0oAmyI1VI,11778
 hestia_earth/utils/pivot/pivot_json.py,sha256=yWbsuFeTQJPk4H2b7ibVALGJa3qfKGyNuPeqM8yrcsI,11030
 hestia_earth/utils/storage/__init__.py,sha256=uNX6_EHWWnNUIm4Ng7L43-cQmuc6NGFAxXye85saIXQ,922
@@ -25,9 +25,9 @@ hestia_earth/utils/storage/_azure_client.py,sha256=mseexhzjteRDzzoFe2fEXe9MYLmvj
 hestia_earth/utils/storage/_local_client.py,sha256=KbYqTfniIU5R5J1m_unCQip9kOz9EGIGI0OH0QvD8eo,551
 hestia_earth/utils/storage/_s3_client.py,sha256=8TCxiHfxE7G8kdp3CnEFrxgmPwfPyci3-blsowE2T7o,3146
 hestia_earth/utils/storage/_sns_client.py,sha256=pvtXYw-sQ8ns3mlDz7ld9iZp3FYSm0xSXSXMJ5IPnBc,380
-hestia_earth_utils-0.16.14.data/scripts/hestia-format-upload,sha256=IhLAHHPJqRgUcht-M_EUEsRMbRbMfshig07o488zscM,703
-hestia_earth_utils-0.16.14.data/scripts/hestia-pivot-csv,sha256=0YBuGuyPO8rytod6iwWEKiQdSlr9JLuD001k6U5t6no,1163
-hestia_earth_utils-0.16.14.dist-info/METADATA,sha256=4i7b1a12W_HBp3NtPrR1Kr6ztiedReV_svrcDcnjKEY,1870
-hestia_earth_utils-0.16.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-hestia_earth_utils-0.16.14.dist-info/top_level.txt,sha256=q0QxKEYx9uLpAD5ZtC7Ypq29smEPfOzEAn7Xv8XHGOQ,13
-hestia_earth_utils-0.16.14.dist-info/RECORD,,
+hestia_earth_utils-0.16.16.data/scripts/hestia-format-upload,sha256=IhLAHHPJqRgUcht-M_EUEsRMbRbMfshig07o488zscM,703
+hestia_earth_utils-0.16.16.data/scripts/hestia-pivot-csv,sha256=0YBuGuyPO8rytod6iwWEKiQdSlr9JLuD001k6U5t6no,1163
+hestia_earth_utils-0.16.16.dist-info/METADATA,sha256=iOf4uwvgxtoZgFdSjW3uElhZfRf9vRQFJL_LC9ojvlM,1873
+hestia_earth_utils-0.16.16.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+hestia_earth_utils-0.16.16.dist-info/top_level.txt,sha256=q0QxKEYx9uLpAD5ZtC7Ypq29smEPfOzEAn7Xv8XHGOQ,13
+hestia_earth_utils-0.16.16.dist-info/RECORD,,

{hestia_earth_utils-0.16.14.dist-info → hestia_earth_utils-0.16.16.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any