pyPreservica 2.9.2__py3-none-any.whl → 2.9.4__py3-none-any.whl

pyPreservica/__init__.py

@@ -23,6 +23,6 @@ from .mdformsAPI import MetadataGroupsAPI, Group, GroupField, GroupFieldType
 __author__ = "James Carr (drjamescarr@gmail.com)"
 
 # Version of the pyPreservica package
-__version__ = "2.9.2"
+__version__ = "2.9.4"
 
 __license__ = "Apache License Version 2.0"

pyPreservica/mdformsAPI.py

@@ -421,7 +421,7 @@ class MetadataGroupsAPI(AuthenticatedAPI):
                 logger.error(exception)
                 raise exception
 
-    def forms(self, schema_uri: str|None = None) -> dict:
+    def forms(self, schema_uri: Union[str, None] = None) -> dict:
         """
             Return all the metadata Forms in the tenancy as a list of JSON dict objects
 
@@ -441,7 +441,7 @@ class MetadataGroupsAPI(AuthenticatedAPI):
         with self.session.get(url, headers=headers, params=params) as request:
             if request.status_code == requests.codes.unauthorized:
                 self.token = self.__token__()
-                return self.forms_json()
+                return self.forms()
             elif request.status_code == requests.codes.ok:
                 return json.loads(str(request.content.decode('utf-8')))['metadataForms']
             else:
@@ -467,7 +467,7 @@ class MetadataGroupsAPI(AuthenticatedAPI):
         with self.session.get(url, headers=headers) as request:
             if request.status_code == requests.codes.unauthorized:
                 self.token = self.__token__()
-                return self.form_json(form_id)
+                return self.form(form_id)
             elif request.status_code == requests.codes.ok:
                 return json.loads(str(request.content.decode('utf-8')))
             else:

pyPreservica/uploadAPI.py

@@ -37,7 +37,7 @@ logger = logging.getLogger(__name__)
 
 MB = 1024 * 1024
 GB = 1024 ** 3
-transfer_config = TransferConfig(multipart_threshold=int((1 * GB) / 16))
+transfer_config = TransferConfig(multipart_threshold=int(32 * MB))
 
 CONTENT_FOLDER = "content"
 PRESERVATION_CONTENT_FOLDER = "p1"
@@ -1910,9 +1910,16 @@ class UploadAPI(AuthenticatedAPI):
         endpoint = f'{self.protocol}://{self.server}/api/s3/buckets'
         self.token = self.__token__()
 
+
+        retries= {
+            'max_attempts': 10,
+            'mode': 'adaptive'
+        }
+
         s3_client = boto3.client('s3', endpoint_url=endpoint, aws_access_key_id=self.token,
                                  aws_secret_access_key="NOT_USED",
-                                 config=Config(s3={'addressing_style': 'path'}))
+                                 config=Config(s3={'addressing_style': 'path'}, read_timeout=120, connect_timeout=120,
+                                               retries=retries, tcp_keepalive=True))
 
         metadata = {}
         if folder is not None:

{pyPreservica-2.9.2.dist-info → pyPreservica-2.9.4.dist-info}/METADATA

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

{pyPreservica-2.9.2.dist-info → pyPreservica-2.9.4.dist-info}/RECORD

@@ -1,19 +1,19 @@
-pyPreservica/__init__.py,sha256=hzcuWdS8XXKexRdqvojfv-pqrW_vS9bF5Hh3Th3HkcY,1177
+pyPreservica/__init__.py,sha256=dDaBZZwmdmrfqa4DsObHFxNfXtscI8P13o7RkqUs0IU,1177
 pyPreservica/adminAPI.py,sha256=511bc5KtrCAXbDyBk39dmDnxUVDaOu6xaiyu0jYhxa4,37781
 pyPreservica/authorityAPI.py,sha256=Eule8g6LXr8c8SFcJgpRah4lH1FgevUItO5HhHDEaZE,9172
 pyPreservica/common.py,sha256=qVmH5xazlxX02pZaYAX1GT-k0fDuzF8JmEIrYBGiTtw,37648
 pyPreservica/contentAPI.py,sha256=6L7z5KZZDuBBLTm9GQ9RLOhugAawPnuQIgv1NZf0vIU,22060
 pyPreservica/entityAPI.py,sha256=BxrJ-irL0-ohZGVd5uduvFgDgMvrB3Xf2pzTaZ00-Cg,118999
-pyPreservica/mdformsAPI.py,sha256=8atJKNi9mGoQR9DSaEJSIdVBEwBstAuktSPUiJczU3w,19128
+pyPreservica/mdformsAPI.py,sha256=v_PKjddWHr2-Lo3zqHXikupq4PJvyrwZEEhPHeKDdGY,19126
 pyPreservica/monitorAPI.py,sha256=HD-PUPdSI9wGAa07e2_2_-FLINH8PoWUwpFogz7F-j4,6269
 pyPreservica/opex.py,sha256=ccra1S4ojUXS3PlbU8WfxajOkJrwG4OykBnNrYP_jus,4875
 pyPreservica/parAPI.py,sha256=bgaQvYfWNnzdD7ibKMV3ZV85pNkEdSoLsgVigoiFFfw,10771
 pyPreservica/retentionAPI.py,sha256=31yKHbatxj9kt5vbqyTeg98nrMotd2iL4jsiNhcOLg4,24770
-pyPreservica/uploadAPI.py,sha256=3XV3_i7mwp0IPcnx1sW4U01rkphtAzq5Se3G_l28wIM,96469
+pyPreservica/uploadAPI.py,sha256=WbMGbp7uVJJm_GGvrwxgIP51M5IVXJU2M_JV6Vv5KJw,96687
 pyPreservica/webHooksAPI.py,sha256=_K3KUOsmwYf8qMa-mD47sAmNUW7Pzb9oKVpS0VoSbC0,6827
 pyPreservica/workflowAPI.py,sha256=wDDR5_CsJ3dhX79E5mJaziAtgYb830J0ZpNJppzgvqk,17493
-pyPreservica-2.9.2.dist-info/LICENSE.txt,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-pyPreservica-2.9.2.dist-info/METADATA,sha256=pwbevSahu7N-Au96h32Qk_U-8Oyf2qNo66mZLh0dmlM,2779
-pyPreservica-2.9.2.dist-info/WHEEL,sha256=YiKiUUeZQGmGJoR_0N1Y933DOBowq4AIvDe2-UIy8E4,91
-pyPreservica-2.9.2.dist-info/top_level.txt,sha256=iIBh6NAznYQHOV8mv_y_kGKSDITek9rANyFDwJsbU-c,13
-pyPreservica-2.9.2.dist-info/RECORD,,
+pyPreservica-2.9.4.dist-info/LICENSE.txt,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+pyPreservica-2.9.4.dist-info/METADATA,sha256=jOR9wFM424u6iERFDApsXB_Ta5bEKHHEOz85yoG-nVY,2779
+pyPreservica-2.9.4.dist-info/WHEEL,sha256=YiKiUUeZQGmGJoR_0N1Y933DOBowq4AIvDe2-UIy8E4,91
+pyPreservica-2.9.4.dist-info/top_level.txt,sha256=iIBh6NAznYQHOV8mv_y_kGKSDITek9rANyFDwJsbU-c,13
+pyPreservica-2.9.4.dist-info/RECORD,,