searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-07-03 11:57:07 +02:00
Code Issues Releases Wiki Activity

Improve code quality

Browse source
This commit is contained in:
Mubelotix 2025-06-24 11:38:11 +02:00
parent 59a1c5d9a7
commit 4a179fb3c0
No known key found for this signature in database
GPG key ID: 89F391DBCC8CE7F0
9 changed files with 25 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/meilisearch-types/src/batch_view.rs
View file

@ -3,7 +3,7 @@ use serde::Serialize;
use time::{Duration, OffsetDateTime};
use utoipa::ToSchema;
use crate::batches::{Batch, BatchEmbeddingStats, BatchId, BatchStats};
use crate::batches::{Batch, EmbedderStatsView, BatchId, BatchStats};
use crate::task_view::DetailsView;
use crate::tasks::serialize_duration;
@ -31,8 +31,8 @@ pub struct BatchView {
pub struct BatchStatsView {
#[serde(flatten)]
pub stats: BatchStats,
#[serde(skip_serializing_if = "BatchEmbeddingStats::skip_serializing", default)]
pub embedder: BatchEmbeddingStats,
#[serde(skip_serializing_if = "EmbedderStatsView::skip_serializing", default)]
pub embedder: EmbedderStatsView,
}
impl BatchView {

14
crates/meilisearch-types/src/batches.rs
View file

@ -20,8 +20,8 @@ pub struct Batch {
pub progress: Option<ProgressView>,
pub details: DetailsView,
pub stats: BatchStats,
#[serde(skip_serializing_if = "BatchEmbeddingStats::skip_serializing", default)]
pub embedder_stats: BatchEmbeddingStats,
#[serde(skip_serializing_if = "EmbedderStatsView::skip_serializing", default)]
pub embedder_stats: EmbedderStatsView,
#[serde(with = "time::serde::rfc3339")]
pub started_at: OffsetDateTime,
@ -92,25 +92,25 @@ pub struct BatchStats {
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize, ToSchema)]
#[serde(rename_all = "camelCase")]
#[schema(rename_all = "camelCase")]
pub struct BatchEmbeddingStats {
pub struct EmbedderStatsView {
pub total_count: usize,
pub error_count: usize,
#[serde(skip_serializing_if = "Option::is_none")]
#[serde(skip_serializing_if = "Option::is_none", default)]
pub last_error: Option<String>,
}
impl From<&EmbedderStats> for BatchEmbeddingStats {
impl From<&EmbedderStats> for EmbedderStatsView {
fn from(stats: &EmbedderStats) -> Self {
let errors = stats.errors.read().unwrap();
Self {
total_count: stats.total_requests.load(std::sync::atomic::Ordering::Relaxed),
total_count: stats.total_count.load(std::sync::atomic::Ordering::Relaxed),
error_count: errors.1 as usize,
last_error: errors.0.clone(),
}
}
}
impl BatchEmbeddingStats {
impl EmbedderStatsView {
pub fn skip_serializing(&self) -> bool {
self.total_count == 0 && self.error_count == 0 && self.last_error.is_none()
}