Merge pull request #28 from sypht-team/hotfix/reuse_sessions_dependency_bump

Hotfix/reuse sessions dependency bump

Author: wilmeryan

requirements.txt

@@ -1 +1,2 @@
-requests==2.22.0
+requests==2.26.0
+urllib3==1.26.0

setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-__version__ = "0.5.11"
+__version__ = "0.5.12"
 __pkg_name__ = "sypht"
 
 setup(
@@ -16,5 +16,5 @@
         "Programming Language :: Python :: 3.7",
         "Topic :: Scientific/Engineering :: Artificial Intelligence",
     ],
-    install_requires=["requests>=2.20.1,<3"],
+    install_requires=["requests>=2.26.0", "urllib3>=1.26.0"],
 )

sypht/client.py

@@ -74,12 +74,11 @@ def __init__(
     def _create_session(self):
         return requests.Session()
 
-    @staticmethod
-    def _authenticate_v2(endpoint, client_id, client_secret, audience):
+    def _authenticate_v2(self, endpoint, client_id, client_secret, audience):
         basic_auth_slug = b64encode((client_id + ":" + client_secret).encode("utf-8")).decode(
             "utf-8"
         )
-        result = requests.post(
+        result = self.requests.post(
             endpoint,
             headers={
                 "Accept": "application/json",
@@ -95,10 +94,9 @@ def _authenticate_v2(endpoint, client_id, client_secret, audience):
 
         return result["access_token"], result["expires_in"]
 
-    @staticmethod
-    def _authenticate_v1(endpoint, client_id, client_secret, audience):
+    def _authenticate_v1(self, endpoint, client_id, client_secret, audience):
         endpoint = endpoint or os.environ.get("SYPHT_AUTH_ENDPOINT", SYPHT_LEGACY_AUTH_ENDPOINT)
-        result = requests.post(
+        result = self.requests.post(
             endpoint,
             data={
                 "client_id": client_id,

tests/tests_client.py

@@ -1,10 +1,10 @@
 import os
 import unittest
 import warnings
+from datetime import datetime, timedelta
+from uuid import UUID, uuid4
 
 from sypht.client import SyphtClient
-from uuid import UUID, uuid4
-from datetime import datetime, timedelta
 
 
 def validate_uuid4(uuid_string):
@@ -25,9 +25,15 @@ def setUp(self):
     def test_with_wrong_fieldset(self):
         with self.assertRaises(Exception) as context:
             with open("tests/sample_invoice.pdf", "rb") as f:
-                response = self.sypht_client.upload(f, ["sypht.incorrect",])
+                response = self.sypht_client.upload(
+                    f,
+                    [
+                        "sypht.incorrect",
+                    ],
+                )
                 self.assertIn(
-                    "does not have permission to use fieldSet sypht.incorrect", response["error"]
+                    "does not have permission to use fieldSet sypht.incorrect",
+                    response["error"],
                 )
 
         self.assertTrue("Request failed with status code" in str(context.exception))
@@ -61,7 +67,7 @@ def test_data_extraction_2(self):
         self.assertIn("bank.bsb", results)
 
     def test_parent_doc_id(self):
-        parent_doc_id=uuid4()
+        parent_doc_id = uuid4()
         with open("tests/sample_invoice.pdf", "rb") as f:
             fid = self.sypht_client.upload(f, ["invoices"], parent_doc_id=parent_doc_id)
             self.assertTrue(validate_uuid4(fid))