fix tests and added getInfoNotExistentCollection tests

neo4j-contrib · Jul 30, 2024 · b8fa616 · b8fa616
1 parent 29d58a0
commit b8fa616
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 5 deletions.
diff --git a/docs/asciidoc/modules/ROOT/pages/database-integration/vectordb/chroma.adoc b/docs/asciidoc/modules/ROOT/pages/database-integration/vectordb/chroma.adoc
@@ -7,7 +7,7 @@ note that the list and the signature procedures are consistent with the others,
 [opts=header, cols="1, 3"]
 |===
 | name | description
-| apoc.vectordb.chroma.info(hostOrKey, collection, $config) | Get information about the specified existing collection or throws an error if it does not exist
+| apoc.vectordb.chroma.info(hostOrKey, collection, $config) | Get information about the specified existing collection or throws an error 500 if it does not exist
 | apoc.vectordb.chroma.createCollection(hostOrKey, collection, similarity, size, $config) |
     Creates a collection, with the name specified in the 2nd parameter, and with the specified `similarity` and `size`.
     The default endpoint is `<hostOrKey param>/api/v1/collections`.

diff --git a/docs/asciidoc/modules/ROOT/pages/database-integration/vectordb/pinecone.adoc b/docs/asciidoc/modules/ROOT/pages/database-integration/vectordb/pinecone.adoc
@@ -6,7 +6,7 @@ Here is a list of all available Pinecone procedures:
 [opts=header, cols="1, 3"]
 |===
 | name | description
-| apoc.vectordb.pinecone.info(hostOrKey, collection, $config) | Get information about the specified existing collection or throws an error if it does not exist
+| apoc.vectordb.pinecone.info(hostOrKey, collection, $config) | Get information about the specified existing collection or throws a 404 error if it does not exist
 | apoc.vectordb.pinecone.createCollection(hostOrKey, index, similarity, size, $config) |
     Creates an index, with the name specified in the 2nd parameter, and with the specified `similarity` and `size`.
     The default endpoint is `<hostOrKey param>/indexes`.

diff --git a/docs/asciidoc/modules/ROOT/pages/database-integration/vectordb/qdrant.adoc b/docs/asciidoc/modules/ROOT/pages/database-integration/vectordb/qdrant.adoc
@@ -7,7 +7,7 @@ note that the list and the signature procedures are consistent with the others,
 [opts=header, cols="1, 3"]
 |===
 | name | description
-| apoc.vectordb.qdrant.info(hostOrKey, collection, $config) | Get information about the specified existing collection or throws an error if it does not exist or throws an error
+| apoc.vectordb.qdrant.info(hostOrKey, collection, $config) | Get information about the specified existing collection or throws a FileNotFoundException if it does not exist
 | apoc.vectordb.qdrant.createCollection(hostOrKey, collection, similarity, size, $config) |
     Creates a collection, with the name specified in the 2nd parameter, and with the specified `similarity` and `size`.
     The default endpoint is `<hostOrKey param>/collections/<collection param>`.

diff --git a/docs/asciidoc/modules/ROOT/pages/database-integration/vectordb/weaviate.adoc b/docs/asciidoc/modules/ROOT/pages/database-integration/vectordb/weaviate.adoc
@@ -7,7 +7,7 @@ note that the list and the signature procedures are consistent with the others,
 [opts=header, cols="1, 3"]
 |===
 | name | description
-| apoc.vectordb.weaviate.info($host, $collectionName, $config) | Get information about the specified existing collection or throws an error if it does not exist
+| apoc.vectordb.weaviate.info($host, $collectionName, $config) | Get information about the specified existing collection or throws a FileNotFoundException if it does not exist
 | apoc.vectordb.weaviate.createCollection(hostOrKey, collection, similarity, size, $config) |
     Creates a collection, with the name specified in the 2nd parameter, and with the specified `similarity` and `size`.
     The default endpoint is `<hostOrKey param>/schema`.

diff --git a/extended-it/src/test/java/apoc/vectordb/ChromaDbTest.java b/extended-it/src/test/java/apoc/vectordb/ChromaDbTest.java
@@ -19,6 +19,7 @@
 
 import static apoc.ml.Prompt.API_KEY_CONF;
 import static apoc.ml.RestAPIConfig.HEADERS_KEY;
+import static apoc.util.ExtendedTestUtil.assertFails;
 import static apoc.util.MapUtil.map;
 import static apoc.util.TestUtil.testCall;
 import static apoc.util.TestUtil.testResult;
@@ -118,6 +119,14 @@ public void getInfo() {
                     assertEquals(COLLECTION_NAME, row.get("name"));
                 });
     }
+
+    @Test
+    public void getInfoNotExistentCollection() {
+        assertFails(db, "CALL apoc.vectordb.chroma.info($host, 'wrong_collection', $conf) ",
+                map("host", HOST, "collection", COLLECTION_NAME, "conf", map(ALL_RESULTS_KEY, true)),
+                "Server returned HTTP response code: 500"
+        );
+    }
 
     @Test
     public void getVectors() {

diff --git a/extended-it/src/test/java/apoc/vectordb/MilvusTest.java b/extended-it/src/test/java/apoc/vectordb/MilvusTest.java
@@ -119,14 +119,25 @@ public void before() {
 
     @Test
     public void getInfo() {
-        testResult(db, "CALL apoc.vectordb.milvus.info($host, 'taaaest_collection', '', $conf) ",
+        testResult(db, "CALL apoc.vectordb.milvus.info($host, 'test_collection', '', $conf) ",
                 map("host", HOST, "conf", map(FIELDS_KEY, FIELDS)),
                 r -> {
                     Map<String, Object> row = r.next();
                     Map value = (Map) row.get("value");
                     assertEquals(200L, value.get("code"));
                 });
     }
+
+    @Test
+    public void getInfoNotExistentCollection() {
+        testResult(db, "CALL apoc.vectordb.milvus.info($host, 'wrong_collection', '', $conf) ",
+                map("host", HOST, "conf", map(FIELDS_KEY, FIELDS)),
+                r -> {
+                    Map<String, Object> row = r.next();
+                    Map value = (Map) row.get("value");
+                    assertEquals(100L, value.get("code"));
+                });
+    }
 
     @Test
     public void getVectorsWithoutVectorResult() {

diff --git a/extended-it/src/test/java/apoc/vectordb/QdrantTest.java b/extended-it/src/test/java/apoc/vectordb/QdrantTest.java
@@ -20,6 +20,7 @@
 
 import static apoc.ml.Prompt.API_KEY_CONF;
 import static apoc.ml.RestAPIConfig.HEADERS_KEY;
+import static apoc.util.ExtendedTestUtil.assertFails;
 import static apoc.util.MapUtil.map;
 import static apoc.util.TestUtil.testCall;
 import static apoc.util.TestUtil.testResult;
@@ -132,6 +133,16 @@ public void getInfo() {
                 });
     }
 
+    @Test
+    public void getInfoNotExistentCollection() {
+        assertFails(
+                db,
+                "CALL apoc.vectordb.qdrant.info($host, 'wrong_collection', $conf)",
+                map("host", HOST, "conf", ADMIN_HEADER_CONF),
+                "java.io.FileNotFoundException"
+        );
+    }
+
     @Test
     public void getVectorsWithReadOnlyApiKey() {
         testResult(db, "CALL apoc.vectordb.qdrant.get($host, 'test_collection', [1], $conf) ",

diff --git a/extended-it/src/test/java/apoc/vectordb/WeaviateTest.java b/extended-it/src/test/java/apoc/vectordb/WeaviateTest.java
@@ -22,6 +22,7 @@
 
 import static apoc.ml.Prompt.API_KEY_CONF;
 import static apoc.ml.RestAPIConfig.HEADERS_KEY;
+import static apoc.util.ExtendedTestUtil.assertFails;
 import static apoc.util.TestUtil.testCall;
 import static apoc.util.TestUtil.testCallEmpty;
 import static apoc.util.TestUtil.testResult;
@@ -159,6 +160,16 @@ public void getInfo() {
                 });
     }
 
+    @Test
+    public void getInfoNotExistentCollection() {
+        assertFails(
+                db,
+                "CALL apoc.vectordb.weaviate.info($host, 'wrong_collection', $conf)",
+                map("host", HOST, "collectionName", COLLECTION_NAME, "conf", map(ALL_RESULTS_KEY, true, HEADERS_KEY, READONLY_AUTHORIZATION)),
+                "java.io.FileNotFoundException"
+        );
+    }
+
     @Test
     public void getVectorsWithReadOnlyApiKey() {
         testResult(db, "CALL apoc.vectordb.weaviate.get($host, 'TestCollection', [$id1], $conf)",

diff --git a/extended/src/main/resources/extended.txt b/extended/src/main/resources/extended.txt
@@ -229,6 +229,7 @@ apoc.vectordb.chroma.get
 apoc.vectordb.chroma.getAndUpdate
 apoc.vectordb.chroma.query
 apoc.vectordb.chroma.queryAndUpdate
+apoc.vectordb.chroma.info
 apoc.vectordb.qdrant.createCollection
 apoc.vectordb.qdrant.deleteCollection
 apoc.vectordb.qdrant.upsert
@@ -237,6 +238,7 @@ apoc.vectordb.qdrant.get
 apoc.vectordb.qdrant.getAndUpdate
 apoc.vectordb.qdrant.query
 apoc.vectordb.qdrant.queryAndUpdate
+apoc.vectordb.qdrant.info
 apoc.vectordb.weaviate.createCollection
 apoc.vectordb.weaviate.deleteCollection
 apoc.vectordb.weaviate.upsert
@@ -245,6 +247,7 @@ apoc.vectordb.weaviate.get
 apoc.vectordb.weaviate.getAndUpdate
 apoc.vectordb.weaviate.query
 apoc.vectordb.weaviate.queryAndUpdate
+apoc.vectordb.weaviate.info
 apoc.vectordb.pinecone.createCollection
 apoc.vectordb.pinecone.deleteCollection
 apoc.vectordb.pinecone.upsert
@@ -253,6 +256,7 @@ apoc.vectordb.pinecone.get
 apoc.vectordb.pinecone.getAndUpdate
 apoc.vectordb.pinecone.query
 apoc.vectordb.pinecone.queryAndUpdate
+apoc.vectordb.pinecone.info
 apoc.vectordb.milvus.createCollection
 apoc.vectordb.milvus.deleteCollection
 apoc.vectordb.milvus.upsert
@@ -261,6 +265,7 @@ apoc.vectordb.milvus.get
 apoc.vectordb.milvus.getAndUpdate
 apoc.vectordb.milvus.query
 apoc.vectordb.milvus.queryAndUpdate
+apoc.vectordb.milvus.info
 apoc.vectordb.custom.get
 apoc.vectordb.custom
 apoc.vectordb.configure
diff --git a/extended/src/test/java/apoc/vectordb/PineconeTest.java b/extended/src/test/java/apoc/vectordb/PineconeTest.java
@@ -19,6 +19,7 @@
 
 import static apoc.ml.Prompt.API_KEY_CONF;
 import static apoc.ml.RestAPIConfig.HEADERS_KEY;
+import static apoc.util.ExtendedTestUtil.assertFails;
 import static apoc.util.MapUtil.map;
 import static apoc.util.TestUtil.testCall;
 import static apoc.util.TestUtil.testCallEmpty;
@@ -138,6 +139,16 @@ public void getInfo() {
                     assertEquals(collName, value.get("name"));
                 });
     }
+
+    @Test
+    public void getInfoNotExistentCollection() {
+        assertFails(db, "CALL apoc.vectordb.pinecone.info($host, 'wrong_collection', $conf) ",
+                map("host", HOST, "coll", collName,
+                        "conf", map(ALL_RESULTS_KEY, true, HEADERS_KEY, ADMIN_AUTHORIZATION)
+                ),
+                "Server returned HTTP response code: 500"
+        );
+    }
 
     @Test
     public void getVectors() {