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

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

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

{wizata_dsapi-1.3.21 → wizata_dsapi-1.3.24}/wizata_dsapi/api_config.py

@@ -2,7 +2,7 @@
 from .plot import Plot
 from .datapoint import DataPoint
 from .datastore import DataStore
-from .mlmodel import MLModel
+from .mlmodel import ModelInfo, ModelList
 from .request import Request
 from .execution import Execution, ExecutionStatus
 from .experiment import Experiment
@@ -76,12 +76,6 @@ _registry = {
             "cloud_dsapi": ['lists', 'get_by_id', 'create', 'update', 'delete', 'search'],
             "cloud_context": ['get_by_id', 'create', 'update', 'delete', 'search']
         },
-    "mlmodels":
-        {
-            "class": MLModel,
-            "cloud_dsapi": ['lists', 'get_by_id', 'get_by_key', 'delete'],
-            "cloud_context": []
-        },
     "pipelines":
         {
             "class": Pipeline,

{wizata_dsapi-1.3.21 → wizata_dsapi-1.3.24}/wizata_dsapi/dsapi_json_encoder.py

@@ -3,7 +3,6 @@ import uuid
 import pandas
 import time
 
-from .mlmodel import MLModel
 from .script import Script
 from .plot import Plot
 from .wizard_function import WizardStep, WizardFunction
@@ -15,20 +14,6 @@ class DSAPIEncoder(json.JSONEncoder):
     def default(self, obj):
         if isinstance(obj, uuid.UUID):
             return str(obj)
-        if isinstance(obj, MLModel):
-            json_obj = {
-                "id": str(obj.model_id),
-                "status": str(obj.status),
-                "generatedById": str(obj.generatedById),
-                "input_columns": list(obj.input_columns),
-                "output_columns": list(obj.output_columns),
-                "has_anomalies": str(obj.has_anomalies),
-                "labels_count": str(obj.label_counts),
-                "has_target_feat": str(obj.has_target_feat),
-                "needExactColumnNames": str(obj.needExactColumnNames),
-                "needExactColumnNumbers": str(obj.needExactColumnNumbers)
-            }
-            return json_obj
         if isinstance(obj, Script):
             json_obj = {
                 "id": str(obj.script_id),

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

@@ -19,22 +19,33 @@ class ModelInfo:
     def __init__(self,
                  key: str,
                  twin_hardware_id: str = None,
-                 property_name: str = None,
+                 property_value: str = None,
                  alias: str = None,
                  model_type: str = None,
                  file_format: str = 'pkl',
-                 source: str = 'wizata'
+                 source: str = 'wizata',
+                 property_name: str = None
                  ):
+        # information identifying a model
         self.key = key
         self.twin_hardware_id = twin_hardware_id
-        self.property_name = property_name
+        self.property_value = property_value
         self.alias = alias
         self.file_format = file_format
         self.source = source
         self.model_type = model_type
+
+        # files attached to model when loaded
         self.trained_model = None
         self.scaler = None
 
+        # temporary properties during model generation not generally stored
+        self.property_name = property_name
+        self.input_columns = None
+        self.has_target_feat = False
+        self.label_counts = 0
+
+
     def identifier(self, include_alias: bool = False) -> str:
         """
         returns the complete string identifier for this model.
@@ -48,8 +59,8 @@ class ModelInfo:
         if self.twin_hardware_id is not None:
             identifier += f".{self.twin_hardware_id}"
 
-        if self.property_name is not None:
-            identifier += f".{self.property_name}"
+        if self.property_value is not None:
+            identifier += f".{self.property_value}"
 
         if include_alias and self.alias is not None:
             identifier += f"@{self.alias}"
@@ -68,8 +79,8 @@ class ModelInfo:
         }
         if self.twin_hardware_id is not None:
             obj["twin_hardware_id"] = str(self.twin_hardware_id)
-        if self.property_name is not None:
-            obj["property_name"] = self.property_name
+        if self.property_value is not None:
+            obj["property_value"] = self.property_value
         if self.alias is not None:
             obj["alias"] = self.alias
         if self.model_type is not None:
@@ -78,6 +89,10 @@ class ModelInfo:
             obj["file_format"] = self.file_format
         if self.source is not None:
             obj["source"] = self.source
+        if self.property_name is not None:
+            obj["property_name"] = self.property_name
+        if self.identifier is not None:
+            obj["identifier"] = self.identifier(include_alias=True)
         return obj
 
     def from_json(self, obj):
@@ -88,8 +103,8 @@ class ModelInfo:
             self.key = obj["key"]
         if "twin_hardware_id" in obj.keys():
             self.twin_hardware_id = obj["twin_hardware_id"]
-        if "property_name" in obj.keys():
-            self.property_name = obj["property_name"]
+        if "property_value" in obj.keys():
+            self.property_name = obj["property_value"]
         if "alias" in obj.keys():
             self.alias = obj["alias"]
         if "model_type" in obj.keys():
@@ -98,6 +113,8 @@ class ModelInfo:
             self.key = obj["file_format"]
         if "source" in obj.keys():
             self.source = obj["source"]
+        if "property_name" in obj.keys():
+            self.property_name = obj["property_name"]
 
 
 class ModelList:
@@ -194,22 +211,28 @@ class MLModelConfig(ApiDto):
         self.model_type = model_type
         self.model_alias = model_alias
 
-    def create_model_info(self, hardware_id: str = None) -> ModelInfo:
+    def create_model_info(self,
+                          hardware_id: str = None,
+                          property_value: str = None) -> ModelInfo:
         """
         create model info corresponding to the configuration.
         :param hardware_id: provide a hardware id for this model if by_twin.
+        :param property_value: provide a value for this model if by_property.
         :return:
         """
         if self.by_twin and hardware_id is None:
             raise ValueError('hardware_id is required if by_twin to create a model info')
+        if self.by_property and property_value is None:
+            raise ValueError('property_value is required if by_property to create a model info')
         model_info = ModelInfo(
             key=self.model_key,
             twin_hardware_id=hardware_id,
-            property_name=self.property_name,
+            property_value=property_value,
             source=self.source,
             alias=self.model_alias,
             file_format=self.model_format,
-            model_type=self.model_type
+            model_type=self.model_type,
+            property_name=self.property_name
         )
         return model_info
 

{wizata_dsapi-1.3.21 → wizata_dsapi-1.3.24}/wizata_dsapi/model_toolkit.py

@@ -1,28 +1,28 @@
 import pandas
-from .mlmodel import MLModel
+from .mlmodel import ModelInfo
 
 
-def predict(df: pandas.DataFrame, ml_model: MLModel, mapping_table=None):
+def predict(df: pandas.DataFrame, model_info: ModelInfo, mapping_table=None):
     """
     Execute a Machine Learning models locally.
     :param df: dataframe to use as input.
-    :param ml_model: trained machine learning model.
+    :param model_info: model information handler.
     :param mapping_table: Optional mapping table.
     :return: output dataframe with predicted values.
     """
-    if ml_model is None or ml_model.trained_model is None or ml_model.input_columns is None:
+    if model_info is None or model_info.trained_model is None or model_info.input_columns is None:
         raise ValueError("Please download your model from DS API before using it.")
     old_index = df.index
     df.index = pandas.to_datetime(df.index)
     df_result = pandas.DataFrame(index=df.index)
-    features = ml_model.input_columns
-    if ml_model.has_target_feat is True:
-        df_result['result'] = ml_model.trained_model.detect(df[features]).astype(float)
+    features = model_info.input_columns
+    if model_info.has_target_feat is True:
+        df_result['result'] = model_info.trained_model.detect(df[features]).astype(float)
     else:
-        df_result['result'] = ml_model.trained_model.predict(df[features]).astype(float)
-    if ml_model.label_counts != 0:
-        df_result[__generate_label_columns(ml_model.label_counts)] = \
-            ml_model.trained_model.predict_proba(df[features]).astype(float)
+        df_result['result'] = model_info.trained_model.predict(df[features]).astype(float)
+    if model_info.label_counts != 0:
+        df_result[__generate_label_columns(model_info.label_counts)] = \
+            model_info.trained_model.predict_proba(df[features]).astype(float)
     df_result = df_result.set_index(old_index)
     return df_result
 

{wizata_dsapi-1.3.21 → wizata_dsapi-1.3.24}/wizata_dsapi/pipeline_image.py

@@ -3,7 +3,7 @@ import json
 from .api_dto import ApiDto
 from .pipeline import Pipeline
 from .script import Script
-from .mlmodel import MLModel
+from .mlmodel import ModelInfo
 from datetime import datetime
 
 import pytz

wizata_dsapi-1.3.24/wizata_dsapi/version.py

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

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

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

wizata_dsapi-1.3.21/wizata_dsapi/version.py

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