Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

assistant: Don't unwrap built-in step resolution prompt (#15704)

Browse source 
This PR removes some `unwrap`s while loading the built-in step
resolution prompt.

While these `unwrap`s are safe today, they are relying on some implicit
contracts that might change in the future. We're using this in a context
where it's easy to propagate an error upwards, so we may as well avoid
the `unwrap`s entirely and use a `Result`.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-08-02 16:07:43 -04:00 • committed by GitHub
parent 24afe7c3f9
commit c6580da889
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/assistant/src/context.rs
View file

@ -1407,7 +1407,7 @@ impl Context {
async move { async move {
let prompt_store = cx.update(|cx| PromptStore::global(cx))?.await?; let prompt_store = cx.update(|cx| PromptStore::global(cx))?.await?;
let mut prompt = prompt_store.step_resolution_prompt(); let mut prompt = prompt_store.step_resolution_prompt()?;
prompt.push_str(&step_text); prompt.push_str(&step_text);
request.messages.push(LanguageModelRequestMessage { request.messages.push(LanguageModelRequestMessage {

14
crates/assistant/src/prompt_library.rs
View file

@ -1505,15 +1505,15 @@ impl PromptStore {
self.metadata_cache.read().metadata.first().cloned() self.metadata_cache.read().metadata.first().cloned()
} }
pub fn step_resolution_prompt(&self) -> String { pub fn step_resolution_prompt(&self) -> Result<String> {
String::from_utf8( let path = "prompts/step_resolution.md";
Ok(String::from_utf8(
Assets Assets
.load("prompts/step_resolution.md") .load(path)?
.unwrap() .ok_or_else(|| anyhow!("{path} not found"))?
.unwrap()
.to_vec(), .to_vec(),
) )?)
.unwrap()
} }
} }