Cleanup; retry; refactor (#150)

* Deleted old files, no longer used.

* Adjusted the exports from __init__.py.

* Use tenacity for retries, and always return response object from HTTP requests, rather than the payload of the response object.

* Add decorators for raising exceptions on 'failed' http requests, and for unpacking json content.

* Do not set `Content-Length` header in `_blob_client.py`.

* Bumped httpx, and added tenacity.

* Bump minimum Python version  to 3.8

* Remove Python 3.7 from test matrix.

---------

Co-authored-by: Raymond Wiker <[email protected]>

.github/workflows/pytest.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9"]
+        python-version: ["3.8", "3.9"]
     permissions:
       contents: read
       id-token: write

requirements/requirements.txt

@@ -3,4 +3,5 @@ msal-extensions>=1.0.0
 PyYAML>=5.4
 setuptools>=49.2.1
 pyjwt>=2.4.0
-httpx>=0.24.1
+httpx>=0.25.0
+tenacity>=8.2.3

setup.py

@@ -42,13 +42,15 @@ def parse_requirements(fname):
         "Development Status :: 3 - Alpha",
         "Intended Audience :: Developers",
         "Natural Language :: English",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
     ],
     use_scm_version={"write_to": "src/sumo/wrapper/version.py"},
     author="Equinor ASA",
     install_requires=REQUIREMENTS,
-    python_requires=">=3.6",
+    python_requires=">=3.8",
     packages=find_packages("src"),
     package_dir={"": "src"},
     include_package_data=True,

src/sumo/wrapper/__init__.py

@@ -1,4 +1,3 @@
-from ._call_sumo_api import CallSumoApi
 from .sumo_client import SumoClient
 
-__all__ = ["CallSumoApi", "SumoClient"]
+__all__ = ["SumoClient"]

src/sumo/wrapper/_blob_client.py

@@ -1,11 +1,13 @@
 import httpx
 
-from ._request_error import raise_request_error_exception
+from .decorators import raise_for_status, http_retry
 
 
 class BlobClient:
     """Upload blobs to blob store using pre-authorized URLs"""
 
+    @raise_for_status
+    @http_retry
     def upload_blob(self, blob: bytes, url: str):
         """Upload a blob.
 
@@ -16,20 +18,15 @@ def upload_blob(self, blob: bytes, url: str):
 
         headers = {
             "Content-Type": "application/octet-stream",
-            "Content-Length": str(len(blob)),
             "x-ms-blob-type": "BlockBlob",
         }
 
-        try:
-            response = httpx.put(url, data=blob, headers=headers)
-        except httpx.ProxyError as err:
-            raise_request_error_exception(503, err)
-
-        if response.is_error:
-            raise_request_error_exception(response.status_code, response.text)
+        response = httpx.put(url, content=blob, headers=headers)
 
         return response
 
+    @raise_for_status
+    @http_retry
     async def upload_blob_async(self, blob: bytes, url: str):
         """Upload a blob async.
 
@@ -40,19 +37,10 @@ async def upload_blob_async(self, blob: bytes, url: str):
 
         headers = {
             "Content-Type": "application/octet-stream",
-            "Content-Length": str(len(blob)),
             "x-ms-blob-type": "BlockBlob",
         }
 
-        try:
-            async with httpx.AsyncClient() as client:
-                response = await client.put(
-                    url=url, data=blob, headers=headers
-                )
-        except httpx.ProxyError as err:
-            raise_request_error_exception(503, err)
-
-        if response.is_error:
-            raise_request_error_exception(response.status_code, response.text)
+        async with httpx.AsyncClient() as client:
+            response = await client.put(url=url, content=blob, headers=headers)
 
         return response