wizata-dsapi 1.2.25__py3-none-any.whl → 1.3.1__py3-none-any.whl

wizata_dsapi/mlmodel.py

@@ -16,6 +16,7 @@ class MLModelConfig(ApiDto):
     a model config defines execution properties within a pipeline.
     usually to define how a pipeline should train and predict with your model.
 
+    :ivar format: by default 'pkl' for pickle, accept 'pt' for PyTorch model using tensors (none = 'pkl')
     :ivar bool by_twin: define if pipeline need to train and use different model by twin item.
     :ivar bool by_property: define if pipeline need to train and use different model based on 'property_name'.
     :ivar list features: datapoint list to refine columns if necessary.
@@ -39,6 +40,7 @@ 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,
@@ -74,6 +76,7 @@ class MLModelConfig(ApiDto):
         self.by_twin = by_twin
         self.by_property = by_property
         self.property_name = property_name
+        self.format = format
 
         # source
         self.source = source
@@ -156,6 +159,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"]
 
     def to_json(self, target: str = None):
         obj = {
@@ -199,6 +204,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
 
         return obj
 

wizata_dsapi/request.py

@@ -355,6 +355,36 @@ class Request(ApiDto):
         else:
             return
 
+    def set_twin(self, twin):
+        """
+        set a twin properly (str hardware Id or uuid.UUID)
+        :param twin:
+        :return:
+        """
+        if self.template is None:
+            self.template = {}
+        if isinstance(twin, uuid.UUID):
+            self.template['twin_id'] = twin
+        elif isinstance(twin, str):
+            self.template['twin_hardware_id'] = twin
+        else:
+            raise TypeError('twin must be str or uuid on request')
+
+    def set_template(self, template):
+        """
+        set a template properly (str key or uuid.UUID)
+        :param template:
+        :return:
+        """
+        if self.template is None:
+            self.template = {}
+        if isinstance(template, uuid.UUID):
+            self.template['template_id'] = template
+        elif isinstance(template, str):
+            self.template['template_key'] = template
+        else:
+            raise TypeError('template must be str or uuid on request')
+
     def __format_date(self, dt_to_format):
         if isinstance(dt_to_format, datetime):
             millisec = dt_to_format.timestamp() * 1000
@@ -468,22 +498,27 @@ class Request(ApiDto):
         else:
             self.template = {}
 
-            if template_id is not None:
+            template = None
+            if template_key is not None:
+                template = template_key
+            elif template_id is not None:
                 if isinstance(template_id, uuid.UUID):
-                    self.template['template_id'] = template_id
+                    template = template_id
                 else:
-                    self.template['template_id'] = uuid.UUID(template_id)
-            elif template_key is not None:
-                self.template['template_key'] = str(template_key)
-
-            if twin_id is not None:
+                    template = uuid.UUID(template_id)
+            if template is not None:
+                self.set_template(template=template)
+
+            twin = None
+            if twin_hardware_id is not None:
+                twin = twin_hardware_id
+            elif twin_id is not None:
                 if isinstance(twin_id, uuid.UUID):
-                    self.template['twin_id'] = twin_id
+                    twin = twin_id
                 else:
-                    self.template['twin_id'] = uuid.UUID(twin_id)
-
-            elif twin_hardware_id is not None:
-                self.template['twin_hardware_id'] = str(twin_hardware_id)
+                    twin = uuid.UUID(twin_id)
+            if twin is not None:
+                self.set_twin(twin=twin)
 
     def get_params(self):
         """

wizata_dsapi/version.py

@@ -1 +1 @@
-__version__ = "1.2.25"
+__version__ = "1.3.1"

wizata_dsapi/wizata_dsapi_client.py

@@ -662,11 +662,11 @@ class WizataDSAPIClient(ApiInterface):
 
         request.set_aggregation(agg_method, interval)
 
-        if template is not None or twin is not None:
-            request.select_template(
-                template_key=template,
-                twin_hardware_id=twin
-            )
+        if twin is not None:
+            request.set_twin(twin)
+
+        if template is not None:
+            request.set_template(template)
 
         if filters is not None:
             request.filters = filters

wizata_dsapi-1.3.1.dist-info/METADATA

@@ -0,0 +1,67 @@
+Metadata-Version: 2.4
+Name: wizata_dsapi
+Version: 1.3.1
+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.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
+Requires-Dist: msal==1.24.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.12"
+Requires-Dist: requests>=2.32.5; python_version >= "3.12"
+Requires-Dist: setuptools==67.6.0; python_version < "3.12"
+Requires-Dist: setuptools>=80.9.0; python_version >= "3.12"
+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.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; extra == "all"
+Requires-Dist: msal==1.24.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.12" and extra == "all"
+Requires-Dist: requests>=2.32.5; python_version >= "3.12" and extra == "all"
+Requires-Dist: setuptools==67.6.0; python_version < "3.12" and extra == "all"
+Requires-Dist: setuptools>=80.9.0; python_version >= "3.12" 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; extra == "all"
+Requires-Dist: tensorflow==2.15.0; (sys_platform != "darwin" or platform_machine != "arm64") and extra == "all"
+Requires-Dist: tensorflow-macos==2.15.0; (sys_platform == "darwin" and platform_machine == "arm64") and extra == "all"
+Requires-Dist: keras==2.15.0; (sys_platform != "darwin" or platform_machine != "arm64") and extra == "all"
+Requires-Dist: keras==2.15.0; (sys_platform == "darwin" and platform_machine == "arm64") and extra == "all"
+Requires-Dist: tensorflow_probability==0.15.0; extra == "all"
+Requires-Dist: scikit-learn==1.2.2; extra == "all"
+Requires-Dist: adtk==0.6.2; extra == "all"
+Requires-Dist: scipy==1.10.1; extra == "all"
+Requires-Dist: xgboost==1.7.4; extra == "all"
+Requires-Dist: u8darts==0.25.0; extra == "all"
+Requires-Dist: optuna==3.3.0; extra == "all"
+Requires-Dist: explainerdashboard==0.4.2.1; extra == "all"
+Requires-Dist: ipywidgets==8.0.4; extra == "all"
+Requires-Dist: kaleido==0.2.1; extra == "all"
+Requires-Dist: pytest==7.2.2; extra == "all"
+Requires-Dist: pytest-cov==4.0.0; extra == "all"
+Requires-Dist: shapely==2.0.1; extra == "all"
+Requires-Dist: pyodbc==4.0.35; extra == "all"
+Dynamic: author
+Dynamic: author-email
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary

{wizata_dsapi-1.2.25.dist-info → wizata_dsapi-1.3.1.dist-info}/RECORD

@@ -16,14 +16,14 @@ 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=ooVfY5LIHZojhBoZtnz-WGnf95P15md5cgvo3Lg8CG4,14568
+wizata_dsapi/mlmodel.py,sha256=1vd5dHob3LtrjbWjpGr90GyPEcdBKxUQRxExX1OJdWc,14923
 wizata_dsapi/model_toolkit.py,sha256=a76ckSuetSKDjEkOl7o49g9oaItdw9iOaPt0JcstmhU,1551
 wizata_dsapi/paged_query_result.py,sha256=0Iyt2Kd4tvrfthhT-tk9EmSERsbJTaPNON2euHcBn6k,1150
 wizata_dsapi/pipeline.py,sha256=WDJeOxPZJiYW1qwTNZUm3jom2epIxqrSoiUwcrTF9EE,31300
 wizata_dsapi/pipeline_deployment.py,sha256=grekBaxUK0EhL9w7lDB8vNuW_wzLnHVm9Mq8Lkbkguk,1722
 wizata_dsapi/pipeline_image.py,sha256=M3FOr45dJIAEvsmXPpMD8JZ09k5-YpW9PRYEWJqptcI,5272
 wizata_dsapi/plot.py,sha256=SPGKFWWYNcRvHcqvvnPIIIBKsd5UwhdsxLW7b2dG2rs,2360
-wizata_dsapi/request.py,sha256=qHh1-DQri2Vh17069fHmLlrF5vjNTvA4jmD6mYjg2w8,26515
+wizata_dsapi/request.py,sha256=W4E1BHacQdJiBLPI96yVeHz41rbfFuGrbuw1U60L_DM,27560
 wizata_dsapi/script.py,sha256=DeEciwVpuCYZetgJCoivw_bYe8ma52WuTaTQ_VkLEcg,12930
 wizata_dsapi/solution_component.py,sha256=8gbZWx2h_xUqI_pAXa3goqAnR5Y-GDMii8MeGlaK1IE,9531
 wizata_dsapi/streamlit_utils.py,sha256=sXBdygktbixV828Zg01Nl27_a4F8zGFc4RY0C8g-1bc,1942
@@ -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=9j001fhDZzLSWs6YCbGQFuK5ERX5EUWz3RKLN8l5JS8,23
+wizata_dsapi/version.py,sha256=-ypEJktJToAL9by62JJKWEzDo_KPCQtmE5kwFgX24z4,22
 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=6URQeMA5A9eXxC2cs8TUbKolmOo-Kj6kII9NmRRITPQ,78702
+wizata_dsapi/wizata_dsapi_client.py,sha256=kos_8j47CBXiy6y6b_H2yDUe3aWh76diEmWjCisYKkY,78662
 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.2.25.dist-info/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-wizata_dsapi-1.2.25.dist-info/METADATA,sha256=hWT2ESQIOnGzoOoXklVARi5LoeEYuL0Sf0IKCU60_YM,2188
-wizata_dsapi-1.2.25.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-wizata_dsapi-1.2.25.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
-wizata_dsapi-1.2.25.dist-info/RECORD,,
+wizata_dsapi-1.3.1.dist-info/licenses/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+wizata_dsapi-1.3.1.dist-info/METADATA,sha256=36YAYQVzxultH6vkroCN9f_AJ4cSfgv-jLSEzrrHvjk,3635
+wizata_dsapi-1.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wizata_dsapi-1.3.1.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
+wizata_dsapi-1.3.1.dist-info/RECORD,,

{wizata_dsapi-1.2.25.dist-info → wizata_dsapi-1.3.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

wizata_dsapi-1.2.25.dist-info/METADATA

@@ -1,46 +0,0 @@
-Metadata-Version: 2.1
-Name: wizata-dsapi
-Version: 1.2.25
-Summary: Wizata Data Science Toolkit
-Author: Wizata S.A.
-Author-email: info@wizata.com
-License-File: LICENSE.txt
-Requires-Dist: pandas (==1.5.3)
-Requires-Dist: numpy (==1.26.4)
-Requires-Dist: dill (==0.3.6)
-Requires-Dist: protobuf (==3.20.3)
-Requires-Dist: msal (>=1.24.0)
-Requires-Dist: joblib (==1.2.0)
-Requires-Dist: requests (==2.28.2)
-Requires-Dist: setuptools (==67.6.0)
-Requires-Dist: plotly (==5.13.1)
-Provides-Extra: all
-Requires-Dist: pandas (==1.5.3) ; extra == 'all'
-Requires-Dist: numpy (==1.26.4) ; extra == 'all'
-Requires-Dist: dill (==0.3.6) ; extra == 'all'
-Requires-Dist: protobuf (==3.20.3) ; extra == 'all'
-Requires-Dist: msal (>=1.24.0) ; extra == 'all'
-Requires-Dist: joblib (==1.2.0) ; extra == 'all'
-Requires-Dist: requests (==2.28.2) ; extra == 'all'
-Requires-Dist: setuptools (==67.6.0) ; extra == 'all'
-Requires-Dist: plotly (==5.13.1) ; extra == 'all'
-Requires-Dist: matplotlib (==3.7.1) ; extra == 'all'
-Requires-Dist: tensorflow-probability (==0.15.0) ; extra == 'all'
-Requires-Dist: scikit-learn (==1.2.2) ; extra == 'all'
-Requires-Dist: adtk (==0.6.2) ; extra == 'all'
-Requires-Dist: scipy (==1.10.1) ; extra == 'all'
-Requires-Dist: xgboost (==1.7.4) ; extra == 'all'
-Requires-Dist: u8darts (==0.25.0) ; extra == 'all'
-Requires-Dist: optuna (==3.3.0) ; extra == 'all'
-Requires-Dist: explainerdashboard (==0.4.2.1) ; extra == 'all'
-Requires-Dist: ipywidgets (==8.0.4) ; extra == 'all'
-Requires-Dist: kaleido (==0.2.1) ; extra == 'all'
-Requires-Dist: pytest (==7.2.2) ; extra == 'all'
-Requires-Dist: pytest-cov (==4.0.0) ; extra == 'all'
-Requires-Dist: shapely (==2.0.1) ; extra == 'all'
-Requires-Dist: pyodbc (==4.0.35) ; extra == 'all'
-Requires-Dist: tensorflow (==2.15.0) ; (sys_platform != "darwin" or platform_machine != "arm64") and extra == 'all'
-Requires-Dist: keras (==2.15.0) ; (sys_platform != "darwin" or platform_machine != "arm64") and extra == 'all'
-Requires-Dist: tensorflow-macos (==2.15.0) ; (sys_platform == "darwin" and platform_machine == "arm64") and extra == 'all'
-Requires-Dist: keras (==2.15.0) ; (sys_platform == "darwin" and platform_machine == "arm64") and extra == 'all'
-