Merge branch 'feat_optimize_request' into 'master'

Feat optimize request

See merge request server/openapi/openapi-python-sdk!206

Author: tigersk

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 3.1.4 (2024-01-19)
+### Modify
+- 优化http请求，复用连接
+- 优化rsa签名
+
 # 3.1.3 (2024-01-04)
 ### Modify
 - `QuoteClient.get_symbol_names` 支持 OTC

requirements.txt

@@ -11,4 +11,5 @@ cryptography
 backoff
 jproperties
 protobuf
-google-cloud
+google-cloud
+urllib3

tigeropen/__init__.py

@@ -4,4 +4,4 @@
 
 @author: gaoan
 """
-__VERSION__ = '3.1.3'
+__VERSION__ = '3.1.4'

tigeropen/common/util/signature_utils.py

@@ -6,12 +6,13 @@
 """
 
 import base64
-import binascii
 import json
-import logging
-import sys
+from functools import lru_cache
 
-import rsa
+from cryptography.hazmat.backends import default_backend
+from cryptography.hazmat.primitives import hashes
+from cryptography.hazmat.primitives import serialization
+from cryptography.hazmat.primitives.asymmetric import padding
 
 from tigeropen.common.util.string_utils import add_start_end
 
@@ -56,21 +57,42 @@ def fill_public_key_marker(public_key):
     return add_start_end(public_key, "-----BEGIN PUBLIC KEY-----\n", "\n-----END PUBLIC KEY-----")
 
 
-def sign_with_rsa(private_key, sign_content, charset):
+@lru_cache(maxsize=10)
+def load_private_key(private_key):
+    return serialization.load_pem_private_key(
+        fill_private_key_marker(private_key).encode(),
+        password=None,
+        backend=default_backend()
+    )
+
+
+@lru_cache(maxsize=10)
+def load_public_key(public_key):
+    return serialization.load_pem_public_key(
+        fill_public_key_marker(public_key).encode(),
+        backend=default_backend()
+    )
+
+
+def sign_with_rsa(private_key_str, sign_content, charset):
     sign_content = sign_content.encode(charset)
-    try:
-        private_key = rsa.PrivateKey.load_pkcs1(fill_private_key_marker(private_key), format='PEM')
-    except binascii.Error:
-        logging.error("私钥格式错误, 请参考文档进行修改. https://quant.itiger.com/openapi/py-docs/zh-cn/docs/intro/quickstart.html ")
-        sys.exit(1)
+    private_key = load_private_key(private_key_str)
 
-    signature = rsa.sign(sign_content, private_key, 'SHA-1')
+    algorithm = hashes.SHA1()
+    padding_data = padding.PKCS1v15()
 
+    signature = private_key.sign(sign_content, padding_data, algorithm)
     sign = str(base64.b64encode(signature), encoding=charset)
     return sign
 
 
 def verify_with_rsa(public_key, message, sign):
-    public_key = fill_public_key_marker(public_key)
+    public_key = load_public_key(public_key)
     sign = base64.b64decode(sign)
-    return rsa.verify(message, sign, rsa.PublicKey.load_pkcs1_openssl_pem(public_key))
+    padding_data = padding.PKCS1v15()
+    algorithm = hashes.SHA1()
+    try:
+        public_key.verify(sign, message, padding=padding_data, algorithm=algorithm)
+    except Exception as e:
+        raise e
+    return True

tigeropen/common/util/web_utils.py

@@ -8,48 +8,9 @@
 
 from tigeropen.common.consts import THREAD_LOCAL
 from tigeropen.common.exceptions import RequestException, ResponseException
+from urllib3 import PoolManager
 
-try:
-    import httplib
-except ImportError:
-    import http.client as httplib
-try:
-    import urlparse
-except ImportError:
-    import urllib.parse as urlparse
-try:
-    from urllib.parse import quote_plus
-except ImportError:
-    from urllib import quote_plus
-
-
-def url_encode(params, charset):
-    query_string = ""
-    for (k, v) in params.items():
-        value = v
-        if not isinstance(value, str):
-            value = json.dumps(value, ensure_ascii=False)
-        value = quote_plus(value, encoding=charset)
-        query_string += ("&" + k + "=" + value)
-    query_string = query_string[1:]
-    return query_string
-
-
-def get_http_connection(url, query_string, timeout):
-    url_parse_result = urlparse.urlparse(url)
-    host = url_parse_result.hostname
-    port = 80
-    connection = httplib.HTTPConnection(host=host, port=port, timeout=timeout)
-    if url.find("https") == 0:
-        port = 443
-        connection = httplib.HTTPSConnection(host=host, port=port, timeout=timeout)
-    url = url_parse_result.scheme + "://" + url_parse_result.hostname
-    if url_parse_result.port:
-        url += url_parse_result.port
-    url += url_parse_result.path
-    if query_string:
-        url += ('?' + query_string)
-    return url, connection
+http_pool = PoolManager()
 
 
 def do_post(url, query_string=None, headers=None, params=None, timeout=15, charset=None):
@@ -63,36 +24,16 @@ def do_get(url, query_string=None, headers=None, params=None, timeout=15, charse
 
 
 def do_request(method, url, query_string=None, headers=None, params=None, timeout=15, charset=None):
-    url, connection = get_http_connection(url, query_string, timeout)
-
-    try:
-        connection.connect()
-    except Exception as e:
-        raise RequestException('[' + THREAD_LOCAL.uuid + ']' + method + ' connect failed. url: ' + url
-                               + ' headers: ' + str(headers)
-                               + ' params: ' + str(params) + ' detail: ' + str(e))
     try:
-        connection.request(method, url, body=json.dumps(params), headers=headers)
+        response = http_pool.request(method, url=url, fields=query_string, body=json.dumps(params), headers=headers,
+                                     timeout=timeout,
+                                     )
     except Exception as e:
         raise RequestException('[' + THREAD_LOCAL.uuid + ']' + method + ' request failed. url: ' + url
                                + ' headers: ' + str(headers)
                                + ' params: ' + str(params) + ' detail: ' + str(e))
-    try:
-        response = connection.getresponse()
-        result = response.read()
-    except Exception as e:
-        raise ResponseException('[' + THREAD_LOCAL.uuid + '] read response error ' +
-                                ' headers: ' + str(headers) +
-                                ' params: ' + str(params))
     if response.status != 200:
-        if charset:
-            result = result.decode(charset)
         raise ResponseException('[' + THREAD_LOCAL.uuid + ']invalid http status ' + str(response.status) +
                                 ' headers: ' + str(headers) +
-                                ' detail body:' + result + ' params: ' + str(params))
-    try:
-        response.close()
-        connection.close()
-    except Exception as e:
-        pass
-    return result
+                                ' detail body:' + str(response.data) + ' params: ' + str(params))
+    return response.data

tigeropen/tiger_open_config.py

@@ -395,7 +395,7 @@ def query_domains(self):
         }
         """
         try:
-            result = json.loads(do_get(DOMAIN_GARDEN_ADDRESS, headers=dict(), params=dict(), timeout=1).decode()) \
+            result = json.loads(do_get(DOMAIN_GARDEN_ADDRESS, headers=dict(), params=dict(), timeout=1)) \
                 .get('items')
             if result:
                 for item in result: