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

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

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

{wizata_dsapi-1.2.24 → 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.24 → wizata_dsapi-1.2.26}/wizata_dsapi/template.py

@@ -1,5 +1,6 @@
 import uuid
 import json
+from typing import Optional
 
 from .api_dto import ApiDto, VarType
 
@@ -243,7 +244,8 @@ class Template(ApiDto):
             p_type: VarType,
             required: bool = True,
             template_property_id: uuid.UUID = None,
-            description: str = None):
+            description: str = None,
+            unit_id: uuid.UUID = None):
         """
         add a property to the template.
         :param str name: name of the property.
@@ -251,6 +253,7 @@ class Template(ApiDto):
         :param bool required: set if property is required (default: true)
         :param uuid.UUID template_property_id: technical id of the template property.
         :param str description: additional information as a description.
+        :param uuid.UUID unit_id: unique identifier of unit for datapoint property.
         """
 
         if self.properties is None:
@@ -264,7 +267,8 @@ class Template(ApiDto):
             name=name,
             p_type=p_type,
             required=required,
-            description=description
+            description=description,
+            unit_id=unit_id
         )
         property_value.template_id = self.template_id
 
@@ -275,7 +279,7 @@ class Template(ApiDto):
 
         self.properties.append(property_value)
 
-    def get_property(self, property_name) -> TemplateProperty:
+    def get_property(self, property_name) -> Optional[TemplateProperty]:
         """
         get a property from its name.
         :param property_name: name of the property.
@@ -284,6 +288,7 @@ class Template(ApiDto):
         for t_property in self.properties:
             if t_property.name == property_name:
                 return t_property
+        return None
 
     def add_property(self, property_value):
         """
@@ -317,11 +322,16 @@ class Template(ApiDto):
             if "description" in property_value:
                 description = property_value["description"]
 
+            unit_id = None
+            if "unitId" in property_value and property_value["unitId"] is not None:
+                unit_id = uuid.UUID(property_value["unitId"])
+
             self.add(template_property_id=template_property_id,
                      name=name,
                      p_type=p_type,
                      required=required,
-                     description=description)
+                     description=description,
+                     unit_id=unit_id)
         elif isinstance(property_value, TemplateProperty):
             property_value.template_id = self.template_id
 

wizata_dsapi-1.2.26/wizata_dsapi/version.py

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

{wizata_dsapi-1.2.24 → 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.24 → 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.24
+Version: 1.2.26
 Summary: Wizata Data Science Toolkit
 Author: Wizata S.A.
 Author-email: info@wizata.com

wizata_dsapi-1.2.24/wizata_dsapi/version.py

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