Change ToolOutput
to ToolView
(#11682)
Additionally, the internal `ToolView` trait used by the registry is now called `InternalToolView`. This should make it a bit easier to understand that the `ToolView` is intended for a `gpui::View` (implementing `Render`). It does still feel like more could be merged here but I think the built tools are now a bit clearer. Release Notes: - N/A
This commit is contained in:
parent
5515ba6043
commit
c71cfd5da4
5 changed files with 17 additions and 17 deletions
|
@ -8,6 +8,6 @@ pub use attachment_registry::{
|
|||
};
|
||||
pub use project_context::ProjectContext;
|
||||
pub use tool_registry::{
|
||||
LanguageModelTool, SavedToolFunctionCall, ToolFunctionCall, ToolFunctionDefinition, ToolOutput,
|
||||
ToolRegistry,
|
||||
LanguageModelTool, SavedToolFunctionCall, ToolFunctionCall, ToolFunctionDefinition,
|
||||
ToolRegistry, ToolView,
|
||||
};
|
||||
|
|
|
@ -31,11 +31,11 @@ enum ToolFunctionCallState {
|
|||
#[default]
|
||||
Initializing,
|
||||
NoSuchTool,
|
||||
KnownTool(Box<dyn ToolView>),
|
||||
ExecutedTool(Box<dyn ToolView>),
|
||||
KnownTool(Box<dyn InternalToolView>),
|
||||
ExecutedTool(Box<dyn InternalToolView>),
|
||||
}
|
||||
|
||||
trait ToolView {
|
||||
trait InternalToolView {
|
||||
fn view(&self) -> AnyView;
|
||||
fn generate(&self, project: &mut ProjectContext, cx: &mut WindowContext) -> String;
|
||||
fn try_set_input(&self, input: &str, cx: &mut WindowContext);
|
||||
|
@ -69,7 +69,7 @@ pub struct ToolFunctionDefinition {
|
|||
}
|
||||
|
||||
pub trait LanguageModelTool {
|
||||
type View: ToolOutput;
|
||||
type View: ToolView;
|
||||
|
||||
/// Returns the name of the tool.
|
||||
///
|
||||
|
@ -85,7 +85,7 @@ pub trait LanguageModelTool {
|
|||
|
||||
/// Returns the OpenAI Function definition for the tool, for direct use with OpenAI's API.
|
||||
fn definition(&self) -> ToolFunctionDefinition {
|
||||
let root_schema = schema_for!(<Self::View as ToolOutput>::Input);
|
||||
let root_schema = schema_for!(<Self::View as ToolView>::Input);
|
||||
|
||||
ToolFunctionDefinition {
|
||||
name: self.name(),
|
||||
|
@ -98,7 +98,7 @@ pub trait LanguageModelTool {
|
|||
fn view(&self, cx: &mut WindowContext) -> View<Self::View>;
|
||||
}
|
||||
|
||||
pub trait ToolOutput: Render {
|
||||
pub trait ToolView: Render {
|
||||
/// The input type that will be passed in to `execute` when the tool is called
|
||||
/// by the language model.
|
||||
type Input: DeserializeOwned + JsonSchema;
|
||||
|
@ -121,7 +121,7 @@ pub trait ToolOutput: Render {
|
|||
struct RegisteredTool {
|
||||
enabled: AtomicBool,
|
||||
type_id: TypeId,
|
||||
build_view: Box<dyn Fn(&mut WindowContext) -> Box<dyn ToolView>>,
|
||||
build_view: Box<dyn Fn(&mut WindowContext) -> Box<dyn InternalToolView>>,
|
||||
definition: ToolFunctionDefinition,
|
||||
}
|
||||
|
||||
|
@ -304,7 +304,7 @@ impl ToolRegistry {
|
|||
}
|
||||
}
|
||||
|
||||
impl<T: ToolOutput> ToolView for View<T> {
|
||||
impl<T: ToolView> InternalToolView for View<T> {
|
||||
fn view(&self) -> AnyView {
|
||||
self.clone().into()
|
||||
}
|
||||
|
@ -404,7 +404,7 @@ mod test {
|
|||
}
|
||||
}
|
||||
|
||||
impl ToolOutput for WeatherView {
|
||||
impl ToolView for WeatherView {
|
||||
type Input = WeatherQuery;
|
||||
|
||||
type SerializedState = WeatherResult;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue