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
C++ algoliadatastoreelasticsearchenterprise-searchfacetingfull-text-searchfuzzy-searchgeosearchin-memoryinstantsearchmerchandisingpineconesearchsearch-enginesemantic-searchsimilarity-searchsite-searchsynonymstypo-tolerancevector-search
Dynamic model existence check for Cloudflare models + bug fix (#1744)
Ozan Armağan4c8a3f18ec39
diff --git a/src/conversation_model.cpp b/src/conversation_model.cppindex 068deadf..1bef50eb 100644--- a/src/conversation_model.cpp+++ b/src/conversation_model.cpp@@ -40,7 +40,7 @@ Option<bool> ConversationModel::validate_model(const nlohmann::json& model_conficonst std::string model_namespace = get_model_namespace(model_config["model_name"].get<std::string>());if(model_namespace == "openai") {return OpenAIConversationModel::validate_model(model_config);- } else if(model_namespace == "cf") {+ } else if(model_namespace == "cloudflare") {return CFConversationModel::validate_model(model_config);} else if(model_namespace == "vllm") {return vLLMConversationModel::validate_model(model_config);@@ -60,7 +60,7 @@ Option<std::string> ConversationModel::get_answer(const std::string& context, coif(model_namespace == "openai") {return OpenAIConversationModel::get_answer(context, prompt, system_prompt, model_config);- } else if(model_namespace == "cf") {+ } else if(model_namespace == "cloudflare") {return CFConversationModel::get_answer(context, prompt, system_prompt, model_config);} else if(model_namespace == "vllm") {return vLLMConversationModel::get_answer(context, prompt, system_prompt, model_config);@@ -74,7 +74,7 @@ Option<std::string> ConversationModel::get_standalone_question(const nlohmann::jif(model_namespace == "openai") {return OpenAIConversationModel::get_standalone_question(conversation_history, question, model_config);- } else if(model_namespace == "cf") {+ } else if(model_namespace == "cloudflare") {return CFConversationModel::get_standalone_question(conversation_history, question, model_config);} else if(model_namespace == "vllm") {return vLLMConversationModel::get_standalone_question(conversation_history, question, model_config);@@ -88,7 +88,7 @@ Option<nlohmann::json> ConversationModel::format_question(const std::string& mesif(model_namespace == "openai") {return OpenAIConversationModel::format_question(message);- } else if(model_namespace == "cf") {+ } else if(model_namespace == "cloudflare") {return CFConversationModel::format_question(message);} else if(model_namespace == "vllm") {return vLLMConversationModel::format_question(message);@@ -102,7 +102,7 @@ Option<nlohmann::json> ConversationModel::format_answer(const std::string& messaif(model_namespace == "openai") {return OpenAIConversationModel::format_answer(message);- } else if(model_namespace == "cf") {+ } else if(model_namespace == "cloudflare") {return CFConversationModel::format_answer(message);} else if(model_namespace == "vllm") {return vLLMConversationModel::format_answer(message);@@ -116,7 +116,7 @@ Option<size_t> ConversationModel::get_minimum_required_bytes(const nlohmann::jsoif(model_namespace == "openai") {return Option<size_t>(OpenAIConversationModel::get_minimum_required_bytes());- } else if(model_namespace == "cf") {+ } else if(model_namespace == "cloudflare") {return Option<size_t>(CFConversationModel::get_minimum_required_bytes());} else if(model_namespace == "vllm") {return Option<size_t>(vLLMConversationModel::get_minimum_required_bytes());@@ -369,7 +369,7 @@ Option<nlohmann::json> OpenAIConversationModel::format_answer(const std::string&}const std::string CFConversationModel::get_model_url(const std::string& model_name, const std::string& account_id) {- return "https://api.cloudflare.com/client/v4/accounts/" + account_id + "/ai/run/@cf/" + model_name;+ return "https://api.cloudflare.com/client/v4/accounts/" + account_id + "/ai/run/" + model_name;}Option<bool> CFConversationModel::validate_model(const nlohmann::json& model_config) {@@ -393,17 +393,6 @@ Option<bool> CFConversationModel::validate_model(const nlohmann::json& model_conbool found = false;- for(auto& cf_model_name : CF_MODEL_NAMES) {- if(cf_model_name == model_name) {- found = true;- break;- }- }-- if(!found) {- return Option<bool>(400, "Model name is not a valid Cloudflare model");- }-std::unordered_map<std::string, std::string> headers;std::map<std::string, std::string> res_headers;headers["Authorization"] = "Bearer " + model_config["api_key"].get<std::string>();@@ -554,7 +543,7 @@ Option<std::string> CFConversationModel::get_standalone_question(const nlohmann:auto res_code = RemoteEmbedder::call_remote_api("POST_STREAM", url, req_body.dump(), res, res_headers, headers);if(res_code == 408) {- return Option<std::string>(400, "OpenAI API timeout.");+ return Option<std::string>(400, "Cloudflare API timeout.");}if (res_code != 200) {@@ -573,30 +562,7 @@ Option<std::string> CFConversationModel::get_standalone_question(const nlohmann:return Option<std::string>(400, "Cloudflare API error: " + json_res["message"].get<std::string>());}- try {- auto json_res = nlohmann::json::parse(res);- std::string parsed_response = "";- std::vector<std::string> lines = json_res["response"].get<std::vector<std::string>>();- for(auto& line : lines) {- while(line.find("data:") != std::string::npos) {- auto substr_line = line.substr(line.find("data:") + 6);- if(substr_line.find("[DONE]") != std::string::npos) {- break;- }- nlohmann::json json_line;- if(substr_line.find("\n") != std::string::npos) {- json_line = nlohmann::json::parse(substr_line.substr(0, substr_line.find("\n")));- } else {- json_line = nlohmann::json::parse(substr_line);- }- parsed_response += json_line["response"];- line = substr_line;- }- }- return Option<std::string>(parsed_response);- } catch (const std::exception& e) {- return Option<std::string>(400, "Got malformed response from Cloudflare API.");- }+ return parse_stream_response(res);}Option<nlohmann::json> CFConversationModel::format_question(const std::string& message) {diff --git a/src/conversation_model_manager.cpp b/src/conversation_model_manager.cppindex e2b8da8e..562034dd 100644--- a/src/conversation_model_manager.cpp+++ b/src/conversation_model_manager.cpp@@ -115,7 +115,22 @@ Option<int> ConversationModelManager::init(Store* store) {for(auto& model_str : model_strs) {nlohmann::json model_json = nlohmann::json::parse(model_str);std::string model_id = model_json["id"];- models[model_id] = model_json;+ // Migrate cloudflare models to new namespace convention, change namespace from `cf` to `cloudflare`+ if(EmbedderManager::get_model_namespace(model_json["model_name"]) == "cf") {+ auto delete_op = delete_model(model_id);+ if(!delete_op.ok()) {+ return Option<int>(delete_op.code(), delete_op.error());+ }+ model_json["model_name"] = "cloudflare/" + EmbedderManager::get_model_name_without_namespace(model_json["model_name"]);+ auto add_res = add_model(model_json, model_id);+ if(!add_res.ok()) {+ return Option<int>(add_res.code(), add_res.error());+ }+ }++++ // Migrate models that don't have a conversation collectionif(model_json.count("conversation_collection") == 0) {auto delete_op = delete_model_unsafe(model_id);if(!delete_op.ok()) {@@ -127,6 +142,8 @@ Option<int> ConversationModelManager::init(Store* store) {}model_json = migrate_op.get();}++ models[model_id] = model_json;ConversationManager::get_instance().add_conversation_collection(model_json["conversation_collection"].get<std::string>());loaded_models++;}@@ -197,4 +214,4 @@ Option<nlohmann::json> ConversationModelManager::migrate_model(nlohmann::json moreturn Option<nlohmann::json>(add_res.code(), add_res.error());}return Option<nlohmann::json>(model);-}\ No newline at end of file+}