wizata-dsapi 1.3.26__tar.gz → 1.3.28__tar.gz

{wizata_dsapi-1.3.26 → wizata_dsapi-1.3.28}/PKG-INFO

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

{wizata_dsapi-1.3.26 → wizata_dsapi-1.3.28}/wizata_dsapi/mlmodel.py

@@ -1,4 +1,5 @@
 from typing import List, Iterator, Union
+import os
 from .api_dto import ApiDto
 
 
@@ -47,6 +48,33 @@ class ModelInfo:
         self.has_target_feat = False
         self.label_counts = 0
 
+    @classmethod
+    def split_identifier(cls, identifier: str):
+        """
+        split the identifier into four parts
+        :param identifier: identifier.
+        :return: key, twin, property, alias
+        """
+
+        # extract alias
+        if "@" in identifier:
+            split_identifier_for_alias = identifier.split("@")
+            identifier = split_identifier_for_alias[0]
+            alias = split_identifier_for_alias[1]
+        else:
+            alias = None
+
+        # extract key, twin, property
+        identifiers = identifier.split('.')
+        key = identifiers[0]
+        twin_hardware_id = None
+        if len(identifiers) > 1:
+            twin_hardware_id = identifiers[1]
+        property_value = None
+        if len(identifiers) > 2:
+            property_value = identifiers[2]
+
+        return key, twin_hardware_id, property_value, alias
 
     def identifier(self, include_alias: bool = False) -> str:
         """
@@ -69,6 +97,18 @@ class ModelInfo:
 
         return identifier
 
+    def add_file_path(self, file_path: str):
+        """
+        add a path to list of known path.
+        detect depending on file type further actions.
+        :param file_path: file_path
+        :return: None
+        """
+        path, extension = os.path.splitext(file_path)
+        if path == "trained_model":
+            self.file_format = extension.lstrip('.')
+        self.files.append(file_path)
+
     def to_json(self):
         """
         convert this entity in a dict that can be json serializable
@@ -133,31 +173,32 @@ class ModelList:
     def __len__(self) -> int:
         return len(self.models)
 
-    def exists(self, key: str) -> bool:
+    def exists(self, model: ModelInfo) -> bool:
         """
         check if a model is within the model list.
-        :param key: identifier to check.
+        :param model: identifier to check.
         :return: True if it exists.
         """
-        return any(model.identifier() == key for model in self.models)
+        return any(model_in_list.identifier(include_alias=True) == model.identifier(include_alias=True) for model_in_list in self.models)
 
-    def __getitem__(self, key: Union[int, str]) -> ModelInfo:
+    def __getitem__(self, key: Union[int, ModelInfo]) -> ModelInfo:
         """
-        find a model within list based on key or index.
-        :param key: str or int identifier or index
+        find a model within list based on key or ModelInfo.
+        :param key: ModelInfo or index
         :return: the model_info
         """
         if isinstance(key, int):
             return self.models[key]
 
-        elif isinstance(key, str):
+        elif isinstance(key, ModelInfo):
+            identifier = key.identifier(include_alias=True)
             for model in self.models:
-                if model.identifier() == key:
+                if model.identifier(include_alias=True) == identifier:
                     return model
-            raise KeyError(f"model with identifier '{key}' not found within this ModelList.")
+            raise KeyError(f"model with identifier '{identifier}' not found within this ModelList.")
 
         else:
-            raise TypeError("ModelList indices must be int or str (model identifier).")
+            raise TypeError("ModelList indices must be int or ModelInfo.")
 
     def append(self, model: ModelInfo):
         self.models.append(model)

wizata_dsapi-1.3.28/wizata_dsapi/version.py

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

{wizata_dsapi-1.3.26 → wizata_dsapi-1.3.28}/wizata_dsapi.egg-info/PKG-INFO

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

wizata_dsapi-1.3.26/wizata_dsapi/version.py

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