wizata-dsapi 1.3.34__tar.gz → 1.3.36__tar.gz

{wizata_dsapi-1.3.34 → wizata_dsapi-1.3.36}/PKG-INFO

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

{wizata_dsapi-1.3.34 → wizata_dsapi-1.3.36}/wizata_dsapi/mlmodel.py

@@ -1,4 +1,4 @@
-from typing import List, Iterator, Union
+from typing import List, Iterator, Union, Optional
 import os
 from .api_dto import ApiDto
 from datetime import datetime, timezone
@@ -49,13 +49,32 @@ class ModelFile:
                  size: int = None,
                  content = None):
         self.full_path = full_path
-        self.path = path
         self.name = name
         self.extension = extension
+        self.path = path
         self.last_modified = last_modified
         self.size = size
         self.content = content
 
+
+    @property
+    def path(self) -> Optional[str]:
+        if self.name and self.extension:
+            return f"{self.name}.{self.extension}"
+        return self.name or None
+
+    @path.setter
+    def path(self, value: Optional[str]):
+        if not value:
+            self.name = None
+            self.extension = None
+            return
+
+        base = os.path.basename(value.strip())
+        name_part, ext = os.path.splitext(base)
+        self.name = name_part or None
+        self.extension = ext.lstrip(".").lower() if ext else None
+
     def to_json(self):
         """
         convert this entity in a dict that can be json serializable
@@ -64,12 +83,12 @@ class ModelFile:
         obj = {}
         if self.full_path is not None:
             obj["full_path"] = str(self.full_path)
-        if self.path is not None:
-            obj["path"] = self.path
         if self.name is not None:
             obj["name"] = self.name
         if self.extension is not None:
             obj["extension"] = self.extension
+        if self.path is not None:
+            obj["path"] = self.path
         if self.last_modified is not None:
             obj["last_modified"] = self.last_modified.timestamp() * 1000.0
         if self.size is not None:
@@ -82,12 +101,12 @@ class ModelFile:
         """
         if "full_path" in obj.keys():
             self.full_path = obj["full_path"]
-        if "path" in obj.keys():
-            self.path = obj["path"]
         if "name" in obj.keys():
             self.name = obj["name"]
         if "extension" in obj.keys():
             self.extension = obj["extension"]
+        if not self.name and not self.extension and "path" in obj:
+            self.path = obj["path"]
         if "last_modified" in obj.keys():
             self.last_modified = datetime.fromtimestamp(obj["last_modified"] / 1000, tz=timezone.utc)
         if "size" in obj.keys():
@@ -222,10 +241,6 @@ class ModelInfo:
             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:
-            obj["source"] = self.source
         if self.property_name is not None:
             obj["property_name"] = self.property_name
         if self.is_active is not None:
@@ -251,7 +266,7 @@ class ModelInfo:
         if "model_type" in obj.keys():
             self.model_type = obj["model_type"]
         if "file_format" in obj.keys():
-            self.key = obj["file_format"]
+            self.file_format = obj["file_format"]
         if "source" in obj.keys():
             self.source = obj["source"]
         if "property_name" in obj.keys():

wizata_dsapi-1.3.36/wizata_dsapi/version.py

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

{wizata_dsapi-1.3.34 → wizata_dsapi-1.3.36}/wizata_dsapi/wizata_dsapi_client.py

@@ -1078,55 +1078,47 @@ class WizataDSAPIClient(ApiInterface):
         else:
             raise self.__raise_error(response)
 
-    def register_model(self,
-                       model_key,
-                       train_model,
-                       df: pandas.DataFrame,
-                       scaler=None,
-                       has_anomalies: bool = False,
-                       has_target_feat: bool = False,
-                       experiment_key = None) -> tuple[ModelInfo, pandas.DataFrame]:
-        """
-        Register a Machine Learning model to Wizata.
-        Model is tested by the API against a sample dataframe.
-        :param model_key: logical string id to identify the model.
-        :param train_model: trained model (must be compatible with pickle library)
-        :param df: sample dataframe.
-        :param scaler: scaler (must be compatible with pickle library)
-        :param has_anomalies: True is model generate Anomalies
-        :param has_target_feat: True if model need a target feature to be selected
-        :param experiment_key: Reference of an experiment to which link the generated ML Model
-        :return: registered ML Model , pandas.DataFrame
-        """
-        if model_key is None and isinstance(model_key, str):
-            raise ValueError('Please provide a str Model Key to identify the model.')
-        if train_model is None:
-            raise ValueError('Trained Machine Learning model should not be null')
-        elif df is None:
-            raise ValueError('A sample dataframe must be provided')
-
-        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
-
-        if experiment_key is not None:
-            ml_model.experimentId = self.get(experiment_key=experiment_key).experiment_id
-
-        try:
-            result_df = predict(df, ml_model)
-            if result_df is not None:
-                ml_model.status = "valid"
-                #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')
-        except Exception as e:
-            raise RuntimeError('not able to validated the model : ' + str(e))
+    def upload_model(self,
+                     model_info: ModelInfo):
+        """
+        upload a model within the model repository.
+        :param model_info: model info, with at least key (+twin, +property, +alias) and trained_model.
+        """
+        if model_info.trained_model is None:
+            raise ValueError("model_info must have a trained model as bytes content pkl or pt")
+        files = {
+            "trained_model": (
+                "trained_model." + model_info.file_format ,
+                model_info.trained_model,
+                "application/octet-stream",
+            )
+        }
+        headers = self.__header()
+        headers.pop("Content-Type", None)
+        response = requests.post(self.__url() + f"models",
+                                 headers=headers,
+                                 data={
+                                    "payload": json.dumps(model_info.to_json())
+                                 },
+                                 files=files)
+        if response.status_code == 200:
+            response_json = response.json()
+            if "identifier" in response_json:
+                key , twin, property_value, alias = ModelInfo.split_identifier(response_json["identifier"])
+                if alias is not None:
+                    model_info.alias = alias
+            for file in model_info.files:
+                file: wizata_dsapi.ModelFile
+                if file.name != "trained_model":
+                    headers["Content-Type"] = "application/octet-stream"
+                    response = requests.post(self.__url() + f"models/{model_info.identifier(include_alias=True)}/files/{file.name}",
+                                             data=file.content,
+                                             timeout=60)
+                    if response.status_code != 200 and response.status_code != 201:
+                        raise self.__raise_error(response)
+            return model_info
+        else:
+            raise self.__raise_error(response)
 
     def upsert_experiment(self, key: str, name: str, pipeline=None, twin=None):
         """

{wizata_dsapi-1.3.34 → wizata_dsapi-1.3.36}/wizata_dsapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wizata-dsapi
-Version: 1.3.34
+Version: 1.3.36
 Summary: Wizata Data Science Toolkit
 Author: Wizata S.A.
 Author-email: info@wizata.com

wizata_dsapi-1.3.34/wizata_dsapi/version.py

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