wizata-dsapi 1.3.42__tar.gz → 1.3.43__tar.gz

{wizata_dsapi-1.3.42/wizata_dsapi.egg-info → wizata_dsapi-1.3.43}/PKG-INFO

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

{wizata_dsapi-1.3.42 → wizata_dsapi-1.3.43}/wizata_dsapi/mlmodel.py

@@ -122,7 +122,7 @@ class ModelInfo:
     """
 
     def __init__(self,
-                 key: str,
+                 key: str = None,
                  twin_hardware_id: str = None,
                  property_value: str = None,
                  alias: str = None,

wizata_dsapi-1.3.43/wizata_dsapi/version.py

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

{wizata_dsapi-1.3.42 → wizata_dsapi-1.3.43}/wizata_dsapi/wizata_dsapi_client.py

@@ -13,6 +13,7 @@ import plotly
 import msal
 import os
 import types
+
 import wizata_dsapi
 import urllib.parse
 import base64
@@ -26,7 +27,7 @@ from .api_dto import ApiDto, VarType, ApiDtoInterface
 from .business_label import BusinessLabel
 from .plot import Plot
 from .request import Request
-from .mlmodel import ModelInfo, ModelList
+from .mlmodel import ModelInfo, ModelList, ModelFile
 from .experiment import Experiment
 from .script import Script
 from .execution import Execution, ExecutionStatus
@@ -1936,6 +1937,100 @@ class WizataDSAPIClient(ApiInterface, ApiDtoInterface):
         image = PipelineImage.loads(pipeline_image_id=pipeline_image_id, g_bytes=response_bytes)
         return image
 
+    def download_model(self, identifier: str) -> ModelInfo:
+        """
+        download a model image directly from the repository, auto-select alias if necessary.
+        :param identifier: exact identifier including alias of the model or no alias to auto-select active version.
+        :return: ModelInfo with trained_model loaded, extra file must be downloaded separately.
+        """
+        response = requests.get(self.__url() + f"models/{identifier}/",
+                                headers=self.__header())
+        if response.status_code == 200:
+            model_info = ModelInfo()
+            model_info.from_json(response.json())
+            self.load_model(model_info)
+            return model_info
+        else:
+            self.__raise_error(response)
+
+
+    def download_file(self,
+                      model: ModelInfo = None,
+                      file: ModelFile = None,
+                      identifier: str = None,
+                      path: str = None):
+        """
+        download a model extra file from the repository.
+        :param model: model (ModelInfo), alternatively can use identifier
+        :param file: file (ModelFile), alternatively can use path
+        :param identifier: identifier including alias of the model.
+        :param path: path name of the file including the extension.
+        :return: bytes content.
+        """
+
+        if model is None and identifier is None:
+            raise TypeError('model or identifier must be provided')
+
+        if file is None and path is None:
+            raise TypeError('file or path must be provided')
+
+        if identifier is None:
+            identifier = model.identifier(include_alias=True)
+
+        if path is None:
+            path = file.path
+
+        response = requests.get(self.__url() + f"models/{identifier}/files/{path}/",
+                                headers=self.__header())
+        if response.status_code == 200:
+            return response.content
+        else:
+            self.__raise_error(response)
+
+
+    def upload_file(self,
+                    content,
+                    model: ModelInfo = None,
+                    file: ModelFile = None,
+                    identifier: str = None,
+                    path: str = None
+                    ):
+        """
+        upload a model extra file to the repository.
+        please use upload_model for a trained_model
+        :param content: the bytes content of the file.
+        :param model: model (ModelInfo), alternatively can use identifier
+        :param file: file (ModelFile), alternatively can use path
+        :param identifier: identifier including alias of the model.
+        :param path: path name of the file including the extension.
+        :return: bytes content.
+        """
+        if path == "trained_model.pkl" or path == "trained_model.pt" or path == "_metadata.json":
+            raise RuntimeError("upload_file cannot be used to upload reserved metadata or the primary trained model")
+
+        if model is None and identifier is None:
+            raise TypeError('model or identifier must be provided')
+
+        if file is None and path is None:
+            raise TypeError('file or path must be provided')
+
+        if identifier is None:
+            identifier = model.identifier(include_alias=True)
+
+        if path is None:
+            path = file.path
+
+        headers = self.__header()
+        headers["Content-Type"] = "application/octet-stream"
+        response = requests.post(self.__url() + f"models/{identifier}/files/{path}",
+                                 headers=headers,
+                                 data=content,
+                                 timeout=60)
+        if response.status_code != 200 and response.status_code != 201:
+            return
+        else:
+            self.__raise_error(response)
+
     def load_model(self, model):
         """
         load a model pickle or torch from the repository ready to be used.

{wizata_dsapi-1.3.42 → wizata_dsapi-1.3.43/wizata_dsapi.egg-info}/PKG-INFO

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

wizata_dsapi-1.3.42/wizata_dsapi/version.py

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