Skip to content

Commit

Permalink
[DM-41830] Fix up linter and ordering issuse
Browse files Browse the repository at this point in the history
  • Loading branch information
cbanek committed Dec 2, 2023
1 parent 95d5e5f commit 8e1a343
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 14 deletions.
16 changes: 9 additions & 7 deletions src/lsst/rsp/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,21 @@

__all__ = [
"__version__",
"Forwarder",
"get_catalog",
"get_obstap_service",
"get_tap_service",
"retrieve_query",
"IPythonHandler",
"format_bytes",
"forward_lsst_log",
"Forwarder",
"get_datalink_result",
"get_siav2_service",
"format_bytes",
"get_access_token",
"get_catalog",
"get_digest",
"get_hostname",
"get_node",
"get_pod",
"get_tap_service",
"get_obstap_service",
"retrieve_query",
"get_hostname",
"get_pyvo_auth",
"show_with_bokeh_server",
]
2 changes: 0 additions & 2 deletions src/lsst/rsp/catalog.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import warnings
from typing import Optional

import pyvo
from deprecated import deprecated
Expand Down
11 changes: 6 additions & 5 deletions src/lsst/rsp/service.py
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
import os

import pyvo
from pyvo.dal import SIA2Service
from pyvo.dal.adhoc import DatalinkResults

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"
"https://data-int.lsst.cloud",
"https://data-dev.lsst.cloud",
]

USDF = [
"https://usdf-rsp.slac.stanford.edu",
"https://usdf-rsp-dev.slac.stanford.edu"
"https://usdf-rsp-dev.slac.stanford.edu",
]


def get_datalink_result(result) -> DatalinkResults:
"""Helper function to return the datalink part of the result."""
return DatalinkResults.from_result_url(result.getdataurl(),session=get_pyvo_auth())
return DatalinkResults.from_result_url(
result.getdataurl(), session=get_pyvo_auth()
)


def get_siav2_service(*args: str) -> SIA2Service:
Expand Down

0 comments on commit 8e1a343

Please sign in to comment.