wizata-dsapi 1.4.0.dev20__tar.gz → 1.4.0.dev22__tar.gz

{wizata_dsapi-1.4.0.dev20/wizata_dsapi.egg-info → wizata_dsapi-1.4.0.dev22}/PKG-INFO

@@ -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 → wizata_dsapi-1.4.0.dev22}/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.dev22/wizata_dsapi/search.py

@@ -0,0 +1,114 @@
+from dataclasses import dataclass, field
+from typing import Dict, List, Any, Optional, Union
+
+
+class FilterOperator:
+    """
+    Constants for standard filtering operators.
+    """
+    EQ = "eq"
+    NE = "ne"
+    GT = "gt"
+    GTE = "gte"
+    LT = "lt"
+    LTE = "lte"
+    IN = "in"
+    CONTAINS = "contains"
+    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
+        self.order = order
+
+
+class SearchQuery:
+    """
+    Generic class to represent JSON request structure.
+    """
+    @classmethod
+    def from_dict(cls, data: dict):
+        """
+        Helper to convert dictionary coming from endpoint to SearchQuery object.
+        """
+
+        svc_name = data.get("serviceName") or data.get("service_name") or "pipeline_runner"
+
+        return cls(
+            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,
+            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",
+                 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.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-1.4.0.dev22/wizata_dsapi/version.py

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

{wizata_dsapi-1.4.0.dev20 → wizata_dsapi-1.4.0.dev22/wizata_dsapi.egg-info}/PKG-INFO

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

@@ -1,64 +0,0 @@
-from dataclasses import dataclass, field
-from typing import Dict, List, Any, Optional
-
-
-class FilterOperator:
-    """
-    Constants for standard filtering operators.
-    """
-    EQ = "eq"
-    NE = "ne"
-    GT = "gt"
-    GTE = "gte"
-    LT = "lt"
-    LTE = "lte"
-    IN = "in"
-    CONTAINS = "contains"
-    SEARCH = "_search"
-
-
-class SortOption:
-    def __init__(self, field: str, order: str = "asc"):
-        self.field = field
-        self.order = order
-
-
-class SearchQuery:
-    """
-    Generic class to represent JSON request structure.
-    """
-    @classmethod
-    def from_dict(cls, data: dict):
-        """
-        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,
-            limit=data.get("limit", 5000),
-            page=data.get("page", 1),
-            size=data.get("size", 50),
-            service_name=svc_name
-        )
-
-    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"):
-
-        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
-

wizata_dsapi-1.4.0.dev20/wizata_dsapi/version.py

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