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ğan9ebc16dd74c5
diff --cc include/collection.hindex 3c460349,4f8cd435..80f423f0--- a/include/collection.h+++ b/include/collection.h@@@ -495,10 -497,7 +497,11 @@@ publicconst size_t remote_embedding_num_tries = 2,const std::string& stopwords_set="",const std::vector<std::string>& facet_return_parent = {},+ const bool converstaion = false,+ const int conversation_model_id = -1,+ const std::string& system_prompt = "",- int conversation_id = -1) const;++ int conversation_id = -1,+ const std::vector<ref_include_fields>& ref_include_fields_vec = {}) const;Option<bool> get_filter_ids(const std::string & filter_query, filter_result_t& filter_result) const;diff --cc src/collection.cppindex 04d7f141,7496d680..10ddedb4--- a/src/collection.cpp+++ b/src/collection.cpp@@@ -1391,10 -1389,7 +1392,11 @@@ Option<nlohmann::json> Collection::searconst size_t remote_embedding_num_tries,const std::string& stopwords_set,const std::vector<std::string>& facet_return_parent,+ const bool conversation,+ const int conversation_model_id,+ const std::string& system_prompt,- int conversation_id) const {++ int conversation_id,+ const std::vector<ref_include_fields>& ref_include_fields_vec) const {std::shared_lock lock(mutex);diff --cc src/collection_manager.cppindex 5addcfa3,f7727688..535fdc77--- a/src/collection_manager.cpp+++ b/src/collection_manager.cpp@@@ -9,7 -9,7 +9,8 @@@#include "logger.h"#include "magic_enum.hpp"#include "stopwords_manager.h"+#include "conversation_model.h"+ #include "field.h"constexpr const size_t CollectionManager::DEFAULT_NUM_MEMORY_SHARDS;@@@ -1343,13 -1341,8 +1357,13 @@@ Option<bool> CollectionManager::do_searremote_embedding_num_tries,stopwords_set,facet_return_parent,+ conversation,+ (conversation_model_id == std::numeric_limits<size_t>::max()) ? -1 : static_cast<int>(conversation_model_id),+ system_prompt,- (conversation_id == std::numeric_limits<size_t>::max()) ? -1 : static_cast<int>(conversation_id)- );++ (conversation_id == std::numeric_limits<size_t>::max()) ? -1 : static_cast<int>(conversation_id),+ ref_include_fields_vec);+uint64_t timeMillis = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now() - begin).count();