Skip to content

Auto-escape bedrock model names to streamline support of model ARNs #1473

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
yehonatanz wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −2
Open

Auto-escape bedrock model names to streamline support of model ARNs #1473

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
13 changes: 11 additions & 2 deletions src/client/bedrock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,14 @@ impl BedrockClient {
("region", "AWS Region", None),
];

fn encode_model_name_if_needed(model_name: &str) -> String {
if model_name.contains('%') {
model_name.to_string()
} else {
urlencoding::encode(model_name).into_owned()
}
}

fn chat_completions_builder(
&self,
client: &ReqwestClient,
Expand All @@ -49,7 +57,7 @@ impl BedrockClient {
let session_token = self.get_session_token().ok();
let host = format!("bedrock-runtime.{region}.amazonaws.com");

let model_name = &self.model.real_name();
let model_name = Self::encode_model_name_if_needed(self.model.real_name());

let uri = if data.stream {
format!("/model/{model_name}/converse-stream")
Expand Down Expand Up @@ -100,7 +108,8 @@ impl BedrockClient {
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());
let model_name = Self::encode_model_name_if_needed(self.model.real_name());
let uri = format!("/model/{}/invoke", model_name);

let input_type = match data.query {
true => "search_query",
Expand Down