wizata-dsapi 1.3.11__tar.gz → 1.3.13__tar.gz

{wizata_dsapi-1.3.11/wizata_dsapi.egg-info → wizata_dsapi-1.3.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wizata_dsapi
-Version: 1.3.11
+Version: 1.3.13
 Summary: Wizata Data Science Toolkit
 Author: Wizata S.A.
 Author-email: info@wizata.com
@@ -12,7 +12,8 @@ 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
+Requires-Dist: protobuf==5.29.5; 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"
@@ -31,7 +32,8 @@ 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; extra == "all"
+Requires-Dist: protobuf==5.29.5; 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"

{wizata_dsapi-1.3.11 → wizata_dsapi-1.3.13}/setup.py

@@ -14,7 +14,8 @@ core_dependencies = [
     'numpy>=2.3.3; python_version>="3.12"',
     'dill==0.3.6; python_version<"3.12"',
     'dill==0.4.0; python_version>="3.12"',
-    'protobuf>=3.20.3',
+    'protobuf==5.29.5; python_version<"3.12"',
+    'protobuf>=5.29.5; python_version>="3.12"',
     'msal==1.30.0; python_version<"3.12"',
     'msal>=1.34.0; python_version>="3.12"',
     'joblib==1.5.2; python_version<"3.12"',

{wizata_dsapi-1.3.11 → wizata_dsapi-1.3.13}/wizata_dsapi/mlmodel.py

@@ -24,6 +24,7 @@ class MLModelConfig(ApiDto):
     :ivar str model_key: key of the model to store (or use story property if dynamic).
     :ivar str model_type: reserved for 'mlflow' defines model flavor such as 'sklearn' or 'pyfunc'.
     :ivar str model_alias: reserved for 'mlflow' set the alias to target and use inside a pipeline.
+    :ivar str model_format: type of model (by default 'pkl') accept also 'pt' for PyTorch model using tensors (none = 'pkl')
     :ivar dict properties_mapping: dict to map properties expected by the script with the properties from the context.
     :ivar str property_name: define which property is looked for when using 'by_property'.
     :ivar str source: define name of model storage to use 'wizata'.
@@ -40,7 +41,6 @@ class MLModelConfig(ApiDto):
                  train_script=None,
                  train_test_split_pct: float = 1.0,
                  train_test_split_type: str = "ignore",
-                 format: str = 'pkl',
                  function: str = "predict",
                  properties_mapping=None,
                  target_feat=None,
@@ -51,6 +51,7 @@ class MLModelConfig(ApiDto):
                  model_key: str = None,
                  model_type: str = None,
                  model_alias: str = None,
+                 model_format: str = 'pkl',
                  by_twin: bool = False,
                  by_property: bool = False,
                  property_name: str = None,
@@ -76,7 +77,7 @@ class MLModelConfig(ApiDto):
         self.by_twin = by_twin
         self.by_property = by_property
         self.property_name = property_name
-        self.format = format
+        self.model_format = model_format
 
         # source
         self.source = source
@@ -159,8 +160,8 @@ class MLModelConfig(ApiDto):
             self.model_type = obj["model_type"]
         if "model_alias" in obj.keys() and obj["model_alias"] is not None:
             self.model_alias = obj["model_alias"]
-        if "format" in obj.keys() and obj["format"] is not None:
-            self.format = obj["format"]
+        if "model_format" in obj.keys() and obj["model_format"] is not None:
+            self.model_format = obj["model_format"]
 
     def to_json(self, target: str = None):
         obj = {
@@ -204,8 +205,8 @@ class MLModelConfig(ApiDto):
             obj["by_property"] = str(self.by_property)
         if self.property_name is not None:
             obj["property_name"] = self.property_name
-        if self.format  is not None:
-            obj["format"] = self.format
+        if self.model_format  is not None:
+            obj["model_format"] = self.model_format
 
         return obj
 

wizata_dsapi-1.3.13/wizata_dsapi/version.py

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

{wizata_dsapi-1.3.11 → wizata_dsapi-1.3.13/wizata_dsapi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wizata_dsapi
-Version: 1.3.11
+Version: 1.3.13
 Summary: Wizata Data Science Toolkit
 Author: Wizata S.A.
 Author-email: info@wizata.com
@@ -12,7 +12,8 @@ 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
+Requires-Dist: protobuf==5.29.5; 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"
@@ -31,7 +32,8 @@ 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; extra == "all"
+Requires-Dist: protobuf==5.29.5; 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"

{wizata_dsapi-1.3.11 → wizata_dsapi-1.3.13}/wizata_dsapi.egg-info/requires.txt

@@ -1,4 +1,3 @@
-protobuf>=3.20.3
 
 [:python_version < "3.11"]
 pandas==1.5.3
@@ -8,6 +7,7 @@ setuptools==67.6.0
 [:python_version < "3.12"]
 numpy==1.26.4
 dill==0.3.6
+protobuf==5.29.5
 msal==1.30.0
 joblib==1.5.2
 plotly==5.13.1
@@ -23,12 +23,12 @@ pandas==2.2.3
 pandas>=2.3.3
 numpy>=2.3.3
 dill==0.4.0
+protobuf>=5.29.5
 msal>=1.34.0
 joblib>=1.2.0
 plotly>=6.3.1
 
 [all]
-protobuf>=3.20.3
 adtk==0.6.2
 
 [all:(sys_platform != "darwin" or platform_machine != "arm64") and python_version < "3.12"]
@@ -43,6 +43,7 @@ matplotlib==3.7.1
 [all:python_version < "3.12"]
 numpy==1.26.4
 dill==0.3.6
+protobuf==5.29.5
 msal==1.30.0
 joblib==1.5.2
 plotly==5.13.1
@@ -74,6 +75,7 @@ torch==2.7.1
 pandas>=2.3.3
 numpy>=2.3.3
 dill==0.4.0
+protobuf>=5.29.5
 msal>=1.34.0
 joblib>=1.2.0
 plotly>=6.3.1

wizata_dsapi-1.3.11/wizata_dsapi/version.py

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