From 5f0a357bc2b43e5bc40bf77fa08cdbe78d7f5948 Mon Sep 17 00:00:00 2001 From: Joshua Palis Date: Wed, 8 Nov 2023 23:29:04 +0000 Subject: [PATCH] Addressing PR comments,making description field optional for RegisterRemoteModelStep and RegisterLocalModelStep Signed-off-by: Joshua Palis --- .../workflow/RegisterLocalModelStep.java | 13 ++----------- .../workflow/RegisterRemoteModelStep.java | 2 +- src/main/resources/mappings/workflow-steps.json | 2 -- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/opensearch/flowframework/workflow/RegisterLocalModelStep.java b/src/main/java/org/opensearch/flowframework/workflow/RegisterLocalModelStep.java index 5e30f20cf..77a7665f1 100644 --- a/src/main/java/org/opensearch/flowframework/workflow/RegisterLocalModelStep.java +++ b/src/main/java/org/opensearch/flowframework/workflow/RegisterLocalModelStep.java @@ -145,17 +145,8 @@ public void onFailure(Exception e) { } } - if (Stream.of( - modelName, - modelVersion, - description, - modelFormat, - modelGroupId, - embeddingDimension, - frameworkType, - modelContentHashValue, - url - ).allMatch(x -> x != null)) { + if (Stream.of(modelName, modelVersion, modelFormat, modelGroupId, embeddingDimension, frameworkType, modelContentHashValue, url) + .allMatch(x -> x != null)) { // Create model configuration, assuming null pooling mode, null model max length, normalize results set to false TextEmbeddingModelConfigBuilder builder = TextEmbeddingModelConfig.builder(); diff --git a/src/main/java/org/opensearch/flowframework/workflow/RegisterRemoteModelStep.java b/src/main/java/org/opensearch/flowframework/workflow/RegisterRemoteModelStep.java index 76fdd3b4c..85e46a8cb 100644 --- a/src/main/java/org/opensearch/flowframework/workflow/RegisterRemoteModelStep.java +++ b/src/main/java/org/opensearch/flowframework/workflow/RegisterRemoteModelStep.java @@ -115,7 +115,7 @@ public void onFailure(Exception e) { } } - if (Stream.of(modelName, functionName, description, connectorId).allMatch(x -> x != null)) { + if (Stream.of(modelName, functionName, connectorId).allMatch(x -> x != null)) { MLRegisterModelInputBuilder builder = MLRegisterModelInput.builder(); diff --git a/src/main/resources/mappings/workflow-steps.json b/src/main/resources/mappings/workflow-steps.json index 94cdfcc92..6256189c1 100644 --- a/src/main/resources/mappings/workflow-steps.json +++ b/src/main/resources/mappings/workflow-steps.json @@ -43,7 +43,6 @@ "inputs":[ "name", "version", - "description", "model_format", "model_group_id", "model_content_hash_value", @@ -61,7 +60,6 @@ "inputs": [ "name", "function_name", - "description", "connector_id" ], "outputs": [