Skip to content

Commit d438b22

Browse files
author
markjrzhang
committed
add MetaInsight ut
update demo
1 parent 92ec2b0 commit d438b22

29 files changed

+308
-163
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.qcloud</groupId>
66
<artifactId>cos_api</artifactId>
7-
<version>5.6.218</version>
7+
<version>5.6.219</version>
88
<packaging>jar</packaging>
99
<name>cos-java-sdk</name>
1010
<description>java sdk for qcloud cos</description>

src/main/java/com/qcloud/cos/COSClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5152,7 +5152,7 @@ public CreateFileMetaIndexResponse createFileMetaIndex(CreateFileMetaIndexReques
51525152
public DatasetFaceSearchResponse datasetFaceSearch(DatasetFaceSearchRequest customRequest) {
51535153
rejectNull(customRequest, "The request parameter must be specified setting the object tags");
51545154

5155-
CosHttpRequest<DatasetFaceSearchRequest> request = createRequest(customRequest.getAppId(), "/datasetquery" + "/facesearch", customRequest , HttpMethodName.POST);
5155+
CosHttpRequest<DatasetFaceSearchRequest> request = createRequest(customRequest.getAppId(), "/datasetquery/facesearch", customRequest , HttpMethodName.POST);
51565156
request.addHeader("Accept", "application/json");
51575157

51585158
this.setContent(request, CIJackson.toJsonBytes(customRequest), "application/json", false);
@@ -5163,7 +5163,7 @@ public DatasetFaceSearchResponse datasetFaceSearch(DatasetFaceSearchRequest cust
51635163
public DatasetSimpleQueryResponse datasetSimpleQuery(DatasetSimpleQueryRequest customRequest) {
51645164
rejectNull(customRequest, "The request parameter must be specified setting the object tags");
51655165

5166-
CosHttpRequest<DatasetSimpleQueryRequest> request = createRequest(customRequest.getAppId(), "/datasetquery" + "/simple", customRequest , HttpMethodName.POST);
5166+
CosHttpRequest<DatasetSimpleQueryRequest> request = createRequest(customRequest.getAppId(), "/datasetquery/simple", customRequest , HttpMethodName.POST);
51675167
request.addHeader("Accept", "application/json");
51685168

51695169
this.setContent(request, CIJackson.toJsonBytes(customRequest), "application/json", false);
@@ -5263,7 +5263,7 @@ public DescribeFileMetaIndexResponse describeFileMetaIndex(DescribeFileMetaIndex
52635263
public SearchImageResponse searchImage(SearchImageRequest customRequest) {
52645264
rejectNull(customRequest, "The request parameter must be specified setting the object tags");
52655265

5266-
CosHttpRequest<SearchImageRequest> request = createRequest(customRequest.getAppId(), "/datasetquery" + "/imagesearch", customRequest , HttpMethodName.POST);
5266+
CosHttpRequest<SearchImageRequest> request = createRequest(customRequest.getAppId(), "/datasetquery/imagesearch", customRequest , HttpMethodName.POST);
52675267
request.addHeader("Accept", "application/json");
52685268

52695269
this.setContent(request, CIJackson.toJsonBytes(customRequest), "application/json", false);

src/main/java/com/qcloud/cos/demo/ci/CreateDatasetBindingDemo.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,19 @@ public static void main(String[] args) {
2020
}
2121

2222
/**
23-
* createDatasetBinding 本文档介绍创建数据集(Dataset)和对象存储(COS)Bucket 的绑定关系,绑定后将使用创建数据集时所指定算子对文件进行处理。
24-
绑定关系创建后,将对 COS 中新增的文件进行准实时的增量追踪扫描,使用创建数据集时所指定算子对文件进行处理,抽取文件元数据信息进行索引。通过此方式为文件建立索引后,您可以使用元数据查询API对元数据进行查询、管理和统计。
25-
23+
* createDatasetBinding 本文档介绍创建数据集(Dataset)和对象存储(COS)Bucket 的绑定关系
24+
* 绑定后将使用创建数据集时所指定算子对文件进行处理。
25+
* 绑定关系创建后,将对 COS 中新增的文件进行准实时的增量追踪扫描,使用创建数据集时所指定算子对文件进行处理,抽取文件元数据信息进行索引。
26+
* 通过此方式为文件建立索引后,您可以使用元数据查询API对元数据进行查询、管理和统计。
2627
* 该接口属于 POST 请求。
2728
*/
2829
public static void createDatasetBinding(COSClient client) {
2930
CreateDatasetBindingRequest request = new CreateDatasetBindingRequest();
30-
request.setBucketName("demo-1234567890");
31+
request.setAppId("1251704708");
3132
// 设置数据集名称,同一个账户下唯一。;是否必传:是
32-
request.setDatasetName("test");
33+
request.setDatasetName("mark");
3334
// 设置资源标识字段,表示需要与数据集绑定的资源,当前仅支持COS存储桶,字段规则:cos://<BucketName>,其中BucketName表示COS存储桶名称,例如:cos://examplebucket-1250000000;是否必传:是
34-
request.setURI("cos://examplebucket-1250000000");
35+
request.setURI("cos://markjrzhang-1251704708");
3536

3637
CreateDatasetBindingResponse response = client.createDatasetBinding(request);
3738
System.out.println(Jackson.toJsonString(response));

src/main/java/com/qcloud/cos/demo/ci/CreateFileMetaIndexDemo.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.qcloud.cos.COSClient;
44
import com.qcloud.cos.model.ciModel.metaInsight.CreateFileMetaIndexRequest;
55
import com.qcloud.cos.model.ciModel.metaInsight.CreateFileMetaIndexResponse;
6+
import com.qcloud.cos.model.ciModel.metaInsight.File;
67
import com.qcloud.cos.utils.Jackson;
78

89

@@ -24,10 +25,12 @@ public static void main(String[] args) {
2425
*/
2526
public static void createFileMetaIndex(COSClient client) {
2627
CreateFileMetaIndexRequest request = new CreateFileMetaIndexRequest();
27-
request.setBucketName("demo-1234567890");
28+
request.setAppId("1234567890");
2829
// 设置数据集名称,同一个账户下唯一。;是否必传:是
2930
request.setDatasetName("test001");
30-
31+
File file = new File();
32+
file.setURI("cos://<BucketName>/<ObjectKey>");
33+
request.setFile(file);
3134
CreateFileMetaIndexResponse response = client.createFileMetaIndex(request);
3235
System.out.println(Jackson.toJsonString(response));
3336
}

src/main/java/com/qcloud/cos/demo/ci/DatasetFaceSearchDemo.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.qcloud.cos.COSClient;
44
import com.qcloud.cos.model.ciModel.metaInsight.DatasetFaceSearchRequest;
55
import com.qcloud.cos.model.ciModel.metaInsight.DatasetFaceSearchResponse;
6+
import com.qcloud.cos.utils.CIJackson;
67
import com.qcloud.cos.utils.Jackson;
78

89

@@ -24,18 +25,17 @@ public static void main(String[] args) {
2425
*/
2526
public static void datasetFaceSearch(COSClient client) {
2627
DatasetFaceSearchRequest request = new DatasetFaceSearchRequest();
27-
request.setBucketName("demo-1234567890");
28+
request.setAppId("1251704708");
2829
// 设置数据集名称,同一个账户下唯一。;是否必传:是
2930
request.setDatasetName("test");
3031
// 设置资源标识字段,表示需要建立索引的文件地址。;是否必传:是
31-
request.setURI("cos://examplebucket-1250000000/test.jpg");
32+
request.setURI("cos://<BucketName>/<ObjectKey>");
3233
// 设置输入图片中检索的人脸数量,默认值为1(传0或不传采用默认值),最大值为10。;是否必传:否
3334
request.setMaxFaceNum(1);
3435
// 设置检索的每张人脸返回相关人脸数量,默认值为10,最大值为100。;是否必传:否
3536
request.setLimit(10);
3637
// 设置出参 Score 中,只有超过 MatchThreshold 值的结果才会返回。范围:1-100,默认值为0,推荐值为80。;是否必传:否
3738
request.setMatchThreshold(10);
38-
3939
DatasetFaceSearchResponse response = client.datasetFaceSearch(request);
4040
System.out.println(Jackson.toJsonString(response));
4141
}

src/main/java/com/qcloud/cos/demo/ci/DatasetSimpleQueryDemo.java

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,14 @@
33
import com.qcloud.cos.COSClient;
44
import com.qcloud.cos.model.ciModel.metaInsight.DatasetSimpleQueryRequest;
55
import com.qcloud.cos.model.ciModel.metaInsight.DatasetSimpleQueryResponse;
6+
import com.qcloud.cos.model.ciModel.metaInsight.Query;
7+
import com.qcloud.cos.model.ciModel.metaInsight.SubQueries;
8+
import com.qcloud.cos.utils.CIJackson;
69
import com.qcloud.cos.utils.Jackson;
710

11+
import java.util.ArrayList;
12+
import java.util.List;
13+
814

915
/**
1016
* 简单查询 详情见https://cloud.tencent.com/document/product/460/106375
@@ -24,16 +30,23 @@ public static void main(String[] args) {
2430
*/
2531
public static void datasetSimpleQuery(COSClient client) {
2632
DatasetSimpleQueryRequest request = new DatasetSimpleQueryRequest();
27-
request.setBucketName("demo-1234567890");
28-
// 设置数据集名称,同一个账户下唯一。;是否必传:是
33+
request.setAppId("1251704708");
2934
request.setDatasetName("test");
30-
// 设置返回文件元数据的最大个数,取值范围为0200。 使用聚合参数时,该值表示返回分组的最大个数,取值范围为02000。 不设置此参数或者设置为0时,则取默认值100。;是否必传:否
31-
request.setMaxResults(100);
32-
// 设置排序字段列表。请参考字段和操作符的支持列表。 多个排序字段可使用半角逗号(,)分隔,例如:Size,Filename。 最多可设置5个排序字段。 排序字段顺序即为排序优先级顺序。;是否必传:是
35+
// 设置数据集名称,同一个账户下唯一。;是否必传:是
36+
Query query = new Query();
37+
query.setOperation("and");
38+
List<SubQueries> subQueriesList = new ArrayList<>();
39+
SubQueries subQueries = new SubQueries();
40+
subQueries.setOperation("eq");
41+
subQueries.setField("ContentType");
42+
subQueries.setValue("image/jpeg");
43+
subQueriesList.add(subQueries);
44+
query.setSubQueries(subQueriesList);
45+
request.setQuery(query);
46+
3347
request.setSort("CustomId");
34-
// 设置排序字段的排序方式。取值如下: asc:升序; desc(默认):降序。 多个排序方式可使用半角逗号(,)分隔,例如:asc,desc。 排序方式不可多于排序字段,即参数Order的元素数量需小于等于参数Sort的元素数量。例如Sort取值为Size,Filename时,Order可取值为asc,desc或asc。 排序方式少于排序字段时,未排序的字段默认取值asc。例如Sort取值为Size,Filename,Order取值为asc时,Filename默认排序方式为asc,即升序排列;是否必传:是
3548
request.setOrder("desc");
36-
49+
request.setMaxResults(100);
3750
DatasetSimpleQueryResponse response = client.datasetSimpleQuery(request);
3851
System.out.println(Jackson.toJsonString(response));
3952
}

src/main/java/com/qcloud/cos/demo/ci/DeleteDatasetBindingDemo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public static void main(String[] args) {
2323
*/
2424
public static void deleteDatasetBinding(COSClient client) {
2525
DeleteDatasetBindingRequest request = new DeleteDatasetBindingRequest();
26-
request.setBucketName("demo-1234567890");
26+
request.setAppId("demo-1234567890");
2727
// 设置数据集名称,同一个账户下唯一。;是否必传:是
2828
request.setDatasetName("test");
2929
// 设置资源标识字段,表示需要与数据集绑定的资源,当前仅支持COS存储桶,字段规则:cos://<BucketName>,其中BucketName表示COS存储桶名称,例如:cos://examplebucket-1250000000;是否必传:是

src/main/java/com/qcloud/cos/demo/ci/DeleteDatasetDemo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static void main(String[] args) {
2525
*/
2626
public static void deleteDataset(COSClient client) {
2727
DeleteDatasetRequest request = new DeleteDatasetRequest();
28-
request.setBucketName("demo-1234567890");
28+
request.setAppId("demo-1234567890");
2929
// 设置数据集名称,同一个账户下唯一。;是否必传:是
3030
request.setDatasetName("test");
3131

src/main/java/com/qcloud/cos/demo/ci/DescribeDatasetBindingDemo.java

Lines changed: 0 additions & 34 deletions
This file was deleted.

src/main/java/com/qcloud/cos/demo/ci/DescribeDatasetBindingsDemo.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,13 @@ public static void main(String[] args) {
2424
*/
2525
public static void describeDatasetBindings(COSClient client) {
2626
DescribeDatasetBindingsRequest request = new DescribeDatasetBindingsRequest();
27-
request.setBucketName("demo-1234567890");
28-
request.setDatasetname("数据集名称");// 设置数据集名称,同一个账户下唯一。
29-
request.setMaxresults(10);// 设置返回绑定关系的最大个数,取值范围为0~200。不设置此参数或者设置为0时,则默认值为100。
30-
request.setNexttoken("token");// 设置当绑定关系总数大于设置的MaxResults时,用于翻页的token。从NextToken开始按字典序返回绑定关系信息列表。第一次调用此接口时,设置为空。
31-
27+
request.setAppId("1251704708");
28+
// 设置数据集名称,同一个账户下唯一。
29+
request.setDatasetname("mark");
30+
// 设置返回绑定关系的最大个数,取值范围为0~200。不设置此参数或者设置为0时,则默认值为100。
31+
request.setMaxresults(10);
32+
// 设置当绑定关系总数大于设置的MaxResults时,用于翻页的token。从NextToken开始按字典序返回绑定关系信息列表。第一次调用此接口时,设置为空。
33+
// request.setNexttoken("token");
3234
DescribeDatasetBindingsResponse response = client.describeDatasetBindings(request);
3335
System.out.println(Jackson.toJsonString(response));
3436
}

0 commit comments

Comments
 (0)