Skip to content

Commit 1a33227

Browse files
b4sjoob4sjoo
authored
Add more logs for automated model interface creation (opensearch-project#2778)
* Added logging for automated model interface creation Signed-off-by: b4sjoo <sicheng.song@outlook.com> * fix test Signed-off-by: b4sjoo <sicheng.song@outlook.com> * change debug level Signed-off-by: b4sjoo <sicheng.song@outlook.com> --------- Signed-off-by: b4sjoo <sicheng.song@outlook.com>
1 parent 36d5caa commit 1a33227

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

‎common/src/main/java/org/opensearch/ml/common/utils/ModelInterfaceUtils.java

+14-5
Original file line numberDiff line numberDiff line change
@@ -558,38 +558,47 @@ private static Map<String, String> createPresetModelInterfaceByConnector(Connect
558558
if (connector.getParameters() != null) {
559559
switch ((connector.getParameters().get("service_name") != null) ? connector.getParameters().get("service_name") : "null") {
560560
case "bedrock":
561-
log.info("Creating preset model interface for Amazon Bedrock model: {}", connector.getParameters().get("model"));
561+
log.debug("Detected Amazon Bedrock model");
562562
switch ((connector.getParameters().get("model") != null) ? connector.getParameters().get("model") : "null") {
563563
case "ai21.j2-mid-v1":
564+
log.debug("Creating preset model interface for Amazon Bedrock model: {}", connector.getParameters().get("model"));
564565
return BEDROCK_AI21_LABS_JURASSIC2_MID_V1_MODEL_INTERFACE;
565566
case "anthropic.claude-3-sonnet-20240229-v1:0":
567+
log.debug("Creating preset model interface for Amazon Bedrock model: {}", connector.getParameters().get("model"));
566568
return BEDROCK_ANTHROPIC_CLAUDE_V3_SONNET_MODEL_INTERFACE;
567569
case "anthropic.claude-v2":
570+
log.debug("Creating preset model interface for Amazon Bedrock model: {}", connector.getParameters().get("model"));
568571
return BEDROCK_ANTHROPIC_CLAUDE_V2_MODEL_INTERFACE;
569-
case "cohere.embed.english-v3":
572+
case "cohere.embed-english-v3":
573+
log.debug("Creating preset model interface for Amazon Bedrock model: {}", connector.getParameters().get("model"));
570574
return BEDROCK_COHERE_EMBED_ENGLISH_V3_MODEL_INTERFACE;
571-
case "cohere.embed.multilingual-v3":
575+
case "cohere.embed-multilingual-v3":
576+
log.debug("Creating preset model interface for Amazon Bedrock model: {}", connector.getParameters().get("model"));
572577
return BEDROCK_COHERE_EMBED_MULTILINGUAL_V3_MODEL_INTERFACE;
573578
case "amazon.titan-embed-text-v1":
579+
log.debug("Creating preset model interface for Amazon Bedrock model: {}", connector.getParameters().get("model"));
574580
return BEDROCK_TITAN_EMBED_TEXT_V1_MODEL_INTERFACE;
575581
case "amazon.titan-embed-image-v1":
582+
log.debug("Creating preset model interface for Amazon Bedrock model: {}", connector.getParameters().get("model"));
576583
return BEDROCK_TITAN_EMBED_MULTI_MODAL_V1_MODEL_INTERFACE;
577584
default:
578585
return null;
579586
}
580587
case "comprehend":
581-
log.info("Creating preset model interface for Amazon Comprehend DetectDominantLanguage API");
588+
log.debug("Detected Amazon Comprehend model");
582589
switch ((connector.getParameters().get("api_name") != null) ? connector.getParameters().get("api_name") : "null"){
583590
// Single case for switch-case statement due to there is one more API in blueprint for Amazon Comprehend Model
584591
// Not set here because there is more than one input/output schema for the DetectEntities API
585592
// TODO: Add default model interface for Amazon Comprehend DetectEntities APIs
586593
case "DetectDominantLanguage":
594+
log.debug("Creating preset model interface for Amazon Comprehend API: {}", connector.getParameters().get("api_name"));
587595
return AMAZON_COMPREHEND_DETECTDOMAINANTLANGUAGE_API_INTERFACE;
588596
default:
589597
return null;
590598
}
591599
case "textract":
592-
log.info("Creating preset model interface for Amazon Textract DetectDocumentText API");
600+
log.debug("Detected Amazon Textract model");
601+
log.debug("Creating preset model interface for Amazon Textract DetectDocumentText API");
593602
return AMAZON_TEXTRACT_DETECTDOCUMENTTEXT_API_INTERFACE;
594603
default:
595604
return null;

‎common/src/test/java/org/opensearch/ml/common/utils/ModelInterfaceUtilsTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void testUpdateRegisterModelInputModelInterfaceFieldsByConnectorBEDROCK_A
9595
public void testUpdateRegisterModelInputModelInterfaceFieldsByConnectorBEDROCK_COHERE_EMBED_ENGLISH_V3_MODEL_INTERFACE() {
9696
Map<String, String> parameters = new HashMap<>();
9797
parameters.put("service_name", "bedrock");
98-
parameters.put("model", "cohere.embed.english-v3");
98+
parameters.put("model", "cohere.embed-english-v3");
9999
connector = HttpConnector.builder().protocol("http").parameters(parameters).build();
100100

101101
updateRegisterModelInputModelInterfaceFieldsByConnector(registerModelInputWithStandaloneConnector, connector);
@@ -106,7 +106,7 @@ public void testUpdateRegisterModelInputModelInterfaceFieldsByConnectorBEDROCK_C
106106
public void testUpdateRegisterModelInputModelInterfaceFieldsByConnectorBEDROCK_COHERE_EMBED_MULTILINGUAL_V3_MODEL_INTERFACE() {
107107
Map<String, String> parameters = new HashMap<>();
108108
parameters.put("service_name", "bedrock");
109-
parameters.put("model", "cohere.embed.multilingual-v3");
109+
parameters.put("model", "cohere.embed-multilingual-v3");
110110
connector = HttpConnector.builder().protocol("http").parameters(parameters).build();
111111

112112
updateRegisterModelInputModelInterfaceFieldsByConnector(registerModelInputWithStandaloneConnector, connector);

0 commit comments

Comments
 (0)