Working MessageHandler with context

Author: marques-bruno

bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_MessageHandler.cpp

@@ -87,22 +87,21 @@ namespace sofapython3
                     default:
                     return "Other";
                 }
-            };
+            }();
 
-            auto component = [&m]() {
+            Base* component = [&m]() -> Base* {
                 sofa::helper::logging::SofaComponentInfo* nfo = dynamic_cast<sofa::helper::logging::SofaComponentInfo*>(m.componentInfo().get());
                 if( nfo != nullptr )
-                    return py::cast(nfo->m_component);
-                return py::object();
-            };
-
-            py::dict msg("type"_a=typeStr,
-                         "isEmpty"_a=m.empty(),
-                         "sender"_a=m.sender(),
-                         "message"_a=m.messageAsString(),
-                         "component"_a=component
-                    );
-
+                    return const_cast<Base*>(nfo->m_component);
+                return nullptr;
+            }();
+
+            py::dict msg;
+            msg["type"] = py::str(typeStr);
+            msg["isEmpty"]=py::cast(m.empty());
+            msg["sender"]=py::str(m.sender());
+            msg["message"]=py::str(m.messageAsString());
+            msg["component"]=component ? PythonFactory::toPython(component) : py::none();
             py::object fct = self.attr("process")(msg);
         }
     }
@@ -121,11 +120,14 @@ namespace sofapython3
         }));
 
         f.def("process", &PyMessageHandler::process);
-        f.def("__enter__", [](PyMessageHandler* self){
+        f.def("__enter__", [](PyMessageHandler* self) -> PyMessageHandler*
+        {
             PythonEnvironment::gil acquire {"MessageHandler"};
             sofa::helper::logging::MessageDispatcher::addHandler(self);
+            return self;
         });
-        f.def("__exit__", [](PyMessageHandler* self){
+        f.def("__exit__", [](PyMessageHandler* self, py::object /*exc_type*/, py::object /*exc_value*/, py::object /*traceback*/)
+        {
             PythonEnvironment::gil acquire {"MessageHandler"};
             sofa::helper::logging::MessageDispatcher::rmHandler(self);
         });

bindings/Sofa/src/SofaPython3/Sofa/Simulation/CMakeLists.txt

@@ -18,5 +18,5 @@ SP3_add_python_module(
         MODULE_NAME  Simulation
         SOURCES      ${SOURCE_FILES}
         HEADERS      ${HEADER_FILES}
-        DEPENDS      SofaCore SofaSimulationCore SofaSimulationGraph SofaBaseVisual
-)
+        DEPENDS      SofaHelper SofaCore SofaSimulationCore SofaSimulationGraph SofaBaseVisual
+)

bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation.cpp

@@ -41,6 +41,7 @@ using sofa::simulation::Simulation;
 
 #include <sofa/core/visual/VisualParams.h>
 #include <sofa/helper/logging/MessageDispatcher.h>
+using sofa::helper::logging::MessageDispatcher;
 #include <sofa/helper/logging/ConsoleMessageHandler.h>
 #include "Submodule_Simulation_doc.h"
 

bindings/Sofa/tests/Helper/Message.py

@@ -8,17 +8,11 @@ class MsgHandler(Sofa.Helper.MessageHandler):
     def __init__(self):
         Sofa.Helper.MessageHandler.__init__(self)
 
-    def process(msg):
-        print ("GOT MESSAGE!")
-        print("type: ")
-        print(msg.type)
-        print("sender: ")
-        print(msg.sender)
-        print("component: ")
-        print(msg.component.typeName())
-        print(msg.component.getName())
-        print("message:")
-        print(msg.message)
+    def process(self, msg):
+        self.type = msg["type"]
+        self.sender = msg["sender"]
+        self.component = msg["component"]
+        self.message = msg["message"]
 
 
 class Test(unittest.TestCase):
@@ -35,9 +29,17 @@ def test_messages(self):
 
 
     def test_messageHandler(self):
-        with MsgHandler():
+        with MsgHandler() as handler:
             Sofa.Helper.msg_info("plop")
-            Sofa.Helper.msg_error("pouet")
-        Sofa.Helper.msg_warning("coucou")
+            self.assertEqual(handler.type, "Info")
+            self.assertEqual(handler.sender, "PythonScript")
+            self.assertEqual(handler.component, None)
+            self.assertEqual(handler.message, "plop")
+
+            Sofa.Helper.msg_warning("coucou")
+            self.assertEqual(handler.type, "Warning")
+            self.assertEqual(handler.sender, "PythonScript")
+            self.assertEqual(handler.component, None)
+            self.assertEqual(handler.message, "coucou")
 
 

bindings/Sofa/tests/Simulation/Node.py

@@ -157,7 +157,7 @@ def test_getItem(self):
 
             self.assertEqual(root["node1.node2.object2.name"], root.node1.node2.object2.name)
 
-	def test_getRoot(self):
+        def test_getRoot(self):
             root = Sofa.Core.Node("root")
             node = root.addChild("node")
             self.assertEqual(node.getRoot(), root)