[DM-41830] Go to a simpler refactor about the labels

setup.cfg

@@ -35,7 +35,7 @@ install_requires =
     kubernetes
     maproxy
     notebook
-    pyvo
+    pyvo @ git+https://github.com/astropy/pyvo.git@7682a1809cb2169cc2ffd9313feb6a4abd7f7e37
     requests
     tornado
 

src/lsst/rsp/catalog.py

@@ -1,6 +1,4 @@
-import os
 import warnings
-from typing import Optional
 
 import pyvo
 from deprecated import deprecated

src/lsst/rsp/service.py

@@ -1,45 +1,11 @@
-import os
-
-import pyvo
 from pyvo.dal import SIA2Service
 
 from .utils import get_pyvo_auth, get_service_url
 
 
-LSST_CLOUD = [
-    "https://data.lsst.cloud",
-    "https://data-int.lsst.cloud", 
-    "https://data-dev.lsst.cloud"
-]
-
-USDF = [
-    "https://usdf-rsp.slac.stanford.edu/",
-    "https://usdf-rsp-dev.slac.stanford.edu/"
-]
-
-
-def get_siav2_service(*args: str) -> SIA2Service:
+def get_siav2_service(label: str) -> SIA2Service:
     """Return a configured SIA2Service object that is ready to use."""
-    fqdn = os.environ["EXTERNAL_INSTANCE_URL"]
-
-    if len(args) == 0:
-        # Use the default for each environment
-        if fqdn in LSST_CLOUD:
-            label = "dp0.2"
-        elif fqdn in USDF:
-            label = "latiss"
-        else:
-            raise Exception("Unknown environment" + fqdn)
-    else:
-        label = args[0]
-
-    # If a label is passed, check that.
-    if label not in ["dp0.2", "latiss"]:
-        raise Exception(label + " is not a valid siav2 label")
-
-    if label == "latiss" and fqdn not in USDF:
-        raise Exception(label + " data not available at your location")
-    if label == "dp0.2" and fqdn not in LSST_CLOUD:
+    if label != "staff":
         raise Exception(label + " data not available at your location")
 
     # No matter what, we've only got one sia server per environment

src/lsst/rsp/utils.py

@@ -9,7 +9,6 @@
 import pyvo.auth.authsession
 import requests
 
-
 _NO_K8S = False
 
 try:
@@ -56,7 +55,7 @@ def get_hostname() -> str:
     return os.environ.get("HOSTNAME") or "localhost"
 
 
-def get_service_url(name: str, env_name=None) -> str:
+def get_service_url(name: str, env_name: Optional[str] = None) -> str:
     if not env_name:
         env_name = name.upper()
 
@@ -129,10 +128,7 @@ def jupyter_proxy_url(port: Optional[int] = None) -> str:
         full_url = urllib.parse.urljoin(user_url, proxy_url_path)
         return full_url
 
-    # The type: ignore is needed because the alternate form of notebook_url
-    # (https://docs.bokeh.org/en/latest/docs/reference/io.html#bokeh.io.show)
-    # isn't in bokeh's type hints.
-    bokeh.io.show(obj=obj, notebook_url=jupyter_proxy_url)  # type:ignore
+    bokeh.io.show(obj=obj, notebook_url=jupyter_proxy_url)
 
 
 def get_pod() -> Optional[client.V1Pod]: