Skip to content

Commit d00e6ba

Browse files
committed
refactor(rust): reorder imports and improve code formatting
Reorder import statements in multiple files to maintain consistency and improve readability. Also fix line wrapping issues in several places to keep lines under 100 characters. BREAKING CHANGE: None
1 parent 4818c92 commit d00e6ba

9 files changed

Lines changed: 26 additions & 32 deletions

File tree

rust/src/index/summary/strategy.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
use async_trait::async_trait;
77

88
use crate::document::{DocumentTree, NodeId};
9-
use crate::llm::{LlmClient, LlmResult};
109
use crate::llm::memo::{MemoKey, MemoStore, MemoValue};
10+
use crate::llm::{LlmClient, LlmResult};
1111
use crate::utils::fingerprint::Fingerprint;
1212

1313
/// Configuration for summary strategies.

rust/src/llm/executor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ use async_openai::types::chat::{
6161
use super::config::LlmConfig;
6262
use super::error::{LlmError, LlmResult};
6363
use super::fallback::{FallbackChain, FallbackStep};
64-
use crate::metrics::MetricsHub;
6564
use super::throttle::ConcurrencyController;
65+
use crate::metrics::MetricsHub;
6666

6767
/// Unified executor for LLM operations.
6868
///

rust/src/llm/memo/store.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,8 @@ impl MemoStore {
426426
}
427427

428428
// Restore stats
429-
self.stats.load_from(data.stats.hits, data.stats.misses, data.stats.tokens_saved);
429+
self.stats
430+
.load_from(data.stats.hits, data.stats.misses, data.stats.tokens_saved);
430431

431432
info!(
432433
"Loaded memo store with {} entries from {:?}",

rust/src/llm/pool.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ use std::sync::Arc;
88
use super::client::LlmClient;
99
use super::config::LlmConfig;
1010
use super::fallback::{FallbackChain, FallbackConfig};
11-
use crate::metrics::MetricsHub;
1211
use super::throttle::ConcurrencyController;
12+
use crate::metrics::MetricsHub;
1313

1414
/// Pool of LLM clients for different purposes.
1515
///

rust/src/retrieval/complexity/detector.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ impl ComplexityDetector {
6060
}
6161

6262
let result = if let Some(ref client) = self.llm_client {
63-
if let Some(complexity) =
64-
crate::retrieval::pilot::detect_with_llm(client, query).await
63+
if let Some(complexity) = crate::retrieval::pilot::detect_with_llm(client, query).await
6564
{
6665
complexity
6766
} else {

rust/src/retrieval/decompose.rs

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
use serde::{Deserialize, Serialize};
4848
use tracing::{debug, info};
4949

50-
use crate::llm::{LlmClient, LlmExecutor};
5150
use crate::llm::memo::{MemoKey, MemoOpType, MemoStore, MemoValue};
51+
use crate::llm::{LlmClient, LlmExecutor};
5252
use crate::utils::fingerprint::Fingerprint;
5353

5454
/// Sub-query resulting from decomposition.
@@ -269,30 +269,27 @@ impl QueryDecomposer {
269269
info!("Decomposing complex query: '{}'", query);
270270

271271
// Try LLM-based decomposition if available
272-
let result = if self.config.use_llm && (self.llm_client.is_some() || self.llm_executor.is_some()) {
273-
match self.llm_decompose(query).await {
274-
Ok(result) => result,
275-
Err(e) => {
276-
debug!(
277-
"LLM decomposition failed, falling back to rule-based: {}",
278-
e
279-
);
280-
self.rule_based_decompose(query)?
272+
let result =
273+
if self.config.use_llm && (self.llm_client.is_some() || self.llm_executor.is_some()) {
274+
match self.llm_decompose(query).await {
275+
Ok(result) => result,
276+
Err(e) => {
277+
debug!(
278+
"LLM decomposition failed, falling back to rule-based: {}",
279+
e
280+
);
281+
self.rule_based_decompose(query)?
282+
}
281283
}
282-
}
283-
} else {
284-
self.rule_based_decompose(query)?
285-
};
284+
} else {
285+
self.rule_based_decompose(query)?
286+
};
286287

287288
// Cache the result
288289
if let Some(ref store) = self.memo_store {
289290
let cache_key = Self::build_cache_key(query);
290291
if let Ok(json) = serde_json::to_value(&CachedDecomposition::from_result(&result)) {
291-
store.put_with_tokens(
292-
cache_key,
293-
MemoValue::Json(json),
294-
(query.len() / 4) as u64,
295-
);
292+
store.put_with_tokens(cache_key, MemoValue::Json(json), (query.len() / 4) as u64);
296293
}
297294
}
298295

rust/src/retrieval/pilot/llm_pilot.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ use std::sync::Arc;
1111
use tracing::{debug, info, warn};
1212

1313
use crate::document::{DocumentTree, NodeId};
14-
use crate::llm::{LlmClient, LlmExecutor};
1514
use crate::llm::memo::{MemoKey, MemoStore, MemoValue};
15+
use crate::llm::{LlmClient, LlmExecutor};
1616
use crate::utils::fingerprint::Fingerprint;
1717

1818
use super::budget::BudgetController;

rust/src/retrieval/stages/analyze.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,8 @@ impl AnalyzeStage {
164164
self.complexity_detector = detector;
165165

166166
// Also enable query decomposition
167-
let mut decomposer = QueryDecomposer::new(DecompositionConfig::default()).with_llm_client(client);
167+
let mut decomposer =
168+
QueryDecomposer::new(DecompositionConfig::default()).with_llm_client(client);
168169
if let Some(ref store) = self.memo_store {
169170
decomposer = decomposer.with_memo_store(store.clone());
170171
}

rust/src/retrieval/sufficiency/llm_judge.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,7 @@ Be conservative - only mark as sufficient if you're confident the content answer
171171
if let Some(ref store) = self.memo_store {
172172
let cache_key = self.build_cache_key(query, content);
173173
let tokens = (prompt.len() / 4) as u64;
174-
store.put_with_tokens(
175-
cache_key,
176-
MemoValue::Text(format!("{:?}", result)),
177-
tokens,
178-
);
174+
store.put_with_tokens(cache_key, MemoValue::Text(format!("{:?}", result)), tokens);
179175
}
180176

181177
result

0 commit comments

Comments
 (0)