wizata-dsapi 1.3.32__tar.gz → 1.3.33__tar.gz

{wizata_dsapi-1.3.32 → wizata_dsapi-1.3.33}/PKG-INFO

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

{wizata_dsapi-1.3.32 → wizata_dsapi-1.3.33}/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-1.3.32 → wizata_dsapi-1.3.33}/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,6 +212,8 @@ 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:
@@ -216,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:
@@ -225,6 +251,7 @@ class ModelList:
 
     def __init__(self):
         self.models: List[ModelInfo] = []
+        self.identifiers_info = {}
 
     def __iter__(self) -> Iterator[ModelInfo]:
         return iter(self.models)
@@ -262,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-1.3.33/wizata_dsapi/version.py

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

{wizata_dsapi-1.3.32 → wizata_dsapi-1.3.33}/wizata_dsapi.egg-info/PKG-INFO

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

wizata_dsapi-1.3.32/wizata_dsapi/version.py

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