add exceptions

pythonApi/grib_to_arrow.cpp

@@ -1,6 +1,10 @@
 #include "../src/gribreader.hpp"
 #include "../src/gribmessage.hpp"
-#include "../src/exceptions/notsuchfileexception.hpp"
+#include "../src/exceptions/nosuchgribfileexception.hpp"
+#include "../src/exceptions/nosuchlocationsfileexception.hpp"
+#include "../src/exceptions/arrowtablereadercreationexception.hpp"
+#include "../src/exceptions/arrowgenericexception.hpp"
+#include "../src/exceptions/invalidcsvexception.hpp"
 
 //#define USE_CMAKE
 
@@ -26,7 +30,12 @@ using namespace std;
 PYBIND11_MODULE(gribtoarrow, m)
 {
 
- py::register_exception<NoSuchFileException>(m, "NoSuchFileException");
+ py::register_exception<InvalidCSVException>(m, "InvalidCSVException");
+ py::register_exception<NoSuchGribFileException>(m, "NoSuchGribFileException");
+ py::register_exception<NoSuchLocationsFileException>(m, "NoSuchLocationsFileException");
+ py::register_exception<UnableToCreateArrowTableReaderException>(m, "UnableToCreateArrowTableReaderException");
+ py::register_exception<ArrowGenericException>(m, "ArrowGenericException");
+
  arrow::py::import_pyarrow();
  py::class_<GribReader>(m, "GribReader")
  .def(py::init<string>(), pybind11::call_guard<pybind11::gil_scoped_release>(), R"EOL(

src/exceptions/arrowgenericexception.hpp

@@ -0,0 +1,9 @@
+#pragma once
+
+class ArrowGenericException : public std::runtime_error
+{
+public:
+
+ ArrowGenericException(std::string errorDetails) : std::runtime_error("Exception " + errorDetails) { }
+
+};

src/exceptions/arrowtablereadercreationexception.hpp

@@ -0,0 +1,9 @@
+#pragma once
+
+class UnableToCreateArrowTableReaderException : public std::runtime_error
+{
+public:
+
+ UnableToCreateArrowTableReaderException(std::string errorDetails) : std::runtime_error("Unable to create arrow table reader " + errorDetails) { }
+
+};

src/exceptions/invalidcsvexception.hpp

@@ -0,0 +1,9 @@
+#pragma once
+
+class InvalidCSVException : public std::runtime_error
+{
+public:
+
+ InvalidCSVException(std::string filepath) : std::runtime_error("Invalid CSV file - is there a formatting error with file " + filepath) { }
+
+};

src/exceptions/nosuchgribfileexception.hpp

@@ -0,0 +1,9 @@
+#pragma once
+
+class NoSuchGribFileException : public std::runtime_error
+{
+public:
+
+ NoSuchGribFileException(std::string filepath) : std::runtime_error("Unable to find file " + filepath) { }
+
+};

src/exceptions/nosuchlocationsfileexception.hpp

@@ -0,0 +1,9 @@
+#pragma once
+
+class NoSuchLocationsFileException : public std::runtime_error
+{
+public:
+
+ NoSuchLocationsFileException(std::string filepath) : std::runtime_error("Unable to find Locations file " + filepath) { }
+
+};

src/gribreader.cpp

@@ -24,7 +24,11 @@
 #include "gribmessageiterator.hpp"
 #include "caster.hpp"
 #include "converter.hpp"
-#include "exceptions/notsuchfileexception.hpp"
+#include "exceptions/nosuchgribfileexception.hpp"
+#include "exceptions/nosuchlocationsfileexception.hpp"
+#include "exceptions/arrowtablereadercreationexception.hpp"
+#include "exceptions/arrowgenericexception.hpp"
+#include "exceptions/invalidcsvexception.hpp"
 
 using namespace std;
 namespace cp = arrow::compute;
@@ -38,7 +42,7 @@ GribReader::GribReader(string filepath) : filepath(filepath) {
  -999l);
  fin = fopen(filepath.c_str(), "rb");
  if (!fin) {
- throw NoSuchFileException(filepath);
+ throw NoSuchGribFileException(filepath);
  cout << "Error: unable to open input file" << filepath << endl;
  } else {
  cout << "I'm ready file is " << fin << endl;
@@ -277,18 +281,39 @@ bool GribReader::hasLocations() {
 }
 
 std::shared_ptr<arrow::Table> GribReader::getTableFromCsv(std::string path, arrow::csv::ConvertOptions convertOptions){
- std::shared_ptr<arrow::io::ReadableFile> infile = arrow::io::ReadableFile::Open(path).ValueOrDie();
+ auto infile = arrow::io::ReadableFile::Open(path);
+
+ if (infile.ok()) {
+
+ auto csv_reader =
+ arrow::csv::TableReader::Make(
+ arrow::io::default_io_context(), infile.ValueOrDie(), arrow::csv::ReadOptions::Defaults(),
+ arrow::csv::ParseOptions::Defaults(), convertOptions);
+
+ if(csv_reader.ok()) {
+ auto table = csv_reader.ValueOrDie()->Read();
+
+ if (table.ok()) {
+ return table.ValueOrDie();
+ } else {
+ std::string errDetails = "Error reading results into arrow table is this a valid CSV ? ";
+ throw InvalidCSVException(errDetails );
+ }
+
+ } else {
+ std::string errDetails = "Unable to create arrow CSV table reader for file " + path;
+ throw UnableToCreateArrowTableReaderException(errDetails);
+ }
 
 
 
- auto csv_reader =
-  arrow::csv::TableReader::Make(
-  arrow::io::default_io_context(), infile, arrow::csv::ReadOptions::Defaults(),
-  arrow::csv::ParseOptions::Defaults(), convertOptions).ValueOrDie();
+
+ } else {
+ throw NoSuchLocationsFileException(path);
+ }
 
- std::shared_ptr<arrow::Table> table = csv_reader->Read().ValueOrDie();
 
- return table;
+
 }
 
 arrow::Result<std::shared_ptr<arrow::Array>> GribReader::createSurrogateKeyCol(long numberOfRows){