Skip to content

Relax Tool::call future bound to Send #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SarthakB11 wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −3
Open

Relax Tool::call future bound to Send #337

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ollama-rs/src/generation/tools/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ pub trait Tool: Send + Sync {
fn call(
&mut self,
parameters: Self::Params,
) -> impl Future<Output = Result<String>> + Send + Sync;
) -> impl Future<Output = Result<String>> + Send;
}

pub trait Parameters: DeserializeOwned + JsonSchema {}
Expand All @@ -36,14 +36,14 @@ pub(crate) trait ToolHolder: Send + Sync {
fn call(
&mut self,
parameters: Value,
) -> Pin<Box<dyn Future<Output = Result<String>> + '_ + Send + Sync>>;
) -> Pin<Box<dyn Future<Output = Result<String>> + '_ + Send>>;
}

impl<T: Tool> ToolHolder for T {
fn call(
&mut self,
parameters: Value,
) -> Pin<Box<dyn Future<Output = Result<String>> + '_ + Send + Sync>> {
) -> Pin<Box<dyn Future<Output = Result<String>> + '_ + Send>> {
Box::pin(async move {
// Json returned from the model can sometimes be in different formats, see https://github.com/pepperoni21/ollama-rs/issues/210
// This is a work-around for this issue.
Expand Down