wizata-dsapi 1.3.31__py3-none-any.whl → 1.3.33__py3-none-any.whl

wizata_dsapi/__init__.py

@@ -3,7 +3,7 @@ from .version import __version__
 from .api_dto import ApiDto, VarType
 from .paged_query_result import PagedQueryResult
 from .plot import Plot
-from .mlmodel import ModelInfo, ModelList, MLModelConfig, ModelFile
+from .mlmodel import ModelInfo, ModelList, MLModelConfig, ModelFile, ModelIdentifierInfo
 from .request import Request, filter_map, RequestGroup, RequestGroupMap, DynamicSelector
 from .execution import Execution, ExecutionStatus, ExecutionStepLog, AbortedException
 from .experiment import Experiment

wizata_dsapi/mlmodel.py

@@ -11,6 +11,27 @@ def get_bool(obj, name: str):
         return bool(obj[name])
 
 
+class ModelIdentifierInfo:
+    """
+    define metadata associated to an identifier (regardless of its alias)
+    """
+
+    def __init__(self,
+                 identifier: str = None,
+                 active_alias: str = None):
+        self.identifier = identifier
+        self.active_alias = active_alias
+
+    def to_json(self):
+        obj = {}
+        if self.active_alias is not None:
+            obj["active_alias"] = self.active_alias
+        return obj
+
+    def from_json(self, json_dict):
+        if "active_alias" in json_dict:
+            self.active_alias = json_dict["active_alias"]
+
 class ModelFile:
     """
     define a model file.
@@ -95,6 +116,7 @@ class ModelInfo:
         self.source = source
         self.model_type = model_type
         self.files = []
+        self.is_active = False
 
         # files attached to model when loaded
         self.trained_model = None
@@ -166,7 +188,7 @@ class ModelInfo:
             self.file_format = file.extension
         self.files.append(file)
 
-    def to_json(self):
+    def to_json(self) -> dict:
         """
         convert this entity in a dict that can be json serializable
         :return: dict
@@ -190,8 +212,12 @@ class ModelInfo:
             obj["source"] = self.source
         if self.property_name is not None:
             obj["property_name"] = self.property_name
+        if self.is_active is not None:
+            obj["is_active"] = self.is_active
         if self.identifier is not None:
             obj["identifier"] = self.identifier(include_alias=True)
+        if len(self.files) > 0:
+            obj["files"] = [file.to_json() for file in self.files]
         return obj
 
     def from_json(self, obj):
@@ -214,6 +240,8 @@ class ModelInfo:
             self.source = obj["source"]
         if "property_name" in obj.keys():
             self.property_name = obj["property_name"]
+        if "is_active" in obj.keys():
+            self.is_active = get_bool(obj, name="is_active")
 
 
 class ModelList:
@@ -223,6 +251,7 @@ class ModelList:
 
     def __init__(self):
         self.models: List[ModelInfo] = []
+        self.identifiers_info = {}
 
     def __iter__(self) -> Iterator[ModelInfo]:
         return iter(self.models)
@@ -260,6 +289,19 @@ class ModelList:
     def append(self, model: ModelInfo):
         self.models.append(model)
 
+    def _process_info(self):
+        """
+        apply all info within the model list (setting model active, ...) to keep data coherence
+        :return:
+        """
+        for identifier in self.identifiers_info:
+            if self.identifiers_info[identifier].active_alias is not None:
+                for model in self.models:
+                    if model.identifier(include_alias=False) == identifier and model.alias == self.identifiers_info[identifier].active_alias:
+                        model.is_active = True
+                    elif model.identifier(include_alias=False) == identifier:
+                        model.is_active = False
+
 
 class MLModelConfig(ApiDto):
     """

wizata_dsapi/version.py

@@ -1 +1 @@
-__version__ = "1.3.31"
+__version__ = "1.3.33"

{wizata_dsapi-1.3.31.dist-info → wizata_dsapi-1.3.33.dist-info}/METADATA

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

{wizata_dsapi-1.3.31.dist-info → wizata_dsapi-1.3.33.dist-info}/RECORD

@@ -1,4 +1,4 @@
-wizata_dsapi/__init__.py,sha256=ve3fgTqcr4gb6n0HyZ-IcZ5XCIYBmoSyU26uUMglxnY,2051
+wizata_dsapi/__init__.py,sha256=aVeizk2zzmAX0TLNG9o7vcmG8KB73XiXw1_qozrJN2w,2072
 wizata_dsapi/api_config.py,sha256=6Pnnv62X_QrTUXaa1MtFZeQaqMUJC-9Y5BW7B4gef10,5139
 wizata_dsapi/api_dto.py,sha256=-NdaTRvw5jW5xFGpIhY8U0-SdvzW2t6QD26y0UPApU0,2238
 wizata_dsapi/api_interface.py,sha256=DURk-0ey16T8sV5e2Y2G_YybPEusJvZuY0oD5L7AnXo,10903
@@ -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=Sw-XFAylm_-yaFVd-9O3t-fp5yrv88zQ7iwOCTdWOKo,19911
+wizata_dsapi/mlmodel.py,sha256=iIAqLVvzZS5lHrZ2UH68NvZZbOYX_zdqORAukOc4pVI,21510
 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,7 +31,7 @@ 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=03CTYGRsPAEz4rNlV1y3u7w7Yn_JkEBWznFFhvFaPrM,23
+wizata_dsapi/version.py,sha256=mlgNKimyRDi_WrDBCrvzFuEZsuPR-NBnjRrGSYC_1v4,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
@@ -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.31.dist-info/licenses/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-wizata_dsapi-1.3.31.dist-info/METADATA,sha256=ZPm_XrVGcmf21WFgcp6QUKuvcV8XXM1sYyr51sXvAbk,5844
-wizata_dsapi-1.3.31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wizata_dsapi-1.3.31.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
-wizata_dsapi-1.3.31.dist-info/RECORD,,
+wizata_dsapi-1.3.33.dist-info/licenses/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+wizata_dsapi-1.3.33.dist-info/METADATA,sha256=hSJF7gKKsGXz6hG7bcJWnreMtjjuYmBdcYA7X8nOyFY,5844
+wizata_dsapi-1.3.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wizata_dsapi-1.3.33.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
+wizata_dsapi-1.3.33.dist-info/RECORD,,