wizata-dsapi 1.2.14__py3-none-any.whl → 1.2.16__py3-none-any.whl

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/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/version.py

@@ -1 +1 @@
-__version__ = "1.2.14"
+__version__ = "1.2.16"

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.dist-info → wizata_dsapi-1.2.16.dist-info}/METADATA

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

{wizata_dsapi-1.2.14.dist-info → wizata_dsapi-1.2.16.dist-info}/RECORD

@@ -23,18 +23,18 @@ wizata_dsapi/pipeline.py,sha256=WDJeOxPZJiYW1qwTNZUm3jom2epIxqrSoiUwcrTF9EE,3130
 wizata_dsapi/pipeline_deployment.py,sha256=grekBaxUK0EhL9w7lDB8vNuW_wzLnHVm9Mq8Lkbkguk,1722
 wizata_dsapi/pipeline_image.py,sha256=M3FOr45dJIAEvsmXPpMD8JZ09k5-YpW9PRYEWJqptcI,5272
 wizata_dsapi/plot.py,sha256=SPGKFWWYNcRvHcqvvnPIIIBKsd5UwhdsxLW7b2dG2rs,2360
-wizata_dsapi/request.py,sha256=sY3Snpt4mIPauSd6dyBckWXQqRwFdhW4HHigsHLHCVU,26012
+wizata_dsapi/request.py,sha256=y1QDcar5ZsTTP07SecucRSa4GCThBE1rxeKSv_yZMrQ,26232
 wizata_dsapi/script.py,sha256=DeEciwVpuCYZetgJCoivw_bYe8ma52WuTaTQ_VkLEcg,12930
 wizata_dsapi/solution_component.py,sha256=8gbZWx2h_xUqI_pAXa3goqAnR5Y-GDMii8MeGlaK1IE,9531
 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=_iYbbKw_m8flEzdnwGbA-NvSUiyQQDgCTa9vJeEggRg,10556
+wizata_dsapi/twin.py,sha256=z-C-DnrN2SQvtr0zsYEl8daaYkU_FlGKQzQCaQUUOK4,10983
 wizata_dsapi/twinregistration.py,sha256=Mi6-YuwroiEXc0c1hgrOaphh4hNVoHupxOnXedVtJtE,13377
-wizata_dsapi/version.py,sha256=mxzjGyB-ihJR05pHYcBiUe_XT5X9wj6cBHLxOXBhAeM,23
+wizata_dsapi/version.py,sha256=7RIJ-Nh9kHJf5O5NvahUeP8DNXq6oIzbYcIt_yKv0lQ,23
 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=qVUwd_S_8NMXHygZpCxj2lP6wZSjxe-W9eOTOAqnzPg,78713
+wizata_dsapi/wizata_dsapi_client.py,sha256=6URQeMA5A9eXxC2cs8TUbKolmOo-Kj6kII9NmRRITPQ,78702
 wizata_dsapi/words.py,sha256=tV8CqzCqODZCV7PgBxBF5exBxeF_ya9t5DiUy-cg6Sg,1535
 wizata_dsapi/models/__init__.py,sha256=O5PHqw8lKILw4apO-MfDxPz73wK0vADD9y3xjuzX7Tw,104
 wizata_dsapi/models/common.py,sha256=1dTqE80-mFJnUwEdNlJdhJzfZ2N5Kp8Nb3LQ8uwPtLc,3808
@@ -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.14.dist-info/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-wizata_dsapi-1.2.14.dist-info/METADATA,sha256=VRaDLyPsjvrAUfFD7TM8YyLi5xRnXp3uR-fIvYmJDYQ,2188
-wizata_dsapi-1.2.14.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-wizata_dsapi-1.2.14.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
-wizata_dsapi-1.2.14.dist-info/RECORD,,
+wizata_dsapi-1.2.16.dist-info/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+wizata_dsapi-1.2.16.dist-info/METADATA,sha256=T9Ji9QQP958xJdCadjYIrKEnza1E9zN3LFlEwvj5B9c,2188
+wizata_dsapi-1.2.16.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+wizata_dsapi-1.2.16.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
+wizata_dsapi-1.2.16.dist-info/RECORD,,