Add specific exception for invalid JSON.

jmont-dev · Aug 15, 2024 · d93a7b3 · d93a7b3
1 parent a97aa99
commit d93a7b3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/include/ollama.hpp b/include/ollama.hpp
@@ -95,6 +95,8 @@ namespace ollama
         const char* what() const noexcept override { return message.c_str(); }
     };
 
+    class invalid_json_exception : public ollama::exception { public: using exception::exception; };
+
     class image {
         public:
             image(const std::string base64_sequence, bool valid = true) 
@@ -304,7 +306,7 @@ namespace ollama
 
                     if ( json_data.contains("error") ) error_string =json_data["error"].get<std::string>();
                 }
-                catch(...) { if (ollama::use_exceptions) throw new ollama::exception("Unable to parse JSON string:"+this->json_string); valid = false; }
+                catch(...) { if (ollama::use_exceptions) throw ollama::invalid_json_exception("Unable to parse JSON string:"+this->json_string); valid = false; }
             }
 
             response() {json_string = ""; valid = false;}
@@ -437,7 +439,7 @@ class Ollama
                 partial_responses->clear();  
                 on_receive_token(response); 
             }
-            catch (...) { /* Partial response was received. Will do nothing and attempt to concatenate with the next response. */ }
+            catch (const ollama::invalid_json_exception& e) { /* Partial response was received. Will do nothing and attempt to concatenate with the next response. */ }
 
             return true;
         };

diff --git a/singleheader/ollama.hpp b/singleheader/ollama.hpp
@@ -34885,6 +34885,8 @@ namespace ollama
         const char* what() const noexcept override { return message.c_str(); }
     };
 
+    class invalid_json_exception : public ollama::exception { public: using exception::exception; };
+
     class image {
         public:
             image(const std::string base64_sequence, bool valid = true) 
@@ -35094,7 +35096,7 @@ namespace ollama
 
                     if ( json_data.contains("error") ) error_string =json_data["error"].get<std::string>();
                 }
-                catch(...) { if (ollama::use_exceptions) throw new ollama::exception("Unable to parse JSON string:"+this->json_string); valid = false; }
+                catch(...) { if (ollama::use_exceptions) throw ollama::invalid_json_exception("Unable to parse JSON string:"+this->json_string); valid = false; }
             }
 
             response() {json_string = ""; valid = false;}
@@ -35227,7 +35229,7 @@ class Ollama
                 partial_responses->clear();  
                 on_receive_token(response); 
             }
-            catch (...) { /* Partial response was received. Will do nothing and attempt to concatenate with the next response. */ }
+            catch (const ollama::invalid_json_exception& e) { /* Partial response was received. Will do nothing and attempt to concatenate with the next response. */ }
 
             return true;
         };