pyPreservica 2.1.1__py3-none-any.whl → 2.2.0__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.1"
+__version__ = "2.2.0"
 
 __license__ = "Apache License Version 2.0"

pyPreservica/common.py

@@ -735,7 +735,7 @@ class AuthenticatedAPI:
             RuntimeError(request.status_code, "version number failed")
 
     def __str__(self):
-        return f"pyPreservica version: {pyPreservica.__version__}  (Preservica 6.9 Compatible) " \
+        return f"pyPreservica version: {pyPreservica.__version__}  (Preservica 6.10 Compatible) " \
                f"Connected to: {self.server} Preservica version: {self.version} as {self.username} " \
                f"in tenancy {self.tenant}"
 

pyPreservica/contentAPI.py

@@ -271,6 +271,9 @@ class ContentAPI(AuthenticatedAPI):
         start_from = str(start_index)
         headers = {'Content-Type': 'application/x-www-form-urlencoded', HEADER_TOKEN: self.token}
 
+        if filter_values is None:
+            filter_values = {}
+
         field_list = []
         for key, value in filter_values.items():
             if value == "":
@@ -293,7 +296,6 @@ class ContentAPI(AuthenticatedAPI):
             query_term = ('{ "q":  "%s",  "fields":  [ %s ],  "sort": [ %s ]}' % (query, filter_terms, sort_terms))
 
         payload = {'start': start_from, 'max': str(page_size), 'metadata': list(filter_values.keys()), 'q': query_term}
-        print(payload)
         logger.debug(payload)
         results = self.session.post(f'{self.protocol}://{self.server}/api/content/search', data=payload,
                                     headers=headers)

pyPreservica/entityAPI.py

@@ -8,6 +8,7 @@ author:     James Carr
 licence:    Apache License 2.0
 
 """
+import hashlib
 import uuid
 import xml.etree.ElementTree
 from datetime import datetime, timedelta, timezone
@@ -1540,7 +1541,14 @@ class EntityAPI(AuthenticatedAPI):
             bitstream = generation.bitstreams.pop()
             for algo, value in bitstream.fixity.items():
                 fixity_algorithm = algo
-                fixity_value = value
+                if "MD5" in fixity_algorithm.upper():
+                    fixity_value = FileHash(hashlib.md5)
+                if "SHA1" in fixity_algorithm.upper() or "SHA-1" in fixity_algorithm.upper():
+                    fixity_value = FileHash(hashlib.sha1)
+                if "SHA256" in fixity_algorithm.upper() or "SHA-256" in fixity_algorithm.upper():
+                    fixity_value = FileHash(hashlib.sha256)
+                if "SHA512" in fixity_algorithm.upper() or "SHA-512" in fixity_algorithm.upper():
+                    fixity_value = FileHash(hashlib.sha512)
 
         if fixity_algorithm and fixity_value:
             if "MD5" in fixity_algorithm.upper():

pyPreservica/uploadAPI.py

@@ -1031,7 +1031,7 @@ def complex_asset_package(preservation_files_list=None, access_files_list=None,
         metadata_map = kwargs.get('Asset_Metadata')
         for metadata_ns, metadata_path in metadata_map.items():
             if metadata_ns:
-                if metadata_path:
+                if metadata_path and isinstance(metadata_path, str):
                     if os.path.exists(metadata_path) and os.path.isfile(metadata_path):
                         descriptive_metadata = xml.etree.ElementTree.parse(source=metadata_path)
                         metadata = SubElement(xip, 'Metadata', {'schemaUri': metadata_ns})
@@ -1053,6 +1053,17 @@ def complex_asset_package(preservation_files_list=None, access_files_list=None,
                             content.append(descriptive_metadata)
                         except RuntimeError:
                             logging.info(f"Could not parse asset metadata in namespace {metadata_ns}")
+                if metadata_path and isinstance(metadata_path, list):
+                    for path in metadata_path:
+                        if os.path.exists(path) and os.path.isfile(path):
+                            descriptive_metadata = xml.etree.ElementTree.parse(source=path)
+                            metadata = SubElement(xip, 'Metadata', {'schemaUri': metadata_ns})
+                            metadata_ref = SubElement(metadata, 'Ref')
+                            metadata_ref.text = str(uuid.uuid4())
+                            entity = SubElement(metadata, 'Entity')
+                            entity.text = io_ref
+                            content = SubElement(metadata, 'Content')
+                            content.append(descriptive_metadata.getroot())
 
     if xip is not None:
         export_folder = export_folder
@@ -1728,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.1.dist-info → pyPreservica-2.2.0.dist-info}/METADATA

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

{pyPreservica-2.1.1.dist-info → pyPreservica-2.2.0.dist-info}/RECORD

@@ -1,19 +1,19 @@
-pyPreservica/__init__.py,sha256=23jeaUXPKWBIN9bCs6Fa2_TjvffN4OtyDRLmHD2ymIc,1085
+pyPreservica/__init__.py,sha256=1FEwPJXGofNTnpV2ypw2XRCPhHF3b8_Nyf1yEcvEj0s,1085
 pyPreservica/adminAPI.py,sha256=HoiNw1eWKhyb2Ccr40GjjMRjxMQIfoPIWP3h3pQjm0E,37810
 pyPreservica/authorityAPI.py,sha256=Eule8g6LXr8c8SFcJgpRah4lH1FgevUItO5HhHDEaZE,9172
-pyPreservica/common.py,sha256=yzwykW1RwvpvC3vcHEVF5ZF4pC8eKXAL6haDSk-JRtc,35345
-pyPreservica/contentAPI.py,sha256=8L6MoiQuDypO5J1pai8dv5ynohvaRdmYRhr7AbT578Y,17206
-pyPreservica/entityAPI.py,sha256=VRp-rp0-iFHlCKmkhN4t-KW1lE13jXsOjajZrVakUOA,108420
+pyPreservica/common.py,sha256=kEfrJAr7cTNG37ziYUW-lgA8b2Llw3UGvfMxOoz-jyQ,35346
+pyPreservica/contentAPI.py,sha256=GZZsZYOf9uXQ7hdnvZldrQuXYrndkec21P-ACgn-Wus,17251
+pyPreservica/entityAPI.py,sha256=rUwAOvbXi3x8L0xatNRtZjMXdbs8bzyjU2XOqlSw3hA,108985
 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=9gMx44_VFSWolj1F2OKM2JAoGm2kILnztSYO41LiJ0Y,92537
+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.1.dist-info/LICENSE.txt,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-pyPreservica-2.1.1.dist-info/METADATA,sha256=8iZT-n3zdwI9GuGemlgpu3G64bWKbf9Q234H4pvBjTY,2784
-pyPreservica-2.1.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-pyPreservica-2.1.1.dist-info/top_level.txt,sha256=iIBh6NAznYQHOV8mv_y_kGKSDITek9rANyFDwJsbU-c,13
-pyPreservica-2.1.1.dist-info/RECORD,,
+pyPreservica-2.2.0.dist-info/LICENSE.txt,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+pyPreservica-2.2.0.dist-info/METADATA,sha256=r_QoMld1uBWoXYMw5CdNs-c3r6ZoWYGNJpRtzsYKLCA,2784
+pyPreservica-2.2.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+pyPreservica-2.2.0.dist-info/top_level.txt,sha256=iIBh6NAznYQHOV8mv_y_kGKSDITek9rANyFDwJsbU-c,13
+pyPreservica-2.2.0.dist-info/RECORD,,