Skip to content

prefer config token to $JUPYTERHUB_API_TOKEN #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yuvipanda merged 1 commit into from
Sep 16, 2024
Merged

prefer config token to $JUPYTERHUB_API_TOKEN #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions kbatch/kbatch/_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,14 @@ def handle_url(kbatch_url: Optional[str], config: Dict[str, Optional[str]]) -> s


def configure(kbatch_url=None, token=None) -> Path:
token = token or os.environ.get("JUPYTERHUB_API_TOKEN")
test_token = token or os.environ.get("JUPYTERHUB_API_TOKEN")
if test_token is None:
raise ValueError("Specify --token or set $JUPYTERHUB_API_TOKEN env")
kbatch_url = handle_url(kbatch_url, config={"kbatch_url": None})

client = httpx.Client(follow_redirects=True)

headers = {"Authorization": f"token {token}"}
headers = {"Authorization": f"token {test_token}"}
# verify that things are OK
# TODO: flexible URL

Expand All @@ -88,7 +90,7 @@ def _request_action(
client = httpx.Client(follow_redirects=True)
config = load_config()

token = token or os.environ.get("JUPYTERHUB_API_TOKEN") or config["token"]
token = token or config["token"] or os.environ.get("JUPYTERHUB_API_TOKEN")
kbatch_url = handle_url(kbatch_url, config)

headers = {
Expand Down Expand Up @@ -174,7 +176,7 @@ def list_pods(kbatch_url: str, token: Optional[str], job_name: Optional[str] = N
client = httpx.Client(follow_redirects=True)
config = load_config()

token = token or os.environ.get("JUPYTERHUB_API_TOKEN") or config["token"]
token = token or config["token"] or os.environ.get("JUPYTERHUB_API_TOKEN")
kbatch_url = handle_url(kbatch_url, config)

headers = {
Expand Down Expand Up @@ -208,7 +210,7 @@ def _logs(
client = httpx.Client(
follow_redirects=True, timeout=httpx.Timeout(5, read=read_timeout)
)
token = token or os.environ.get("JUPYTERHUB_API_TOKEN") or config["token"]
token = token or config["token"] or os.environ.get("JUPYTERHUB_API_TOKEN")
kbatch_url = handle_url(kbatch_url, config)

headers = {
Expand Down