tencentcloud-sdk-python-common 3.0.1111__tar.gz → 3.0.1125__tar.gz

{tencentcloud-sdk-python-common-3.0.1111 → tencentcloud-sdk-python-common-3.0.1125}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tencentcloud-sdk-python-common
-Version: 3.0.1111
+Version: 3.0.1125
 Summary: Tencent Cloud Common SDK for Python
 Home-page: https://github.com/TencentCloud/tencentcloud-sdk-python
 Author: Tencent Cloud

{tencentcloud-sdk-python-common-3.0.1111 → tencentcloud-sdk-python-common-3.0.1125}/tencentcloud/__init__.py

@@ -14,4 +14,4 @@
 # limitations under the License.
 
 
-__version__ = '3.0.1111'
+__version__ = '3.0.1125'

{tencentcloud-sdk-python-common-3.0.1111 → tencentcloud-sdk-python-common-3.0.1125}/tencentcloud/common/abstract_client.py

@@ -86,6 +86,10 @@ class AbstractClient(object):
             if self.profile.region_breaker_profile is None:
                 self.profile.region_breaker_profile = RegionBreakerProfile()
             self.circuit_breaker = CircuitBreaker(self.profile.region_breaker_profile)
+        if self.profile.request_client:
+            self.request_client = self._sdkVersion + "; " + self.profile.request_client
+        else:
+            self.request_client = self._sdkVersion
 
     def _fix_params(self, params):
         if not isinstance(params, (dict,)):
@@ -135,7 +139,7 @@ class AbstractClient(object):
     def _build_req_with_old_signature(self, action, params, req):
         params = copy.deepcopy(self._fix_params(params))
         params['Action'] = action[0].upper() + action[1:]
-        params['RequestClient'] = self._sdkVersion
+        params['RequestClient'] = self.request_client
         params['Nonce'] = random.randint(1, sys.maxsize)
         params['Timestamp'] = int(time.time())
         params['Version'] = self._apiVersion
@@ -184,7 +188,7 @@ class AbstractClient(object):
         timestamp = int(time.time())
         req.header["Host"] = endpoint
         req.header["X-TC-Action"] = action[0].upper() + action[1:]
-        req.header["X-TC-RequestClient"] = self._sdkVersion
+        req.header["X-TC-RequestClient"] = self.request_client
         req.header["X-TC-Timestamp"] = str(timestamp)
         req.header["X-TC-Version"] = self._apiVersion
         if self.profile.unsignedPayload is True:
@@ -275,7 +279,7 @@ class AbstractClient(object):
         timestamp = int(time.time())
         req.header["Host"] = endpoint
         req.header["X-TC-Action"] = action[0].upper() + action[1:]
-        req.header["X-TC-RequestClient"] = self._sdkVersion
+        req.header["X-TC-RequestClient"] = self.request_client
         req.header["X-TC-Timestamp"] = str(timestamp)
         req.header["X-TC-Version"] = self._apiVersion
         if self.profile.unsignedPayload is True:
@@ -397,6 +401,12 @@ class AbstractClient(object):
                 e[key] = int(val)
 
     def _call(self, action, params, options=None, headers=None):
+        if headers is None:
+            headers = {}
+        if not isinstance(headers, dict):
+            raise TencentCloudSDKException("ClientError", "headers must be a dict.")
+        if "x-tc-traceid" not in {k.lower() for k in headers.keys()}:
+            headers["X-TC-TraceId"] = str(uuid.uuid4())
         if not self.profile.disable_region_breaker:
             return self._call_with_region_breaker(action, params, options, headers)
         req = RequestInternal(self._get_endpoint(),

{tencentcloud-sdk-python-common-3.0.1111 → tencentcloud-sdk-python-common-3.0.1125}/tencentcloud/common/profile/client_profile.py

@@ -11,6 +11,8 @@
 # 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.
+import re
+import warnings
 from tencentcloud.common.exception.tencent_cloud_sdk_exception import TencentCloudSDKException
 from tencentcloud.common.profile.http_profile import HttpProfile
 
@@ -19,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):
+                 disable_region_breaker=True, region_breaker_profile=None, request_client=None):
         """SDK profile.
 
         :param signMethod: The signature method, valid choice: HmacSHA1, HmacSHA256, TC3-HMAC-SHA256
@@ -32,6 +34,8 @@ class ClientProfile(object):
         :type disable_region_breaker: bool
         :param region_breaker_profile: The region breaker profile.
         :type region_breaker_profile: :class:`RegionBreakerProfile`
+        :param request_client: Custom request client.
+        :type request_client: str
         """
         self.httpProfile = HttpProfile() if httpProfile is None else httpProfile
         self.signMethod = "TC3-HMAC-SHA256" if signMethod is None else signMethod
@@ -43,6 +47,13 @@ class ClientProfile(object):
         self.region_breaker_profile = region_breaker_profile
         if not self.disable_region_breaker and self.region_breaker_profile is None:
             self.region_breaker_profile = RegionBreakerProfile()
+        self.request_client = None
+        if isinstance(request_client, str) and re.match("^[0-9a-zA-Z-_,;.]+$", request_client):
+            if len(request_client) > 128:
+                warnings.warn("the length of RequestClient should be with in 128 characters, it will be truncated")
+            self.request_client = request_client[:128]
+        elif request_client is not None:
+            warnings.warn("RequestClient not match the regexp: ^[0-9a-zA-Z-_,;.]+$, ignored")
 
 
 class RegionBreakerProfile(object):

{tencentcloud-sdk-python-common-3.0.1111 → tencentcloud-sdk-python-common-3.0.1125}/tencentcloud_sdk_python_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tencentcloud-sdk-python-common
-Version: 3.0.1111
+Version: 3.0.1125
 Summary: Tencent Cloud Common SDK for Python
 Home-page: https://github.com/TencentCloud/tencentcloud-sdk-python
 Author: Tencent Cloud