16366cf9f2
https://github.com/zed-industries/zed/issues/30972 brought up another case where our context is not enough to track the actual source of the issue: we get a general top-level error without inner error. The reason for this was `.ok_or_else(|| anyhow!("failed to read HEAD SHA"))?; ` on the top level. The PR finally reworks the way we use anyhow to reduce such issues (or at least make it simpler to bubble them up later in a fix). On top of that, uses a few more anyhow methods for better readability. * `.ok_or_else(|| anyhow!("..."))`, `map_err` and other similar error conversion/option reporting cases are replaced with `context` and `with_context` calls * in addition to that, various `anyhow!("failed to do ...")` are stripped with `.context("Doing ...")` messages instead to remove the parasitic `failed to` text * `anyhow::ensure!` is used instead of `if ... { return Err(...); }` calls * `anyhow::bail!` is used instead of `return Err(anyhow!(...));` Release Notes: - N/A
95 lines
3 KiB
Rust
95 lines
3 KiB
Rust
use crate::schema::json_schema_for;
|
|
use anyhow::{Context as _, Result, anyhow};
|
|
use assistant_tool::{ActionLog, Tool, ToolResult};
|
|
use gpui::AnyWindowHandle;
|
|
use gpui::{App, Entity, Task};
|
|
use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
|
|
use project::Project;
|
|
use schemars::JsonSchema;
|
|
use serde::{Deserialize, Serialize};
|
|
use std::sync::Arc;
|
|
use ui::IconName;
|
|
use util::markdown::MarkdownInlineCode;
|
|
|
|
#[derive(Debug, Serialize, Deserialize, JsonSchema)]
|
|
pub struct CreateDirectoryToolInput {
|
|
/// The path of the new directory.
|
|
///
|
|
/// <example>
|
|
/// If the project has the following structure:
|
|
///
|
|
/// - directory1/
|
|
/// - directory2/
|
|
///
|
|
/// You can create a new directory by providing a path of "directory1/new_directory"
|
|
/// </example>
|
|
pub path: String,
|
|
}
|
|
|
|
pub struct CreateDirectoryTool;
|
|
|
|
impl Tool for CreateDirectoryTool {
|
|
fn name(&self) -> String {
|
|
"create_directory".into()
|
|
}
|
|
|
|
fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
|
|
false
|
|
}
|
|
|
|
fn description(&self) -> String {
|
|
include_str!("./create_directory_tool/description.md").into()
|
|
}
|
|
|
|
fn icon(&self) -> IconName {
|
|
IconName::Folder
|
|
}
|
|
|
|
fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
|
|
json_schema_for::<CreateDirectoryToolInput>(format)
|
|
}
|
|
|
|
fn ui_text(&self, input: &serde_json::Value) -> String {
|
|
match serde_json::from_value::<CreateDirectoryToolInput>(input.clone()) {
|
|
Ok(input) => {
|
|
format!("Create directory {}", MarkdownInlineCode(&input.path))
|
|
}
|
|
Err(_) => "Create directory".to_string(),
|
|
}
|
|
}
|
|
|
|
fn run(
|
|
self: Arc<Self>,
|
|
input: serde_json::Value,
|
|
_request: Arc<LanguageModelRequest>,
|
|
project: Entity<Project>,
|
|
_action_log: Entity<ActionLog>,
|
|
_model: Arc<dyn LanguageModel>,
|
|
_window: Option<AnyWindowHandle>,
|
|
cx: &mut App,
|
|
) -> ToolResult {
|
|
let input = match serde_json::from_value::<CreateDirectoryToolInput>(input) {
|
|
Ok(input) => input,
|
|
Err(err) => return Task::ready(Err(anyhow!(err))).into(),
|
|
};
|
|
let project_path = match project.read(cx).find_project_path(&input.path, cx) {
|
|
Some(project_path) => project_path,
|
|
None => {
|
|
return Task::ready(Err(anyhow!("Path to create was outside the project"))).into();
|
|
}
|
|
};
|
|
let destination_path: Arc<str> = input.path.as_str().into();
|
|
|
|
cx.spawn(async move |cx| {
|
|
project
|
|
.update(cx, |project, cx| {
|
|
project.create_entry(project_path.clone(), true, cx)
|
|
})?
|
|
.await
|
|
.with_context(|| format!("Creating directory {destination_path}"))?;
|
|
|
|
Ok(format!("Created directory {destination_path}").into())
|
|
})
|
|
.into()
|
|
}
|
|
}
|