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

assistant2: Avoid unnecessary String cloning in tool use (#25725)

Browse source 
This PR removes some unnecessary `String` cloning in the tool use paths.

We now store the data in `Arc<str>`s for cheap cloning.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2025-02-26 22:16:09 -05:00 • committed by GitHub
parent da22f21dec
commit e7df5ce61c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/assistant2/src/thread.rs
View file

@ -636,7 +636,7 @@ impl Thread {
Ok(output) => {
tool_results.push(LanguageModelToolResult {
tool_use_id: tool_use_id.clone(),
content: output,
content: output.into(),
is_error: false,
});
thread.pending_tool_uses_by_id.remove(&tool_use_id);
@ -646,14 +646,15 @@ impl Thread {
Err(err) => {
tool_results.push(LanguageModelToolResult {
tool_use_id: tool_use_id.clone(),
content: err.to_string(),
content: err.to_string().into(),
is_error: true,
});
if let Some(tool_use) =
thread.pending_tool_uses_by_id.get_mut(&tool_use_id)
{
tool_use.status = PendingToolUseStatus::Error(err.to_string());
tool_use.status =
PendingToolUseStatus::Error(err.to_string().into());
}
cx.emit(ThreadEvent::ToolFinished { tool_use_id });
@ -716,7 +717,7 @@ pub struct PendingToolUse {
pub id: LanguageModelToolUseId,
/// The ID of the Assistant message in which the tool use was requested.
pub assistant_message_id: MessageId,
pub name: String,
pub name: Arc<str>,
pub input: serde_json::Value,
pub status: PendingToolUseStatus,
}
@ -725,7 +726,7 @@ pub struct PendingToolUse {
pub enum PendingToolUseStatus {
Idle,
Running { _task: Shared<Task<()>> },
Error(#[allow(unused)] String),
Error(#[allow(unused)] Arc<str>),
}
impl PendingToolUseStatus {