From d9cb6a8f5094754a570d3026a85e3b8993135a59 Mon Sep 17 00:00:00 2001 From: sdk-team Date: Wed, 15 Sep 2021 06:25:38 +0000 Subject: [PATCH] Update AddFace SearchFace. --- CHANGELOG | 3 ++ VERSION | 2 +- .../facebody/model/AddFaceRequest.h | 9 +++++ .../facebody/model/SearchFaceRequest.h | 3 ++ .../facebody/model/SearchFaceResult.h | 1 + facebody/src/model/AddFaceRequest.cc | 33 +++++++++++++++++++ facebody/src/model/SearchFaceRequest.cc | 13 +++++++- facebody/src/model/SearchFaceResult.cc | 2 ++ 8 files changed, 64 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d6a04408a..c2b89dd65 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2021-09-15 Version: 1.36.876 +- Update AddFace SearchFace. + 2021-09-14 Version: 1.36.875 - Add DiskIds for CreateSnapshotGroup. diff --git a/VERSION b/VERSION index a81ec2ece..fe9519d2d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.875 \ No newline at end of file +1.36.876 \ No newline at end of file diff --git a/facebody/include/alibabacloud/facebody/model/AddFaceRequest.h b/facebody/include/alibabacloud/facebody/model/AddFaceRequest.h index d034b9567..0c39a8319 100644 --- a/facebody/include/alibabacloud/facebody/model/AddFaceRequest.h +++ b/facebody/include/alibabacloud/facebody/model/AddFaceRequest.h @@ -37,8 +37,14 @@ namespace AlibabaCloud std::string getEntityId()const; void setEntityId(const std::string& entityId); + float getQualityScoreThreshold()const; + void setQualityScoreThreshold(float qualityScoreThreshold); + float getSimilarityScoreThresholdBetweenEntity()const; + void setSimilarityScoreThresholdBetweenEntity(float similarityScoreThresholdBetweenEntity); std::string getExtraData()const; void setExtraData(const std::string& extraData); + float getSimilarityScoreThresholdInEntity()const; + void setSimilarityScoreThresholdInEntity(float similarityScoreThresholdInEntity); std::string getDbName()const; void setDbName(const std::string& dbName); std::string getImageUrl()const; @@ -46,7 +52,10 @@ namespace AlibabaCloud private: std::string entityId_; + float qualityScoreThreshold_; + float similarityScoreThresholdBetweenEntity_; std::string extraData_; + float similarityScoreThresholdInEntity_; std::string dbName_; std::string imageUrl_; diff --git a/facebody/include/alibabacloud/facebody/model/SearchFaceRequest.h b/facebody/include/alibabacloud/facebody/model/SearchFaceRequest.h index 51ba150ed..feb3e6827 100644 --- a/facebody/include/alibabacloud/facebody/model/SearchFaceRequest.h +++ b/facebody/include/alibabacloud/facebody/model/SearchFaceRequest.h @@ -35,6 +35,8 @@ namespace AlibabaCloud SearchFaceRequest(); ~SearchFaceRequest(); + float getQualityScoreThreshold()const; + void setQualityScoreThreshold(float qualityScoreThreshold); int getLimit()const; void setLimit(int limit); std::string getDbNames()const; @@ -45,6 +47,7 @@ namespace AlibabaCloud void setImageUrl(const std::string& imageUrl); private: + float qualityScoreThreshold_; int limit_; std::string dbNames_; std::string dbName_; diff --git a/facebody/include/alibabacloud/facebody/model/SearchFaceResult.h b/facebody/include/alibabacloud/facebody/model/SearchFaceResult.h index d90af357b..248d65bcb 100644 --- a/facebody/include/alibabacloud/facebody/model/SearchFaceResult.h +++ b/facebody/include/alibabacloud/facebody/model/SearchFaceResult.h @@ -48,6 +48,7 @@ namespace AlibabaCloud std::string entityId; std::string faceId; float score; + float confidence; std::string dbName; std::string extraData; }; diff --git a/facebody/src/model/AddFaceRequest.cc b/facebody/src/model/AddFaceRequest.cc index 636cce8ec..451f31df2 100644 --- a/facebody/src/model/AddFaceRequest.cc +++ b/facebody/src/model/AddFaceRequest.cc @@ -38,6 +38,28 @@ void AddFaceRequest::setEntityId(const std::string& entityId) setBodyParameter("EntityId", entityId); } +float AddFaceRequest::getQualityScoreThreshold()const +{ + return qualityScoreThreshold_; +} + +void AddFaceRequest::setQualityScoreThreshold(float qualityScoreThreshold) +{ + qualityScoreThreshold_ = qualityScoreThreshold; + setBodyParameter("QualityScoreThreshold", std::to_string(qualityScoreThreshold)); +} + +float AddFaceRequest::getSimilarityScoreThresholdBetweenEntity()const +{ + return similarityScoreThresholdBetweenEntity_; +} + +void AddFaceRequest::setSimilarityScoreThresholdBetweenEntity(float similarityScoreThresholdBetweenEntity) +{ + similarityScoreThresholdBetweenEntity_ = similarityScoreThresholdBetweenEntity; + setBodyParameter("SimilarityScoreThresholdBetweenEntity", std::to_string(similarityScoreThresholdBetweenEntity)); +} + std::string AddFaceRequest::getExtraData()const { return extraData_; @@ -49,6 +71,17 @@ void AddFaceRequest::setExtraData(const std::string& extraData) setBodyParameter("ExtraData", extraData); } +float AddFaceRequest::getSimilarityScoreThresholdInEntity()const +{ + return similarityScoreThresholdInEntity_; +} + +void AddFaceRequest::setSimilarityScoreThresholdInEntity(float similarityScoreThresholdInEntity) +{ + similarityScoreThresholdInEntity_ = similarityScoreThresholdInEntity; + setBodyParameter("SimilarityScoreThresholdInEntity", std::to_string(similarityScoreThresholdInEntity)); +} + std::string AddFaceRequest::getDbName()const { return dbName_; diff --git a/facebody/src/model/SearchFaceRequest.cc b/facebody/src/model/SearchFaceRequest.cc index fda74dd07..22e87099f 100644 --- a/facebody/src/model/SearchFaceRequest.cc +++ b/facebody/src/model/SearchFaceRequest.cc @@ -27,6 +27,17 @@ SearchFaceRequest::SearchFaceRequest() : SearchFaceRequest::~SearchFaceRequest() {} +float SearchFaceRequest::getQualityScoreThreshold()const +{ + return qualityScoreThreshold_; +} + +void SearchFaceRequest::setQualityScoreThreshold(float qualityScoreThreshold) +{ + qualityScoreThreshold_ = qualityScoreThreshold; + setBodyParameter("QualityScoreThreshold", std::to_string(qualityScoreThreshold)); +} + int SearchFaceRequest::getLimit()const { return limit_; @@ -46,7 +57,7 @@ std::string SearchFaceRequest::getDbNames()const void SearchFaceRequest::setDbNames(const std::string& dbNames) { dbNames_ = dbNames; - setParameter("DbNames", dbNames); + setBodyParameter("DbNames", dbNames); } std::string SearchFaceRequest::getDbName()const diff --git a/facebody/src/model/SearchFaceResult.cc b/facebody/src/model/SearchFaceResult.cc index fe274d9a3..c46eb4ba7 100644 --- a/facebody/src/model/SearchFaceResult.cc +++ b/facebody/src/model/SearchFaceResult.cc @@ -58,6 +58,8 @@ void SearchFaceResult::parse(const std::string &payload) faceItemsObject.extraData = dataNodeMatchListMatchListItemFaceItemsFaceItemsItem["ExtraData"].asString(); if(!dataNodeMatchListMatchListItemFaceItemsFaceItemsItem["DbName"].isNull()) faceItemsObject.dbName = dataNodeMatchListMatchListItemFaceItemsFaceItemsItem["DbName"].asString(); + if(!dataNodeMatchListMatchListItemFaceItemsFaceItemsItem["Confidence"].isNull()) + faceItemsObject.confidence = std::stof(dataNodeMatchListMatchListItemFaceItemsFaceItemsItem["Confidence"].asString()); matchListItemObject.faceItems.push_back(faceItemsObject); } auto locationNode = value["Location"];