Add python code to support mappings.

Author: alejandroinfante

flask_platform.py

@@ -29,6 +29,9 @@ def eval_expression():
         def status_endpoint():
             return "{}"
 
+    def addMapping(self, key_type, mapping_function):
+        json_encoder.JsonSerializer.addMapping(key_type, mapping_function)
+
     def _start(self):
         try:
             self.app.run(port=self.port)

json_encoder.py

@@ -2,18 +2,19 @@
 import io
 from PythonBridge.object_registry import registry
 
+mapper = {}
+
+def addMapping(key_type, mapping_function):
+    mapper[key_type] = mapping_function
+
 class JsonEncoder(json.JSONEncoder):
     def __init__(self, *args, **kwargs):
         json.JSONEncoder.__init__(self, *args, **kwargs)
-        self.mapper = self.default_mapper()
-
-    def default_mapper(self):
-        d = {}
-        return d
+        self.mapper = mapper
 
     def default(self, obj):
         if type(obj) in self.mapper:
-            return mapper[type(obj)](obj)
+            return self.mapper[type(obj)](obj)
         return {
             '__pyclass__': type(obj).__name__,
             '__pyid__': registry().register(obj)

msgpack_serializer.py

@@ -12,20 +12,23 @@
     memoryview,
     bytearray]
 
+mapper = {}
+
+def addMapping(key_type, mapping_function):
+    mapper[key_type] = mapping_function
+
 class MsgPackSerializer:
     def __init__(self):
         self.primitive_types = primitive_types
-        self.mapper = self.default_mapper()
 
-    def default_mapper(self):
-        d = {}
-        return d
+    def mapper(self):
+        return mapper
 
     def default(self, obj):
         if type(obj) in self.primitive_types:
             return obj
-        if type(obj) in self.mapper:
-            return mapper[type(obj)](obj)
+        if type(obj) in self.mapper():
+            return self.mapper()[type(obj)](obj)
         return {
             '__pyclass__': type(obj).__name__,
             '__pyid__': registry().register(obj)

msgpack_socket_platform.py

@@ -19,6 +19,9 @@ def __init__(self, port):
         self.packer = msgpack.Packer(use_bin_type=True)
         self.sync_table = {}
         self.async_handlers = {}
+    
+    def addMapping(self, key_type, mapping_function):
+        msgpack_serializer.addMapping(key_type, mapping_function)
 
     def set_handler(self, msg_type, async_handler):
         self.async_handlers[msg_type] = async_handler

tests/test_bridge_encoder.py

@@ -21,6 +21,10 @@ def test_encode_int(self):
     def test_encode_float(self):
         self.assert_encode_raw(5.5,'5.5')
 
+    def test_add_mapping(self):
+        json_encoder.addMapping(type(self), lambda obj: 'Foooo!')
+        self.assert_encode(self,'Foooo!')
+
     def test_encode_obj(self):
         registry().register_with_id(self.encoder,'337')
         self.assert_encode(self.encoder,{'__pyclass__': "JsonEncoder", "__pyid__": '337'})

tests/test_msgpack_serializer.py

@@ -1,4 +1,5 @@
 import msgpack
+import msgpack_serializer
 from msgpack_serializer import *
 import unittest
 from object_registry import registry
@@ -19,6 +20,10 @@ def test_encode_int(self):
 
     def test_encode_float(self):
         self.assert_encode_raw(5.5, b'\xcb\x40\x16\x00\x00\x00\x00\x00\x00')
+    
+    def test_add_mapping(self):
+        msgpack_serializer.addMapping(type(self), lambda obj: 'Foooo!')
+        self.assert_encode(self,'Foooo!')
 
     def test_encode_obj(self):
         registry().register_with_id(self.serializer,'337')