wizata-dsapi 1.4.0.dev20__py3-none-any.whl → 1.4.0.dev22__py3-none-any.whl

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/search.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import Dict, List, Any, Optional
+from typing import Dict, List, Any, Optional, Union
 
 
 class FilterOperator:
@@ -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
@@ -32,33 +52,63 @@ class SearchQuery:
         """
         Helper to convert dictionary coming from endpoint to SearchQuery object.
         """
-        raw_sort = data.get("sort", [])
-        sort_objs = []
-        for s in raw_sort:
-            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(
-            filters=data.get("filters", {}),
-            sort=sort_objs,
+            filters=data.get("filters"),
+            sort=data.get("sort"),
             limit=data.get("limit", 5000),
             page=data.get("page", 1),
             size=data.get("size", 50),
-            service_name=svc_name
+            service_name=svc_name,
+            groups=data.get("groups"),
+            group_summaries=data.get("groupSummaries")
         )
 
+
     def __init__(self,
                  filters: Optional[Dict[str, Any]] = None,
                  sort: Optional[List[SortOption]] = None,
                  limit: int = 5000,
                  page: int = 1,
                  size: int = 50,
-                 service_name: str = "pipeline_runner"):
+                 service_name: str = "pipeline_runner",
+                 groups: Optional[List[Union[GroupOption, dict]]] = None,
+                 group_summaries: Optional[List[Union[GroupSummary, dict]]] = None):
 
         self.filters = filters if filters is not None else {}
-        self.sort = sort if sort is not None else []
         self.limit = limit
         self.page = page
         self.size = size
         self.service_name = service_name
 
+        self.sort: List[SortOption] = []
+        if sort:
+            for s in sort:
+                if isinstance(s, SortOption):
+                    self.sort.append(s)
+                elif isinstance(s, dict):
+                    self.sort.append(SortOption(field=s.get("field"), order=s.get("order", "asc")))
+
+
+        # New grouping feature
+        self.groups: List[GroupOption] = []
+        if groups:
+            for g in groups:
+                if isinstance(g, GroupOption):
+                    self.groups.append(g)
+                elif isinstance(g, dict) and g.get("propertyName"):
+                    self.groups.append(GroupOption(property_name=g.get("propertyName")))
+
+
+        # GroupSummaries
+        self.group_summaries: List[GroupSummary] = []
+        if group_summaries:
+            for gs in group_summaries:
+                if isinstance(gs, GroupSummary):
+                    self.group_summaries.append(gs)
+                elif isinstance(gs, dict) and gs.get("propertyName"):
+                    sum_type = gs.get("type", "Count")
+                    self.group_summaries.append(GroupSummary(type=sum_type, property_name=gs.get("propertyName")))
+

wizata_dsapi/version.py

@@ -1 +1 @@
-__version__ = "1.4.0.dev20"
+__version__ = "1.4.0.dev22"

{wizata_dsapi-1.4.0.dev20.dist-info → wizata_dsapi-1.4.0.dev22.dist-info}/METADATA

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

{wizata_dsapi-1.4.0.dev20.dist-info → wizata_dsapi-1.4.0.dev22.dist-info}/RECORD

@@ -19,20 +19,20 @@ wizata_dsapi/ilogger.py,sha256=YKBTRp7pHYtBlnzroGRPT91_bMVJT93Pft3fUGcFSIM,488
 wizata_dsapi/insight.py,sha256=ABFZ04DqYxxzqAEfU1tzlTZqqrigM-zN-8Lbetko3g0,6468
 wizata_dsapi/mlmodel.py,sha256=QkWBNordOQiw6Vv4xN_pxwJWqbBm29vY1dyDZgmMS_4,26324
 wizata_dsapi/model_toolkit.py,sha256=UNyw5CFSgZeXydQFsiDIRTjoMeqIsdyIIuiwumLW5bA,1574
-wizata_dsapi/paged_query_result.py,sha256=QU0JukkBk7wwfE43wOcj4so2aYpGj5r5_XobLfm8CnE,1939
+wizata_dsapi/paged_query_result.py,sha256=WMtxMulIEiWMZxNwdgJcKfmm3mBOGKKO6zMeE1mhcQ0,2129
 wizata_dsapi/pipeline.py,sha256=gqZ6R8d8f_uz9xI3Umz2uN3yTD4N3jsBPltAIg--Bjk,31646
 wizata_dsapi/pipeline_image.py,sha256=4DhDo1SYftN6QcNbehNbM86VTD6EYGmtlcOmE5DP5Vc,6330
 wizata_dsapi/plot.py,sha256=-gV6rZJQDhGH4CV9BgefjeJWI--X5HDBOjseEzHr3Gc,1971
 wizata_dsapi/request.py,sha256=W4E1BHacQdJiBLPI96yVeHz41rbfFuGrbuw1U60L_DM,27560
 wizata_dsapi/script.py,sha256=DeEciwVpuCYZetgJCoivw_bYe8ma52WuTaTQ_VkLEcg,12930
-wizata_dsapi/search.py,sha256=LcWzjauHj4EzIl7aEXAsZGpX2IYl6e4Vw2jGWtdrfHI,1767
+wizata_dsapi/search.py,sha256=nGbs3FUgpByY_iehslT_quRinYBViKVX8jI-mDeq6s0,3399
 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=wtCRKKk3PchH4RrNgNYlEF_9C6bzZwKIeLyEvgv6Fdo,13704
 wizata_dsapi/trigger.py,sha256=w3BZYP-L3SUwvaT0oCTanh_Ewn57peZvlt7vxzHv9J8,5129
 wizata_dsapi/twin.py,sha256=S0DUzQf1smZXZTdXpXZPtkZYCfKIhw53EecCnsl9i4Q,11017
 wizata_dsapi/twinregistration.py,sha256=Mi6-YuwroiEXc0c1hgrOaphh4hNVoHupxOnXedVtJtE,13377
-wizata_dsapi/version.py,sha256=rdWb7-sRh1ikR1MPSNXnFtr5Wgd4se16okHI7g_hfYA,28
+wizata_dsapi/version.py,sha256=5fqi6-MnuV0hvCz7ExBM59mdK0C1-HCzZPaNbyJblIk,28
 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=pClIADBb_CfgT4P4Hz9mopgsuC0Wa_XiZBuej7x5JUM,85056
@@ -43,8 +43,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.4.0.dev20.dist-info/licenses/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-wizata_dsapi-1.4.0.dev20.dist-info/METADATA,sha256=XAsaess3KexlRaXwYVSKXsXETqz4ndGgkTGyPZp2ISc,4960
-wizata_dsapi-1.4.0.dev20.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-wizata_dsapi-1.4.0.dev20.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
-wizata_dsapi-1.4.0.dev20.dist-info/RECORD,,
+wizata_dsapi-1.4.0.dev22.dist-info/licenses/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+wizata_dsapi-1.4.0.dev22.dist-info/METADATA,sha256=CWxqvKA_uLH4mObJLivZcFb4WHz0Dh2yJFVBfVDmN5k,4960
+wizata_dsapi-1.4.0.dev22.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+wizata_dsapi-1.4.0.dev22.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
+wizata_dsapi-1.4.0.dev22.dist-info/RECORD,,