Skip to content
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

feat: add bedrock runtime agent for knowledge base #2651

Merged
merged 2 commits into from
Jul 18, 2024
Merged

feat: add bedrock runtime agent for knowledge base #2651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef0bed7
add bedrock runtime agent for knowledge base
yuye-aws Jul 16, 2024
dcfd08a
update unit test
yuye-aws Jul 16, 2024
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
5 changes: 4 additions & 1 deletion common/src/test/java/org/opensearch/ml/common/connector/ConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,17 @@ public void validateConnectorURL_Invalid() {
HttpConnector connector = createHttpConnector();
connector.validateConnectorURL(Arrays.asList("^https://runtime\\.sagemaker\\..*[a-z0-9-]\\.amazonaws\\.com/.*$",
"^https://api\\.openai\\.com/.*$",
"^https://api\\.cohere\\.ai/.*$"));
"^https://api\\.cohere\\.ai/.*$",
"^https://bedrock-agent-runtime\\\\..*[a-z0-9-]\\\\.amazonaws\\\\.com/.*$"
));
}

@Test
public void validateConnectorURL() {
HttpConnector connector = createHttpConnector();
connector.validateConnectorURL(Arrays.asList("^https://runtime\\.sagemaker\\..*[a-z0-9-]\\.amazonaws\\.com/.*$",
"^https://api\\.openai\\.com/.*$",
"^https://bedrock-agent-runtime\\\\..*[a-z0-9-]\\\\.amazonaws\\\\.com/.*$",
"^" + connector.getActions().get(0).getUrl()));
}
}
3 changes: 2 additions & 1 deletion plugin/src/main/java/org/opensearch/ml/settings/MLCommonsSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@ private MLCommonsSettings() {}
"^https://runtime\\.sagemaker\\..*[a-z0-9-]\\.amazonaws\\.com/.*$",
"^https://api\\.openai\\.com/.*$",
"^https://api\\.cohere\\.ai/.*$",
"^https://bedrock-runtime\\..*[a-z0-9-]\\.amazonaws\\.com/.*$"
"^https://bedrock-runtime\\..*[a-z0-9-]\\.amazonaws\\.com/.*$",
"^https://bedrock-agent-runtime\\..*[a-z0-9-]\\.amazonaws\\.com/.*$"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we combine these two bedrock endpoint into one?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean regex like the following?
^https://(?:bedrock-runtime|bedrock-agent-runtime)\\..*[a-z0-9-]\\.amazonaws\\.com/.*$

But I think the current code is more readable, so I prefer remain unchanged.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean bedrock.* to include all bedrock related, so we don't need to add more if there has another bedrock-xyz. I think it's ok to keep as two for now and merge into one if we have more bedrock endpoints comes after.

),
Function.identity(),
Setting.Property.NodeScope,
Expand Down
Loading