sparclclient 1.2.5b1__tar.gz → 1.2.6b1__tar.gz

{sparclclient-1.2.5b1 → sparclclient-1.2.6b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sparclclient
-Version: 1.2.5b1
+Version: 1.2.6b1
 Summary: A client for getting spectra and meta-data from NOIRLab.
 Author-email: "S. Pothier" <datalab-spectro@noirlab.edu>
 Description-Content-Type: text/markdown

{sparclclient-1.2.5b1 → sparclclient-1.2.6b1}/sparcl/__init__.py

@@ -34,4 +34,5 @@ __all__ = ["client", "align_records"]
 #__version__ = "1.2.2"
 #__version__ = "1.2.3"
 #__version__ = "1.2.4"
-__version__ = "1.2.5b1"
+#__version__ = "1.2.5"
+__version__ = "1.2.6b1"

{sparclclient-1.2.5b1 → sparclclient-1.2.6b1}/sparcl/client.py

@@ -159,6 +159,9 @@ class SparclClient:  # was SparclApi()
             wait for server to send a response. Generally time to
             wait for first byte. Defaults to 5400.
 
+        announcement (:obj:`bool`, optional): SPARCL announcements.
+            Defaults to True.
+
     Example:
         >>> client = SparclClient()
 
@@ -179,6 +182,7 @@ class SparclClient:  # was SparclApi()
         show_curl=False,
         connect_timeout=1.1,  # seconds
         read_timeout=90 * 60,  # seconds
+        announcement=True,
     ):
         """Create client instance."""
         session = requests.Session()
@@ -203,6 +207,7 @@ class SparclClient:  # was SparclApi()
         # (connect timeout, read timeout) in seconds
         self.timeout = (self.c_timeout, self.r_timeout)
         # @@@ read timeout should be a function of the POST payload size
+        self.announcement = f"{self.rooturl}/sparc/announcement/"
 
         if verbose:
             print(f"apiurl={self.apiurl}")
@@ -948,9 +953,9 @@ class SparclClient:  # was SparclApi()
                 "spectra/sec)"
             )
             print(f'{meta["status"]}')
-        
-        # Format/consolodate the server messages to one message with the count of missing
-        # files
+
+        # Format/consolodate the server messages to one message with
+        # the count of missing files
         if len(meta["status"].get("warnings", [])) > 0:
             warnings = meta["status"].get("warnings")
             if verbose:

{sparclclient-1.2.5b1 → sparclclient-1.2.6b1}/tests/expected_pat.py

@@ -98,30 +98,33 @@ authorized_1 = {
 
 authorized_2 = {
     "Loggedin_As": "test_user_2@noirlab.edu",
-    "Authorized_Datasets": {"BOSS-DR16", "DESI-EDR", "SDSS-DR16"},
+    "Authorized_Datasets": {"BOSS-DR16", "DESI-DR1", "DESI-EDR", "SDSS-DR16"},
 }
 
 authorized_3 = {
     "Loggedin_As": "Anonymous",
-    "Authorized_Datasets": {"BOSS-DR16", "DESI-EDR", "SDSS-DR16"},
+    "Authorized_Datasets": {"BOSS-DR16", "DESI-DR1", "DESI-EDR", "SDSS-DR16"},
 }
 
 # Private and Public
 pub_1 = ["BOSS-DR16"]
-pub_all = ["BOSS-DR16", "DESI-EDR", "SDSS-DR16"]
-priv = ["DESI-DR1", "SDSS-DR17-test", "BOSS-DR17", "SDSS-DR17"]
+pub_all = ["BOSS-DR16", "DESI-DR1", "DESI-EDR", "SDSS-DR16"]
+priv = ["SDSS-DR17-test", "BOSS-DR17", "SDSS-DR17"]
 all_all = pub_all + priv
 all_all.sort()
 privpub1 = [pub_all[0], priv[0]]
 unauth = "test_user_2@noirlab.edu"
-#
-auth_find_1 = privpub1
-auth_find_2 = ['DESI-DR1', 'DESI-EDR']
+msg = "Find Results: 1000 records"
+# OLD as of July 9, 2025
+#auth_find_1 = privpub1
+#auth_find_2 = ['DESI-DR1', 'DESI-EDR']
+auth_find_1 = auth_find_2 = auth_find_4 = auth_find_6 = msg
 auth_find_3 = auth_retrieve_3 = (f"[DSDENIED] uname='{unauth}' is declined "
                                  f"access to datasets={[priv[0]]}; "
                                  f"drs_requested={privpub1} "
                                  f"my_auth={pub_all}")
-auth_find_4 = auth_find_6 = pub_all
+# OLD as of July 9, 2025
+#auth_find_4 = auth_find_6 = pub_all
 auth_find_5 = auth_retrieve_6 = ("[DSDENIED] uname='ANONYMOUS' is declined "
                                  f"access to datasets={[priv[0]]}; "
                                  f"drs_requested={privpub1} "

{sparclclient-1.2.5b1 → sparclclient-1.2.6b1}/tests/tests_api.py

@@ -296,11 +296,9 @@ class SparclClientTest(unittest.TestCase):
 
     def test_retrieve_0(self):
         """Get spectra using small list of SPECIDS."""
-        drs = ["SDSS-DR16", "BOSS-DR16", "DESI-EDR"]
         res = self.client.retrieve_by_specid(
             self.specid_list0,
-            include=["sparcl_id", "specid", "flux"],
-            dataset_list=drs,
+            include=["sparcl_id", "specid", "flux"]
         )
         actual = sorted(res.records[0].keys())
         if showact:
@@ -312,10 +310,9 @@ class SparclClientTest(unittest.TestCase):
         """Get spectra using small list of uuids."""
         name = "retrieve_0b"
         uuids = self.uuid_list0
-        drs = ["SDSS-DR16", "BOSS-DR16", "DESI-EDR"]
 
         tic()
-        res = self.client.retrieve(uuids, dataset_list=drs)
+        res = self.client.retrieve(uuids)
         self.timing[name] = toc()
         actual = sorted(res.records[0].keys())
 
@@ -356,11 +353,9 @@ class SparclClientTest(unittest.TestCase):
 
     def test_retrieve_5(self):
         """Limit number of records returned by retrieve_by_specid."""
-        drs = ["SDSS-DR16", "BOSS-DR16", "DESI-EDR"]
         res = self.client.retrieve_by_specid(
             self.specid_list5,
             include=["specid", "ivar"],
-            dataset_list=drs,
             limit=2,
         )
         actual = len(res.records)
@@ -485,8 +480,7 @@ class SparclClientTest(unittest.TestCase):
         ids = self.uuid_list2
 
         tic()
-        drs = ["SDSS-DR16", "BOSS-DR16", "DESI-EDR"]
-        res = self.client.retrieve(ids, dataset_list=drs)
+        res = self.client.retrieve(ids)
         self.timing[name] = toc()
         res_reorder = res.reorder(ids)
         actual = [f["sparcl_id"] for f in res_reorder.records]
@@ -500,8 +494,7 @@ class SparclClientTest(unittest.TestCase):
         specids = self.specid_list2
 
         tic()
-        drs = ["SDSS-DR16", "BOSS-DR16", "DESI-EDR"]
-        res = self.client.retrieve_by_specid(specids, dataset_list=drs)
+        res = self.client.retrieve_by_specid(specids)
         self.timing[name] = toc()
         res_reorder = res.reorder(specids)
         actual = [f["specid"] for f in res_reorder.records]
@@ -516,9 +509,8 @@ class SparclClientTest(unittest.TestCase):
         ids = self.uuid_list3
 
         tic()
-        drs = ["SDSS-DR16", "BOSS-DR16", "DESI-EDR"]
         with self.assertWarns(Warning):
-            res = self.client.retrieve(ids, dataset_list=drs)
+            res = self.client.retrieve(ids)
         self.timing[name] = toc()
         with self.assertWarns(Warning):
             res_reorder = res.reorder(ids)
@@ -534,8 +526,7 @@ class SparclClientTest(unittest.TestCase):
         specids = self.specid_list3
 
         tic()
-        drs = ["SDSS-DR16", "BOSS-DR16", "DESI-EDR"]
-        res = self.client.retrieve_by_specid(specids, dataset_list=drs)
+        res = self.client.retrieve_by_specid(specids)
         self.timing[name] = toc()
         with self.assertWarns(Warning):
             res_reorder = res.reorder(specids)
@@ -554,8 +545,7 @@ class SparclClientTest(unittest.TestCase):
         og_ids = []
 
         tic()
-        drs = ["SDSS-DR16", "BOSS-DR16", "DESI-EDR"]
-        res = self.client.retrieve(ids, dataset_list=drs)
+        res = self.client.retrieve(ids)
         self.timing[name] = toc()
         with self.assertRaises(ex.NoIDs):
             res.reorder(og_ids)
@@ -568,8 +558,7 @@ class SparclClientTest(unittest.TestCase):
         og_specids = []
 
         tic()
-        drs = ["SDSS-DR16", "BOSS-DR16", "DESI-EDR"]
-        res = self.client.retrieve_by_specid(specids, dataset_list=drs)
+        res = self.client.retrieve_by_specid(specids)
         self.timing[name] = toc()
         with self.assertRaises(ex.NoIDs):
             res.reorder(og_specids)
@@ -756,8 +745,8 @@ class AuthTest(unittest.TestCase):
         cls.unauth_user = "test_user_2@noirlab.edu"
 
         # Dataset lists
-        cls.Pub = ["BOSS-DR16", "DESI-EDR", "SDSS-DR16"]
-        cls.Priv = ["DESI-DR1", "SDSS-DR17-test", "BOSS-DR17", "SDSS-DR17"]
+        cls.Pub = ["BOSS-DR16", "DESI-DR1", "DESI-EDR", "SDSS-DR16"]
+        cls.Priv = ["SDSS-DR17-test", "BOSS-DR17", "SDSS-DR17"]
         cls.PrivPub = cls.Priv + cls.Pub
         cls.PrivPub.sort()
         cls.PrivPub1 = [cls.Priv[0], cls.Pub[0]]
@@ -921,7 +910,7 @@ class AuthTest(unittest.TestCase):
             print(f"authorized_3: actual={actual}")
         self.assertEqual(actual, exp.authorized_3, msg="Actual to Expected")
 
-    def auth_find(self, user, drs, expvar, cons={}, limit=21000):
+    def auth_find(self, user, drs, expvar, cons={}, limit=1000):
         expected = eval(expvar)  # e.g. 'ep.retrieve_N'
         #!print(f'{expvar}: {user=} {drs=} ')
         self.silent_login(user, usrpw)
@@ -943,7 +932,8 @@ class AuthTest(unittest.TestCase):
             #!if showact:
             #!    print(f"{expvar}: {found.records=}")
 
-            actual = sorted(set([r._dr for r in found.records]))
+            #actual = sorted(set([r._dr for r in found.records]))
+            actual = str(found)
         except Exception as err:
             actual = str(err)
         finally: