wizata-dsapi 1.4.0.dev10__tar.gz → 1.4.0.dev15__tar.gz

{wizata_dsapi-1.4.0.dev10/wizata_dsapi.egg-info → wizata_dsapi-1.4.0.dev15}/PKG-INFO

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

{wizata_dsapi-1.4.0.dev10 → wizata_dsapi-1.4.0.dev15}/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.dev10 → wizata_dsapi-1.4.0.dev15}/wizata_dsapi/execution_log.py

@@ -1,4 +1,5 @@
 from .api_dto import Dto
+from .plot import Plot
 from .experiment import Experiment
 from .pipeline import Pipeline
 from .twin import Twin
@@ -49,6 +50,12 @@ class ExecutionLog(Dto):
         if isinstance(properties, str):
             properties = json.loads(properties)
 
+        plots = data.get("plots")
+        _plots = []
+        if isinstance(plots, list):
+            for plot in plots:
+                _plots.append(Plot.from_dict(plot))
+
         return cls(
             execution_id=uuid.UUID(data["id"]) if "id" in data and not isinstance(data["id"], int) else None,
             experiment=data.get("experiment"),
@@ -64,7 +71,8 @@ class ExecutionLog(Dto):
             execution_time=int(data.get("executionTime")) if "executionTime" in data and data["executionTime"] is not None else None,
             trigger_id=uuid.UUID(data["executionTriggerId"]) if "executionTriggerId" in data and data["executionTriggerId"] is not None else None,
             version=data.get("version"),
-            properties=properties
+            properties=properties,
+            plots=_plots
         )
 
     def __init__(self,
@@ -83,7 +91,8 @@ class ExecutionLog(Dto):
                  execution_time: int = None,
                  trigger_id: uuid.UUID = None,
                  version: str = None,
-                 properties: dict = None):
+                 properties: dict = None,
+                 plots: list = None):
 
         # labels
         self._experiment = None
@@ -132,7 +141,10 @@ class ExecutionLog(Dto):
             properties = {}
         self.properties = properties
         self.models = []
-        self.plots = []
+        if plots is not None:
+            self.plots = plots
+        else:
+            self.plots = []
         self.dataframes = []
         self.messages = []
 
@@ -393,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}
 
@@ -409,6 +421,10 @@ class ExecutionLog(Dto):
             "version": self.version,
             "messages": self.messages or None
         }
+        if self.plots is not None and len(self.plots) > 0:
+            data["plots"] = []
+            for plot in self.plots:
+                data["plots"].append(plot.to_json(target="logs"))
         return {k: v for k, v in data.items() if v is not None}
 
     def to_dict(self) -> dict:

{wizata_dsapi-1.4.0.dev10 → wizata_dsapi-1.4.0.dev15}/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.dev10 → wizata_dsapi-1.4.0.dev15}/wizata_dsapi/plot.py

@@ -6,7 +6,6 @@ class Plot(ApiDto):
     """
     A plot is a definition of a Plotly figure that can be stored and shared on Wizata.
     :ivar plot_id: The UUID of the plot.
-    :ivar generatedById: The UUID of the Execution from which the plot was created.
     :ivar name: A simple name helping the user identifying the plot.
     :ivar figure: Plotly figure defining the plot itself.
     """
@@ -21,14 +20,12 @@ class Plot(ApiDto):
         obj.from_json(data)
         return obj
 
-    def __init__(self, plot_id=None, name=None, generated_by_id=None, figure=None):
+    def __init__(self, plot_id=None, name=None, figure=None):
         if plot_id is None:
             self.plot_id = uuid.uuid4()
         else:
             self.plot_id = plot_id
         self.name = name
-        self.generatedById = generated_by_id # Execution
-        # Step Id
         self.figure = figure
 
     def api_id(self) -> str:
@@ -56,8 +53,6 @@ class Plot(ApiDto):
             self.name = obj["name"]
         if "figure" in obj.keys():
             self.figure = obj["figure"]
-        if "generatedById" in obj.keys():
-            self.generatedById = uuid.UUID(obj["generatedById"])
 
     def to_json(self, target: str = None):
         """
@@ -69,11 +64,7 @@ class Plot(ApiDto):
         }
         if self.name is not None:
             obj["name"] = self.name
-        if target is None or target != 'backend-create':
+        if target is None or target != 'logs':
             if self.figure is not None:
                 obj["figure"] = self.figure
-        if self.generatedById is not None:
-            #TODO: add generateById as UUID or find another way to store plots
-            #obj["generatedById"] = str(self.generatedById)
-            pass
         return obj

wizata_dsapi-1.4.0.dev15/wizata_dsapi/search.py

@@ -0,0 +1,61 @@
+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", 50),
+            offset=data.get("offset", 0),
+            service_name=svc_name
+        )
+
+    def __init__(self,
+                 filters: Optional[Dict[str, Any]] = None,
+                 sort: Optional[List[SortOption]] = None,
+                 limit: int = 50,
+                 offset: int = 0,
+                 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.offset = offset
+        self.service_name = service_name
+

wizata_dsapi-1.4.0.dev15/wizata_dsapi/version.py

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

{wizata_dsapi-1.4.0.dev10 → wizata_dsapi-1.4.0.dev15}/wizata_dsapi/wizata_dsapi_client.py

@@ -1053,7 +1053,7 @@ class WizataDSAPIClient(ApiInterface, ApiDtoInterface):
         else:
             raise self.__raise_error(response)
 
-    def plot(self, plot_id: str = None, plot: Plot = None, figure=None,):
+    def plot(self, plot_id: str = None, plot: Plot = None, figure=None):
         """
         Fetch and show plot.
         :param plot: Wizata Plot Object

{wizata_dsapi-1.4.0.dev10 → wizata_dsapi-1.4.0.dev15/wizata_dsapi.egg-info}/PKG-INFO

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

{wizata_dsapi-1.4.0.dev10 → wizata_dsapi-1.4.0.dev15}/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.dev10/wizata_dsapi/version.py

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