Skip to content

Commit add005d

Browse files
author
Milder Hernandez
authored
Merge pull request #253 from milderhc/vector-stores
Move vector stores out of experimental
2 parents c985b51 + e6e3ac9 commit add005d

File tree

112 files changed

+286
-1228
lines changed

Some content is hidden

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

112 files changed

+286
-1228
lines changed

‎api-test/integration-tests/pom.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,12 @@
5858
</dependency>
5959
<dependency>
6060
<groupId>com.microsoft.semantic-kernel</groupId>
61-
<artifactId>semantickernel-experimental</artifactId>
61+
<artifactId>semantickernel-data-jdbc</artifactId>
62+
<scope>test</scope>
63+
</dependency>
64+
<dependency>
65+
<groupId>com.microsoft.semantic-kernel</groupId>
66+
<artifactId>semantickernel-data-redis</artifactId>
6267
<scope>test</scope>
6368
</dependency>
6469

api-test/integration-tests/src/test/java/com/microsoft/semantickernel/tests/connectors/memory/jdbc/Hotel.java renamed to api-test/integration-tests/src/test/java/com/microsoft/semantickernel/tests/data/jdbc/Hotel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.microsoft.semantickernel.tests.connectors.memory.jdbc;
1+
package com.microsoft.semantickernel.tests.data.jdbc;
22

33
import com.fasterxml.jackson.annotation.JsonCreator;
44
import com.fasterxml.jackson.annotation.JsonProperty;

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
package com.microsoft.semantickernel.tests.connectors.memory.jdbc;
1+
package com.microsoft.semantickernel.tests.data.jdbc;
22

33
import static org.junit.jupiter.api.Assertions.assertEquals;
44
import static org.junit.jupiter.api.Assertions.assertNotNull;
55
import static org.junit.jupiter.api.Assertions.assertNull;
66

7-
import com.microsoft.semantickernel.connectors.data.hsqldb.HSQLDBVectorStoreQueryProvider;
8-
import com.microsoft.semantickernel.connectors.data.jdbc.JDBCVectorStoreRecordCollection;
9-
import com.microsoft.semantickernel.connectors.data.jdbc.JDBCVectorStoreRecordCollectionOptions;
10-
import com.microsoft.semantickernel.connectors.data.jdbc.SQLVectorStoreQueryProvider;
11-
import com.microsoft.semantickernel.connectors.data.mysql.MySQLVectorStoreQueryProvider;
12-
import com.microsoft.semantickernel.connectors.data.postgres.PostgreSQLVectorStoreQueryProvider;
13-
import com.microsoft.semantickernel.connectors.data.sqlite.SQLiteVectorStoreQueryProvider;
7+
import com.microsoft.semantickernel.data.jdbc.hsqldb.HSQLDBVectorStoreQueryProvider;
8+
import com.microsoft.semantickernel.data.jdbc.JDBCVectorStoreRecordCollection;
9+
import com.microsoft.semantickernel.data.jdbc.JDBCVectorStoreRecordCollectionOptions;
10+
import com.microsoft.semantickernel.data.jdbc.SQLVectorStoreQueryProvider;
11+
import com.microsoft.semantickernel.data.jdbc.mysql.MySQLVectorStoreQueryProvider;
12+
import com.microsoft.semantickernel.data.jdbc.postgres.PostgreSQLVectorStoreQueryProvider;
13+
import com.microsoft.semantickernel.data.jdbc.sqlite.SQLiteVectorStoreQueryProvider;
1414
import com.microsoft.semantickernel.data.vectorsearch.VectorSearchFilter;
1515
import com.microsoft.semantickernel.data.vectorsearch.VectorSearchResult;
1616
import com.microsoft.semantickernel.data.vectorstorage.options.GetRecordOptions;

api-test/integration-tests/src/test/java/com/microsoft/semantickernel/tests/connectors/memory/jdbc/JDBCVectorStoreTest.java renamed to api-test/integration-tests/src/test/java/com/microsoft/semantickernel/tests/data/jdbc/JDBCVectorStoreTest.java

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package com.microsoft.semantickernel.tests.connectors.memory.jdbc;
2-
3-
import com.microsoft.semantickernel.connectors.data.hsqldb.HSQLDBVectorStoreQueryProvider;
4-
import com.microsoft.semantickernel.connectors.data.jdbc.JDBCVectorStore;
5-
import com.microsoft.semantickernel.connectors.data.jdbc.JDBCVectorStoreOptions;
6-
import com.microsoft.semantickernel.connectors.data.jdbc.SQLVectorStoreQueryProvider;
7-
import com.microsoft.semantickernel.connectors.data.jdbc.JDBCVectorStoreRecordCollectionOptions;
8-
import com.microsoft.semantickernel.connectors.data.mysql.MySQLVectorStoreQueryProvider;
9-
import com.microsoft.semantickernel.connectors.data.postgres.PostgreSQLVectorStoreQueryProvider;
10-
import com.microsoft.semantickernel.connectors.data.sqlite.SQLiteVectorStoreQueryProvider;
1+
package com.microsoft.semantickernel.tests.data.jdbc;
2+
3+
import com.microsoft.semantickernel.data.jdbc.hsqldb.HSQLDBVectorStoreQueryProvider;
4+
import com.microsoft.semantickernel.data.jdbc.JDBCVectorStore;
5+
import com.microsoft.semantickernel.data.jdbc.JDBCVectorStoreOptions;
6+
import com.microsoft.semantickernel.data.jdbc.SQLVectorStoreQueryProvider;
7+
import com.microsoft.semantickernel.data.jdbc.JDBCVectorStoreRecordCollectionOptions;
8+
import com.microsoft.semantickernel.data.jdbc.mysql.MySQLVectorStoreQueryProvider;
9+
import com.microsoft.semantickernel.data.jdbc.postgres.PostgreSQLVectorStoreQueryProvider;
10+
import com.microsoft.semantickernel.data.jdbc.sqlite.SQLiteVectorStoreQueryProvider;
1111
import com.mysql.cj.jdbc.MysqlDataSource;
1212
import org.hsqldb.jdbc.JDBCDataSourceFactory;
1313
import org.junit.jupiter.params.ParameterizedTest;
@@ -21,17 +21,15 @@
2121
import org.testcontainers.utility.DockerImageName;
2222

2323
import javax.sql.DataSource;
24-
import java.io.IOException;
25-
import java.nio.file.Files;
2624
import java.nio.file.Path;
2725
import java.util.Arrays;
2826
import java.util.List;
2927
import java.util.Map;
3028
import java.util.Properties;
3129

32-
import com.microsoft.semantickernel.tests.connectors.memory.jdbc.JDBCVectorStoreRecordCollectionTest.QueryProvider;
30+
import com.microsoft.semantickernel.tests.data.jdbc.JDBCVectorStoreRecordCollectionTest.QueryProvider;
3331

34-
import static com.microsoft.semantickernel.tests.connectors.memory.jdbc.JDBCVectorStoreRecordCollectionTest.createTempDbFile;
32+
import static com.microsoft.semantickernel.tests.data.jdbc.JDBCVectorStoreRecordCollectionTest.createTempDbFile;
3533
import static org.junit.jupiter.api.Assertions.assertEquals;
3634
import static org.junit.jupiter.api.Assertions.assertNotNull;
3735
import static org.junit.jupiter.api.Assertions.assertTrue;

api-test/integration-tests/src/test/java/com/microsoft/semantickernel/tests/connectors/memory/redis/Hotel.java renamed to api-test/integration-tests/src/test/java/com/microsoft/semantickernel/tests/data/redis/Hotel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.microsoft.semantickernel.tests.connectors.memory.redis;
1+
package com.microsoft.semantickernel.tests.data.redis;
22

33
import com.fasterxml.jackson.annotation.JsonCreator;
44
import com.fasterxml.jackson.annotation.JsonProperty;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.microsoft.semantickernel.tests.connectors.memory.redis;
1+
package com.microsoft.semantickernel.tests.data.redis;
22

3-
import com.microsoft.semantickernel.connectors.data.redis.RedisHashSetVectorStoreRecordCollection;
4-
import com.microsoft.semantickernel.connectors.data.redis.RedisHashSetVectorStoreRecordCollectionOptions;
3+
import com.microsoft.semantickernel.data.redis.RedisHashSetVectorStoreRecordCollection;
4+
import com.microsoft.semantickernel.data.redis.RedisHashSetVectorStoreRecordCollectionOptions;
55
import com.microsoft.semantickernel.data.vectorsearch.VectorSearchFilter;
66
import com.microsoft.semantickernel.data.vectorsearch.VectorSearchResult;
77
import com.microsoft.semantickernel.data.vectorstorage.definition.VectorStoreRecordDataField;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.microsoft.semantickernel.tests.connectors.memory.redis;
1+
package com.microsoft.semantickernel.tests.data.redis;
22

3-
import com.microsoft.semantickernel.connectors.data.redis.RedisJsonVectorStoreRecordCollection;
4-
import com.microsoft.semantickernel.connectors.data.redis.RedisJsonVectorStoreRecordCollectionOptions;
3+
import com.microsoft.semantickernel.data.redis.RedisJsonVectorStoreRecordCollection;
4+
import com.microsoft.semantickernel.data.redis.RedisJsonVectorStoreRecordCollectionOptions;
55
import com.microsoft.semantickernel.data.vectorsearch.VectorSearchFilter;
66
import com.microsoft.semantickernel.data.vectorsearch.VectorSearchResult;
77
import com.microsoft.semantickernel.data.vectorstorage.definition.VectorStoreRecordDataField;

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.microsoft.semantickernel.tests.connectors.memory.redis;
1+
package com.microsoft.semantickernel.tests.data.redis;
22

3-
import com.microsoft.semantickernel.connectors.data.redis.RedisHashSetVectorStoreRecordCollectionOptions;
4-
import com.microsoft.semantickernel.connectors.data.redis.RedisJsonVectorStoreRecordCollectionOptions;
5-
import com.microsoft.semantickernel.connectors.data.redis.RedisStorageType;
6-
import com.microsoft.semantickernel.connectors.data.redis.RedisVectorStore;
7-
import com.microsoft.semantickernel.connectors.data.redis.RedisVectorStoreOptions;
3+
import com.microsoft.semantickernel.data.redis.RedisHashSetVectorStoreRecordCollectionOptions;
4+
import com.microsoft.semantickernel.data.redis.RedisJsonVectorStoreRecordCollectionOptions;
5+
import com.microsoft.semantickernel.data.redis.RedisStorageType;
6+
import com.microsoft.semantickernel.data.redis.RedisVectorStore;
7+
import com.microsoft.semantickernel.data.redis.RedisVectorStoreOptions;
88
import com.microsoft.semantickernel.data.vectorstorage.VectorStoreRecordCollectionOptions;
9-
import com.microsoft.semantickernel.tests.connectors.memory.jdbc.Hotel;
9+
import com.microsoft.semantickernel.tests.data.jdbc.Hotel;
1010
import com.redis.testcontainers.RedisContainer;
1111
import org.junit.jupiter.params.ParameterizedTest;
1212
import org.junit.jupiter.params.provider.EnumSource;

‎connectors/semantickernel-connectors-memory-redis/src/main/java/com/microsoft/semantickernel/connectors/memory/redis/JsonMemoryRecord.java‎

Lines changed: 0 additions & 163 deletions
This file was deleted.

‎connectors/semantickernel-connectors-memory-redis/src/main/java/com/microsoft/semantickernel/connectors/memory/redis/RedisException.java‎

Lines changed: 0 additions & 69 deletions
This file was deleted.

0 commit comments

Comments
 (0)