wizata-dsapi 1.2.4__py3-none-any.whl → 1.2.6__py3-none-any.whl

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.
@@ -63,7 +44,7 @@ class RequestGroup:
                 raise ValueError(f"please specify system_id in {my_dict}")
 
         group = RequestGroup(
-            system_id=["system_id"]
+            system_id=my_dict["system_id"]
         )
 
         # set group_by
@@ -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/version.py

@@ -1 +1 @@
-__version__ = "1.2.4"
+__version__ = "1.2.6"

{wizata_dsapi-1.2.4.dist-info → wizata_dsapi-1.2.6.dist-info}/METADATA

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

{wizata_dsapi-1.2.4.dist-info → wizata_dsapi-1.2.6.dist-info}/RECORD

@@ -23,7 +23,7 @@ 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=uZCTNiDz8Y2vq2e1UEXcBaNSCn4m7JaIh8ZiqqmKq7I,26209
+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
@@ -31,7 +31,7 @@ wizata_dsapi/template.py,sha256=h2f3dLduJ4WhreVxJXuFIB3pinnI3c39WxBms0bCgos,1300
 wizata_dsapi/trigger.py,sha256=w3BZYP-L3SUwvaT0oCTanh_Ewn57peZvlt7vxzHv9J8,5129
 wizata_dsapi/twin.py,sha256=OFDFg2CsTxOUOVOf6kkDUEK9A3ED7yuPpN9TqodGruo,6581
 wizata_dsapi/twinregistration.py,sha256=Mi6-YuwroiEXc0c1hgrOaphh4hNVoHupxOnXedVtJtE,13377
-wizata_dsapi/version.py,sha256=XBKH8E1LmDxv06U39yqMBbXZapOERFgICEDYZs_kRso,22
+wizata_dsapi/version.py,sha256=vMQK58X8_YZGKzRm0ThvPAKFtpfyejGmUnDrY9RQ13w,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.4.dist-info/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-wizata_dsapi-1.2.4.dist-info/METADATA,sha256=mTEgSlDDw2Y6uEMkiF-EBNStOQhMmJ-4hvewz0tiMEw,2187
-wizata_dsapi-1.2.4.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-wizata_dsapi-1.2.4.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
-wizata_dsapi-1.2.4.dist-info/RECORD,,
+wizata_dsapi-1.2.6.dist-info/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+wizata_dsapi-1.2.6.dist-info/METADATA,sha256=gghYKA1y29GCop-vWf9zC68niDmPfjkmfRZRWyQSg_E,2187
+wizata_dsapi-1.2.6.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+wizata_dsapi-1.2.6.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
+wizata_dsapi-1.2.6.dist-info/RECORD,,