Fixed retries

planetary_computer/sas.py

@@ -58,7 +58,9 @@ class SASToken(SASBase):
 
     def sign(self, href: str) -> SignedLink:
         """Signs an href with this token"""
-        return SignedLink(href=f"{href}?{self.token}", expiry=self.expiry)
+        return SignedLink(
+            href=f"{href}?{self.token}", expiry=self.expiry  # type: ignore [call-arg]
+        )
 
     def ttl(self) -> float:
         """Number of seconds the token is still valid for"""
@@ -264,7 +266,6 @@ def _sign_fsspec_asset_in_place(asset: AssetLike) -> None:
 
         storage_options = None
         for key in ["table:storage_options", "xarray:storage_options"]:
-
             if key in extra_d:
                 storage_options = extra_d[key]
                 break
@@ -444,6 +445,7 @@ def get_token(
         retry = urllib3.util.retry.Retry(
             total=retry_total,
             backoff_factor=retry_backoff_factor,
+            status_forcelist=[429, 500, 502, 503, 504],
         )
         adapter = requests.adapters.HTTPAdapter(max_retries=retry)
         session.mount("http://", adapter)

scripts/cibuild

@@ -19,8 +19,7 @@ if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
     else
         # Install/upgrade dependencies
         python -m pip install --upgrade pip
-        pip install -r requirements-dev.txt
-        pip install -e .[adlfs,azure]
+        pip install -e .[adlfs,azure,dev]
 
         ./scripts/test
     fi

setup.cfg

@@ -22,6 +22,14 @@ install_requires =
 [options.extras_require]
 adlfs = adlfs
 azure = azure-storage-blob
+dev =
+    black
+    flake8
+    mypy
+    types-requests
+    setuptools
+    pytest
+    responses
 
 [options.entry_points]
 console_scripts =

tests/test_signing.py

@@ -5,7 +5,10 @@
 from pathlib import Path
 import warnings
 import pystac
+import pytest
+from requests.exceptions import RetryError
 
+import responses
 import requests
 
 import planetary_computer as pc
@@ -367,3 +370,19 @@ def test_is_fsspec_url(self) -> None:
 
         asset = Asset("adlfs://my-container/my/path.ext")
         self.assertFalse(is_fsspec_asset(asset))
+
+
+@responses.activate
+def test_retry() -> None:
+    TOKEN_CACHE.clear()
+    rsp1 = responses.Response(
+        method="GET",
+        url="https://planetarycomputer.microsoft.com/api/sas/v1/token/naipeuwest/naip",
+        status=503,
+    )
+    responses.add(rsp1)
+
+    with pytest.raises(RetryError):
+        get_token("naipeuwest", "naip")
+
+    assert rsp1.call_count == 11