Merge pull request #25 from GDATASoftwareAG/httpx

Switch to httpx

python/requirements.txt

@@ -2,6 +2,6 @@ xmlrunner==1.7.7
 unittest-xml-reporting==3.2.0
 websockets~=10.3
 python-dotenv==0.20.0
-requests==2.27.1
+httpx[http2]==0.22.0
 build==0.7.0
 jwt==1.3.1

python/setup.cfg

@@ -18,7 +18,7 @@ classifiers =
 python_requires = >=3.8
 install_requires =
     websockets == 10.3
-    requests == 2.27.1
+    httpx[http2] == 0.22.0
     jwt == 1.3.1
 
 [options.packages.find]

python/src/vaas/vaas.py

@@ -8,7 +8,7 @@
 import asyncio
 from asyncio import Future
 from jwt import JWT
-import requests
+import httpx
 import websockets.client
 
 URL = "wss://gateway-vaas.gdatasecurity.de"
@@ -32,7 +32,7 @@ def __init__(self, tracing=VaasTracing()):
         self.websocket = None
         self.session_id = None
         self.results = {}
-        self.session = requests.Session()
+        self.httpx_client = httpx.AsyncClient(http2=True)
 
     async def connect(self, token, url=URL):
         """Connect to VaaS
@@ -59,6 +59,8 @@ async def close(self):
             await self.websocket.close()
         if self.loop_result is not None:
             await self.loop_result
+        if self.httpx_client is not None:
+            await self.httpx_client.aclose()
 
     async def __aenter__(self):
         return self
@@ -113,7 +115,7 @@ async def for_buffer(self, buffer):
             token = response.get("upload_token")
             url = response.get("url")
             response_message = self.__response_message_for_guid(guid)
-            self.__upload(token, url, buffer)
+            await self.__upload(token, url, buffer)
             verdict = (await response_message).get("verdict")
             self.tracing.trace_upload_request(time.time() - start, len(buffer))
 
@@ -124,11 +126,11 @@ async def for_file(self, path):
         with open(path, "rb") as open_file:
             return await self.for_buffer(open_file.read())
 
-    def __upload(self, token, upload_uri, buffer):
+    async def __upload(self, token, upload_uri, buffer):
         jwt = JWT()
         decoded_token = jwt.decode(token, do_verify=False)
         trace_id = decoded_token.get("traceId")
-        self.session.put(
+        await self.httpx_client.put(
             url=upload_uri,
             data=buffer,
             headers={"Authorization": token, "traceParent": trace_id},