wizata-dsapi 1.2.25__tar.gz → 1.2.26__tar.gz

{wizata_dsapi-1.2.25 → wizata_dsapi-1.2.26}/PKG-INFO

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

{wizata_dsapi-1.2.25 → wizata_dsapi-1.2.26}/wizata_dsapi/request.py

@@ -355,6 +355,36 @@ class Request(ApiDto):
         else:
             return
 
+    def set_twin(self, twin):
+        """
+        set a twin properly (str hardware Id or uuid.UUID)
+        :param twin:
+        :return:
+        """
+        if self.template is None:
+            self.template = {}
+        if isinstance(twin, uuid.UUID):
+            self.template['twin_id'] = twin
+        elif isinstance(twin, str):
+            self.template['twin_hardware_id'] = twin
+        else:
+            raise TypeError('twin must be str or uuid on request')
+
+    def set_template(self, template):
+        """
+        set a template properly (str key or uuid.UUID)
+        :param template:
+        :return:
+        """
+        if self.template is None:
+            self.template = {}
+        if isinstance(template, uuid.UUID):
+            self.template['template_id'] = template
+        elif isinstance(template, str):
+            self.template['template_key'] = template
+        else:
+            raise TypeError('template must be str or uuid on request')
+
     def __format_date(self, dt_to_format):
         if isinstance(dt_to_format, datetime):
             millisec = dt_to_format.timestamp() * 1000
@@ -468,22 +498,27 @@ class Request(ApiDto):
         else:
             self.template = {}
 
-            if template_id is not None:
+            template = None
+            if template_key is not None:
+                template = template_key
+            elif template_id is not None:
                 if isinstance(template_id, uuid.UUID):
-                    self.template['template_id'] = template_id
+                    template = template_id
                 else:
-                    self.template['template_id'] = uuid.UUID(template_id)
-            elif template_key is not None:
-                self.template['template_key'] = str(template_key)
-
-            if twin_id is not None:
+                    template = uuid.UUID(template_id)
+            if template is not None:
+                self.set_template(template=template)
+
+            twin = None
+            if twin_hardware_id is not None:
+                twin = twin_hardware_id
+            elif twin_id is not None:
                 if isinstance(twin_id, uuid.UUID):
-                    self.template['twin_id'] = twin_id
+                    twin = twin_id
                 else:
-                    self.template['twin_id'] = uuid.UUID(twin_id)
-
-            elif twin_hardware_id is not None:
-                self.template['twin_hardware_id'] = str(twin_hardware_id)
+                    twin = uuid.UUID(twin_id)
+            if twin is not None:
+                self.set_twin(twin=twin)
 
     def get_params(self):
         """

wizata_dsapi-1.2.26/wizata_dsapi/version.py

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

{wizata_dsapi-1.2.25 → wizata_dsapi-1.2.26}/wizata_dsapi/wizata_dsapi_client.py

@@ -662,11 +662,11 @@ class WizataDSAPIClient(ApiInterface):
 
         request.set_aggregation(agg_method, interval)
 
-        if template is not None or twin is not None:
-            request.select_template(
-                template_key=template,
-                twin_hardware_id=twin
-            )
+        if twin is not None:
+            request.set_twin(twin)
+
+        if template is not None:
+            request.set_template(template)
 
         if filters is not None:
             request.filters = filters

{wizata_dsapi-1.2.25 → wizata_dsapi-1.2.26}/wizata_dsapi.egg-info/PKG-INFO

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

wizata_dsapi-1.2.25/wizata_dsapi/version.py

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