wizata-dsapi 1.3.46__py3-none-any.whl → 1.3.48__py3-none-any.whl

wizata_dsapi/mlmodel.py

@@ -29,7 +29,7 @@ class ModelIdentifierInfo:
         return obj
 
     def from_json(self, json_dict):
-        if "active_alias" in json_dict:
+        if "active_alias" in json_dict and json_dict["active_alias"] is not None:
             self.active_alias = json_dict["active_alias"]
 
 class ModelFile:
@@ -310,6 +310,17 @@ class ModelInfo:
             raise RuntimeError("api is not bound to the dto use bind_api()")
         self._api.load_model(self)
 
+    def uncompress_bytes_to_model(self, bytes_model):
+        import io, joblib
+        if self.file_format == "pkl":
+            self.trained_model = joblib.load(io.BytesIO(bytes_model))
+        elif self.file_format == "pt":
+            import torch
+            buffer = io.BytesIO(bytes_model)
+            self.trained_model = torch.jit.load(buffer)
+        else:
+            raise RuntimeError(f'unsupported file format {self.file_format} must be pt or pkl')
+
 
 class ModelList:
     """
@@ -361,6 +372,21 @@ class ModelList:
         else:
             raise TypeError("ModelList indices must be int, str or ModelInfo.")
 
+    def select_all_active_model(self) -> list[ModelInfo]:
+        """
+        select all active model for all possible identifier.
+        :return: return a list of ModelInfo only with active models.
+        """
+        distinct_identifiers = []
+        for model in self.models:
+            identifier = model.identifier(include_alias=False)
+            if identifier not in distinct_identifiers:
+                distinct_identifiers.append(identifier)
+        models = []
+        for identifier in distinct_identifiers:
+            models.append(self.select_active_model(identifier=identifier))
+        return models
+
     def select_active_model(self, identifier: str) -> ModelInfo:
         """
         return the active model based on active status or latest one if none active.
@@ -374,7 +400,7 @@ class ModelList:
                     return model
                 else:
                     models.append(model)
-        return max(models, key=lambda f: f.updated_date, default=None)
+        return max(models, key=lambda f: f.updated_date or 0, default=None)
 
     def append(self, model: ModelInfo):
         self.models.append(model)

wizata_dsapi/pipeline_image.py

@@ -1,9 +1,9 @@
 import json
-
+import os
+import wizata_dsapi
 from .api_dto import ApiDto
 from .pipeline import Pipeline
 from .script import Script
-from .mlmodel import ModelInfo
 from datetime import datetime
 
 import pytz
@@ -11,7 +11,6 @@ import io
 import tarfile
 import gzip
 import dill
-import pickle
 
 
 def files_from_gzipped_data(gzipped_data):
@@ -153,7 +152,29 @@ class PipelineImage(ApiDto):
             # process the models
             model_files = {k: v for k, v in g_files.items() if k.startswith('models/')}
             for pkl_file in model_files:
-                image.models[pkl_file[7:-4]] = pickle.loads(g_files[pkl_file])
+                parts = pkl_file.split('/')
+                if len(parts) == 2:
+                    identifier = os.path.splitext(parts[1])[0]
+                else:
+                    identifier = parts[1]
+
+                if identifier not in image.models:
+                    key, twin_hardware_id, property_value, alias = wizata_dsapi.ModelInfo.split_identifier(identifier)
+                    image.models[identifier] = wizata_dsapi.ModelInfo(
+                        key=key,
+                        twin_hardware_id=twin_hardware_id,
+                        property_value=property_value,
+                        alias=alias
+                    )
+                if len(parts) == 2:
+                    image.models[identifier].file_format = os.path.splitext(parts[1])[1].lstrip('.')
+                    image.models[identifier].uncompress_bytes_to_model(g_files[pkl_file])
+                if len(parts) == 3:
+                    image.models[identifier].add_file(wizata_dsapi.ModelFile(
+                        full_path=pkl_file,
+                        path=parts[2],
+                        content=g_files[pkl_file]
+                    ))
 
             return image
 

wizata_dsapi/version.py

@@ -1 +1 @@
-__version__ = "1.3.46"
+__version__ = "1.3.48"

{wizata_dsapi-1.3.46.dist-info → wizata_dsapi-1.3.48.dist-info}/METADATA

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

{wizata_dsapi-1.3.46.dist-info → wizata_dsapi-1.3.48.dist-info}/RECORD

@@ -16,12 +16,12 @@ 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=f7XmM1cuAufNo7hC5CFPlbDojTWWNfDdVnPYo2Kc0PU,24824
+wizata_dsapi/mlmodel.py,sha256=YpnzTHUfRwuVdOO3IwhsLWHlIE0UH8nrY9ga73Gp_pE,25955
 wizata_dsapi/model_toolkit.py,sha256=UNyw5CFSgZeXydQFsiDIRTjoMeqIsdyIIuiwumLW5bA,1574
 wizata_dsapi/paged_query_result.py,sha256=0Iyt2Kd4tvrfthhT-tk9EmSERsbJTaPNON2euHcBn6k,1150
 wizata_dsapi/pipeline.py,sha256=CtB6-HwJ2OtqUIbwAVTcawLmvYfudgIwGiPZARwTobM,31778
 wizata_dsapi/pipeline_deployment.py,sha256=grekBaxUK0EhL9w7lDB8vNuW_wzLnHVm9Mq8Lkbkguk,1722
-wizata_dsapi/pipeline_image.py,sha256=FUxaDDAOZHG8MA2xpZDoG7m1xbtiRSB8YuLFObUSd8c,5274
+wizata_dsapi/pipeline_image.py,sha256=4DhDo1SYftN6QcNbehNbM86VTD6EYGmtlcOmE5DP5Vc,6330
 wizata_dsapi/plot.py,sha256=SPGKFWWYNcRvHcqvvnPIIIBKsd5UwhdsxLW7b2dG2rs,2360
 wizata_dsapi/request.py,sha256=W4E1BHacQdJiBLPI96yVeHz41rbfFuGrbuw1U60L_DM,27560
 wizata_dsapi/script.py,sha256=DeEciwVpuCYZetgJCoivw_bYe8ma52WuTaTQ_VkLEcg,12930
@@ -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=5O78hV8ZBFKQKxB-un5qpit3OFVDyjX6JFd97JFh6aY,23
+wizata_dsapi/version.py,sha256=J3iHKwFSmz-a5KrTbBRN9NJYHI5myM6ROUcZyRoDQOw,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=PUFOt5b9OOBEjlgUgA4FtdtJyORzZ2eRv4VfWW4uH7E,84724
@@ -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.46.dist-info/licenses/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-wizata_dsapi-1.3.46.dist-info/METADATA,sha256=YPJMA0vfCa6ZvoOVi2n_hqMXfFhFX6zWoZFEAyq3NIg,5651
-wizata_dsapi-1.3.46.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wizata_dsapi-1.3.46.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
-wizata_dsapi-1.3.46.dist-info/RECORD,,
+wizata_dsapi-1.3.48.dist-info/licenses/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+wizata_dsapi-1.3.48.dist-info/METADATA,sha256=ZRfFbCIchLf-PY8FwSxKUv1K0pQaB0fusUHZKTTeP-w,5651
+wizata_dsapi-1.3.48.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wizata_dsapi-1.3.48.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
+wizata_dsapi-1.3.48.dist-info/RECORD,,