Merge remote-tracking branch 'upstream/main' into hsqldb-2

Author: johnoliver

api-test/integration-tests/src/test/java/com/microsoft/semantickernel/tests/connectors/memory/redis/RedisHashSetVectorStoreRecordCollectionTest.java

@@ -369,6 +369,8 @@ private static Stream<Arguments> provideSearchParameters() {
         );
     }
 
+    private final String indexingFailureMessage = "If you are running in a slow machine, data might not be indexed yet. Adjust setup delay if needed";
+
     @ParameterizedTest
     @MethodSource("provideSearchParameters")
     public void search(RecordCollectionOptions options, String embeddingName) {
@@ -385,9 +387,9 @@ public void search(RecordCollectionOptions options, String embeddingName) {
         // Embeddings similar to the third hotel
         List<VectorSearchResult<Hotel>> results = recordCollection.searchAsync(SEARCH_EMBEDDINGS, searchOptions).block();
         assertNotNull(results);
-        assertEquals(VectorSearchOptions.DEFAULT_RESULT_LIMIT, results.size());
+        assertEquals(VectorSearchOptions.DEFAULT_RESULT_LIMIT, results.size(), indexingFailureMessage);
         // The third hotel should be the most similar
-        assertEquals(hotels.get(2).getId(), results.get(0).getRecord().getId());
+        assertEquals(hotels.get(2).getId(), results.get(0).getRecord().getId(), indexingFailureMessage);
         // Score should be different than zero
         assertNotEquals(0.0, results.get(0).getScore());
         assertNull(results.get(0).getRecord().getEuclidean());
@@ -410,9 +412,9 @@ public void searchWithVectors(RecordCollectionOptions options, String embeddingN
         // Embeddings similar to the third hotel
         List<VectorSearchResult<Hotel>> results = recordCollection.searchAsync(SEARCH_EMBEDDINGS, searchOptions).block();
         assertNotNull(results);
-        assertEquals(VectorSearchOptions.DEFAULT_RESULT_LIMIT, results.size());
+        assertEquals(VectorSearchOptions.DEFAULT_RESULT_LIMIT, results.size(), indexingFailureMessage);
         // The third hotel should be the most similar
-        assertEquals(hotels.get(2).getId(), results.get(0).getRecord().getId());
+        assertEquals(hotels.get(2).getId(), results.get(0).getRecord().getId(), indexingFailureMessage);
         assertNotNull(results.get(0).getRecord().getEuclidean());
     }
 
@@ -434,8 +436,8 @@ public void searchWithOffSet(RecordCollectionOptions options, String embeddingNa
         // Embeddings similar to the third hotel
         List<VectorSearchResult<Hotel>> results = recordCollection.searchAsync(SEARCH_EMBEDDINGS, searchOptions).block();
         assertNotNull(results);
-        assertEquals(4, results.size());
+        assertEquals(4, results.size(), indexingFailureMessage);
         // The first hotel should be the most similar
-        assertEquals(hotels.get(0).getId(), results.get(0).getRecord().getId());
+        assertEquals(hotels.get(0).getId(), results.get(0).getRecord().getId(), indexingFailureMessage);
     }
 }

api-test/integration-tests/src/test/java/com/microsoft/semantickernel/tests/connectors/memory/redis/RedisJsonVectorStoreRecordCollectionTest.java

@@ -369,6 +369,8 @@ private static Stream<Arguments> provideSearchParameters() {
         );
     }
 
+    private final String indexingFailureMessage = "If you are running in a slow machine, data might not be indexed yet. Adjust setup delay if needed";
+
     @ParameterizedTest
     @MethodSource("provideSearchParameters")
     public void search(RecordCollectionOptions options, String embeddingName) {
@@ -385,9 +387,9 @@ public void search(RecordCollectionOptions options, String embeddingName) {
         // Embeddings similar to the third hotel
         List<VectorSearchResult<Hotel>> results = recordCollection.searchAsync(SEARCH_EMBEDDINGS, searchOptions).block();
         assertNotNull(results);
-        assertEquals(VectorSearchOptions.DEFAULT_RESULT_LIMIT, results.size());
+        assertEquals(VectorSearchOptions.DEFAULT_RESULT_LIMIT, results.size(), indexingFailureMessage);
         // The third hotel should be the most similar
-        assertEquals(hotels.get(2).getId(), results.get(0).getRecord().getId());
+        assertEquals(hotels.get(2).getId(), results.get(0).getRecord().getId(), indexingFailureMessage);
         // Score should be different than zero
         assertNotEquals(0.0, results.get(0).getScore());
         assertNull(results.get(0).getRecord().getEuclidean());
@@ -410,9 +412,9 @@ public void searchWithVectors(RecordCollectionOptions options, String embeddingN
         // Embeddings similar to the third hotel
         List<VectorSearchResult<Hotel>> results = recordCollection.searchAsync(SEARCH_EMBEDDINGS, searchOptions).block();
         assertNotNull(results);
-        assertEquals(VectorSearchOptions.DEFAULT_RESULT_LIMIT, results.size());
+        assertEquals(VectorSearchOptions.DEFAULT_RESULT_LIMIT, results.size(), indexingFailureMessage);
         // The third hotel should be the most similar
-        assertEquals(hotels.get(2).getId(), results.get(0).getRecord().getId());
+        assertEquals(hotels.get(2).getId(), results.get(0).getRecord().getId(), indexingFailureMessage);
         assertNotNull(results.get(0).getRecord().getEuclidean());
     }
 
@@ -434,8 +436,8 @@ public void searchWithOffSet(RecordCollectionOptions options, String embeddingNa
         // Embeddings similar to the third hotel
         List<VectorSearchResult<Hotel>> results = recordCollection.searchAsync(SEARCH_EMBEDDINGS, searchOptions).block();
         assertNotNull(results);
-        assertEquals(4, results.size());
+        assertEquals(4, results.size(), indexingFailureMessage);
         // The first hotel should be the most similar
-        assertEquals(hotels.get(0).getId(), results.get(0).getRecord().getId());
+        assertEquals(hotels.get(0).getId(), results.get(0).getRecord().getId(), indexingFailureMessage);
     }
 }