Skip to content

CAMEL-20560 - Camel-AWS-Bedrock: Support Anthropic models #13462

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
oscerd merged 1 commit into from
Mar 13, 2024
Merged

CAMEL-20560 - Camel-AWS-Bedrock: Support Anthropic models #13462

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
5 changes: 3 additions & 2 deletions ...amel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ public enum BedrockModels {
JURASSIC2_ULTRA("ai21.j2-ultra-v1"),
JURASSIC2_MID("ai21.j2-mid-v1"),
ANTROPHIC_CLAUDE_INSTANT_V1("anthropic.claude-instant-v1"),
ANTROPHIC_CLAUDE_INSTANT_V2("anthropic.claude-v2"),
ANTROPHIC_CLAUDE_INSTANT_V2_1("anthropic.claude-v2:1");
ANTROPHIC_CLAUDE_V2("anthropic.claude-v2"),
ANTROPHIC_CLAUDE_V2_1("anthropic.claude-v2:1"),
ANTROPHIC_CLAUDE_V3("anthropic.claude-3-sonnet-20240229-v1:0");

public final String model;

Expand Down
26 changes: 26 additions & 0 deletions ...edrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,20 @@ protected void setResponseText(InvokeModelResponse result, Message message) {
throw new RuntimeException(e);
}
}
case "anthropic.claude-instant-v1", "anthropic.claude-v2", "anthropic.claude-v2:1" -> {
try {
setAnthropicText(result, message);
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
}
}
case "anthropic.claude-3-sonnet-20240229-v1:0" -> {
try {
setAnthropicV3Text(result, message);
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
}
}
default -> throw new IllegalStateException("Unexpected value: " + getConfiguration().getModelId());
}
}
Expand All @@ -256,6 +270,18 @@ private void setAi21Text(InvokeModelResponse result, Message message) throws Jso
message.setBody(jsonString.get("completions"));
}

private void setAnthropicText(InvokeModelResponse result, Message message) throws JsonProcessingException {
ObjectMapper mapper = new ObjectMapper();
JsonNode jsonString = mapper.readTree(result.body().asUtf8String());
message.setBody(jsonString.get("completion"));
}

private void setAnthropicV3Text(InvokeModelResponse result, Message message) throws JsonProcessingException {
ObjectMapper mapper = new ObjectMapper();
JsonNode jsonString = mapper.readTree(result.body().asUtf8String());
message.setBody(jsonString);
}

public static Message getMessageForResponse(final Exchange exchange) {
return exchange.getMessage();
}
Expand Down
150 changes: 145 additions & 5 deletions ...t/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@
package org.apache.camel.component.aws2.bedrock.runtime.integration;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.IntNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.databind.node.TextNode;
import com.fasterxml.jackson.databind.node.*;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
Expand Down Expand Up @@ -220,6 +217,125 @@ public void testInvokeJurassic2MidModel() throws InterruptedException {
MockEndpoint.assertIsSatisfied(context);
}

@Test
public void testInvokeAnthropicV1Model() throws InterruptedException {

result.expectedMessageCount(1);
final Exchange result = template.send("direct:send_anthropic_v1_model", exchange -> {
ObjectMapper mapper = new ObjectMapper();
ObjectNode rootNode = mapper.createObjectNode();
rootNode.putIfAbsent("prompt",
new TextNode("Human: Can you tell the history of Mayflower? \\n\\Assistant:"));

ArrayNode stopSequences = mapper.createArrayNode();
stopSequences.add("Human:");
rootNode.putIfAbsent("max_tokens_to_sample", new IntNode(300));
rootNode.putIfAbsent("stop_sequences", stopSequences);
rootNode.putIfAbsent("temperature", new DoubleNode(0.5));
rootNode.putIfAbsent("top_p", new IntNode(1));
rootNode.putIfAbsent("top_k", new IntNode(250));
rootNode.putIfAbsent("anthropic_version", new TextNode("bedrock-2023-05-31"));

exchange.getMessage().setBody(mapper.writer().writeValueAsString(rootNode));
exchange.getMessage().setHeader(BedrockConstants.MODEL_CONTENT_TYPE, "application/json");
exchange.getMessage().setHeader(BedrockConstants.MODEL_ACCEPT_CONTENT_TYPE, "application/json");
});

MockEndpoint.assertIsSatisfied(context);
}

@Test
public void testInvokeAnthropicV2Model() throws InterruptedException {

result.expectedMessageCount(1);
final Exchange result = template.send("direct:send_anthropic_v2_model", exchange -> {
ObjectMapper mapper = new ObjectMapper();
ObjectNode rootNode = mapper.createObjectNode();
rootNode.putIfAbsent("prompt",
new TextNode("Human: Can you tell the history of Mayflower? \\n\\Assistant:"));

ArrayNode stopSequences = mapper.createArrayNode();
stopSequences.add("Human:");
rootNode.putIfAbsent("max_tokens_to_sample", new IntNode(300));
rootNode.putIfAbsent("stop_sequences", stopSequences);
rootNode.putIfAbsent("temperature", new DoubleNode(0.5));
rootNode.putIfAbsent("top_p", new IntNode(1));
rootNode.putIfAbsent("top_k", new IntNode(250));
rootNode.putIfAbsent("anthropic_version", new TextNode("bedrock-2023-05-31"));

exchange.getMessage().setBody(mapper.writer().writeValueAsString(rootNode));
exchange.getMessage().setHeader(BedrockConstants.MODEL_CONTENT_TYPE, "application/json");
exchange.getMessage().setHeader(BedrockConstants.MODEL_ACCEPT_CONTENT_TYPE, "application/json");
});

MockEndpoint.assertIsSatisfied(context);
}

@Test
public void testInvokeAnthropicV21Model() throws InterruptedException {

result.expectedMessageCount(1);
final Exchange result = template.send("direct:send_anthropic_v21_model", exchange -> {
ObjectMapper mapper = new ObjectMapper();
ObjectNode rootNode = mapper.createObjectNode();
rootNode.putIfAbsent("prompt",
new TextNode("Human: Can you tell the history of Mayflower? \\n\\Assistant:"));

ArrayNode stopSequences = mapper.createArrayNode();
stopSequences.add("Human:");
rootNode.putIfAbsent("max_tokens_to_sample", new IntNode(300));
rootNode.putIfAbsent("stop_sequences", stopSequences);
rootNode.putIfAbsent("temperature", new DoubleNode(0.5));
rootNode.putIfAbsent("top_p", new IntNode(1));
rootNode.putIfAbsent("top_k", new IntNode(250));
rootNode.putIfAbsent("anthropic_version", new TextNode("bedrock-2023-05-31"));

exchange.getMessage().setBody(mapper.writer().writeValueAsString(rootNode));
exchange.getMessage().setHeader(BedrockConstants.MODEL_CONTENT_TYPE, "application/json");
exchange.getMessage().setHeader(BedrockConstants.MODEL_ACCEPT_CONTENT_TYPE, "application/json");
});

MockEndpoint.assertIsSatisfied(context);
}

@Test
public void testInvokeAnthropicV3Model() throws InterruptedException {

result.expectedMessageCount(1);
final Exchange result = template.send("direct:send_anthropic_v3_model", exchange -> {
ObjectMapper mapper = new ObjectMapper();
ObjectNode rootNode = mapper.createObjectNode();

ArrayNode messages = mapper.createArrayNode();

ObjectNode element = mapper.createObjectNode();
element.putIfAbsent("role", new TextNode("user"));

ArrayNode content = mapper.createArrayNode();

ObjectNode textContent = mapper.createObjectNode();

textContent.putIfAbsent("type", new TextNode("text"));
textContent.putIfAbsent("text", new TextNode("Can you tell the history of Mayflower?"));

content.add(textContent);

element.putIfAbsent("content", content);

messages.add(element);

rootNode.putIfAbsent("messages", messages);
rootNode.putIfAbsent("max_tokens", new IntNode(1000));
rootNode.putIfAbsent("anthropic_version", new TextNode("bedrock-2023-05-31"));

exchange.getMessage().setBody(mapper.writer().writeValueAsString(rootNode));
exchange.getMessage().setHeader(BedrockConstants.MODEL_CONTENT_TYPE, "application/json");
exchange.getMessage().setHeader(BedrockConstants.MODEL_ACCEPT_CONTENT_TYPE, "application/json");
});

MockEndpoint.assertIsSatisfied(context);
}

@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
Expand Down Expand Up @@ -257,12 +373,36 @@ public void configure() {
.to(result);

from("direct:send_jurassic2_mid_model")
.to("aws-bedrock:label?accessKey=RAW({{aws.manual.access.key}})&secretKey=RAW({{aws.manual.secret.key}}&region=us-east-1&operation=invokeTextModel&modelId="
.to("aws-bedrock:label?useDefaultCredentialsProvider=true&region=us-east-1&operation=invokeTextModel&modelId="
+ BedrockModels.JURASSIC2_MID.model)
.split(body())
.transform().jq(".data.text")
.log("Completions: ${body}")
.to(result);

from("direct:send_anthropic_v1_model")
.to("aws-bedrock:label?accessKey=RAW({{aws.manual.access.key}})&secretKey=RAW({{aws.manual.secret.key}}&region=us-east-1&operation=invokeTextModel&modelId="
+ BedrockModels.ANTROPHIC_CLAUDE_INSTANT_V1.model)
.log("${body}")
.to(result);

from("direct:send_anthropic_v2_model")
.to("aws-bedrock:label?accessKey=RAW({{aws.manual.access.key}})&secretKey=RAW({{aws.manual.secret.key}}&region=us-east-1&operation=invokeTextModel&modelId="
+ BedrockModels.ANTROPHIC_CLAUDE_V2.model)
.log("${body}")
.to(result);

from("direct:send_anthropic_v21_model")
.to("aws-bedrock:label?accessKey=RAW({{aws.manual.access.key}})&secretKey=RAW({{aws.manual.secret.key}}&region=us-east-1&operation=invokeTextModel&modelId="
+ BedrockModels.ANTROPHIC_CLAUDE_V2_1.model)
.log("${body}")
.to(result);

from("direct:send_anthropic_v3_model")
.to("aws-bedrock:label?accessKey=RAW({{aws.manual.access.key}})&secretKey=RAW({{aws.manual.secret.key}}&region=us-east-1&operation=invokeTextModel&modelId="
+ BedrockModels.ANTROPHIC_CLAUDE_V3.model)
.log("Completions: ${body}")
.to(result);
}
};
}
Expand Down