Providing error message to python in exception

src/NativeBridge/ManagedInterop.cpp

@@ -83,7 +83,6 @@ EnvironmentBlock::EnvironmentBlock(int verbosity, int maxSlots, int seed, const
     // Assert that this class doesn't have a vtable.
     assert(offsetof(EnvironmentBlock, verbosity) == 0);
 
-    this->_errCode = PyErrorCode_NoError;
     this->verbosity = verbosity;
     this->maxSlots = maxSlots;
     this->seed = seed;
@@ -207,6 +206,7 @@ STATIC MANAGED_CALLBACK(void) EnvironmentBlock::MessageSink(EnvironmentBlock * e
             break;
         case Error:  // We will throw the error when ConnectToMlNet returns
             sMessage = "Error: " + sMessage;
+            env->_errMessage = sMessage;
             break;
         }
 

src/NativeBridge/ManagedInterop.h

@@ -21,13 +21,6 @@ enum MessageKind
     Error = 3
 };
 
-// These are only used locally
-enum PyErrorCode
-{
-    PyErrorCode_NoError = 0,
-    PyErrorCode_Failure = 1
-};
-
 // REVIEW: the exceptions thrown in the callbacks will not be caught by BxlServer on Linux.
 // On Linux, CoreCLR will ignore previous stack frames, i.e., those before entering the managed code.
 typedef MANAGED_CALLBACK_PTR(void, MODELSINK) (EnvironmentBlock * env,
@@ -87,7 +80,6 @@ class CLASS_ALIGN EnvironmentBlock
 public:
     EnvironmentBlock(int verbosity = 0, int maxSlots = -1, int seed = 42, const char* pythonPath = NULL);
     ~EnvironmentBlock();
-    PyErrorCode GetErrorCode() { return _errCode; }
     std::string GetErrorMessage() { return _errMessage; }
     bp::dict GetData();
 
@@ -107,7 +99,6 @@ class CLASS_ALIGN EnvironmentBlock
     int _irowBase;
     int _crowWant;
     std::vector<void*> _vset;
-    PyErrorCode _errCode;
     std::string _errMessage;
 
     std::vector<std::string> _names;

src/NativeBridge/dllmain.cpp

@@ -114,11 +114,11 @@ bp::dict pxCall(bp::dict& params)
         else
             retCode = exec(&env, s_graph.c_str(), 0, NULL);
 
+        if (retCode == -1)
+            throw std::runtime_error(env.GetErrorMessage());
+
         res = env.GetData();
 
-        if (retCode == -1)
-            // REVIEW: get the content of IChannel and add it the the error message.
-            throw std::runtime_error("Returned code is -1. Check the log for error messages.");
     }
     catch (const std::exception& e)
     {

src/python/nimbusml/__init__.py

@@ -2,7 +2,7 @@
 Microsoft Machine Learning for Python
 """
 
-__version__ = '1.4.1'
+__version__ = '1.4.2'
 
 # CoreCLR version of MicrosoftML is built on Windows.
 # But file permissions are not preserved when it's copied to Linux.

src/python/nimbusml/tests/test_errors.py

@@ -41,7 +41,7 @@ def test_error_wrong_column_name(self):
                 raise Exception(
                     'boost.python did not replace the exception.\n{0}'.format(
                         e))
-            assert "Check the log for error messages" in str(e)
+            assert "Error: *** System.ArgumentOutOfRangeException: 'Could not find input column" in str(e)
 
     @unittest.skip("System.NullReferenceException")
     def test_char_tokenizer(self):

src/python/nimbusml/tests/test_syntax_onehotvectorizer.py

@@ -79,7 +79,7 @@ def test_syntax5_failing(self):
             vec.fit_transform(X, verbose=2)
             assert False
         except RuntimeError as e:
-            assert "Returned code is -1. Check the log for error messages.." \
+            assert "Error: *** System.ArgumentOutOfRangeException: 'Could not find input column" \
                    in str(e)
         vec = OneHotVectorizer() << {'edu1': ['education']}
         res = vec.fit_transform(X)
@@ -147,3 +147,6 @@ def test_syntax9_multiple_inputs(self):
             'out1': ['education1', 'education2']}
         output4 = ng4.fit_transform(X)
         assert output4.shape == (5, 13)
+
+if __name__ == '__main__':
+    unittest.main()

src/python/setup.py

@@ -45,7 +45,7 @@
     # Versions should comply with PEP440.  For a discussion on
     # single-sourcing the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='1.4.1',
+    version='1.4.2',
 
     description='NimbusML',
     long_description=long_description,

version.txt

@@ -1 +1 @@
-1.4.1
+1.4.2