Fix serializing & deserializing data. Fixes #75

- convert data to serializable dict when publishing it from stores
- allow loading model objects from serialized data in storeclient

Author: rtnpro

ircb/models/lib.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+import datetime
+
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
@@ -9,12 +11,28 @@
 
 class _Base(object):
 
-    def to_dict(self):
+    def to_dict(self, serializable=True):
         d = {}
         for col in self.__table__.columns:
             d[col.name] = getattr(self, col.name)
+        if serializable:
+            if getattr(self, 'created'):
+                d['created'] = self.created.timestamp()
+            if getattr(self, 'last_updated'):
+                d['last_updated'] = self.last_updated.timestamp()
         return d
 
+    @classmethod
+    def from_dict(cls, data, serialized=True):
+        if serialized:
+            if 'created' in data:
+                data['created'] = datetime.datetime.fromtimestamp(
+                    data['created'])
+            if 'last_updated' in data:
+                data['last_updated'] = datetime.datetime.fromtimestamp(
+                    data['last_updated'])
+        return cls(**data)
+
 Base = declarative_base(cls=_Base)
 
 

ircb/models/logs.py

@@ -23,13 +23,25 @@ class BaseLog(object):
     last_updated = sa.Column(sa.DateTime,
                              default=datetime.datetime.utcnow)
 
-    def to_dict(self, serializable=False):
+    def to_dict(self, serializable=True):
         d = super().to_dict()
-        d['timestamp'] = self.timestamp.timestamp()
-        d['created'] = self.created.timestamp()
-        d['last_updated'] = self.last_updated.timestamp()
+        if serializable:
+            d['timestamp'] = self.timestamp.timestamp()
         return d
 
+    @classmethod
+    def from_dict(cls, data, serialized=True):
+        if serialized:
+            data['timestamp'] = datetime.datetime.fromtimestamp(
+                data['timestamp'])
+            if 'created' in data:
+                data['created'] = datetime.datetime.fromtimestamp(
+                    data['created'])
+            if 'last_updated' in data:
+                data['last_updated'] = datetime.datetime.fromtimestamp(
+                    data['last_updated'])
+        return cls(**data)
+
 
 class MessageLog(BaseLog, Base):
     """

ircb/models/network.py

@@ -89,7 +89,4 @@ def to_dict(self, serializable=False):
             self.status if isinstance(self.status, str) else self.status.code)
         d['ssl_verify'] = ssl_verify
         d['status'] = status
-        if serializable:
-            d['created'] = self.created.timestamp()
-            d['last_updated'] = self.last_updated.timestamp()
         return d

ircb/models/user.py

@@ -35,7 +35,7 @@ class User(Base, UserMixin):
     created = Column(DateTime, default=datetime.datetime.utcnow)
     last_updated = Column(DateTime, default=datetime.datetime.utcnow)
 
-    def to_dict(self):
+    def to_dict(self, serializable=False):
         d = super().to_dict()
         d.pop('password')
         d['is_active'] = self.is_active()

ircb/storeclient/base.py

@@ -41,12 +41,12 @@ def initialize(cls):
     def get(cls, data, raw=False):
         result = yield from cls._get(data)
         if isinstance(result, dict):
-            result = cls.model(**result) if raw is False else result
+            result = cls.model.from_dict(result) if raw is False else result
         elif isinstance(result, tuple):
             if raw:
                 result = result
             else:
-                result = [cls.model(**item) for item in result]
+                result = [cls.model.from_dict(item) for item in result]
         return result
 
     @classmethod
@@ -67,7 +67,7 @@ def delete(cls, data):
     @classmethod
     def create_or_update(cls, data):
         result = yield from cls._create_or_update(data)
-        return cls.model(**result)
+        return cls.model.from_dict(result)
 
     @classmethod
     def _get(cls, data):
@@ -166,7 +166,7 @@ def _on_message(cls, signal, data, taskid=None):
             raw_callbacks = cls.raw_callbacks['delete']
         if callbacks:
             for callback in callbacks:
-                callback(cls.model(**data))
+                callback(cls.model.from_dict(data))
         if raw_callbacks:
             for callback in raw_callbacks:
                 callback(data)