From acfb4a9b9ea74946ff25794346d75f88995f08a7 Mon Sep 17 00:00:00 2001
From: Jing Zhang <jngz@amazon.com>
Date: Thu, 11 Apr 2024 17:56:08 -0700
Subject: [PATCH] fix stopwords npe (#2311)

Signed-off-by: Jing Zhang <jngz@amazon.com>
---
 .../org/opensearch/ml/common/model/MLGuard.java   |  4 +++-
 .../opensearch/ml/common/model/MLGuardTests.java  | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/common/src/main/java/org/opensearch/ml/common/model/MLGuard.java b/common/src/main/java/org/opensearch/ml/common/model/MLGuard.java
index 72fc5eb14f..dcb0e65ad7 100644
--- a/common/src/main/java/org/opensearch/ml/common/model/MLGuard.java
+++ b/common/src/main/java/org/opensearch/ml/common/model/MLGuard.java
@@ -77,7 +77,9 @@ private void fillStopWordsToMap(@NonNull Guardrail guardrail, Map<String, List<S
             return;
         }
         for (StopWords e : stopWords) {
-            map.put(e.getIndex(), Arrays.asList(e.getSourceFields()));
+            if (e.getIndex() != null && e.getSourceFields() != null) {
+                map.put(e.getIndex(), Arrays.asList(e.getSourceFields()));
+            }
         }
     }
 
diff --git a/common/src/test/java/org/opensearch/ml/common/model/MLGuardTests.java b/common/src/test/java/org/opensearch/ml/common/model/MLGuardTests.java
index 6a7e7fece6..4af3072c8a 100644
--- a/common/src/test/java/org/opensearch/ml/common/model/MLGuardTests.java
+++ b/common/src/test/java/org/opensearch/ml/common/model/MLGuardTests.java
@@ -87,6 +87,21 @@ public void validateInput() {
         Assert.assertFalse(res);
     }
 
+    @Test
+    public void validateInitializedStopWordsEmpty() {
+        stopWords = new StopWords(null, null);
+        regex = List.of("(.|\n)*stop words(.|\n)*").toArray(new String[0]);
+        regexPatterns = List.of(Pattern.compile("(.|\n)*stop words(.|\n)*"));
+        inputGuardrail = new Guardrail(List.of(stopWords), regex);
+        outputGuardrail = new Guardrail(List.of(stopWords), regex);
+        guardrails = new Guardrails("test_type", inputGuardrail, outputGuardrail);
+        mlGuard = new MLGuard(guardrails, xContentRegistry, client);
+
+        String input = "\n\nHuman:hello good words.\n\nAssistant:";
+        Boolean res = mlGuard.validate(input, MLGuard.Type.INPUT);
+        Assert.assertTrue(res);
+    }
+
     @Test
     public void validateOutput() {
         String input = "\n\nHuman:hello stop words.\n\nAssistant:";