Skip to content
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
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

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

1 change: 1 addition & 0 deletions rig-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ worker = { workspace = true, optional = true }
rmcp = { version = "0.6", optional = true, features = ["client"] }
reqwest-eventsource = { workspace = true }
tokio = { workspace = true, features = ["sync"] }
http = "1.3.1"
tracing-futures = { version = "0.2.5", features = ["futures-03"] }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion rig-core/examples/agent_with_galadriel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ async fn main() -> Result<(), anyhow::Error> {
if let Some(fine_tune_api_key) = fine_tune_api_key.as_deref() {
builder = builder.fine_tune_api_key(fine_tune_api_key);
}
let client = builder.build().expect("Failed to build client");
let client = builder.build();

// Create agent with a single context prompt
let comedian_agent = client
Expand Down
2 changes: 1 addition & 1 deletion rig-core/examples/pdf_agent.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ async fn main() -> Result<()> {
// Initialize Ollama client
let client = openai::Client::builder("ollama")
.base_url("http://localhost:11434/v1")
.build()?;
.build();

// Load PDFs using Rig's built-in PDF loader
let documents_dir = std::env::current_dir()?.join("rig-core/examples/documents");
Expand Down
2 changes: 1 addition & 1 deletion rig-core/examples/vector_search_ollama.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ async fn main() -> Result<(), anyhow::Error> {
// Create ollama client
let client = providers::ollama::Client::builder()
.base_url("http://localhost:11434")
.build()?;
.build();
let embedding_model = client.embedding_model("nomic-embed-text");

let embeddings = EmbeddingsBuilder::new(embedding_model.clone())
Expand Down
4 changes: 2 additions & 2 deletions rig-core/src/audio_generation.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Everything related to audio generation (ie, Text To Speech).
//! Rig abstracts over a number of different providers using the [AudioGenerationModel] trait.
use crate::client::audio_generation::AudioGenerationModelHandle;
use crate::{client::audio_generation::AudioGenerationModelHandle, http_client};
use futures::future::BoxFuture;
use serde_json::Value;
use std::sync::Arc;
Expand All @@ -10,7 +10,7 @@ use thiserror::Error;
pub enum AudioGenerationError {
/// Http error (e.g.: connection error, timeout, etc.)
#[error("HttpError: {0}")]
HttpError(#[from] reqwest::Error),
HttpError(#[from] http_client::Error),

/// Json error (e.g.: serialization, deserialization)
#[error("JsonError: {0}")]
Expand Down
72 changes: 36 additions & 36 deletions rig-core/src/client/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,93 +80,93 @@ impl<'a> DynClientBuilder {
.register_all(vec![
ClientFactory::new(
DefaultProviders::ANTHROPIC,
anthropic::Client::from_env_boxed,
anthropic::Client::from_val_boxed,
anthropic::Client::<reqwest::Client>::from_env_boxed,
anthropic::Client::<reqwest::Client>::from_val_boxed,
),
ClientFactory::new(
DefaultProviders::COHERE,
cohere::Client::from_env_boxed,
cohere::Client::from_val_boxed,
cohere::Client::<reqwest::Client>::from_env_boxed,
cohere::Client::<reqwest::Client>::from_val_boxed,
),
ClientFactory::new(
DefaultProviders::GEMINI,
gemini::Client::from_env_boxed,
gemini::Client::from_val_boxed,
gemini::Client::<reqwest::Client>::from_env_boxed,
gemini::Client::<reqwest::Client>::from_val_boxed,
),
ClientFactory::new(
DefaultProviders::HUGGINGFACE,
huggingface::Client::from_env_boxed,
huggingface::Client::from_val_boxed,
huggingface::Client::<reqwest::Client>::from_env_boxed,
huggingface::Client::<reqwest::Client>::from_val_boxed,
),
ClientFactory::new(
DefaultProviders::OPENAI,
openai::Client::from_env_boxed,
openai::Client::from_val_boxed,
openai::Client::<reqwest::Client>::from_env_boxed,
openai::Client::<reqwest::Client>::from_val_boxed,
),
ClientFactory::new(
DefaultProviders::OPENROUTER,
openrouter::Client::from_env_boxed,
openrouter::Client::from_val_boxed,
openrouter::Client::<reqwest::Client>::from_env_boxed,
openrouter::Client::<reqwest::Client>::from_val_boxed,
),
ClientFactory::new(
DefaultProviders::TOGETHER,
together::Client::from_env_boxed,
together::Client::from_val_boxed,
together::Client::<reqwest::Client>::from_env_boxed,
together::Client::<reqwest::Client>::from_val_boxed,
),
ClientFactory::new(
DefaultProviders::XAI,
xai::Client::from_env_boxed,
xai::Client::from_val_boxed,
xai::Client::<reqwest::Client>::from_env_boxed,
xai::Client::<reqwest::Client>::from_val_boxed,
),
ClientFactory::new(
DefaultProviders::AZURE,
azure::Client::from_env_boxed,
azure::Client::from_val_boxed,
azure::Client::<reqwest::Client>::from_env_boxed,
azure::Client::<reqwest::Client>::from_val_boxed,
),
ClientFactory::new(
DefaultProviders::DEEPSEEK,
deepseek::Client::from_env_boxed,
deepseek::Client::from_val_boxed,
deepseek::Client::<reqwest::Client>::from_env_boxed,
deepseek::Client::<reqwest::Client>::from_val_boxed,
),
ClientFactory::new(
DefaultProviders::GALADRIEL,
galadriel::Client::from_env_boxed,
galadriel::Client::from_val_boxed,
galadriel::Client::<reqwest::Client>::from_env_boxed,
galadriel::Client::<reqwest::Client>::from_val_boxed,
),
ClientFactory::new(
DefaultProviders::GROQ,
groq::Client::from_env_boxed,
groq::Client::from_val_boxed,
groq::Client::<reqwest::Client>::from_env_boxed,
groq::Client::<reqwest::Client>::from_val_boxed,
),
ClientFactory::new(
DefaultProviders::HYPERBOLIC,
hyperbolic::Client::from_env_boxed,
hyperbolic::Client::from_val_boxed,
hyperbolic::Client::<reqwest::Client>::from_env_boxed,
hyperbolic::Client::<reqwest::Client>::from_val_boxed,
),
ClientFactory::new(
DefaultProviders::MOONSHOT,
moonshot::Client::from_env_boxed,
moonshot::Client::from_val_boxed,
moonshot::Client::<reqwest::Client>::from_env_boxed,
moonshot::Client::<reqwest::Client>::from_val_boxed,
),
ClientFactory::new(
DefaultProviders::MIRA,
mira::Client::from_env_boxed,
mira::Client::from_val_boxed,
mira::Client::<reqwest::Client>::from_env_boxed,
mira::Client::<reqwest::Client>::from_val_boxed,
),
ClientFactory::new(
DefaultProviders::MISTRAL,
mistral::Client::from_env_boxed,
mistral::Client::from_val_boxed,
mistral::Client::<reqwest::Client>::from_env_boxed,
mistral::Client::<reqwest::Client>::from_val_boxed,
),
ClientFactory::new(
DefaultProviders::OLLAMA,
ollama::Client::from_env_boxed,
ollama::Client::from_val_boxed,
ollama::Client::<reqwest::Client>::from_env_boxed,
ollama::Client::<reqwest::Client>::from_val_boxed,
),
ClientFactory::new(
DefaultProviders::PERPLEXITY,
perplexity::Client::from_env_boxed,
perplexity::Client::from_val_boxed,
perplexity::Client::<reqwest::Client>::from_env_boxed,
perplexity::Client::<reqwest::Client>::from_val_boxed,
),
])
}
Expand Down
Loading
Loading