Skip to content
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

change ChatCompletionChunk to align with "OpenAI Chat Completions str… #3003

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

change ChatCompletionChunk to align with "OpenAI Chat Completions str… #3003

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
efeef0b
change ChatCompletionChunk to align with "OpenAI Chat Completions str…
sywangyi Feb 7, 2025
ecbd956
add in Buffering..
sywangyi Feb 10, 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
15 changes: 9 additions & 6 deletions router/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,12 +790,15 @@ impl ChatCompletionChunk {
created,
model,
system_fingerprint,
choices: vec![ChatCompletionChoice {
index: 0,
delta,
logprobs,
finish_reason,
}],
choices: match usage {
None => vec![ChatCompletionChoice {
index: 0,
delta,
logprobs,
finish_reason,
}],
_ => vec![],
},
usage,
}
}
Expand Down
78 changes: 67 additions & 11 deletions router/src/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,7 +1124,6 @@ enum StreamState {
fn create_event_from_stream_token(
stream_token: &StreamResponse,
logprobs: bool,
stream_options: Option<StreamOptions>,
inner_using_tools: bool,
system_fingerprint: String,
model_id: String,
Expand Down Expand Up @@ -1153,8 +1152,43 @@ fn create_event_from_stream_token(
};

let (usage, finish_reason) = match &stream_token.details {
Some(details) => (None, Some(details.finish_reason.format(true))),
None => (None, None),
};

let chat_complete = CompletionType::ChatCompletionChunk(ChatCompletionChunk::new(
model_id.clone(),
system_fingerprint.clone(),
content,
tool_calls,
current_time,
logprobs,
finish_reason,
usage,
));

event.json_data(chat_complete).unwrap_or_else(|e| {
println!("Failed to serialize ChatCompletionChunk: {:?}", e);
Event::default()
})
}

/// Convert a StreamResponse into an Event to be sent over SSE
fn create_usage_event_from_stream_token(
stream_token: &StreamResponse,
stream_options: Option<StreamOptions>,
system_fingerprint: String,
model_id: String,
) -> Event {
let event = Event::default();
let current_time = std::time::SystemTime::now()
.duration_since(std::time::UNIX_EPOCH)
.unwrap_or_else(|_| std::time::Duration::from_secs(0))
.as_secs();

let usage = match &stream_token.details {
Some(details) => {
let usage = if stream_options
if stream_options
.as_ref()
.map(|s| s.include_usage)
.unwrap_or(false)
Expand All @@ -1169,20 +1203,19 @@ fn create_event_from_stream_token(
})
} else {
None
};
(usage, Some(details.finish_reason.format(true)))
}
}
None => (None, None),
None => None,
};

let chat_complete = CompletionType::ChatCompletionChunk(ChatCompletionChunk::new(
model_id.clone(),
system_fingerprint.clone(),
content,
tool_calls,
None,
None,
current_time,
logprobs,
finish_reason,
None,
None,
usage,
));

Expand Down Expand Up @@ -1307,12 +1340,23 @@ pub(crate) async fn chat_completions(
let event = create_event_from_stream_token(
stream_token,
logprobs,
stream_options.clone(),
response_as_tool,
system_fingerprint.clone(),
model_id.clone(),
);
yield Ok::<Event, Infallible>(event);
if stream_token.details.is_some() && stream_options
.as_ref()
.map(|s| s.include_usage)
.unwrap_or(false) {
let usage_event = create_usage_event_from_stream_token(
stream_token,
stream_options.clone(),
system_fingerprint.clone(),
model_id.clone(),
);
yield Ok::<Event, Infallible>(usage_event);
}
}
}
}
Expand Down Expand Up @@ -1369,13 +1413,25 @@ pub(crate) async fn chat_completions(
let event = create_event_from_stream_token(
&stream_token,
logprobs,
stream_options.clone(),
response_as_tool,
system_fingerprint.clone(),
model_id.clone(),
);

yield Ok::<Event, Infallible>(event);

if stream_token.details.is_some() && stream_options
.as_ref()
.map(|s| s.include_usage)
.unwrap_or(false) {
let usage_event = create_usage_event_from_stream_token(
&stream_token,
stream_options.clone(),
system_fingerprint.clone(),
model_id.clone(),
);
yield Ok::<Event, Infallible>(usage_event);
}
}
}
}
Expand Down
Loading