wizata-dsapi 1.2.4__tar.gz → 1.2.6__tar.gz

{wizata_dsapi-1.2.4 → wizata_dsapi-1.2.6}/PKG-INFO

@@ -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 → wizata_dsapi-1.2.6}/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-1.2.6/wizata_dsapi/version.py

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

{wizata_dsapi-1.2.4 → wizata_dsapi-1.2.6}/wizata_dsapi.egg-info/PKG-INFO

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

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