wizata-dsapi 1.4.0.dev19__tar.gz → 1.4.0.dev21__tar.gz

{wizata_dsapi-1.4.0.dev19/wizata_dsapi.egg-info → wizata_dsapi-1.4.0.dev21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wizata_dsapi
-Version: 1.4.0.dev19
+Version: 1.4.0.dev21
 Summary: Wizata Data Science Toolkit
 Author: Wizata S.A.
 Author-email: info@wizata.com

{wizata_dsapi-1.4.0.dev19 → wizata_dsapi-1.4.0.dev21}/wizata_dsapi/execution_log.py

@@ -39,7 +39,7 @@ class ExecutionLog(Dto):
 
     # non-persistent values
     :ivar dict properties: properties containing key/value pairs used to parametrize the pipeline execution
-    :ivar list warnings: list of error and/or warning messages
+    :ivar list messages: list of error and/or warning messages
     """
 
     @classmethod
@@ -72,7 +72,8 @@ class ExecutionLog(Dto):
             trigger_id=uuid.UUID(data["executionTriggerId"]) if "executionTriggerId" in data and data["executionTriggerId"] is not None else None,
             version=data.get("version"),
             properties=properties,
-            plots=_plots
+            plots=_plots,
+            messages=data.get("messages") or ([data.get("message")] if data.get("message") else None)
         )
 
     def __init__(self,
@@ -92,7 +93,8 @@ class ExecutionLog(Dto):
                  trigger_id: uuid.UUID = None,
                  version: str = None,
                  properties: dict = None,
-                 plots: list = None):
+                 plots: list = None,
+                 messages: list = None):
 
         # labels
         self._experiment = None
@@ -146,7 +148,10 @@ class ExecutionLog(Dto):
         else:
             self.plots = []
         self.dataframes = []
-        self.messages = []
+        if messages is not None:
+            self.messages = messages
+        else:
+            self.messages = []
 
     @property
     def experiment(self):

{wizata_dsapi-1.4.0.dev19 → wizata_dsapi-1.4.0.dev21}/wizata_dsapi/paged_query_result.py

@@ -7,6 +7,7 @@ class PagedQueryResult:
     :ivar int size: number of records per page.
     :ivar str sort: column name used in sorting.
     :ivar int total: total number of results on all pages.
+    :ivar dict groups: statistics used for the execution logs charts.
     """
 
     def __init__(self,
@@ -14,7 +15,8 @@ class PagedQueryResult:
                  page: int = None,
                  size: int = None,
                  sort: str = None,
-                 direction: str = None):
+                 direction: str = None,
+                 groups: dict = None):
         self.total = total
         self.page = page
         if page < 0:
@@ -29,6 +31,7 @@ class PagedQueryResult:
         if direction != 'asc' and direction != 'desc':
             raise ValueError("direction must be asc or desc")
         self.results = None
+        self.groups = groups if groups else {}
 
     def to_json(self):
         """
@@ -55,5 +58,6 @@ class PagedQueryResult:
             "sort": self.sort,
             "direction": sort_dir,
             "total": self.total,
-            "results": formatted_results
+            "results": formatted_results,
+            "groups": self.groups
         }

{wizata_dsapi-1.4.0.dev19 → wizata_dsapi-1.4.0.dev21}/wizata_dsapi/search.py

@@ -17,6 +17,26 @@ class FilterOperator:
     SEARCH = "_search"
 
 
+class GroupSummaryType:
+    """
+    Aggregate methods for group summary types.
+    """
+    SUM = "Sum"
+    AVG = "Avg"
+    MAX = "Max"
+    MIN = "Min"
+    COUNT = "Count"
+
+class GroupOption:
+    def __init__(self, property_name: str):
+        self.property_name = property_name
+
+class GroupSummary:
+    def __init__(self, type: str, property_name: str):
+        self.type = type
+        self.property_name = property_name
+
+
 class SortOption:
     def __init__(self, field: str, order: str = "asc"):
         self.field = field
@@ -38,14 +58,26 @@ class SearchQuery:
             sort_objs.append(SortOption(field=s["field"], order=s.get("order", "asc")))
 
         svc_name = data.get("serviceName") or data.get("service_name") or "pipeline_runner"
-        return cls(
+
+        # New grouping feature
+        raw_groups = data.get("groups", [])
+        groups_objs = [GroupOption(g["propertyName"]) for g in raw_groups]
+
+        # GroupSummaries
+        raw_summaries = data.get("groupSummaries", [])
+        summaries_objs = [GroupSummary(s["type"], s["propertyName"]) for s in raw_summaries]
+
+        instance = cls(
             filters=data.get("filters", {}),
             sort=sort_objs,
             limit=data.get("limit", 5000),
             page=data.get("page", 1),
             size=data.get("size", 50),
-            service_name=svc_name
+            service_name=svc_name,
+            groups = groups_objs,
+            group_summaries = summaries_objs
         )
+        return instance
 
     def __init__(self,
                  filters: Optional[Dict[str, Any]] = None,
@@ -53,7 +85,9 @@ class SearchQuery:
                  limit: int = 5000,
                  page: int = 1,
                  size: int = 50,
-                 service_name: str = "pipeline_runner"):
+                 service_name: str = "pipeline_runner",
+                 groups: Optional[List[GroupOption]] = None,
+                 group_summaries: Optional[List[GroupSummary]] = None):
 
         self.filters = filters if filters is not None else {}
         self.sort = sort if sort is not None else []
@@ -61,4 +95,6 @@ class SearchQuery:
         self.page = page
         self.size = size
         self.service_name = service_name
+        self.groups = groups if groups is not None else []
+        self.group_summaries = group_summaries if group_summaries is not None else []
 

wizata_dsapi-1.4.0.dev21/wizata_dsapi/version.py

@@ -0,0 +1 @@
+__version__ = "1.4.0.dev21"

{wizata_dsapi-1.4.0.dev19 → wizata_dsapi-1.4.0.dev21/wizata_dsapi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wizata_dsapi
-Version: 1.4.0.dev19
+Version: 1.4.0.dev21
 Summary: Wizata Data Science Toolkit
 Author: Wizata S.A.
 Author-email: info@wizata.com

wizata_dsapi-1.4.0.dev19/wizata_dsapi/version.py

@@ -1 +0,0 @@
-__version__ = "1.4.0.dev19"