fix: add uploadlimit from capabilities rather than hardcoding it

Author: ManonMarchand

astroquery/simbad/core.py

@@ -108,6 +108,7 @@ def __init__(self, ROW_LIMIT=None):
         self._server = conf.server
         self._tap = None
         self._hardlimit = None
+        self._uploadlimit = None
         # attributes to construct ADQL queries
         self._columns_in_output = None  # a list of _Column
         self.joins = []  # a list of _Join
@@ -166,6 +167,12 @@ def hardlimit(self):
             self._hardlimit = self.tap.hardlimit
         return self._hardlimit
 
+    @property
+    def uploadlimit(self):
+        if self._uploadlimit is None:
+            self._uploadlimit = self.tap.get_tap_capability().uploadlimit.hard.content
+        return self._uploadlimit
+
     @property
     def columns_in_output(self):
         """A list of _Column.
@@ -780,9 +787,9 @@ def query_region(self, coordinates, radius=2*u.arcmin, *,
 
         # from uploadLimit in SIMBAD's capabilities
         # http://simbad.cds.unistra.fr/simbad/sim-tap/capabilities
-        if len(center) > 200000:
-            raise ValueError("'query_region' can process up to 200000 centers. For "
-                             "larger queries, split your centers list.")
+        if len(center) > self.uploadlimit:
+            raise ValueError(f"'query_region' can process up to {self.uploadlimit} "
+                             "centers. For larger queries, split your centers list.")
 
         # `radius` as `str` is iterable, but contains only one value.
         if isiterable(radius) and not isinstance(radius, str):

astroquery/simbad/tests/test_simbad.py

@@ -33,6 +33,7 @@ def _mock_simbad_class(monkeypatch):
     # >>> options = Simbad.list_votable_fields()
     # >>> options.write("simbad_output_options.xml", format="votable")
     monkeypatch.setattr(simbad.SimbadClass, "hardlimit", 2000000)
+    monkeypatch.setattr(simbad.SimbadClass, "uploadlimit", 200000)
     monkeypatch.setattr(simbad.SimbadClass, "list_votable_fields", lambda self: table)
 
 
@@ -151,6 +152,8 @@ def test_mocked_simbad():
     assert len(options) >= 115
     # this mocks the hardlimit
     assert simbad_instance.hardlimit == 2000000
+    # and the uploadlimit
+    assert simbad_instance.uploadlimit == 200000
 
 # ----------------------------
 # Test output options settings