lusid-sdk 2.1.405__py3-none-any.whl → 2.1.537__py3-none-any.whl

lusid/api_client.py

@@ -155,7 +155,7 @@ class ApiClient:
             files=None, response_types_map=None, auth_settings=None,
             _return_http_data_only=None, collection_formats=None,
             _preload_content=True, _request_timeout=None, _host=None,
-            _request_auth=None):
+            _request_auth=None, opts=None):
 
         config = self.configuration
 
@@ -223,7 +223,8 @@ class ApiClient:
                 headers=header_params,
                 post_params=post_params, body=body,
                 _preload_content=_preload_content,
-                _request_timeout=_request_timeout)
+                _request_timeout=_request_timeout,
+                opts=opts)
         except ApiException as e:
             if e.body:
                 e.body = e.body.decode('utf-8')
@@ -372,7 +373,8 @@ class ApiClient:
                  response_types_map=None, auth_settings=None,
                  async_req=None, _return_http_data_only=None,
                  collection_formats=None, _preload_content=True,
-                 _request_timeout=None, _host=None, _request_auth=None):
+                 _request_timeout=None, _host=None, _request_auth=None,
+                 opts=None):
         """Makes the HTTP request (synchronous) and returns deserialized data.
 
         To make an async_req request, set the async_req parameter.
@@ -399,10 +401,9 @@ class ApiClient:
                                  Default is True.
         :param collection_formats: dict of collection formats for path, query,
             header, and post parameters.
-        :param _request_timeout: timeout setting for this request. If one
-                                 number provided, it will be total request
-                                 timeout. It can also be a pair (tuple) of
-                                 (connection, read) timeouts.
+        :param _request_timeout: Timeout setting. Do not use - use the opts parameter instead
+        :param opts: Configuration options for this request
+        :type opts: ConfigurationOptions, optional
         :param _request_auth: set to override the auth_settings for an a single
                               request; this effectively ignores the authentication
                               in the spec for a single request.
@@ -421,7 +422,7 @@ class ApiClient:
                                    response_types_map, auth_settings,
                                    _return_http_data_only, collection_formats,
                                    _preload_content, _request_timeout, _host,
-                                   _request_auth)
+                                   _request_auth, opts)
 
         return self.pool.apply_async(self.__call_api, (resource_path,
                                                        method, path_params,
@@ -434,30 +435,34 @@ class ApiClient:
                                                        collection_formats,
                                                        _preload_content,
                                                        _request_timeout,
-                                                       _host, _request_auth))
+                                                       _host, _request_auth,
+                                                       opts))
 
     def request(self, method, url, query_params=None, headers=None,
                 post_params=None, body=None, _preload_content=True,
-                _request_timeout=None):
+                _request_timeout=None, opts=None):
         """Makes the HTTP request using RESTClient."""
         if method == "GET":
             return self.rest_client.get_request(url,
                                         query_params=query_params,
                                         _preload_content=_preload_content,
                                         _request_timeout=_request_timeout,
-                                        headers=headers)
+                                        headers=headers,
+                                        opts=opts)
         elif method == "HEAD":
             return self.rest_client.head_request(url,
                                          query_params=query_params,
                                          _preload_content=_preload_content,
                                          _request_timeout=_request_timeout,
-                                         headers=headers)
+                                         headers=headers,
+                                         opts=opts)
         elif method == "OPTIONS":
             return self.rest_client.options_request(url,
                                             query_params=query_params,
                                             headers=headers,
                                             _preload_content=_preload_content,
-                                            _request_timeout=_request_timeout)
+                                            _request_timeout=_request_timeout,
+                                            opts=opts)
         elif method == "POST":
             return self.rest_client.post_request(url,
                                          query_params=query_params,
@@ -465,7 +470,8 @@ class ApiClient:
                                          post_params=post_params,
                                          _preload_content=_preload_content,
                                          _request_timeout=_request_timeout,
-                                         body=body)
+                                         body=body,
+                                         opts=opts)
         elif method == "PUT":
             return self.rest_client.put_request(url,
                                         query_params=query_params,
@@ -473,7 +479,8 @@ class ApiClient:
                                         post_params=post_params,
                                         _preload_content=_preload_content,
                                         _request_timeout=_request_timeout,
-                                        body=body)
+                                        body=body,
+                                        opts=opts)
         elif method == "PATCH":
             return self.rest_client.patch_request(url,
                                           query_params=query_params,
@@ -481,14 +488,16 @@ class ApiClient:
                                           post_params=post_params,
                                           _preload_content=_preload_content,
                                           _request_timeout=_request_timeout,
-                                          body=body)
+                                          body=body,
+                                          opts=opts)
         elif method == "DELETE":
             return self.rest_client.delete_request(url,
                                            query_params=query_params,
                                            headers=headers,
                                            _preload_content=_preload_content,
                                            _request_timeout=_request_timeout,
-                                           body=body)
+                                           body=body,
+                                           opts=opts)
         else:
             raise ApiValueError(
                 "http method must be `GET`, `HEAD`, `OPTIONS`,"

lusid/configuration.py

@@ -26,6 +26,56 @@ JSON_SCHEMA_VALIDATION_KEYWORDS = {
     'minLength', 'pattern', 'maxItems', 'minItems'
 }
 
+class Timeouts:
+
+    @property
+    def total_timeout_ms(self):
+        return self.__total_timeout_ms
+
+    @total_timeout_ms.setter
+    def total_timeout_ms(self, value):
+        if not isinstance(value, int):
+            raise TypeError(f"total_timeout_ms must be type int but type '{type(value)}' used")
+        if value < 0:
+            raise ValueError(f"total_timeout_ms must be an integer greater than or equal to zero")
+        self.__total_timeout_ms = value
+
+    @property
+    def connect_timeout_ms(self):
+        return self.__connect_timeout_ms
+
+    @connect_timeout_ms.setter
+    def connect_timeout_ms(self, value):
+        if not isinstance(value, int):
+            raise TypeError(f"connect_timeout_ms must be type int but type '{type(value)}' used")
+        if value < 0:
+            raise ValueError(f"connect_timeout_ms must be an integer greater than or equal to zero")
+        self.__connect_timeout_ms = value
+
+    @property
+    def read_timeout_ms(self):
+        return self.__read_timeout_ms
+
+    @read_timeout_ms.setter
+    def read_timeout_ms(self, value):
+        if not isinstance(value, int):
+            raise TypeError(f"read_timeout_ms must be type int but type '{type(value)}' used")
+        if value < 0:
+            raise ValueError(f"read_timeout_ms must be an integer greater than or equal to zero")
+        self.__read_timeout_ms = value
+        
+    def __init__(self, total_timeout_ms: int, connect_timeout_ms: int, read_timeout_ms: int):
+        self.total_timeout_ms = total_timeout_ms
+        self.connect_timeout_ms = connect_timeout_ms
+        self.read_timeout_ms = read_timeout_ms
+        
+    def get_default():
+        return Timeouts(
+            total_timeout_ms=Configuration.DEFAULT_TOTAL_TIMEOUT_MS,
+            connect_timeout_ms=Configuration.DEFAULT_CONNECT_TIMEOUT_MS,
+            read_timeout_ms=Configuration.DEFAULT_READ_TIMEOUT_MS
+        )
+        
 class Configuration:
     """This class contains various settings of the API client.
 
@@ -55,6 +105,12 @@ class Configuration:
 
     :Example:
     """
+    
+    DEFAULT_TOTAL_TIMEOUT_MS: int = 1800_000
+    DEFAULT_CONNECT_TIMEOUT_MS: int = 0
+    DEFAULT_READ_TIMEOUT_MS: int = 0
+    DEFAULT_RATE_LIMIT_RETRIES: int = 2
+    DEFAULT_RETRIES: int = 3
 
     _default = None
 
@@ -65,7 +121,11 @@ class Configuration:
                  server_index=None, server_variables=None,
                  server_operation_index=None, server_operation_variables=None,
                  ssl_ca_cert=None,
-                 ) -> None:
+                 timeouts=Timeouts(
+                     total_timeout_ms=DEFAULT_TOTAL_TIMEOUT_MS,
+                     connect_timeout_ms=DEFAULT_CONNECT_TIMEOUT_MS,
+                     read_timeout_ms=DEFAULT_READ_TIMEOUT_MS),
+                 rate_limit_retries=DEFAULT_RATE_LIMIT_RETRIES) -> None:
         """Constructor
         """
         self._base_path = "https://www.lusid.com/api" if host is None else host
@@ -179,6 +239,9 @@ class Configuration:
         self.date_format = "%Y-%m-%d"
         """date format
         """
+        
+        self.timeouts = timeouts
+        self.rate_limit_retries = rate_limit_retries
 
     def __deepcopy__(self, memo):
         cls = self.__class__
@@ -382,7 +445,7 @@ class Configuration:
         return "Python SDK Debug Report:\n"\
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
-               "Version of the API: 0.11.6835\n"\
+               "Version of the API: 0.11.6966\n"\
                "SDK Package Version: {package_version}".\
                format(env=sys.platform, pyversion=sys.version, package_version=package_version)
 
@@ -447,3 +510,25 @@ class Configuration:
         """Fix base path."""
         self._base_path = value
         self.server_index = None
+
+    @property
+    def timeouts(self):
+        return self._timeouts
+
+    @timeouts.setter
+    def timeouts(self, value):
+        if not isinstance(value, Timeouts):
+            raise TypeError(f"timeouts must be type Timeouts but type '{type(value)}' used")
+        self._timeouts = value
+
+    @property
+    def rate_limit_retries(self):
+        return self._rate_limit_retries
+
+    @rate_limit_retries.setter
+    def rate_limit_retries(self, value):
+        if not isinstance(value, int):
+            raise TypeError(f"rate_limit_retries must be type int but type '{type(value)}' used")
+        if value < 0:
+            raise ValueError(f"rate_limit_retries must be greater than or equal to zero but was '{value}'")
+        self._rate_limit_retries = value

lusid/extensions/api_client.py

@@ -154,7 +154,7 @@ class SyncApiClient:
             files=None, response_types_map=None, auth_settings=None,
             _return_http_data_only=None, collection_formats=None,
             _preload_content=True, _request_timeout=None, _host=None,
-            _request_auth=None):
+            _request_auth=None, opts=None):
 
         config = self.configuration
 
@@ -222,7 +222,8 @@ class SyncApiClient:
                 headers=header_params,
                 post_params=post_params, body=body,
                 _preload_content=_preload_content,
-                _request_timeout=_request_timeout)
+                _request_timeout=_request_timeout,
+                opts=opts)
         except ApiException as e:
             if e.body:
                 e.body = e.body.decode('utf-8')
@@ -371,7 +372,8 @@ class SyncApiClient:
                  response_types_map=None, auth_settings=None,
                  async_req=None, _return_http_data_only=None,
                  collection_formats=None, _preload_content=True,
-                 _request_timeout=None, _host=None, _request_auth=None):
+                 _request_timeout=None, _host=None, _request_auth=None,
+                 opts=None):
         """Makes the HTTP request (synchronous) and returns deserialized data.
 
         To make an async_req request, set the async_req parameter.
@@ -398,10 +400,9 @@ class SyncApiClient:
                                  Default is True.
         :param collection_formats: dict of collection formats for path, query,
             header, and post parameters.
-        :param _request_timeout: timeout setting for this request. If one
-                                 number provided, it will be total request
-                                 timeout. It can also be a pair (tuple) of
-                                 (connection, read) timeouts.
+        :param _request_timeout: Timeout setting. Do not use - use the opts parameter instead
+        :param opts: Configuration options for this request
+        :type opts: ConfigurationOptions, optional
         :param _request_auth: set to override the auth_settings for an a single
                               request; this effectively ignores the authentication
                               in the spec for a single request.
@@ -420,7 +421,7 @@ class SyncApiClient:
                                    response_types_map, auth_settings,
                                    _return_http_data_only, collection_formats,
                                    _preload_content, _request_timeout, _host,
-                                   _request_auth)
+                                   _request_auth, opts)
 
         return self.pool.apply_async(self.__call_api, (resource_path,
                                                        method, path_params,
@@ -433,30 +434,33 @@ class SyncApiClient:
                                                        collection_formats,
                                                        _preload_content,
                                                        _request_timeout,
-                                                       _host, _request_auth))
+                                                       _host, _request_auth, opts))
 
     def request(self, method, url, query_params=None, headers=None,
                 post_params=None, body=None, _preload_content=True,
-                _request_timeout=None):
+                _request_timeout=None, opts=None):
         """Makes the HTTP request using RESTClient."""
         if method == "GET":
             return self.rest_client.get_request(url,
                                         query_params=query_params,
                                         _preload_content=_preload_content,
                                         _request_timeout=_request_timeout,
-                                        headers=headers)
+                                        headers=headers,
+                                        opts=opts)
         elif method == "HEAD":
             return self.rest_client.head_request(url,
                                          query_params=query_params,
                                          _preload_content=_preload_content,
                                          _request_timeout=_request_timeout,
-                                         headers=headers)
+                                         headers=headers,
+                                         opts=opts)
         elif method == "OPTIONS":
             return self.rest_client.options_request(url,
                                             query_params=query_params,
                                             headers=headers,
                                             _preload_content=_preload_content,
-                                            _request_timeout=_request_timeout)
+                                            _request_timeout=_request_timeout,
+                                            opts=opts)
         elif method == "POST":
             return self.rest_client.post_request(url,
                                          query_params=query_params,
@@ -464,7 +468,8 @@ class SyncApiClient:
                                          post_params=post_params,
                                          _preload_content=_preload_content,
                                          _request_timeout=_request_timeout,
-                                         body=body)
+                                         body=body,
+                                         opts=opts)
         elif method == "PUT":
             return self.rest_client.put_request(url,
                                         query_params=query_params,
@@ -472,7 +477,8 @@ class SyncApiClient:
                                         post_params=post_params,
                                         _preload_content=_preload_content,
                                         _request_timeout=_request_timeout,
-                                        body=body)
+                                        body=body,
+                                        opts=opts)
         elif method == "PATCH":
             return self.rest_client.patch_request(url,
                                           query_params=query_params,
@@ -480,14 +486,16 @@ class SyncApiClient:
                                           post_params=post_params,
                                           _preload_content=_preload_content,
                                           _request_timeout=_request_timeout,
-                                          body=body)
+                                          body=body,
+                                          opts=opts)
         elif method == "DELETE":
             return self.rest_client.delete_request(url,
                                            query_params=query_params,
                                            headers=headers,
                                            _preload_content=_preload_content,
                                            _request_timeout=_request_timeout,
-                                           body=body)
+                                           body=body,
+                                           opts=opts)
         else:
             raise ApiValueError(
                 "http method must be `GET`, `HEAD`, `OPTIONS`,"

lusid/extensions/api_client_factory.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 from lusid.api_client import ApiClient
+from lusid.extensions.configuration_options import ConfigurationOptions
 from lusid.extensions.retry import (
     RetryingRestWrapper,
     RetryingRestWrapperAsync
@@ -68,6 +69,7 @@ class SyncApiClientFactory:
         ] = keep_alive_socket_options(),
         correlation_id: Optional[str] = None,
         app_name: Optional[str] = None,
+        opts: Optional[ConfigurationOptions] = None,
     ):
         """Create an ApiClientFactory which can build
         api objects with a configured ApiClient object
@@ -96,7 +98,8 @@ class SyncApiClientFactory:
         api_client_config = api_config.build_api_client_config(
             tcp_keep_alive=tcp_keep_alive,
             socket_options=socket_options,
-            id_provider_response_handler=id_provider_response_handler
+            id_provider_response_handler=id_provider_response_handler,
+            opts=opts
         )
         self.__api_client = SyncApiClient(
             configuration=api_client_config,
@@ -107,7 +110,9 @@ class SyncApiClientFactory:
         if tcp_keep_alive:
             rc.pool_manager.pool_classes_by_scheme = {"http": TCPKeepAliveHTTPConnectionPool, "https": TCPKeepAliveHTTPSConnectionPool}
 
-        wrapped_rest_client = rest_client_wrapper(rc)
+        wrapped_rest_client = rest_client_wrapper(
+            rest_object=rc, 
+            rate_limit_retries=api_client_config.rate_limit_retries)
         self.__api_client.rest_client = wrapped_rest_client
 
         set_additional_api_client_headers(
@@ -153,7 +158,8 @@ class ApiClientFactory:
         correlation_id: Optional[str] = None,
         app_name: Optional[str] = None,
         client_session: Optional[ClientSession] = None,
-        trace_configs: Optional[List[TraceConfig]] = None
+        trace_configs: Optional[List[TraceConfig]] = None,
+        opts: Optional[ConfigurationOptions] = None,
     ):
         """Create an ApiClientFactory which can build api 
         objects with a configured ApiClient object
@@ -189,7 +195,8 @@ class ApiClientFactory:
         api_client_config = api_config.build_api_client_config(
             tcp_keep_alive=tcp_keep_alive,
             socket_options=socket_options,
-            id_provider_response_handler=id_provider_response_handler
+            id_provider_response_handler=id_provider_response_handler,
+            opts=opts
         )
         self.__api_client = ApiClient(
             configuration=api_client_config,
@@ -218,7 +225,9 @@ class ApiClientFactory:
             logger.exception("client_session must be an aiohttp.ClientSession"
                              " object with an initialised TCP Connector")
         rest_client_wrapper = RetryingRestWrapperAsync
-        wrapped_rest_client = rest_client_wrapper(rc)
+        wrapped_rest_client = rest_client_wrapper(
+            rest_object=rc, 
+            rate_limit_retries=api_client_config.rate_limit_retries)
         self.__api_client.rest_client = wrapped_rest_client
         set_additional_api_client_headers(
             self.__api_client, app_name=app_name, correlation_id=correlation_id

lusid/extensions/api_configuration.py

@@ -1,7 +1,8 @@
 import re
 import logging
 from typing import Optional, Union, Tuple, Any, Callable
-from lusid.configuration import Configuration
+from lusid.configuration import Configuration, Timeouts
+from lusid.extensions.configuration_options import ConfigurationOptions
 from lusid.extensions.refreshing_token import RefreshingToken
 from lusid.extensions.socket_keep_alive import keep_alive_socket_options
 from lusid.extensions.proxy_config import ProxyConfig
@@ -22,6 +23,10 @@ class ApiConfiguration:
         certificate_filename=None,
         proxy_config:Optional[ProxyConfig]=None,
         access_token=None,
+        total_timeout_ms=None,
+        connect_timeout_ms=None,
+        read_timeout_ms=None,
+        rate_limit_retries=None,
     ):
         """
         The configuration required to access LUSID, read more at https://support.finbourne.com/getting-started-with-apis-sdks
@@ -46,6 +51,10 @@ class ApiConfiguration:
         self.__certificate_filename = certificate_filename
         self.__proxy_config = proxy_config
         self.__access_token = access_token
+        self.__total_timeout_ms = total_timeout_ms
+        self.__connect_timeout_ms = connect_timeout_ms
+        self.__read_timeout_ms = read_timeout_ms
+        self.__rate_limit_retries = rate_limit_retries
 
     @property
     def token_url(self):
@@ -181,6 +190,35 @@ class ApiConfiguration:
             )
             raise
 
+    @property
+    def total_timeout_ms(self):
+        return self.__total_timeout_ms
+
+    @total_timeout_ms.setter
+    def total_timeout_ms(self, value):
+        self.__total_timeout_ms = value
+
+    @property
+    def connect_timeout_ms(self):
+        return self.__connect_timeout_ms
+
+    @connect_timeout_ms.setter
+    def connect_timeout_ms(self, value):
+        self.__connect_timeout_ms = value
+
+    @property
+    def read_timeout_ms(self):
+        return self.__read_timeout_ms
+
+    @read_timeout_ms.setter
+    def read_timeout_ms(self, value):
+        self.__read_timeout_ms = value
+
+    @property
+    def rate_limit_retries(self):
+        return self.__rate_limit_retries
+
+
     def build_api_client_config(
         self,
         tcp_keep_alive: bool = True,
@@ -188,6 +226,7 @@ class ApiConfiguration:
             Union[Tuple[Any, Any, Any], Tuple[Any, Any, None, int]]
         ] = keep_alive_socket_options(),
         id_provider_response_handler: Optional[Callable[[Response], None]] = None,
+        opts: ConfigurationOptions = None,
     ) -> Configuration:
         """Builds lusid.Configuration for initialising an api client.
 
@@ -219,6 +258,16 @@ class ApiConfiguration:
                 access_token=access_token,
                 host=self.api_url,
                 ssl_ca_cert=self.certificate_filename,
+                timeouts=Timeouts(
+                    total_timeout_ms=opts.total_timeout_ms if opts and opts.total_timeout_ms != None else 
+                        self.total_timeout_ms if self.total_timeout_ms != None else Configuration.DEFAULT_TOTAL_TIMEOUT_MS,
+                    connect_timeout_ms=opts.connect_timeout_ms if opts and opts.connect_timeout_ms != None else 
+                        self.connect_timeout_ms if self.connect_timeout_ms != None else Configuration.DEFAULT_CONNECT_TIMEOUT_MS,
+                    read_timeout_ms=opts.read_timeout_ms if opts and opts.read_timeout_ms != None else 
+                        self.read_timeout_ms if self.read_timeout_ms != None else Configuration.DEFAULT_READ_TIMEOUT_MS
+                ),
+                rate_limit_retries=opts.rate_limit_retries if opts != None and opts.rate_limit_retries != None else 
+                        self.rate_limit_retries if self.rate_limit_retries != None else Configuration.DEFAULT_RATE_LIMIT_RETRIES
             )
             if tcp_keep_alive:
                 config.socket_options = socket_options or keep_alive_socket_options()

lusid/extensions/configuration_loaders.py

@@ -5,6 +5,7 @@ import logging
 from lusid.extensions.proxy_config import ProxyConfig
 from lusid.extensions.api_configuration import ApiConfiguration
 from lusid.extensions.file_access_token import FileAccessToken
+from lusid.extensions.configuration_options import ConfigurationOptions
 
 logger = logging.getLogger(__name__)
 
@@ -21,7 +22,11 @@ ENVIRONMENT_CONFIG_KEYS = {
     "proxy_address": "FBN_PROXY_ADDRESS",
     "proxy_username": "FBN_PROXY_USERNAME",
     "proxy_password": "FBN_PROXY_PASSWORD",
-    "access_token": "FBN_ACCESS_TOKEN"
+    "access_token": "FBN_ACCESS_TOKEN",
+    "total_timeout_ms": "FBN_TOTAL_TIMEOUT_MS",
+    "connect_timeout_ms": "FBN_CONNECT_TIMEOUT_MS",
+    "read_timeout_ms": "FBN_READ_TIMEOUT_MS",
+    "rate_limit_retries": "FBN_RATE_LIMIT_RETRIES",
 }
 
 SECRETS_FILE_CONFIG_KEYS = {
@@ -37,7 +42,11 @@ SECRETS_FILE_CONFIG_KEYS = {
     "proxy_address": "address",
     "proxy_username": "username",
     "proxy_password": "password",
-    "access_token": "accessToken"
+    "access_token": "accessToken",
+    "total_timeout_ms": "totalTimeoutMs",
+    "connect_timeout_ms": "connectTimeoutMs",
+    "read_timeout_ms": "readTimeoutMs",
+    "rate_limit_retries": "rateLimitRetries",
 }
 
 
@@ -47,7 +56,7 @@ class ConfigurationLoader(Protocol):
     environment variables with preference given to the secrets file.
     """
 
-    def load_config(self) -> Dict[str, str]:
+    def load_config(self) -> Dict[str, object]:
         pass
 
 
@@ -67,12 +76,12 @@ class SecretsFileConfigurationLoader:
         """
         self._api_secrets_file = api_secrets_file or ""
 
-    def load_config(self) -> Dict[str, str]:
+    def load_config(self) -> Dict[str, object]:
         """reads config from the provided secrets file
 
         Returns
         -------
-        Dict[str, str]
+        Dict[str, object]
             dictionary that can be loaded into an ApiConfiguration object
         """
         # The secrets file is a nested dictionary, set the names of the top level keys
@@ -117,12 +126,12 @@ class SecretsFileConfigurationLoader:
 class EnvironmentVariablesConfigurationLoader:
     """ConfigurationLoader which reads config from environment variables
     """    
-    def load_config(self) -> Dict[str, str]:
+    def load_config(self) -> Dict[str, object]:
         """reads config from environment variables
 
         Returns
         -------
-        Dict[str, str]
+        Dict[str, object]
             dictionary that can be loaded into an ApiConfiguration object
         """
         logger.debug("loading config from environment variables")
@@ -134,6 +143,13 @@ class EnvironmentVariablesConfigurationLoader:
         }
         if not populated_api_config_values["api_url"]:
             populated_api_config_values["api_url"] = populated_api_config_values["previous_api_url"]
+        # ensure that these values are ints
+        for key in ["total_timeout_ms", "connect_timeout_ms", "read_timeout_ms", "rate_limit_retries"]:
+            if populated_api_config_values[key]:
+                try:
+                    populated_api_config_values[key] = int(populated_api_config_values[key])
+                except ValueError as e:
+                    raise ValueError(f"invalid value for '{key}' - value must be an integer if set")
         del(populated_api_config_values["previous_api_url"])
         populated_proxy_values = {
             key: os.environ.get(value)
@@ -162,7 +178,11 @@ class ArgsConfigurationLoader:
         proxy_address:Optional[str]=None,
         proxy_username:Optional[str]=None,
         proxy_password:Optional[str]=None,
-        access_token:Optional[str]=None
+        access_token:Optional[str]=None,
+        total_timeout_ms:Optional[int]=None,
+        connect_timeout_ms:Optional[int]=None,
+        read_timeout_ms:Optional[int]=None,
+        rate_limit_retries:Optional[int]=None,
         ):
         """kwargs passed to this constructor used to build ApiConfiguration
         """
@@ -178,13 +198,17 @@ class ArgsConfigurationLoader:
         self.__proxy_username = proxy_username
         self.__proxy_password = proxy_password
         self.__access_token = access_token
+        self.__total_timeout_ms = total_timeout_ms
+        self.__connect_timeout_ms = connect_timeout_ms
+        self.__read_timeout_ms = read_timeout_ms
+        self.__rate_limit_retries = rate_limit_retries
 
-    def load_config(self) -> Dict[str, str]:
+    def load_config(self) -> Dict[str, object]:
         """load configuration from kwargs passed to constructor
 
         Returns
         -------
-        Dict[str, str]
+        Dict[str, object]
             dictionary that can be loaded into an ApiConfiguration object
         """
         logger.debug("loading config from arguments passed to ArgsConfigurationLoader")
@@ -200,7 +224,11 @@ class ArgsConfigurationLoader:
             "proxy_address" : self.__proxy_address, 
             "proxy_username" : self.__proxy_username, 
             "proxy_password" : self.__proxy_password, 
-            "access_token" : self.__access_token
+            "access_token" : self.__access_token,
+            "total_timeout_ms" : self.__total_timeout_ms,
+            "connect_timeout_ms" : self.__connect_timeout_ms,
+            "read_timeout_ms" : self.__read_timeout_ms,
+            "rate_limit_retries" : self.__rate_limit_retries,
         }