Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
66 changes: 33 additions & 33 deletions Cargo.lock

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

7 changes: 7 additions & 0 deletions rig-integrations/rig-bedrock/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.3.9](https://github.com/0xPlaygrounds/rig/compare/rig-bedrock-v0.3.8...rig-bedrock-v0.3.9) - 2025-12-15

### Other

- ToolCall Signature and additional parameters ([#1154](https://github.com/0xPlaygrounds/rig/pull/1154))
- *(rig-1090)* crate re-org ([#1145](https://github.com/0xPlaygrounds/rig/pull/1145))

## [0.3.8](https://github.com/0xPlaygrounds/rig/compare/rig-bedrock-v0.3.7...rig-bedrock-v0.3.8) - 2025-12-04

### Other
Expand Down
6 changes: 3 additions & 3 deletions rig-integrations/rig-bedrock/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rig-bedrock"
version = "0.3.8"
version = "0.3.9"
edition = { workspace = true }
license = "MIT"
readme = "README.md"
Expand All @@ -15,10 +15,10 @@ aws-config = { workspace = true, features = ["behavior-version-latest"] }
aws-sdk-bedrockruntime = { workspace = true }
aws-smithy-types = { workspace = true }
base64 = { workspace = true }
rig-core = { path = "../../rig/rig-core", version = "0.26.0", default-features = false, features = [
rig-core = { path = "../../rig/rig-core", version = "0.27.0", default-features = false, features = [
"image",
] }
rig-derive = { path = "../../rig/rig-derive", version = "0.1.9" }
rig-derive = { path = "../../rig/rig-derive", version = "0.1.10" }
schemars = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
Expand Down
12 changes: 5 additions & 7 deletions rig-integrations/rig-bedrock/src/streaming.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ use async_stream::stream;
use aws_sdk_bedrockruntime::types as aws_bedrock;
use rig::completion::GetTokenUsage;
use rig::streaming::StreamingCompletionResponse;
use rig::{completion::CompletionError, streaming::RawStreamingChoice};
use rig::{
completion::CompletionError,
streaming::{RawStreamingChoice, RawStreamingToolCall},
};
use serde::{Deserialize, Serialize};

#[derive(Clone, Deserialize, Serialize)]
Expand Down Expand Up @@ -160,12 +163,7 @@ impl CompletionModel {
} else {
serde_json::from_str(tool_call.input_json.as_str())?
};
yield Ok(RawStreamingChoice::ToolCall {
name: tool_call.name,
call_id: None,
id: tool_call.id,
arguments: tool_input
});
yield Ok(RawStreamingChoice::ToolCall(RawStreamingToolCall::new(tool_call.id, tool_call.name, tool_input)));
} else {
yield Err(CompletionError::ProviderError("Failed to call tool".into()))
}
Expand Down
12 changes: 4 additions & 8 deletions rig-integrations/rig-bedrock/src/types/assistant_content.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,10 @@ impl TryFrom<AwsConverseOutput> for completion::CompletionResponse<AwsConverseOu
_ => None,
}) {
return Ok(completion::CompletionResponse {
choice: OneOrMany::one(AssistantContent::ToolCall(ToolCall {
id: tool_use.id,
call_id: None,
function: ToolFunction {
name: tool_use.function.name,
arguments: tool_use.function.arguments,
},
})),
choice: OneOrMany::one(AssistantContent::ToolCall(ToolCall::new(
tool_use.id,
ToolFunction::new(tool_use.function.name, tool_use.function.arguments),
))),
usage,
raw_response: value,
});
Expand Down
7 changes: 7 additions & 0 deletions rig-integrations/rig-eternalai/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.3.15](https://github.com/0xPlaygrounds/rig/compare/rig-eternalai-v0.3.14...rig-eternalai-v0.3.15) - 2025-12-15

### Other

- ToolCall Signature and additional parameters ([#1154](https://github.com/0xPlaygrounds/rig/pull/1154))
- *(rig-1090)* crate re-org ([#1145](https://github.com/0xPlaygrounds/rig/pull/1145))

## [0.3.14](https://github.com/0xPlaygrounds/rig/compare/rig-eternalai-v0.3.13...rig-eternalai-v0.3.14) - 2025-12-04

### Other
Expand Down
4 changes: 2 additions & 2 deletions rig-integrations/rig-eternalai/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rig-eternalai"
version = "0.3.14"
version = "0.3.15"
edition = { workspace = true }
license = "MIT"
readme = "README.md"
Expand All @@ -11,7 +11,7 @@ repository = "https://github.com/0xPlaygrounds/rig"
workspace = true

[dependencies]
rig-core = { path = "../../rig/rig-core", version = "0.26.0", default-features = false }
rig-core = { path = "../../rig/rig-core", version = "0.27.0", default-features = false }
ethers = { workspace = true }
reqwest = { workspace = true, features = ["json"] }
serde = { workspace = true, features = ["derive"] }
Expand Down
9 changes: 2 additions & 7 deletions rig-integrations/rig-eternalai/src/providers/eternalai.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use rig::http_client;
use rig::message;
use rig::message::AssistantContent;
use rig::providers::openai::{self, Message};
use rig::streaming::{RawStreamingChoice, StreamingCompletionResponse};
use rig::streaming::{RawStreamingChoice, RawStreamingToolCall, StreamingCompletionResponse};
use rig::{Embed, completion, embeddings};
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
Expand Down Expand Up @@ -734,12 +734,7 @@ impl completion::CompletionModel for CompletionModel {
yield Ok(RawStreamingChoice::Message(text.text.clone()))
}
AssistantContent::ToolCall(tc) => {
yield Ok(RawStreamingChoice::ToolCall {
id: tc.id.clone(),
call_id: None,
name: tc.function.name.clone(),
arguments: tc.function.arguments.clone(),
})
yield Ok(RawStreamingChoice::ToolCall(RawStreamingToolCall::new(tc.id.clone(), tc.function.name.clone(), tc.function.arguments.clone())));
}
AssistantContent::Image(_) => {
panic!("Image content is currently unimplemented on Eternal AI. If you need this, please open a ticket!")
Expand Down
Loading