wizata-dsapi 1.3.45__tar.gz → 1.3.47__tar.gz

{wizata_dsapi-1.3.45/wizata_dsapi.egg-info → wizata_dsapi-1.3.47}/PKG-INFO

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

{wizata_dsapi-1.3.45 → wizata_dsapi-1.3.47}/wizata_dsapi/mlmodel.py

@@ -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-1.3.45 → wizata_dsapi-1.3.47}/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-1.3.47/wizata_dsapi/version.py

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

{wizata_dsapi-1.3.45 → wizata_dsapi-1.3.47}/wizata_dsapi/wizata_dsapi_client.py

@@ -1142,10 +1142,16 @@ class WizataDSAPIClient(ApiInterface, ApiDtoInterface):
             for file in model_info.files:
                 file: wizata_dsapi.ModelFile
                 if file.name != "trained_model":
-                    headers["Content-Type"] = "application/octet-stream"
+                    single_file = {
+                        "file": (
+                            file.path,
+                            file.content,
+                            "application/octet-stream",
+                        )
+                    }
                     response = requests.post(self.__url() + f"models/{model_info.identifier(include_alias=True)}/files/{file.path}",
                                              headers=headers,
-                                             data=file.content,
+                                             files=single_file,
                                              timeout=60)
                     if response.status_code != 200 and response.status_code != 201:
                         raise self.__raise_error(response)
@@ -2021,10 +2027,17 @@ class WizataDSAPIClient(ApiInterface, ApiDtoInterface):
             path = file.path
 
         headers = self.__header()
-        headers["Content-Type"] = "application/octet-stream"
+        headers.pop("Content-Type", None)
+        single_file = {
+            "file": (
+                path,
+                content,
+                "application/octet-stream",
+            )
+        }
         response = requests.post(self.__url() + f"models/{identifier}/files/{path}",
                                  headers=headers,
-                                 data=content,
+                                 files=single_file,
                                  timeout=60)
         if response.status_code != 200 and response.status_code != 201:
             return

{wizata_dsapi-1.3.45 → wizata_dsapi-1.3.47/wizata_dsapi.egg-info}/PKG-INFO

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

wizata_dsapi-1.3.45/wizata_dsapi/version.py

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