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
Add tests & add validate_and_init_embed_field
ozanarmagan16a553dd3e0b
diff --git a/include/field.h b/include/field.hindex d34d32ae..908c0cc9 100644--- a/include/field.h+++ b/include/field.h@@ -424,6 +424,11 @@ struct field {std::string& fallback_field_type,std::vector<field>& the_fields);+ static Option<bool> validate_and_init_embed_field(const tsl::htrie_map<char, field>& search_schema,+ nlohmann::json& field_json,+ const nlohmann::json& fields_json,+ field& the_field);+static Option<bool> validate_and_init_embed_fields(const std::vector<std::pair<size_t, size_t>>& embed_json_field_indices,const tsl::htrie_map<char, field>& search_schema,nlohmann::json& fields_json,diff --git a/src/collection.cpp b/src/collection.cppindex 6168c8f7..960ce266 100644--- a/src/collection.cpp+++ b/src/collection.cpp@@ -4252,6 +4252,14 @@ Option<bool> Collection::validate_alter_payload(nlohmann::json& schema_changes,updated_search_schema[f.name] = f;}+ if(!f.embed.empty() && !diff_fields.empty()) {+ auto validate_res = field::validate_and_init_embed_field(search_schema, schema_changes["fields"][json_array_index], schema_changes["fields"], diff_fields.back());++ if(!validate_res.ok()) {+ return validate_res;+ }+ }+if(is_reindex) {reindex_fields.push_back(f);} else {@@ -4286,9 +4294,7 @@ Option<bool> Collection::validate_alter_payload(nlohmann::json& schema_changes,}}- if(!f.embed.empty() && !diff_fields.empty()) {- embed_json_field_indices.emplace_back(json_array_index, diff_fields.size()-1);- }+} else {// partial update is not supported for now@@ -4297,9 +4303,6 @@ Option<bool> Collection::validate_alter_payload(nlohmann::json& schema_changes,}}}-- auto validation_op = field::validate_and_init_embed_fields(embed_json_field_indices, search_schema,- schema_changes["fields"], diff_fields);for(auto index : embed_json_field_indices) {auto& field = diff_fields[index.second];@@ -4321,9 +4324,6 @@ Option<bool> Collection::validate_alter_payload(nlohmann::json& schema_changes,}}- if(!validation_op.ok()) {- return validation_op;- }if(num_auto_detect_fields > 1) {return Option<bool>(400, "There can be only one field named `.*`.");diff --git a/src/field.cpp b/src/field.cppindex 3c4d2e1c..6a3151ae 100644--- a/src/field.cpp+++ b/src/field.cpp@@ -1083,7 +1083,7 @@ void field::compact_nested_fields(tsl::htrie_map<char, field>& nested_fields) {Option<bool> field::json_fields_to_fields(bool enable_nested_fields, nlohmann::json &fields_json, string &fallback_field_type,std::vector<field>& the_fields) {size_t num_auto_detect_fields = 0;- std::vector<std::pair<size_t, size_t>> embed_json_field_indices;+ const tsl::htrie_map<char, field> dummy_search_schema;for(size_t i = 0; i < fields_json.size(); i++) {nlohmann::json& field_json = fields_json[i];@@ -1094,17 +1094,13 @@ Option<bool> field::json_fields_to_fields(bool enable_nested_fields, nlohmann::j}if(!the_fields.empty() && !the_fields.back().embed.empty()) {- embed_json_field_indices.emplace_back(i, the_fields.size()-1);+ auto validate_res = validate_and_init_embed_field(dummy_search_schema, field_json, fields_json, the_fields.back());+ if(!validate_res.ok()) {+ return validate_res;+ }}}- const tsl::htrie_map<char, field> dummy_search_schema;- auto validation_op = field::validate_and_init_embed_fields(embed_json_field_indices, dummy_search_schema,- fields_json, the_fields);- if(!validation_op.ok()) {- return validation_op;- }-if(num_auto_detect_fields > 1) {return Option<bool>(400,"There can be only one field named `.*`.");}@@ -1112,6 +1108,46 @@ Option<bool> field::json_fields_to_fields(bool enable_nested_fields, nlohmann::jreturn Option<bool>(true);}+Option<bool> field::validate_and_init_embed_field(const tsl::htrie_map<char, field>& search_schema, nlohmann::json& field_json,+ const nlohmann::json& fields_json,+ field& the_field) {+ const std::string err_msg = "Property `" + fields::embed + "." + fields::from ++ "` can only refer to string or string array fields.";++ for(auto& field_name : field_json[fields::embed][fields::from].get<std::vector<std::string>>()) {++ auto embed_field = std::find_if(fields_json.begin(), fields_json.end(), [&field_name](const nlohmann::json& x) {+ return x["name"].get<std::string>() == field_name;+ });+++ if(embed_field == fields_json.end()) {+ const auto& embed_field2 = search_schema.find(field_name);+ if (embed_field2 == search_schema.end()) {+ return Option<bool>(400, err_msg);+ } else if (embed_field2->type != field_types::STRING && embed_field2->type != field_types::STRING_ARRAY) {+ return Option<bool>(400, err_msg);+ }+ } else if((*embed_field)[fields::type] != field_types::STRING &&+ (*embed_field)[fields::type] != field_types::STRING_ARRAY) {+ return Option<bool>(400, err_msg);+ }+ }++ const auto& model_config = field_json[fields::embed][fields::model_config];+ size_t num_dim = 0;+ auto res = TextEmbedderManager::get_instance().validate_and_init_model(model_config, num_dim);+ if(!res.ok()) {+ return Option<bool>(res.code(), res.error());+ }++ LOG(INFO) << "Model init done.";+ field_json[fields::num_dim] = num_dim;+ the_field.num_dim = num_dim;++ return Option<bool>(true);+}+Option<bool> field::validate_and_init_embed_fields(const std::vector<std::pair<size_t, size_t>>& embed_json_field_indices,const tsl::htrie_map<char, field>& search_schema,nlohmann::json& fields_json,diff --git a/test/collection_schema_change_test.cpp b/test/collection_schema_change_test.cppindex 0d8364fd..c936ce78 100644--- a/test/collection_schema_change_test.cpp+++ b/test/collection_schema_change_test.cpp@@ -1566,6 +1566,14 @@ TEST_F(CollectionSchemaChangeTest, UpdateSchemaWithNewEmbeddingField) {ASSERT_TRUE(res.ok());ASSERT_EQ(1, coll->get_embedding_fields().size());+ auto search_schema = coll->get_schema();++ auto embedding_field_it = search_schema.find("embedding");+ ASSERT_TRUE(embedding_field_it != coll->get_schema().end());+ ASSERT_EQ("embedding", embedding_field_it.value().name);+ ASSERT_EQ("float[]", embedding_field_it.value().type);+ ASSERT_EQ(384, embedding_field_it.value().num_dim);+nlohmann::json doc;doc["names"] = {"hello", "world"};auto add_op = coll->add(doc.dump());diff --git a/test/collection_vector_search_test.cpp b/test/collection_vector_search_test.cppindex ddd5a16f..4b77bb95 100644--- a/test/collection_vector_search_test.cpp+++ b/test/collection_vector_search_test.cpp@@ -1718,4 +1718,41 @@ TEST_F(CollectionVectorTest, TestDifferentOpenAIApiKeys) {ASSERT_NE(embedder_map.find("openai/text-embedding-ada-002:" + api_key1), embedder_map.end());ASSERT_NE(embedder_map.find("openai/text-embedding-ada-002:" + api_key2), embedder_map.end());ASSERT_EQ(embedder_map.find("openai/text-embedding-ada-002"), embedder_map.end());+}+++TEST_F(CollectionVectorTest, TestMultilingualE5) {+ auto schema_json =+ R"({+ "name": "TEST",+ "fields": [+ {"name": "name", "type": "string"},+ {"name": "embedding", "type":"float[]", "embed":{"from": ["name"], "model_config": {"model_name": "ts/multilingual-e5-small"}}}+ ]+ })"_json;++ TextEmbedderManager::set_model_dir("/tmp/typesense_test/models");++ auto collection_create_op = collectionManager.create_collection(schema_json);++ ASSERT_TRUE(collection_create_op.ok());+ auto coll1 = collection_create_op.get();++ auto add_op = coll1->add(R"({+ "name": "john doe"+ })"_json.dump());++ auto hybrid_results = coll1->search("john", {"name", "embedding"},+ "", {}, {}, {2}, 10,+ 1, FREQUENCY, {true},+ 0, spp::sparse_hash_set<std::string>());++ ASSERT_TRUE(hybrid_results.ok());++ auto semantic_results = coll1->search("john", {"embedding"},+ "", {}, {}, {2}, 10,+ 1, FREQUENCY, {true},+ 0, spp::sparse_hash_set<std::string>());++ ASSERT_TRUE(semantic_results.ok());}\ No newline at end of file