fixup! PR #770 openeo.utils.http finetuning (#441, #764)

Author: soxofaan

openeo/extra/job_management/__init__.py

@@ -29,7 +29,8 @@
 import shapely.errors
 import shapely.geometry.base
 import shapely.wkt
-from requests.adapters import HTTPAdapter, Retry
+from requests.adapters import HTTPAdapter
+from urllib3.util import Retry
 
 from openeo import BatchJob, Connection
 from openeo.internal.processes.parse import (

openeo/rest/_connection.py

@@ -5,7 +5,7 @@
 from typing import Iterable, Optional, Union
 
 import requests
-import requests.adapters
+import urllib3.util
 from requests import Response
 from requests.auth import AuthBase
 
@@ -33,7 +33,7 @@ def __init__(
         session: Optional[requests.Session] = None,
         default_timeout: Optional[int] = None,
         slow_response_threshold: Optional[float] = None,
-        retry: Union[requests.adapters.Retry, dict, bool, None] = None,
+        retry: Union[urllib3.util.Retry, dict, bool, None] = None,
     ):
         self._root_url = root_url
         self._auth = None

openeo/rest/connection.py

@@ -28,8 +28,8 @@
 )
 
 import requests
-import requests.adapters
 import shapely.geometry.base
+import urllib3.util
 from requests.auth import AuthBase, HTTPBasicAuth
 
 import openeo
@@ -117,7 +117,7 @@ class Connection(RestApiConnection):
         Usage of this parameter is deprecated, use the specific authentication methods instead.
     :param retry: general request retry settings, can be specified as:
 
-        - :py:class:`requests.adapters.Retry` object
+        - :py:class:`urllib3.util.Retry` object
           or a dictionary with corresponding keyword arguments
           (e.g. ``total``, ``backoff_factor``, ``status_forcelist``, ...)
         - ``None`` (default) to use default openEO-oriented retry settings
@@ -141,7 +141,7 @@ def __init__(
         refresh_token_store: Optional[RefreshTokenStore] = None,
         oidc_auth_renewer: Optional[OidcAuthenticator] = None,
         auth: Optional[AuthBase] = None,
-        retry: Union[requests.adapters.Retry, dict, bool, None] = None,
+        retry: Union[urllib3.util.Retry, dict, bool, None] = None,
     ):
         if "://" not in url:
             url = "https://" + url
@@ -1898,7 +1898,7 @@ def connect(
     session: Optional[requests.Session] = None,
     default_timeout: Optional[int] = None,
     auto_validate: bool = True,
-    retry: Union[requests.adapters.Retry, dict, bool, None] = None,
+    retry: Union[urllib3.util.Retry, dict, bool, None] = None,
 ) -> Connection:
     """
     This method is the entry point to OpenEO.
@@ -1920,7 +1920,7 @@ def connect(
     :param auto_validate: toggle to automatically validate process graphs before execution
     :param retry: general request retry settings, can be specified as:
 
-        - :py:class:`requests.adapters.Retry` object
+        - :py:class:`urllib3.util.Retry` object
           or a dictionary with corresponding keyword arguments
           (e.g. ``total``, ``backoff_factor``, ``status_forcelist``, ...)
         - ``None`` (default) to use default openEO-oriented retry settings