wizata-dsapi 2.2.0.dev27__py3-none-any.whl → 2.2.0.dev28__py3-none-any.whl

wizata_dsapi/mlmodel.py

@@ -1,6 +1,7 @@
 from typing import List, Iterator, Union, Optional
 import os
 from .api_dto import ApiDto, ApiDtoInterface
+from .script import ScriptType
 from datetime import datetime, timezone
 
 
@@ -438,6 +439,9 @@ class MLModelConfig(ApiDto):
     :ivar str source: define name of model storage to use 'wizata'.
     :ivar str|list target_feat: target feature name(s) to remove from df in 'predict' mode.
     :ivar str train_script: name of function referencing the script to train the model.
+    :ivar ScriptType train_script_type: the trainer's type (JSON ``train_script_type``): ``raw``
+        for a trainer kept in the attached git repository; when absent it is inferred, built-in
+        (``wizata.*``) or uploaded with the SDK (DEV-6125).
     :ivar float train_test_split_pct: percentage repartition to split the data for training and scoring.
     :ivar str train_test_split_type: type of splitting desired to split the train dataframe.
     :ivar bool output_append: true - default - append output to input dataframe. false to retrieve only 'predict' column(s).
@@ -464,11 +468,13 @@ class MLModelConfig(ApiDto):
                  by_twin: bool = False,
                  by_property: bool = False,
                  property_name: str = None,
-                 source: str = "wizata"
+                 source: str = "wizata",
+                 train_script_type=None
                  ):
 
         # training
         self.train_script = train_script
+        self.train_script_type = ScriptType(train_script_type) if train_script_type is not None else None
         self.train_test_split_pct = train_test_split_pct
         self.train_test_split_type = train_test_split_type
         self.function = function
@@ -535,6 +541,8 @@ class MLModelConfig(ApiDto):
         # training info
         if "train_script" in obj.keys() and obj["train_script"] is not None:
             self.train_script = obj["train_script"]
+        if obj.get("train_script_type") is not None:
+            self.train_script_type = ScriptType(obj["train_script_type"])
         if "train_test_split_pct" in obj.keys() and obj["train_test_split_pct"] is not None:
             self.train_test_split_pct = float(obj["train_test_split_pct"])
         if "train_test_split_type" in obj.keys() and obj["train_test_split_type"] is not None:
@@ -612,6 +620,8 @@ class MLModelConfig(ApiDto):
         # training info
         if self.train_script is not None:
             obj["train_script"] = str(self.train_script)
+        if getattr(self, "train_script_type", None) is not None:
+            obj["train_script_type"] = self.train_script_type.value
         if self.train_test_split_pct is not None:
             obj["train_test_split_pct"] = float(self.train_test_split_pct)
         if self.train_test_split_type is not None:

wizata_dsapi/version.py

@@ -1 +1 @@
-__version__ = "2.2.0.dev27"
+__version__ = "2.2.0.dev28"

{wizata_dsapi-2.2.0.dev27.dist-info → wizata_dsapi-2.2.0.dev28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wizata_dsapi
-Version: 2.2.0.dev27
+Version: 2.2.0.dev28
 Summary: Wizata Data Science Toolkit
 Author: Wizata S.A.
 Author-email: info@wizata.com

{wizata_dsapi-2.2.0.dev27.dist-info → wizata_dsapi-2.2.0.dev28.dist-info}/RECORD

@@ -30,7 +30,7 @@ wizata_dsapi/group_system.py,sha256=6rUKe0_J3YWACysyBlzuw_TEpKNXgLOMxhpWsNxOzwY,
 wizata_dsapi/ilogger.py,sha256=YKBTRp7pHYtBlnzroGRPT91_bMVJT93Pft3fUGcFSIM,488
 wizata_dsapi/insight.py,sha256=ABFZ04DqYxxzqAEfU1tzlTZqqrigM-zN-8Lbetko3g0,6468
 wizata_dsapi/inventory.py,sha256=r6TZDRTMEWeKDu2l2cL1K2vJ8etdjTEGPsMt3adcNgw,26985
-wizata_dsapi/mlmodel.py,sha256=ezgln6vyNGqEw7mD4P2YQZxHm5rXGqM9YW40eS09A8Q,26595
+wizata_dsapi/mlmodel.py,sha256=fgfzdHvNQFuPkR_eReXWNpnoiKWzjSB1oYEmm5HVHc8,27286
 wizata_dsapi/mobile_asset.py,sha256=FBEvrOaXkT8YaLv1coemqNFJaoY-NVUcgNKPFgUzfP4,7631
 wizata_dsapi/model_toolkit.py,sha256=UNyw5CFSgZeXydQFsiDIRTjoMeqIsdyIIuiwumLW5bA,1574
 wizata_dsapi/notification.py,sha256=rzAo0e-LcGqsmatSlZL3YhUu6JvDj6p643CxDfI9nMc,24147
@@ -51,7 +51,7 @@ wizata_dsapi/trigger.py,sha256=waOX2AhrLvFzNFRQ535j6iemgg_QJP2QsWGL2ipljFg,8848
 wizata_dsapi/twin.py,sha256=8AnrxSaL7dMrILXJ3-GGmmUz078j3qqwzDTe6i86xqA,12672
 wizata_dsapi/twinregistration.py,sha256=iXt55AVGAQNl0jmxa3ZVynPqlSsIunFf4sLfp-MWTw0,13244
 wizata_dsapi/user.py,sha256=-hchKAMZULu9P00RUHDqu_5AT4NI5BYOJd8XCBrt3eQ,1950
-wizata_dsapi/version.py,sha256=-O4Jjc54Pnm7YwfkQ6rMh5IuguviteSQhQGRRgCWFgk,28
+wizata_dsapi/version.py,sha256=wpXjQQA6bBSpurnYdLwjUJLEfpD9VHd_fGDkjv7feb0,28
 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=wfTiSSakIub_F6V4PCt0tWnZp8PA8lkGma1HXfcfZ2A,141457
@@ -63,8 +63,8 @@ wizata_dsapi/plots/common.py,sha256=7F4WMBaddubnCpdSafgaI9U9Sz0Sngg0VREP_vnIMno,
 wizata_dsapi/plots/theme.py,sha256=D4sSgEwabXVxF3z1GV8DivXJbbY61KgxXAWfjUbNDAc,3594
 wizata_dsapi/scripts/__init__.py,sha256=9fRdTMuuXcqMkIsUPf5dwFsTWwBzKteQdAMVkyy2acQ,212
 wizata_dsapi/scripts/common.py,sha256=8LJK23Za0Yy4Dda1feKpKELav8806MH-hxFJYrklVOY,14758
-wizata_dsapi-2.2.0.dev27.dist-info/licenses/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-wizata_dsapi-2.2.0.dev27.dist-info/METADATA,sha256=Ia_nGFWPSPQPiV2mh5okzm9bLLjwraTe-ODncBUTEn4,14038
-wizata_dsapi-2.2.0.dev27.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-wizata_dsapi-2.2.0.dev27.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
-wizata_dsapi-2.2.0.dev27.dist-info/RECORD,,
+wizata_dsapi-2.2.0.dev28.dist-info/licenses/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+wizata_dsapi-2.2.0.dev28.dist-info/METADATA,sha256=m7MV_YewvRfGwPsg09fi_8YT2UQR0DHQ_o6EhUgbVJs,14038
+wizata_dsapi-2.2.0.dev28.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+wizata_dsapi-2.2.0.dev28.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
+wizata_dsapi-2.2.0.dev28.dist-info/RECORD,,