Apps/ImageApi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

chore: cargo fmt + clippy fix for collapsed if-let chain (T017)

Browse Source 
- cargo fmt applied across all modified source files
- Collapse nested if let Some / if !is_empty into a single let-chain (clippy::collapsible_match)
- All other warnings are pre-existing dead-code lint on unused trait methods

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Cameron
2026-03-18 23:09:58 -04:00
parent 5c9f5c7d0b
commit c1b6013412
8 changed files with 201 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/ai/ollama.rs
View File

@@ -528,10 +528,8 @@ Analyze the image and use specific details from both the visual content and the
// Try fallback server if available
if let Some(fallback_url) = &self.fallback_url {
let fallback_model = self
.fallback_model
.as_ref()
.unwrap_or(&self.primary_model);
let fallback_model =
self.fallback_model.as_ref().unwrap_or(&self.primary_model);
log::info!(
"Attempting chat_with_tools with fallback server: {} (model: {})",
@@ -578,7 +576,9 @@ Analyze the image and use specific details from both the visual content and the
let model = if base_url == self.primary_url {
&self.primary_model
} else {
self.fallback_model.as_deref().unwrap_or(&self.primary_model)
self.fallback_model
.as_deref()
.unwrap_or(&self.primary_model)
};
let options = self.num_ctx.map(|ctx| OllamaOptions { num_ctx: Some(ctx) });
@@ -602,7 +602,11 @@ Analyze the image and use specific details from both the visual content and the
if !response.status().is_success() {
let status = response.status();
let body = response.text().await.unwrap_or_default();
anyhow::bail!("Ollama chat request failed with status {}: {}", status, body);
anyhow::bail!(
"Ollama chat request failed with status {}: {}",
status,
body
);
}
let chat_response: OllamaChatResponse = response
@@ -804,13 +808,28 @@ pub struct ChatMessage {
impl ChatMessage {
pub fn system(content: impl Into<String>) -> Self {
Self { role: "system".to_string(), content: content.into(), tool_calls: None, images: None }
Self {
role: "system".to_string(),
content: content.into(),
tool_calls: None,
images: None,
}
}
pub fn user(content: impl Into<String>) -> Self {
Self { role: "user".to_string(), content: content.into(), tool_calls: None, images: None }
Self {
role: "user".to_string(),
content: content.into(),
tool_calls: None,
images: None,
}
}
pub fn tool_result(content: impl Into<String>) -> Self {
Self { role: "tool".to_string(), content: content.into(), tool_calls: None, images: None }
Self {
role: "tool".to_string(),
content: content.into(),
tool_calls: None,
images: None,
}
}
}