mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-30 14:17:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

clean up redundancies in prompts and ensure tokens are being reserved for generation when filling semantic context

Browse source
This commit is contained in:
KCaverly 2023-10-06 16:43:19 +02:00
parent ecfece3ac4
commit 391179657c
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
crates/assistant/src/prompts.rs
View file

@ -125,6 +125,7 @@ pub fn generate_content_prompt(
model: &str, model: &str,
) -> String { ) -> String {
const MAXIMUM_SNIPPET_TOKEN_COUNT: usize = 500; const MAXIMUM_SNIPPET_TOKEN_COUNT: usize = 500;
const RESERVED_TOKENS_FOR_GENERATION: usize = 1000;
let mut prompts = Vec::new(); let mut prompts = Vec::new();
@ -182,11 +183,17 @@ pub fn generate_content_prompt(
name: None, name: None,
}]; }];
let remaining_token_count = if let Ok(current_token_count) = let mut remaining_token_count = if let Ok(current_token_count) =
tiktoken_rs::num_tokens_from_messages(model, &current_messages) tiktoken_rs::num_tokens_from_messages(model, &current_messages)
{ {
let max_token_count = tiktoken_rs::model::get_context_size(model); let max_token_count = tiktoken_rs::model::get_context_size(model);
max_token_count - current_token_count let intermediate_token_count = max_token_count - current_token_count;
if intermediate_token_count < RESERVED_TOKENS_FOR_GENERATION {
0
} else {
intermediate_token_count - RESERVED_TOKENS_FOR_GENERATION
}
} else { } else {
// If tiktoken fails to count token count, assume we have no space remaining. // If tiktoken fails to count token count, assume we have no space remaining.
0 0
@ -197,7 +204,7 @@ pub fn generate_content_prompt(
// - add file path // - add file path
// - add language // - add language
if let Ok(encoding) = tiktoken_rs::get_bpe_from_model(model) { if let Ok(encoding) = tiktoken_rs::get_bpe_from_model(model) {
let template = "You are working inside a large repository, here are a few code snippets that may be useful"; let mut template = "You are working inside a large repository, here are a few code snippets that may be useful";
for search_result in search_results { for search_result in search_results {
let mut snippet_prompt = template.to_string(); let mut snippet_prompt = template.to_string();
@ -210,6 +217,9 @@ pub fn generate_content_prompt(
if token_count < MAXIMUM_SNIPPET_TOKEN_COUNT { if token_count < MAXIMUM_SNIPPET_TOKEN_COUNT {
prompts.insert(snippet_position, snippet_prompt); prompts.insert(snippet_position, snippet_prompt);
snippet_position += 1; snippet_position += 1;
remaining_token_count -= token_count;
// If you have already added the template to the prompt, remove the template.
template = "";
} }
} else { } else {
break; break;