wizata-dsapi 1.3.33__tar.gz → 1.3.35__tar.gz

wizata_dsapi-1.3.35/PKG-INFO

@@ -0,0 +1,8 @@
+Metadata-Version: 2.1
+Name: wizata_dsapi
+Version: 1.3.35
+Summary: Wizata Data Science Toolkit
+Author: Wizata S.A.
+Author-email: info@wizata.com
+Provides-Extra: all
+License-File: LICENSE.txt

{wizata_dsapi-1.3.33 → wizata_dsapi-1.3.35}/wizata_dsapi/mlmodel.py

@@ -35,6 +35,9 @@ class ModelIdentifierInfo:
 class ModelFile:
     """
     define a model file.
+
+    :ivar path str: file name relative path e.g. trained_model.pkl
+    :ivar content bytes[]: array of content bytes
     """
 
     def __init__(self,
@@ -43,13 +46,15 @@ class ModelFile:
                  name: str = None,
                  extension: str = None,
                  last_modified: datetime = None,
-                 size: int = None):
+                 size: int = None,
+                 content = None):
         self.full_path = full_path
         self.path = path
         self.name = name
         self.extension = extension
         self.last_modified = last_modified
         self.size = size
+        self.content = content
 
     def to_json(self):
         """
@@ -94,7 +99,7 @@ class ModelInfo:
     define a pointer to a machine learning model.
 
     :ivar model_type str: mlflow model flavour
-    :ivar files list: list of file paths of model content.
+    :ivar files list: list of ModelFile of model content.
     """
 
     def __init__(self,
@@ -105,7 +110,10 @@ class ModelInfo:
                  model_type: str = None,
                  file_format: str = 'pkl',
                  source: str = 'wizata',
-                 property_name: str = None
+                 property_name: str = None,
+                 trained_model = None,
+                 scaler = None,
+                 files = None
                  ):
         # information identifying a model
         self.key = key
@@ -113,14 +121,22 @@ class ModelInfo:
         self.property_value = property_value
         self.alias = alias
         self.file_format = file_format
+        if self.file_format not in ["pt", "pkl"]:
+            raise ValueError("file_format must be 'pt' or 'pkl'")
         self.source = source
         self.model_type = model_type
-        self.files = []
+        if files is None:
+            self.files = []
+        else:
+            self.files = files
+            for file in files:
+                if not isinstance(file, ModelFile):
+                    raise TypeError("file is not a ModelFile with files")
         self.is_active = False
 
         # files attached to model when loaded
-        self.trained_model = None
-        self.scaler = None
+        self.trained_model = trained_model
+        self.scaler = scaler
 
         # temporary properties during model generation not generally stored
         self.property_name = property_name
@@ -206,10 +222,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:
@@ -235,7 +247,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.35/wizata_dsapi/version.py

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

{wizata_dsapi-1.3.33 → wizata_dsapi-1.3.35}/wizata_dsapi/wizata_dsapi_client.py

@@ -1078,55 +1078,38 @@ 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, alias = ModelInfo.split_identifier(response_json["identifier"])
+                if alias is not None:
+                    model_info.alias = alias
+            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.35/wizata_dsapi.egg-info/PKG-INFO

@@ -0,0 +1,8 @@
+Metadata-Version: 2.1
+Name: wizata-dsapi
+Version: 1.3.35
+Summary: Wizata Data Science Toolkit
+Author: Wizata S.A.
+Author-email: info@wizata.com
+Provides-Extra: all
+License-File: LICENSE.txt

wizata_dsapi-1.3.33/PKG-INFO

@@ -1,89 +0,0 @@
-Metadata-Version: 2.4
-Name: wizata_dsapi
-Version: 1.3.33
-Summary: Wizata Data Science Toolkit
-Author: Wizata S.A.
-Author-email: info@wizata.com
-License-File: LICENSE.txt
-Requires-Dist: pandas==1.5.3; python_version < "3.11"
-Requires-Dist: pandas==2.2.3; python_version >= "3.11" and python_version < "3.12"
-Requires-Dist: pandas>=2.3.3; python_version >= "3.12"
-Requires-Dist: numpy==1.26.4; python_version < "3.12"
-Requires-Dist: numpy>=2.3.3; python_version >= "3.12"
-Requires-Dist: dill==0.3.6; python_version < "3.12"
-Requires-Dist: dill==0.4.0; python_version >= "3.12"
-Requires-Dist: protobuf==3.20.3; python_version < "3.11"
-Requires-Dist: protobuf==5.29.5; python_version >= "3.11" and python_version < "3.12"
-Requires-Dist: protobuf>=5.29.5; python_version >= "3.12"
-Requires-Dist: msal==1.30.0; python_version < "3.12"
-Requires-Dist: msal>=1.34.0; python_version >= "3.12"
-Requires-Dist: joblib==1.5.2; python_version < "3.12"
-Requires-Dist: joblib>=1.2.0; python_version >= "3.12"
-Requires-Dist: requests==2.28.2; python_version < "3.11"
-Requires-Dist: requests>=2.32.5; python_version >= "3.11"
-Requires-Dist: setuptools==67.6.0; python_version < "3.11"
-Requires-Dist: setuptools>=80.9.0; python_version >= "3.11"
-Requires-Dist: plotly==5.13.1; python_version < "3.12"
-Requires-Dist: plotly>=6.3.1; python_version >= "3.12"
-Provides-Extra: all
-Requires-Dist: pandas==1.5.3; python_version < "3.11" and extra == "all"
-Requires-Dist: pandas==2.2.3; (python_version >= "3.11" and python_version < "3.12") and extra == "all"
-Requires-Dist: pandas>=2.3.3; python_version >= "3.12" and extra == "all"
-Requires-Dist: numpy==1.26.4; python_version < "3.12" and extra == "all"
-Requires-Dist: numpy>=2.3.3; python_version >= "3.12" and extra == "all"
-Requires-Dist: dill==0.3.6; python_version < "3.12" and extra == "all"
-Requires-Dist: dill==0.4.0; python_version >= "3.12" and extra == "all"
-Requires-Dist: protobuf==3.20.3; python_version < "3.11" and extra == "all"
-Requires-Dist: protobuf==5.29.5; (python_version >= "3.11" and python_version < "3.12") and extra == "all"
-Requires-Dist: protobuf>=5.29.5; python_version >= "3.12" and extra == "all"
-Requires-Dist: msal==1.30.0; python_version < "3.12" and extra == "all"
-Requires-Dist: msal>=1.34.0; python_version >= "3.12" and extra == "all"
-Requires-Dist: joblib==1.5.2; python_version < "3.12" and extra == "all"
-Requires-Dist: joblib>=1.2.0; python_version >= "3.12" and extra == "all"
-Requires-Dist: requests==2.28.2; python_version < "3.11" and extra == "all"
-Requires-Dist: requests>=2.32.5; python_version >= "3.11" and extra == "all"
-Requires-Dist: setuptools==67.6.0; python_version < "3.11" and extra == "all"
-Requires-Dist: setuptools>=80.9.0; python_version >= "3.11" and extra == "all"
-Requires-Dist: plotly==5.13.1; python_version < "3.12" and extra == "all"
-Requires-Dist: plotly>=6.3.1; python_version >= "3.12" and extra == "all"
-Requires-Dist: matplotlib==3.7.1; python_version < "3.11" and extra == "all"
-Requires-Dist: matplotlib>=3.10.6; python_version >= "3.11" and extra == "all"
-Requires-Dist: tensorflow>=2.15.0; ((sys_platform != "darwin" or platform_machine != "arm64") and python_version < "3.12") and extra == "all"
-Requires-Dist: tensorflow-macos>=2.15.0; (sys_platform == "darwin" and platform_machine == "arm64" and python_version < "3.12") and extra == "all"
-Requires-Dist: tensorflow>=2.20.0; python_version >= "3.12" and extra == "all"
-Requires-Dist: keras==2.15.0; python_version < "3.12" and extra == "all"
-Requires-Dist: keras>=3.11.3; python_version >= "3.12" and extra == "all"
-Requires-Dist: tensorflow_probability==0.15.0; python_version < "3.12" and extra == "all"
-Requires-Dist: tensorflow_probability>=0.25.0; python_version >= "3.12" and extra == "all"
-Requires-Dist: scikit-learn==1.2.2; python_version < "3.12" and extra == "all"
-Requires-Dist: scikit-learn>=1.7.2; python_version >= "3.12" and extra == "all"
-Requires-Dist: adtk==0.6.2; extra == "all"
-Requires-Dist: scipy==1.10.1; python_version < "3.12" and extra == "all"
-Requires-Dist: scipy>=1.16.2; python_version >= "3.12" and extra == "all"
-Requires-Dist: xgboost==1.7.4; python_version < "3.12" and extra == "all"
-Requires-Dist: xgboost>=3.0.5; python_version >= "3.12" and extra == "all"
-Requires-Dist: u8darts==0.25.0; python_version < "3.12" and extra == "all"
-Requires-Dist: u8darts>=0.38.0; python_version >= "3.12" and extra == "all"
-Requires-Dist: optuna==3.3.0; python_version < "3.12" and extra == "all"
-Requires-Dist: optuna>=4.5.0; python_version >= "3.12" and extra == "all"
-Requires-Dist: explainerdashboard==0.4.2.1; python_version < "3.12" and extra == "all"
-Requires-Dist: ipywidgets==8.0.4; python_version < "3.12" and extra == "all"
-Requires-Dist: ipywidgets>=8.1.7; python_version >= "3.12" and extra == "all"
-Requires-Dist: kaleido==0.2.1; python_version < "3.12" and extra == "all"
-Requires-Dist: kaleido>=1.1.0; python_version >= "3.12" and extra == "all"
-Requires-Dist: pytest==7.2.2; python_version < "3.12" and extra == "all"
-Requires-Dist: pytest>=8.4.2; python_version >= "3.12" and extra == "all"
-Requires-Dist: pytest-cov==4.0.0; python_version < "3.12" and extra == "all"
-Requires-Dist: pytest-cov>=7.0.0; python_version >= "3.12" and extra == "all"
-Requires-Dist: shapely==2.0.1; python_version < "3.12" and extra == "all"
-Requires-Dist: shapely>=2.1.2; python_version >= "3.12" and extra == "all"
-Requires-Dist: pyodbc==4.0.35; python_version < "3.12" and extra == "all"
-Requires-Dist: pyodbc>=5.2.0; python_version >= "3.12" and extra == "all"
-Requires-Dist: torch==2.7.1; (python_version >= "3.11" and python_version < "3.12") and extra == "all"
-Requires-Dist: torch>=2.8.0; python_version >= "3.12" and extra == "all"
-Dynamic: author
-Dynamic: author-email
-Dynamic: license-file
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: summary

wizata_dsapi-1.3.33/wizata_dsapi/version.py

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

wizata_dsapi-1.3.33/wizata_dsapi.egg-info/PKG-INFO

@@ -1,89 +0,0 @@
-Metadata-Version: 2.4
-Name: wizata_dsapi
-Version: 1.3.33
-Summary: Wizata Data Science Toolkit
-Author: Wizata S.A.
-Author-email: info@wizata.com
-License-File: LICENSE.txt
-Requires-Dist: pandas==1.5.3; python_version < "3.11"
-Requires-Dist: pandas==2.2.3; python_version >= "3.11" and python_version < "3.12"
-Requires-Dist: pandas>=2.3.3; python_version >= "3.12"
-Requires-Dist: numpy==1.26.4; python_version < "3.12"
-Requires-Dist: numpy>=2.3.3; python_version >= "3.12"
-Requires-Dist: dill==0.3.6; python_version < "3.12"
-Requires-Dist: dill==0.4.0; python_version >= "3.12"
-Requires-Dist: protobuf==3.20.3; python_version < "3.11"
-Requires-Dist: protobuf==5.29.5; python_version >= "3.11" and python_version < "3.12"
-Requires-Dist: protobuf>=5.29.5; python_version >= "3.12"
-Requires-Dist: msal==1.30.0; python_version < "3.12"
-Requires-Dist: msal>=1.34.0; python_version >= "3.12"
-Requires-Dist: joblib==1.5.2; python_version < "3.12"
-Requires-Dist: joblib>=1.2.0; python_version >= "3.12"
-Requires-Dist: requests==2.28.2; python_version < "3.11"
-Requires-Dist: requests>=2.32.5; python_version >= "3.11"
-Requires-Dist: setuptools==67.6.0; python_version < "3.11"
-Requires-Dist: setuptools>=80.9.0; python_version >= "3.11"
-Requires-Dist: plotly==5.13.1; python_version < "3.12"
-Requires-Dist: plotly>=6.3.1; python_version >= "3.12"
-Provides-Extra: all
-Requires-Dist: pandas==1.5.3; python_version < "3.11" and extra == "all"
-Requires-Dist: pandas==2.2.3; (python_version >= "3.11" and python_version < "3.12") and extra == "all"
-Requires-Dist: pandas>=2.3.3; python_version >= "3.12" and extra == "all"
-Requires-Dist: numpy==1.26.4; python_version < "3.12" and extra == "all"
-Requires-Dist: numpy>=2.3.3; python_version >= "3.12" and extra == "all"
-Requires-Dist: dill==0.3.6; python_version < "3.12" and extra == "all"
-Requires-Dist: dill==0.4.0; python_version >= "3.12" and extra == "all"
-Requires-Dist: protobuf==3.20.3; python_version < "3.11" and extra == "all"
-Requires-Dist: protobuf==5.29.5; (python_version >= "3.11" and python_version < "3.12") and extra == "all"
-Requires-Dist: protobuf>=5.29.5; python_version >= "3.12" and extra == "all"
-Requires-Dist: msal==1.30.0; python_version < "3.12" and extra == "all"
-Requires-Dist: msal>=1.34.0; python_version >= "3.12" and extra == "all"
-Requires-Dist: joblib==1.5.2; python_version < "3.12" and extra == "all"
-Requires-Dist: joblib>=1.2.0; python_version >= "3.12" and extra == "all"
-Requires-Dist: requests==2.28.2; python_version < "3.11" and extra == "all"
-Requires-Dist: requests>=2.32.5; python_version >= "3.11" and extra == "all"
-Requires-Dist: setuptools==67.6.0; python_version < "3.11" and extra == "all"
-Requires-Dist: setuptools>=80.9.0; python_version >= "3.11" and extra == "all"
-Requires-Dist: plotly==5.13.1; python_version < "3.12" and extra == "all"
-Requires-Dist: plotly>=6.3.1; python_version >= "3.12" and extra == "all"
-Requires-Dist: matplotlib==3.7.1; python_version < "3.11" and extra == "all"
-Requires-Dist: matplotlib>=3.10.6; python_version >= "3.11" and extra == "all"
-Requires-Dist: tensorflow>=2.15.0; ((sys_platform != "darwin" or platform_machine != "arm64") and python_version < "3.12") and extra == "all"
-Requires-Dist: tensorflow-macos>=2.15.0; (sys_platform == "darwin" and platform_machine == "arm64" and python_version < "3.12") and extra == "all"
-Requires-Dist: tensorflow>=2.20.0; python_version >= "3.12" and extra == "all"
-Requires-Dist: keras==2.15.0; python_version < "3.12" and extra == "all"
-Requires-Dist: keras>=3.11.3; python_version >= "3.12" and extra == "all"
-Requires-Dist: tensorflow_probability==0.15.0; python_version < "3.12" and extra == "all"
-Requires-Dist: tensorflow_probability>=0.25.0; python_version >= "3.12" and extra == "all"
-Requires-Dist: scikit-learn==1.2.2; python_version < "3.12" and extra == "all"
-Requires-Dist: scikit-learn>=1.7.2; python_version >= "3.12" and extra == "all"
-Requires-Dist: adtk==0.6.2; extra == "all"
-Requires-Dist: scipy==1.10.1; python_version < "3.12" and extra == "all"
-Requires-Dist: scipy>=1.16.2; python_version >= "3.12" and extra == "all"
-Requires-Dist: xgboost==1.7.4; python_version < "3.12" and extra == "all"
-Requires-Dist: xgboost>=3.0.5; python_version >= "3.12" and extra == "all"
-Requires-Dist: u8darts==0.25.0; python_version < "3.12" and extra == "all"
-Requires-Dist: u8darts>=0.38.0; python_version >= "3.12" and extra == "all"
-Requires-Dist: optuna==3.3.0; python_version < "3.12" and extra == "all"
-Requires-Dist: optuna>=4.5.0; python_version >= "3.12" and extra == "all"
-Requires-Dist: explainerdashboard==0.4.2.1; python_version < "3.12" and extra == "all"
-Requires-Dist: ipywidgets==8.0.4; python_version < "3.12" and extra == "all"
-Requires-Dist: ipywidgets>=8.1.7; python_version >= "3.12" and extra == "all"
-Requires-Dist: kaleido==0.2.1; python_version < "3.12" and extra == "all"
-Requires-Dist: kaleido>=1.1.0; python_version >= "3.12" and extra == "all"
-Requires-Dist: pytest==7.2.2; python_version < "3.12" and extra == "all"
-Requires-Dist: pytest>=8.4.2; python_version >= "3.12" and extra == "all"
-Requires-Dist: pytest-cov==4.0.0; python_version < "3.12" and extra == "all"
-Requires-Dist: pytest-cov>=7.0.0; python_version >= "3.12" and extra == "all"
-Requires-Dist: shapely==2.0.1; python_version < "3.12" and extra == "all"
-Requires-Dist: shapely>=2.1.2; python_version >= "3.12" and extra == "all"
-Requires-Dist: pyodbc==4.0.35; python_version < "3.12" and extra == "all"
-Requires-Dist: pyodbc>=5.2.0; python_version >= "3.12" and extra == "all"
-Requires-Dist: torch==2.7.1; (python_version >= "3.11" and python_version < "3.12") and extra == "all"
-Requires-Dist: torch>=2.8.0; python_version >= "3.12" and extra == "all"
-Dynamic: author
-Dynamic: author-email
-Dynamic: license-file
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: summary