hestia-earth-utils 0.15.9__py3-none-any.whl → 0.15.11__py3-none-any.whl

hestia_earth/utils/emission.py

@@ -5,6 +5,7 @@ from .lookup import download_lookup, lookup_term_ids
 from .lookup_utils import (
     is_in_system_boundary,
     is_siteType_allowed,
+    is_site_measurement_id_allowed,
     is_product_termType_allowed,
     is_product_id_allowed,
     is_input_termType_allowed,
@@ -30,6 +31,7 @@ def cycle_emission_is_in_system_boundary(cycle: dict):
     def filter_term(term_id: str):
         return is_in_system_boundary(term_id) and all(map(lambda check: check(cycle, term_id), [
             is_siteType_allowed,
+            is_site_measurement_id_allowed,
             is_product_termType_allowed,
             is_product_id_allowed,
             is_input_termType_allowed,

hestia_earth/utils/lookup_utils.py

@@ -3,7 +3,7 @@ import json
 
 from .lookup import _download_lookup_data, download_lookup, get_table_value, column_name
 from .api import download_hestia
-from .tools import non_empty_list
+from .tools import non_empty_list, flatten
 
 _ALLOW_ALL = 'all'
 
@@ -30,6 +30,11 @@ def _get_site_types(node: dict):
     return non_empty_list([site.get('siteType') for site in sites])
 
 
+def _get_site_measurements(node: dict):
+    sites = [node] if _is_site(node) else _get_sites(node)
+    return flatten([non_empty_list(site.get('measurements', [])) for site in sites])
+
+
 @lru_cache()
 def _allowed_model_mapping(model: str, term_id: str, column: str):
     mapping = _allowed_mapping_data()
@@ -76,6 +81,16 @@ def is_siteType_allowed(data: dict, term_id: str):
     ])
 
 
+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])
+
+
 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])

hestia_earth/utils/version.py

@@ -1 +1 @@
-VERSION = '0.15.9'
+VERSION = '0.15.11'

{hestia_earth_utils-0.15.9.dist-info → hestia_earth_utils-0.15.11.dist-info}/METADATA

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

{hestia_earth_utils-0.15.9.dist-info → hestia_earth_utils-0.15.11.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=crHAJOQRI0NRHht0fFOFjEqcarsFqzbV4pDgk90dfME,1595
+hestia_earth/utils/emission.py,sha256=Dk99fpfGhVH3Azebqt7KAldWzVkEtsW5Yr1Ggfse8ho,1675
 hestia_earth/utils/lookup.py,sha256=0RLqy3HPzkbhkRaO7fYoHU0jKhAYzI6QHMptMEbqTlg,10344
-hestia_earth/utils/lookup_utils.py,sha256=9pkJUKo3NEBspoN9yRPoDCzkxcbpnbLpC7Z0I6HiP7I,5369
+hestia_earth/utils/lookup_utils.py,sha256=DXjxrgb6ETnFnzgQpDdhAoja2YuI7b-5QyomJDFr5Qc,5985
 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=eCppZ0gFR6RPF7TEraMLwLJnUCJb93xP0iEzFPcYpK0,4685
-hestia_earth/utils/version.py,sha256=bYJDMWJ5fpHePjK8_SqlY-xcn41Nz654Q1jc3TykHC8,19
+hestia_earth/utils/version.py,sha256=qRcvn3GMIawuLKmMfJA7N1zkiyrTpl49n8THxVSnnVg,20
 hestia_earth/utils/pivot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/utils/pivot/_shared.py,sha256=MB9074xkgKO9D_B6tWM-pdOlpjP_9itWpAHAzkA_1to,914
 hestia_earth/utils/pivot/pivot_csv.py,sha256=Ed-sCKEqVIFJu71AncS7zlMkHbw5V15QLd5c5B_uxiE,12296
@@ -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=aWt4i_vObcTDWcwyzOOnBBnMv1rxPZV3AJZQMn96Hok,2975
 hestia_earth/utils/storage/_sns_client.py,sha256=LowUatj78Egu6_Id6Rr7hZjfZx1WguS3lozB3yAwSps,347
-hestia_earth_utils-0.15.9.data/scripts/hestia-format-upload,sha256=IhLAHHPJqRgUcht-M_EUEsRMbRbMfshig07o488zscM,703
-hestia_earth_utils-0.15.9.data/scripts/hestia-pivot-csv,sha256=0YBuGuyPO8rytod6iwWEKiQdSlr9JLuD001k6U5t6no,1163
+hestia_earth_utils-0.15.11.data/scripts/hestia-format-upload,sha256=IhLAHHPJqRgUcht-M_EUEsRMbRbMfshig07o488zscM,703
+hestia_earth_utils-0.15.11.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.9.dist-info/METADATA,sha256=4jCktvV_bF4-K0KgGIb-i9wQk2T6CrgzMY7jAJxrZaw,1757
-hestia_earth_utils-0.15.9.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_utils-0.15.9.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_utils-0.15.9.dist-info/RECORD,,
+hestia_earth_utils-0.15.11.dist-info/METADATA,sha256=yjwNXw4Pz9CNmnusIzhScYklZWFrmSpyahc7a11K6nI,1758
+hestia_earth_utils-0.15.11.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hestia_earth_utils-0.15.11.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_utils-0.15.11.dist-info/RECORD,,