Raise RuntimeError from Cython if the pipeline has not been executed

Author: gsakkis

pdal/PyPipeline.cpp

@@ -184,9 +184,6 @@ PyArrayObject* viewToNumpyArray(PointViewPtr view)
 
 std::vector<PyArrayObject*> PyPipelineExecutor::getArrays() const
 {
-    if (!executed())
-        throw python_error("call execute() before fetching arrays");
-
     std::vector<PyArrayObject*> output;
     for (auto view: getManagerConst().views())
         output.push_back(viewToNumpyArray(view));
@@ -248,9 +245,6 @@ PyArrayObject* meshToNumpyArray(const TriangularMesh* mesh)
 
 std::vector<PyArrayObject*> PyPipelineExecutor::getMeshes() const
 {
-    if (!executed())
-        throw python_error("call execute() before fetching the mesh");
-
     std::vector<PyArrayObject*> output;
     for (auto view: getManagerConst().views())
         output.push_back(meshToNumpyArray(view->mesh()));

pdal/PyPipeline.hpp

@@ -45,20 +45,11 @@ namespace python
 
 class Array;
 
-class python_error : public std::runtime_error
-{
-public:
-    inline python_error(std::string const& msg) : std::runtime_error(msg)
-        {}
-};
-
 class PyPipelineExecutor : public PipelineExecutor
 {
 public:
     PyPipelineExecutor(std::string const& json);
-    PyPipelineExecutor(std::string const& json,
-        std::vector<pdal::python::Array*> arrays);
-
+    PyPipelineExecutor(std::string const& json, std::vector<Array*> arrays);
     std::vector<PyArrayObject*> getArrays() const;
     std::vector<PyArrayObject*> getMeshes() const;
 };

pdal/libpdalpython.pyx

@@ -64,6 +64,7 @@ cdef extern from "PyPipeline.hpp" namespace "pdal::python":
     cdef cppclass PyPipelineExecutor:
         PyPipelineExecutor(const char*) except +
         PyPipelineExecutor(const char*, vector[Array*]&) except +
+        bool executed() except +
         int64_t execute() except +
         bool validate() except +
         string getPipeline() except +
@@ -117,10 +118,14 @@ cdef class Pipeline:
 
     property arrays:
         def __get__(self):
+            if not self._executor.executed():
+                raise RuntimeError("call execute() before fetching arrays")
             return self._vector_to_list(self._executor.getArrays())
 
     property meshes:
         def __get__(self):
+            if not self._executor.executed():
+                raise RuntimeError("call execute() before fetching the mesh")
             return self._vector_to_list(self._executor.getMeshes())
 
     def execute(self):