Merge pull request #545 from d-giles/casefix

Updated SIA up-casing behavior

CHANGES.rst

@@ -23,9 +23,10 @@ Enhancements and Fixes
   them. [#517]
 
 - Introducing the new MIVOT module, enabling processed VOTable data mapped to
-  any model serialized in VO-DML. This package dynamically generates python objects 
+  any model serialized in VO-DML. This package dynamically generates python objects
   whose structure corresponds to the classes of the mapped models. [#497]
 
+
 Deprecations and Removals
 -------------------------
 
@@ -39,6 +40,8 @@ Bug Fixes
 - Avoid Astropy Time error for SIAResult.dateobs when
   VOX:Image_MJDateObs or ssa:DataID.Date is nan. [#550]
 
+- More robust handling of SIA1 FORMAT [#545]
+
 
 1.5.1 (2024-02-21)
 ==================

pyvo/dal/sia.py

@@ -506,10 +506,18 @@ def format(self):
     def format(self, format_):
         setattr(self, "_format", format_)
 
-        if isinstance(format_, (str, bytes)):
-            format_ = [format_]
-
-        self["FORMAT"] = ",".join(_.upper() for _ in format_)
+        if not isinstance(format_, list):
+            format_ = format_.split(',')
+        normalized_formats = []
+        for user_input in format_:
+            if user_input.upper() in ['ALL', 'METADATA', 'GRAPHIC', 'GRAPHIC-ALL']:
+                normalized_formats.append(user_input.upper())
+            elif user_input.split('-')[0].upper() == 'GRAPHIC':
+                normalized_formats.append(user_input.split('-')[0].upper()+"-"+user_input.split('-')[1])
+            else:
+                normalized_formats.append(user_input)
+
+        self["FORMAT"] = ",".join(normalized_formats)
 
     @format.deleter
     def format(self):

pyvo/dal/tests/test_sia.py

@@ -8,7 +8,7 @@
 
 import pytest
 
-from pyvo.dal.sia import search, SIAService
+from pyvo.dal.sia import search, SIAService, SIAQuery
 
 from astropy.io.fits import HDUList
 from astropy.coordinates import SkyCoord
@@ -47,8 +47,9 @@ def _test_result(result):
 @pytest.mark.usefixtures('register_mocks')
 @pytest.mark.filterwarnings("ignore::astropy.io.votable.exceptions.W06")
 @pytest.mark.parametrize("position", ((288, 15), SkyCoord(288, 15, unit="deg")))
-def test_search(position):
-    results = search('http://example.com/sia', pos=position)
+@pytest.mark.parametrize("format", ("IMAGE/JPEG", "all"))
+def test_search(position, format):
+    results = search('http://example.com/sia', pos=position, format=format)
     result = results[0]
 
     _test_result(result)
@@ -73,3 +74,19 @@ def test_search(self):
         _test_result(result)
 
         assert results[1].dateobs is None
+
+    @pytest.mark.usefixtures('sia')
+    @pytest.mark.usefixtures('register_mocks')
+    @pytest.mark.filterwarnings("ignore::astropy.io.votable.exceptions.W06")
+    @pytest.mark.filterwarnings("ignore::astropy.io.votable.exceptions.W42")
+    @pytest.mark.filterwarnings("ignore::astropy.io.votable.exceptions.W49")
+    def test_formatter(self):
+        service = SIAQuery('http://example.com/sia')
+        service.format = "image"
+        assert service["FORMAT"] == "image"
+        service.format = "all"
+        assert service["FORMAT"] == "ALL"
+        service.format = "Graphic-png"
+        assert service["FORMAT"] == "GRAPHIC-png"
+        service.format = "Unsupported"
+        assert service["FORMAT"] == "Unsupported"