Add concrete From into boxed tool to macros

bosun-ai · Dec 2, 2024 · f962557 · f962557
1 parent 8d2fbf6
commit f962557
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 19 deletions.
diff --git a/swiftide-agents/src/default_context.rs b/swiftide-agents/src/default_context.rs
@@ -166,9 +166,5 @@ mod tests {
         assert_eq!(messages.len(), 4);
 
         assert!(context.next_completion().await.is_none());
-
-        // If the last message is from the assistant, we should not get any more completions
-        context.add_messages(&[assistant!("I am fine")]).await;
-        assert!(context.next_completion().await.is_none());
     }
 }
diff --git a/swiftide-macros/src/tool/mod.rs b/swiftide-macros/src/tool/mod.rs
@@ -3,7 +3,7 @@ use darling::{ast::NestedMeta, Error, FromDeriveInput, FromMeta};
 use proc_macro2::TokenStream;
 use quote::quote;
 use serde::ser::SerializeMap as _;
-use syn::{spanned::Spanned, DeriveInput, FnArg, ItemFn, Pat, PatType};
+use syn::{spanned::Spanned, DeriveInput, FnArg, ItemFn, Lifetime, Pat, PatType};
 
 mod args;
 mod tool_spec;
@@ -141,7 +141,7 @@ pub(crate) fn tool_impl(input_args: &TokenStream, input: &ItemFn) -> TokenStream
         }
     };
 
-    let boxed_from = boxed_from(tool_struct.clone());
+    let boxed_from = boxed_from(&tool_struct, &[]);
 
     quote! {
         #tool_args
@@ -243,7 +243,8 @@ pub(crate) fn tool_derive_impl(input: &DeriveInput) -> syn::Result<TokenStream>
         quote! { <#(#struct_lifetimes),*> }
     };
 
-    let boxed_from = boxed_from(struct_ident.clone());
+    // Arg should be, if empty None, else Some(&args)
+    let boxed_from = boxed_from(struct_ident, &struct_lifetimes);
     Ok(quote! {
         #tool_args
 
@@ -273,10 +274,15 @@ fn parse_args(args: TokenStream) -> Result<ToolArgs, Error> {
     ToolArgs::from_list(&attr_args)
 }
 
-fn boxed_from(val: syn::Ident) -> TokenStream {
+fn boxed_from(struct_ident: &syn::Ident, lifetimes: &[&Lifetime]) -> TokenStream {
+    if !lifetimes.is_empty() {
+        // TODO: Implement for existing lifetimes
+        return quote! {};
+    }
+
     quote! {
-        impl From<#val> for Box<dyn ::swiftide::chat_completion::Tool> {
-            fn from(val: #val) -> Self {
+        impl<'TOOLBOXED> From<#struct_ident> for Box<dyn ::swiftide::chat_completion::Tool + 'TOOLBOXED> {
+            fn from(val: #struct_ident) -> Self {
                 Box::new(val)
             }
         }

diff --git a/swiftide-macros/src/tool/snapshots/swiftide_macros__tool__tests__snapshot_derive.snap b/swiftide-macros/src/tool/snapshots/swiftide_macros__tool__tests__snapshot_derive.snap
@@ -25,7 +25,8 @@ impl swiftide::chat_completion::Tool for HelloDerive {
             .unwrap()
     }
 }
-impl From<HelloDerive> for Box<dyn ::swiftide::chat_completion::Tool> {
+impl<'TOOLBOXED> From<HelloDerive>
+for Box<dyn ::swiftide::chat_completion::Tool + 'TOOLBOXED> {
     fn from(val: HelloDerive) -> Self {
         Box::new(val)
     }

diff --git a/...de-macros/src/tool/snapshots/swiftide_macros__tool__tests__snapshot_derive_with_args.snap b/...de-macros/src/tool/snapshots/swiftide_macros__tool__tests__snapshot_derive_with_args.snap
@@ -47,7 +47,8 @@ impl swiftide::chat_completion::Tool for HelloDerive {
             .unwrap()
     }
 }
-impl From<HelloDerive> for Box<dyn ::swiftide::chat_completion::Tool> {
+impl<'TOOLBOXED> From<HelloDerive>
+for Box<dyn ::swiftide::chat_completion::Tool + 'TOOLBOXED> {
     fn from(val: HelloDerive) -> Self {
         Box::new(val)
     }

diff --git a/...acros/src/tool/snapshots/swiftide_macros__tool__tests__snapshot_derive_with_lifetime.snap b/...acros/src/tool/snapshots/swiftide_macros__tool__tests__snapshot_derive_with_lifetime.snap
@@ -47,8 +47,3 @@ impl<'a> swiftide::chat_completion::Tool for HelloDerive<'a> {
             .unwrap()
     }
 }
-impl From<HelloDerive> for Box<dyn ::swiftide::chat_completion::Tool> {
-    fn from(val: HelloDerive) -> Self {
-        Box::new(val)
-    }
-}
diff --git a/swiftide-macros/src/tool/snapshots/swiftide_macros__tool__tests__snapshot_multiple_args.snap b/swiftide-macros/src/tool/snapshots/swiftide_macros__tool__tests__snapshot_multiple_args.snap
@@ -64,7 +64,8 @@ impl ::swiftide::chat_completion::Tool for SearchCode {
             .unwrap()
     }
 }
-impl From<SearchCode> for Box<dyn ::swiftide::chat_completion::Tool> {
+impl<'TOOLBOXED> From<SearchCode>
+for Box<dyn ::swiftide::chat_completion::Tool + 'TOOLBOXED> {
     fn from(val: SearchCode) -> Self {
         Box::new(val)
     }

diff --git a/swiftide-macros/src/tool/snapshots/swiftide_macros__tool__tests__snapshot_single_arg.snap b/swiftide-macros/src/tool/snapshots/swiftide_macros__tool__tests__snapshot_single_arg.snap
@@ -60,7 +60,8 @@ impl ::swiftide::chat_completion::Tool for SearchCode {
             .unwrap()
     }
 }
-impl From<SearchCode> for Box<dyn ::swiftide::chat_completion::Tool> {
+impl<'TOOLBOXED> From<SearchCode>
+for Box<dyn ::swiftide::chat_completion::Tool + 'TOOLBOXED> {
     fn from(val: SearchCode) -> Self {
         Box::new(val)
     }