pyPreservica 2.6.7__py3-none-any.whl → 2.7.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.6.7"
+__version__ = "2.7.0"
 
 __license__ = "Apache License Version 2.0"

pyPreservica/common.py

@@ -23,6 +23,7 @@ import xml.etree.ElementTree
 from enum import Enum
 from pathlib import Path
 import pyotp
+from requests import Response, Session
 from urllib3.util import Retry
 import requests
 from requests.adapters import HTTPAdapter
@@ -860,7 +861,7 @@ class AuthenticatedAPI:
 
         config = configparser.ConfigParser(interpolation=configparser.Interpolation())
         config.read('credentials.properties', encoding='utf-8')
-        self.session = requests.Session()
+        self.session: Session = requests.Session()
 
         retries = Retry(
             total=3,
@@ -869,7 +870,7 @@ class AuthenticatedAPI:
             allowed_methods=Retry.DEFAULT_ALLOWED_METHODS
         )
 
-        self.shared_secret = bool(use_shared_secret)
+        self.shared_secret: bool = bool(use_shared_secret)
         self.protocol = protocol
         self.two_fa_secret_key = two_fa_secret_key
 

pyPreservica/entityAPI.py

@@ -1880,7 +1880,11 @@ class EntityAPI(AuthenticatedAPI):
     def children(self, folder: Union[str, Folder] = None, maximum: int = 100, next_page: str = None) -> PagedSet:
         headers = {HEADER_TOKEN: self.token}
         data = {'start': str(0), 'max': str(maximum)}
-        folder_reference = folder
+
+        if isinstance(folder, Folder):
+            folder_reference = folder.reference
+        else:
+            folder_reference = folder
         if next_page is None:
             if folder_reference is None:
                 request = self.session.get(f'{self.protocol}://{self.server}/api/entity/root/children', params=data,

{pyPreservica-2.6.7.dist-info → pyPreservica-2.7.0.dist-info}/METADATA

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

{pyPreservica-2.6.7.dist-info → pyPreservica-2.7.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
-pyPreservica/__init__.py,sha256=WC44WynzHyCoyIEaO23odoVeBnG8EKKAYJ766bN4-z4,1085
+pyPreservica/__init__.py,sha256=9CnLUpMumnbIHfqhA4Y1riWp7PJbD_1gMy1sIuNaU5k,1085
 pyPreservica/adminAPI.py,sha256=511bc5KtrCAXbDyBk39dmDnxUVDaOu6xaiyu0jYhxa4,37781
 pyPreservica/authorityAPI.py,sha256=Eule8g6LXr8c8SFcJgpRah4lH1FgevUItO5HhHDEaZE,9172
-pyPreservica/common.py,sha256=y-yzPQZMBm_sBc6C28VgMLBNIHh8kSy5utY9f0h8sWU,36463
+pyPreservica/common.py,sha256=upTmwvPK9kcgSO3L8mfIMVrCOWJCCYIHi5GK516jOok,36518
 pyPreservica/contentAPI.py,sha256=d6bK7qXFLep8rOs8y-dJGzoFuqanO3fo82G4dW0YWWE,17245
-pyPreservica/entityAPI.py,sha256=CVPDQhJZzQjqq-HzV05vnGlqynEQ5aplTYwd1BZNyZ0,114526
+pyPreservica/entityAPI.py,sha256=adJFoPE1tfL_K8dE9kfWZMYdnMFtAMv8X6ZUQGxpQRA,114636
 pyPreservica/monitorAPI.py,sha256=HD-PUPdSI9wGAa07e2_2_-FLINH8PoWUwpFogz7F-j4,6269
 pyPreservica/opex.py,sha256=ccra1S4ojUXS3PlbU8WfxajOkJrwG4OykBnNrYP_jus,4875
 pyPreservica/parAPI.py,sha256=bgaQvYfWNnzdD7ibKMV3ZV85pNkEdSoLsgVigoiFFfw,10771
@@ -12,8 +12,8 @@ pyPreservica/uploadAPI.py,sha256=4Rdm9xvO2FKC8SirOP41g5wVnPEZLRI0Mz4KinxT-L4,935
 pyPreservica/vocabularyAPI.py,sha256=jPl6KDZoBGqlY0oEYjTpZ9kNEPzchDW-gyp-HH-MSKk,5729
 pyPreservica/webHooksAPI.py,sha256=0wP-59mep8gtlIZ9P5vV68-HnNdTuuo2kzGcDWj0bNg,6790
 pyPreservica/workflowAPI.py,sha256=ENFWxcuPW5WX9jG2CAha6UzTywULWvosgTUVsmvs8f8,17323
-pyPreservica-2.6.7.dist-info/LICENSE.txt,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-pyPreservica-2.6.7.dist-info/METADATA,sha256=rb3Y384XVbwgB_rd5A1WcHkUQcplCBPCmXQeoX0GbL8,2784
-pyPreservica-2.6.7.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-pyPreservica-2.6.7.dist-info/top_level.txt,sha256=iIBh6NAznYQHOV8mv_y_kGKSDITek9rANyFDwJsbU-c,13
-pyPreservica-2.6.7.dist-info/RECORD,,
+pyPreservica-2.7.0.dist-info/LICENSE.txt,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+pyPreservica-2.7.0.dist-info/METADATA,sha256=G8cCrLf_qnlYZ2ujMTM3edGsjxaVyoAdv3H8QiHUa4A,2784
+pyPreservica-2.7.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+pyPreservica-2.7.0.dist-info/top_level.txt,sha256=iIBh6NAznYQHOV8mv_y_kGKSDITek9rANyFDwJsbU-c,13
+pyPreservica-2.7.0.dist-info/RECORD,,