Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ rustflags = ["-C", "target-cpu=native"]
[target.aarch64-apple-darwin]
rustflags = [
"-C", "target-cpu=native",
"-C", "target-feature=+aes,+sha2,+fp16,+fp16fml",
"-C", "target-feature=+aes,+sha2,+fp16",
]

[target.x86_64-apple-darwin]
Expand Down
28 changes: 27 additions & 1 deletion mistralrs-core/src/engine/add_request.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use crate::{
request::{DetokenizationRequest, NormalRequest, TokenizationRequest},
sequence::SeqStepType,
tools::{ToolCallingMatcher, ToolChoice},
RequestMessage, Response,
ModelCategory, RequestMessage, Response,
};
use candle_core::Tensor;
use either::Either;
Expand Down Expand Up @@ -88,6 +88,32 @@ impl Engine {
return;
}

// Verify the model's category matches the messages received.
match (
get_mut_arcmutex!(self.pipeline).category(),
&request.messages,
) {
(
ModelCategory::Text | ModelCategory::Vision { .. },
RequestMessage::Chat { .. }
| RequestMessage::VisionChat { .. }
| RequestMessage::Completion { .. }
| RequestMessage::CompletionTokens(_),
) => (),
(ModelCategory::Diffusion, RequestMessage::ImageGeneration { .. }) => (),
(ModelCategory::Speech, RequestMessage::SpeechGeneration { .. }) => (),
_ => {
request
.response
.send(Response::ValidationError(
"Received a request incompatible for this model's category.".into(),
))
.await
.expect("Expected receiver.");
return;
}
}

let images = match request.messages {
RequestMessage::VisionChat {
ref images,
Expand Down
Loading