Turn off follow_redirects for httpx clients and only enable it for a …

…specific endpoints... this may make httpx happier.
equinor · Nov 14, 2024 · 9721c53 · 9721c53
1 parent 3c7be64
commit 9721c53
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/src/sumo/wrapper/sumo_client.py b/src/sumo/wrapper/sumo_client.py
@@ -2,6 +2,7 @@
 import asyncio
 import httpx
 import jwt
+import re
 
 from ._blob_client import BlobClient
 from ._logging import LogHandlerSumo
@@ -49,8 +50,8 @@ def __init__(
             raise ValueError(f"Invalid environment: {env}")
 
         self._retry_strategy = retry_strategy
-        self._client = httpx.Client(follow_redirects=True)
-        self._async_client = httpx.AsyncClient(follow_redirects=True)
+        self._client = httpx.Client()
+        self._async_client = httpx.AsyncClient()
 
         self._timeout = timeout
 
@@ -197,12 +198,17 @@ def get(self, path: str, params: dict = None) -> dict:
 
         headers.update(self.auth.get_authorization())
 
+        follow_redirects = False
+        if re.match(r"^/objects\('[0-9a-fA-F-]{8}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{12}'\)/blob$",
+                    path) is not None:
+            follow_redirects = True
+
         def _get():
             return self._client.get(
                 f"{self.base_url}{path}",
                 params=params,
                 headers=headers,
-                follow_redirects=True,
+                follow_redirects=follow_redirects,
                 timeout=self._timeout,
             )
 
@@ -424,11 +430,17 @@ async def get_async(self, path: str, params: dict = None):
 
         headers.update(self.auth.get_authorization())
 
+        follow_redirects = False
+        if re.match(r"^/objects\('[0-9a-fA-F-]{8}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{12}'\)/blob$",
+                    path) is not None:
+            follow_redirects = True
+
         async def _get():
             return await self._async_client.get(
                 f"{self.base_url}{path}",
                 params=params,
                 headers=headers,
+                follow_redirects = follow_redirects,
                 timeout=self._timeout,
             )