Merge pull request #128 from intezer/fix/small-fixes

Fix/small fixes
intezer · Jan 15, 2024 · 4810456 · 4810456
2 parents 57f79f5 + d229c76
commit 4810456
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,8 @@
+1.19.10
+_______
+- Add timeout support to IntezerApiClient
+- Set pip-system-certs requirement correctly
+
 1.19.9
 ------
 - Fix certificate issue by adding pip-system-certs to requirements

diff --git a/intezer_sdk/api.py b/intezer_sdk/api.py
@@ -85,7 +85,8 @@ def __init__(self,
                  on_premise_version: OnPremiseVersion = None,
                  user_agent: str = None,
                  renew_token_window=20,
-                 max_retry=3):
+                 max_retry=3,
+                 timeout_in_seconds: Optional[int] = None):
         self.full_url = base_url + api_version
         self.base_url = base_url
         self._proxies = proxies
@@ -97,6 +98,7 @@ def __init__(self,
         self.verify_ssl = verify_ssl
         self.on_premise_version = on_premise_version
         self.max_retry = max_retry
+        self.timeout_in_seconds = timeout_in_seconds
         if user_agent:
             user_agent = f'{consts.USER_AGENT}/{user_agent}'
         else:
@@ -110,7 +112,8 @@ def _request(self,
                  headers: dict = None,
                  files: dict = None,
                  stream: bool = None,
-                 base_url: str = None) -> Response:
+                 base_url: str = None,
+                 timeout_in_seconds: Optional[int] = None) -> Response:
         if not self._session:
             self._set_session()
 
@@ -123,7 +126,8 @@ def _request(self,
                 files=files,
                 data=data or {},
                 headers=headers or {},
-                stream=stream
+                stream=stream,
+                timeout=timeout_in_seconds or self.timeout_in_seconds
             )
         elif isinstance(data, bytes):
             response = self._session.request(
@@ -132,15 +136,17 @@ def _request(self,
                 files=files,
                 data=data,
                 headers=headers or {},
-                stream=stream
+                stream=stream,
+                timeout=timeout_in_seconds or self.timeout_in_seconds
             )
         else:
             response = self._session.request(
                 method,
                 url,
                 json=data or {},
                 headers=headers,
-                stream=stream
+                stream=stream,
+                timeout=timeout_in_seconds or self.timeout_in_seconds
             )
 
         return response
@@ -158,15 +164,16 @@ def request_with_refresh_expired_access_token(self,
                                                   headers: dict = None,
                                                   files: dict = None,
                                                   stream: bool = None,
-                                                  base_url: str = None) -> Response:
+                                                  base_url: str = None,
+                                                  timeout_in_seconds: Optional[int] = None) -> Response:
         for retry_count in range(self.max_retry):
             try:
                 self._refresh_token_if_needed()
-                response = self._request(method, path, data, headers, files, stream, base_url=base_url)
+                response = self._request(method, path, data, headers, files, stream, base_url, timeout_in_seconds)
 
                 if response.status_code == HTTPStatus.UNAUTHORIZED and not self._token_expiration:
                     self._set_access_token()
-                    response = self._request(method, path, data, headers, files, stream, base_url)
+                    response = self._request(method, path, data, headers, files, stream, base_url, timeout_in_seconds)
 
                 return response
             except ConnectionError:
@@ -733,6 +740,7 @@ def set_global_api(api_key: str = None,
                              proxies=proxies)
     return _global_api
 
+
 def set_global_api_custom_instance(api: IntezerApiClient) -> IntezerApiClient:
     """
     Configure the global api with a custom instance

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,5 @@
+# This is not used by the project, but is used by the CI/CD pipeline to install dependencies, update setup.py for package dependencies.
 requests>=2.29.0,<3
 pip-system-certs==4.0
-responses==0.23.3
+responses==0.24.1
 pytest==7.4.4
diff --git a/setup.py b/setup.py
@@ -21,7 +21,8 @@ def rel(*xs):
     long_description = f.read()
 
 install_requires = [
-    'requests >= 2.29.0,<3'
+    'requests >= 2.29.0,<3',
+    'pip-system-certs == 4.0'
 ]
 setup(
     name='intezer_sdk',
@@ -37,7 +38,7 @@ def rel(*xs):
     install_requires=install_requires,
     keywords='intezer',
     tests_requires=[
-        'responses == 0.23.3',
+        'responses == 0.24.1',
         'pytest == 7.4.4'
     ],
     python_requires='!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,!=3.7.*',