Skip to content

Open Source alternative to Algolia + Pinecone and an Easier-to-Use alternative to ElasticSearch ⚡ 🔍 ✨ Fast, typo tolerant, in-memory fuzzy Search Engine for building delightful search experiences

Remove system_prompt parameter and add it to conversation models & support excluding conversation history

ozanarmagan822cb9c2cdd8
diff --git a/include/collection.h b/include/collection.h
index 7a5b3ffd..78f5921d 100644
--- a/include/collection.h
+++ b/include/collection.h
@@ -529,7 +529,6 @@ public:
const bool group_missing_values = true,
const bool converstaion = false,
const int conversation_model_id = -1,
- const std::string& system_prompt = "",
std::string conversation_id = "") const;
Option<bool> get_filter_ids(const std::string & filter_query, filter_result_t& filter_result) const;
diff --git a/include/conversation_model.h b/include/conversation_model.h
index 24644564..97458384 100644
--- a/include/conversation_model.h
+++ b/include/conversation_model.h
@@ -9,7 +9,7 @@
class ConversationModel {
public:
virtual ~ConversationModel() {};
- static Option<std::string> get_answer(const std::string& context, const std::string& prompt, const std::string& system_prompt, const nlohmann::json& model_config);
+ static Option<std::string> get_answer(const std::string& context, const std::string& prompt, const nlohmann::json& model_config);
static Option<nlohmann::json> parse_conversation_history(const nlohmann::json& conversation, const nlohmann::json& model_config);
static Option<bool> validate_model(const nlohmann::json& model_config);
static Option<std::string> get_standalone_question(const nlohmann::json& conversation_history, const std::string& question, const nlohmann::json& model_config);
diff --git a/src/collection.cpp b/src/collection.cpp
index bf5c03ae..3f714e2a 100644
--- a/src/collection.cpp
+++ b/src/collection.cpp
@@ -1416,7 +1416,6 @@ Option<nlohmann::json> Collection::search(std::string raw_query,
const bool group_missing_values,
const bool conversation,
const int conversation_model_id,
- const std::string& system_prompt,
std::string conversation_id) const {
std::shared_lock lock(mutex);
@@ -2414,7 +2413,7 @@ Option<nlohmann::json> Collection::search(std::string raw_query,
auto conversation_model = ConversationModelManager::get_model(conversation_model_id).get();
bool has_conversation_history = !conversation_id.empty();
- auto qa_op = ConversationModel::get_answer(docs_array.dump(0), raw_query, system_prompt, conversation_model);
+ auto qa_op = ConversationModel::get_answer(docs_array.dump(0), raw_query, conversation_model);
if(!qa_op.ok()) {
return Option<nlohmann::json>(qa_op.code(), qa_op.error());
}
@@ -2440,8 +2439,9 @@ Option<nlohmann::json> Collection::search(std::string raw_query,
}
auto conversation_history = get_conversation_op.get();
-
- result["conversation"]["conversation_history"] = conversation_history;
+ if(exclude_fields.count("conversation_history") == 0) {
+ result["conversation"]["conversation_history"] = conversation_history;
+ }
result["conversation"]["conversation_id"] = conversation_id;
} else {
nlohmann::json conversation_history = nlohmann::json::array();
@@ -2458,7 +2458,9 @@ Option<nlohmann::json> Collection::search(std::string raw_query,
return Option<nlohmann::json>(get_conversation_op.code(), get_conversation_op.error());
}
- result["conversation"]["conversation_history"] = get_conversation_op.get();
+ if(exclude_fields.count("conversation_history") == 0) {
+ result["conversation"]["conversation_history"] = get_conversation_op.get();
+ }
result["conversation"]["conversation_id"] = create_conversation_op.get();
}
}
@@ -5816,6 +5818,10 @@ Option<bool> Collection::populate_include_exclude_fields(const spp::sparse_hash_
continue;
}
+ if(f_name == "conversation_history") {
+ continue;
+ }
+
auto field_op = extract_field_name(f_name, search_schema, exclude_fields_vec, false, enable_nested_fields, true, true);
if(!field_op.ok()) {
if(field_op.code() == 404) {
diff --git a/src/collection_manager.cpp b/src/collection_manager.cpp
index 6e33db86..9c487409 100644
--- a/src/collection_manager.cpp
+++ b/src/collection_manager.cpp
@@ -1247,7 +1247,6 @@ Option<bool> CollectionManager::do_search(std::map<std::string, std::string>& re
bool conversation = false;
std::string conversation_id;
- std::string system_prompt;
size_t conversation_model_id = std::numeric_limits<size_t>::max();
std::string drop_tokens_mode_str = "right_to_left";
@@ -1291,7 +1290,6 @@ Option<bool> CollectionManager::do_search(std::map<std::string, std::string>& re
{HIGHLIGHT_END_TAG, &highlight_end_tag},
{PINNED_HITS, &pinned_hits_str},
{HIDDEN_HITS, &hidden_hits_str},
- {SYSTEM_PROMPT, &system_prompt},
{CONVERSATION_ID, &conversation_id},
{DROP_TOKENS_MODE, &drop_tokens_mode_str},
};
@@ -1513,7 +1511,6 @@ Option<bool> CollectionManager::do_search(std::map<std::string, std::string>& re
group_missing_values,
conversation,
(conversation_model_id == std::numeric_limits<size_t>::max()) ? -1 : static_cast<int>(conversation_model_id),
- system_prompt,
conversation_id);
diff --git a/src/conversation_model.cpp b/src/conversation_model.cpp
index cab826fb..70a1d8f2 100644
--- a/src/conversation_model.cpp
+++ b/src/conversation_model.cpp
@@ -18,6 +18,10 @@ Option<bool> ConversationModel::validate_model(const nlohmann::json& model_confi
return Option<bool>(400, "Property `model_name` is not provided or not a string.");
}
+ if(model_config.count("system_prompt") != 0 && !model_config["system_prompt"].is_string()) {
+ return Option<bool>(400, "Property `system_prompt` is not a string.");
+ }
+
const std::string model_namespace = get_model_namespace(model_config["model_name"].get<std::string>());
if(model_namespace == "openai") {
return OpenAIConversationModel::validate_model(model_config);
@@ -26,11 +30,11 @@ Option<bool> ConversationModel::validate_model(const nlohmann::json& model_confi
return Option<bool>(400, "Model namespace `" + model_namespace + "` is not supported.");
}
-Option<std::string> ConversationModel::get_answer(const std::string& context, const std::string& prompt,
- const std::string& system_prompt, const nlohmann::json& model_config) {
+Option<std::string> ConversationModel::get_answer(const std::string& context, const std::string& prompt, const nlohmann::json& model_config) {
- const std::string model_namespace = get_model_namespace(model_config["model_name"].get<std::string>());
+ const std::string& model_namespace = get_model_namespace(model_config["model_name"].get<std::string>());
+ const std::string& system_prompt = model_config["system_prompt"].get<std::string>();
if(model_namespace == "openai") {
return OpenAIConversationModel::get_answer(context, prompt, system_prompt, model_config);
diff --git a/src/core_api.cpp b/src/core_api.cpp
index 9467bc22..0adbe342 100644
--- a/src/core_api.cpp
+++ b/src/core_api.cpp
@@ -730,9 +730,8 @@ bool post_multi_search(const std::shared_ptr<http_req>& req, const std::shared_p
auto conversation_model = ConversationModelManager::get_model(conversation_model_id).get();
auto prompt = req->params["q"];
- auto system_prompt = req->params["system_prompt"];
- auto answer_op = ConversationModel::get_answer(result_docs.dump(0), prompt, system_prompt, conversation_model);
+ auto answer_op = ConversationModel::get_answer(result_docs.dump(0), prompt, conversation_model);
if(!answer_op.ok()) {
res->set_400(answer_op.error());
@@ -756,8 +755,11 @@ bool post_multi_search(const std::shared_ptr<http_req>& req, const std::shared_p
return false;
}
+ std::vector<std::string> exclude_fields;
+ StringUtils::split(req->params["exclude_fields"], exclude_fields, ",");
+ bool exclude_conversation_history = std::find(exclude_fields.begin(), exclude_fields.end(), "conversation_history") != exclude_fields.end();
+
if(conversation_history) {
- LOG(INFO) << "Appending to conversation history.";
std::string conversation_id = orig_req_params["conversation_id"];
ConversationManager::append_conversation(conversation_id, formatted_question_op.get());
ConversationManager::append_conversation(conversation_id, formatted_answer_op.get());
@@ -768,8 +770,9 @@ bool post_multi_search(const std::shared_ptr<http_req>& req, const std::shared_p
}
auto conversation_history = get_conversation_op.get();
-
- response["conversation"]["conversation_history"] = conversation_history;
+ if(!exclude_conversation_history) {
+ response["conversation"]["conversation_history"] = conversation_history;
+ }
response["conversation"]["conversation_id"] = conversation_id;
} else {
nlohmann::json conversation_history = nlohmann::json::array();
@@ -787,8 +790,9 @@ bool post_multi_search(const std::shared_ptr<http_req>& req, const std::shared_p
res->set_400(get_conversation_op.error());
return false;
}
-
- response["conversation"]["conversation_history"] = get_conversation_op.get();
+ if(!exclude_conversation_history) {
+ response["conversation"]["conversation_history"] = get_conversation_op.get();
+ }
response["conversation"]["conversation_id"] = create_conversation_op.get();
}