add make stage, preview url

VERSION

@@ -1 +1 @@
-1.36.1738
+1.36.1739

avatar/CMakeLists.txt

@@ -43,6 +43,8 @@ set(avatar_public_header_model
 	include/alibabacloud/avatar/model/QueryRunningInstanceResult.h
 	include/alibabacloud/avatar/model/QueryTimedResetOperateStatusRequest.h
 	include/alibabacloud/avatar/model/QueryTimedResetOperateStatusResult.h
+	include/alibabacloud/avatar/model/QueryVideoTaskInfoRequest.h
+	include/alibabacloud/avatar/model/QueryVideoTaskInfoResult.h
 	include/alibabacloud/avatar/model/SendCommandRequest.h
 	include/alibabacloud/avatar/model/SendCommandResult.h
 	include/alibabacloud/avatar/model/SendMessageRequest.h
@@ -92,6 +94,8 @@ set(avatar_src
 	src/model/QueryRunningInstanceResult.cc
 	src/model/QueryTimedResetOperateStatusRequest.cc
 	src/model/QueryTimedResetOperateStatusResult.cc
+	src/model/QueryVideoTaskInfoRequest.cc
+	src/model/QueryVideoTaskInfoResult.cc
 	src/model/SendCommandRequest.cc
 	src/model/SendCommandResult.cc
 	src/model/SendMessageRequest.cc

avatar/include/alibabacloud/avatar/AvatarClient.h

@@ -44,6 +44,8 @@
 #include "model/QueryRunningInstanceResult.h"
 #include "model/QueryTimedResetOperateStatusRequest.h"
 #include "model/QueryTimedResetOperateStatusResult.h"
+#include "model/QueryVideoTaskInfoRequest.h"
+#include "model/QueryVideoTaskInfoResult.h"
 #include "model/SendCommandRequest.h"
 #include "model/SendCommandResult.h"
 #include "model/SendMessageRequest.h"
@@ -110,6 +112,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::QueryTimedResetOperateStatusResult> QueryTimedResetOperateStatusOutcome;
 			typedef std::future<QueryTimedResetOperateStatusOutcome> QueryTimedResetOperateStatusOutcomeCallable;
 			typedef std::function<void(const AvatarClient*, const Model::QueryTimedResetOperateStatusRequest&, const QueryTimedResetOperateStatusOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> QueryTimedResetOperateStatusAsyncHandler;
+			typedef Outcome<Error, Model::QueryVideoTaskInfoResult> QueryVideoTaskInfoOutcome;
+			typedef std::future<QueryVideoTaskInfoOutcome> QueryVideoTaskInfoOutcomeCallable;
+			typedef std::function<void(const AvatarClient*, const Model::QueryVideoTaskInfoRequest&, const QueryVideoTaskInfoOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> QueryVideoTaskInfoAsyncHandler;
 			typedef Outcome<Error, Model::SendCommandResult> SendCommandOutcome;
 			typedef std::future<SendCommandOutcome> SendCommandOutcomeCallable;
 			typedef std::function<void(const AvatarClient*, const Model::SendCommandRequest&, const SendCommandOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> SendCommandAsyncHandler;
@@ -184,6 +189,9 @@ namespace AlibabaCloud
 			QueryTimedResetOperateStatusOutcome queryTimedResetOperateStatus(const Model::QueryTimedResetOperateStatusRequest &request)const;
 			void queryTimedResetOperateStatusAsync(const Model::QueryTimedResetOperateStatusRequest& request, const QueryTimedResetOperateStatusAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			QueryTimedResetOperateStatusOutcomeCallable queryTimedResetOperateStatusCallable(const Model::QueryTimedResetOperateStatusRequest& request) const;
+			QueryVideoTaskInfoOutcome queryVideoTaskInfo(const Model::QueryVideoTaskInfoRequest &request)const;
+			void queryVideoTaskInfoAsync(const Model::QueryVideoTaskInfoRequest& request, const QueryVideoTaskInfoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			QueryVideoTaskInfoOutcomeCallable queryVideoTaskInfoCallable(const Model::QueryVideoTaskInfoRequest& request) const;
 			SendCommandOutcome sendCommand(const Model::SendCommandRequest &request)const;
 			void sendCommandAsync(const Model::SendCommandRequest& request, const SendCommandAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			SendCommandOutcomeCallable sendCommandCallable(const Model::SendCommandRequest& request) const;

avatar/include/alibabacloud/avatar/model/GetVideoTaskInfoResult.h

@@ -38,6 +38,7 @@ namespace AlibabaCloud
 					{
 						std::string alphaUrl;
 						int videoDuration;
+						std::string previewPic;
 						std::string failCode;
 						std::string subtitlesUrl;
 						std::string wordSubtitlesUrl;

avatar/include/alibabacloud/avatar/model/QueryAvatarListResult.h

@@ -54,6 +54,7 @@ namespace AlibabaCloud
 							std::vector<OnlineItem> online;
 						};
 						std::string description;
+						std::string makeStage;
 						SupportedResolutions supportedResolutions;
 						std::string portrait;
 						std::string avatarType;

avatar/include/alibabacloud/avatar/model/QueryAvatarResult.h

@@ -52,12 +52,14 @@ namespace AlibabaCloud
 						std::vector<OnlineItem> online;
 					};
 					std::string description;
+					std::string makeStage;
 					SupportedResolutions supportedResolutions;
 					std::string portrait;
 					std::string modelType;
 					std::string avatarType;
 					std::string makeStatus;
 					std::string image;
+					std::string allLocateImages;
 					std::string name;
 					std::string makeFailReason;
 				};

avatar/include/alibabacloud/avatar/model/QueryVideoTaskInfoRequest.h

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_AVATAR_MODEL_QUERYVIDEOTASKINFOREQUEST_H_
+#define ALIBABACLOUD_AVATAR_MODEL_QUERYVIDEOTASKINFOREQUEST_H_
+
+#include <alibabacloud/avatar/AvatarExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Avatar {
+namespace Model {
+class ALIBABACLOUD_AVATAR_EXPORT QueryVideoTaskInfoRequest : public RpcServiceRequest {
+public:
+	struct App {
+		std::string appId;
+	};
+	QueryVideoTaskInfoRequest();
+	~QueryVideoTaskInfoRequest();
+	App getApp() const;
+	void setApp(const App &app);
+	std::string getTitle() const;
+	void setTitle(const std::string &title);
+	int getType() const;
+	void setType(int type);
+	std::string getOrderById() const;
+	void setOrderById(const std::string &orderById);
+	int getPageNo() const;
+	void setPageNo(int pageNo);
+	long getTenantId() const;
+	void setTenantId(long tenantId);
+	int getPageSize() const;
+	void setPageSize(int pageSize);
+	std::string getTaskUuid() const;
+	void setTaskUuid(const std::string &taskUuid);
+	int getStatus() const;
+	void setStatus(int status);
+
+private:
+	App app_;
+	std::string title_;
+	int type_;
+	std::string orderById_;
+	int pageNo_;
+	long tenantId_;
+	int pageSize_;
+	std::string taskUuid_;
+	int status_;
+};
+} // namespace Model
+} // namespace Avatar
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_AVATAR_MODEL_QUERYVIDEOTASKINFOREQUEST_H_

avatar/include/alibabacloud/avatar/model/QueryVideoTaskInfoResult.h

@@ -0,0 +1,83 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_AVATAR_MODEL_QUERYVIDEOTASKINFORESULT_H_
+#define ALIBABACLOUD_AVATAR_MODEL_QUERYVIDEOTASKINFORESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/avatar/AvatarExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Avatar
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_AVATAR_EXPORT QueryVideoTaskInfoResult : public ServiceResult
+			{
+			public:
+				struct Data
+				{
+					struct ListItem
+					{
+						struct TaskResult
+						{
+							std::string alphaUrl;
+							int videoDuration;
+							std::string previewPic;
+							std::string failCode;
+							std::string subtitlesUrl;
+							std::string wordSubtitlesUrl;
+							std::string failReason;
+							std::string videoUrl;
+						};
+						int status;
+						int type;
+						std::string taskUuid;
+						TaskResult taskResult;
+						std::string title;
+					};
+					long totalCount;
+					int pageSize;
+					std::vector<ListItem> list;
+					int pageNo;
+				};
+
+
+				QueryVideoTaskInfoResult();
+				explicit QueryVideoTaskInfoResult(const std::string &payload);
+				~QueryVideoTaskInfoResult();
+				std::string getMessage()const;
+				Data getData()const;
+				std::string getCode()const;
+				bool getSuccess()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string message_;
+				Data data_;
+				std::string code_;
+				bool success_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_AVATAR_MODEL_QUERYVIDEOTASKINFORESULT_H_

avatar/src/AvatarClient.cc

@@ -447,6 +447,42 @@ AvatarClient::QueryTimedResetOperateStatusOutcomeCallable AvatarClient::queryTim
 	return task->get_future();
 }
 
+AvatarClient::QueryVideoTaskInfoOutcome AvatarClient::queryVideoTaskInfo(const QueryVideoTaskInfoRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return QueryVideoTaskInfoOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return QueryVideoTaskInfoOutcome(QueryVideoTaskInfoResult(outcome.result()));
+	else
+		return QueryVideoTaskInfoOutcome(outcome.error());
+}
+
+void AvatarClient::queryVideoTaskInfoAsync(const QueryVideoTaskInfoRequest& request, const QueryVideoTaskInfoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, queryVideoTaskInfo(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+AvatarClient::QueryVideoTaskInfoOutcomeCallable AvatarClient::queryVideoTaskInfoCallable(const QueryVideoTaskInfoRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<QueryVideoTaskInfoOutcome()>>(
+			[this, request]()
+			{
+			return this->queryVideoTaskInfo(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 AvatarClient::SendCommandOutcome AvatarClient::sendCommand(const SendCommandRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

avatar/src/model/GetVideoTaskInfoResult.cc

@@ -63,6 +63,8 @@ void GetVideoTaskInfoResult::parse(const std::string &payload)
 		data_.taskResult.videoDuration = std::stoi(taskResultNode["VideoDuration"].asString());
 	if(!taskResultNode["AlphaUrl"].isNull())
 		data_.taskResult.alphaUrl = taskResultNode["AlphaUrl"].asString();
+	if(!taskResultNode["PreviewPic"].isNull())
+		data_.taskResult.previewPic = taskResultNode["PreviewPic"].asString();
 	if(!value["Code"].isNull())
 		code_ = value["Code"].asString();
 	if(!value["Message"].isNull())

avatar/src/model/QueryAvatarListResult.cc

@@ -70,6 +70,8 @@ void QueryAvatarListResult::parse(const std::string &payload)
 			listItemObject.makeStatus = dataNodeListlistItem["MakeStatus"].asString();
 		if(!dataNodeListlistItem["MakeFailReason"].isNull())
 			listItemObject.makeFailReason = dataNodeListlistItem["MakeFailReason"].asString();
+		if(!dataNodeListlistItem["MakeStage"].isNull())
+			listItemObject.makeStage = dataNodeListlistItem["MakeStage"].asString();
 		auto supportedResolutionsNode = value["SupportedResolutions"];
 		auto allOfflineNode = supportedResolutionsNode["Offline"]["offlineItem"];
 		for (auto supportedResolutionsNodeOfflineofflineItem : allOfflineNode)

avatar/src/model/QueryAvatarResult.cc

@@ -48,6 +48,8 @@ void QueryAvatarResult::parse(const std::string &payload)
 		data_.portrait = dataNode["Portrait"].asString();
 	if(!dataNode["Image"].isNull())
 		data_.image = dataNode["Image"].asString();
+	if(!dataNode["AllLocateImages"].isNull())
+		data_.allLocateImages = dataNode["AllLocateImages"].asString();
 	if(!dataNode["ModelType"].isNull())
 		data_.modelType = dataNode["ModelType"].asString();
 	if(!dataNode["AvatarType"].isNull())
@@ -56,6 +58,8 @@ void QueryAvatarResult::parse(const std::string &payload)
 		data_.makeStatus = dataNode["MakeStatus"].asString();
 	if(!dataNode["MakeFailReason"].isNull())
 		data_.makeFailReason = dataNode["MakeFailReason"].asString();
+	if(!dataNode["MakeStage"].isNull())
+		data_.makeStage = dataNode["MakeStage"].asString();
 	auto supportedResolutionsNode = dataNode["SupportedResolutions"];
 	auto allOfflineNode = supportedResolutionsNode["Offline"]["offlineItem"];
 	for (auto supportedResolutionsNodeOfflineofflineItem : allOfflineNode)

avatar/src/model/QueryVideoTaskInfoRequest.cc

@@ -0,0 +1,108 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/avatar/model/QueryVideoTaskInfoRequest.h>
+
+using AlibabaCloud::Avatar::Model::QueryVideoTaskInfoRequest;
+
+QueryVideoTaskInfoRequest::QueryVideoTaskInfoRequest()
+    : RpcServiceRequest("avatar", "2022-01-30", "QueryVideoTaskInfo") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+QueryVideoTaskInfoRequest::~QueryVideoTaskInfoRequest() {}
+
+QueryVideoTaskInfoRequest::App QueryVideoTaskInfoRequest::getApp() const {
+  return app_;
+}
+
+void QueryVideoTaskInfoRequest::setApp(const QueryVideoTaskInfoRequest::App &app) {
+  app_ = app;
+  setParameter(std::string("App") + ".AppId", app.appId);
+}
+
+std::string QueryVideoTaskInfoRequest::getTitle() const {
+  return title_;
+}
+
+void QueryVideoTaskInfoRequest::setTitle(const std::string &title) {
+  title_ = title;
+  setParameter(std::string("Title"), title);
+}
+
+int QueryVideoTaskInfoRequest::getType() const {
+  return type_;
+}
+
+void QueryVideoTaskInfoRequest::setType(int type) {
+  type_ = type;
+  setParameter(std::string("Type"), std::to_string(type));
+}
+
+std::string QueryVideoTaskInfoRequest::getOrderById() const {
+  return orderById_;
+}
+
+void QueryVideoTaskInfoRequest::setOrderById(const std::string &orderById) {
+  orderById_ = orderById;
+  setParameter(std::string("OrderById"), orderById);
+}
+
+int QueryVideoTaskInfoRequest::getPageNo() const {
+  return pageNo_;
+}
+
+void QueryVideoTaskInfoRequest::setPageNo(int pageNo) {
+  pageNo_ = pageNo;
+  setParameter(std::string("PageNo"), std::to_string(pageNo));
+}
+
+long QueryVideoTaskInfoRequest::getTenantId() const {
+  return tenantId_;
+}
+
+void QueryVideoTaskInfoRequest::setTenantId(long tenantId) {
+  tenantId_ = tenantId;
+  setParameter(std::string("TenantId"), std::to_string(tenantId));
+}
+
+int QueryVideoTaskInfoRequest::getPageSize() const {
+  return pageSize_;
+}
+
+void QueryVideoTaskInfoRequest::setPageSize(int pageSize) {
+  pageSize_ = pageSize;
+  setParameter(std::string("PageSize"), std::to_string(pageSize));
+}
+
+std::string QueryVideoTaskInfoRequest::getTaskUuid() const {
+  return taskUuid_;
+}
+
+void QueryVideoTaskInfoRequest::setTaskUuid(const std::string &taskUuid) {
+  taskUuid_ = taskUuid;
+  setParameter(std::string("TaskUuid"), taskUuid);
+}
+
+int QueryVideoTaskInfoRequest::getStatus() const {
+  return status_;
+}
+
+void QueryVideoTaskInfoRequest::setStatus(int status) {
+  status_ = status;
+  setParameter(std::string("Status"), std::to_string(status));
+}
+

avatar/src/model/QueryVideoTaskInfoResult.cc

@@ -0,0 +1,108 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/avatar/model/QueryVideoTaskInfoResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Avatar;
+using namespace AlibabaCloud::Avatar::Model;
+
+QueryVideoTaskInfoResult::QueryVideoTaskInfoResult() :
+	ServiceResult()
+{}
+
+QueryVideoTaskInfoResult::QueryVideoTaskInfoResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+QueryVideoTaskInfoResult::~QueryVideoTaskInfoResult()
+{}
+
+void QueryVideoTaskInfoResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto dataNode = value["Data"];
+	if(!dataNode["PageNo"].isNull())
+		data_.pageNo = std::stoi(dataNode["PageNo"].asString());
+	if(!dataNode["PageSize"].isNull())
+		data_.pageSize = std::stoi(dataNode["PageSize"].asString());
+	if(!dataNode["TotalCount"].isNull())
+		data_.totalCount = std::stol(dataNode["TotalCount"].asString());
+	auto allListNode = dataNode["List"]["listItem"];
+	for (auto dataNodeListlistItem : allListNode)
+	{
+		Data::ListItem listItemObject;
+		if(!dataNodeListlistItem["TaskUuid"].isNull())
+			listItemObject.taskUuid = dataNodeListlistItem["TaskUuid"].asString();
+		if(!dataNodeListlistItem["Title"].isNull())
+			listItemObject.title = dataNodeListlistItem["Title"].asString();
+		if(!dataNodeListlistItem["Type"].isNull())
+			listItemObject.type = std::stoi(dataNodeListlistItem["Type"].asString());
+		if(!dataNodeListlistItem["Status"].isNull())
+			listItemObject.status = std::stoi(dataNodeListlistItem["Status"].asString());
+		auto taskResultNode = value["TaskResult"];
+		if(!taskResultNode["VideoUrl"].isNull())
+			listItemObject.taskResult.videoUrl = taskResultNode["VideoUrl"].asString();
+		if(!taskResultNode["SubtitlesUrl"].isNull())
+			listItemObject.taskResult.subtitlesUrl = taskResultNode["SubtitlesUrl"].asString();
+		if(!taskResultNode["WordSubtitlesUrl"].isNull())
+			listItemObject.taskResult.wordSubtitlesUrl = taskResultNode["WordSubtitlesUrl"].asString();
+		if(!taskResultNode["VideoDuration"].isNull())
+			listItemObject.taskResult.videoDuration = std::stoi(taskResultNode["VideoDuration"].asString());
+		if(!taskResultNode["FailReason"].isNull())
+			listItemObject.taskResult.failReason = taskResultNode["FailReason"].asString();
+		if(!taskResultNode["FailCode"].isNull())
+			listItemObject.taskResult.failCode = taskResultNode["FailCode"].asString();
+		if(!taskResultNode["AlphaUrl"].isNull())
+			listItemObject.taskResult.alphaUrl = taskResultNode["AlphaUrl"].asString();
+		if(!taskResultNode["PreviewPic"].isNull())
+			listItemObject.taskResult.previewPic = taskResultNode["PreviewPic"].asString();
+		data_.list.push_back(listItemObject);
+	}
+	if(!value["Success"].isNull())
+		success_ = value["Success"].asString() == "true";
+	if(!value["Code"].isNull())
+		code_ = value["Code"].asString();
+	if(!value["Message"].isNull())
+		message_ = value["Message"].asString();
+
+}
+
+std::string QueryVideoTaskInfoResult::getMessage()const
+{
+	return message_;
+}
+
+QueryVideoTaskInfoResult::Data QueryVideoTaskInfoResult::getData()const
+{
+	return data_;
+}
+
+std::string QueryVideoTaskInfoResult::getCode()const
+{
+	return code_;
+}
+
+bool QueryVideoTaskInfoResult::getSuccess()const
+{
+	return success_;
+}
+