wizata-dsapi 1.4.0.dev21__py3-none-any.whl → 1.4.0.dev23__py3-none-any.whl

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,49 +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"
 
-        # 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),
+        return cls(
+            filters=data.get("filters"),
+            sort=data.get("sort"),
+            limit=data.get("limit", 1000),
             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,
                  sort: Optional[List[SortOption]] = None,
-                 limit: int = 5000,
+                 limit: int = 1000,
                  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/version.py

@@ -1 +1 @@
-__version__ = "1.4.0.dev21"
+__version__ = "1.4.0.dev23"

{wizata_dsapi-1.4.0.dev21.dist-info → wizata_dsapi-1.4.0.dev23.dist-info}/METADATA

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

{wizata_dsapi-1.4.0.dev21.dist-info → wizata_dsapi-1.4.0.dev23.dist-info}/RECORD

@@ -25,14 +25,14 @@ wizata_dsapi/pipeline_image.py,sha256=4DhDo1SYftN6QcNbehNbM86VTD6EYGmtlcOmE5DP5V
 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=I19VFsdvKOxnOgkjPWNI_Wd1ac_zacZBxU-zLwwv8Zk,2902
+wizata_dsapi/search.py,sha256=5hqrZp4rMQ1aF45uQnliyt0gK17LGctymWeUwfHQciY,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=qFeWqY-JbMX0fcG7ujiygB9jupydyyNEd6_udTU1GJw,28
+wizata_dsapi/version.py,sha256=d-I957A4xj3N_u8Vvxvug9md08EhUVXzylwh6LUehe4,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.dev21.dist-info/licenses/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-wizata_dsapi-1.4.0.dev21.dist-info/METADATA,sha256=F6Scf3P5H9pLa7zRq-c9DF0gqXGt42NJ3AJcDrUqyts,4960
-wizata_dsapi-1.4.0.dev21.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-wizata_dsapi-1.4.0.dev21.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
-wizata_dsapi-1.4.0.dev21.dist-info/RECORD,,
+wizata_dsapi-1.4.0.dev23.dist-info/licenses/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+wizata_dsapi-1.4.0.dev23.dist-info/METADATA,sha256=SikhCbBE85c3IjFO31yCFDU_w-nPNbMLEwVfEkjxY2U,4960
+wizata_dsapi-1.4.0.dev23.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+wizata_dsapi-1.4.0.dev23.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
+wizata_dsapi-1.4.0.dev23.dist-info/RECORD,,