option to pass timeout directly to server instance

Author: davidhamann

fmrest/server.py

@@ -7,8 +7,9 @@
 import requests
 from .utils import (request, build_portal_params, build_script_params,
                     filename_from_url, PlaceholderDict)
-from .const import (PORTAL_PREFIX, FMSErrorCode, API_VERSIONS, API_DATE_FORMATS, API_PATH_PREFIX,
-                    API_PATH)
+from .const import (PORTAL_PREFIX, FMSErrorCode, API_VERSIONS,
+                    API_DATE_FORMATS, API_PATH_PREFIX,
+                    API_PATH, TIMEOUT)
 from .exceptions import BadJSON, FileMakerError, RecordError, BadGatewayError
 from .record import Record
 from .foundset import Foundset
@@ -45,7 +46,8 @@ def __init__(self, url: str, user: str,
                  type_conversion: bool = False,
                  auto_relogin: bool = False,
                  proxies: Optional[Dict] = None,
-                 api_version: Optional[str] = None) -> None:
+                 api_version: Optional[str] = None,
+                 timeout: int = TIMEOUT) -> None:
         """Initialize the Server class.
 
         Parameters
@@ -93,6 +95,10 @@ def __init__(self, url: str, user: str,
             Configure which version of the data API should be queried (e.g. v1)
             It is recommended to set the version explicitly to prevent
             potential future breaking changes.
+        timeout : int
+            Duration in seconds to wait for FMS to respond (HTTP timeout).
+            This takes priority over the legacy environment variable
+            "fmrest_timeout".
         """
 
         self.url = url
@@ -104,6 +110,7 @@ def __init__(self, url: str, user: str,
         self.verify_ssl = verify_ssl
         self.auto_relogin = auto_relogin
         self.proxies = proxies
+        self.timeout = timeout
 
         if not api_version:
             warnings.warn('No api_version given. Defaulting to v1.')
@@ -701,6 +708,7 @@ def fetch_file(self, file_url: str,
                            url=file_url,
                            verify=self.verify_ssl,
                            stream=stream,
+                           timeout=self.timeout,
                            proxies=self.proxies)
 
         return (name,
@@ -920,6 +928,7 @@ def _call_filemaker(self, method: str, path: str,
                            verify=self.verify_ssl,
                            params=params,
                            proxies=self.proxies,
+                           timeout=self.timeout,
                            **kwargs)
 
         if response.status_code == 502:

fmrest/utils.py

@@ -7,8 +7,9 @@
 
 def request(*args, **kwargs) -> requests.Response:
     """Wrapper around requests library request call"""
+    timeout = kwargs.pop("timeout", TIMEOUT)
     try:
-        return requests.request(*args, timeout=TIMEOUT, **kwargs)
+        return requests.request(*args, timeout=timeout, **kwargs)
     except Exception as ex:
         raise RequestException(ex, args, kwargs) from None
 

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name='python-fmrest',
-    version='1.7.2',
+    version='1.7.3',
     python_requires='>=3.6',
     author='David Hamann',
     author_email='dh@davidhamann.de',