improve error handling

pythonApi/grib_to_arrow.cpp

@@ -6,6 +6,7 @@
 #include "../src/exceptions/arrowgenericexception.hpp"
 #include "../src/exceptions/invalidcsvexception.hpp"
 #include "../src/exceptions/invalidschemaexception.hpp"
+#include "../src/exceptions/gribexception.hpp"
 
 //#define USE_CMAKE
 
@@ -37,6 +38,7 @@ PYBIND11_MODULE(gribtoarrow, m)
  py::register_exception<UnableToCreateArrowTableReaderException>(m, "UnableToCreateArrowTableReaderException");
  py::register_exception<ArrowGenericException>(m, "ArrowGenericException");
  py::register_exception<InvalidSchemaException>(m, "InvalidSchemaException");
+ py::register_exception<GribException>(m, "GribException");
 
  py::module::import("pyarrow");
  py::class_<GribReader>(m, "GribReader")

src/exceptions/gribexception.hpp

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

src/gribmessage.cpp

@@ -11,6 +11,7 @@
 #include "caster.hpp"
 #include "gribmessage.hpp"
 #include "arrowutils.hpp"
+#include "exceptions/gribexception.hpp"
 
 
 
@@ -238,17 +239,40 @@ using namespace std;
  string GribMessage::getStringParameter(string parameterName) {
  size_t parameterNameLength;
  auto parameterNameC = parameterName.c_str();
- codes_get_length(h, parameterNameC, &parameterNameLength);
+ auto err = codes_get_length(h, parameterNameC, &parameterNameLength);
+ if(err !=0 ) {
+ std::ostringstream oss;
+ oss << "Error calling codes_get_length whilst trying to access string key with name " <<
+ parameterName << "got error code " << err
+ << " whilst processing file " << _reader->getFilePath();
+
+ throw GribException (oss.str());
+ }
  auto short_name = new char[parameterNameLength];
- codes_get_string(h, parameterNameC, short_name, &parameterNameLength);
+ err = codes_get_string(h, parameterNameC, short_name, &parameterNameLength);
+ if(err !=0 ) {
+ std::ostringstream oss;
+ oss << "Error calling codes_get_string whilst trying to access string key with name " <<
+ parameterName << "got error code " << err
+ << " whilst processing file " << _reader->getFilePath();
+
+ throw GribException (oss.str());
+ }
  string short_name_std = short_name;
  delete [] short_name;
  return short_name_std;
  }
 
  long GribMessage::getNumericParameter(string parameterName) {
  long parameterId;
- codes_get_long(h, parameterName.c_str(), &parameterId);
+ auto err = codes_get_long(h, parameterName.c_str(), &parameterId);
+ if(err !=0 ) {
+ std::ostringstream oss;
+ oss << "Error calling codes_get_double got error code " << err
+ << " whilst processing file " << _reader->getFilePath();
+
+ throw GribException (oss.str());
+ }
  return parameterId;
  }
 
@@ -260,7 +284,14 @@ using namespace std;
 
  double GribMessage::getDoubleParameter(string parameterName) {
  double parameterId;
- codes_get_double(h, parameterName.c_str(), &parameterId);
+ auto err = codes_get_double(h, parameterName.c_str(), &parameterId);
+ if(err !=0 ) {
+ std::ostringstream oss;
+ oss << "Error calling codes_get_double got error code " << err
+ << " whilst processing file " << _reader->getFilePath();
+
+ throw GribException (oss.str());
+ }
  return parameterId;
  }
 

src/gribreader.cpp

@@ -30,6 +30,7 @@
 #include "exceptions/arrowgenericexception.hpp"
 #include "exceptions/invalidcsvexception.hpp"
 #include "exceptions/invalidschemaexception.hpp"
+#include "exceptions/gribexception.hpp"
 
 using namespace std;
 namespace cp = arrow::compute;
@@ -340,6 +341,15 @@ Iterator GribReader::begin() {
  if (!isExhausted || isRepeatable) {
  std::cout << "Creating iterator" << endl;
  codes_handle* h = codes_handle_new_from_file(0, fin, PRODUCT_GRIB, &err);
+ std::cout << "handle is " << h << std::endl;
+ if(h == nullptr || h == NULL || err != 0) {
+
+ std::ostringstream oss;
+ oss << "Error calling codes_handle_new_from_file got error code " << err
+ << " whilst processing file " << filepath;
+
+ throw GribException (oss.str());
+ }
  auto m = new GribMessage(this, h, 0l);
  return Iterator(this, m, m_endMessage);
  } else {
@@ -484,3 +494,7 @@ arrow::Result<std::shared_ptr<arrow::Array>> GribReader::createSurrogateKeyCol(l
 void GribReader::setExhausted(bool status) {
  isExhausted = status;
 }
+
+std::string GribReader::getFilePath() {
+ return filepath;
+}

src/gribreader.hpp

@@ -48,6 +48,7 @@ class GribReader
  GribLocationData* addLocationDataToCache(std::unique_ptr<GridArea>& area, GribLocationData* locationData);
 
  void setExhausted(bool status);
+ std::string getFilePath();
 
  private:
  string filepath;

tests/test_dodgy_file.py

@@ -0,0 +1,13 @@
+import polars as pl
+import pytest
+
+
+class TestDodgyFile:
+ def test_compressed_file(self, resource):
+ import gribtoarrow
+
+ #Since the file is compressed externally we can't read it
+ reader = gribtoarrow.GribReader(str(resource) + "/meps_weatherapi_sorlandet.grb.bz2")
+
+ with pytest.raises(gribtoarrow.GribException):
+ iter(reader)