wizata-dsapi 1.3.35__tar.gz → 1.3.36__tar.gz

{wizata_dsapi-1.3.35 → wizata_dsapi-1.3.36}/PKG-INFO

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

{wizata_dsapi-1.3.35 → wizata_dsapi-1.3.36}/wizata_dsapi/mlmodel.py

@@ -1,4 +1,4 @@
-from typing import List, Iterator, Union
+from typing import List, Iterator, Union, Optional
 import os
 from .api_dto import ApiDto
 from datetime import datetime, timezone
@@ -49,13 +49,32 @@ class ModelFile:
                  size: int = None,
                  content = None):
         self.full_path = full_path
-        self.path = path
         self.name = name
         self.extension = extension
+        self.path = path
         self.last_modified = last_modified
         self.size = size
         self.content = content
 
+
+    @property
+    def path(self) -> Optional[str]:
+        if self.name and self.extension:
+            return f"{self.name}.{self.extension}"
+        return self.name or None
+
+    @path.setter
+    def path(self, value: Optional[str]):
+        if not value:
+            self.name = None
+            self.extension = None
+            return
+
+        base = os.path.basename(value.strip())
+        name_part, ext = os.path.splitext(base)
+        self.name = name_part or None
+        self.extension = ext.lstrip(".").lower() if ext else None
+
     def to_json(self):
         """
         convert this entity in a dict that can be json serializable
@@ -64,12 +83,12 @@ class ModelFile:
         obj = {}
         if self.full_path is not None:
             obj["full_path"] = str(self.full_path)
-        if self.path is not None:
-            obj["path"] = self.path
         if self.name is not None:
             obj["name"] = self.name
         if self.extension is not None:
             obj["extension"] = self.extension
+        if self.path is not None:
+            obj["path"] = self.path
         if self.last_modified is not None:
             obj["last_modified"] = self.last_modified.timestamp() * 1000.0
         if self.size is not None:
@@ -82,12 +101,12 @@ class ModelFile:
         """
         if "full_path" in obj.keys():
             self.full_path = obj["full_path"]
-        if "path" in obj.keys():
-            self.path = obj["path"]
         if "name" in obj.keys():
             self.name = obj["name"]
         if "extension" in obj.keys():
             self.extension = obj["extension"]
+        if not self.name and not self.extension and "path" in obj:
+            self.path = obj["path"]
         if "last_modified" in obj.keys():
             self.last_modified = datetime.fromtimestamp(obj["last_modified"] / 1000, tz=timezone.utc)
         if "size" in obj.keys():

wizata_dsapi-1.3.36/wizata_dsapi/version.py

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

{wizata_dsapi-1.3.35 → wizata_dsapi-1.3.36}/wizata_dsapi/wizata_dsapi_client.py

@@ -1104,9 +1104,18 @@ class WizataDSAPIClient(ApiInterface):
         if response.status_code == 200:
             response_json = response.json()
             if "identifier" in response_json:
-                key , twin, property, alias = ModelInfo.split_identifier(response_json["identifier"])
+                key , twin, property_value, alias = ModelInfo.split_identifier(response_json["identifier"])
                 if alias is not None:
                     model_info.alias = alias
+            for file in model_info.files:
+                file: wizata_dsapi.ModelFile
+                if file.name != "trained_model":
+                    headers["Content-Type"] = "application/octet-stream"
+                    response = requests.post(self.__url() + f"models/{model_info.identifier(include_alias=True)}/files/{file.name}",
+                                             data=file.content,
+                                             timeout=60)
+                    if response.status_code != 200 and response.status_code != 201:
+                        raise self.__raise_error(response)
             return model_info
         else:
             raise self.__raise_error(response)

{wizata_dsapi-1.3.35 → wizata_dsapi-1.3.36}/wizata_dsapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wizata-dsapi
-Version: 1.3.35
+Version: 1.3.36
 Summary: Wizata Data Science Toolkit
 Author: Wizata S.A.
 Author-email: info@wizata.com

wizata_dsapi-1.3.35/wizata_dsapi/version.py

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