Skip to content

Commit c72b4a2

Browse files
opensearch-trigger-bot[bot]b4sjoo
opensearch-trigger-bot[bot]
and
b4sjoo
authored
Fix remote inference blueprints (opensearch-project#2692) (opensearch-project#2693)
Signed-off-by: b4sjoo <sicheng.song@outlook.com> (cherry picked from commit d57e0b3) Co-authored-by: Sicheng Song <sicheng.song@outlook.com>
1 parent 0a6a2b0 commit c72b4a2

7 files changed

+26
-22
lines changed

‎docs/remote_inference_blueprints/amazon_comprehend_connector_blueprint.md

+4-8
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ POST /_plugins/_ml/connectors/_create
4747
"parameters": {
4848
"service_name": "comprehend",
4949
"region": "us-east-1",
50-
"endpoint": "https://${parameters.service_name}.${parameters.region}.amazonaws.com",
5150
"api_version": "20171127",
5251
"api_name": "DetectDominantLanguage",
5352
"api": "Comprehend_${parameters.api_version}.${parameters.api_name}",
@@ -57,7 +56,7 @@ POST /_plugins/_ml/connectors/_create
5756
{
5857
"action_type": "predict",
5958
"method": "POST",
60-
"url": "${parameters.endpoint}",
59+
"url": "https://${parameters.service_name}.${parameters.region}.amazonaws.com",
6160
"headers": {
6261
"X-Amz-Target": "${parameters.api}",
6362
"content-type": "application/x-amz-json-1.1"
@@ -87,7 +86,6 @@ POST /_plugins/_ml/connectors/_create
8786
"parameters": {
8887
"service_name": "comprehend",
8988
"region": "us-east-1",
90-
"endpoint": "https://${parameters.service_name}.${parameters.region}.amazonaws.com",
9189
"api_version": "20171127",
9290
"api_name": "DetectDominantLanguage",
9391
"api": "Comprehend_${parameters.api_version}.${parameters.api_name}",
@@ -97,7 +95,7 @@ POST /_plugins/_ml/connectors/_create
9795
{
9896
"action_type": "predict",
9997
"method": "POST",
100-
"url": "${parameters.endpoint}",
98+
"url": "https://${parameters.service_name}.${parameters.region}.amazonaws.com",
10199
"headers": {
102100
"X-Amz-Target": "${parameters.api}",
103101
"content-type": "application/x-amz-json-1.1"
@@ -400,7 +398,6 @@ POST /_plugins/_ml/connectors/_create
400398
"parameters": {
401399
"service_name": "comprehend",
402400
"region": "us-east-1",
403-
"endpoint": "https://${parameters.service_name}.${parameters.region}.amazonaws.com",
404401
"api_version": "20171127",
405402
"api_name": "DetectEntities",
406403
"api": "Comprehend_${parameters.api_version}.${parameters.api_name}",
@@ -410,7 +407,7 @@ POST /_plugins/_ml/connectors/_create
410407
{
411408
"action_type": "predict",
412409
"method": "POST",
413-
"url": "${parameters.endpoint}",
410+
"url": "https://${parameters.service_name}.${parameters.region}.amazonaws.com",
414411
"headers": {
415412
"X-Amz-Target": "${parameters.api}",
416413
"content-type": "application/x-amz-json-1.1"
@@ -440,7 +437,6 @@ POST /_plugins/_ml/connectors/_create
440437
"parameters": {
441438
"service_name": "comprehend",
442439
"region": "us-east-1",
443-
"endpoint": "https://${parameters.service_name}.${parameters.region}.amazonaws.com",
444440
"api_version": "20171127",
445441
"api_name": "DetectEntities",
446442
"api": "Comprehend_${parameters.api_version}.${parameters.api_name}",
@@ -450,7 +446,7 @@ POST /_plugins/_ml/connectors/_create
450446
{
451447
"action_type": "predict",
452448
"method": "POST",
453-
"url": "${parameters.endpoint}",
449+
"url": "https://${parameters.service_name}.${parameters.region}.amazonaws.com",
454450
"headers": {
455451
"X-Amz-Target": "${parameters.api}",
456452
"content-type": "application/x-amz-json-1.1"

‎docs/remote_inference_blueprints/amazon_textract_connector_blueprint.md

+8-4
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,17 @@ POST /_plugins/_ml/connectors/_create
4242
},
4343
"parameters": {
4444
"region": "<PLEASE ADD YOUR AWS REGION like us-west-2>",
45-
"service_name": "textract"
45+
"service_name": "textract",
46+
"api_name": "DetectDocumentText",
47+
"api": "Textract.${parameters.api_name}"
4648
},
4749
"actions": [
4850
{
4951
"action_type": "predict",
5052
"method": "POST",
5153
"headers": {
5254
"content-type": "application/x-amz-json-1.1",
53-
"X-Amz-Target": "Textract.DetectDocumentText"
55+
"X-Amz-Target": "${parameters.api}"
5456
},
5557
"url": "https://${parameters.service_name}.${parameters.region}.amazonaws.com",
5658
"request_body": "{ \"Document\": { \"Bytes\": \"${parameters.bytes}\" } } "
@@ -77,15 +79,17 @@ POST /_plugins/_ml/connectors/_create
7779
},
7880
"parameters": {
7981
"region": "<PLEASE ADD YOUR AWS REGION like us-west-2>",
80-
"service_name": "textract"
82+
"service_name": "textract",
83+
"api_name": "DetectDocumentText",
84+
"api": "Textract.${parameters.api_name}"
8185
},
8286
"actions": [
8387
{
8488
"action_type": "predict",
8589
"method": "POST",
8690
"headers": {
8791
"content-type": "application/x-amz-json-1.1",
88-
"X-Amz-Target": "Textract.DetectDocumentText"
92+
"X-Amz-Target": "${parameters.api}"
8993
},
9094
"url": "https://${parameters.service_name}.${parameters.region}.amazonaws.com",
9195
"request_body": "{ \"Document\": { \"Bytes\": \"${parameters.bytes}\" } } "

‎docs/remote_inference_blueprints/bedrock_connector_ai21labs_jurassic_blueprint.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ POST /_plugins/_ml/connectors/_create
2828
"protocol": "aws_sigv4",
2929
"credential": {
3030
"access_key": "<PLEASE ADD YOUR AWS ACCESS KEY HERE>",
31-
"secret_key": "<PLEASE ADD YOUR AWS SECRET KEY HERE>"
31+
"secret_key": "<PLEASE ADD YOUR AWS SECRET KEY HERE>",
32+
"session_token": "<PLEASE ADD YOUR AWS SECURITY TOKEN HERE>"
3233
},
3334
"parameters": {
3435
"region": "<PLEASE ADD YOUR AWS REGION HERE>",
@@ -42,7 +43,7 @@ POST /_plugins/_ml/connectors/_create
4243
"headers": {
4344
"content-type": "application/json"
4445
},
45-
"url": "https://bedrock-runtime.${parameters.region}.amazonaws.com/model/${parameters.model_name}/invoke",
46+
"url": "https://bedrock-runtime.${parameters.region}.amazonaws.com/model/${parameters.model}/invoke",
4647
"request_body": "{\"prompt\":\"${parameters.inputs}\",\"maxTokens\":200,\"temperature\":0.7,\"topP\":1,\"stopSequences\":[],\"countPenalty\":{\"scale\":0},\"presencePenalty\":{\"scale\":0},\"frequencyPenalty\":{\"scale\":0}}",
4748
"post_process_function": "\n return params['completions'][0].data.text; \n"
4849
}
@@ -66,7 +67,7 @@ POST /_plugins/_ml/connectors/_create
6667
"parameters": {
6768
"region": "<PLEASE ADD YOUR AWS REGION HERE>",
6869
"service_name": "bedrock",
69-
"model_name": "ai21.j2-mid-v1"
70+
"model": "ai21.j2-mid-v1"
7071
},
7172
"actions": [
7273
{
@@ -75,7 +76,7 @@ POST /_plugins/_ml/connectors/_create
7576
"headers": {
7677
"content-type": "application/json"
7778
},
78-
"url": "https://bedrock-runtime.${parameters.region}.amazonaws.com/model/${parameters.model_name}/invoke",
79+
"url": "https://bedrock-runtime.${parameters.region}.amazonaws.com/model/${parameters.model}/invoke",
7980
"request_body": "{\"prompt\":\"${parameters.inputs}\",\"maxTokens\":200,\"temperature\":0.7,\"topP\":1,\"stopSequences\":[],\"countPenalty\":{\"scale\":0},\"presencePenalty\":{\"scale\":0},\"frequencyPenalty\":{\"scale\":0}}",
8081
"post_process_function": "\n return params['completions'][0].data.text; \n"
8182
}

‎docs/remote_inference_blueprints/bedrock_connector_anthropic_claude3_blueprint.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ POST /_plugins/_ml/connectors/_create
7373
"auth": "Sig_V4",
7474
"response_filter": "$.content[0].text",
7575
"max_tokens_to_sample": "8000",
76-
"anthropic_version": "bedrock-2023-05-31"
76+
"anthropic_version": "bedrock-2023-05-31",
77+
"model": "anthropic.claude-3-sonnet-20240229-v1:0"
7778
},
7879
"actions": [
7980
{
@@ -82,7 +83,7 @@ POST /_plugins/_ml/connectors/_create
8283
"headers": {
8384
"content-type": "application/json"
8485
},
85-
"url": "https://bedrock-runtime.us-east-1.amazonaws.com/model/anthropic.claude-3-sonnet-20240229-v1:0/invoke",
86+
"url": "https://bedrock-runtime.us-east-1.amazonaws.com/model/${parameters.model}/invoke",
8687
"request_body": "{\"messages\":[{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"${parameters.prompt}\"}]}],\"anthropic_version\":\"${parameters.anthropic_version}\",\"max_tokens\":${parameters.max_tokens_to_sample}}"
8788
}
8889
]

‎docs/remote_inference_blueprints/bedrock_connector_anthropic_claude_blueprint.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ POST /_plugins/_ml/connectors/_create
6565
},
6666
"parameters": {
6767
"region": "<PLEASE ADD YOUR AWS REGION HERE>",
68-
"service_name": "bedrock"
68+
"service_name": "bedrock",
69+
"model": "anthropic.claude-v2"
6970
},
7071
"actions": [
7172
{
@@ -74,7 +75,7 @@ POST /_plugins/_ml/connectors/_create
7475
"headers": {
7576
"content-type": "application/json"
7677
},
77-
"url": "https://bedrock-runtime.${parameters.region}.amazonaws.com/model/anthropic.claude-v2/invoke",
78+
"url": "https://bedrock-runtime.${parameters.region}.amazonaws.com/model/${parameters.model}/invoke",
7879
"request_body": "{\"prompt\":\"\\n\\nHuman: ${parameters.inputs}\\n\\nAssistant:\",\"max_tokens_to_sample\":300,\"temperature\":0.5,\"top_k\":250,\"top_p\":1,\"stop_sequences\":[\"\\\\n\\\\nHuman:\"]}"
7980
}
8081
]

‎docs/remote_inference_blueprints/bedrock_connector_titan_embedding_blueprint.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ POST /_plugins/_ml/connectors/_create
7676
{
7777
"action_type": "predict",
7878
"method": "POST",
79-
"url": "https://bedrock-runtime.${parameters.region}.amazonaws.com/model/amazon.titan-embed-text-v1/invoke",
79+
"url": "https://bedrock-runtime.${parameters.region}.amazonaws.com/model/${parameters.model}/invoke",
8080
"headers": {
8181
"content-type": "application/json",
8282
"x-amz-content-sha256": "required"

‎docs/remote_inference_blueprints/bedrock_connector_titan_multimodal_embedding_blueprint.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ POST /_plugins/_ml/connectors/_create
6767
"parameters": {
6868
"region": "<PLEASE ADD YOUR AWS REGION HERE>",
6969
"service_name": "bedrock",
70+
"model": "amazon.titan-embed-image-v1",
7071
"input_docs_processed_step_size": 2
7172
},
7273
"credential": {
@@ -76,7 +77,7 @@ POST /_plugins/_ml/connectors/_create
7677
{
7778
"action_type": "predict",
7879
"method": "POST",
79-
"url": "https://bedrock-runtime.${parameters.region}.amazonaws.com/model/amazon.titan-embed-image-v1/invoke",
80+
"url": "https://bedrock-runtime.${parameters.region}.amazonaws.com/model/${parameters.model}/invoke",
8081
"headers": {
8182
"content-type": "application/json",
8283
"x-amz-content-sha256": "required"

0 commit comments

Comments
 (0)