This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch haiku-claude-support
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 07ca87b178df1c089946d0532c1109fbd9bf1237
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed Apr 3 13:28:18 2024 +0200
CAMEL-20642 - Camel-AWS-Bedrock: Support Anthropic Haiku model
Signed-off-by: Andrea Cosentino <anco...@gmail.com>
---
.../org/apache/camel/component/aws2/bedrock/runtime/aws-bedrock.json | 4 ++--
.../camel/component/aws2/bedrock/runtime/BedrockConfiguration.java | 2 +-
.../component/aws2/bedrock/runtime/integration/BedrockProducerIT.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/components/camel-aws/camel-aws-bedrock/src/generated/resources/META-INF/org/apache/camel/component/aws2/bedrock/runtime/aws-bedrock.json
b/components/camel-aws/camel-aws-bedrock/src/generated/resources/META-INF/org/apache/camel/component/aws2/bedrock/runtime/aws-bedrock.json
index d60b0e4559f..81632b556d9 100644
---
a/components/camel-aws/camel-aws-bedrock/src/generated/resources/META-INF/org/apache/camel/component/aws2/bedrock/runtime/aws-bedrock.json
+++
b/components/camel-aws/camel-aws-bedrock/src/generated/resources/META-INF/org/apache/camel/component/aws2/bedrock/runtime/aws-bedrock.json
@@ -25,7 +25,7 @@
"componentProperties": {
"configuration": { "index": 0, "kind": "property", "displayName":
"Configuration", "group": "producer", "label": "", "required": false, "type":
"object", "javaType":
"org.apache.camel.component.aws2.bedrock.runtime.BedrockConfiguration",
"deprecated": false, "autowired": false, "secret": false, "description":
"Component configuration" },
"lazyStartProducer": { "index": 1, "kind": "property", "displayName":
"Lazy Start Producer", "group": "producer", "label": "producer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether the producer should be started lazy (on the first message). By
starting lazy you can use this to allow CamelContext and routes to startup in
situations where a producer may otherwise fail [...]
- "modelId": { "index": 2, "kind": "property", "displayName": "Model Id",
"group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "enum": [ "amazon.titan-text-express-v1",
"amazon.titan-text-lite-v1", "amazon.titan-image-generator-v1",
"amazon.titan-embed-text-v1", "ai21.j2-ultra-v1", "ai21.j2-mid-v1",
"anthropic.claude-instant-v1", "anthropic.claude-v2", "anthropic.claude-v2:1",
"anthropic.claude-3-sonnet-20240229-v1:0" ], "deprecated": fa [...]
+ "modelId": { "index": 2, "kind": "property", "displayName": "Model Id",
"group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "enum": [ "amazon.titan-text-express-v1",
"amazon.titan-text-lite-v1", "amazon.titan-image-generator-v1",
"amazon.titan-embed-text-v1", "ai21.j2-ultra-v1", "ai21.j2-mid-v1",
"anthropic.claude-instant-v1", "anthropic.claude-v2", "anthropic.claude-v2:1",
"anthropic.claude-3-sonnet-20240229-v1:0", "anthropic.claude- [...]
"operation": { "index": 3, "kind": "property", "displayName": "Operation",
"group": "producer", "label": "", "required": true, "type": "object",
"javaType":
"org.apache.camel.component.aws2.bedrock.runtime.BedrockOperations", "enum": [
"invokeTextModel", "invokeImageModel", "invokeEmbeddingsModel" ], "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.runtime.BedrockConfiguration",
"configurat [...]
"overrideEndpoint": { "index": 4, "kind": "property", "displayName":
"Override Endpoint", "group": "producer", "label": "", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.runtime.BedrockConfiguration",
"configurationField": "configuration", "description": "Set the need for
overriding the endpoint. This option needs to be used in [...]
"pojoRequest": { "index": 5, "kind": "property", "displayName": "Pojo
Request", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.runtime.BedrockConfiguration",
"configurationField": "configuration", "description": "If we want to use a POJO
request as body or not" },
@@ -54,7 +54,7 @@
},
"properties": {
"label": { "index": 0, "kind": "path", "displayName": "Label", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.runtime.BedrockConfiguration",
"configurationField": "configuration", "description": "Logical name" },
- "modelId": { "index": 1, "kind": "parameter", "displayName": "Model Id",
"group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "enum": [ "amazon.titan-text-express-v1",
"amazon.titan-text-lite-v1", "amazon.titan-image-generator-v1",
"amazon.titan-embed-text-v1", "ai21.j2-ultra-v1", "ai21.j2-mid-v1",
"anthropic.claude-instant-v1", "anthropic.claude-v2", "anthropic.claude-v2:1",
"anthropic.claude-3-sonnet-20240229-v1:0" ], "deprecated": f [...]
+ "modelId": { "index": 1, "kind": "parameter", "displayName": "Model Id",
"group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "enum": [ "amazon.titan-text-express-v1",
"amazon.titan-text-lite-v1", "amazon.titan-image-generator-v1",
"amazon.titan-embed-text-v1", "ai21.j2-ultra-v1", "ai21.j2-mid-v1",
"anthropic.claude-instant-v1", "anthropic.claude-v2", "anthropic.claude-v2:1",
"anthropic.claude-3-sonnet-20240229-v1:0", "anthropic.claude [...]
"operation": { "index": 2, "kind": "parameter", "displayName":
"Operation", "group": "producer", "label": "", "required": true, "type":
"object", "javaType":
"org.apache.camel.component.aws2.bedrock.runtime.BedrockOperations", "enum": [
"invokeTextModel", "invokeImageModel", "invokeEmbeddingsModel" ], "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.runtime.BedrockConfiguration",
"configura [...]
"overrideEndpoint": { "index": 3, "kind": "parameter", "displayName":
"Override Endpoint", "group": "producer", "label": "", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.runtime.BedrockConfiguration",
"configurationField": "configuration", "description": "Set the need for
overriding the endpoint. This option needs to be used i [...]
"pojoRequest": { "index": 4, "kind": "parameter", "displayName": "Pojo
Request", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.runtime.BedrockConfiguration",
"configurationField": "configuration", "description": "If we want to use a POJO
request as body or not" },
diff --git
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockConfiguration.java
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockConfiguration.java
index 718d695f496..99a133c7a46 100644
---
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockConfiguration.java
+++
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockConfiguration.java
@@ -39,7 +39,7 @@ public class BedrockConfiguration implements Cloneable {
private String secretKey;
@UriParam(label = "security", secret = true)
private String sessionToken;
- @UriParam(enums =
"amazon.titan-text-express-v1,amazon.titan-text-lite-v1,amazon.titan-image-generator-v1,amazon.titan-embed-text-v1,ai21.j2-ultra-v1,ai21.j2-mid-v1,anthropic.claude-instant-v1,anthropic.claude-v2,anthropic.claude-v2:1,anthropic.claude-3-sonnet-20240229-v1:0")
+ @UriParam(enums =
"amazon.titan-text-express-v1,amazon.titan-text-lite-v1,amazon.titan-image-generator-v1,amazon.titan-embed-text-v1,ai21.j2-ultra-v1,ai21.j2-mid-v1,anthropic.claude-instant-v1,anthropic.claude-v2,anthropic.claude-v2:1,anthropic.claude-3-sonnet-20240229-v1:0,anthropic.claude-3-haiku-20240307-v1:0")
@Metadata(required = true)
private String modelId;
@UriParam
diff --git
a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
index 85600c4d4a2..05f720a0a60 100644
---
a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
+++
b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
@@ -444,7 +444,7 @@ class BedrockProducerIT extends CamelTestSupport {
from("direct:send_anthropic_v3_haiku_model")
.to("aws-bedrock:label?accessKey=RAW({{aws.manual.access.key}})&secretKey=RAW({{aws.manual.secret.key}}®ion=us-east-1&operation=invokeTextModel&modelId="
- +
BedrockModels.ANTROPHIC_CLAUDE_HAIKU_V3.model)
+ + BedrockModels.ANTROPHIC_CLAUDE_HAIKU_V3.model)
.log("Completions: ${body}")
.to(result);
}
