diff --git a/astra-db-java/pom.xml b/astra-db-java/pom.xml index 133d831d..4282503d 100644 --- a/astra-db-java/pom.xml +++ b/astra-db-java/pom.xml @@ -8,7 +8,7 @@ com.datastax.astra astra-db-java-parent - 1.5.1-SNAPSHOT + 1.5.3-SNAPSHOT diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/DataAPIClients.java b/astra-db-java/src/main/java/com/datastax/astra/client/DataAPIClients.java index 30f30531..37f57e62 100644 --- a/astra-db-java/src/main/java/com/datastax/astra/client/DataAPIClients.java +++ b/astra-db-java/src/main/java/com/datastax/astra/client/DataAPIClients.java @@ -78,6 +78,7 @@ public static DataAPIClient createForLocal() { new UsernamePasswordTokenProvider().getToken(), DataAPIOptions.builder() .withDestination(DataAPIOptions.DataAPIDestination.CASSANDRA) + .logRequests() .withObserver(new LoggingCommandObserver(DataAPIClient.class)) .build()); } diff --git a/astra-db-java/src/main/java/com/datastax/astra/internal/command/AbstractCommandRunner.java b/astra-db-java/src/main/java/com/datastax/astra/internal/command/AbstractCommandRunner.java index ad41ec55..82e774d7 100644 --- a/astra-db-java/src/main/java/com/datastax/astra/internal/command/AbstractCommandRunner.java +++ b/astra-db-java/src/main/java/com/datastax/astra/internal/command/AbstractCommandRunner.java @@ -158,7 +158,7 @@ public ApiResponse runCommand(Command command, CommandOptions overridingOptio throw new DataApiResponseException(Collections.singletonList(executionInfo.build())); } // Trace All Warning - if (jsonRes.getStatus().containsKey("warnings")) { + if (jsonRes.getStatus()!= null && jsonRes.getStatus().containsKey("warnings")) { jsonRes.getStatusKeyAsStringStream("warnings").forEach(log::warn); } return jsonRes; diff --git a/examples/pom.xml b/examples/pom.xml index 36ca6268..653542c1 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -3,19 +3,20 @@ 4.0.0 astra-db-java-examples + 1.5.0 Data API Client Samples com.datastax.astra astra-db-java-parent - 1.5.0 + 1.5.3-SNAPSHOT com.datastax.astra astra-db-java - ${project.version} + 1.5.3-SNAPSHOT ch.qos.logback diff --git a/langchain4j-astradb/pom.xml b/langchain4j-astradb/pom.xml index 35c379de..0098d8c5 100644 --- a/langchain4j-astradb/pom.xml +++ b/langchain4j-astradb/pom.xml @@ -8,11 +8,11 @@ com.datastax.astra astra-db-java-parent - 1.5.1-SNAPSHOT + 1.5.3-SNAPSHOT - 0.34.0 + 0.35.0 diff --git a/langchain4j-astradb/src/main/java/com/datastax/astra/langchain4j/store/embedding/AstraDbEmbeddingStore.java b/langchain4j-astradb/src/main/java/com/datastax/astra/langchain4j/store/embedding/AstraDbEmbeddingStore.java index eb1d4909..c7033228 100644 --- a/langchain4j-astradb/src/main/java/com/datastax/astra/langchain4j/store/embedding/AstraDbEmbeddingStore.java +++ b/langchain4j-astradb/src/main/java/com/datastax/astra/langchain4j/store/embedding/AstraDbEmbeddingStore.java @@ -32,6 +32,7 @@ import dev.langchain4j.data.embedding.Embedding; import dev.langchain4j.data.segment.TextSegment; import dev.langchain4j.store.embedding.EmbeddingMatch; +import dev.langchain4j.store.embedding.EmbeddingSearchRequest; import dev.langchain4j.store.embedding.EmbeddingSearchResult; import dev.langchain4j.store.embedding.EmbeddingStore; import lombok.Getter; @@ -215,6 +216,18 @@ public List> findRelevant(Embedding referenceEmbeddi return findRelevant(referenceEmbedding, (Filter) null, maxResults, minScore); } + public EmbeddingSearchResult search(EmbeddingSearchRequest request) { + dev.langchain4j.store.embedding.filter.Filter lc4jFilter = request.filter(); + if (lc4jFilter != null) { + // Map Filter + Filter astraFilter = AstraDbFilterMapper.map(lc4jFilter); + List> matches = this.findRelevant(request.queryEmbedding(), astraFilter, request.maxResults(), request.minScore()); + return new EmbeddingSearchResult(matches); + } + List> matches2 = this.findRelevant(request.queryEmbedding(), request.maxResults(), request.minScore()); + return new EmbeddingSearchResult(matches2); + } + /** * Implementation of the Search to add the metadata Filtering. * diff --git a/pom.xml b/pom.xml index f3ea8597..cdba78c4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.datastax.astra astra-db-java-parent Data API Client - 1.5.1-SNAPSHOT + 1.5.3-SNAPSHOT pom https://github.com/datastax/astra-db-java 2024 diff --git a/tools/pom.xml b/tools/pom.xml index daa4c3f5..0163f157 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -3,19 +3,20 @@ 4.0.0 astra-db-java-tools + 1.5.0 Data API Client Tools com.datastax.astra astra-db-java-parent - 1.5.0 + 1.5.3-SNAPSHOT com.datastax.astra astra-db-java - ${project.version} + 1.5.3-SNAPSHOT ch.qos.logback