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
Merge branch 'v0.26-facets' into v0.26-facets
Ozan Armağan1ca6058abf4c
diff --cc include/collection.hindex 78f5921d,d8894eb3..34b79b28--- a/include/collection.h+++ b/include/collection.h@@@ -527,9 -544,7 +544,10 @@@ publicconst std::string& drop_tokens_mode = "right_to_left",const bool prioritize_num_matching_fields = true,const bool group_missing_values = true,+ const bool converstaion = false,+ const int conversation_model_id = -1,- std::string conversation_id = "") const;++ std::string conversation_id = "",+ const std::string& override_tags_str = "") const;Option<bool> get_filter_ids(const std::string & filter_query, filter_result_t& filter_result) const;diff --cc src/collection.cppindex 3f714e2a,bdea8cd7..47999e06--- a/src/collection.cpp+++ b/src/collection.cpp@@@ -1414,9 -1512,8 +1515,10 @@@ Option<nlohmann::json> Collection::searconst std::string& drop_tokens_mode,const bool prioritize_num_matching_fields,const bool group_missing_values,+ const bool conversation,+ const int conversation_model_id,- std::string conversation_id) const {++ std::string conversation_id,+ const std::string& override_tags_str) const {-std::shared_lock lock(mutex);// setup thread local varsdiff --cc src/collection_manager.cppindex 9c487409,053e8bd8..cc2657aa--- a/src/collection_manager.cpp+++ b/src/collection_manager.cpp@@@ -1116,13 -1115,9 +1116,14 @@@ Option<bool> CollectionManager::do_searconst char *FACET_SAMPLE_PERCENT = "facet_sample_percent";const char *FACET_SAMPLE_THRESHOLD = "facet_sample_threshold";+ const char *CONVERSATION = "conversation";+ const char *CONVERSATION_ID = "conversation_id";+ const char *SYSTEM_PROMPT = "system_prompt";+ const char *CONVERSATION_MODEL_ID = "conversation_model_id";+const char *DROP_TOKENS_MODE = "drop_tokens_mode";const char *PRIORITIZE_NUM_MATCHING_FIELDS = "prioritize_num_matching_fields";+ const char *OVERRIDE_TAGS = "override_tags";// enrich params with values from embedded paramsfor(auto& item: embedded_params.items()) {@@@ -1245,14 -1240,10 +1246,15 @@@size_t facet_sample_percent = 100;size_t facet_sample_threshold = 0;+ bool conversation = false;+ std::string conversation_id;+ size_t conversation_model_id = std::numeric_limits<size_t>::max();+std::string drop_tokens_mode_str = "right_to_left";bool prioritize_num_matching_fields = true;+ std::string override_tags;+std::unordered_map<std::string, size_t*> unsigned_int_values = {{MIN_LEN_1TYPO, &min_len_1typo},{MIN_LEN_2TYPO, &min_len_2typo},@@@ -1290,8 -1280,8 +1292,9 @@@{HIGHLIGHT_END_TAG, &highlight_end_tag},{PINNED_HITS, &pinned_hits_str},{HIDDEN_HITS, &hidden_hits_str},+ {CONVERSATION_ID, &conversation_id},{DROP_TOKENS_MODE, &drop_tokens_mode_str},+ {OVERRIDE_TAGS, &override_tags},};std::unordered_map<std::string, bool*> bool_values = {@@@ -1509,10 -1497,7 +1512,10 @@@drop_tokens_mode_str,prioritize_num_matching_fields,group_missing_values,+ conversation,+ (conversation_model_id == std::numeric_limits<size_t>::max()) ? -1 : static_cast<int>(conversation_model_id),- conversation_id);-++ conversation_id,+ override_tags);uint64_t timeMillis = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now() - begin).count();