Support sg for ml region.

CHANGELOG

@@ -1,3 +1,6 @@
+2020-09-02 Version: 1.36.631
+- Support sg for ml region.
+
 2020-09-02 Version: 1.36.630
 - ChatApp second version.
 - Support new message fomat.

VERSION

@@ -1 +1 @@
-1.36.630
+1.36.631

saf/CMakeLists.txt

@@ -25,6 +25,8 @@ set(saf_public_header_model
 	include/alibabacloud/saf/model/ExecuteExtendServiceResult.h
 	include/alibabacloud/saf/model/ExecuteRequestRequest.h
 	include/alibabacloud/saf/model/ExecuteRequestResult.h
+	include/alibabacloud/saf/model/ExecuteRequestMLRequest.h
+	include/alibabacloud/saf/model/ExecuteRequestMLResult.h
 	include/alibabacloud/saf/model/ExecuteRequestSGRequest.h
 	include/alibabacloud/saf/model/ExecuteRequestSGResult.h )
 
@@ -34,6 +36,8 @@ set(saf_src
 	src/model/ExecuteExtendServiceResult.cc
 	src/model/ExecuteRequestRequest.cc
 	src/model/ExecuteRequestResult.cc
+	src/model/ExecuteRequestMLRequest.cc
+	src/model/ExecuteRequestMLResult.cc
 	src/model/ExecuteRequestSGRequest.cc
 	src/model/ExecuteRequestSGResult.cc )
 

saf/include/alibabacloud/saf/SafClient.h

@@ -26,6 +26,8 @@
 #include "model/ExecuteExtendServiceResult.h"
 #include "model/ExecuteRequestRequest.h"
 #include "model/ExecuteRequestResult.h"
+#include "model/ExecuteRequestMLRequest.h"
+#include "model/ExecuteRequestMLResult.h"
 #include "model/ExecuteRequestSGRequest.h"
 #include "model/ExecuteRequestSGResult.h"
 
@@ -43,6 +45,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ExecuteRequestResult> ExecuteRequestOutcome;
 			typedef std::future<ExecuteRequestOutcome> ExecuteRequestOutcomeCallable;
 			typedef std::function<void(const SafClient*, const Model::ExecuteRequestRequest&, const ExecuteRequestOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ExecuteRequestAsyncHandler;
+			typedef Outcome<Error, Model::ExecuteRequestMLResult> ExecuteRequestMLOutcome;
+			typedef std::future<ExecuteRequestMLOutcome> ExecuteRequestMLOutcomeCallable;
+			typedef std::function<void(const SafClient*, const Model::ExecuteRequestMLRequest&, const ExecuteRequestMLOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ExecuteRequestMLAsyncHandler;
 			typedef Outcome<Error, Model::ExecuteRequestSGResult> ExecuteRequestSGOutcome;
 			typedef std::future<ExecuteRequestSGOutcome> ExecuteRequestSGOutcomeCallable;
 			typedef std::function<void(const SafClient*, const Model::ExecuteRequestSGRequest&, const ExecuteRequestSGOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ExecuteRequestSGAsyncHandler;
@@ -57,6 +62,9 @@ namespace AlibabaCloud
 			ExecuteRequestOutcome executeRequest(const Model::ExecuteRequestRequest &request)const;
 			void executeRequestAsync(const Model::ExecuteRequestRequest& request, const ExecuteRequestAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ExecuteRequestOutcomeCallable executeRequestCallable(const Model::ExecuteRequestRequest& request) const;
+			ExecuteRequestMLOutcome executeRequestML(const Model::ExecuteRequestMLRequest &request)const;
+			void executeRequestMLAsync(const Model::ExecuteRequestMLRequest& request, const ExecuteRequestMLAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ExecuteRequestMLOutcomeCallable executeRequestMLCallable(const Model::ExecuteRequestMLRequest& request) const;
 			ExecuteRequestSGOutcome executeRequestSG(const Model::ExecuteRequestSGRequest &request)const;
 			void executeRequestSGAsync(const Model::ExecuteRequestSGRequest& request, const ExecuteRequestSGAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ExecuteRequestSGOutcomeCallable executeRequestSGCallable(const Model::ExecuteRequestSGRequest& request) const;

saf/include/alibabacloud/saf/model/ExecuteRequestMLRequest.h

@@ -0,0 +1,51 @@
+/*
+ * 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_SAF_MODEL_EXECUTEREQUESTMLREQUEST_H_
+#define ALIBABACLOUD_SAF_MODEL_EXECUTEREQUESTMLREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/saf/SafExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Saf
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_SAF_EXPORT ExecuteRequestMLRequest : public RpcServiceRequest
+			{
+
+			public:
+				ExecuteRequestMLRequest();
+				~ExecuteRequestMLRequest();
+
+				std::string getServiceParameters()const;
+				void setServiceParameters(const std::string& serviceParameters);
+				std::string getService()const;
+				void setService(const std::string& service);
+
+            private:
+				std::string serviceParameters_;
+				std::string service_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_SAF_MODEL_EXECUTEREQUESTMLREQUEST_H_

saf/include/alibabacloud/saf/model/ExecuteRequestMLResult.h

@@ -0,0 +1,55 @@
+/*
+ * 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_SAF_MODEL_EXECUTEREQUESTMLRESULT_H_
+#define ALIBABACLOUD_SAF_MODEL_EXECUTEREQUESTMLRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/saf/SafExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Saf
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_SAF_EXPORT ExecuteRequestMLResult : public ServiceResult
+			{
+			public:
+
+
+				ExecuteRequestMLResult();
+				explicit ExecuteRequestMLResult(const std::string &payload);
+				~ExecuteRequestMLResult();
+				std::string getMessage()const;
+				std::string getData()const;
+				int getCode()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string message_;
+				std::string data_;
+				int code_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_SAF_MODEL_EXECUTEREQUESTMLRESULT_H_

saf/src/SafClient.cc

@@ -31,21 +31,21 @@ SafClient::SafClient(const Credentials &credentials, const ClientConfiguration &
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(credentials), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentials, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "SAF");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "saf");
 }
 
 SafClient::SafClient(const std::shared_ptr<CredentialsProvider>& credentialsProvider, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, credentialsProvider, configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentialsProvider, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "SAF");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "saf");
 }
 
 SafClient::SafClient(const std::string & accessKeyId, const std::string & accessKeySecret, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(accessKeyId, accessKeySecret), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(accessKeyId, accessKeySecret, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "SAF");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "saf");
 }
 
 SafClient::~SafClient()
@@ -123,6 +123,42 @@ SafClient::ExecuteRequestOutcomeCallable SafClient::executeRequestCallable(const
 	return task->get_future();
 }
 
+SafClient::ExecuteRequestMLOutcome SafClient::executeRequestML(const ExecuteRequestMLRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return ExecuteRequestMLOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return ExecuteRequestMLOutcome(ExecuteRequestMLResult(outcome.result()));
+	else
+		return ExecuteRequestMLOutcome(outcome.error());
+}
+
+void SafClient::executeRequestMLAsync(const ExecuteRequestMLRequest& request, const ExecuteRequestMLAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, executeRequestML(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+SafClient::ExecuteRequestMLOutcomeCallable SafClient::executeRequestMLCallable(const ExecuteRequestMLRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<ExecuteRequestMLOutcome()>>(
+			[this, request]()
+			{
+			return this->executeRequestML(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 SafClient::ExecuteRequestSGOutcome SafClient::executeRequestSG(const ExecuteRequestSGRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

saf/src/model/ExecuteRequestMLRequest.cc

@@ -0,0 +1,51 @@
+/*
+ * 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/saf/model/ExecuteRequestMLRequest.h>
+
+using AlibabaCloud::Saf::Model::ExecuteRequestMLRequest;
+
+ExecuteRequestMLRequest::ExecuteRequestMLRequest() :
+	RpcServiceRequest("saf", "2019-05-21", "ExecuteRequestML")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+ExecuteRequestMLRequest::~ExecuteRequestMLRequest()
+{}
+
+std::string ExecuteRequestMLRequest::getServiceParameters()const
+{
+	return serviceParameters_;
+}
+
+void ExecuteRequestMLRequest::setServiceParameters(const std::string& serviceParameters)
+{
+	serviceParameters_ = serviceParameters;
+	setParameter("ServiceParameters", serviceParameters);
+}
+
+std::string ExecuteRequestMLRequest::getService()const
+{
+	return service_;
+}
+
+void ExecuteRequestMLRequest::setService(const std::string& service)
+{
+	service_ = service;
+	setParameter("Service", service);
+}
+

saf/src/model/ExecuteRequestMLResult.cc

@@ -0,0 +1,65 @@
+/*
+ * 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/saf/model/ExecuteRequestMLResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Saf;
+using namespace AlibabaCloud::Saf::Model;
+
+ExecuteRequestMLResult::ExecuteRequestMLResult() :
+	ServiceResult()
+{}
+
+ExecuteRequestMLResult::ExecuteRequestMLResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+ExecuteRequestMLResult::~ExecuteRequestMLResult()
+{}
+
+void ExecuteRequestMLResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["Code"].isNull())
+		code_ = std::stoi(value["Code"].asString());
+	if(!value["Message"].isNull())
+		message_ = value["Message"].asString();
+	if(!value["Data"].isNull())
+		data_ = value["Data"].asString();
+
+}
+
+std::string ExecuteRequestMLResult::getMessage()const
+{
+	return message_;
+}
+
+std::string ExecuteRequestMLResult::getData()const
+{
+	return data_;
+}
+
+int ExecuteRequestMLResult::getCode()const
+{
+	return code_;
+}
+