hestia-earth-utils 0.16.2__tar.gz → 0.16.4__tar.gz

{hestia_earth_utils-0.16.2/hestia_earth_utils.egg-info → hestia_earth_utils-0.16.4}/PKG-INFO

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

{hestia_earth_utils-0.16.2 → hestia_earth_utils-0.16.4}/hestia_earth/utils/csv_utils.py

@@ -26,12 +26,10 @@ def _text_to_csv(csv_content: str):
 
 
 def _csv_reader_converter(field_str_bytes):
-    field_str = field_str_bytes if isinstance(field_str_bytes, str) else field_str_bytes.decode('utf-8')
-    reader = _text_to_csv(field_str)
-
     try:
-        return _replace_missing_values(next(reader)[0].strip())
-    except StopIteration:
+        field_str = field_str_bytes if isinstance(field_str_bytes, str) else field_str_bytes.decode('utf-8')
+        return _replace_missing_values(field_str)
+    except Exception:
         return str(_MISSING)
 
 

{hestia_earth_utils-0.16.2 → hestia_earth_utils-0.16.4}/hestia_earth/utils/lookup.py

@@ -2,7 +2,6 @@ from functools import reduce
 from typing import Union
 import requests
 import numpy
-import traceback
 
 from .storage import _load_from_storage
 from .request import request_url, web_url
@@ -92,8 +91,6 @@ def download_lookup(filename: str, keep_in_memory: bool = True, build_index: boo
     try:
         return _memory_wrapper(filename, load) if keep_in_memory else load()
     except Exception:
-        stack = traceback.format_exc()
-        print(stack)
         return None
 
 
@@ -142,7 +139,7 @@ def _get_multiple_table_values(data: Union[dict, numpy.recarray], col_match: str
     return reduce(reducer, enumerate(col_match), data)[col_val][0]
 
 
-def get_table_value(lookup: Union[dict, numpy.recarray], col_match: str, col_match_with, col_val):
+def get_table_value(lookup: Union[dict, numpy.recarray], col_match: str, col_match_with, col_val, default_value=''):
     """
     Get a value matched by one or more columns from a `numpy.recarray`.
 
@@ -158,6 +155,8 @@ def get_table_value(lookup: Union[dict, numpy.recarray], col_match: str, col_mat
         Can be a single `str` or a list of `str`. If a list is used, must be the same length as `col_match`.
     col_val: str
         The column which contains the value to look for.
+    default_value : Any
+        A value to return when none if found in the data.
 
     Returns
     -------
@@ -170,7 +169,7 @@ def get_table_value(lookup: Union[dict, numpy.recarray], col_match: str, col_mat
             _get_single_table_value(lookup, col_match, col_match_with, col_val) if single else
             _get_multiple_table_values(lookup, col_match, col_match_with, col_val)
         )
-        return None if is_missing_value(value) else _parse_value(value)
+        return default_value if is_missing_value(value) else _parse_value(value)
     except Exception:
         return None
 

hestia_earth_utils-0.16.4/hestia_earth/utils/version.py

@@ -0,0 +1 @@
+VERSION = '0.16.4'

{hestia_earth_utils-0.16.2 → hestia_earth_utils-0.16.4/hestia_earth_utils.egg-info}/PKG-INFO

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

{hestia_earth_utils-0.16.2 → hestia_earth_utils-0.16.4}/tests/test_lookup.py

@@ -56,11 +56,11 @@ def test_get_table_value():
 
 def test_get_table_value_empty():
     lookup = load_lookup(f"{fixtures_path}/lookup.csv")
-    assert get_table_value(lookup, column_name('Col1'), 'val10', column_name('Col4')) is None
-    assert get_table_value(lookup, column_name('Col2'), 'val22', column_name('Col1')) is None
+    assert get_table_value(lookup, column_name('Col1'), 'val10', column_name('Col4'), default_value=None) is None
+    assert get_table_value(lookup, column_name('Col2'), 'val22', column_name('Col1')) == ''
 
     lookup = download_lookup('crop.csv')
-    assert get_table_value(lookup, 'termid', 'genericCropSeed', column_name('Plantation_density')) is None
+    assert get_table_value(lookup, 'termid', 'genericCropSeed', column_name('Plantation_density')) == ''
 
 
 def test_find_term_ids_by():
@@ -83,7 +83,7 @@ def test_download_lookup_without_index():
 def test_handle_missing_float_value():
     filename = 'measurement.csv'
     lookup = download_lookup(filename)
-    assert get_table_value(lookup, 'termid', 'rainfallPeriod', 'maximum') is None
+    assert get_table_value(lookup, 'termid', 'rainfallPeriod', 'maximum') == ''
 
 
 def test_handle_missing_string_value():
@@ -148,3 +148,16 @@ def test_lookup_term_ids():
 
 def test_lookup_columns():
     assert 'termid' in lookup_columns(download_lookup('crop.csv'))
+
+
+def test_get_data_advanced():
+    lookup = download_lookup('liveAnimal.csv')
+    value = get_table_value(lookup, 'termid', 'sheepRam', column_name('ratioCPregnancyNetEnergyPregnancyIpcc2019'))
+    assert value == ''
+
+
+def test_grouping_with_comma():
+    lookup = download_lookup('animalProduct.csv')
+    term_id = 'meatChickenReadyToCookWeight'
+    value = get_table_value(lookup, 'termid', term_id, column_name('animalProductGroupingFAO'))
+    assert value == 'Meat of chickens, fresh or chilled'

hestia_earth_utils-0.16.2/hestia_earth/utils/version.py

@@ -1 +0,0 @@
-VERSION = '0.16.2'