pyPreservica 3.2.3__tar.gz → 3.2.4__tar.gz

{pypreservica-3.2.3 → pypreservica-3.2.4}/PKG-INFO

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

{pypreservica-3.2.3 → pypreservica-3.2.4}/pyPreservica/__init__.py

@@ -35,6 +35,6 @@ from .settingsAPI import SettingsAPI
 __author__ = "James Carr (drjamescarr@gmail.com)"
 
 # Version of the pyPreservica package
-__version__ = "3.2.3"
+__version__ = "3.2.4"
 
 __license__ = "Apache License Version 2.0"

{pypreservica-3.2.3 → pypreservica-3.2.4}/pyPreservica/common.py

@@ -822,8 +822,6 @@ class AuthenticatedAPI:
             self.minor_version = int(version_numbers[1])
             self.patch_version = int(version_numbers[2])
 
-            if self.server == "preview.preservica.com":
-                self.minor_version = 1
 
             return version
         elif request.status_code == requests.codes.unauthorized:

{pypreservica-3.2.3 → pypreservica-3.2.4}/pyPreservica/entityAPI.py

@@ -1044,7 +1044,6 @@ class EntityAPI(AuthenticatedAPI):
         xml_request = xml.etree.ElementTree.tostring(xml_object, encoding='utf-8')
         end_point = f"/{entity.path}/{entity.reference}/metadata"
         logger.debug(xml_request)
-        print(xml_request)
         request = self.session.post(f'{self.protocol}://{self.server}/api/entity{end_point}', data=xml_request,
                                     headers=headers)
         if request.status_code == requests.codes.ok:
@@ -2648,3 +2647,4 @@ class EntityAPI(AuthenticatedAPI):
                                   "_delete_entity", request.content.decode('utf-8'))
         logger.error(exception)
         raise exception
+

{pypreservica-3.2.3 → pypreservica-3.2.4}/pyPreservica/uploadAPI.py

@@ -1633,6 +1633,52 @@ class UploadAPI(AuthenticatedAPI):
             logger.error(exception)
             raise exception
 
+    def clean_upload_bucket(self, bucket_name: str,  older_than_days: int = 90):
+        """
+        Clean up objects in an upload bucket which are older than older_than_days.
+
+        """
+        from azure.storage.blob import ContainerClient
+
+        for location in self.upload_locations():
+            if location['containerName'] == bucket_name:
+
+                if location['type'] != 'AWS':
+                    credentials = self.upload_credentials(location['apiId'])
+                    account_key = credentials['key']
+                    session_token = credentials['sessionToken']
+                    sas_url = f"https://{account_key}.blob.core.windows.net/{bucket_name}"
+                    container = ContainerClient.from_container_url(container_url=sas_url, credential=session_token)
+                    now = datetime.now(timezone.utc)
+                    for blob in container.list_blobs():
+                        if abs((blob.last_modified - now).days) > older_than_days:
+                            logger.debug(f"Deleting expired object {blob.name}")
+                            container.delete_blob(blob.name)
+
+                if location['type'] == 'AWS':
+                    credentials = self.upload_credentials(location['apiId'])
+                    access_key = credentials['key']
+                    secret_key = credentials['secret']
+                    session_token = credentials['sessionToken']
+                    session = boto3.Session(aws_access_key_id=access_key, aws_secret_access_key=secret_key,
+                                            aws_session_token=session_token)
+                    s3_client = session.client("s3")
+                    paginator = s3_client.get_paginator('list_objects_v2')
+                    now = datetime.now(timezone.utc)
+                    for page in paginator.paginate(Bucket=bucket_name):
+                        if 'Contents' in page:
+                            for key in page['Contents']:
+                                last_modified = key["LastModified"]
+                                if abs((last_modified - now).days) > older_than_days:
+                                    logger.debug(f"Deleting expired object {key["Key"]}")
+                                    s3_client.delete_object(Bucket=bucket_name, Key=key["Key"])
+
+
+
+
+
+
+
     def upload_locations(self):
         """
         Upload locations are configured on the Sources page as 'SIP Upload'.

{pypreservica-3.2.3 → pypreservica-3.2.4}/pyPreservica.egg-info/PKG-INFO

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

{pypreservica-3.2.3 → pypreservica-3.2.4}/setup.py

@@ -21,7 +21,7 @@ if sys.argv[-1] == 'publish':
 # This call to setup() does all the work
 setup(
     name=PKG,
-    version="3.2.3",
+    version="3.2.4",
     description="Python library for the Preservica API",
     long_description=README,
     long_description_content_type="text/markdown",