wizata-dsapi 1.3.20__tar.gz → 1.3.21__tar.gz

{wizata_dsapi-1.3.20/wizata_dsapi.egg-info → wizata_dsapi-1.3.21}/PKG-INFO

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

{wizata_dsapi-1.3.20 → wizata_dsapi-1.3.21}/wizata_dsapi/mlmodel.py

@@ -12,6 +12,8 @@ def get_bool(obj, name: str):
 class ModelInfo:
     """
     define a pointer to a machine learning model.
+
+    :ivar model_type str: mlflow model flavour
     """
 
     def __init__(self,
@@ -19,6 +21,7 @@ class ModelInfo:
                  twin_hardware_id: str = None,
                  property_name: str = None,
                  alias: str = None,
+                 model_type: str = None,
                  file_format: str = 'pkl',
                  source: str = 'wizata'
                  ):
@@ -28,6 +31,7 @@ class ModelInfo:
         self.alias = alias
         self.file_format = file_format
         self.source = source
+        self.model_type = model_type
         self.trained_model = None
         self.scaler = None
 
@@ -68,6 +72,8 @@ class ModelInfo:
             obj["property_name"] = self.property_name
         if self.alias is not None:
             obj["alias"] = self.alias
+        if self.model_type is not None:
+            obj["model_type"] = self.model_type
         if self.file_format is not None:
             obj["file_format"] = self.file_format
         if self.source is not None:
@@ -86,6 +92,8 @@ class ModelInfo:
             self.property_name = obj["property_name"]
         if "alias" in obj.keys():
             self.alias = obj["alias"]
+        if "model_type" in obj.keys():
+            self.model_type = obj["model_type"]
         if "file_format" in obj.keys():
             self.key = obj["file_format"]
         if "source" in obj.keys():
@@ -192,13 +200,16 @@ class MLModelConfig(ApiDto):
         :param hardware_id: provide a hardware id for this model if by_twin.
         :return:
         """
+        if self.by_twin and hardware_id is None:
+            raise ValueError('hardware_id is required if by_twin to create a model info')
         model_info = ModelInfo(
             key=self.model_key,
             twin_hardware_id=hardware_id,
             property_name=self.property_name,
             source=self.source,
             alias=self.model_alias,
-            file_format=self.model_format
+            file_format=self.model_format,
+            model_type=self.model_type
         )
         return model_info
 

wizata_dsapi-1.3.21/wizata_dsapi/version.py

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

{wizata_dsapi-1.3.20 → wizata_dsapi-1.3.21}/wizata_dsapi/wizata_dsapi_client.py

@@ -23,7 +23,7 @@ from .api_dto import ApiDto, VarType
 from .business_label import BusinessLabel
 from .plot import Plot
 from .request import Request
-from .mlmodel import MLModel
+from .mlmodel import ModelInfo, ModelList
 from .experiment import Experiment
 from .script import Script
 from .execution import Execution, ExecutionStatus
@@ -590,15 +590,6 @@ class WizataDSAPIClient(ApiInterface):
                 return obj.script_id
             else:
                 raise self.__raise_error(response)
-        if isinstance(obj, MLModel):
-            response = requests.put(self.__url() + "mlmodels/",
-                                    headers=self.__header(),
-                                    data=pickle.dumps(obj))
-            if response.status_code == 200:
-                obj.model_id = uuid.UUID(response.json()['id'])
-                return obj.model_id
-            else:
-                raise self.__raise_error(response)
         if isinstance(obj, Template):
             return self.upsert_template(obj.key, obj.name)
         if isinstance(obj, Pipeline):
@@ -847,13 +838,6 @@ class WizataDSAPIClient(ApiInterface):
                 execution.script = self.get(script_name=script)
             elif isinstance(script, Script):
                 execution.script = script
-        if ml_model is not None:
-            if isinstance(ml_model, uuid.UUID) or (isinstance(ml_model, str) and is_valid_uuid(ml_model)):
-                execution.ml_model = MLModel(ml_model)
-            elif isinstance(ml_model, str):
-                execution.ml_model = self.get(model_key=ml_model)
-            elif isinstance(ml_model, MLModel):
-                execution.ml_model = ml_model
         if image is not None:
             execution.pipeline_image_id = image
         if isAnomalyDetection:
@@ -899,9 +883,6 @@ class WizataDSAPIClient(ApiInterface):
                 if "plots" in obj.keys():
                     for plot in obj["plots"]:
                         result_execution.plots.append(self.get(Plot(plot_id=plot["id"])))
-                if "models" in obj.keys():
-                    for mlmodel in obj["models"]:
-                        result_execution.models.append(self.get(MLModel(model_id=mlmodel["id"])))
                 if "resultDataframe" in obj.keys() and obj["resultDataframe"]["id"] is not None:
                     result_execution.output_ds_dataframe = self.get(DSDataFrame(df_id=obj["resultDataframe"]["id"]))
 
@@ -1104,7 +1085,7 @@ class WizataDSAPIClient(ApiInterface):
                        scaler=None,
                        has_anomalies: bool = False,
                        has_target_feat: bool = False,
-                       experiment_key = None) -> tuple[MLModel, pandas.DataFrame]:
+                       experiment_key = None) -> tuple[ModelInfo, pandas.DataFrame]:
         """
         Register a Machine Learning model to Wizata.
         Model is tested by the API against a sample dataframe.
@@ -1124,15 +1105,13 @@ class WizataDSAPIClient(ApiInterface):
         elif df is None:
             raise ValueError('A sample dataframe must be provided')
 
-        # Create a ML Model object
-        ml_model = MLModel()
+        ml_model = ModelInfo(key=model_key)
         ml_model.trained_model = train_model
         if scaler is not None:
             ml_model.scaler = scaler
         ml_model.has_anomalies = has_anomalies
         ml_model.has_target_feat = has_target_feat
         ml_model.input_columns = df.columns
-        ml_model.key = model_key
 
         if experiment_key is not None:
             ml_model.experimentId = self.get(experiment_key=experiment_key).experiment_id
@@ -1141,7 +1120,8 @@ class WizataDSAPIClient(ApiInterface):
             result_df = predict(df, ml_model)
             if result_df is not None:
                 ml_model.status = "valid"
-                self.upsert(ml_model)
+                #TODO: proper method to upload and download from registry to modify this one
+                ## self.upsert(ml_model)
                 return ml_model, result_df
             else:
                 raise RuntimeError('no dataframe was generated by your model while testing predict capabilities')

{wizata_dsapi-1.3.20 → wizata_dsapi-1.3.21/wizata_dsapi.egg-info}/PKG-INFO

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

wizata_dsapi-1.3.20/wizata_dsapi/version.py

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