Patch Release V1.0.21

CHANGELOG.md

@@ -26,6 +26,14 @@ and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 -->
 -----
+## [1.0.21](https://github.com/asfadmin/Discovery-SearchAPI-v3/compare/v1.0.20...v1.0.21)
+### Changed
+- bump asf-search to v14.0.1
+    - `SMAP` product type aliases
+    - `collectionName` and `conceptID` to general jsonlite output
+### Fixed
+- boolean keywords (`jointObservation`, `collectionAlias`) are parsed from strings, so `false` is no longer treated as true
+-----
 ## [1.0.20](https://github.com/asfadmin/Discovery-SearchAPI-v3/compare/v1.0.19...v1.0.20)
 ### Changed
 - bump asf-search to v14.0.0

requirements.txt

@@ -22,7 +22,7 @@ ujson==5.7.0
 uvicorn==0.21.1
 watchfiles==0.19.0
 
-asf-search[asf-enumeration]==14.0.0
+asf-search[asf-enumeration]==14.0.1
 python-json-logger==2.0.7
 
 pyshp==2.1.3

src/SearchAPI/application/asf_opts.py

@@ -59,6 +59,16 @@ def string_to_num_or_range_list(v: Union[str, list]):
     return v_list
 
 
+def string_to_bool(v: Union[str, bool]) -> bool:
+    if not isinstance(v, str):
+        return bool(v)
+    if v.lower() == "true":
+        return True
+    if v.lower() == "false":
+        return False
+    raise ValueError(f"Invalid boolean: {v}")
+
+
 string_to_obj_map = {
     # Range only:
     asf.validators.parse_date_range: string_to_range,
@@ -75,6 +85,8 @@ def string_to_num_or_range_list(v: Union[str, list]):
     # Number or Range-list:
     asf.validators.parse_int_or_range_list: string_to_num_or_range_list,
     asf.validators.parse_float_or_range_list: string_to_num_or_range_list,
+    # Boolean only:
+    bool: string_to_bool,
 }
 
 

tests/unit/test_asf_opts.py

@@ -0,0 +1,26 @@
+import pytest
+from fastapi import HTTPException
+
+from SearchAPI.application.asf_opts import get_asf_opts, string_to_bool
+
+
+def test_string_to_bool():
+    assert string_to_bool('true') is True
+    assert string_to_bool('False') is False
+    assert string_to_bool(True) is True
+
+    with pytest.raises(ValueError):
+        string_to_bool('asdf')
+
+
+def test_bool_keywords_from_strings():
+    assert get_asf_opts({'jointObservation': 'true'}).jointObservation is True
+    assert get_asf_opts({'jointObservation': 'false'}).jointObservation is False
+    assert get_asf_opts({'collectionAlias': 'false'}).collectionAlias is False
+
+
+def test_invalid_bool_keyword_is_400():
+    with pytest.raises(HTTPException) as exc:
+        get_asf_opts({'jointObservation': 'asdf'})
+
+    assert exc.value.status_code == 400

tests/yml_tests/test_URLs.yml

@@ -306,6 +306,14 @@ tests:
     expected file: count
     expected code: 200
 
+- jointObservation false count:
+    dataset: NISAR
+    jointObservation: "false"
+    output: count
+
+    expected file: count
+    expected code: 200
+
 - flightDirection A:
     flightDirection: A
     maxresults: 10

tests/yml_tests/test_URLs_expected_400.yml

@@ -20,6 +20,14 @@ tests:
     expected file: error json
     expected code: 400
 
+- jointObservation invalid bool:
+    jointObservation: asdf
+    dataset: NISAR
+    output: count
+
+    expected file: error json
+    expected code: 400
+
 - blank keyword invalid:
     platform: null
     output: csv