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

wizata_dsapi/__init__.py

@@ -18,7 +18,7 @@ from .group_system import GroupSystem
 from .bucket import Bucket
 
 # Sql Entities (Dto)
-from .twin import Twin, TwinBlockType
+from .twin import Twin, TwinBlockType, TwinType
 from .datapoint import DataPoint, BusinessType, Label, Unit, Category, InputModeType
 from .datastore import DataStore
 from .insight import Insight

wizata_dsapi/api_config.py

@@ -14,7 +14,7 @@ from .solution_component import SolutionComponent
 from .business_label import BusinessLabel
 from .twinregistration import TwinRegistration, TwinRegistrationProperty
 from .trigger import Trigger
-from .twin import Twin
+from .twin import Twin, TwinType
 from .pipeline import Pipeline
 from .pipeline_image import PipelineImage
 from .insight import Insight
@@ -147,5 +147,11 @@ _registry = {
             "class": Twin,
             "cloud_dsapi": ['lists', 'get_by_id', 'get_by_key', 'create', 'update', 'delete', 'search'],
             "cloud_context": ['get_by_id', 'get_by_key', 'create', 'update', 'delete', 'search']
+        },
+    "twintypes":
+        {
+            "class": TwinType,
+            "cloud_dsapi": [ 'get_by_id', 'create', 'update', 'delete'],
+            "cloud_context": [ 'get_by_id', 'create', 'update', 'delete' ]
         }
 }

wizata_dsapi/request.py

@@ -15,25 +15,6 @@ filter_map = {
     '!=': 'neq'
 }
 
-
-class RequestGroupMap:
-    """
-    Define a mapping between a set of datapoints and their corresponding event datapoint.
-    :ivar event_hardware_id str: hardware id of the datapoint identifying event inside a group.
-    :ivar event_datapoint: datapoint complete definition corresponding to event_hardware_id.
-    :ivar datapoints_hardware_ids list: list of all related datapoints.
-    :ivar datapoints dict: dict with key as hardware id and value datapoint for all mapped datapoints.
-    """
-
-    def __init__(self,
-                 event_hardware_id: str,
-                 datapoints_hardware_ids: list):
-        self.event_hardware_id = event_hardware_id
-        self.datapoints_hardware_ids = datapoints_hardware_ids
-        self.event_datapoint = None
-        self.datapoints = {}
-
-
 class RequestGroup:
     """
     Define a group statement within a structured query.
@@ -87,6 +68,26 @@ class RequestGroup:
         return group
 
 
+class RequestGroupMap:
+    """
+    Define a mapping between a set of datapoints and their corresponding event datapoint.
+    :ivar event_hardware_id str: hardware id of the datapoint identifying event inside a group.
+    :ivar event_datapoint: datapoint complete definition corresponding to event_hardware_id.
+    :ivar datapoints_hardware_ids list: list of all related datapoints.
+    :ivar datapoints dict: dict with key as hardware id and value datapoint for all mapped datapoints.
+    """
+
+    def __init__(self,
+                 event_hardware_id: str,
+                 datapoints_hardware_ids: list,
+                 group: RequestGroup = None):
+        self.event_hardware_id = event_hardware_id
+        self.datapoints_hardware_ids = datapoints_hardware_ids
+        self.event_datapoint = None
+        self.datapoints = {}
+        self.group = group
+
+
 class Request(ApiDto):
     """
     request defines how to fetch data from time-series database.

wizata_dsapi/twin.py

@@ -13,8 +13,96 @@ def is_valid_hex_color(color):
         return True
 
 
+class TwinType(ApiDto):
+    """
+    twin type
+    """
+
+    @classmethod
+    def route(cls):
+        return "twintypes"
+
+    @classmethod
+    def from_dict(cls, data):
+        obj = TwinType()
+        obj.from_json(data)
+        return obj
+
+    def __init__(self,
+                 twin_type_id: uuid.UUID = None,
+                 name: str = None,
+                 icon: str = None,
+                 color: str = None,
+                 description: str = None):
+        if twin_type_id is None:
+            self.twin_type_id = uuid.uuid4()
+        else:
+            self.twin_type_id = twin_type_id
+        self.name = name
+        self.icon = icon
+        self.color = color
+        if color is not None:
+            is_valid_hex_color(color)
+        self.description = description
+        self.createdById = None
+        self.createdDate = None
+        self.updatedById = None
+        self.updatedDate = None
+
+    def api_id(self) -> str:
+        return str(self.twin_type_id).upper()
+
+    def endpoint(self) -> str:
+        return "TwinTypes"
+
+    def from_json(self, obj):
+        if "id" in obj.keys():
+            self.twin_type_id = uuid.UUID(obj["id"])
+        if "name" in obj.keys() and obj["name"] is not None:
+            self.name = obj["name"]
+        if "color" in obj.keys() and obj["color"] is not None:
+            is_valid_hex_color(str(obj["color"]))
+            self.color = str(obj["color"])
+        if "icon" in obj.keys() and obj["icon"] is not None:
+            self.icon = str(obj["icon"])
+        if "description" in obj.keys() and obj["description"] is not None:
+            self.description = str(obj["description"])
+        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:
+            self.createdDate = obj["createdDate"]
+        if "updatedById" in obj.keys() and obj["updatedById"] is not None:
+            self.updatedById = obj["updatedById"]
+        if "updatedDate" in obj.keys() and obj["updatedDate"] is not None:
+            self.updatedDate = obj["updatedDate"]
+
+    def to_json(self, target: str = None):
+        obj = {
+            "id": str(self.twin_type_id)
+        }
+        if self.name is not None:
+            obj["name"] = str(self.name)
+        if self.color is not None:
+            obj["color"] = str(self.color)
+        if self.description is not None:
+            obj["description"] = str(self.description)
+        if self.icon is not None:
+            obj["icon"] = str(self.icon)
+        if self.createdById is not None:
+            obj["createdById"] = str(self.createdById)
+        if self.createdDate is not None:
+            obj["createdDate"] = str(self.createdDate)
+        if self.updatedById is not None:
+            obj["updatedById"] = str(self.updatedById)
+        if self.updatedDate is not None:
+            obj["updatedDate"] = str(self.updatedDate)
+        return obj
+
+
+
 class TwinBlockType(Enum):
     """
+    deprecated - replaced by TwinType
     digital twin block type
         - area
         - machine
@@ -59,6 +147,7 @@ class Twin(ApiDto):
         return obj
 
     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):
         if twin_id is None:
@@ -69,6 +158,7 @@ class Twin(ApiDto):
         self.name = name
         self.parent_id = parent_id
         self.type = ttype
+        self.type_id = type_id
         self.description = description
         self.latitude = latitude
         self.longitude = longitude
@@ -98,6 +188,8 @@ class Twin(ApiDto):
             self.name = obj["name"]
         if "parentId" in obj.keys() and obj["parentId"] is not None:
             self.parent_id = uuid.UUID(obj["parentId"])
+        if "twinTypeId" in obj.keys() and obj["twinTypeId"] is not None:
+            self.type_id = uuid.UUID(obj["twinTypeId"])
         if "latitude" in obj.keys() and obj["latitude"] is not None:
             self.latitude = float(obj["latitude"])
         if "longitude" in obj.keys() and obj["longitude"] is not None:
@@ -134,6 +226,8 @@ 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:
+            obj["twinTypeId"] = str(self.type_id)
         if self.type is not None and isinstance(self.type, TwinBlockType):
             obj["type"] = self.type.value
         if self.color is not None:

wizata_dsapi/version.py

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

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

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

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

@@ -1,5 +1,5 @@
-wizata_dsapi/__init__.py,sha256=rXiNoTi7YeObXCa4nLOdILZhhmt_GL2_eIQ5TK5NNlw,2000
-wizata_dsapi/api_config.py,sha256=CkEmEZYNKqtnzZRHH5O4QW3O4MtoOJHoghh7ZsOokEc,5073
+wizata_dsapi/__init__.py,sha256=4J-4ssj9oyI_5vv2_vMOR5ZFYQxrcHrmv900KOQEFYY,2010
+wizata_dsapi/api_config.py,sha256=pyGPyoCrfOFl-C6DlDRdQbQWDG2Y_oB4gvzjh2wYb8w,5300
 wizata_dsapi/api_dto.py,sha256=-NdaTRvw5jW5xFGpIhY8U0-SdvzW2t6QD26y0UPApU0,2238
 wizata_dsapi/api_interface.py,sha256=DURk-0ey16T8sV5e2Y2G_YybPEusJvZuY0oD5L7AnXo,10903
 wizata_dsapi/bucket.py,sha256=Zz9olv-pymikAutGitSuGWrAPiawOTW86JDDHG4ugTc,1150
@@ -23,15 +23,15 @@ 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=rfCiMv2x7dSNM-2y888WAdG_bkYpHOHy428ZwNnSsSo,26216
+wizata_dsapi/request.py,sha256=WTwctIzHLLtSSixcXBsNyoyLqdZk8dZdaCTVbejSvIQ,26287
 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=OFDFg2CsTxOUOVOf6kkDUEK9A3ED7yuPpN9TqodGruo,6581
+wizata_dsapi/twin.py,sha256=LXlX4kUl7JzONyXsuyHfcEFcXvo5ne0PGJfHfK4bXEc,9895
 wizata_dsapi/twinregistration.py,sha256=Mi6-YuwroiEXc0c1hgrOaphh4hNVoHupxOnXedVtJtE,13377
-wizata_dsapi/version.py,sha256=jBmZf3HLbiQlWiolOsAA6J5-BbxXD2bqFqEqDH3lfqo,22
+wizata_dsapi/version.py,sha256=49prCLbE3fFzLfxem5rd2dr1iV4_L-bN0N4J7jxU5yA,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.5.dist-info/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-wizata_dsapi-1.2.5.dist-info/METADATA,sha256=W5jaltng0RYpgDAUthSiPQkgnDdmOpDrO8jSYrXaAxU,2187
-wizata_dsapi-1.2.5.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-wizata_dsapi-1.2.5.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
-wizata_dsapi-1.2.5.dist-info/RECORD,,
+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,,