add timeout to the API

examples/get_metrics.py

@@ -11,7 +11,9 @@
 
 def main():
     # Init
-    drift_client = DriftClient("drift-test-rig.local", os.getenv("DRIFT_PASSWORD"))
+    drift_client = DriftClient(
+        "192.168.1.25", os.getenv("DRIFT_PASSWORD"), timeout=100.0
+    )
     metrics = drift_client.get_metrics(
         "energy-distr-1",
         start=datetime.datetime.now() - datetime.timedelta(minutes=15),

pkg/drift_client/drift_client.py

@@ -54,6 +54,7 @@ def __init__(self, host: str, password: str, **kwargs):
             influx_port (int): InfluxDB port. Default: 8086,
             mqtt_port (int): MQTT port. Default: 1883
             loop: asyncio loop for integration into async code
+            timeout (float): Timeout for requests. Default: 30 seconds
         """
         if password is None or password == "":
             raise ValueError("Password is required")
@@ -68,6 +69,7 @@ def __init__(self, host: str, password: str, **kwargs):
         )
         mqtt_port = kwargs["mqtt_port"] if "mqtt_port" in kwargs else 1883
         loop = kwargs["loop"] if "loop" in kwargs else None
+        timeout = kwargs["timeout"] if "timeout" in kwargs else 30
 
         self._mqtt_client = MQTTClient(
             f"mqtt://{host}:{mqtt_port}",
@@ -79,12 +81,14 @@ def __init__(self, host: str, password: str, **kwargs):
             org,
             password,
             False,
+            timeout,
         )  # TBD!!! --> SSL handling!
 
         try:
             self._blob_storage = ReductStoreClient(
                 f"{('https://' if secure else 'http://')}{host}:{reduct_storage_port}",
                 password,
+                timeout,
                 loop,
             )
             return

pkg/drift_client/drift_data_package.py

@@ -1,4 +1,5 @@
 """Wrapper around DriftPackage"""
+
 from typing import Optional, Dict
 
 from drift_bytes import Variant, InputBuffer

pkg/drift_client/influxdb_client.py

@@ -10,13 +10,7 @@
 class InfluxDBClient:
     """Wrapper around `InfluxDBClient`"""
 
-    def __init__(
-        self,
-        uri: str,
-        org: str,
-        token: str,
-        secure: bool,
-    ):
+    def __init__(self, uri: str, org: str, token: str, secure: bool, timeout: float):
         """Create Client for InfluxDB access
 
         :param uri: URI, format: <protocol>://<host>:<port>
@@ -34,6 +28,7 @@ def __init__(
             org=org,
             token=token,
             verify_ssl=secure,
+            timeout=int(timeout * 1000),
         )
         self.__query_api = self.__client.query_api()
         self.__bucket = "data"

pkg/drift_client/reduct_client.py

@@ -1,4 +1,5 @@
 """Reduct Storage client"""
+
 import asyncio
 from asyncio import new_event_loop
 from typing import Tuple, List, Optional, Dict, Iterator
@@ -11,14 +12,14 @@
 class ReductStoreClient:
     """Wrapper around ReductStore client"""
 
-    def __init__(self, url: str, token: str, loop=None):
+    def __init__(self, url: str, token: str, timeout: float, loop=None):
         """
         Args:
             url: ReductStore URL
             token: ReductStore API token
             loop: asyncio event loop
         """
-        self._client = Client(url, api_token=token)
+        self._client = Client(url, api_token=token, timeout=timeout)
         self._bucket = "data"
         self._loop = loop if loop else new_event_loop()
         _ = self._run(self._client.info())  # check connection for fallback to Minio

tests/drift_client_test.py

@@ -1,4 +1,5 @@
 """Tests for DriftClient"""
+
 from datetime import datetime
 from typing import Optional, List, Any
 

tests/influxdb_client_test.py

@@ -1,4 +1,5 @@
 """InfluxDB Client"""
+
 from datetime import datetime
 
 import pytest

tests/minio_client_test.py

@@ -1,4 +1,5 @@
 """Minio Client"""
+
 import pytest
 
 from minio.error import S3Error

tests/package_test.py

@@ -1,4 +1,5 @@
 """Tests for Package"""
+
 from typing import Dict
 
 # pylint: disable=no-member

tests/reduct_client_test.py

@@ -1,4 +1,5 @@
 """Reduct Storage Client"""
+
 from typing import Optional, List, Any
 
 import pytest