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

{wizata_dsapi-1.4.0.dev21/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.dev21
+Version: 1.4.0.dev22
 Summary: Wizata Data Science Toolkit
 Author: Wizata S.A.
 Author-email: info@wizata.com

{wizata_dsapi-1.4.0.dev21 → wizata_dsapi-1.4.0.dev22}/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:
@@ -52,32 +52,20 @@ 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"
 
-        # 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,
+        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 = groups_objs,
-            group_summaries = summaries_objs
+            groups=data.get("groups"),
+            group_summaries=data.get("groupSummaries")
         )
-        return instance
+
 
     def __init__(self,
                  filters: Optional[Dict[str, Any]] = None,
@@ -86,15 +74,41 @@ class SearchQuery:
                  page: int = 1,
                  size: int = 50,
                  service_name: str = "pipeline_runner",
-                 groups: Optional[List[GroupOption]] = None,
-                 group_summaries: Optional[List[GroupSummary]] = None):
+                 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.groups = groups if groups is not None else []
-        self.group_summaries = group_summaries if group_summaries is not None else []
+
+        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.dev21 → 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.dev21
+Version: 1.4.0.dev22
 Summary: Wizata Data Science Toolkit
 Author: Wizata S.A.
 Author-email: info@wizata.com

wizata_dsapi-1.4.0.dev21/wizata_dsapi/version.py

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