Merge pull request #100 from jmartisk/pinecone-format

Adjust to recent Pinecone query response format change
quarkiverse · Dec 7, 2023 · aab4e44 · aab4e44
2 parents dc451f3 + a371197
commit aab4e44
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/.../test/java/io/quarkiverse/langchain4j/pinecone/deployment/PineconeEmbeddingStoreTest.java b/.../test/java/io/quarkiverse/langchain4j/pinecone/deployment/PineconeEmbeddingStoreTest.java
@@ -98,7 +98,7 @@ public void cleanup() {
      */
     private static void delay() {
         try {
-            int timeout = 40;
+            int timeout = 30;
             Log.info("Waiting " + timeout + " seconds to allow Pinecone time to process deletions");
             TimeUnit.SECONDS.sleep(timeout);
         } catch (InterruptedException e) {

diff --git a/...one/runtime/src/main/java/io/quarkiverse/langchain4j/pinecone/PineconeEmbeddingStore.java b/...one/runtime/src/main/java/io/quarkiverse/langchain4j/pinecone/PineconeEmbeddingStore.java
@@ -149,13 +149,19 @@ public List<EmbeddingMatch<TextSegment>> findRelevant(Embedding embedding, int m
         QueryRequest request = new QueryRequest(namespace, (long) maxResults, true, true, embedding.vector());
         QueryResponse response = vectorOperations.query(request);
         return response
-                .getMatches().stream().map(match -> new EmbeddingMatch<>(
-                        RelevanceScore.fromCosineSimilarity(match.getScore()),
-                        match.getId(),
-                        new Embedding(match.getValues()),
-                        match.getMetadata().get(textFieldName) != null ? new TextSegment(
-                                match.getMetadata().get(textFieldName),
-                                new Metadata(mapWithoutKey(match.getMetadata(), textFieldName))) : null))
+                .getMatches().stream().map(match -> {
+                    String text = match.getMetadata() != null &&
+                            match.getMetadata().get(textFieldName) != null
+                                    ? match.getMetadata().get(textFieldName)
+                                    : null;
+                    return new EmbeddingMatch<>(
+                            RelevanceScore.fromCosineSimilarity(match.getScore()),
+                            match.getId(),
+                            new Embedding(match.getValues()),
+                            text != null ? new TextSegment(
+                                    text,
+                                    new Metadata(mapWithoutKey(match.getMetadata(), textFieldName))) : null);
+                })
                 .filter(match -> match.score() >= minScore)
                 .collect(toList());
     }

diff --git a/...cone/runtime/src/main/java/io/quarkiverse/langchain4j/pinecone/runtime/QueryResponse.java b/...cone/runtime/src/main/java/io/quarkiverse/langchain4j/pinecone/runtime/QueryResponse.java
@@ -15,20 +15,19 @@ public class QueryResponse {
 
     private final List<VectorMatch> matches;
 
-    private String metadata;
+    private String namespace;
 
     @JsonCreator
-    public QueryResponse(List<VectorMatch> matches, String metadata) {
+    public QueryResponse(List<VectorMatch> matches, String metadata, String namespace) {
         this.matches = matches;
-        this.metadata = metadata;
+        this.namespace = namespace;
     }
 
     public List<VectorMatch> getMatches() {
         return matches;
     }
 
-    public String getMetadata() {
-        return metadata;
+    public String getNamespace() {
+        return namespace;
     }
-
 }