Skip to content

fix: fix system prompt filtering bug #31

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: fix system prompt filtering bug #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 18 additions & 10 deletions src/models/request.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ use std::collections::HashMap;
pub struct ApiRequest {
#[serde(default)]
pub stream: bool,

#[serde(default)]
pub verbose: bool,

pub system: Option<String>,
pub messages: Vec<Message>,

#[serde(default)]
pub deepseek_config: ApiConfig,

#[serde(default)]
pub anthropic_config: ApiConfig,
}
Expand Down Expand Up @@ -58,7 +58,7 @@ pub enum Role {
pub struct ApiConfig {
#[serde(default)]
pub headers: HashMap<String, String>,

#[serde(default)]
pub body: serde_json::Value,
}
Expand All @@ -73,8 +73,11 @@ impl ApiRequest {
///
/// * `bool` - True if system prompt validation passes (no duplicates), false otherwise
pub fn validate_system_prompt(&self) -> bool {
let system_in_messages = self.messages.iter().any(|msg| matches!(msg.role, Role::System));

let system_in_messages = self
.messages
.iter()
.any(|msg| matches!(msg.role, Role::System));

// Only invalid if system prompt is provided in both places
!(self.system.is_some() && system_in_messages)
}
Expand All @@ -91,15 +94,20 @@ impl ApiRequest {
let mut messages = Vec::new();

// Add system message first
if let Some(system) = &self.system {
if let Some(system) = &self.get_system_prompt() {
messages.push(Message {
role: Role::System,
content: system.clone(),
content: system.to_string(),
});
}

// Add remaining messages
messages.extend(self.messages.iter().filter(|msg| !matches!(msg.role, Role::System)).cloned());
messages.extend(
self.messages
.iter()
.filter(|msg| !matches!(msg.role, Role::System))
.cloned(),
);

messages
}
Expand Down