wizata-dsapi 1.2.7__py3-none-any.whl → 1.2.8__py3-none-any.whl

wizata_dsapi/twin.py

@@ -2,6 +2,7 @@ import uuid
 from .api_dto import ApiDto
 from enum import Enum
 import re
+import json
 
 
 def is_valid_hex_color(color):
@@ -149,7 +150,9 @@ class Twin(ApiDto):
     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, description: str = None):
+                 latitude: float = None, longitude: float = None,
+                 extra_properties: dict = None,
+                 description: str = None):
         if twin_id is None:
             self.twin_id = uuid.uuid4()
         else:
@@ -168,6 +171,7 @@ class Twin(ApiDto):
             is_valid_hex_color(color)
         self.color = color
         self.icon = icon
+        self.extra_properties = extra_properties
         self.createdById = None
         self.createdDate = None
         self.updatedById = None
@@ -207,6 +211,11 @@ class Twin(ApiDto):
             self.description = str(obj["description"])
         if "type" in obj.keys():
             self.type = TwinBlockType(str(obj["type"]))
+        if "extraProperties" in obj.keys():
+            if isinstance(obj["extraProperties"], str):
+                self.extra_properties = json.loads(obj["extraProperties"])
+            else:
+                self.extra_properties = obj["extraProperties"]
         if "createdById" in obj.keys() and obj["createdById"] is not None:
             self.createdById = obj["createdById"]
         if "createdDate" in obj.keys() and obj["createdDate"] is not None:
@@ -244,6 +253,10 @@ class Twin(ApiDto):
             obj["longitudeSensorId"] = str(self.longitude_id)
         if self.icon is not None:
             obj["icon"] = str(self.icon)
+        if self.extra_properties is not None:
+            if not isinstance(self.extra_properties, dict):
+                raise ValueError('on twin extra properties must be None or a JSON serializable dict')
+            obj["extraProperties"] = json.dumps(self.extra_properties)
         if self.createdById is not None:
             obj["createdById"] = str(self.createdById)
         if self.createdDate is not None:

wizata_dsapi/version.py

@@ -1 +1 @@
-__version__ = "1.2.7"
+__version__ = "1.2.8"

{wizata_dsapi-1.2.7.dist-info → wizata_dsapi-1.2.8.dist-info}/METADATA

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

{wizata_dsapi-1.2.7.dist-info → wizata_dsapi-1.2.8.dist-info}/RECORD

@@ -29,9 +29,9 @@ wizata_dsapi/solution_component.py,sha256=8gbZWx2h_xUqI_pAXa3goqAnR5Y-GDMii8MeGl
 wizata_dsapi/streamlit_utils.py,sha256=sXBdygktbixV828Zg01Nl27_a4F8zGFc4RY0C8g-1bc,1942
 wizata_dsapi/template.py,sha256=h2f3dLduJ4WhreVxJXuFIB3pinnI3c39WxBms0bCgos,13007
 wizata_dsapi/trigger.py,sha256=w3BZYP-L3SUwvaT0oCTanh_Ewn57peZvlt7vxzHv9J8,5129
-wizata_dsapi/twin.py,sha256=LXlX4kUl7JzONyXsuyHfcEFcXvo5ne0PGJfHfK4bXEc,9895
+wizata_dsapi/twin.py,sha256=_iYbbKw_m8flEzdnwGbA-NvSUiyQQDgCTa9vJeEggRg,10556
 wizata_dsapi/twinregistration.py,sha256=Mi6-YuwroiEXc0c1hgrOaphh4hNVoHupxOnXedVtJtE,13377
-wizata_dsapi/version.py,sha256=49prCLbE3fFzLfxem5rd2dr1iV4_L-bN0N4J7jxU5yA,22
+wizata_dsapi/version.py,sha256=CfVXm0wwlKPW0khOcwhWw61TpgtZiLijCePsAIOK3aU,22
 wizata_dsapi/wizard_function.py,sha256=RbM7W7Gf-6Rhp_1dU9DBYkHaciknGAGvuAndhAS_vyo,942
 wizata_dsapi/wizard_request.py,sha256=v6BaqKLKvTWmUSo0_gda9FabAQz5x_-GOH1Av50GzFo,3762
 wizata_dsapi/wizata_dsapi_client.py,sha256=Qz54vYoxRLBUa21Q55K5Oo1qtZpW9ucuXi4BX1N85oE,78716
@@ -42,8 +42,8 @@ wizata_dsapi/plots/__init__.py,sha256=qgnSFqrjOPur-807M8uh5awIfjM1ZHXUXcAqHc-r2l
 wizata_dsapi/plots/common.py,sha256=jdPsJqLHBwSKc6dX83BSGPqSRxzIVNHSYO5yI_8sjGk,6568
 wizata_dsapi/scripts/__init__.py,sha256=hAxiETSQf0qOHde1si1tEAJU48seqEgHrchCzS2-LvQ,80
 wizata_dsapi/scripts/common.py,sha256=efwq-Rd0lvYljIs3gSFz9izogBD7asOU2cTK-IvHTkM,4244
-wizata_dsapi-1.2.7.dist-info/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-wizata_dsapi-1.2.7.dist-info/METADATA,sha256=mLlTT4h_hWFEe07idxFfTx1-guTPcgIu56sAfrIoUEA,2187
-wizata_dsapi-1.2.7.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-wizata_dsapi-1.2.7.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
-wizata_dsapi-1.2.7.dist-info/RECORD,,
+wizata_dsapi-1.2.8.dist-info/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+wizata_dsapi-1.2.8.dist-info/METADATA,sha256=WRikpYQRfPcBEkfk239lutdBmdl7ApxLsglLGMdmySk,2187
+wizata_dsapi-1.2.8.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+wizata_dsapi-1.2.8.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
+wizata_dsapi-1.2.8.dist-info/RECORD,,