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

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

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

{wizata_dsapi-1.2.15 → wizata_dsapi-1.2.16}/wizata_dsapi/twin.py

@@ -147,10 +147,19 @@ class Twin(ApiDto):
         obj.from_json(data)
         return obj
 
-    def __init__(self, twin_id=None, hardware_id=None, name=None, parent_id=None, ttype=TwinBlockType.MACHINE,
+    def __init__(self,
+                 twin_id=None,
+                 hardware_id=None,
+                 name=None, parent_id=None,
+                 ttype=TwinBlockType.MACHINE,
                  type_id:uuid.UUID = None,
-                 latitude_id: uuid.UUID = None, longitude_id: uuid.UUID = None, color: str = None, icon: str = None,
-                 latitude: float = None, longitude: float = None,
+                 twin_type:TwinType = None,
+                 latitude_id: uuid.UUID = None,
+                 longitude_id: uuid.UUID = None,
+                 color: str = None,
+                 icon: str = None,
+                 latitude: float = None,
+                 longitude: float = None,
                  extra_properties: dict = None,
                  description: str = None):
         if twin_id is None:
@@ -161,7 +170,11 @@ class Twin(ApiDto):
         self.name = name
         self.parent_id = parent_id
         self.type = ttype
-        self.type_id = type_id
+        if twin_type is not None:
+            self.twin_type = twin_type
+            self.type_id = twin_type.twin_type_id
+        else:
+            self.type_id = type_id
         self.description = description
         self.latitude = latitude
         self.longitude = longitude
@@ -235,7 +248,9 @@ class Twin(ApiDto):
             obj["name"] = str(self.name)
         if self.parent_id is not None:
             obj["parentId"] = str(self.parent_id)
-        if self.type_id is not None:
+        if self.twin_type is not None:
+            obj["twinTypeId"] = str(self.twin_type.twin_type_id)
+        elif self.type_id is not None:
             obj["twinTypeId"] = str(self.type_id)
         if self.type is not None and isinstance(self.type, TwinBlockType):
             obj["type"] = self.type.value

wizata_dsapi-1.2.16/wizata_dsapi/version.py

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

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

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

wizata_dsapi-1.2.15/wizata_dsapi/version.py

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