Add embedding support api #528
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixed the $vector update field
Fixed the $vector update field
...argate/sgv2/jsonapi/service/embedding/configuration/PropertyBasedEmbeddingServiceConfig.java
Outdated
Show resolved
Hide resolved
...argate/sgv2/jsonapi/service/embedding/configuration/PropertyBasedEmbeddingServiceConfig.java
Outdated
Show resolved
Hide resolved
src/main/java/io/stargate/sgv2/jsonapi/service/embedding/operation/EmbeddingServiceCache.java
Show resolved
Hide resolved
src/main/java/io/stargate/sgv2/jsonapi/service/embedding/operation/EmbeddingServiceCache.java
Outdated
Show resolved
Hide resolved
src/main/java/io/stargate/sgv2/jsonapi/service/embedding/operation/EmbeddingServiceCache.java
Outdated
Show resolved
Hide resolved
...in/java/io/stargate/sgv2/jsonapi/service/embedding/operation/HuggingFaceEmbeddingClient.java
Outdated
Show resolved
Hide resolved
src/main/java/io/stargate/sgv2/jsonapi/service/embedding/operation/OpenAiEmbeddingClient.java
Outdated
Show resolved
Hide resolved
...ain/java/io/stargate/sgv2/jsonapi/service/embedding/operation/test/TestEmbeddingService.java
Outdated
Show resolved
Hide resolved
src/main/java/io/stargate/sgv2/jsonapi/api/model/command/impl/CreateCollectionCommand.java
Show resolved
Hide resolved
src/main/java/io/stargate/sgv2/jsonapi/service/bridge/executor/NamespaceCache.java
Outdated
Show resolved
Hide resolved
| @@ -15,17 +15,23 @@ public record CreateCollectionOperation( | |||
| String name, | |||
| boolean vectorSearch, | |||
| int vectorSize, | |||
| String vectorFunction) | |||
| String vectorFunction, | |||
| String vectorize) | |||
There was a problem hiding this comment.
Is this a JSON serialization of Vectorize service configuration?
There was a problem hiding this comment.
Yes, the value is stored part of table's comment.
| @@ -66,6 +72,9 @@ protected QueryOuterClass.Query getCreateTable(String keyspace, String table) { | |||
| + vectorSize | |||
| + ">, " | |||
| + " PRIMARY KEY (key))"; | |||
| if (vectorize != null) { | |||
| createTableWithVector = createTableWithVector + " WITH comment = '" + vectorize + "'"; | |||
There was a problem hiding this comment.
Not sure if it matters, but if vectorize is serialized JSON it could still have characters that require escaping (esp. apostrophes themselves). Although I guess those would lead to CQL query failure, not corrupted data.
There was a problem hiding this comment.
Not sure what kind of characters to handle since this is just a text value, If needed I will add permitted character for the vectorize options.
src/main/java/io/stargate/sgv2/jsonapi/service/resolver/CommandResolverService.java
Outdated
Show resolved
Hide resolved
...va/io/stargate/sgv2/jsonapi/service/resolver/model/impl/CreateCollectionCommandResolver.java
Show resolved
Hide resolved
...stargate/sgv2/jsonapi/service/resolver/model/impl/CreateEmbeddingServiceCommandResolver.java
Show resolved
Hide resolved
...main/java/io/stargate/sgv2/jsonapi/service/resolver/model/impl/DeleteOneCommandResolver.java
Outdated
Show resolved
Hide resolved
...ain/java/io/stargate/sgv2/jsonapi/service/resolver/model/impl/InsertManyCommandResolver.java
Outdated
Show resolved
Hide resolved
...ava/io/stargate/sgv2/jsonapi/api/model/command/deserializers/SortClauseDeserializerTest.java
Show resolved
Hide resolved
src/test/java/io/stargate/sgv2/jsonapi/api/v1/VectorizeSearchIntegrationTest.java
Show resolved
Hide resolved
src/test/java/io/stargate/sgv2/jsonapi/api/v1/VectorizeSearchIntegrationTest.java
Show resolved
Hide resolved
src/test/java/io/stargate/sgv2/jsonapi/service/embedding/operation/TestEmbeddingService.java
Outdated
Show resolved
Hide resolved
...est/java/io/stargate/sgv2/jsonapi/service/embedding/operation/EmbeddingServiceCacheTest.java
Outdated
Show resolved
Hide resolved
tatu-at-datastax
approved these changes
Sep 22, 2023
Yuqi-Du
reviewed
Sep 22, 2023
| { | ||
| "findOneAndUpdate": { | ||
| "filter" : {"_id" : "id"}, | ||
| "update" : {"$setOnInsert" : {"$vectorize" : "New York"}} |
There was a problem hiding this comment.
what is the difference between this $setOnInsert and upper $set
There was a problem hiding this comment.
When upsert option is set to true during update operation, we will create new document if no document found based on condition. setOnInsert will work when this a new document.
There was a problem hiding this comment.
$setOnInsert is only applied in case a new document is inserted, but not if one exists.
Used for things like adding id field(s), or creation-time.
Yuqi-Du
reviewed
Sep 22, 2023
src/main/java/io/stargate/sgv2/jsonapi/service/embedding/operation/EmbeddingService.java
Outdated
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does:
Support for vectorize method
Fixed the update operation for vector data
Which issue(s) this PR fixes:
Fixes #524
Checklist