Merge pull request #155 from equinor/async-fixes

Add raise_for_status_async decorator + follow_redirect

Author: adnejacobsen

src/sumo/wrapper/_blob_client.py

@@ -1,6 +1,6 @@
 import httpx
 
-from ._decorators import raise_for_status, http_retry
+from ._decorators import raise_for_status, http_retry, raise_for_status_async
 
 
 class BlobClient:
@@ -25,7 +25,7 @@ def upload_blob(self, blob: bytes, url: str):
 
         return response
 
-    @raise_for_status
+    @raise_for_status_async
     @http_retry
     async def upload_blob_async(self, blob: bytes, url: str):
         """Upload a blob async.

src/sumo/wrapper/_decorators.py

@@ -14,6 +14,18 @@ def wrapper(*args, **kwargs):
     return wrapper
 
 
+def raise_for_status_async(func):
+    async def wrapper(*args, **kwargs):
+        # FIXME: in newer versions of httpx, raise_for_status() is chainable,
+        # so we could simply write
+        # return func(*args, **kwargs).raise_for_status()
+        response = await func(*args, **kwargs)
+        response.raise_for_status()
+        return response
+
+    return wrapper
+
+
 def http_unpack(func):
     def wrapper(*args, **kwargs):
         response = func(*args, **kwargs)

src/sumo/wrapper/sumo_client.py

@@ -9,7 +9,7 @@
 from ._auth_provider import get_auth_provider
 from .config import APP_REGISTRATION, TENANT_ID, AUTHORITY_HOST_URI
 
-from ._decorators import raise_for_status, http_retry
+from ._decorators import raise_for_status, http_retry, raise_for_status_async
 
 logger = logging.getLogger("sumo.wrapper")
 
@@ -328,7 +328,7 @@ def getLogger(self, name):
         logger.addHandler(handler)
         return logger
 
-    @raise_for_status
+    @raise_for_status_async
     @http_retry
     async def get_async(self, path: str, params: dict = None):
         """Performs an async GET-request to the Sumo API.
@@ -364,7 +364,7 @@ async def get_async(self, path: str, params: dict = None):
             "authorization": f"Bearer {token}",
         }
 
-        async with httpx.AsyncClient() as client:
+        async with httpx.AsyncClient(follow_redirects=True) as client:
             response = await client.get(
                 f"{self.base_url}{path}",
                 params=params,
@@ -374,7 +374,7 @@ async def get_async(self, path: str, params: dict = None):
 
         return response
 
-    @raise_for_status
+    @raise_for_status_async
     @http_retry
     async def post_async(
         self,
@@ -450,7 +450,7 @@ async def post_async(
 
         return response
 
-    @raise_for_status
+    @raise_for_status_async
     @http_retry
     async def put_async(
         self, path: str, blob: bytes = None, json: dict = None
@@ -496,7 +496,7 @@ async def put_async(
 
         return response
 
-    @raise_for_status
+    @raise_for_status_async
     @http_retry
     async def delete_async(self, path: str, params: dict = None) -> dict:
         """Performs an async DELETE-request to the Sumo API.