Skip to content

Commit 881ddd2

Browse files
author
Milder Hernandez Cagua
committed
Add suggestions and update packages
1 parent b5ad055 commit 881ddd2

73 files changed

Lines changed: 287 additions & 249 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api-test/integration-tests/src/test/java/com/microsoft/semantickernel/tests/connectors/memory/Hotel.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import com.fasterxml.jackson.annotation.JsonCreator;
44
import com.fasterxml.jackson.annotation.JsonProperty;
5-
import com.microsoft.semantickernel.data.record.attributes.VectorStoreRecordDataAttribute;
6-
import com.microsoft.semantickernel.data.record.attributes.VectorStoreRecordKeyAttribute;
7-
import com.microsoft.semantickernel.data.record.attributes.VectorStoreRecordVectorAttribute;
5+
import com.microsoft.semantickernel.data.vectorstorage.attributes.VectorStoreRecordDataAttribute;
6+
import com.microsoft.semantickernel.data.vectorstorage.attributes.VectorStoreRecordKeyAttribute;
7+
import com.microsoft.semantickernel.data.vectorstorage.attributes.VectorStoreRecordVectorAttribute;
88

99
import java.util.List;
1010

‎api-test/integration-tests/src/test/java/com/microsoft/semantickernel/tests/connectors/memory/jdbc/JDBCVectorStoreRecordCollectionTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.microsoft.semantickernel.connectors.data.jdbc.JDBCVectorStoreRecordCollectionOptions;
66
import com.microsoft.semantickernel.connectors.data.mysql.MySQLVectorStoreQueryProvider;
77
import com.microsoft.semantickernel.connectors.data.postgres.PostgreSQLVectorStoreQueryProvider;
8-
import com.microsoft.semantickernel.data.record.options.GetRecordOptions;
8+
import com.microsoft.semantickernel.data.vectorstorage.options.GetRecordOptions;
99
import com.microsoft.semantickernel.tests.connectors.memory.Hotel;
1010
import com.mysql.cj.jdbc.MysqlDataSource;
1111
import org.junit.jupiter.params.ParameterizedTest;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import com.microsoft.semantickernel.connectors.data.redis.RedisHashSetVectorStoreRecordCollection;
44
import com.microsoft.semantickernel.connectors.data.redis.RedisHashSetVectorStoreRecordCollectionOptions;
5-
import com.microsoft.semantickernel.data.record.definition.VectorStoreRecordDataField;
6-
import com.microsoft.semantickernel.data.record.definition.VectorStoreRecordDefinition;
7-
import com.microsoft.semantickernel.data.record.definition.VectorStoreRecordField;
8-
import com.microsoft.semantickernel.data.record.definition.VectorStoreRecordKeyField;
9-
import com.microsoft.semantickernel.data.record.definition.VectorStoreRecordVectorField;
10-
import com.microsoft.semantickernel.data.record.options.GetRecordOptions;
5+
import com.microsoft.semantickernel.data.vectorstorage.definition.VectorStoreRecordDataField;
6+
import com.microsoft.semantickernel.data.vectorstorage.definition.VectorStoreRecordDefinition;
7+
import com.microsoft.semantickernel.data.vectorstorage.definition.VectorStoreRecordField;
8+
import com.microsoft.semantickernel.data.vectorstorage.definition.VectorStoreRecordKeyField;
9+
import com.microsoft.semantickernel.data.vectorstorage.definition.VectorStoreRecordVectorField;
10+
import com.microsoft.semantickernel.data.vectorstorage.options.GetRecordOptions;
1111
import com.microsoft.semantickernel.tests.connectors.memory.Hotel;
1212
import com.redis.testcontainers.RedisContainer;
1313
import org.junit.jupiter.api.BeforeAll;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import com.microsoft.semantickernel.connectors.data.redis.RedisJsonVectorStoreRecordCollection;
44
import com.microsoft.semantickernel.connectors.data.redis.RedisJsonVectorStoreRecordCollectionOptions;
5-
import com.microsoft.semantickernel.data.record.definition.VectorStoreRecordDataField;
6-
import com.microsoft.semantickernel.data.record.definition.VectorStoreRecordDefinition;
7-
import com.microsoft.semantickernel.data.record.definition.VectorStoreRecordField;
8-
import com.microsoft.semantickernel.data.record.definition.VectorStoreRecordKeyField;
9-
import com.microsoft.semantickernel.data.record.definition.VectorStoreRecordVectorField;
10-
import com.microsoft.semantickernel.data.record.options.GetRecordOptions;
5+
import com.microsoft.semantickernel.data.vectorstorage.definition.VectorStoreRecordDataField;
6+
import com.microsoft.semantickernel.data.vectorstorage.definition.VectorStoreRecordDefinition;
7+
import com.microsoft.semantickernel.data.vectorstorage.definition.VectorStoreRecordField;
8+
import com.microsoft.semantickernel.data.vectorstorage.definition.VectorStoreRecordKeyField;
9+
import com.microsoft.semantickernel.data.vectorstorage.definition.VectorStoreRecordVectorField;
10+
import com.microsoft.semantickernel.data.vectorstorage.options.GetRecordOptions;
1111
import com.microsoft.semantickernel.tests.connectors.memory.Hotel;
1212
import com.redis.testcontainers.RedisContainer;
1313
import org.junit.jupiter.api.BeforeAll;

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,9 @@
55
import com.microsoft.semantickernel.connectors.data.redis.RedisStorageType;
66
import com.microsoft.semantickernel.connectors.data.redis.RedisVectorStore;
77
import com.microsoft.semantickernel.connectors.data.redis.RedisVectorStoreOptions;
8-
import com.microsoft.semantickernel.data.VectorStoreRecordCollectionOptions;
8+
import com.microsoft.semantickernel.data.vectorstorage.VectorStoreRecordCollectionOptions;
99
import com.microsoft.semantickernel.tests.connectors.memory.Hotel;
1010
import com.redis.testcontainers.RedisContainer;
11-
import org.junit.jupiter.api.BeforeAll;
12-
import org.junit.jupiter.api.BeforeEach;
13-
import org.junit.jupiter.api.Test;
1411
import org.junit.jupiter.params.ParameterizedTest;
1512
import org.junit.jupiter.params.provider.EnumSource;
1613
import org.testcontainers.junit.jupiter.Container;

‎samples/semantickernel-concepts/semantickernel-syntax-examples/src/main/java/com/microsoft/semantickernel/samples/syntaxexamples/memory/AzureAISearchVectorStore.java‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
import com.microsoft.semantickernel.connectors.data.azureaisearch.AzureAISearchVectorStoreOptions;
1616
import com.microsoft.semantickernel.connectors.data.azureaisearch.AzureAISearchVectorStoreRecordCollection;
1717
import com.microsoft.semantickernel.connectors.data.azureaisearch.AzureAISearchVectorStoreRecordCollectionOptions;
18-
import com.microsoft.semantickernel.data.VectorSearchResult;
19-
import com.microsoft.semantickernel.data.record.attributes.VectorStoreRecordDataAttribute;
20-
import com.microsoft.semantickernel.data.record.attributes.VectorStoreRecordKeyAttribute;
21-
import com.microsoft.semantickernel.data.record.attributes.VectorStoreRecordVectorAttribute;
18+
import com.microsoft.semantickernel.data.vectorsearch.VectorSearchResult;
19+
import com.microsoft.semantickernel.data.vectorstorage.attributes.VectorStoreRecordDataAttribute;
20+
import com.microsoft.semantickernel.data.vectorstorage.attributes.VectorStoreRecordKeyAttribute;
21+
import com.microsoft.semantickernel.data.vectorstorage.attributes.VectorStoreRecordVectorAttribute;
2222
import java.nio.charset.StandardCharsets;
2323
import java.util.Arrays;
2424
import java.util.Base64;
@@ -139,6 +139,11 @@ public static void dataStorageWithAzureAISearch(
139139
// Search for results
140140
// Might need to wait for the data to be indexed
141141
var results = search("How to get started", collection, embeddingGeneration).block();
142+
143+
if (results == null || results.isEmpty()) {
144+
System.out.println("No search results found.");
145+
return;
146+
}
142147
var searchResult = results.get(0);
143148
System.out.printf("Search result with score: %f.%n Link: %s, Description: %s%n",
144149
searchResult.getScore(), searchResult.getRecord().link, searchResult.getRecord().description);

‎samples/semantickernel-concepts/semantickernel-syntax-examples/src/main/java/com/microsoft/semantickernel/samples/syntaxexamples/memory/InMemory_DataStorage.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
import com.azure.core.credential.AzureKeyCredential;
77
import com.azure.core.credential.KeyCredential;
88
import com.microsoft.semantickernel.aiservices.openai.textembedding.OpenAITextEmbeddingGenerationService;
9-
import com.microsoft.semantickernel.data.VectorStoreRecordCollection;
9+
import com.microsoft.semantickernel.data.vectorstorage.VectorStoreRecordCollection;
1010
import com.microsoft.semantickernel.data.VolatileVectorStore;
1111
import com.microsoft.semantickernel.data.VolatileVectorStoreRecordCollectionOptions;
12-
import com.microsoft.semantickernel.data.record.attributes.VectorStoreRecordDataAttribute;
13-
import com.microsoft.semantickernel.data.record.attributes.VectorStoreRecordKeyAttribute;
14-
import com.microsoft.semantickernel.data.record.attributes.VectorStoreRecordVectorAttribute;
12+
import com.microsoft.semantickernel.data.vectorstorage.attributes.VectorStoreRecordDataAttribute;
13+
import com.microsoft.semantickernel.data.vectorstorage.attributes.VectorStoreRecordKeyAttribute;
14+
import com.microsoft.semantickernel.data.vectorstorage.attributes.VectorStoreRecordVectorAttribute;
1515
import java.util.Arrays;
1616
import java.util.Collections;
1717
import java.util.List;

‎samples/semantickernel-concepts/semantickernel-syntax-examples/src/main/java/com/microsoft/semantickernel/samples/syntaxexamples/memory/JDBC_DataStorage.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
import com.microsoft.semantickernel.connectors.data.jdbc.JDBCVectorStoreOptions;
1111
import com.microsoft.semantickernel.connectors.data.jdbc.JDBCVectorStoreRecordCollectionOptions;
1212
import com.microsoft.semantickernel.connectors.data.mysql.MySQLVectorStoreQueryProvider;
13-
import com.microsoft.semantickernel.data.VectorStoreRecordCollection;
14-
import com.microsoft.semantickernel.data.record.attributes.VectorStoreRecordDataAttribute;
15-
import com.microsoft.semantickernel.data.record.attributes.VectorStoreRecordKeyAttribute;
16-
import com.microsoft.semantickernel.data.record.attributes.VectorStoreRecordVectorAttribute;
13+
import com.microsoft.semantickernel.data.vectorstorage.VectorStoreRecordCollection;
14+
import com.microsoft.semantickernel.data.vectorstorage.attributes.VectorStoreRecordDataAttribute;
15+
import com.microsoft.semantickernel.data.vectorstorage.attributes.VectorStoreRecordKeyAttribute;
16+
import com.microsoft.semantickernel.data.vectorstorage.attributes.VectorStoreRecordVectorAttribute;
1717
import com.mysql.cj.jdbc.MysqlDataSource;
1818
import java.nio.charset.StandardCharsets;
1919
import java.sql.SQLException;

‎samples/semantickernel-concepts/semantickernel-syntax-examples/src/main/java/com/microsoft/semantickernel/samples/syntaxexamples/memory/Redis_DataStorage.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
import com.microsoft.semantickernel.connectors.data.redis.RedisJsonVectorStoreRecordCollectionOptions;
1313
import com.microsoft.semantickernel.connectors.data.redis.RedisVectorStore;
1414
import com.microsoft.semantickernel.connectors.data.redis.RedisVectorStoreOptions;
15-
import com.microsoft.semantickernel.data.VectorStoreRecordCollection;
16-
import com.microsoft.semantickernel.data.record.attributes.VectorStoreRecordDataAttribute;
17-
import com.microsoft.semantickernel.data.record.attributes.VectorStoreRecordKeyAttribute;
18-
import com.microsoft.semantickernel.data.record.attributes.VectorStoreRecordVectorAttribute;
15+
import com.microsoft.semantickernel.data.vectorstorage.VectorStoreRecordCollection;
16+
import com.microsoft.semantickernel.data.vectorstorage.attributes.VectorStoreRecordDataAttribute;
17+
import com.microsoft.semantickernel.data.vectorstorage.attributes.VectorStoreRecordKeyAttribute;
18+
import com.microsoft.semantickernel.data.vectorstorage.attributes.VectorStoreRecordVectorAttribute;
1919

2020
import java.util.Arrays;
2121
import java.util.Collections;

‎semantickernel-experimental/src/main/java/com/microsoft/semantickernel/connectors/data/azureaisearch/AzureAISearchEqualityFilterClause.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Microsoft. All rights reserved.
22
package com.microsoft.semantickernel.connectors.data.azureaisearch;
33

4-
import com.microsoft.semantickernel.data.vectorsearch.filtering.EqualityFilterClause;
4+
import com.microsoft.semantickernel.data.filtering.EqualityFilterClause;
55
import com.microsoft.semantickernel.exceptions.SKException;
66

77
import java.time.OffsetDateTime;

0 commit comments

Comments
 (0)