wizata-dsapi 2.2.0.dev26__tar.gz → 2.2.0.dev28__tar.gz

{wizata_dsapi-2.2.0.dev26 → wizata_dsapi-2.2.0.dev28}/PKG-INFO

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

{wizata_dsapi-2.2.0.dev26 → wizata_dsapi-2.2.0.dev28}/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-2.2.0.dev26 → wizata_dsapi-2.2.0.dev28}/wizata_dsapi/python_package.py

@@ -6,13 +6,13 @@ importable where a pipeline runs (runners, pipeline images, edges) under its ori
 dotted name, so models pickled against it load unchanged.
 
 PythonPackage — one package, named as pip names it: the name is normalised the pip way
-  (``XpertRef_Tools`` is ``xpertref-tools``). ``source`` says where its code comes from:
+  (``Plant_Models`` is ``plant-models``). ``source`` says where its code comes from:
 
   - ``upload``: pure-Python wheels uploaded one version at a time (option A);
   - ``git``: the ``packages/<name>/`` folder of the attached repository (option B), whose
     version is the commit a pipeline is read at.
 
-  ``import_names`` are the top-level modules it provides (``xpertref``). ``versions`` is
+  ``import_names`` are the top-level modules it provides (``plant_models``). ``versions`` is
   filled on read only.
 
 PythonPackageVersion — one uploaded wheel of an ``upload`` package. Immutable: a version is
@@ -30,7 +30,7 @@ from typing import List, Optional
 
 def normalize_python_package_name(name: str) -> str:
     """
-    A package name as pip compares it (PEP 503): ``XpertRef_Tools.v2`` -> ``xpertref-tools-v2``.
+    A package name as pip compares it (PEP 503): ``Plant_Models.v2`` -> ``plant-models-v2``.
     Validating it is the package client's job.
     """
     return re.sub(r"[-_.]+", "-", name).lower()

wizata_dsapi-2.2.0.dev28/wizata_dsapi/version.py

@@ -0,0 +1 @@
+__version__ = "2.2.0.dev28"

{wizata_dsapi-2.2.0.dev26 → wizata_dsapi-2.2.0.dev28}/wizata_dsapi/wizata_dsapi_client.py

@@ -1454,7 +1454,7 @@ class WizataDSAPIClient(ApiInterface, ApiDtoInterface):
                               description: str = None) -> PythonPackageVersion:
         """
         Upload a version of a Python package your pipelines import: the pure-Python wheel
-        ``python -m build --wheel`` makes (e.g. ``dist/xpertref-1.4.0-py3-none-any.whl``).
+        ``python -m build --wheel`` makes (e.g. ``dist/plant_models-1.4.0-py3-none-any.whl``).
         Its name, version and requirements come from the wheel; the package is created by
         its first upload. A version is immutable: a fix is a new version.
 
@@ -1466,7 +1466,7 @@ class WizataDSAPIClient(ApiInterface, ApiDtoInterface):
         if isinstance(wheel, (bytes, bytearray)):
             if not filename:
                 raise ValueError("give the wheel's file name with its bytes "
-                                 "(e.g. xpertref-1.4.0-py3-none-any.whl)")
+                                 "(e.g. plant_models-1.4.0-py3-none-any.whl)")
             data = bytes(wheel)
         else:
             path = str(wheel)

{wizata_dsapi-2.2.0.dev26 → wizata_dsapi-2.2.0.dev28}/wizata_dsapi.egg-info/PKG-INFO

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

wizata_dsapi-2.2.0.dev26/wizata_dsapi/version.py

@@ -1 +0,0 @@
-__version__ = "2.2.0.dev26"