Skip to content

feat: bedrock supports session_token #1362

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

Merged
sigoden merged 1 commit into from
Jul 30, 2025
Merged

feat: bedrock supports session_token #1362

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 config.example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ clients:
access_key_id: xxx
secret_access_key: xxx
region: xxx
session_token: xxx # Optional, only needed for temporary credentials

# See https://developers.cloudflare.com/workers-ai/
- type: openai-compatible
Expand Down
10 changes: 10 additions & 0 deletions src/client/bedrock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ pub struct BedrockConfig {
pub access_key_id: Option<String>,
pub secret_access_key: Option<String>,
pub region: Option<String>,
pub session_token: Option<String>,
#[serde(default)]
pub models: Vec<ModelData>,
pub patch: Option<RequestPatch>,
Expand All @@ -29,6 +30,7 @@ impl BedrockClient {
config_get_fn!(access_key_id, get_access_key_id);
config_get_fn!(secret_access_key, get_secret_access_key);
config_get_fn!(region, get_region);
config_get_fn!(session_token, get_session_token);

pub const PROMPTS: [PromptAction<'static>; 3] = [
("access_key_id", "AWS Access Key ID", None),
Expand All @@ -44,6 +46,7 @@ impl BedrockClient {
let access_key_id = self.get_access_key_id()?;
let secret_access_key = self.get_secret_access_key()?;
let region = self.get_region()?;
let session_token = self.get_session_token().ok();
let host = format!("bedrock-runtime.{region}.amazonaws.com");

let model_name = &self.model.real_name();
Expand All @@ -70,6 +73,7 @@ impl BedrockClient {
access_key_id,
secret_access_key,
region,
session_token,
},
AwsRequest {
method: Method::POST,
Expand All @@ -93,6 +97,7 @@ impl BedrockClient {
let access_key_id = self.get_access_key_id()?;
let secret_access_key = self.get_secret_access_key()?;
let region = self.get_region()?;
let session_token = self.get_session_token().ok();
let host = format!("bedrock-runtime.{region}.amazonaws.com");

let uri = format!("/model/{}/invoke", self.model.real_name());
Expand Down Expand Up @@ -121,6 +126,7 @@ impl BedrockClient {
access_key_id,
secret_access_key,
region,
session_token,
},
AwsRequest {
method: Method::POST,
Expand Down Expand Up @@ -527,6 +533,7 @@ struct AwsCredentials {
access_key_id: String,
secret_access_key: String,
region: String,
session_token: Option<String>,
}

#[derive(Debug)]
Expand Down Expand Up @@ -563,6 +570,9 @@ fn aws_fetch(
let date_stamp = amz_date[0..8].to_string();
headers.insert("host".into(), host.clone());
headers.insert("x-amz-date".into(), amz_date.clone());
if let Some(token) = credentials.session_token.clone() {
headers.insert("x-amz-security-token".into(), token);
}

let canonical_headers = headers
.iter()
Expand Down
Loading