tencentcloud-sdk-python 3.0.1316__tar.gz → 3.0.1318__tar.gz

{tencentcloud-sdk-python-3.0.1316 → tencentcloud-sdk-python-3.0.1318}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tencentcloud-sdk-python
-Version: 3.0.1316
+Version: 3.0.1318
 Summary: Tencent Cloud SDK for Python
 Home-page: https://github.com/TencentCloud/tencentcloud-sdk-python
 Author: Tencent Cloud

{tencentcloud-sdk-python-3.0.1316 → tencentcloud-sdk-python-3.0.1318}/tencentcloud/__init__.py

@@ -14,4 +14,4 @@
 # limitations under the License.
 
 
-__version__ = '3.0.1316'
+__version__ = '3.0.1318'

{tencentcloud-sdk-python-3.0.1316 → tencentcloud-sdk-python-3.0.1318}/tencentcloud/antiddos/v20200309/models.py

@@ -4214,7 +4214,7 @@ class CreateBoundIPRequest(AbstractModel):
         :type UnBoundDevList: list of BoundIpInfo
         :param _CopyPolicy: 已弃用，不填
         :type CopyPolicy: str
-        :param _FilterRegion: 如果该资源实例为域名化资产则，该参数必填
+        :param _FilterRegion: 如果该资源实例为域名化资产以及跨地域绑定则，该参数必填
         :type FilterRegion: str
         """
         self._Business = None
@@ -4281,7 +4281,7 @@ class CreateBoundIPRequest(AbstractModel):
 
     @property
     def FilterRegion(self):
-        """如果该资源实例为域名化资产则，该参数必填
+        """如果该资源实例为域名化资产以及跨地域绑定则，该参数必填
         :rtype: str
         """
         return self._FilterRegion

{tencentcloud-sdk-python-3.0.1316 → tencentcloud-sdk-python-3.0.1318}/tencentcloud/ccc/v20200210/models.py

@@ -14247,7 +14247,7 @@ class TelCdrInfo(AbstractModel):
 电话呼出	        210	           notInService	不在服务区
 
 电话呼入&呼出	211    clientError    客户端错误
-
+电话呼出        212     carrierBlocked      运营商拦截
         :type EndStatus: int
         :param _SkillGroup: 技能组名称
         :type SkillGroup: str
@@ -14322,7 +14322,7 @@ class TelCdrInfo(AbstractModel):
 电话呼出	        210	           notInService	不在服务区
 
 电话呼入&呼出	211    clientError    客户端错误
-
+电话呼出        212     carrierBlocked      运营商拦截
         :type EndStatusString: str
         :param _StartTimestamp: 会话开始时间戳，UNIX 秒级时间戳
         :type StartTimestamp: int
@@ -14546,7 +14546,7 @@ NotExists
 电话呼出	        210	           notInService	不在服务区
 
 电话呼入&呼出	211    clientError    客户端错误
-
+电话呼出        212     carrierBlocked      运营商拦截
         :rtype: int
         """
         return self._EndStatus
@@ -14720,7 +14720,7 @@ NotExists
 电话呼出	        210	           notInService	不在服务区
 
 电话呼入&呼出	211    clientError    客户端错误
-
+电话呼出        212     carrierBlocked      运营商拦截
         :rtype: str
         """
         return self._EndStatusString

{tencentcloud-sdk-python-3.0.1316 → tencentcloud-sdk-python-3.0.1318}/tencentcloud/cdn/v20180606/errorcodes.py

@@ -26,6 +26,9 @@ FAILEDOPERATION = 'FailedOperation'
 # 域名配置更新操作失败，请重试或联系客服人员解决。
 FAILEDOPERATION_CDNCONFIGERROR = 'FailedOperation.CdnConfigError'
 
+# 证书不存在
+FAILEDOPERATION_SSLCERTNOTFOUND = 'FailedOperation.SslCertNotFound'
+
 # 内部错误。
 INTERNALERROR = 'InternalError'
 

{tencentcloud-sdk-python-3.0.1316 → tencentcloud-sdk-python-3.0.1318}/tencentcloud/cdn/v20180606/models.py

@@ -3959,7 +3959,7 @@ off：关闭
         :param _AccessKey: 访问ID。
 注意：此字段可能返回 null，表示取不到有效值。
         :type AccessKey: str
-        :param _SecretKey: 密钥。
+        :param _SecretKey: 密钥，字段为脱敏返回。
 注意：此字段可能返回 null，表示取不到有效值。
         :type SecretKey: str
         :param _Region: 地域
@@ -4002,7 +4002,7 @@ off：关闭
 
     @property
     def SecretKey(self):
-        """密钥。
+        """密钥，字段为脱敏返回。
 注意：此字段可能返回 null，表示取不到有效值。
         :rtype: str
         """
@@ -20416,7 +20416,7 @@ off：关闭
         :param _AccessKey: 访问 ID
 注意：此字段可能返回 null，表示取不到有效值。
         :type AccessKey: str
-        :param _SecretKey: 密钥
+        :param _SecretKey: 密钥，字段为脱敏返回。
 注意：此字段可能返回 null，表示取不到有效值。
         :type SecretKey: str
         :param _Bucket: bucketname
@@ -20455,7 +20455,7 @@ off：关闭
 
     @property
     def SecretKey(self):
-        """密钥
+        """密钥，字段为脱敏返回。
 注意：此字段可能返回 null，表示取不到有效值。
         :rtype: str
         """
@@ -25597,7 +25597,7 @@ off：关闭
         :param _AccessKey: 访问ID。
 注意：此字段可能返回 null，表示取不到有效值。
         :type AccessKey: str
-        :param _SecretKey: 密钥。
+        :param _SecretKey: 密钥，字段为脱敏返回。
 注意：此字段可能返回 null，表示取不到有效值。
         :type SecretKey: str
         :param _Region: 地域
@@ -25640,7 +25640,7 @@ off：关闭
 
     @property
     def SecretKey(self):
-        """密钥。
+        """密钥，字段为脱敏返回。
 注意：此字段可能返回 null，表示取不到有效值。
         :rtype: str
         """
@@ -25705,7 +25705,7 @@ off：关闭
         :param _AccessKey: 访问ID。
 注意：此字段可能返回 null，表示取不到有效值。
         :type AccessKey: str
-        :param _SecretKey: 密钥。
+        :param _SecretKey: 密钥，字段位脱敏返回。
 注意：此字段可能返回 null，表示取不到有效值。
         :type SecretKey: str
         :param _Region: 地域。
@@ -25748,7 +25748,7 @@ off：关闭
 
     @property
     def SecretKey(self):
-        """密钥。
+        """密钥，字段位脱敏返回。
 注意：此字段可能返回 null，表示取不到有效值。
         :rtype: str
         """
@@ -27550,7 +27550,7 @@ off：关闭
         :param _AccessKey: 访问 ID
 注意：此字段可能返回 null，表示取不到有效值。
         :type AccessKey: str
-        :param _SecretKey: 密钥
+        :param _SecretKey: 密钥，字段为脱敏返回。
         :type SecretKey: str
         """
         self._Switch = None
@@ -27584,7 +27584,7 @@ off：关闭
 
     @property
     def SecretKey(self):
-        """密钥
+        """密钥，字段为脱敏返回。
         :rtype: str
         """
         return self._SecretKey

{tencentcloud-sdk-python-3.0.1316 → tencentcloud-sdk-python-3.0.1318}/tencentcloud/cls/v20201016/models.py

@@ -25854,7 +25854,7 @@ class NoticeReceiver(AbstractModel):
         :type ReceiverType: str
         :param _ReceiverIds: 接收者。
 当ReceiverType为Uin时，ReceiverIds的值为用户uid。[子用户信息查询](https://cloud.tencent.com/document/api/598/53486)
-当ReceiverType为Group时，ReceiverIds的值为用户组id。[CAM用户组](https://cloud.tencent.com/document/product/598/14985)
+当ReceiverType为Group时，ReceiverIds的值为用户组id。[CAM用户组](https://cloud.tencent.com/document/product/598/34589)
         :type ReceiverIds: list of int
         :param _ReceiverChannels: 通知接收渠道。
 - Email - 邮件
@@ -25901,7 +25901,7 @@ class NoticeReceiver(AbstractModel):
     def ReceiverIds(self):
         """接收者。
 当ReceiverType为Uin时，ReceiverIds的值为用户uid。[子用户信息查询](https://cloud.tencent.com/document/api/598/53486)
-当ReceiverType为Group时，ReceiverIds的值为用户组id。[CAM用户组](https://cloud.tencent.com/document/product/598/14985)
+当ReceiverType为Group时，ReceiverIds的值为用户组id。[CAM用户组](https://cloud.tencent.com/document/product/598/34589)
         :rtype: list of int
         """
         return self._ReceiverIds

{tencentcloud-sdk-python-3.0.1316 → tencentcloud-sdk-python-3.0.1318}/tencentcloud/common/abstract_client.py

@@ -39,6 +39,7 @@ from tencentcloud.common.http.request import RequestInternal
 from tencentcloud.common.profile.client_profile import ClientProfile, RegionBreakerProfile
 from tencentcloud.common.sign import Sign
 from tencentcloud.common.circuit_breaker import CircuitBreaker
+from tencentcloud.common.retry import NoopRetryer
 
 warnings.filterwarnings("ignore", module="tencentcloud", category=UserWarning)
 
@@ -428,11 +429,16 @@ class AbstractClient(object):
         return self.request.send_request(req)
 
     def call(self, action, params, options=None, headers=None):
-        resp = self._call(action, params, options, headers)
-        self._check_status(resp)
-        self._check_error(resp)
-        logger.debug("GetResponse: %s", ResponsePrettyFormatter(resp))
-        return resp.content
+
+        def _call_once():
+            resp = self._call(action, params, options, headers)
+            self._check_status(resp)
+            self._check_error(resp)
+            logger.debug("GetResponse: %s", ResponsePrettyFormatter(resp))
+            return resp
+
+        retryer = self.profile.retryer or NoopRetryer()
+        return retryer.send_request(_call_once).content
 
     def _call_with_region_breaker(self, action, params, options=None, headers=None):
         endpoint = self._get_endpoint()
@@ -508,23 +514,36 @@ class AbstractClient(object):
         :type options: dict
         :param options: request options, like {"SkipSign": False, "IsMultipart": False, "IsOctetStream": False, "BinaryParams": []}
         """
-        resp = self._call(action, params, options, headers)
-        self._check_status(resp)
-        self._check_error(resp)
-        logger.debug("GetResponse: %s", ResponsePrettyFormatter(resp))
-        return json.loads(resp.content)
+
+        def _call_once():
+            resp = self._call(action, params, options, headers)
+            self._check_status(resp)
+            self._check_error(resp)
+            logger.debug("GetResponse: %s", ResponsePrettyFormatter(resp))
+            return resp
+
+        retryer = self.profile.retryer or NoopRetryer()
+        return json.loads(retryer.send_request(_call_once).content)
 
     def call_sse(self, action, params, headers=None, options=None):
-        resp = self._call(action, params, options, headers)
-        self._check_status(resp)
-        self._check_error(resp)
-        return self._process_response_sse(resp)
+        def _call_once():
+            resp = self._call(action, params, options, headers)
+            self._check_status(resp)
+            self._check_error(resp)
+            return resp
+
+        retryer = self.profile.retryer or NoopRetryer()
+        return self._process_response_sse(retryer.send_request(_call_once))
 
     def _call_and_deserialize(self, action, params, resp_type, headers=None, options=None):
-        resp = self._call(action, params, options, headers)
-        self._check_status(resp)
-        self._check_error(resp)
-        return self._process_response(resp, resp_type)
+        def _call_once():
+            resp = self._call(action, params, options, headers)
+            self._check_status(resp)
+            self._check_error(resp)
+            return resp
+
+        retryer = self.profile.retryer or NoopRetryer()
+        return self._process_response(retryer.send_request(_call_once), resp_type)
 
     def _process_response(self, resp, resp_type):
         if resp.headers.get('Content-Type') == "text/event-stream":

{tencentcloud-sdk-python-3.0.1316 → tencentcloud-sdk-python-3.0.1318}/tencentcloud/common/profile/client_profile.py

@@ -21,7 +21,7 @@ class ClientProfile(object):
     unsignedPayload = False
 
     def __init__(self, signMethod=None, httpProfile=None, language="zh-CN",
-                 disable_region_breaker=True, region_breaker_profile=None, request_client=None):
+                 disable_region_breaker=True, region_breaker_profile=None, request_client=None, retryer=None):
         """SDK profile.
 
         :param signMethod: The signature method, valid choice: HmacSHA1, HmacSHA256, TC3-HMAC-SHA256
@@ -55,13 +55,15 @@ class ClientProfile(object):
         elif request_client is not None:
             warnings.warn("RequestClient not match the regexp: ^[0-9a-zA-Z-_,;.]+$, ignored")
 
+        self.retryer = retryer
+
 
 class RegionBreakerProfile(object):
 
     def __init__(self, backup_endpoint="ap-guangzhou.tencentcloudapi.com",
                  max_fail_num=5,
                  max_fail_percent=0.75,
-                 window_interval=60*5,
+                 window_interval=60 * 5,
                  timeout=60,
                  max_requests=5):
         """RegionBreaker profile.
@@ -102,4 +104,3 @@ class RegionBreakerProfile(object):
             if len(region.split("-")) != 2:
                 return False
         return True
-

tencentcloud-sdk-python-3.0.1318/tencentcloud/common/retry.py

@@ -0,0 +1,62 @@
+import logging
+import time
+
+from tencentcloud.common.exception import TencentCloudSDKException
+
+
+class NoopRetryer(object):
+    def send_request(self, fn):
+        return fn()
+
+
+class StandardRetryer(object):
+    def __init__(self, max_attempts=3, backoff_fn=None, logger=None):
+        self._max_attempts = max_attempts
+        self._backoff_fn = backoff_fn or self.backoff
+        self._logger = logger
+
+    def send_request(self, fn):
+        resp = None
+        err = None
+
+        for n in range(self._max_attempts):
+            try:
+                resp = fn()
+            except TencentCloudSDKException as e:
+                err = e
+
+            if not self.should_retry(resp, err):
+                if err:
+                    raise err
+                return resp
+
+            sleep = self._backoff_fn(n)
+            self.on_retry(n, sleep, resp, err)
+            time.sleep(sleep)
+
+        raise err
+
+    @staticmethod
+    def should_retry(resp, err):
+        if not err:
+            return False
+
+        if not isinstance(err, TencentCloudSDKException):
+            return False
+
+        ec = err.get_code()
+        if ec in (
+                "ClientNetworkError", "ServerNetworkError", "RequestLimitExceeded",
+                "RequestLimitExceeded.UinLimitExceeded", "RequestLimitExceeded.GlobalRegionUinLimitExceeded"
+        ):
+            return True
+
+        return False
+
+    @staticmethod
+    def backoff(n):
+        return 2 ** n
+
+    def on_retry(self, n, sleep, resp, err):
+        if self._logger:
+            self._logger.debug("retry: n=%d sleep=%ss err=%s", n, sleep, err)

{tencentcloud-sdk-python-3.0.1316 → tencentcloud-sdk-python-3.0.1318}/tencentcloud/cvm/v20170312/models.py

@@ -10528,11 +10528,25 @@ class ImportImageResponse(AbstractModel):
 
     def __init__(self):
         r"""
+        :param _ImageId: 镜像 ID
+        :type ImageId: str
         :param _RequestId: 唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。
         :type RequestId: str
         """
+        self._ImageId = None
         self._RequestId = None
 
+    @property
+    def ImageId(self):
+        """镜像 ID
+        :rtype: str
+        """
+        return self._ImageId
+
+    @ImageId.setter
+    def ImageId(self, ImageId):
+        self._ImageId = ImageId
+
     @property
     def RequestId(self):
         """唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。
@@ -10546,6 +10560,7 @@ class ImportImageResponse(AbstractModel):
 
 
     def _deserialize(self, params):
+        self._ImageId = params.get("ImageId")
         self._RequestId = params.get("RequestId")
 
 

{tencentcloud-sdk-python-3.0.1316 → tencentcloud-sdk-python-3.0.1318}/tencentcloud/emr/v20190103/models.py

@@ -27187,7 +27187,7 @@ class RunJobFlowResponse(AbstractModel):
 
 
 class SLInstanceInfo(AbstractModel):
-    """Serverless HBase 实例信息
+    """Serverless HBase实例信息
 
     """
 
@@ -27199,6 +27199,8 @@ class SLInstanceInfo(AbstractModel):
         :type Id: int
         :param _StatusDesc: 状态描述
         :type StatusDesc: str
+        :param _HealthStatus: 健康状态
+        :type HealthStatus: str
         :param _ClusterName: 实例名称
         :type ClusterName: str
         :param _RegionId: 地域ID
@@ -27235,6 +27237,7 @@ class SLInstanceInfo(AbstractModel):
         self._ClusterId = None
         self._Id = None
         self._StatusDesc = None
+        self._HealthStatus = None
         self._ClusterName = None
         self._RegionId = None
         self._ZoneId = None
@@ -27284,6 +27287,17 @@ class SLInstanceInfo(AbstractModel):
     def StatusDesc(self, StatusDesc):
         self._StatusDesc = StatusDesc
 
+    @property
+    def HealthStatus(self):
+        """健康状态
+        :rtype: str
+        """
+        return self._HealthStatus
+
+    @HealthStatus.setter
+    def HealthStatus(self, HealthStatus):
+        self._HealthStatus = HealthStatus
+
     @property
     def ClusterName(self):
         """实例名称
@@ -27456,6 +27470,7 @@ class SLInstanceInfo(AbstractModel):
         self._ClusterId = params.get("ClusterId")
         self._Id = params.get("Id")
         self._StatusDesc = params.get("StatusDesc")
+        self._HealthStatus = params.get("HealthStatus")
         self._ClusterName = params.get("ClusterName")
         self._RegionId = params.get("RegionId")
         self._ZoneId = params.get("ZoneId")

{tencentcloud-sdk-python-3.0.1316 → tencentcloud-sdk-python-3.0.1318}/tencentcloud/ess/v20201111/errorcodes.py

@@ -23,6 +23,9 @@ FAILEDOPERATION = 'FailedOperation'
 # 年龄限制无法使用电子签服务，请联系客服咨询处理。
 FAILEDOPERATION_AGENOTACHIEVENORMALLEGAL = 'FailedOperation.AgeNotAchieveNormalLegal'
 
+# 套餐余额不足。
+FAILEDOPERATION_BALANCENOTENOUGH = 'FailedOperation.BalanceNotEnough'
+
 # 签署流程已有关联文档，请检查参数修改后重试。
 FAILEDOPERATION_FLOWHASDOCUMENT = 'FailedOperation.FlowHasDocument'
 

{tencentcloud-sdk-python-3.0.1316 → tencentcloud-sdk-python-3.0.1318}/tencentcloud/ess/v20201111/ess_client.py

@@ -600,6 +600,31 @@ class EssClient(AbstractClient):
                 raise TencentCloudSDKException(type(e).__name__, str(e))
 
 
+    def CreateFileCounterSign(self, request):
+        """此接口用于发起数字文件CA加签操作。可以使用同步或者异步模式进行。
+
+        **注意： 1. 文件类型暂时仅支持PDF类型文件。2. 此接口为『数字文件CA加签服务』白名单功能，使用前请联系对接的客户经理沟通。**
+
+        :param request: Request instance for CreateFileCounterSign.
+        :type request: :class:`tencentcloud.ess.v20201111.models.CreateFileCounterSignRequest`
+        :rtype: :class:`tencentcloud.ess.v20201111.models.CreateFileCounterSignResponse`
+
+        """
+        try:
+            params = request._serialize()
+            headers = request.headers
+            body = self.call("CreateFileCounterSign", params, headers=headers)
+            response = json.loads(body)
+            model = models.CreateFileCounterSignResponse()
+            model._deserialize(response["Response"])
+            return model
+        except Exception as e:
+            if isinstance(e, TencentCloudSDKException):
+                raise
+            else:
+                raise TencentCloudSDKException(type(e).__name__, str(e))
+
+
     def CreateFlow(self, request):
         """通过模板创建签署流程<br/>
         适用场景：在标准制式的合同场景中，可通过提前预制好模板文件，每次调用模板文件的id，补充合同内容信息及签署信息生成电子合同。
@@ -2210,6 +2235,31 @@ class EssClient(AbstractClient):
                 raise TencentCloudSDKException(type(e).__name__, str(e))
 
 
+    def DescribeFileCounterSignResult(self, request):
+        """文件CA加签任务结果查询接口，用于查询 CreateFileCounterSign接口 发起的异步加签任务。
+
+        注意：`此接口为『数字文件CA加签服务』白名单功能，使用前请联系对接的客户经理沟通。`
+
+        :param request: Request instance for DescribeFileCounterSignResult.
+        :type request: :class:`tencentcloud.ess.v20201111.models.DescribeFileCounterSignResultRequest`
+        :rtype: :class:`tencentcloud.ess.v20201111.models.DescribeFileCounterSignResultResponse`
+
+        """
+        try:
+            params = request._serialize()
+            headers = request.headers
+            body = self.call("DescribeFileCounterSignResult", params, headers=headers)
+            response = json.loads(body)
+            model = models.DescribeFileCounterSignResultResponse()
+            model._deserialize(response["Response"])
+            return model
+        except Exception as e:
+            if isinstance(e, TencentCloudSDKException):
+                raise
+            else:
+                raise TencentCloudSDKException(type(e).__name__, str(e))
+
+
     def DescribeFileUrls(self, request):
         """本接口（DescribeFileUrls）用于查询文件的下载URL。
         适用场景：通过传参合同流程编号，下载对应的合同PDF文件流到本地。
@@ -3102,6 +3152,29 @@ class EssClient(AbstractClient):
                 raise TencentCloudSDKException(type(e).__name__, str(e))
 
 
+    def VerifyDigitFile(self, request):
+        """对加签后的文件进行数字签名验证，判断数字签名是否有效。
+
+        :param request: Request instance for VerifyDigitFile.
+        :type request: :class:`tencentcloud.ess.v20201111.models.VerifyDigitFileRequest`
+        :rtype: :class:`tencentcloud.ess.v20201111.models.VerifyDigitFileResponse`
+
+        """
+        try:
+            params = request._serialize()
+            headers = request.headers
+            body = self.call("VerifyDigitFile", params, headers=headers)
+            response = json.loads(body)
+            model = models.VerifyDigitFileResponse()
+            model._deserialize(response["Response"])
+            return model
+        except Exception as e:
+            if isinstance(e, TencentCloudSDKException):
+                raise
+            else:
+                raise TencentCloudSDKException(type(e).__name__, str(e))
+
+
     def VerifyPdf(self, request):
         """对合同流程文件进行数字签名验证，判断数字签名是否有效，合同文件内容是否被篡改。