wizata-dsapi 1.2.2__tar.gz → 1.2.3__tar.gz

{wizata_dsapi-1.2.2 → wizata_dsapi-1.2.3}/PKG-INFO

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

{wizata_dsapi-1.2.2 → wizata_dsapi-1.2.3}/wizata_dsapi/request.py

@@ -13,6 +13,25 @@ filter_map = {
 }
 
 
+def _format_group(my_group:dict) -> dict:
+    """
+    verify and format a group
+    :param my_group: group to check and format
+    :return: formatted group
+    """
+    if my_group is None or not isinstance(my_group, dict):
+        raise ValueError(f"illegal group {my_group}")
+    if "group_by" not in my_group:
+        my_group["group_by"] = "id"
+    elif my_group["group_by"] not in ["id" , "type"]:
+        raise ValueError(f"illegal group {my_group['group_by']}")
+    if "event_ids" in my_group:
+        my_group["events"] = my_group["event_ids"]
+    if "system_id" not in my_group or my_group["system_id"] is None or not isinstance(["system_id"], str):
+        raise ValueError(f"please specify system_id in {my_group}")
+    return my_group
+
+
 class Request(ApiDto):
     """
     request defines how to fetch data from time-series database.
@@ -117,6 +136,23 @@ class Request(ApiDto):
         else:
             raise TypeError(f'field must be None, str or a list of str')
 
+    @property
+    def groups(self) -> list:
+        """
+        return formatted groups list based on group
+        :return:
+        """
+        if self.group is not None and self.group != {}:
+            if not isinstance(self.group, list):
+                return [_format_group(self.group)]
+            else:
+                groups = []
+                for group in self.group:
+                    groups.append(_format_group(group))
+                return groups
+        else:
+            return []
+
     def get_template_id(self):
         """
         extract template id from request if present.

wizata_dsapi-1.2.3/wizata_dsapi/version.py

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

{wizata_dsapi-1.2.2 → wizata_dsapi-1.2.3}/wizata_dsapi.egg-info/PKG-INFO

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

wizata_dsapi-1.2.2/wizata_dsapi/version.py

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