Merge pull request #159 from AlanRosenthal/alan/permissions

Fix typo when parsing device-config's gatt server

bumble/att.py

@@ -739,11 +739,16 @@ class Attribute(EventEmitter):
 
     @staticmethod
     def string_to_permissions(permissions_str: str):
-        return functools.reduce(
-            lambda x, y: x | get_dict_key_by_value(Attribute.PERMISSION_NAMES, y),
-            permissions_str.split(","),
-            0,
-        )
+        try:
+            return functools.reduce(
+                lambda x, y: x | get_dict_key_by_value(Attribute.PERMISSION_NAMES, y),
+                permissions_str.split(","),
+                0,
+            )
+        except TypeError:
+            raise TypeError(
+                f"Attribute::permissions error:\nExpected a string containing any of the keys, seperated by commas: {','.join(Attribute.PERMISSION_NAMES.values())}\nGot: {permissions_str}"
+            )
 
     def __init__(self, attribute_type, permissions, value=b''):
         EventEmitter.__init__(self)

bumble/device.py

@@ -1000,9 +1000,14 @@ class Device(CompositeEventEmitter):
             for characteristic in service.get("characteristics", []):
                 descriptors = []
                 for descriptor in characteristic.get("descriptors", []):
+                    # Leave this check until 5/25/2023
+                    if descriptor.get("permission", False):
+                        raise Exception(
+                            "Error parsing Device Config's GATT Services. The key 'permission' must be renamed to 'permissions'"
+                        )
                     new_descriptor = Descriptor(
                         attribute_type=descriptor["descriptor_type"],
-                        permissions=descriptor["permission"],
+                        permissions=descriptor["permissions"],
                     )
                     descriptors.append(new_descriptor)
                 new_characteristic = Characteristic(