MINIFICPP-2511 Fix python processor tests

- Properly load libpython in PythonManifestTests
- Fix refcount handling for Python singleton objects

Closes #1916

Signed-off-by: Marton Szasz <[email protected]>

Author: lordgamez

extensions/python/PythonScriptEngine.h

@@ -68,7 +68,6 @@ class PythonScriptEngine {
         }
         return result;
       }
-      Py_INCREF(Py_None);
       return OwnedReference(Py_None);
     } catch (const std::exception& e) {
       throw PythonScriptException(e.what());
@@ -98,13 +97,11 @@ class PythonScriptEngine {
 
     try {
       if (PyObject_HasAttrString(processor_instance_.get(), fn_name.c_str()) == 0) {
-        Py_INCREF(Py_None);
         return OwnedReference(Py_None);
       }
 
       auto callable_method = OwnedCallable(PyObject_GetAttrString(processor_instance_.get(), fn_name.c_str()));
       if (callable_method.get() == nullptr) {
-        Py_INCREF(Py_None);
         return OwnedReference(Py_None);
       }
 

extensions/python/tests/PythonManifestTests.cpp

@@ -157,7 +157,11 @@ class MyPyProc5(FlowFileTransform):
 )";
 
   controller.configuration_->set(minifi::Configuration::nifi_python_processor_dir, python_dir.string());
+#ifdef __linux__
+  controller.configuration_->set(minifi::Configuration::nifi_extension_path, "*minifi-python-lib-loader*, *minifi-python-script*");
+#else
   controller.configuration_->set(minifi::Configuration::nifi_extension_path, "*minifi-python-script*");
+#endif
 
   core::extension::ExtensionManager::get().initialize(controller.configuration_);
 

extensions/python/types/BaseTypes.h

@@ -50,6 +50,9 @@ struct ObjectReference {
 
   explicit ObjectReference(PyObject* object)
       : object_(object) {
+    if (object_ == Py_None || object_ == Py_True || object_ == Py_False || object_ == Py_Ellipsis || object_ == Py_NotImplemented) {
+      Py_INCREF(object_);
+    }
   }
 
   ~ObjectReference() {

extensions/python/types/Types.h

@@ -60,18 +60,15 @@ template<>
 struct Converter<bool> {
   OwnedObject from(bool value) {
     if (value) {
-      Py_INCREF(Py_True);
       return OwnedObject(Py_True);
     }
-    Py_INCREF(Py_False);
     return OwnedObject(Py_False);
   }
 };
 
 template<>
 struct Converter<std::nullptr_t> {
   OwnedObject from(std::nullptr_t) {
-    Py_INCREF(Py_None);
     return OwnedObject(Py_None);
   }
 };