Skip to content

Interactive mode improvements #1299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 28, 2025
Merged

Interactive mode improvements #1299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7f3372
More ergonomic image url parsing
EricLBuehler Apr 28, 2025
5a34796
Add option to clear
EricLBuehler Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 56 additions & 28 deletions mistralrs-core/src/pipeline/loaders/vision_loaders.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use anyhow::Result;
use candle_core::{DType, Device, Tensor, D};
use candle_nn::Conv2dConfig;
use image::{ColorType, DynamicImage};
use itertools::Itertools;
use mistralrs_quant::ShardedVarBuilder;

#[cfg(feature = "pyo3_macros")]
Expand Down Expand Up @@ -245,9 +246,15 @@ pub struct Phi3VLoader;
pub struct Phi3VPrefixer;

impl VisionPromptPrefixer for Phi3VPrefixer {
fn prefix_image(&self, image_index: usize, prompt: &str) -> String {
fn prefix_image(&self, image_indexes: Vec<usize>, prompt: &str) -> String {
// Image indexing starts at 0.
format!("<|image_{}|>{prompt}", image_index + 1)
format!(
"{}{prompt}",
image_indexes
.into_iter()
.map(|image_index| format!("<|image_{}|>", image_index + 1))
.join("")
)
}
}

Expand Down Expand Up @@ -508,7 +515,7 @@ pub struct Idefics2Loader;
pub struct Idefics2Prefixer;

impl VisionPromptPrefixer for Idefics2Prefixer {
fn prefix_image(&self, _image_index: usize, prompt: &str) -> String {
fn prefix_image(&self, _image_indexes: Vec<usize>, prompt: &str) -> String {
// Chat template does it
prompt.to_string()
}
Expand Down Expand Up @@ -837,8 +844,8 @@ pub struct LLaVANextLoader;
pub struct LLaVANextPrefixer;

impl VisionPromptPrefixer for LLaVANextPrefixer {
fn prefix_image(&self, _image_index: usize, prompt: &str) -> String {
format!("<image>{prompt}")
fn prefix_image(&self, image_indexes: Vec<usize>, prompt: &str) -> String {
format!("{}{prompt}", "<image>".repeat(image_indexes.len()))
}
}

Expand Down Expand Up @@ -1085,8 +1092,8 @@ pub struct LLaVALoader;
pub struct LLaVAPrefixer;

impl VisionPromptPrefixer for LLaVAPrefixer {
fn prefix_image(&self, _image_index: usize, prompt: &str) -> String {
format!("<image>{prompt}")
fn prefix_image(&self, image_indexes: Vec<usize>, prompt: &str) -> String {
format!("{}{prompt}", "<image>".repeat(image_indexes.len()))
}
}

Expand Down Expand Up @@ -1325,8 +1332,8 @@ pub struct VLlamaLoader;
pub struct VLlamaPrefixer;

impl VisionPromptPrefixer for VLlamaPrefixer {
fn prefix_image(&self, _image_index: usize, prompt: &str) -> String {
format!("<|image|>{prompt}")
fn prefix_image(&self, image_indexes: Vec<usize>, prompt: &str) -> String {
format!("{}{prompt}", "<|image|>".repeat(image_indexes.len()))
}
}

Expand Down Expand Up @@ -1699,12 +1706,16 @@ pub struct Qwen2VLLoader;
pub struct Qwen2VLPrefixer;

impl VisionPromptPrefixer for Qwen2VLPrefixer {
fn prefix_image(&self, _image_index: usize, prompt: &str) -> String {
fn prefix_image(&self, image_indexes: Vec<usize>, prompt: &str) -> String {
format!(
"{}{}{}{prompt}",
Qwen2VLProcessor::VISION_START,
Qwen2VLProcessor::IMAGE_PAD,
Qwen2VLProcessor::VISION_END
"{}{prompt}",
format!(
"{}{}{}",
Qwen2VLProcessor::VISION_START,
Qwen2VLProcessor::IMAGE_PAD,
Qwen2VLProcessor::VISION_END
)
.repeat(image_indexes.len())
)
}
}
Expand Down Expand Up @@ -1981,7 +1992,7 @@ pub struct Idefics3Loader;
pub struct Idefics3Prefixer;

impl VisionPromptPrefixer for Idefics3Prefixer {
fn prefix_image(&self, _image_index: usize, prompt: &str) -> String {
fn prefix_image(&self, _image_indexes: Vec<usize>, prompt: &str) -> String {
// Chat template does it
prompt.to_string()
}
Expand Down Expand Up @@ -2261,8 +2272,11 @@ pub struct MiniCpmOLoader;
pub struct MiniCpmOPrefixer;

impl VisionPromptPrefixer for MiniCpmOPrefixer {
fn prefix_image(&self, _image_index: usize, prompt: &str) -> String {
format!("(<image>./</image>){prompt}")
fn prefix_image(&self, image_indexes: Vec<usize>, prompt: &str) -> String {
format!(
"{}{prompt}",
"(<image>./</image>)".repeat(image_indexes.len())
)
}
}

Expand Down Expand Up @@ -2529,9 +2543,16 @@ pub struct Phi4MMLoader;
pub struct Phi4MMPrefixer;

impl VisionPromptPrefixer for Phi4MMPrefixer {
fn prefix_image(&self, image_index: usize, prompt: &str) -> String {
fn prefix_image(&self, image_indexes: Vec<usize>, prompt: &str) -> String {
// Image indexing starts at 0.
format!("<|image_{}|>{prompt}", image_index + 1)

format!(
"{}{prompt}",
image_indexes
.into_iter()
.map(|image_index| format!("<|image_{}|>", image_index + 1))
.join("")
)
}
}

Expand Down Expand Up @@ -2840,12 +2861,16 @@ pub struct Qwen2_5VLLoader;
pub struct Qwen2_5VLPrefixer;

impl VisionPromptPrefixer for Qwen2_5VLPrefixer {
fn prefix_image(&self, _image_index: usize, prompt: &str) -> String {
fn prefix_image(&self, image_indexes: Vec<usize>, prompt: &str) -> String {
format!(
"{}{}{}{prompt}",
Qwen2_5VLProcessor::VISION_START,
Qwen2_5VLProcessor::IMAGE_PAD,
Qwen2_5VLProcessor::VISION_END
"{}{prompt}",
format!(
"{}{}{}",
Qwen2_5VLProcessor::VISION_START,
Qwen2_5VLProcessor::IMAGE_PAD,
Qwen2_5VLProcessor::VISION_END
)
.repeat(image_indexes.len())
)
}
}
Expand Down Expand Up @@ -3121,7 +3146,7 @@ pub struct Gemma3Loader;
pub struct Gemma3Prefixer;

impl VisionPromptPrefixer for Gemma3Prefixer {
fn prefix_image(&self, _image_index: usize, prompt: &str) -> String {
fn prefix_image(&self, _image_indexes: Vec<usize>, prompt: &str) -> String {
prompt.to_string()
}
}
Expand Down Expand Up @@ -3436,7 +3461,7 @@ pub struct Mistral3Loader;
pub struct Mistral3Prefixer;

impl VisionPromptPrefixer for Mistral3Prefixer {
fn prefix_image(&self, _image_index: usize, prompt: &str) -> String {
fn prefix_image(&self, _image_indexes: Vec<usize>, prompt: &str) -> String {
prompt.to_string()
}
}
Expand Down Expand Up @@ -3736,8 +3761,11 @@ pub struct VLlama4Loader;
pub struct VLlama4Prefixer;

impl VisionPromptPrefixer for VLlama4Prefixer {
fn prefix_image(&self, _image_index: usize, prompt: &str) -> String {
format!("{}{prompt}", llama4::IMAGE_TOKEN)
fn prefix_image(&self, image_indexes: Vec<usize>, prompt: &str) -> String {
format!(
"{}{prompt}",
llama4::IMAGE_TOKEN.repeat(image_indexes.len())
)
}
}

Expand Down
4 changes: 2 additions & 2 deletions mistralrs-core/src/pipeline/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,10 @@ impl PartialEq for ModelCategory {
}
}

/// Prepend a vision tag appropriate for the model to the prompt. Image indexing is assumed that start at
/// Prepend a vision tag appropriate for the model to the prompt. Image indexing is assumed that start at 0.
pub trait VisionPromptPrefixer: Send + Sync {
/// Prefix for inclusion in messages (may do nothing if the chat template handles it).
fn prefix_image(&self, image_index: usize, prompt: &str) -> String;
fn prefix_image(&self, image_indees: Vec<usize>, prompt: &str) -> String;
}

pub enum CacheBackendMetadata<'a> {
Expand Down
Loading
Loading