Skip to content

refactor: specialize provider trait message types #43

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
jamadeo wants to merge 1 commit into
base: provider-crate-extraction-phase-14k-conversation-dto
Choose a base branch
from
Open

refactor: specialize provider trait message types #43

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/goose-providers/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ futures = { workspace = true }
uuid = { workspace = true, features = ["v4"] }
utoipa.workspace = true
base64.workspace = true
rmcp.workspace = true

[dev-dependencies]
tempfile.workspace = true
14 changes: 6 additions & 8 deletions crates/goose-providers/src/provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,26 @@ use crate::models;
use crate::retry::RetryConfig;
use async_trait::async_trait;
use futures::Stream;
use goose_types::{ModelConfig, ModelInfo, ProviderUsage};
use goose_types::{Message, ModelConfig, ModelInfo, ProviderUsage};
use rmcp::model::Tool;
use std::pin::Pin;

pub type MessageStream<Message> = Pin<
pub type MessageStream = Pin<
Box<dyn Stream<Item = Result<(Option<Message>, Option<ProviderUsage>), ProviderError>> + Send>,
>;

#[async_trait]
pub trait Provider: Send + Sync {
type Message: Send + Sync + 'static;
type Tool: Send + Sync + 'static;

fn get_name(&self) -> &str;

async fn stream(
&self,
model_config: &ModelConfig,
session_id: &str,
system: &str,
messages: &[Self::Message],
tools: &[Self::Tool],
) -> Result<MessageStream<Self::Message>, ProviderError>;
messages: &[Message],
tools: &[Tool],
) -> Result<MessageStream, ProviderError>;

fn get_model_config(&self) -> ModelConfig;

Expand Down
9 changes: 3 additions & 6 deletions crates/goose/src/providers/base.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ pub trait Provider: Send + Sync {
/// A message stream yields partial text content but complete tool calls, all within the Message object
/// So a message with text will contain potentially just a word of a longer response, but tool calls
/// messages will only be yielded once concatenated.
pub type MessageStream = goose_providers::provider::MessageStream<Message>;
pub type MessageStream = goose_providers::provider::MessageStream;

pub struct GooseProviderAdapter<'a> {
provider: &'a dyn Provider,
Expand All @@ -524,9 +524,6 @@ impl<'a> GooseProviderAdapter<'a> {

#[async_trait]
impl goose_providers::provider::Provider for GooseProviderAdapter<'_> {
type Message = Message;
type Tool = Tool;

fn get_name(&self) -> &str {
self.provider.get_name()
}
Expand All @@ -536,8 +533,8 @@ impl goose_providers::provider::Provider for GooseProviderAdapter<'_> {
model_config: &ModelConfig,
session_id: &str,
system: &str,
messages: &[Self::Message],
tools: &[Self::Tool],
messages: &[Message],
tools: &[Tool],
) -> Result<MessageStream, ProviderError> {
self.provider
.stream(model_config, session_id, system, messages, tools)
Expand Down