wizata-dsapi 1.3.43__tar.gz → 1.3.45__tar.gz

{wizata_dsapi-1.3.43/wizata_dsapi.egg-info → wizata_dsapi-1.3.45}/PKG-INFO

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

{wizata_dsapi-1.3.43 → wizata_dsapi-1.3.45}/wizata_dsapi/api_config.py

@@ -76,6 +76,12 @@ _registry = {
             "cloud_dsapi": ['lists', 'get_by_id', 'create', 'update', 'delete', 'search'],
             "cloud_context": ['get_by_id', 'create', 'update', 'delete', 'search']
         },
+    "models":
+        {
+            "class": ModelInfo,
+            "cloud_dsapi": ['download_model', 'download_file' , 'upload_model'  , 'upload_file'],
+            "cloud_context": ['download_model' , 'download_file' , 'upload_model'  , 'upload_file']
+        },
     "pipelines":
         {
             "class": Pipeline,

{wizata_dsapi-1.3.43 → wizata_dsapi-1.3.45}/wizata_dsapi/api_interface.py

@@ -2,6 +2,7 @@ import uuid
 from .solution_component import SolutionComponent
 from .paged_query_result import PagedQueryResult
 from .pipeline import AlertType
+from .mlmodel import ModelInfo, ModelFile
 from datetime import datetime
 import pandas
 
@@ -276,3 +277,58 @@ class ApiInterface:
         :param list cc: for email only - cc recipients list.
         """
         pass
+
+    def download_model(self, identifier: str) -> ModelInfo:
+        """
+        download a model image directly from the repository, auto-select alias if necessary.
+        :param identifier: exact identifier including alias of the model or no alias to auto-select active version.
+        :return: ModelInfo with trained_model loaded, extra file must be downloaded separately.
+        """
+        pass
+
+    def download_file(self,
+                      model: ModelInfo = None,
+                      file: ModelFile = None,
+                      identifier: str = None,
+                      path: str = None):
+        """
+        download a model extra file from the repository.
+        :param model: model (ModelInfo), alternatively can use identifier
+        :param file: file (ModelFile), alternatively can use path
+        :param identifier: identifier including alias of the model.
+        :param path: path name of the file including the extension.
+        :return: bytes content.
+        """
+        pass
+
+    def upload_file(self,
+                    content,
+                    model: ModelInfo = None,
+                    file: ModelFile = None,
+                    identifier: str = None,
+                    path: str = None
+                    ):
+        """
+        upload a model extra file to the repository.
+        please use upload_model for a trained_model
+        :param content: the bytes content of the file.
+        :param model: model (ModelInfo), alternatively can use identifier
+        :param file: file (ModelFile), alternatively can use path
+        :param identifier: identifier including alias of the model.
+        :param path: path name of the file including the extension.
+        :return: bytes content.
+        """
+        pass
+
+    def upload_model(self,
+                     model_info: ModelInfo,
+                     bytes_content=None):
+        """
+        upload a model within the model repository.
+            - by default use model_info.trained_model and convert it to a pickle
+            - for already torch or pickle please pass the bytes_content
+            - model_info.file_format must be set properly to 'pkl' or 'pt'
+        :param model_info: model info, with at least key (+twin, +property, +alias) and trained_model.
+        :param bytes_content: bytes[] of your torch or pickle model.
+        """
+        pass

{wizata_dsapi-1.3.43 → wizata_dsapi-1.3.45}/wizata_dsapi/context.py

@@ -1,7 +1,11 @@
 import uuid
 import pandas
+import numpy as np
+import io
+import json
+import pickle
 
-from .mlmodel import ModelInfo
+from .mlmodel import ModelInfo, ModelFile
 from .plot import Plot
 from .ilogger import ILogger
 from .api_interface import ApiInterface
@@ -188,22 +192,40 @@ class Context(ILogger):
         if self.__new_plot is not None:
             return self.__new_plot.figure
 
-    def set_model(self, trained_model, input_columns, output_columns=None, has_anomalies=False, scaler=None):
+    def set_model(self,
+                  trained_model,
+                  **kwargs):
         """
         set model to be added to the context.
         :param trained_model: Trained Model to be stored as a pickled object.
-        :param list input_columns: List of str defining input columns to call the model (df.columns)
-        :param list output_columns: List of output columns - Optional as can be detected automatically during validation.
-        :param bool has_anomalies: False by default, define if the model set anomalies
-        :param scaler: Scaler to be stored if necessary.
-        :return: ML Model object prepared.
+        :param scaler: Scaler extra file to be stored.
+        :return: ModelInfo object
         """
         model_info = ModelInfo(key="undefined")
         model_info.trained_model = trained_model
+
+        scaler = kwargs.pop("scaler", None)
         model_info.scaler = scaler
-        model_info.input_columns = input_columns
-        model_info.output_columns = output_columns
-        model_info.has_anomalies = has_anomalies
+
+        for key, value in kwargs.items():
+
+            if isinstance(value, (pandas.Index, pandas.Series, np.ndarray)):
+                content = json.dumps(value.tolist()).encode('utf-8')
+                filename = f"{key}.json"
+            elif isinstance(value, (dict, list)):
+                content = json.dumps(value).encode('utf-8')
+                filename = f"{key}.json"
+            else:
+                content = pickle.dumps(value)
+                filename = f"{key}.pkl"
+
+            model_info.add_file(
+                file=ModelFile(
+                    content=io.BytesIO(content),
+                    path=filename
+                )
+            )
+
         self.__new_model = model_info
         return model_info
 

{wizata_dsapi-1.3.43 → wizata_dsapi-1.3.45}/wizata_dsapi/mlmodel.py

@@ -133,7 +133,8 @@ class ModelInfo:
                  trained_model = None,
                  scaler = None,
                  files = None,
-                 updated_date = None
+                 updated_date = None,
+                 metadata: dict = None
                  ):
         # information identifying a model
         self.key = key
@@ -153,7 +154,8 @@ class ModelInfo:
                 if not isinstance(file, ModelFile):
                     raise TypeError("file is not a ModelFile with files")
         self.is_active = False
-        self.updated_date = None
+        self.updated_date = updated_date
+        self.metadata = metadata
 
         # files attached to model when loaded
         self.trained_model = trained_model
@@ -264,6 +266,8 @@ class ModelInfo:
             obj["files"] = [file.to_json() for file in self.files]
         if self.updated_date is not None:
             obj["updatedDate"] = str(self.updated_date)
+        if self.metadata is not None:
+            obj["metadata"] = self.metadata
         return obj
 
     def from_json(self, obj):
@@ -290,6 +294,8 @@ class ModelInfo:
             self.is_active = get_bool(obj, name="is_active")
         if "updatedDate" in obj.keys() and obj["updatedDate"] is not None:
             self.updated_date = obj["updatedDate"]
+        if "metadata" in obj.keys() and obj["metadata"] is not None:
+            self.metadata = obj["metadata"]
         if "files" in obj.keys():
             for obj_file in obj["files"]:
                 model_file = ModelFile()

wizata_dsapi-1.3.45/wizata_dsapi/version.py

@@ -0,0 +1 @@
+__version__ = "1.3.45"

{wizata_dsapi-1.3.43 → wizata_dsapi-1.3.45/wizata_dsapi.egg-info}/PKG-INFO

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

wizata_dsapi-1.3.43/wizata_dsapi/version.py

@@ -1 +0,0 @@
-__version__ = "1.3.43"