hestia-earth-utils 0.15.14__py3-none-any.whl → 0.15.16__py3-none-any.whl

hestia_earth/utils/emission.py

@@ -9,7 +9,11 @@ from .lookup_utils import (
     is_product_termType_allowed,
     is_product_id_allowed,
     is_input_termType_allowed,
-    is_input_id_allowed
+    is_input_id_allowed,
+    is_practice_termType_allowed,
+    is_practice_id_allowed,
+    is_transformation_termType_allowed,
+    is_transformation_id_allowed,
 )
 
 
@@ -35,7 +39,11 @@ def cycle_emission_is_in_system_boundary(cycle: dict):
             is_product_termType_allowed,
             is_product_id_allowed,
             is_input_termType_allowed,
-            is_input_id_allowed
+            is_input_id_allowed,
+            is_practice_termType_allowed,
+            is_practice_id_allowed,
+            is_transformation_termType_allowed,
+            is_transformation_id_allowed,
         ]))
 
     return filter_term

hestia_earth/utils/lookup_utils.py

@@ -1,5 +1,6 @@
 from functools import lru_cache
 import json
+from hestia_earth.schema import SchemaType
 
 from .lookup import _download_lookup_data, download_lookup, get_table_value, column_name
 from .api import download_hestia
@@ -35,6 +36,10 @@ def _get_site_measurements(node: dict):
     return flatten([non_empty_list(site.get('measurements', [])) for site in sites])
 
 
+def _blank_node_term_values(blank_nodes: list, key: str = '@id'):
+    return non_empty_list([v.get('term', {}).get(key) for v in blank_nodes])
+
+
 @lru_cache()
 def _allowed_model_mapping(model: str, term_id: str, column: str):
     mapping = _allowed_mapping_data()
@@ -45,22 +50,27 @@ def _allowed_model_mapping(model: str, term_id: str, column: str):
     return (value or _ALLOW_ALL).split(';') if isinstance(value, str) else _ALLOW_ALL
 
 
+def _is_model_value_allowed(model: str, term_id: str, values: list, lookup_column: str):
+    allowed_values = _allowed_model_mapping(model, term_id, lookup_column)
+    return any([
+        _ALLOW_ALL in allowed_values,
+        len(values) == 0
+    ]) or any([value in allowed_values for value in values])
+
+
 def is_model_siteType_allowed(model: str, term_id: str, data: dict):
-    site_types = _get_site_types(data)
-    allowed_values = _allowed_model_mapping(model, term_id, 'siteTypesAllowed')
-    return True if _ALLOW_ALL in allowed_values or not site_types else any([
-        (site_type in allowed_values) for site_type in site_types
-    ])
+    values = _get_site_types(data)
+    return _is_model_value_allowed(model, term_id, values, 'siteTypesAllowed')
 
 
 def is_model_product_id_allowed(model: str, term_id: str, data: dict):
-    products = data.get('products', [])
-    values = non_empty_list([p.get('term', {}).get('@id') for p in products])
-    allowed_values = _allowed_model_mapping(model, term_id, 'productTermIdsAllowed')
-    return True if any([
-        _ALLOW_ALL in allowed_values,
-        len(values) == 0
-    ]) else any([value in allowed_values for value in values])
+    values = _blank_node_term_values(data.get('products', []))
+    return _is_model_value_allowed(model, term_id, values, 'productTermIdsAllowed')
+
+
+def is_model_measurement_id_allowed(model: str, term_id: str, data: dict):
+    values = _blank_node_term_values(data.get('measurements', []))
+    return _is_model_value_allowed(model, term_id, values, 'measurementIdsAllowed')
 
 
 @lru_cache()
@@ -73,68 +83,76 @@ def _allowed_mapping(term_id: str, column: str):
     return (value or _ALLOW_ALL).split(';') if isinstance(value, str) else _ALLOW_ALL
 
 
+def _is_term_value_allowed(term_id: str, values: list, lookup_column: str):
+    allowed_values = _allowed_mapping(term_id, lookup_column)
+    return any([
+        _ALLOW_ALL in allowed_values,
+        len(values) == 0
+    ]) or any([value in allowed_values for value in values])
+
+
 def is_siteType_allowed(data: dict, term_id: str):
-    site_types = _get_site_types(data)
-    allowed_values = _allowed_mapping(term_id, 'siteTypesAllowed')
-    return True if _ALLOW_ALL in allowed_values or not site_types else any([
-        (site_type in allowed_values) for site_type in site_types
-    ])
+    values = _get_site_types(data)
+    return _is_term_value_allowed(term_id, values, 'siteTypesAllowed')
 
 
 def is_site_measurement_id_allowed(data: dict, term_id: str):
     measurements = _get_site_measurements(data)
-    values = non_empty_list([v.get('term', {}).get('@id') for v in measurements])
-    allowed_values = _allowed_mapping(term_id, 'siteMeasurementIdsAllowed')
-    return True if any([
-        _ALLOW_ALL in allowed_values,
-        len(values) == 0
-    ]) else any([value in allowed_values for value in values])
+    values = _blank_node_term_values(measurements, key='@id')
+    return _is_term_value_allowed(term_id, values, 'siteMeasurementIdsAllowed')
 
 
 def is_product_termType_allowed(data: dict, term_id: str):
     products = data.get('products', [])
-    values = non_empty_list([p.get('term', {}).get('termType') for p in products])
-    allowed_values = _allowed_mapping(term_id, 'productTermTypesAllowed')
-    return True if any([
-        _ALLOW_ALL in allowed_values,
-        len(values) == 0
-    ]) else any([value in allowed_values for value in values])
+    values = _blank_node_term_values(products, key='termType')
+    return _is_term_value_allowed(term_id, values, 'productTermTypesAllowed')
 
 
 def is_product_id_allowed(data: dict, term_id: str):
     products = data.get('products', [])
-    values = non_empty_list([p.get('term', {}).get('@id') for p in products])
-    allowed_values = _allowed_mapping(term_id, 'productTermIdsAllowed')
-    return True if any([
-        _ALLOW_ALL in allowed_values,
-        len(values) == 0
-    ]) else any([value in allowed_values for value in values])
+    values = _blank_node_term_values(products, key='@id')
+    return _is_term_value_allowed(term_id, values, 'productTermIdsAllowed')
 
 
 def is_input_termType_allowed(data: dict, term_id: str):
     inputs = data.get('inputs', [])
-    values = non_empty_list([p.get('term', {}).get('termType') for p in inputs])
-    allowed_values = _allowed_mapping(term_id, 'inputTermTypesAllowed')
-    return True if any([
-        _ALLOW_ALL in allowed_values,
-        len(values) == 0
-    ]) else any([value in allowed_values for value in values])
+    values = _blank_node_term_values(inputs, key='termType')
+    return _is_term_value_allowed(term_id, values, 'inputTermTypesAllowed')
 
 
 def is_input_id_allowed(data: dict, term_id: str):
     inputs = data.get('inputs', [])
-    values = non_empty_list([p.get('term', {}).get('@id') for p in inputs])
-    allowed_values = _allowed_mapping(term_id, 'inputTermIdsAllowed')
-    return True if any([
-        _ALLOW_ALL in allowed_values,
-        len(values) == 0
-    ]) else any([value in allowed_values for value in values])
+    values = _blank_node_term_values(inputs, key='@id')
+    return _is_term_value_allowed(term_id, values, 'inputTermIdsAllowed')
+
+
+def is_practice_termType_allowed(data: dict, term_id: str):
+    practices = data.get('practices', [])
+    values = _blank_node_term_values(practices, key='termType')
+    return _is_term_value_allowed(term_id, values, 'practiceTermTypesAllowed')
+
+
+def is_practice_id_allowed(data: dict, term_id: str):
+    practices = data.get('practices', [])
+    values = _blank_node_term_values(practices, key='@id')
+    return _is_term_value_allowed(term_id, values, 'practiceTermIdsAllowed')
+
+
+def is_transformation_termType_allowed(data: dict, term_id: str):
+    is_transformation = data.get('@type', data.get('type')) == SchemaType.TRANSFORMATION.value
+    values = non_empty_list([data.get('term', {}).get('termType')])
+    return not is_transformation or _is_term_value_allowed(term_id, values, 'transformationTermTypesAllowed')
+
+
+def is_transformation_id_allowed(data: dict, term_id: str):
+    is_transformation = data.get('@type', data.get('type')) == SchemaType.TRANSFORMATION.value
+    values = non_empty_list([data.get('term', {}).get('@id')])
+    return not is_transformation or _is_term_value_allowed(term_id, values, 'transformationTermIdsAllowed')
 
 
 def is_node_type_allowed(data: dict, term_id: str):
-    node_type = data.get('@type', data.get('type'))
-    allowed_types = _allowed_mapping(term_id, 'typesAllowed')
-    return True if _ALLOW_ALL in allowed_types or not node_type else node_type in allowed_types
+    values = non_empty_list([data.get('@type', data.get('type'))])
+    return _is_term_value_allowed(term_id, values, 'typesAllowed')
 
 
 @lru_cache()

hestia_earth/utils/version.py

@@ -1 +1 @@
-VERSION = '0.15.14'
+VERSION = '0.15.16'

{hestia_earth_utils-0.15.14.dist-info → hestia_earth_utils-0.15.16.dist-info}/METADATA

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

{hestia_earth_utils-0.15.14.dist-info → hestia_earth_utils-0.15.16.dist-info}/RECORD

@@ -6,9 +6,9 @@ hestia_earth/utils/calculation_status.py,sha256=X7lbgVMD9luH1gj9lEcxd3_P2-u7e8ZP
 hestia_earth/utils/cycle.py,sha256=rFLRL9X4KQ1UrE6fEPA_gV8KmwzrZpR3Ce56zg41lRk,1326
 hestia_earth/utils/date.py,sha256=SPQ69uxHiv1o3BqIkBKkM5XX_CmS20CB7g6u2rhsdh8,1807
 hestia_earth/utils/descriptive_stats.py,sha256=EMVwFvg2OnZgKRAfireAoWY2EbrSvqR0V0bK9B53p28,1583
-hestia_earth/utils/emission.py,sha256=Dk99fpfGhVH3Azebqt7KAldWzVkEtsW5Yr1Ggfse8ho,1675
+hestia_earth/utils/emission.py,sha256=BhBitooLTxZSh82S982v2QfPxxTF1kmGClG_uHyWdz4,1981
 hestia_earth/utils/lookup.py,sha256=0RLqy3HPzkbhkRaO7fYoHU0jKhAYzI6QHMptMEbqTlg,10344
-hestia_earth/utils/lookup_utils.py,sha256=DXjxrgb6ETnFnzgQpDdhAoja2YuI7b-5QyomJDFr5Qc,5985
+hestia_earth/utils/lookup_utils.py,sha256=_k3RZ1pK-gw7jq8wn9HrPWfDl4FlEWRb8bXmgaARu0w,6716
 hestia_earth/utils/model.py,sha256=uUcrF07XmBzqLni8VSaP0HoebJnQ57kk0EOmhwYMbfI,4637
 hestia_earth/utils/pipeline.py,sha256=O-6DPtK0U1lJ51LFGa1gM6pjkBJUfxOjNjY8LxQPXV0,9588
 hestia_earth/utils/request.py,sha256=bu7hkWKmFdXl2_Feawiam_x32whlclA9oP0asJyC69k,626
@@ -16,7 +16,7 @@ hestia_earth/utils/stats.py,sha256=4t3op10xDJbGxWJEY1Jtyl302PYWyMFwLpsSkMlzQn8,3
 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=9GaUJwxL-CTzEOGnRFkUQDVFelPevQSxXrf25vssCVo,4990
-hestia_earth/utils/version.py,sha256=JsSUgxGFTJenpZ-C8T3RsjjTqcfvNP4_JsQwOIQcUeE,20
+hestia_earth/utils/version.py,sha256=JDQ_516e1l28tU9cgTLDX-12-rAvR8X42sQ5QDTbtTU,20
 hestia_earth/utils/pivot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/utils/pivot/_shared.py,sha256=JnyIOzpans45DE2hSa9-4yvNhq8t08lx1IAWGJi6WPQ,1397
 hestia_earth/utils/pivot/pivot_csv.py,sha256=zaiDcig4I5lVSHPZ-2bXKKBcIRrayA0GUaw0c8H3D-w,12371
@@ -26,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=B2yTsf-VfHcRLCKTMes4S_nCXxrZad9umyZx3b5Pu_c,3181
 hestia_earth/utils/storage/_sns_client.py,sha256=LowUatj78Egu6_Id6Rr7hZjfZx1WguS3lozB3yAwSps,347
-hestia_earth_utils-0.15.14.data/scripts/hestia-format-upload,sha256=IhLAHHPJqRgUcht-M_EUEsRMbRbMfshig07o488zscM,703
-hestia_earth_utils-0.15.14.data/scripts/hestia-pivot-csv,sha256=0YBuGuyPO8rytod6iwWEKiQdSlr9JLuD001k6U5t6no,1163
+hestia_earth_utils-0.15.16.data/scripts/hestia-format-upload,sha256=IhLAHHPJqRgUcht-M_EUEsRMbRbMfshig07o488zscM,703
+hestia_earth_utils-0.15.16.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.14.dist-info/METADATA,sha256=Mpjtek3IFIguYtfT6tRF2u5j1dHWIMU-Cy1Gx_J44QE,1758
-hestia_earth_utils-0.15.14.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_utils-0.15.14.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_utils-0.15.14.dist-info/RECORD,,
+hestia_earth_utils-0.15.16.dist-info/METADATA,sha256=nTJS2R1fi2c9Lz3R7zvRuf8HKG1n7K72KoDek_C9LpU,1758
+hestia_earth_utils-0.15.16.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hestia_earth_utils-0.15.16.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_utils-0.15.16.dist-info/RECORD,,