v2.5.3

Author: anyihao

README.md

@@ -24,14 +24,14 @@ You can use **Apache Maven** or **Gradle**/**Grails** to download the SDK.
         <dependency>
             <groupId>com.tencent.tcvectordb</groupId>
             <artifactId>vectordatabase-sdk-java</artifactId>
-            <version>2.5.0</version>
+            <version>2.5.3</version>
         </dependency>
        ```
 
    - Gradle/Grails
 
         ```gradle
-        compile 'com.tencent.tcvectordb:vectordatabase-sdk-java:2.5.0'
+        compile 'com.tencent.tcvectordb:vectordatabase-sdk-java:2.5.3'
         ```
 
 ### Examples

tcvectordb/LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright (C) 2017-2019 THL A29 Limited, a Tencent company.
+   Copyright (C) 2017-2019 Tencent.
    All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");

tcvectordb/README.md

@@ -24,14 +24,14 @@ You can use **Apache Maven** or **Gradle**/**Grails** to download the SDK.
         <dependency>
             <groupId>com.tencent.tcvectordb</groupId>
             <artifactId>vectordatabase-sdk-java</artifactId>
-            <version>2.5.0</version>
+            <version>2.5.3</version>
         </dependency>
        ```
 
    - Gradle/Grails
 
         ```gradle
-        compile 'com.tencent.tcvectordb:vectordatabase-sdk-java:2.5.0'
+        compile 'com.tencent.tcvectordb:vectordatabase-sdk-java:2.5.3'
         ```
 
 ### Examples

tcvectordb/pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.tencent.tcvectordb</groupId>
     <artifactId>vectordatabase-sdk-java</artifactId>
-    <version>2.5.0</version>
+    <version>2.5.3</version>
     <packaging>jar</packaging>
 
     <name>vectordatabase-sdk-java</name>
@@ -128,7 +128,7 @@
         <dependency>
             <groupId>com.tencent.tcvectordb</groupId>
             <artifactId>tcvdb-text</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.3</version>
         </dependency>
     </dependencies>
     <build>

tcvectordb/src/main/java/com/tencent/tcvectordb/client/VectorDBClient.java

@@ -841,4 +841,24 @@ public QueryFileDetailRes queryFileDetails(String database, String collection, Q
         return this.stub.queryFileDetails(paramInner);
     }
 
+    /**
+     * atomic embedding
+     * @param param: AtomicEmbeddingParam.class
+     *             model (String): model name
+     *             dataType (String): data type, text
+     *             data (List<String>): data list
+     *             modelParams (ModelParam.class):
+     *                  retrieveDenseVector  : retrieve dense vector
+     *                  retrieveSparseVector : retrieve sparse vector
+     *
+     * @return AtomicEmbeddingRes.class
+     *              tokenUsed (int): token used
+     *              denseVector (List<List<Double>>): dense vector list
+     *              sparseVector (List<Map<String, Double>>): sparse vector list
+     *
+    **/
+    public AtomicEmbeddingRes atomicEmbedding(AtomicEmbeddingParam param) {
+        return this.stub.atomicEmbedding(param);
+    }
+
 }

tcvectordb/src/main/java/com/tencent/tcvectordb/examples/VectorDBExample.java

@@ -302,7 +302,8 @@ private static void queryData(VectorDBClient client) {
         SearchByIdParam searchByIdParam = SearchByIdParam.newBuilder()
                 .withDocumentIds(documentIds)
                 // 若使用 HNSW 索引，则需要指定参数 ef，ef 越大，召回率越高，但也会影响检索速度
-                .withParams(new HNSWSearchParams(100))
+//              .withParams(new HNSWSearchParams(100))
+                //.withParams(GeneralParams.newBuilder().withNProbe(100).build())
                 // 指定 Top K 的 K 值
                 .withLimit(2)
                 // 过滤获取到结果

tcvectordb/src/main/java/com/tencent/tcvectordb/examples/VectorDBExampleWithCollectionUploadFile.java

@@ -20,7 +20,6 @@
 
 package com.tencent.tcvectordb.examples;
 
-import com.sun.org.apache.xpath.internal.operations.Or;
 import com.tencent.tcvectordb.client.VectorDBClient;
 import com.tencent.tcvectordb.model.*;
 import com.tencent.tcvectordb.model.Collection;

tcvectordb/src/main/java/com/tencent/tcvectordb/examples/VectorDBWithAtomicEmbeddingExample.java

@@ -0,0 +1,29 @@
+package com.tencent.tcvectordb.examples;
+
+import com.tencent.tcvectordb.client.VectorDBClient;
+import com.tencent.tcvectordb.model.param.dml.AtomicEmbeddingParam;
+import com.tencent.tcvectordb.model.param.dml.ModelParam;
+import com.tencent.tcvectordb.model.param.entity.AtomicEmbeddingRes;
+
+import java.util.Arrays;
+import java.util.Map;
+
+public class VectorDBWithAtomicEmbeddingExample {
+    public static void main(String[] args) {
+        // 创建 VectorDB Client
+        VectorDBClient client = CommonService.initClient();
+
+        AtomicEmbeddingParam param = AtomicEmbeddingParam.newBuilder()
+                .withModel("bge-m3")
+                .withDataType("text")
+                .withData(Arrays.asList("什么是腾讯云向量数据库"))
+                .withModelParam(ModelParam.newBuilder()
+                        .withRetrieveDenseVector(true)
+                        .withRetrieveSparseVector(true)
+                        .build())
+                .build();
+        AtomicEmbeddingRes atomicEmbeddingRes = client.atomicEmbedding(param);
+        System.out.println(atomicEmbeddingRes.toString());
+        client.close();
+    }
+}

tcvectordb/src/main/java/com/tencent/tcvectordb/model/param/dml/AtomicEmbeddingParam.java

@@ -0,0 +1,93 @@
+package com.tencent.tcvectordb.model.param.dml;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.util.List;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class AtomicEmbeddingParam {
+    private String model;
+    private String dataType;
+
+    private ModelParam modelParams;
+    private List<String> data;
+
+    public AtomicEmbeddingParam(Builder builder) {
+        this.model = builder.model;
+        this.dataType = builder.dataType;
+        this.modelParams = builder.modelParam;
+        this.data = builder.data;
+    }
+
+    public static Builder newBuilder() {
+        return new Builder();
+    }
+
+    public String getModel() {
+        return model;
+    }
+
+    public void setModel(String model) {
+        this.model = model;
+    }
+
+    public String getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(String dataType) {
+        this.dataType = dataType;
+    }
+
+    public ModelParam getModelParams() {
+        return modelParams;
+    }
+
+    public void setModelParams(ModelParam modelParams) {
+        this.modelParams = modelParams;
+    }
+
+    public List<String> getData() {
+        return data;
+    }
+
+    public void setData(List<String> data) {
+        this.data = data;
+    }
+
+    // builder pattern
+
+    public static class Builder {
+        private String model;
+        private String dataType;
+        private ModelParam modelParam;
+        private List<String> data;
+
+        public Builder() {
+        }
+
+        public Builder withModel(String model) {
+            this.model = model;
+            return this;
+        }
+
+        public Builder withDataType(String dataType) {
+            this.dataType = dataType;
+            return this;
+        }
+
+        public Builder withModelParam(ModelParam modelParam) {
+            this.modelParam = modelParam;
+            return this;
+        }
+
+        public Builder withData(List<String> data) {
+            this.data = data;
+            return this;
+        }
+
+        public AtomicEmbeddingParam build() {
+            return new AtomicEmbeddingParam(this);
+        }
+    }
+}

tcvectordb/src/main/java/com/tencent/tcvectordb/model/param/dml/Filter.java

@@ -18,7 +18,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package com.tencent.tcvectordb.model.param.dml;;
+package com.tencent.tcvectordb.model.param.dml;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.tencent.tcvectordb.exception.ParamException;