From db9d97bcbda5eedfed83f7ccf93bc1e2c1c79795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Den=20Delimarsky=20=F0=9F=8C=BA?= <53200638+localden@users.noreply.github.com> Date: Sat, 20 Sep 2025 08:46:32 -0700 Subject: [PATCH] Update __init__.py --- src/specify_cli/__init__.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/specify_cli/__init__.py b/src/specify_cli/__init__.py index 891d5f2e9..27ce122c4 100644 --- a/src/specify_cli/__init__.py +++ b/src/specify_cli/__init__.py @@ -53,17 +53,13 @@ ssl_context = truststore.SSLContext(ssl.PROTOCOL_TLS_CLIENT) client = httpx.Client(verify=ssl_context) def _github_token(cli_token: str | None = None) -> str | None: - return cli_token or os.getenv("GH_TOKEN") or os.getenv("GITHUB_TOKEN") + """Return sanitized GitHub token (cli arg takes precedence) or None.""" + return ((cli_token or os.getenv("GH_TOKEN") or os.getenv("GITHUB_TOKEN") or "").strip()) or None def _github_auth_headers(cli_token: str | None = None) -> dict: - """Headers for GitHub REST API requests. - - Uses Bearer auth if token present - """ - headers = {} + """Return Authorization header dict only when a non-empty token exists.""" token = _github_token(cli_token) - if token: - headers["Authorization"] = f"Bearer {token}" - return headers + return {"Authorization": f"Bearer {token}"} if token else {} # Constants AI_CHOICES = { @@ -447,7 +443,7 @@ def download_template_from_github(ai_assistant: str, download_dir: Path, *, scri api_url, timeout=30, follow_redirects=True, - headers=_github_auth_headers(github_token) or None, + headers=_github_auth_headers(github_token), ) status = response.status_code if status != 200: @@ -500,7 +496,7 @@ def download_template_from_github(ai_assistant: str, download_dir: Path, *, scri download_url, timeout=60, follow_redirects=True, - headers=_github_auth_headers(github_token) or None, + headers=_github_auth_headers(github_token), ) as response: if response.status_code != 200: body_sample = response.text[:400]