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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hestia_earth_utils
-Version: 0.16.2
+Version: 0.16.3
 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.3}/hestia_earth/utils/lookup.py

@@ -142,7 +142,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 +158,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 +172,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.3/hestia_earth/utils/version.py

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

{hestia_earth_utils-0.16.2 → hestia_earth_utils-0.16.3/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.3
 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.3}/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,9 @@ 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 == ''

hestia_earth_utils-0.16.2/hestia_earth/utils/version.py

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