pyPreservica 2.1.2__py3-none-any.whl → 2.2.1__py3-none-any.whl

pyPreservica/__init__.py

@@ -23,6 +23,6 @@ from .authorityAPI import AuthorityAPI, Table
 __author__ = "James Carr (drjamescarr@gmail.com)"
 
 # Version of the Preservica API package
-__version__ = "2.1.2"
+__version__ = "2.2.1"
 
 __license__ = "Apache License Version 2.0"

pyPreservica/entityAPI.py

@@ -1708,7 +1708,7 @@ class EntityAPI(AuthenticatedAPI):
         if isinstance(entity, ContentObject):
             raise RuntimeError("Thumbnails cannot be added to Content Objects")
 
-        headers = {HEADER_TOKEN: self.token}  # , 'Content-Type': 'application/octet-stream'}
+        headers = {HEADER_TOKEN: self.token,  'Content-Type': 'application/octet-stream'}
 
         with open(image_file, 'rb') as fd:
             request = self.session.put(

pyPreservica/uploadAPI.py

@@ -1065,9 +1065,6 @@ def complex_asset_package(preservation_files_list=None, access_files_list=None,
                             content = SubElement(metadata, 'Content')
                             content.append(descriptive_metadata.getroot())
 
-
-
-
     if xip is not None:
         export_folder = export_folder
         top_level_folder = os.path.join(export_folder, io_ref)
@@ -1742,6 +1739,38 @@ class UploadAPI(AuthenticatedAPI):
                         logger.info(f"Reached Max Upload Limit")
                         break
 
+    def upload_zip_to_Source(self, path_to_zip_package, container_name, folder=None, delete_after_upload=False,
+                             show_progress=False):
+
+        """
+             Uploads a zip file package to either an Azure container or S3 bucket
+             depending on the Preservica system deployment
+
+             :param str path_to_zip_package: Path to the package
+             :param str container_name: container connected to the ingest workflow
+             :param Folder folder: The folder to ingest the package into
+             :param bool delete_after_upload: Delete the local copy of the package after the upload has completed
+             :param bool show_progress:  Show upload progress bar
+
+        """
+
+        locations = self.upload_locations()
+        for location in locations:
+            if location['containerName'] == container_name:
+                if location['type'] == 'AWS':
+                    callback = None
+                    if show_progress:
+                        callback = UploadProgressConsoleCallback(path_to_zip_package)
+                    self.upload_zip_package_to_S3(path_to_zip_package=path_to_zip_package,
+                                                  bucket_name=container_name, folder=folder, callback=callback,
+                                                  delete_after_upload=delete_after_upload)
+                else:
+                    self.upload_zip_package_to_Azure(path_to_zip_package=path_to_zip_package,
+                                                     container_name=container_name, folder=folder,
+                                                     delete_after_upload=delete_after_upload,
+                                                     show_progress=show_progress)
+
+
     def upload_zip_package_to_Azure(self, path_to_zip_package, container_name, folder=None, delete_after_upload=False,
                                     show_progress=False):
 

{pyPreservica-2.1.2.dist-info → pyPreservica-2.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyPreservica
-Version: 2.1.2
+Version: 2.2.1
 Summary: Python library for the Preservica API
 Home-page: https://pypreservica.readthedocs.io/
 Author: James Carr

{pyPreservica-2.1.2.dist-info → pyPreservica-2.2.1.dist-info}/RECORD

@@ -1,19 +1,19 @@
-pyPreservica/__init__.py,sha256=pru8_C8g8wtJBMlhJYHgqxk4VoFEPT-ixIfPxv2fPKs,1085
+pyPreservica/__init__.py,sha256=3yJh4gowQZcH-bl9aXF3q3I_s6R_EQLcwWD919yt6zQ,1085
 pyPreservica/adminAPI.py,sha256=HoiNw1eWKhyb2Ccr40GjjMRjxMQIfoPIWP3h3pQjm0E,37810
 pyPreservica/authorityAPI.py,sha256=Eule8g6LXr8c8SFcJgpRah4lH1FgevUItO5HhHDEaZE,9172
 pyPreservica/common.py,sha256=kEfrJAr7cTNG37ziYUW-lgA8b2Llw3UGvfMxOoz-jyQ,35346
 pyPreservica/contentAPI.py,sha256=GZZsZYOf9uXQ7hdnvZldrQuXYrndkec21P-ACgn-Wus,17251
-pyPreservica/entityAPI.py,sha256=rUwAOvbXi3x8L0xatNRtZjMXdbs8bzyjU2XOqlSw3hA,108985
+pyPreservica/entityAPI.py,sha256=FjMFudkJCw0xHv6X0i3C_GPZc4m6b4sUSo6UzljzvFs,108981
 pyPreservica/monitorAPI.py,sha256=Xto2uSiryfZlUMUCrH7it2B8xOPVSLgSVLodxZW45po,6258
 pyPreservica/opex.py,sha256=ccra1S4ojUXS3PlbU8WfxajOkJrwG4OykBnNrYP_jus,4875
 pyPreservica/parAPI.py,sha256=bgaQvYfWNnzdD7ibKMV3ZV85pNkEdSoLsgVigoiFFfw,10771
 pyPreservica/retentionAPI.py,sha256=Cx1ofz9V31a8c8utEfKYLlfQaHSaaqg_D4R3LUFBEx0,23612
-pyPreservica/uploadAPI.py,sha256=82sM2iRXj0Nury_Ekn2NWYq-tPgIXq0b3hjVLVbnlrU,93366
+pyPreservica/uploadAPI.py,sha256=HdMoQAq2PY6NQklrYb2l51YoPyTXc71__dXhqsuNP0A,95157
 pyPreservica/vocabularyAPI.py,sha256=jPl6KDZoBGqlY0oEYjTpZ9kNEPzchDW-gyp-HH-MSKk,5729
 pyPreservica/webHooksAPI.py,sha256=bhenk2nAlAZRauSET0AG9DZyKckJos2NENyl0LDN5Z4,6736
 pyPreservica/workflowAPI.py,sha256=QOMd4Nw69Vf8tJ7Px4gSLpug7VakAtNi-90UTgWSed0,17862
-pyPreservica-2.1.2.dist-info/LICENSE.txt,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-pyPreservica-2.1.2.dist-info/METADATA,sha256=1XI-i_jc4HUafMz5dGw8tDW21DVN4JliXfSfQ_pBXJs,2784
-pyPreservica-2.1.2.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-pyPreservica-2.1.2.dist-info/top_level.txt,sha256=iIBh6NAznYQHOV8mv_y_kGKSDITek9rANyFDwJsbU-c,13
-pyPreservica-2.1.2.dist-info/RECORD,,
+pyPreservica-2.2.1.dist-info/LICENSE.txt,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+pyPreservica-2.2.1.dist-info/METADATA,sha256=xMTxeuB_6gMCiNZtir5ofjkKAF0zXAtJ5gnSHnxVXuU,2784
+pyPreservica-2.2.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+pyPreservica-2.2.1.dist-info/top_level.txt,sha256=iIBh6NAznYQHOV8mv_y_kGKSDITek9rANyFDwJsbU-c,13
+pyPreservica-2.2.1.dist-info/RECORD,,