From d93a7b33e962392e37747ad48e7fdcf6aa2d92c7 Mon Sep 17 00:00:00 2001
From: James Montgomery <James.Brian.Montgomery@gmail.com>
Date: Wed, 14 Aug 2024 21:51:53 -0400
Subject: [PATCH 1/2] Add specific exception for invalid JSON.
---
include/ollama.hpp | 6 ++++--
singleheader/ollama.hpp | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/include/ollama.hpp b/include/ollama.hpp
index 1e4cce5..d3a3e15 100644
--- 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
index 5325a59..750ac9e 100644
--- 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;
};
From 56a0b6b39aeeae8b4eaf745b5f25c1863371d8f0 Mon Sep 17 00:00:00 2001
From: James Montgomery <James.Brian.Montgomery@gmail.com>
Date: Thu, 15 Aug 2024 00:23:06 -0400
Subject: [PATCH 2/2] Update chat to handle partial messages from streaming
replies.
---
include/ollama.hpp | 18 ++++++++++++++----
singleheader/ollama.hpp | 18 ++++++++++++++----
2 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/include/ollama.hpp b/include/ollama.hpp
index d3a3e15..2cd8e73 100644
--- a/include/ollama.hpp
+++ b/include/ollama.hpp
@@ -495,13 +495,23 @@ class Ollama
std::string request_string = request.dump();
if (ollama::log_requests) std::cout << request_string << std::endl;
- auto stream_callback = [on_receive_token](const char *data, size_t data_length)->bool{
+ std::shared_ptr<std::vector<std::string>> partial_responses = std::make_shared<std::vector<std::string>>();
+
+ auto stream_callback = [on_receive_token, partial_responses](const char *data, size_t data_length)->bool{
std::string message(data, data_length);
if (ollama::log_replies) std::cout << message << std::endl;
- ollama::response response(message, ollama::message_type::chat);
- if ( response.has_error() ) { if (ollama::use_exceptions) throw ollama::exception("Ollama response returned error: "+response.get_error() ); }
- on_receive_token(response);
+ try
+ {
+ partial_responses->push_back(message);
+ std::string total_response = std::accumulate(partial_responses->begin(), partial_responses->end(), std::string(""));
+ ollama::response response(total_response, ollama::message_type::chat);
+ partial_responses->clear();
+
+ if ( response.has_error() ) { if (ollama::use_exceptions) throw ollama::exception("Ollama response returned error: "+response.get_error() ); }
+ on_receive_token(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
index 750ac9e..3f68add 100644
--- a/singleheader/ollama.hpp
+++ b/singleheader/ollama.hpp
@@ -35285,13 +35285,23 @@ class Ollama
std::string request_string = request.dump();
if (ollama::log_requests) std::cout << request_string << std::endl;
- auto stream_callback = [on_receive_token](const char *data, size_t data_length)->bool{
+ std::shared_ptr<std::vector<std::string>> partial_responses = std::make_shared<std::vector<std::string>>();
+
+ auto stream_callback = [on_receive_token, partial_responses](const char *data, size_t data_length)->bool{
std::string message(data, data_length);
if (ollama::log_replies) std::cout << message << std::endl;
- ollama::response response(message, ollama::message_type::chat);
- if ( response.has_error() ) { if (ollama::use_exceptions) throw ollama::exception("Ollama response returned error: "+response.get_error() ); }
- on_receive_token(response);
+ try
+ {
+ partial_responses->push_back(message);
+ std::string total_response = std::accumulate(partial_responses->begin(), partial_responses->end(), std::string(""));
+ ollama::response response(total_response, ollama::message_type::chat);
+ partial_responses->clear();
+
+ if ( response.has_error() ) { if (ollama::use_exceptions) throw ollama::exception("Ollama response returned error: "+response.get_error() ); }
+ on_receive_token(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;
};