pyGuardPoint 2.0.9__tar.gz → 2.1.1__tar.gz

{pyguardpoint-2.0.9 → pyguardpoint-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyGuardPoint
-Version: 2.0.9
+Version: 2.1.1
 Summary: Python wrapper for GuardPoint 10 Access Control System
 Author: John Owen
 Maintainer-email: sales@sensoraccess.co.uk

{pyguardpoint-2.0.9 → pyguardpoint-2.1.1}/pyGuardPoint/_guardpoint_cardholders.py

@@ -4,7 +4,7 @@ from datetime import datetime
 import validators
 from ._odata_filter import _compose_filter, _compose_select, _compose_expand
 from ._str_match_algo import fuzzy_match
-from .guardpoint_dataclasses import Cardholder, SortAlgorithm, Area, CardholderOrderBy
+from .guardpoint_dataclasses import Cardholder, SortAlgorithm, Area, CardholderOrderBy, CardholderType, SecurityGroup
 from .guardpoint_error import GuardPointError, GuardPointUnauthorized
 from .guardpoint_utils import GuardPointResponse
 
@@ -213,10 +213,10 @@ class CardholdersAPI:
         if enroll_face_from_photo:
             headers['EnrollFaceFromPhoto'] = ""
 
-        if cardholder.cardholderType:
+        if isinstance(cardholder.cardholderType, CardholderType):
             cardholder.cardholderTypeUID = cardholder.cardholderType.uid
 
-        if cardholder.securityGroup:
+        if isinstance(cardholder.securityGroup, SecurityGroup):
             cardholder.securityGroupUID = cardholder.securityGroup.uid
 
         if changed_only:

{pyguardpoint-2.0.9 → pyguardpoint-2.1.1}/pyGuardPoint/gp_asyncio/_async_guardpoint_cardholders.py

@@ -3,7 +3,7 @@ from datetime import datetime
 import validators
 from .._odata_filter import _compose_filter, _compose_select, _compose_expand
 from .._str_match_algo import fuzzy_match
-from ..guardpoint_dataclasses import Cardholder, SortAlgorithm, Area, CardholderOrderBy
+from ..guardpoint_dataclasses import Cardholder, SortAlgorithm, Area, CardholderOrderBy, CardholderType, SecurityGroup
 from ..guardpoint_error import GuardPointError, GuardPointUnauthorized
 from ..guardpoint_utils import GuardPointResponse
 
@@ -142,10 +142,10 @@ class CardholdersAPI:
         if enroll_face_from_photo:
             headers['EnrollFaceFromPhoto'] = ""
 
-        if cardholder.cardholderType:
+        if isinstance(cardholder.cardholderType, CardholderType):
             cardholder.cardholderTypeUID = cardholder.cardholderType.uid
 
-        if cardholder.securityGroup:
+        if isinstance(cardholder.securityGroup, SecurityGroup):
             cardholder.securityGroupUID = cardholder.securityGroup.uid
 
         if changed_only:

{pyguardpoint-2.0.9 → pyguardpoint-2.1.1}/pyGuardPoint/gp_asyncio/guardpoint_connection_asyncio.py

@@ -172,11 +172,11 @@ class GuardPointConnection:
                 if code != 200:
                     return code, auth_body
             if self.auto_renew:
-                if self.token_expiry < (time.time() - (20 * 60)):  # If Token will expire within 20 minutes
+                if self.token_expiry < (time.time() + (20 * 60)) and self.token_expiry > time.time():
                     code, auth_body = await self._renew_token()
                     if code != 200:
                         return code, auth_body
-                if self.token_expiry < time.time():
+                elif self.token_expiry < time.time():
                     code, auth_body = await self._new_token()
                     if code != 200:
                         return code, auth_body
@@ -220,54 +220,70 @@ class GuardPointConnection:
                         json_body = None
             except InvalidURL as e:
                 log.error(str(e))
-                return
+                return 400, {"error": str(e)}
             except Exception as e:
                 log.error(str(e))
-                return
+                return 500, {"error": str(e)}
 
         elif method.lower() == "post":
-            async with self.session.post(url, data=raw_body, headers=headers) as response:
-                body = await response.text()
-                try:
-                    json_body = json.loads(body)
-                except JSONDecodeError:
-                    json_body = None
-                except Exception as e:
-                    log.error(e)
-                    json_body = None
+            try:
+                async with self.session.post(url, data=raw_body, headers=headers) as response:
+                    body = await response.text()
+                    try:
+                        json_body = json.loads(body)
+                    except JSONDecodeError:
+                        json_body = None
+                    except Exception as e:
+                        log.error(e)
+                        json_body = None
+            except Exception as e:
+                log.error(str(e))
+                return 500, {"error": str(e)}
 
         elif method.lower() == "patch":
-            async with self.session.patch(url, data=raw_body, headers=headers) as response:
-                body = await response.text()
-                try:
-                    json_body = json.loads(body)
-                except JSONDecodeError:
-                    json_body = None
-                except Exception as e:
-                    log.error(e)
-                    json_body = None
+            try:
+                async with self.session.patch(url, data=raw_body, headers=headers) as response:
+                    body = await response.text()
+                    try:
+                        json_body = json.loads(body)
+                    except JSONDecodeError:
+                        json_body = None
+                    except Exception as e:
+                        log.error(e)
+                        json_body = None
+            except Exception as e:
+                log.error(str(e))
+                return 500, {"error": str(e)}
 
         elif method.lower() == "delete":
-            async with self.session.delete(url, data=raw_body, headers=headers) as response:
-                body = await response.text()
-                try:
-                    json_body = json.loads(body)
-                except JSONDecodeError:
-                    json_body = None
-                except Exception as e:
-                    log.error(e)
-                    json_body = None
+            try:
+                async with self.session.delete(url, data=raw_body, headers=headers) as response:
+                    body = await response.text()
+                    try:
+                        json_body = json.loads(body)
+                    except JSONDecodeError:
+                        json_body = None
+                    except Exception as e:
+                        log.error(e)
+                        json_body = None
+            except Exception as e:
+                log.error(str(e))
+                return 500, {"error": str(e)}
 
         elif method.lower() == "put":
-            async with self.session.put(url, data=raw_body, headers=headers) as response:
-                body = await response.text()
-                try:
-                    json_body = json.loads(body)
-                except JSONDecodeError:
-                    json_body = None
-                except Exception as e:
-                    log.error(e)
-                    json_body = None
+            try:
+                async with self.session.put(url, data=raw_body, headers=headers) as response:
+                    body = await response.text()
+                    try:
+                        json_body = json.loads(body)
+                    except JSONDecodeError:
+                        json_body = None
+                    except Exception as e:
+                        log.error(e)
+                        json_body = None
+            except Exception as e:
+                log.error(str(e))
+                return 500, {"error": str(e)}
 
         else:
             raise ValueError("Method Not Supported")

{pyguardpoint-2.0.9 → pyguardpoint-2.1.1}/pyGuardPoint/guardpoint_connection.py

@@ -185,11 +185,11 @@ class GuardPointConnection:
                 if code != 200:
                     return code, auth_body
             if self.auto_renew:
-                if self.token_expiry < (time.time() - (20 * 60)):  # If Token will expire within 20 minutes
+                if self.token_expiry < (time.time() + (20 * 60)) and self.token_expiry > time.time():
                     code, auth_body = self._renew_token()
                     if code != 200:
                         return code, auth_body
-                if self.token_expiry < time.time():
+                elif self.token_expiry < time.time():
                     code, auth_body = self._new_token()
                     if code != 200:
                         return code, auth_body

{pyguardpoint-2.0.9 → pyguardpoint-2.1.1}/pyGuardPoint/guardpoint_dataclasses.py

@@ -1,4 +1,5 @@
 import logging
+import threading
 from collections import defaultdict
 from dataclasses import dataclass, asdict, field
 from enum import Enum
@@ -18,20 +19,21 @@ class EventOrder(Enum):
 
 
 class Observable:
-    # A set of all attributes which get changed
-    changed_attributes = set()
-
     def __init__(self):
-        self.observed = defaultdict(list)
+        super().__setattr__('changed_attributes', set())
+        super().__setattr__('observed', defaultdict(list))
+        super().__setattr__('_observer_lock', threading.RLock())
 
     def __setattr__(self, name, value):
         super().__setattr__(name, value)
 
-        for observer in self.observed.get(name, []):
-            observer(name)
+        with self._observer_lock:
+            for observer in self.observed.get(name, []):
+                observer(name)
 
     def add_observer(self, name):
-        self.observed[name].append(lambda name: self.changed_attributes.add(name))
+        with self._observer_lock:
+            self.observed[name].append(lambda name: self.changed_attributes.add(name))
 
 
 def sanitise_args(obj: Observable, args, kwargs):
@@ -1219,7 +1221,7 @@ class Cardholder(Observable):
                 try:
                     if isinstance(getattr(self, property_name), str):
                         value = str(value)
-                except:
+                except AttributeError:
                     pass
 
 

{pyguardpoint-2.0.9 → pyguardpoint-2.1.1}/pyGuardPoint.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyGuardPoint
-Version: 2.0.9
+Version: 2.1.1
 Summary: Python wrapper for GuardPoint 10 Access Control System
 Author: John Owen
 Maintainer-email: sales@sensoraccess.co.uk

{pyguardpoint-2.0.9 → pyguardpoint-2.1.1}/setup.py

@@ -5,7 +5,7 @@ long_description = open('README.rst').read()
 setup(name="pyGuardPoint",
       python_requires='>3.9.0',
       packages=find_packages(),
-      version="2.0.9",
+      version="2.1.1",
       author="John Owen",
       description="Python wrapper for GuardPoint 10 Access Control System",
       long_description_content_type='text/markdown',