GUI/View/Project/PyImportAssistant: Use PythonInterpreter functionality

Use PythonInterpreter functionality instead of using Python C-API directly.

GUI/View/Project/PyImportAssistant.cpp

@@ -30,7 +30,8 @@
 #include "GUI/View/Project/ProjectManager.h"
 #include "GUI/View/Tool/Globals.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Multilayer/PyImport.h"
+#include "PyTools/Embed/PythonInterpreter.h"  // listOfFunctions
+#include "PyTools/Sample/Multilayer/ImportMultiLayer.h"  // createMultiLayerFromPython
 #include <QApplication>
 #include <QFileDialog>
 #include <QTextStream>
@@ -101,21 +102,23 @@ QString readFile(const QString& fileName)
 
 std::unique_ptr<MultiLayer> createMultiLayer(const QString& snippet, const QString& funcName)
 {
-    std::unique_ptr<MultiLayer> result;
-
     QApplication::setOverrideCursor(Qt::WaitCursor);
-    try {
-        result = Py::Import::createFromPython(snippet.toStdString(), funcName.toStdString(),
-                                              bornagainDir());
-    } catch (const std::exception& ex) {
+
+    Result<std::unique_ptr<MultiLayer>> result{
+        PythonInterpreter::createMultiLayerFromPython(
+            snippet.toStdString(), funcName.toStdString(),
+            bornagainDir())};
+
+    if (!result.valid()) {
         QApplication::restoreOverrideCursor();
         QString message("Exception thrown while executing Python code to create sample.\n\n");
-        QString details = QString::fromStdString(std::string(ex.what()));
-        DetailedMessageBox(GUI::Global::mainWindow, "Python failure", message, details).exec();
+        QString details = QString::fromStdString(result.status.message);
+    DetailedMessageBox(GUI::Global::mainWindow, "Python failure", message, details).exec();
     }
+
     QApplication::restoreOverrideCursor();
 
-    return result;
+    return std::move(result.val);
 }
 
 //! Lets user select a function name which generates a MultiLayer.
@@ -148,22 +151,23 @@ QString selectPySampleFunction(const QStringList& funcNames)
 
 QString getPySampleFunctionName(const QString& snippet)
 {
-    QStringList funcList;
-
     QApplication::setOverrideCursor(Qt::WaitCursor);
-    try {
-        auto funcs = Py::Import::listOfFunctions(snippet.toStdString(), bornagainDir());
-        funcList = GUI::Util::String::fromStdStrings(funcs);
-    } catch (const std::exception& ex) {
+
+    Result<std::vector<std::string>> funcs_res {
+        PythonInterpreter::BornAgain::listOfFunctions(
+            snippet.toStdString(), bornagainDir())};
+
+    if(!funcs_res.valid())
+    {
         QApplication::restoreOverrideCursor();
         QString message("Exception thrown while acquiring functions from Python code.\n\n");
-        QString details = QString::fromStdString(std::string(ex.what()));
+        QString details = QString::fromStdString(funcs_res.status.message);
         DetailedMessageBox(GUI::Global::mainWindow, "Python failure", message, details).exec();
-
         return "";
     }
-    QApplication::restoreOverrideCursor();
 
+    QApplication::restoreOverrideCursor();
+    QStringList funcList {GUI::Util::String::fromStdStrings(funcs_res.val)};
     return selectPySampleFunction(funcList);
 }