This commit is contained in:
Tamo
2025-09-23 11:25:51 +02:00
parent 3a7f9b56fe
commit 8405f0bf9c
10 changed files with 22 additions and 31 deletions

View File

@ -7,23 +7,14 @@
use nom::branch::alt; use nom::branch::alt;
use nom::bytes::complete::tag; use nom::bytes::complete::tag;
use nom::character::complete::char; use nom::character::complete::{char, multispace0, multispace1};
use nom::character::complete::multispace0; use nom::combinator::{cut, map, value};
use nom::character::complete::multispace1; use nom::sequence::{preceded, terminated, tuple};
use nom::combinator::cut;
use nom::combinator::map;
use nom::combinator::value;
use nom::sequence::preceded;
use nom::sequence::{terminated, tuple};
use Condition::*; use Condition::*;
use crate::error::IResultExt; use crate::error::IResultExt;
use crate::value::parse_vector_value; use crate::value::{parse_vector_value, parse_vector_value_cut};
use crate::value::parse_vector_value_cut; use crate::{parse_value, Error, ErrorKind, FilterCondition, IResult, Span, Token, VectorFilter};
use crate::Error;
use crate::ErrorKind;
use crate::VectorFilter;
use crate::{parse_value, FilterCondition, IResult, Span, Token};
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
pub enum Condition<'a> { pub enum Condition<'a> {

View File

@ -271,9 +271,10 @@ macro_rules! json_string {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use uuid::Uuid;
use crate as meili_snap; use crate as meili_snap;
use crate::UUID_IN_MESSAGE_RE; use crate::UUID_IN_MESSAGE_RE;
use uuid::Uuid;
#[test] #[test]
fn snap() { fn snap() {

View File

@ -1,3 +1,4 @@
use core::convert::Infallible;
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::str::FromStr; use std::str::FromStr;
@ -7,7 +8,6 @@ use actix_http::header::{
}; };
use actix_web::web::{self, Data, Path}; use actix_web::web::{self, Data, Path};
use actix_web::{HttpRequest, HttpResponse}; use actix_web::{HttpRequest, HttpResponse};
use core::convert::Infallible;
use deserr::actix_web::AwebJson; use deserr::actix_web::AwebJson;
use deserr::{DeserializeError, Deserr, ValuePointerRef}; use deserr::{DeserializeError, Deserr, ValuePointerRef};
use index_scheduler::IndexScheduler; use index_scheduler::IndexScheduler;
@ -24,12 +24,12 @@ use tracing::debug;
use url::Url; use url::Url;
use utoipa::{OpenApi, ToSchema}; use utoipa::{OpenApi, ToSchema};
use uuid::Uuid; use uuid::Uuid;
use WebhooksError::*;
use crate::analytics::{Aggregate, Analytics}; use crate::analytics::{Aggregate, Analytics};
use crate::extractors::authentication::policies::ActionPolicy; use crate::extractors::authentication::policies::ActionPolicy;
use crate::extractors::authentication::GuardedData; use crate::extractors::authentication::GuardedData;
use crate::extractors::sequential_extractor::SeqHandler; use crate::extractors::sequential_extractor::SeqHandler;
use WebhooksError::*;
#[derive(OpenApi)] #[derive(OpenApi)]
#[openapi( #[openapi(

View File

@ -1,6 +1,3 @@
use crate::common::encoder::Encoder;
use crate::common::{default_settings, GetAllDocumentsOptions, Server, Value};
use crate::json;
use actix_web::test; use actix_web::test;
use meili_snap::{json_string, snapshot}; use meili_snap::{json_string, snapshot};
use meilisearch::Opt; use meilisearch::Opt;
@ -8,6 +5,10 @@ use time::format_description::well_known::Rfc3339;
use time::OffsetDateTime; use time::OffsetDateTime;
use uuid::Uuid; use uuid::Uuid;
use crate::common::encoder::Encoder;
use crate::common::{default_settings, GetAllDocumentsOptions, Server, Value};
use crate::json;
/// This is the basic usage of our API and every other tests uses the content-type application/json /// This is the basic usage of our API and every other tests uses the content-type application/json
#[actix_rt::test] #[actix_rt::test]
async fn add_documents_test_json_content_types() { async fn add_documents_test_json_content_types() {

View File

@ -1,9 +1,8 @@
use crate::{
common::{shared_index_geojson_documents, Server},
json,
};
use meili_snap::{json_string, snapshot}; use meili_snap::{json_string, snapshot};
use crate::common::{shared_index_geojson_documents, Server};
use crate::json;
const LILLE: &str = include_str!("assets/lille.geojson"); const LILLE: &str = include_str!("assets/lille.geojson");
#[actix_rt::test] #[actix_rt::test]

View File

@ -1,5 +1,4 @@
use meili_snap::snapshot; use meili_snap::snapshot;
use time::format_description::well_known::Rfc3339; use time::format_description::well_known::Rfc3339;
use time::OffsetDateTime; use time::OffsetDateTime;

View File

@ -2,8 +2,7 @@ use std::sync::Arc;
use actix_http::StatusCode; use actix_http::StatusCode;
use meili_snap::{json_string, snapshot}; use meili_snap::{json_string, snapshot};
use wiremock::matchers::method; use wiremock::matchers::{method, path, AnyMatcher};
use wiremock::matchers::{path, AnyMatcher};
use wiremock::{Mock, MockServer, Request, ResponseTemplate}; use wiremock::{Mock, MockServer, Request, ResponseTemplate};
use crate::common::{Server, Value, SCORE_DOCUMENTS}; use crate::common::{Server, Value, SCORE_DOCUMENTS};

View File

@ -1,7 +1,8 @@
use meili_snap::{json_string, snapshot};
use super::shared_index_with_documents; use super::shared_index_with_documents;
use crate::common::Server; use crate::common::Server;
use crate::json; use crate::json;
use meili_snap::{json_string, snapshot};
#[actix_rt::test] #[actix_rt::test]
async fn default_search_should_return_estimated_total_hit() { async fn default_search_should_return_estimated_total_hit() {

View File

@ -1,6 +1,7 @@
use meili_snap::{json_string, snapshot};
use crate::common::Server; use crate::common::Server;
use crate::json; use crate::json;
use meili_snap::{json_string, snapshot};
#[actix_rt::test] #[actix_rt::test]
async fn set_reset_chat_issue_5772() { async fn set_reset_chat_issue_5772() {

View File

@ -19,8 +19,7 @@ use crate::proximity::ProximityPrecision;
use crate::update::new::extract::cellulite::GeoJsonExtractor; use crate::update::new::extract::cellulite::GeoJsonExtractor;
use crate::update::new::extract::EmbeddingExtractor; use crate::update::new::extract::EmbeddingExtractor;
use crate::update::new::indexer::settings_changes::DocumentsIndentifiers; use crate::update::new::indexer::settings_changes::DocumentsIndentifiers;
use crate::update::new::merger::merge_and_send_cellulite; use crate::update::new::merger::{merge_and_send_cellulite, merge_and_send_rtree};
use crate::update::new::merger::merge_and_send_rtree;
use crate::update::new::{merge_and_send_docids, merge_and_send_facet_docids, FacetDatabases}; use crate::update::new::{merge_and_send_docids, merge_and_send_facet_docids, FacetDatabases};
use crate::update::settings::SettingsDelta; use crate::update::settings::SettingsDelta;
use crate::vector::db::{EmbedderInfo, IndexEmbeddingConfig}; use crate::vector::db::{EmbedderInfo, IndexEmbeddingConfig};