pyGuardPoint 2.0.7__tar.gz → 2.0.9__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (68) hide show
  1. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/PKG-INFO +1 -1
  2. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/_guardpoint_cardholders.py +7 -0
  3. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/gp_asyncio/_async_guardpoint_cardholders.py +6 -0
  4. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/guardpoint_dataclasses.py +1 -1
  5. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/guardpoint_utils.py +5 -2
  6. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint.egg-info/PKG-INFO +1 -1
  7. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/setup.py +1 -1
  8. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/LICENSE.txt +0 -0
  9. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/README.rst +0 -0
  10. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/CustomWebsocketTransport.py +0 -0
  11. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/CustomWebsocketTransportOld.py +0 -0
  12. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/__init__.py +0 -0
  13. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/_guardpoint_accessgroups.py +0 -0
  14. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/_guardpoint_alarmstates.py +0 -0
  15. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/_guardpoint_alarmzones.py +0 -0
  16. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/_guardpoint_areas.py +0 -0
  17. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/_guardpoint_cardholdertypes.py +0 -0
  18. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/_guardpoint_cards.py +0 -0
  19. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/_guardpoint_controllers.py +0 -0
  20. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/_guardpoint_customizedfields.py +0 -0
  21. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/_guardpoint_departments.py +0 -0
  22. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/_guardpoint_diagnostic.py +0 -0
  23. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/_guardpoint_events.py +0 -0
  24. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/_guardpoint_genericinformation.py +0 -0
  25. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/_guardpoint_inputs.py +0 -0
  26. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/_guardpoint_manualevents.py +0 -0
  27. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/_guardpoint_ouputs.py +0 -0
  28. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/_guardpoint_personaldetails.py +0 -0
  29. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/_guardpoint_readers.py +0 -0
  30. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/_guardpoint_scheduledmags.py +0 -0
  31. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/_guardpoint_securitygroups.py +0 -0
  32. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/_guardpoint_sites.py +0 -0
  33. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/_guardpoint_weeklyprograms.py +0 -0
  34. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/_odata_filter.py +0 -0
  35. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/_str_match_algo.py +0 -0
  36. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/gp_asyncio/__init__.py +0 -0
  37. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/gp_asyncio/_async_guardpoint_accessgroups.py +0 -0
  38. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/gp_asyncio/_async_guardpoint_alarmstates.py +0 -0
  39. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/gp_asyncio/_async_guardpoint_alarmzones.py +0 -0
  40. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/gp_asyncio/_async_guardpoint_areas.py +0 -0
  41. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/gp_asyncio/_async_guardpoint_cardholdertypes.py +0 -0
  42. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/gp_asyncio/_async_guardpoint_cards.py +0 -0
  43. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/gp_asyncio/_async_guardpoint_controllers.py +0 -0
  44. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/gp_asyncio/_async_guardpoint_customizedfields.py +0 -0
  45. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/gp_asyncio/_async_guardpoint_departments.py +0 -0
  46. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/gp_asyncio/_async_guardpoint_diagnostic.py +0 -0
  47. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/gp_asyncio/_async_guardpoint_events.py +0 -0
  48. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/gp_asyncio/_async_guardpoint_genericinformation.py +0 -0
  49. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/gp_asyncio/_async_guardpoint_manualevents.py +0 -0
  50. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/gp_asyncio/_async_guardpoint_ouputs.py +0 -0
  51. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/gp_asyncio/_async_guardpoint_personaldetails.py +0 -0
  52. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/gp_asyncio/_async_guardpoint_readers.py +0 -0
  53. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/gp_asyncio/_async_guardpoint_scheduledmags.py +0 -0
  54. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/gp_asyncio/_async_guardpoint_securitygroups.py +0 -0
  55. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/gp_asyncio/_async_guardpoint_sites.py +0 -0
  56. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/gp_asyncio/_async_guardpoint_weeklyprograms.py +0 -0
  57. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/gp_asyncio/guardpoint_connection_asyncio.py +0 -0
  58. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/guardpoint.py +0 -0
  59. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/guardpoint_asyncio.py +0 -0
  60. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/guardpoint_connection.py +0 -0
  61. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/guardpoint_error.py +0 -0
  62. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint/guardpoint_threaded.py +0 -0
  63. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint.egg-info/SOURCES.txt +0 -0
  64. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint.egg-info/dependency_links.txt +0 -0
  65. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint.egg-info/not-zip-safe +0 -0
  66. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint.egg-info/requires.txt +0 -0
  67. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/pyGuardPoint.egg-info/top_level.txt +0 -0
  68. {pyguardpoint-2.0.7 → pyguardpoint-2.0.9}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: pyGuardPoint
3
- Version: 2.0.7
3
+ Version: 2.0.9
4
4
  Summary: Python wrapper for GuardPoint 10 Access Control System
5
5
  Author: John Owen
6
6
  Maintainer-email: sales@sensoraccess.co.uk
@@ -213,6 +213,12 @@ class CardholdersAPI:
213
213
  if enroll_face_from_photo:
214
214
  headers['EnrollFaceFromPhoto'] = ""
215
215
 
216
+ if cardholder.cardholderType:
217
+ cardholder.cardholderTypeUID = cardholder.cardholderType.uid
218
+
219
+ if cardholder.securityGroup:
220
+ cardholder.securityGroupUID = cardholder.securityGroup.uid
221
+
216
222
  if changed_only:
217
223
  ch = cardholder.dict(editable_only=True, changed_only=True, non_empty_only=True)
218
224
  else:
@@ -230,6 +236,7 @@ class CardholdersAPI:
230
236
 
231
237
  if code == 201: # HTTP CREATED
232
238
  new_cardholder = Cardholder(json_body)
239
+
233
240
  if cardholder.cardholderPersonalDetail:
234
241
  if len(cardholder.cardholderPersonalDetail.changed_attributes) > 0:
235
242
  self.update_personal_details(cardholder_uid=new_cardholder.uid,
@@ -142,6 +142,12 @@ class CardholdersAPI:
142
142
  if enroll_face_from_photo:
143
143
  headers['EnrollFaceFromPhoto'] = ""
144
144
 
145
+ if cardholder.cardholderType:
146
+ cardholder.cardholderTypeUID = cardholder.cardholderType.uid
147
+
148
+ if cardholder.securityGroup:
149
+ cardholder.securityGroupUID = cardholder.securityGroup.uid
150
+
145
151
  if changed_only:
146
152
  ch = cardholder.dict(editable_only=True, changed_only=True, non_empty_only=True)
147
153
  else:
@@ -1161,7 +1161,7 @@ class Cardholder(Observable):
1161
1161
  securityGroupUID: str = ""
1162
1162
  accessGroupUIDs: any = None
1163
1163
  liftAccessGroupUIDs: any = None
1164
- personalCrisisLevel: int = 0
1164
+ personalCrisisLevel: int = None
1165
1165
  lastDownloadTime: any = None
1166
1166
  lastInOutArea: str = ""
1167
1167
  lastInOutReaderUID: any = None
@@ -47,8 +47,11 @@ class GuardPointResponse:
47
47
  if isinstance(response_body, dict):
48
48
  if "errorMessages" in response_body:
49
49
  if isinstance(response_body["errorMessages"], list):
50
- if 'message' in response_body["errorMessages"][0] and 'other' in response_body["errorMessages"][0]:
51
- error_msg = f'{response_body["errorMessages"][0]["message"]}-{response_body["errorMessages"][0]["other"]}'
50
+ if len(response_body["errorMessages"]) > 0:
51
+ if 'message' in response_body["errorMessages"][0] and 'other' in response_body["errorMessages"][0]:
52
+ error_msg = f'{response_body["errorMessages"][0]["message"]}-{response_body["errorMessages"][0]["other"]}'
53
+ elif isinstance(response_body["errorMessages"][0], str):
54
+ error_msg = response_body["errorMessages"][0]
52
55
  if 'message' in response_body:
53
56
  error_msg = response_body['message']
54
57
  if 'error' in response_body:
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: pyGuardPoint
3
- Version: 2.0.7
3
+ Version: 2.0.9
4
4
  Summary: Python wrapper for GuardPoint 10 Access Control System
5
5
  Author: John Owen
6
6
  Maintainer-email: sales@sensoraccess.co.uk
@@ -5,7 +5,7 @@ long_description = open('README.rst').read()
5
5
  setup(name="pyGuardPoint",
6
6
  python_requires='>3.9.0',
7
7
  packages=find_packages(),
8
- version="2.0.7",
8
+ version="2.0.9",
9
9
  author="John Owen",
10
10
  description="Python wrapper for GuardPoint 10 Access Control System",
11
11
  long_description_content_type='text/markdown',
File without changes
File without changes
File without changes