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

Use ternary operator for model key

ozanarmagan2d855a9f0ae4
diff --git a/src/text_embedder_manager.cpp b/src/text_embedder_manager.cpp
index 8b34b949..489fd208 100644
--- a/src/text_embedder_manager.cpp
+++ b/src/text_embedder_manager.cpp
@@ -43,13 +43,9 @@ Option<bool> TextEmbedderManager::validate_and_init_remote_model(const nlohmann:
}
std::unique_lock<std::mutex> lock(text_embedders_mutex);
- std::string model_key = model_name;
- if(is_remote_model(model_name)) {
- model_key = RemoteEmbedder::get_model_key(model_config);
- }
- auto text_embedder_it = text_embedders.find(model_key);
+ auto text_embedder_it = text_embedders.find(is_remote_model(model_name) ? RemoteEmbedder::get_model_key(model_config) : model_name);
if(text_embedder_it == text_embedders.end()) {
- text_embedders.emplace(model_key, std::make_shared<TextEmbedder>(model_config, num_dims));
+ text_embedders.emplace(is_remote_model(model_name) ? RemoteEmbedder::get_model_key(model_config) : model_name, std::make_shared<TextEmbedder>(model_config, num_dims));
}
return Option<bool>(true);
@@ -126,11 +122,7 @@ Option<bool> TextEmbedderManager::validate_and_init_local_model(const nlohmann::
Option<TextEmbedder*> TextEmbedderManager::get_text_embedder(const nlohmann::json& model_config) {
std::unique_lock<std::mutex> lock(text_embedders_mutex);
const std::string& model_name = model_config.at("model_name");
- std::string model_key = model_name;
- if(is_remote_model(model_name)) {
- model_key = RemoteEmbedder::get_model_key(model_config);
- }
- auto text_embedder_it = text_embedders.find(model_key);
+ auto text_embedder_it = text_embedders.find(is_remote_model(model_name) ? RemoteEmbedder::get_model_key(model_config) : model_name);
if(text_embedder_it == text_embedders.end()) {
return Option<TextEmbedder*>(404, "Text embedder was not found.");
diff --git a/src/text_embedder_remote.cpp b/src/text_embedder_remote.cpp
index a7a745e0..06a53a65 100644
--- a/src/text_embedder_remote.cpp
+++ b/src/text_embedder_remote.cpp
@@ -649,7 +649,5 @@ Option<std::string> GCPEmbedder::generate_access_token(const std::string& refres
}
std::string GCPEmbedder::get_model_key(const nlohmann::json& model_config) {
- return model_config["model_name"].get<std::string>() + ":" + model_config["project_id"].get<std::string>() + ":"
- + model_config["access_token"].get<std::string>() + ":" + model_config["refresh_token"].get<std::string>() + ":"
- + model_config["client_id"].get<std::string>() + ":" + model_config["client_secret"].get<std::string>();
+ return model_config["model_name"].get<std::string>() + ":" + model_config["project_id"].get<std::string>() + ":" + model_config["client_secret"].get<std::string>();
}
\ No newline at end of file