Added optional __COLLECTION_NAME__ argument and attach enum to collection

Author: Jeroen van der Heijden

thingsdb/model/collection.py

@@ -165,10 +165,10 @@ def _upd_type_ren(self, data):
         self._types[type_id] = tuple(t)
 
     def _update_enum(self, data):
-        Enum._update_enum(self._enums, data, convert=self._conv_any)
+        Enum._update_enum(self._name, self._enums, data, self._conv_any)
 
     def _upd_enum_add(self, data):
-        Enum._upd_enum_add(self._enums, data, convert=self._conv_any)
+        Enum._upd_enum_add(self._enums, data, self._conv_any)
 
     def _upd_enum_def(self, data):
         Enum._upd_enum_def(self._enums, data)
@@ -177,11 +177,11 @@ def _upd_enum_del(self, data):
         Enum._upd_enum_del(self._enums, data)
 
     def _upd_enum_mod(self, data):
-        Enum._upd_enum_mod(self._enums, data, convert=self._conv_any)
+        Enum._upd_enum_mod(self._enums, data, self._conv_any)
 
     def _upd_enum_ren(self, data):
         Enum._upd_enum_ren(self._enums, data)
 
     def _get_enum_member(self, enum_id, idx):
-        enum = self._enums[enum_id]
-        return enum[idx]
+        members, _ = self._enums[enum_id]
+        return members[idx]

thingsdb/model/emitter.py

@@ -8,7 +8,7 @@ class Emitter(Events):
 
     _ev_handlers = dict()
 
-    def __init__(self, client: Client, emitter: str, scope=None):
+    def __init__(self, client: Client, emitter: str = '', scope: str = None):
         super().__init__()
         self._event_id = 0
         self._client = client
@@ -41,7 +41,7 @@ def on_node_status(self, _status):
     def on_warning(self, warn):
         logging.warning(f'{warn["warn_msg"]} ({warn["warn_code"]})')
 
-    def on_watch_init(self, data):
+    def on_watch_init(self, _data):
         pass
 
     def on_event(self, ev, *args):
@@ -57,7 +57,7 @@ def on_watch_update(self, data):
         if thing_id != self._thing_id:
             return
 
-        event_id, jobs = data['event'], data.pop('jobs')
+        event_id, jobs = data['event'], data['jobs']
 
         if self._event_id > event_id:
             logging.warning(

thingsdb/model/enum.py

@@ -30,6 +30,7 @@ def __init_subclass__(cls, **kwargs):
             return
 
         cls._name = getattr(cls, '__NAME__', cls.__name__)
+        cls._cname = getattr(cls, '__COLLECTION_NAME__', '')
         cls._id = None
         cls._memberclass = type(f'{cls._name}Member', (EnumMember, cls), {})
 
@@ -40,28 +41,33 @@ def __init_subclass__(cls, **kwargs):
             setattr(cls, k, cls._memberclass(cls._name, k, v))
 
         # register for lookup by name
-        _enums_lookup[cls._name] = cls
+        _enums_lookup[cls._cname + cls._name] = cls
 
     @staticmethod
-    def _update_enum(enums, data, convert):
+    def _update_enum(cname, enums, data, convert):
         name = data['name']
-        enum = _enums_lookup.get(name)
+        enum = _enums_lookup.get(name, _enums_lookup.get(cname + name))
+        if enum and enum._cname and enum._cname != cname:
+            raise TypeError(
+                f'Enum type {name} is used in more than one collection; '
+                'Add __COLLECTION_NAME__ to your Enum definition to fix '
+                'this error')
         cls = EnumMember if enum is None else enum._memberclass
 
         members = [cls(name, k, convert(v)) for k, v in data['members']]
 
         if enum is not None:
+            enum._cname = cname
             enum._id = data['enum_id']
             for member in members:
                 setattr(enum, member.name, member)
 
-        enums[data['enum_id']] = members
+        enums[data['enum_id']] = members, enum
 
     @staticmethod
     def _upd_enum_add(enums, data, convert):
-        members = enums[data['enum_id']]
+        members, enum = enums[data['enum_id']]
         name = members[0]._enum_name
-        enum = _enums_lookup.get(name)
         cls = EnumMember if enum is None else enum._memberclass
 
         member = cls(name, data['name'], convert(data['value']))
@@ -72,10 +78,8 @@ def _upd_enum_add(enums, data, convert):
 
     @staticmethod
     def _upd_enum_del(enums, data):
-        members = enums[data['enum_id']]
-        name = members[0]._enum_name
+        members, enum = enums[data['enum_id']]
 
-        enum = _enums_lookup.get(name)
         if enum is not None:
             member = members[data['index']]
             delattr(enum, member.name)
@@ -88,7 +92,7 @@ def _upd_enum_del(enums, data):
 
     @staticmethod
     def _upd_enum_def(enums, data):
-        members = enums[data['enum_id']]
+        members, _ = enums[data['enum_id']]
         # swap index
         idx = data['index']
         tmp = members[idx]
@@ -97,18 +101,16 @@ def _upd_enum_def(enums, data):
 
     @staticmethod
     def _upd_enum_mod(enums, data, convert):
-        members = enums[data['enum_id']]
+        members, _ = enums[data['enum_id']]
         name = members[0]._enum_name
         member = members[data['index']]
         member._value = convert(data['value'])
 
     @staticmethod
     def _upd_enum_ren(enums, data):
-        members = enums[data['enum_id']]
-        name = members[0]._enum_name
+        members, enum = enums[data['enum_id']]
         member = members[data['index']]
 
-        enum = _enums_lookup.get(name)
         if enum is not None:
             delattr(enum, member.name)
             setattr(enum, data['name'], member)

thingsdb/version.py

@@ -1 +1 @@
-__version__ = '0.6.8'
+__version__ = '0.6.9'