sparclclient 1.2.2b9__tar.gz → 1.2.2b11__tar.gz

{sparclclient-1.2.2b9 → sparclclient-1.2.2b11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sparclclient
-Version: 1.2.2b9
+Version: 1.2.2b11
 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.2b9 → sparclclient-1.2.2b11}/sparcl/__init__.py

@@ -31,4 +31,4 @@ __all__ = ["client", "align_records"]
 # __version__ = "1.2.1b3"
 # __version__ = "1.2.1"
 # FIRST uncommented value will be used! (so only leave one uncommented)
-__version__ = "1.2.2b9"
+__version__ = "1.2.2b11"

{sparclclient-1.2.2b9 → sparclclient-1.2.2b11}/sparcl/client.py

@@ -163,7 +163,7 @@ class SparclClient:  # was SparclApi()
 
     """
 
-    KNOWN_GOOD_API_VERSION = 11.0  # @@@ Change when Server version incremented
+    KNOWN_GOOD_API_VERSION = 12.0  # @@@ Change when Server version incremented
 
     def __init__(
         self,
@@ -468,7 +468,7 @@ class SparclClient:  # was SparclApi()
         Example:
             >>> client = SparclClient()
             >>> client.version
-            11.0
+            12.0
         """
 
         if self.apiversion is None:
@@ -658,7 +658,7 @@ class SparclClient:  # was SparclApi()
             are NOT stored in the SPARCL database.
 
         Example:
-            >>> client = SparclClient(url=_DEV)
+            >>> client = SparclClient()
             >>> found = client.find(outfields=['specid'], limit=2)
             >>> specids = [f.specid for f in found.records]
             >>> client.missing_specids(specids + ['bad_id'])

sparclclient-1.2.2b11/tests/expected_pat.py

@@ -0,0 +1,121 @@
+# For running client against PAT host
+# See also: expected_dev1.py   (SP DEV)
+
+all_fields = [
+    "data_release",
+    "datasetgroup",
+    "dateobs",
+    "dateobs_center",
+    "dec",
+    "exptime",
+    "flux",
+    "instrument",
+    "ivar",
+    "mask",
+    "model",
+    "ra",
+    "redshift",
+    "redshift_err",
+    "redshift_warning",
+    "site",
+    "sparcl_id",
+    "specid",
+    "specprimary",
+    "spectype",
+    "survey",
+    "targetid",
+    "telescope",
+    "wave_sigma",
+    "wavelength",
+    "wavemax",
+    "wavemin",
+]
+
+
+default_fields = ["dec", "flux", "ra", "sparcl_id", "specid", "wavelength"]
+
+retrieve_0 = ["_dr", "flux", "sparcl_id", "specid"]
+
+retrieve_0b = ["_dr", "dec", "flux", "ra", "sparcl_id", "specid", "wavelength"]
+
+retrieve_5 = 2
+
+find_0 = [
+    {
+        "_dr": "BOSS-DR16",
+        "data_release": "BOSS-DR16",
+        "specid": -6444532452352045056,
+    }
+]
+
+find_1 = [
+    {
+        "_dr": "SDSS-DR16",
+        "data_release": "SDSS-DR16",
+        "specid": 1506454396622366720,
+    }
+]
+
+find_2 = 936894  # PAT
+
+find_3 = [
+    {"_dr": "BOSS-DR16", "data_release": "BOSS-DR16"},
+    {"_dr": "DESI-EDR", "data_release": "DESI-EDR"},
+    {"_dr": "SDSS-DR16", "data_release": "SDSS-DR16"},
+]
+
+find_4 = 36
+
+find_5a = [
+    {"_dr": "BOSS-DR16", "data_release": "BOSS-DR16", "mjd": 55689},
+    {"_dr": "SDSS-DR16", "data_release": "SDSS-DR16", "mjd": 54763},
+]
+
+find_5d = []
+
+authorized_1 = {
+    "Loggedin_As": "test_user_1@noirlab.edu",
+    "Authorized_Datasets": {
+        "BOSS-DR16",
+        "DESI-EDR",
+        "SDSS-DR16",
+        "SDSS-DR17-test",
+    },
+}
+
+authorized_2 = {
+    "Loggedin_As": "test_user_2@noirlab.edu",
+    "Authorized_Datasets": {"BOSS-DR16", "DESI-EDR", "SDSS-DR16"},
+}
+
+authorized_3 = {
+    "Loggedin_As": "Anonymous",
+    "Authorized_Datasets": {"BOSS-DR16", "DESI-EDR", "SDSS-DR16"},
+}
+
+# Private and Public
+pub_1 = ["BOSS-DR16"]
+pub_all = ["BOSS-DR16", "DESI-EDR", "SDSS-DR16"]
+priv = ["SDSS-DR17-test"]
+unauth = "test_user_2@noirlab.edu"
+#
+auth_find_1 = auth_find_2 = pub_all + priv
+# OLD as of July 9, 2024
+#auth_find_3 = f"[DSDENIED] {unauth} is declined access to datasets {priv}"
+auth_find_3 = auth_retrieve_3 = (f"[DSDENIED] uname='{unauth}' is declined "
+                                 f"access to datasets={priv}; "
+                                 f"drs_requested={pub_all + priv} "
+                                 f"my_auth={pub_all}")
+auth_find_4 = auth_find_6 = pub_all
+# OLD as of July 9, 2024
+#auth_find_5 = f"[DSDENIED] ANONYMOUS is declined access to datasets {priv}"
+auth_find_5 = auth_retrieve_6 = ("[DSDENIED] uname='ANONYMOUS' is declined "
+                                 f"access to datasets={priv}; "
+                                 f"drs_requested={pub_all + priv} "
+                                 f"my_auth={pub_all}")
+auth_retrieve_1 = auth_retrieve_2 = pub_1 + priv
+# OLD as of July 9, 2024
+#auth_retrieve_3 = f"[DSDENIED] {unauth} is declined access to datasets {priv}"
+auth_retrieve_4 = auth_retrieve_5 = auth_retrieve_7 = auth_retrieve_8 = pub_1
+# OLD as of July 9, 2024
+#auth_retrieve_6 = f"[DSDENIED] ANONYMOUS is declined access to datasets {priv}"  # noqa: E501

{sparclclient-1.2.2b9 → sparclclient-1.2.2b11}/tests/tests_api.py

@@ -61,8 +61,7 @@ import warnings
 
 # Local Packages
 from tests.utils import tic, toc
-import tests.expected_pat as exp_pat
-import tests.expected_dev1 as exp_dev
+import tests.expected_pat as exp
 import sparcl.exceptions as ex
 import sparcl.gather_2d as sg
 import sparcl.client
@@ -81,31 +80,20 @@ _STAGE = "https://sparclstage.datalab.noirlab.edu"  # noqa: E221
 _PROD = "https://astrosparcl.datalab.noirlab.edu"  # noqa: E221
 
 serverurl = os.environ.get("serverurl", _PROD)
-#!DEV_SERVERS = [_DEV1,]
-DEV_SERVERS = []
-
-if serverurl in DEV_SERVERS:
-    exp = exp_dev
-else:
-    exp = exp_pat
-
 showact = False
 showact = showact or os.environ.get("showact") == "1"
-
 showcurl = False
 showcurl = showcurl or os.environ.get("showcurl") == "1"
-
 clverb = False
 clverb = clverb or os.environ.get("clverb") == "1"
-
 showall = False
 showall = showall or os.environ.get("showall") == "1"
 if showall:
     showact = showcurl = clverb = True
 
-usrpw = os.environ.get("usrpw")
+usrpw = os.environ.get("usrpw")  # password for test users
+show_run_context = True  # Print message about parameters of this test run
 
-show_run_context = True
 
 @contextmanager
 def streamhandler_to_console(lggr):
@@ -134,14 +122,37 @@ def testcase_log_console(lggr):
 def load_tests(loader, tests, ignore):
     import doctest
 
-    print(f"Arranging to run doctests against: sparcl.client")
-    tests.addTests(doctest.DocTestSuite(sparcl.client))
+    if serverurl == _PROD:
+        print(f"Arranging to run doctests against: sparcl.client")
+        tests.addTests(doctest.DocTestSuite(sparcl.client))
+
+        print(f"Arranging to run doctests against: sparcl.gather_2d")
+        tests.addTests(doctest.DocTestSuite(sparcl.gather_2d))
+    else:
+        print(
+            "Not running doctests since you are not running client"
+            " against the PRODUCTION server."
+        )
 
-    print(f"Arranging to run doctests against: sparcl.gather_2d")
-    tests.addTests(doctest.DocTestSuite(sparcl.gather_2d))
     return tests
 
 
+def print_run_context(cls):
+    print(
+        f"""
+    Running Client Tests
+      against Server: \t"{urlparse(serverurl).netloc}"
+      comparing to: \t{exp.__name__}
+      {showact=}
+      {showcurl=}
+      client={cls.client}
+
+    For REPRODUCIBLE RESULTS rebuild Server DB before running tests!
+    Use: init-db.sh
+    """
+    )
+
+
 class SparclClientTest(unittest.TestCase):
     """Test access to each endpoint of the Server API"""
 
@@ -172,14 +183,7 @@ class SparclClientTest(unittest.TestCase):
         global show_run_context
 
         if show_run_context:
-            print(
-                f"Running Client Tests\n"
-                f'  against Server: "{urlparse(serverurl).netloc}"\n'
-                f"  comparing to: {exp.__name__}\n"
-                f"  showact={showact}\n"
-                f"  showcurl={showcurl}\n"
-                f"  client={cls.client}\n"
-            )
+            print_run_context(cls)
             show_run_context = False
 
         # Get some id_lists to use in tests
@@ -354,8 +358,10 @@ class SparclClientTest(unittest.TestCase):
         """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
+            self.specid_list5,
+            include=["specid", "ivar"],
+            dataset_list=drs,
+            limit=2,
         )
         actual = len(res.records)
         if showact:
@@ -367,31 +373,27 @@ class SparclClientTest(unittest.TestCase):
         """Get metadata using search spec."""
 
         outfields = ["data_release", "specid"]
-        # from list(FitsRecord.objects.all().values('ra','dec'))
-
         # To get suitable constraints (in sparc-shell on Server):
-        #   sorted(FitsRecord.objects.all().values('ra','dec'),
-        #          key=lambda r: r['dec'])
-        #if serverurl in DEV_SERVERS:
-        #    !constraints = {"ra": [246.0, 247.0], "dec": [+34.7, +34.8]}
-        #    constraints = {"ra": [194.0, 195.0], "dec": [+27.5, +27.6]}
-        #else:
-        #    constraints = {"ra": [340.0, 341.0], "dec": [+3.0, +4.0]}
-        constraints = {"ra": [134.288, 134.291], "dec": [+28.34, +28.351]}
+        #    list(FitsRecord.objects.all().values('ra','dec'))
+        constraints = {"ra": [132.1, 132.2], "dec": [+28.0, +28.1]}
         found = self.client.find(outfields, constraints=constraints, limit=3)
         actual = found.records[:2]
         if showact:
             print(f"find_0: actual={pf(actual[:2])}")
         self.assertEqual(actual, exp.find_0, msg="Actual to Expected")
 
+    @skip("fiddly bit skipped until we use factoryboy")
     def test_find_1(self):
         """Get metadata using search spec."""
         outfields = ["data_release", "specid"]
-        constraints = ({"redshift": [0.191, 0.192],
-                        "exptime": [2100.2, 2100.31],
-                        "data_release": ['SDSS-DR16']})
-        found = self.client.find(outfields, constraints=constraints,
-                                 limit=1, sort="specid")  # @@@
+        constraints = {
+            "redshift": [0.191, 0.192],
+            "exptime": [2100.2, 2100.31],
+            "data_release": ["SDSS-DR16"],
+        }
+        found = self.client.find(
+            outfields, constraints=constraints, limit=1, sort="specid"
+        )  # @@@
         actual = sorted(found.records, key=lambda rec: rec["specid"])
         if showact:
             print(f"find_1: actual={pf(actual)}")
@@ -523,7 +525,7 @@ class SparclClientTest(unittest.TestCase):
         actual = [f["sparcl_id"] for f in res_reorder.records]
         if showact:
             print(f"reorder_2a: actual={pf(actual)}")
-        self.assertEqual(actual, ids[:2] + ['None'], msg="Actual to Expected")
+        self.assertEqual(actual, ids[:2] + ["None"], msg="Actual to Expected")
 
     def test_reorder_2b(self):
         """Reorder records when specid is missing from database, after
@@ -540,8 +542,9 @@ class SparclClientTest(unittest.TestCase):
         actual = [f["specid"] for f in res_reorder.records]
         if showact:
             print(f"reorder_2b: actual={pf(actual)}")
-        self.assertEqual(actual, specids[:2] + [None],
-                         msg="Actual to Expected")
+        self.assertEqual(
+            actual, specids[:2] + [None], msg="Actual to Expected"
+        )
 
     def test_reorder_3a(self):
         """Test for expected Exception when a list of sparcl_ids with
@@ -742,14 +745,7 @@ class AuthTest(unittest.TestCase):
         global show_run_context
 
         if show_run_context:
-            print(
-                f"Running Client Tests\n"
-                f'  against Server: "{urlparse(serverurl).netloc}"\n'
-                f"  comparing to: {exp.__name__}\n"
-                f"  showact={showact}\n"
-                f"  showcurl={showcurl}\n"
-                f"  client={cls.client}\n"
-            )
+            print_run_context(cls)
             show_run_context = False
 
         cls.outflds = ["sparcl_id", "data_release"]
@@ -781,18 +777,18 @@ class AuthTest(unittest.TestCase):
                 sort="sparcl_id",
             )
         ).ids
-        #cls.uuid_pub = (  # cls.uuid_sdssdr16
+        # cls.uuid_pub = (  # cls.uuid_sdssdr16
         #    cls.client.find(
         #        outfields=out,
         #        constraints={"data_release": cls.Pub},
         #        limit=2,
         #        sort="sparcl_id",
         #    )
-        #).ids
+        # ).ids
         cls.uuid_pub = (
             cls.client.find(
                 outfields=out,
-                constraints={"data_release": ['BOSS-DR16']},
+                constraints={"data_release": ["BOSS-DR16"]},
                 limit=2,
                 sort="sparcl_id",
             )
@@ -823,7 +819,6 @@ class AuthTest(unittest.TestCase):
     def tearDownClass(cls):
         pass
 
-
     # curl -X 'POST' \
     #   'http://localhost:8050/sparc/get_token/' \
     #   -H 'Content-Type: application/json' \
@@ -832,23 +827,30 @@ class AuthTest(unittest.TestCase):
     # > Could not get token from SSO server:
     #   HTTPSConnectionPool(host='docker1.csdc.noirlab.edu', port=443):
     #   Max retries exceeded with url: /api/token/
-    # (Caused by SSLError(SSLCertVerificationError(1, '[SSL: CERTIFICATE_VERIFY_FAILED]
+    # (Caused by SSLError(SSLCertVerificationError(1,
+    #                                   '[SSL: CERTIFICATE_VERIFY_FAILED]
     # certificate verify failed: unable to get local issuer certificate
     # (_ssl.c:997)')))
+
+    def test_sso_server(self):
+        sso_server = "https://sso.csdc.noirlab.edu/"
+        response = requests.get(sso_server)
+        self.assertEqual(response.status_code, 200, response.content.decode())
+
     def test_get_token(self):
-        # print(f'login: get_token {url=}')
+        """Make sure we can get expected SSO token."""
         json = {"email": self.auth_user, "password": usrpw}
         if showact:
-            print(f'test_get_token: {json=}')
+            print(f"test_get_token: {json=}")
 
-        expected = ''
-        res = requests.post(f'{self.client.apiurl}/get_token/', json=json)
+        expected = 281
+        res = requests.post(f"{self.client.apiurl}/get_token/", json=json)
         self.assertEqual(res.status_code, 200, res.content.decode())
-
+        token = res.content.decode()
+        actual = len(token)
         if showact:
-            print(f'test_get_token: {res=}')
-        self.assertEqual(res, expected, msg="Actual to Expected")
-
+            print(f"test_get_token: ({len(token)}) {token=!s}")
+        self.assertEqual(actual, expected, msg="Actual to Expected")
 
     def test_authorized_1(self):
         """Test authorized method with authorized user signed in"""
@@ -919,9 +921,7 @@ class AuthTest(unittest.TestCase):
         inc = ["sparcl_id", "data_release"]
         try:
             if drs is None:
-                got = self.client.retrieve(
-                    uuid_list=ids, include=inc
-                )
+                got = self.client.retrieve(uuid_list=ids, include=inc)
             else:
                 got = self.client.retrieve(
                     uuid_list=ids, include=inc, dataset_list=drs

sparclclient-1.2.2b9/tests/expected_pat.py

@@ -1,286 +0,0 @@
-# For running client against PAT host
-# See also: expected_dev1.py   (SP DEV)
-
-all_fields = [
-    "data_release",
-    "datasetgroup",
-    "dateobs",
-    "dateobs_center",
-    "dec",
-    "exptime",
-    "flux",
-    "instrument",
-    "ivar",
-    "mask",
-    "model",
-    "ra",
-    "redshift",
-    "redshift_err",
-    "redshift_warning",
-    "site",
-    "sparcl_id",
-    "specid",
-    "specprimary",
-    "spectype",
-    "survey",
-    "targetid",
-    "telescope",
-    "wave_sigma",
-    "wavelength",
-    "wavemax",
-    "wavemin",
-]
-
-
-default_fields = ["dec", "flux", "ra", "sparcl_id", "specid", "wavelength"]
-
-# OLD as of Dec 14, 2023
-# retrieve_0 = [1254334738051655680, 1254335012929562624]
-
-# OLD as of May 3, 2024
-#retrieve_0 = [39627920993422590, 39627926995470031]
-
-retrieve_0 = ["_dr", "flux", "sparcl_id", "specid"]
-
-retrieve_0b = ["_dr", "dec", "flux", "ra", "sparcl_id", "specid", "wavelength"]
-
-
-# OLD as of Dec 14, 2023
-# retrieve_5 = [1254334738051655680, 1254335012929562624]
-
-# OLD as of May 3, 2024
-#retrieve_5 = [39627920993422590, 39627926995470031]
-
-retrieve_5 = 2
-
-# OLD as of Dec 14, 2023
-# find_0 = [
-#    {
-#        "_dr": "BOSS-DR16",
-#        "dec": 28.038113,
-#        "ra": 132.95902999999998,
-#        "sparcl_id": "611a5a1c-75d8-11ee-8b9f-525400aad0aa",
-#    },
-#    {
-#        "_dr": "BOSS-DR16",
-#        "dec": 28.019856,
-#        "ra": 132.93685,
-#        "sparcl_id": "61357ba4-75d8-11ee-a1b5-525400aad0aa",
-#    },
-# ]
-
-# OLD as of May 3, 2024
-#find_0 = [
-#    {
-#        "_dr": "BOSS-DR16",
-#        "dec": 3.4911852,
-#        "ra": 340.93613000000005,
-#        "sparcl_id": "0c46e982-992d-11ee-b800-525400aad0aa",
-#    },
-#    {
-#        "_dr": "BOSS-DR16",
-#        "dec": 3.0464991,
-#        "ra": 340.93298000000004,
-#        "sparcl_id": "2602c4a5-992d-11ee-b3e7-525400aad0aa",
-#    },
-#]
-
-find_0 = [{'_dr': 'BOSS-DR16',
-           'data_release': 'BOSS-DR16',
-           'specid': -6444642403514822656}]
-
-# OLD as of Dec 14, 2023
-# find_1 = [
-#    {
-#        "_dr": "SDSS-DR17",
-#        "dec": -0.98681,
-#        "ra": 313.90848,
-#        "sparcl_id": "0002f55c-75d7-11ee-822f-525400aad0aa",
-#    }
-# ]
-
-# OLD as of May 3, 2024
-#find_1 = [
-#    {
-#        "_dr": "DESI-EDR",
-#        "dec": 5.662937176455572,
-#        "ra": 208.7076645721256,
-#        "sparcl_id": "00063e73-992e-11ee-ad57-525400aad0aa",
-#    }
-#]
-
-find_1 = [{'_dr': 'SDSS-DR16',
-           'data_release': 'SDSS-DR16',
-           'specid': 1506454396622366720}]
-
-find_2 = 936894  # PAT
-
-# OLD as of Dec 14, 2023
-# find_3 = [
-#    {
-#        "_dr": "SDSS-DR17",
-#        "dec": -0.98681,
-#        "ra": 313.90848,
-#        "sparcl_id": "0002f55c-75d7-11ee-822f-525400aad0aa",
-#    },
-#    {
-#        "_dr": "SDSS-DR17",
-#        "dec": -0.945676,
-#        "ra": 313.91043,
-#        "sparcl_id": "000df610-75d7-11ee-9957-525400aad0aa",
-#    },
-#    {
-#        "_dr": "SDSS-DR17",
-#        "dec": -0.486388,
-#        "ra": 313.70407,
-#        "sparcl_id": "0018f253-75d7-11ee-8253-525400aad0aa",
-#    },
-# ]
-
-# OLD as of March 13, 2024
-# find_3 = [{'_dr': 'DESI-EDR',
-#           'dec': 5.662937176455572,
-#           'ra': 208.7076645721256,
-#           'sparcl_id': '00063e73-992e-11ee-ad57-525400aad0aa'},
-#          {'_dr': 'DESI-EDR',
-#           'dec': 5.492057016906403,
-#           'ra': 209.52823969727436,
-#           'sparcl_id': '000d4892-9931-11ee-9e4d-525400aad0aa'},
-#          {'_dr': 'SDSS-DR17',
-#           'dec': 34.863511,
-#           'ra': 194.86904,
-#           'sparcl_id': '000e388f-992d-11ee-a373-525400aad0aa'}]
-
-# OLD as of May 3, 2024
-#find_3 = [
-#    {
-#        "_dr": "DESI-EDR",
-#        "dec": 5.662937176455572,
-#        "ra": 208.7076645721256,
-#        "sparcl_id": "00063e73-992e-11ee-ad57-525400aad0aa",
-#    },
-#    {
-#        "_dr": "DESI-EDR",
-#        "dec": 5.492057016906403,
-#        "ra": 209.52823969727436,
-#        "sparcl_id": "000d4892-9931-11ee-9e4d-525400aad0aa",
-#    },
-#    {
-#        "_dr": "BOSS-DR16",
-#        "dec": 27.461703,
-#        "ra": 141.95067,
-#        "sparcl_id": "001b11a6-992f-11ee-993c-525400aad0aa",
-#    },
-#]
-
-find_3 = [{'_dr': 'BOSS-DR16', 'data_release': 'BOSS-DR16'},
-          {'_dr': 'BOSS-DR16', 'data_release': 'BOSS-DR16'},
-          {'_dr': 'BOSS-DR16', 'data_release': 'BOSS-DR16'}]
-
-# OLD as of Dec 14, 2023
-# find_4 = [
-#    "0002f55c-75d7-11ee-822f-525400aad0aa",
-#    "000df610-75d7-11ee-9957-525400aad0aa",
-#    "0018f253-75d7-11ee-8253-525400aad0aa",
-# ]
-
-# OLD as of March 13, 2024
-# find_4 = ['00063e73-992e-11ee-ad57-525400aad0aa',
-#          '000d4892-9931-11ee-9e4d-525400aad0aa',
-#          '000e388f-992d-11ee-a373-525400aad0aa']
-
-# OLD as of May 3, 2024
-#find_4 = [
-#    "00063e73-992e-11ee-ad57-525400aad0aa",
-#    "000d4892-9931-11ee-9e4d-525400aad0aa",
-#    "001b11a6-992f-11ee-993c-525400aad0aa",
-#]
-
-find_4 = 36
-
-find_5a = [
-    {"_dr": "BOSS-DR16", "data_release": "BOSS-DR16", "mjd": 55689},
-    {"_dr": "SDSS-DR16", "data_release": "SDSS-DR16", "mjd": 54763},
-]
-
-find_5d = []
-
-# OLD as of Dec 14, 2023
-# reorder_1a = [
-#    "9452379f-d82d-43bb-8fc2-c26451df4710",
-#    "529936c6-14ef-4119-a80d-b184dcb6308e",
-#    "fbb22144-25c5-4330-9b0b-8b2eac83079c",
-# ]
-
-# OLD as of March 13, 2024
-# reorder_1a = ['00063e73-992e-11ee-ad57-525400aad0aa',
-#              '000d4892-9931-11ee-9e4d-525400aad0aa',
-#              '000e388f-992d-11ee-a373-525400aad0aa']
-
-# OLD as of May 3, 2024
-#reorder_1a = [
-#    "00063e73-992e-11ee-ad57-525400aad0aa",
-#    "000d4892-9931-11ee-9e4d-525400aad0aa",
-#    "001b11a6-992f-11ee-993c-525400aad0aa",
-#]
-
-# OLD as of Dec 14, 2023
-# reorder_1b = [1254334738051655680, 1254335012929562624, 1254335287807469568]
-
-# OLD as of March 13, 2024
-# reorder_1b = [39627926995470031, 39627920993422590, 2258670445286942720]
-
-# OLD as of May 3, 2024
-#reorder_1b = [39627926995470031, 39627920993422590, -5672180510041550848]
-
-# OLD as of Dec 14, 2023
-# reorder_2a = [1254334738051655680, 1254335012929562624, None]
-
-# OLD as of May 3, 2024
-#reorder_2a = [
-#    "00063e73-992e-11ee-ad57-525400aad0aa",
-#    "000d4892-9931-11ee-9e4d-525400aad0aa",
-#    "None",
-#]
-
-# OLD as of Dec 14, 2023
-# reorder_2b = [1254334738051655680, 1254335012929562624, None]
-
-# OLD as of May 3, 2024
-#reorder_2b = [39627926995470031, 39627920993422590, None]
-
-authorized_1 = {
-    "Loggedin_As": "test_user_1@noirlab.edu",
-    "Authorized_Datasets": {
-        "BOSS-DR16",
-        "DESI-EDR",
-        "SDSS-DR16",
-        "SDSS-DR17-test",
-    },
-}
-
-authorized_2 = {
-    "Loggedin_As": "test_user_2@noirlab.edu",
-    "Authorized_Datasets": {"BOSS-DR16", "DESI-EDR", "SDSS-DR16"},
-}
-
-authorized_3 = {
-    "Loggedin_As": "Anonymous",
-    "Authorized_Datasets": {"BOSS-DR16", "DESI-EDR", "SDSS-DR16"},
-}
-
-# Private and Public
-pub_1 = ["BOSS-DR16"]
-pub_all = ["BOSS-DR16", "DESI-EDR", "SDSS-DR16"]
-priv = ["SDSS-DR17-test"]
-unauth = "test_user_2@noirlab.edu"
-#
-auth_find_1 = auth_find_2 = pub_all + priv
-auth_find_3 = f"[DSDENIED] {unauth} is declined access to datasets {priv}"
-auth_find_4 = auth_find_6 = pub_all
-auth_find_5 = f"[DSDENIED] ANONYMOUS is declined access to datasets {priv}"
-#
-auth_retrieve_1 = auth_retrieve_2 = pub_1 + priv
-auth_retrieve_3 = f"[DSDENIED] {unauth} is declined access to datasets {priv}"
-auth_retrieve_4 = auth_retrieve_5 = auth_retrieve_7 = auth_retrieve_8 = pub_1
-auth_retrieve_6 = f"[DSDENIED] ANONYMOUS is declined access to datasets {priv}"