mirror of
https://github.com/meilisearch/meilisearch.git
synced 2025-07-27 00:31:02 +00:00
Update search and docs usages
This commit is contained in:
@ -19,6 +19,7 @@ use meilisearch_types::error::{Code, ResponseError};
|
|||||||
use meilisearch_types::heed::RoTxn;
|
use meilisearch_types::heed::RoTxn;
|
||||||
use meilisearch_types::index_uid::IndexUid;
|
use meilisearch_types::index_uid::IndexUid;
|
||||||
use meilisearch_types::milli::documents::sort::recursive_sort;
|
use meilisearch_types::milli::documents::sort::recursive_sort;
|
||||||
|
use meilisearch_types::milli::index::EmbeddingsWithMetadata;
|
||||||
use meilisearch_types::milli::update::IndexDocumentsMethod;
|
use meilisearch_types::milli::update::IndexDocumentsMethod;
|
||||||
use meilisearch_types::milli::vector::parsed_vectors::ExplicitVectors;
|
use meilisearch_types::milli::vector::parsed_vectors::ExplicitVectors;
|
||||||
use meilisearch_types::milli::{AscDesc, DocumentId};
|
use meilisearch_types::milli::{AscDesc, DocumentId};
|
||||||
@ -1460,9 +1461,13 @@ fn some_documents<'a, 't: 'a>(
|
|||||||
Some(Value::Object(map)) => map,
|
Some(Value::Object(map)) => map,
|
||||||
_ => Default::default(),
|
_ => Default::default(),
|
||||||
};
|
};
|
||||||
for (name, (vector, regenerate)) in index.embeddings(rtxn, key)? {
|
for (
|
||||||
|
name,
|
||||||
|
EmbeddingsWithMetadata { embeddings, regenerate, has_fragments: _ },
|
||||||
|
) in index.embeddings(rtxn, key)?
|
||||||
|
{
|
||||||
let embeddings =
|
let embeddings =
|
||||||
ExplicitVectors { embeddings: Some(vector.into()), regenerate };
|
ExplicitVectors { embeddings: Some(embeddings.into()), regenerate };
|
||||||
vectors.insert(
|
vectors.insert(
|
||||||
name,
|
name,
|
||||||
serde_json::to_value(embeddings).map_err(MeilisearchHttpError::from)?,
|
serde_json::to_value(embeddings).map_err(MeilisearchHttpError::from)?,
|
||||||
|
@ -16,7 +16,7 @@ use meilisearch_types::error::{Code, ResponseError};
|
|||||||
use meilisearch_types::heed::RoTxn;
|
use meilisearch_types::heed::RoTxn;
|
||||||
use meilisearch_types::index_uid::IndexUid;
|
use meilisearch_types::index_uid::IndexUid;
|
||||||
use meilisearch_types::locales::Locale;
|
use meilisearch_types::locales::Locale;
|
||||||
use meilisearch_types::milli::index::{self, SearchParameters};
|
use meilisearch_types::milli::index::{self, EmbeddingsWithMetadata, SearchParameters};
|
||||||
use meilisearch_types::milli::score_details::{ScoreDetails, ScoringStrategy};
|
use meilisearch_types::milli::score_details::{ScoreDetails, ScoringStrategy};
|
||||||
use meilisearch_types::milli::vector::parsed_vectors::ExplicitVectors;
|
use meilisearch_types::milli::vector::parsed_vectors::ExplicitVectors;
|
||||||
use meilisearch_types::milli::vector::Embedder;
|
use meilisearch_types::milli::vector::Embedder;
|
||||||
@ -1528,8 +1528,11 @@ impl<'a> HitMaker<'a> {
|
|||||||
Some(Value::Object(map)) => map,
|
Some(Value::Object(map)) => map,
|
||||||
_ => Default::default(),
|
_ => Default::default(),
|
||||||
};
|
};
|
||||||
for (name, (vector, regenerate)) in self.index.embeddings(self.rtxn, id)? {
|
for (name, EmbeddingsWithMetadata { embeddings, regenerate, has_fragments: _ }) in
|
||||||
let embeddings = ExplicitVectors { embeddings: Some(vector.into()), regenerate };
|
self.index.embeddings(self.rtxn, id)?
|
||||||
|
{
|
||||||
|
let embeddings =
|
||||||
|
ExplicitVectors { embeddings: Some(embeddings.into()), regenerate };
|
||||||
vectors.insert(
|
vectors.insert(
|
||||||
name,
|
name,
|
||||||
serde_json::to_value(embeddings).map_err(InternalError::SerdeJson)?,
|
serde_json::to_value(embeddings).map_err(InternalError::SerdeJson)?,
|
||||||
|
Reference in New Issue
Block a user