wizata-dsapi 1.3.34__py3-none-any.whl → 1.3.35__py3-none-any.whl

wizata_dsapi/mlmodel.py

@@ -222,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:
@@ -251,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/version.py

@@ -1 +1 @@
-__version__ = "1.3.34"
+__version__ = "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.34.dist-info → wizata_dsapi-1.3.35.dist-info}/METADATA

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

{wizata_dsapi-1.3.34.dist-info → wizata_dsapi-1.3.35.dist-info}/RECORD

@@ -16,7 +16,7 @@ wizata_dsapi/experiment.py,sha256=QYQ1CJ-MTWsXq08xYbm5sAp95dRxbPOmGDgaAOoBMDQ,46
 wizata_dsapi/group_system.py,sha256=6rUKe0_J3YWACysyBlzuw_TEpKNXgLOMxhpWsNxOzwY,1708
 wizata_dsapi/ilogger.py,sha256=iYnID-Z-qrYhie26C43404aIuU4_tHSKXbDeQIdo82Q,807
 wizata_dsapi/insight.py,sha256=ABFZ04DqYxxzqAEfU1tzlTZqqrigM-zN-8Lbetko3g0,6468
-wizata_dsapi/mlmodel.py,sha256=8oRq6hoVAwN44490s7NrvlmzHVg6-8WO-Z60LrYARmU,22152
+wizata_dsapi/mlmodel.py,sha256=VPfjdTAQ2X20kAkfAXKGGlqEUkzMCY9NcKVj422YYQ4,21993
 wizata_dsapi/model_toolkit.py,sha256=UNyw5CFSgZeXydQFsiDIRTjoMeqIsdyIIuiwumLW5bA,1574
 wizata_dsapi/paged_query_result.py,sha256=0Iyt2Kd4tvrfthhT-tk9EmSERsbJTaPNON2euHcBn6k,1150
 wizata_dsapi/pipeline.py,sha256=WDJeOxPZJiYW1qwTNZUm3jom2epIxqrSoiUwcrTF9EE,31300
@@ -31,10 +31,10 @@ wizata_dsapi/template.py,sha256=wtCRKKk3PchH4RrNgNYlEF_9C6bzZwKIeLyEvgv6Fdo,1370
 wizata_dsapi/trigger.py,sha256=w3BZYP-L3SUwvaT0oCTanh_Ewn57peZvlt7vxzHv9J8,5129
 wizata_dsapi/twin.py,sha256=S0DUzQf1smZXZTdXpXZPtkZYCfKIhw53EecCnsl9i4Q,11017
 wizata_dsapi/twinregistration.py,sha256=Mi6-YuwroiEXc0c1hgrOaphh4hNVoHupxOnXedVtJtE,13377
-wizata_dsapi/version.py,sha256=ZFzPwcVApl0WXETY3ii4RpYWOC9l9iNTKU07I0HChdg,23
+wizata_dsapi/version.py,sha256=X9wwJLVQWqESOn2IYyoaDZxF1SSf2EHnlJd49iZiLGU,23
 wizata_dsapi/wizard_function.py,sha256=RbM7W7Gf-6Rhp_1dU9DBYkHaciknGAGvuAndhAS_vyo,942
 wizata_dsapi/wizard_request.py,sha256=v6BaqKLKvTWmUSo0_gda9FabAQz5x_-GOH1Av50GzFo,3762
-wizata_dsapi/wizata_dsapi_client.py,sha256=h8iSz7IGbP-Zq9rbqMdq-hTrt16laD1JeaRWPzaLaoo,77695
+wizata_dsapi/wizata_dsapi_client.py,sha256=-4fE22nZPSTOzByt6mGebf774gPMoqvoIp33a3BLFis,76691
 wizata_dsapi/words.py,sha256=tV8CqzCqODZCV7PgBxBF5exBxeF_ya9t5DiUy-cg6Sg,1535
 wizata_dsapi/models/__init__.py,sha256=O5PHqw8lKILw4apO-MfDxPz73wK0vADD9y3xjuzX7Tw,104
 wizata_dsapi/models/common.py,sha256=1dTqE80-mFJnUwEdNlJdhJzfZ2N5Kp8Nb3LQ8uwPtLc,3808
@@ -42,8 +42,8 @@ wizata_dsapi/plots/__init__.py,sha256=qgnSFqrjOPur-807M8uh5awIfjM1ZHXUXcAqHc-r2l
 wizata_dsapi/plots/common.py,sha256=jdPsJqLHBwSKc6dX83BSGPqSRxzIVNHSYO5yI_8sjGk,6568
 wizata_dsapi/scripts/__init__.py,sha256=hAxiETSQf0qOHde1si1tEAJU48seqEgHrchCzS2-LvQ,80
 wizata_dsapi/scripts/common.py,sha256=efwq-Rd0lvYljIs3gSFz9izogBD7asOU2cTK-IvHTkM,4244
-wizata_dsapi-1.3.34.dist-info/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-wizata_dsapi-1.3.34.dist-info/METADATA,sha256=f3XiXVKkbEnDaQ74Mgh0-JmqIpLDPGMBUQcyeHEHSCI,6119
-wizata_dsapi-1.3.34.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-wizata_dsapi-1.3.34.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
-wizata_dsapi-1.3.34.dist-info/RECORD,,
+wizata_dsapi-1.3.35.dist-info/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+wizata_dsapi-1.3.35.dist-info/METADATA,sha256=wl5Nn6q8EQA8vJToONdXUGyW3pEh51dNe4DtveHaD4A,6119
+wizata_dsapi-1.3.35.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+wizata_dsapi-1.3.35.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
+wizata_dsapi-1.3.35.dist-info/RECORD,,