[SofaPython3] Cleaning in SpellingSuggestionHelper.h

Author: damienmarchal

Plugin/src/SofaPython3/SpellingSuggestionHelper.h

@@ -20,6 +20,7 @@
 #pragma once
 
 #include <functional>
+#include <algorithm>
 #include <iostream>
 #include <sofa/helper/DiffLib.h>
 
@@ -32,27 +33,13 @@ void fillVectorOfStringFrom(const Iterable& v, const UnaryOperation& op, const P
     std::transform(v.begin(), v.end(), op, func);
 }
 
-//template<class Iterable>
-//std::ostream& emitSpellingMessage(std::ostream& ostream, const std::string& message, const Iterable& iterable, const std::string& name, sofa::Size numEntries=5, double thresold=0.6)
-//{
-//    std::vector<std::string> possibleNames;
-//    fillVectorOfStringFrom(iterable, std::back_inserter(possibleNames), [](const typename Iterable::value_type d) { return d->getName(); });
-
-//    auto spellingSuggestions = sofa::helper::getClosestMatch(name, possibleNames, numEntries, thresold);
-//    if(!spellingSuggestions.empty())
-//    {
-//        for(auto& [name, score] : spellingSuggestions)
-//           ostream << message << "'" << name << "' ("<< std::to_string((int)(100*score))+"% match)" << std::endl;
-//    }
-//    return ostream;
-//}
-
 template<class Iterable, class PickingFunction=std::function<const std::string(typename Iterable::value_type)> >
 std::ostream& emitSpellingMessage(std::ostream& ostream, const std::string& message, const Iterable& iterable, const std::string& name,
                                   sofa::Size numEntries=5, SReal thresold=0.6_sreal,
                                   PickingFunction f = [](const typename Iterable::value_type d) { return d->getName(); })
 {
     std::vector<std::string> possibleNames;
+    possibleNames.reserve(iterable.size());
     fillVectorOfStringFrom(iterable, std::back_inserter(possibleNames), f);
 
     auto spellingSuggestions = sofa::helper::getClosestMatch(name, possibleNames, numEntries, thresold);

bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base.cpp

@@ -361,7 +361,7 @@ py::object BindingBase::__getattr__(py::object self, const std::string& attribut
     emitSpellingMessage(tmp, "   - The link named ", selfbase->getLinks(), attributeName, 2, 0.6);
 
     // Also provide spelling hints on python functions.
-    emitSpellingMessage(tmp, "   - The python attribute named ", py::cast<py::dict>(py::type::of(self).attr("__dict__")), attributeName, 5, 0.8,
+    emitSpellingMessage(tmp, "   - The python attribute named ", py::cast<py::dict>(pybind11_compat::type::of(self).attr("__dict__")), attributeName, 5, 0.8,
                         [](const std::pair<py::handle, py::handle>& kv) { return py::cast<std::string>(std::get<0>(kv)); });
 
     std::stringstream message;

bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base.h

@@ -30,6 +30,34 @@ namespace sofapython3 {
 template <typename T>
 using py_shared_ptr = sofa::core::sptr<T>;
 
+namespace pybind11_compat
+{
+using namespace pybind11;
+class type : public pybind11::object {
+public:
+    PYBIND11_OBJECT(type, pybind11::object, PyType_Check)
+
+    /// Return a type handle from a handle or an object
+    static pybind11::handle handle_of(pybind11::handle h) { return handle((PyObject*) Py_TYPE(h.ptr())); }
+
+    /// Return a type object from a handle or an object
+    static type of(pybind11::handle h) { return type(type::handle_of(h), borrowed_t{}); }
+
+    // Defined in pybind11/cast.h
+    /// Convert C++ type to handle if previously registered. Does not convert
+    /// standard types, like int, float. etc. yet.
+    /// See https://github.com/pybind/pybind11/issues/2486
+    template<typename T>
+    static handle handle_of();
+
+    /// Convert C++ type to type if previously registered. Does not convert
+    /// standard types, like int, float. etc. yet.
+    /// See https://github.com/pybind/pybind11/issues/2486
+    template<typename T>
+    static type of() {return type(type::handle_of<T>(), borrowed_t{}); }
+};
+}
+
 } // namespace sofapython3
 
 PYBIND11_DECLARE_HOLDER_TYPE(T, sofapython3::py_shared_ptr<T>, true)

bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.cpp

@@ -17,11 +17,9 @@
 *******************************************************************************
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
-
-
 /// Neede to have automatic conversion from pybind types to stl container.
 #include <pybind11/stl.h>
-#include <pybind11/eval.h>
+#include <pybind11/numpy.h>
 
 #include <sofa/simulation/Simulation.h>
 #include <sofa/core/ComponentNameHelper.h>
@@ -69,6 +67,8 @@ using sofa::core::objectmodel::BaseObjectDescription;
 #include <queue>
 #include <sofa/core/objectmodel/Link.h>
 
+SOFAPYTHON3_BIND_ATTRIBUTE_ERROR()
+
 /// Makes an alias for the pybind11 namespace to increase readability.
 namespace py { using namespace pybind11; }
 
@@ -484,7 +484,7 @@ py::object __getattr__(py::object pyself, const std::string& name)
     emitSpellingMessage(tmp, "   - The child node named ", selfnode->getChildren(), name, 2, 0.8);
 
     // Also provide spelling hints on python functions.
-    emitSpellingMessage(tmp, "   - The python attribute named ", py::cast<py::dict>(py::type::of(pyself).attr("__dict__")), name, 5, 0.8,
+    emitSpellingMessage(tmp, "   - The python attribute named ", py::cast<py::dict>(pybind11_compat::type::of(pyself).attr("__dict__")), name, 5, 0.8,
                         [](const std::pair<py::handle, py::handle>& kv) { return py::cast<std::string>(std::get<0>(kv)); });
 
     std::stringstream message;
@@ -495,7 +495,7 @@ py::object __getattr__(py::object pyself, const std::string& name)
         message << "   You possibly wanted to access: " << msgendl;
         message << tmp.rdbuf();
     }
-    throw py::attribute_error(message.str());
+    throw pybind11::attribute_error(message.str());
 }
 
 /// gets an item using its path (path is dot-separated, relative to the object