wizata-dsapi 1.4.0.dev11__tar.gz → 1.4.0.dev18__tar.gz

{wizata_dsapi-1.4.0.dev11 → wizata_dsapi-1.4.0.dev18}/PKG-INFO

@@ -1,9 +1,12 @@
 Metadata-Version: 2.4
 Name: wizata_dsapi
-Version: 1.4.0.dev11
+Version: 1.4.0.dev18
 Summary: Wizata Data Science Toolkit
+Home-page: https://www.wizata.com
 Author: Wizata S.A.
 Author-email: info@wizata.com
+Requires-Python: >=3.9
+Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: pandas==1.5.3; python_version < "3.11"
 Requires-Dist: pandas==2.2.3; python_version >= "3.11" and python_version < "3.12"
@@ -74,7 +77,21 @@ Requires-Dist: torch==2.7.1; (python_version >= "3.11" and python_version < "3.1
 Requires-Dist: torch>=2.8.0; python_version >= "3.12" and extra == "all"
 Dynamic: author
 Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
 Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
+Dynamic: requires-python
 Dynamic: summary
+
+===========================
+Wizata Data Science Package
+===========================
+
+This module is intended to be used to create and distribute data science modules within Wizata Platform.
+
+Documentation can be found https://<your_tenant>.onwizata.com/docs
+
+For more information please visit https://www.wizata.com

{wizata_dsapi-1.4.0.dev11 → wizata_dsapi-1.4.0.dev18}/setup.py

@@ -1,11 +1,16 @@
 from setuptools import setup
 from distutils.util import convert_path
+from pathlib import Path
 
 main_ns = {}
 ver_path = convert_path('wizata_dsapi/version.py')
 with open(ver_path) as ver_file:
     exec(ver_file.read(), main_ns)
 
+# Read the long description from README
+this_directory = Path(__file__).parent
+long_description = (this_directory / "README.rst").read_text(encoding='utf-8')
+
 core_dependencies = [
     'pandas==1.5.3; python_version<"3.11"',
     'pandas==2.2.3; python_version>="3.11" and python_version<"3.12"',
@@ -72,8 +77,11 @@ setup(
     name='wizata_dsapi',
     version=main_ns['__version__'],
     description='Wizata Data Science Toolkit',
+    long_description=long_description,
+    long_description_content_type='text/x-rst',
     author='Wizata S.A.',
     author_email='info@wizata.com',
+    url='https://www.wizata.com',
     packages=['wizata_dsapi',
               'wizata_dsapi.plots',
               'wizata_dsapi.scripts',
@@ -82,4 +90,5 @@ setup(
     extras_require={
         'all': all_dependencies
     },
+    python_requires='>=3.9',
 )

{wizata_dsapi-1.4.0.dev11 → wizata_dsapi-1.4.0.dev18}/wizata_dsapi/__init__.py

@@ -48,3 +48,5 @@ from .evaluation import Evaluation
 # Streamlit utils
 from .streamlit_utils import (get_streamlit_token, get_streamlit_domain, get_streamlit_from, get_streamlit_to,
                               get_streamlit_twin_id)
+
+from .search import FilterOperator, SearchQuery, SortOption

{wizata_dsapi-1.4.0.dev11 → wizata_dsapi-1.4.0.dev18}/wizata_dsapi/execution_log.py

@@ -405,7 +405,7 @@ class ExecutionLog(Dto):
             "template": self.get_template_key(),
             "twin": self.get_twin_key(),
             "edgeDeviceId": self.edge_device_id,
-            "status": self.status.value if self.status else None
+            "status": self.status.value if hasattr(self.status, 'value') else self.status
         }
         return {k: v for k, v in labels.items() if v is not None}
 

{wizata_dsapi-1.4.0.dev11 → wizata_dsapi-1.4.0.dev18}/wizata_dsapi/paged_query_result.py

@@ -29,3 +29,31 @@ class PagedQueryResult:
         if direction != 'asc' and direction != 'desc':
             raise ValueError("direction must be asc or desc")
         self.results = None
+
+    def to_json(self):
+        """
+        format the results
+        """
+
+        if self.direction == "asc":
+            sort_dir = "asc"
+        else:
+            sort_dir = "desc"
+
+        formatted_results = []
+        if self.results:
+            for obj in self.results:
+                if hasattr(obj, 'to_json'):
+                    formatted_results.append(obj.to_json())
+                elif hasattr(obj, 'to_dict'):
+                    formatted_results.append(obj.to_dict())
+                else:
+                    formatted_results.append(obj)
+        return {
+            "page": self.page,
+            "size": self.size,
+            "sort": self.sort,
+            "direction": sort_dir,
+            "total": self.total,
+            "results": formatted_results
+        }

wizata_dsapi-1.4.0.dev18/wizata_dsapi/search.py

@@ -0,0 +1,64 @@
+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.dev18/wizata_dsapi/version.py

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

{wizata_dsapi-1.4.0.dev11 → wizata_dsapi-1.4.0.dev18}/wizata_dsapi.egg-info/PKG-INFO

@@ -1,9 +1,12 @@
 Metadata-Version: 2.4
 Name: wizata_dsapi
-Version: 1.4.0.dev11
+Version: 1.4.0.dev18
 Summary: Wizata Data Science Toolkit
+Home-page: https://www.wizata.com
 Author: Wizata S.A.
 Author-email: info@wizata.com
+Requires-Python: >=3.9
+Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: pandas==1.5.3; python_version < "3.11"
 Requires-Dist: pandas==2.2.3; python_version >= "3.11" and python_version < "3.12"
@@ -74,7 +77,21 @@ Requires-Dist: torch==2.7.1; (python_version >= "3.11" and python_version < "3.1
 Requires-Dist: torch>=2.8.0; python_version >= "3.12" and extra == "all"
 Dynamic: author
 Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
 Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
+Dynamic: requires-python
 Dynamic: summary
+
+===========================
+Wizata Data Science Package
+===========================
+
+This module is intended to be used to create and distribute data science modules within Wizata Platform.
+
+Documentation can be found https://<your_tenant>.onwizata.com/docs
+
+For more information please visit https://www.wizata.com

{wizata_dsapi-1.4.0.dev11 → wizata_dsapi-1.4.0.dev18}/wizata_dsapi.egg-info/SOURCES.txt

@@ -28,6 +28,7 @@ wizata_dsapi/pipeline_image.py
 wizata_dsapi/plot.py
 wizata_dsapi/request.py
 wizata_dsapi/script.py
+wizata_dsapi/search.py
 wizata_dsapi/solution_component.py
 wizata_dsapi/streamlit_utils.py
 wizata_dsapi/template.py

wizata_dsapi-1.4.0.dev11/wizata_dsapi/version.py

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