wizata-dsapi 1.2.14__tar.gz → 1.2.15__tar.gz

{wizata_dsapi-1.2.14 → wizata_dsapi-1.2.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wizata_dsapi
-Version: 1.2.14
+Version: 1.2.15
 Summary: Wizata Data Science Toolkit
 Author: Wizata S.A.
 Author-email: info@wizata.com

{wizata_dsapi-1.2.14 → wizata_dsapi-1.2.15}/wizata_dsapi/request.py

@@ -26,10 +26,12 @@ class DynamicSelector:
     def __init__(self,
                  category = None,
                  unit = None,
+                 twin_type = None,
                  agg_method = None,
                  rename = None):
         self.category = category
         self.unit = unit
+        self.twin_type = twin_type
         self.agg_method = agg_method
         self.rename = rename
         self.datapoints = []
@@ -47,6 +49,8 @@ class DynamicSelector:
             self.category = obj["category"]
         if "unit" in obj:
             self.unit = obj["unit"]
+        if "twin_type" in obj:
+            self.twin_type = obj["twin_type"]
         if "datapoints" in obj:
             self.datapoints = obj["datapoints"]
         if "rename" in obj:
@@ -60,6 +64,8 @@ class DynamicSelector:
             obj["category"] = self.category
         if self.unit:
             obj["unit"] = self.unit
+        if self.twin_type:
+            obj["twin_type"] = self.twin_type
         if self.datapoints:
             obj["datapoints"] = self.datapoints
         if self.agg_method:

wizata_dsapi-1.2.15/wizata_dsapi/version.py

@@ -0,0 +1 @@
+__version__ = "1.2.15"

{wizata_dsapi-1.2.14 → wizata_dsapi-1.2.15}/wizata_dsapi/wizata_dsapi_client.py

@@ -611,7 +611,7 @@ class WizataDSAPIClient(ApiInterface):
             raise TypeError("Type not supported.")
 
     def query(self,
-              datapoints: list[str] = None,
+              datapoints: list = None,
               start: datetime = None,
               end: datetime = None,
               interval: int = None,
@@ -662,7 +662,7 @@ class WizataDSAPIClient(ApiInterface):
 
         request.set_aggregation(agg_method, interval)
 
-        if template is not None and twin is not None:
+        if template is not None or twin is not None:
             request.select_template(
                 template_key=template,
                 twin_hardware_id=twin
@@ -692,7 +692,7 @@ class WizataDSAPIClient(ApiInterface):
 
     def batch_query(self,
                     step: timedelta,
-                    datapoints: list[str] = None,
+                    datapoints: list = None,
                     start: datetime = None,
                     end: datetime = None,
                     interval: int = None,

{wizata_dsapi-1.2.14 → wizata_dsapi-1.2.15}/wizata_dsapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wizata-dsapi
-Version: 1.2.14
+Version: 1.2.15
 Summary: Wizata Data Science Toolkit
 Author: Wizata S.A.
 Author-email: info@wizata.com

wizata_dsapi-1.2.14/wizata_dsapi/version.py

@@ -1 +0,0 @@
-__version__ = "1.2.14"