Merge pull request astropy#669 from chmmao/sia2_standardid

[Issue 668] [SIA2 service] check existence of standardid

Author: bsipocz

CHANGES.rst

@@ -17,6 +17,9 @@ Enhancements and Fixes
 - Correctly delete jobs in ``TAPService.run_async`` even when the server returns an
   error [#667]
 
+- Fixed AttributeError when a capability has None standardID in SIA2Service. [#669]
+
+
 Deprecations and Removals
 -------------------------
 

pyvo/dal/sia2.py

@@ -186,7 +186,7 @@ def __init__(self, baseurl, *, capability_description=None, session=None, check_
                 # assumes that the access URL is the same regardless of the
                 # authentication method except BasicAA which is not supported
                 # in pyvo. So pick any access url as long as it's not
-                if cap.standardid.lower() == SIA2_STANDARD_ID.lower():
+                if cap.standardid and cap.standardid.lower() == SIA2_STANDARD_ID.lower():
                     for interface in cap.interfaces:
                         if interface.accessurls and \
                                 not (len(interface.securitymethods) == 1

pyvo/dal/tests/test_sia2.py

@@ -213,3 +213,32 @@ def test_variable_deprecation():
     with pytest.warns(AstropyDeprecationWarning):
         from pyvo.dal.sia2 import SIA_PARAMETERS_DESC
         assert SIA_PARAMETERS_DESC
+
+
+def test_none_standardid_capability():
+    """Test that SIA2Service handles capabilities with None standardID."""
+    from pyvo.dal.sia2 import SIA2Service
+    import requests_mock
+    # Mock a capabilities response with a None standardID
+    with requests_mock.Mocker() as m:
+        # Mock the capabilities endpoint
+        m.get('http://example.com/sia/capabilities',
+              content=b'''<?xml version="1.0" encoding="UTF-8"?>
+<vosi:capabilities xmlns:vosi="http://www.ivoa.net/xml/VOSICapabilities/v1.0">
+  <capability>
+    <!-- This capability has no standardID attribute -->
+    <interface>
+      <accessURL use="full">http://example.com/sia/query</accessURL>
+    </interface>
+  </capability>
+  <capability standardID="ivo://ivoa.net/std/SIA#query-2.0">
+    <interface>
+      <accessURL use="full">http://example.com/sia/query</accessURL>
+    </interface>
+  </capability>
+</vosi:capabilities>''')
+        # This should not raise an AttributeError
+        sia2_service = SIA2Service('http://example.com/sia')
+        # Basic verification that the service was created successfully
+        assert sia2_service is not None
+        assert sia2_service.query_ep is not None