fix getConversations when index not exists

Signed-off-by: Hailong Cui <[email protected]>
Hailong-am · Jan 11, 2024 · 8d8dc35 · 8d8dc35
1 parent f155233
commit 8d8dc35
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/memory/src/main/java/org/opensearch/ml/memory/index/ConversationMetaIndex.java b/memory/src/main/java/org/opensearch/ml/memory/index/ConversationMetaIndex.java
@@ -198,6 +198,7 @@ public void createConversation(String name, ActionListener<String> listener) {
     public void getConversations(int from, int maxResults, ActionListener<List<ConversationMeta>> listener) {
         if (!clusterService.state().metadata().hasIndex(META_INDEX_NAME)) {
             listener.onResponse(List.of());
+            return;
         }
         SearchRequest request = Requests.searchRequest(META_INDEX_NAME);
         String userstr = getUserStrFromThreadContext();
@@ -250,6 +251,7 @@ public void getConversations(int maxResults, ActionListener<List<ConversationMet
     public void deleteConversation(String conversationId, ActionListener<Boolean> listener) {
         if (!clusterService.state().metadata().hasIndex(META_INDEX_NAME)) {
             listener.onResponse(true);
+            return;
         }
         DeleteRequest delRequest = Requests.deleteRequest(META_INDEX_NAME).id(conversationId);
         String userstr = getUserStrFromThreadContext();

diff --git a/plugin/src/test/java/org/opensearch/ml/rest/MLModelGroupRestIT.java b/plugin/src/test/java/org/opensearch/ml/rest/MLModelGroupRestIT.java
@@ -1222,21 +1222,21 @@ public void test_get_modelGroup() throws IOException {
                 getModelGroup(
                     user2Client,
                     modelGroupId1,
-                    getModelGroupResult -> { assertTrue(getModelGroupResult.containsKey("model_group_id")); }
+                    getModelGroupResult -> { assertEquals(getModelGroupResult.get("name"), "testModelGroup1"); }
                 );
 
                 // Admin successfully gets model group
                 getModelGroup(
                     client(),
                     modelGroupId1,
-                    getModelGroupResult -> { assertTrue(getModelGroupResult.containsKey("model_group_id")); }
+                    getModelGroupResult -> { assertEquals(getModelGroupResult.get("name"), "testModelGroup1"); }
                 );
             } catch (IOException e) {
                 assertNull(e);
             }
             // User2 fails to get model group
             try {
-                getModelGroup(user3Client, modelGroupId, null);
+                getModelGroup(user3Client, modelGroupId1, null);
             } catch (Exception e) {
                 assertEquals(ResponseException.class, e.getClass());
                 assertTrue(
@@ -1256,21 +1256,21 @@ public void test_get_modelGroup() throws IOException {
                 getModelGroup(
                     user1Client,
                     modelGroupId2,
-                    getModelGroupResult -> { assertTrue(getModelGroupResult.containsKey("model_group_id")); }
+                    getModelGroupResult -> { assertEquals(getModelGroupResult.get("name"), "testModelGroup2"); }
                 );
 
                 // User3 successfully gets model group
                 getModelGroup(
                     user3Client,
                     modelGroupId2,
-                    getModelGroupResult -> { assertTrue(getModelGroupResult.containsKey("model_group_id")); }
+                    getModelGroupResult -> { assertEquals(getModelGroupResult.get("name"), "testModelGroup2"); }
                 );
 
                 // User4 successfully gets model group
                 getModelGroup(
                     user4Client,
                     modelGroupId2,
-                    getModelGroupResult -> { assertTrue(getModelGroupResult.containsKey("model_group_id")); }
+                    getModelGroupResult -> { assertEquals(getModelGroupResult.get("name"), "testModelGroup2"); }
                 );
             } catch (IOException e) {
                 assertNull(e);
@@ -1286,14 +1286,14 @@ public void test_get_modelGroup() throws IOException {
                 getModelGroup(
                     user3Client,
                     modelGroupId3,
-                    getModelGroupResult -> { assertTrue(getModelGroupResult.containsKey("model_group_id")); }
+                    getModelGroupResult -> { assertEquals(getModelGroupResult.get("name"), "testModelGroup3"); }
                 );
 
                 // Admin successfully gets model group
                 getModelGroup(
                     client(),
                     modelGroupId3,
-                    getModelGroupResult -> { assertTrue(getModelGroupResult.containsKey("model_group_id")); }
+                    getModelGroupResult -> { assertEquals(getModelGroupResult.get("name"), "testModelGroup3"); }
                 );
             } catch (IOException e) {
                 assertNull(e);
@@ -1320,7 +1320,7 @@ public void test_get_modelGroup() throws IOException {
                 getModelGroup(
                     client(),
                     modelGroupId4,
-                    getModelGroupResult -> { assertTrue(getModelGroupResult.containsKey("model_group_id")); }
+                    getModelGroupResult -> { assertEquals(getModelGroupResult.get("name"), "testModelGroup4"); }
                 );
             } catch (IOException e) {
                 assertNull(e);