Merge branch 'develop' into 'master'

新增模型许可证运行模式（用于第三方本地使用 SDK 启动测试服务器运行模型）

See merge request bge/bge-python-sdk!9

Author: zhanglei3

bgesdk/client.py

@@ -924,7 +924,7 @@ def get_data_items(self, namespace, biosample_id,
             '/data_item/batch_retrieve', params=params, timeout=timeout)
         return models.Model(result)
 
-    def invoke_model(self, model_id, **kwargs):
+    def invoke_model(self, model_id, headers=None, **kwargs):
         """模型调用
 
         Args:
@@ -943,10 +943,15 @@ def invoke_model(self, model_id, **kwargs):
             self.endpoint, max_retries=max_retries, verbose=verbose)
         request.set_authorization(self.token_type, self.access_token)
         model_url = '/model/{}'.format(model_id)
-        result = request.get(model_url, params=params, timeout=timeout)
+        result = request.get(
+            model_url,
+            params=params,
+            headers=headers,
+            timeout=timeout
+        )
         return models.Model(result)
 
-    def invoke_draft_model(self, model_id, **kwargs):
+    def invoke_draft_model(self, model_id, headers=None, **kwargs):
         """调用灰度部署版本模型
 
         Args:
@@ -965,7 +970,12 @@ def invoke_draft_model(self, model_id, **kwargs):
             self.endpoint, max_retries=max_retries, verbose=verbose)
         request.set_authorization(self.token_type, self.access_token)
         model_url = '/model/{}/draft'.format(model_id)
-        result = request.get(model_url, params=params, timeout=timeout)
+        result = request.get(
+            model_url,
+            params=params,
+            headers=headers,
+            timeout=timeout
+        )
         return models.Model(result)
 
     def deploy_model(self, model_id, object_name=None, runtime=None,
@@ -1124,6 +1134,32 @@ def upload_callback(monitor):
         sys.stdout.write('')
         return models.Model(result)
 
+    def model_license(self, model_id, expires=60, params=None):
+        """模型运行许可
+
+        Args:
+            model_id (str): 模型编号。
+            **kwargs: 模型相关参数，由模型定义的参数决定；
+
+        Returns:
+            Model: 授权模型运行的对称加密相关参数；
+        """
+        data = {}
+        data['model_id'] = model_id
+        data['expires'] = expires
+        if params:
+            params = json.dumps(params)
+        data['params'] = params
+        timeout = self.timeout
+        verbose = self.verbose
+        max_retries = self.max_retries
+        request = HTTPRequest(
+            self.endpoint, max_retries=max_retries, verbose=verbose)
+        request.set_authorization(self.token_type, self.access_token)
+        model_url = '/model/license'
+        result = request.post(model_url, data=data, timeout=timeout)
+        return models.Model(result)
+
     def task(self, task_id):
         """获取任务结果
 

bgesdk/http.py

@@ -27,9 +27,13 @@ def __init__(self, endpoint, max_retries=None, verbose=False):
         self.session = requests.Session()
         if max_retries is not None:
             self.session.mount(
-                'http://', HTTPAdapter(max_retries=max_retries))
+                'http://',
+                HTTPAdapter(max_retries=max_retries)
+            )
             self.session.mount(
-                'https://', HTTPAdapter(max_retries=max_retries))
+                'https://',
+                HTTPAdapter(max_retries=max_retries)
+            )
 
     def set_authorization(self, token_type, access_token):
         """设置 Authorization 头部
@@ -38,7 +42,9 @@ def set_authorization(self, token_type, access_token):
             access_token (str): 访问令牌
         """
         self.headers['Authorization'] = '{} {}'.format(
-            token_type, access_token)
+            token_type,
+            access_token
+        )
 
     def get(self, path, params=None, headers=None, timeout=None):
         """GET 接口请求
@@ -53,7 +59,12 @@ def get(self, path, params=None, headers=None, timeout=None):
             object: 请求返回值
         """
         return self._request(
-            'GET', path, params=params, headers=headers, timeout=timeout)
+            'GET',
+            path,
+            params=params,
+            headers=headers,
+            timeout=timeout
+        )
 
     def post(self, path, params=None, data=None, files=None, headers=None,
              timeout=None):
@@ -71,8 +82,14 @@ def post(self, path, params=None, data=None, files=None, headers=None,
             object: 请求返回值
         """
         return self._request(
-            'POST', path, params=params, data=data, files=files,
-            headers=headers, timeout=timeout)
+            'POST',
+            path,
+            params=params,
+            data=data,
+            files=files,
+            headers=headers,
+            timeout=timeout
+        )
 
     def _request(self, method, path, timeout=None, headers=None, **kwargs):
         """发送 HTTP 请求
@@ -98,8 +115,12 @@ def _request(self, method, path, timeout=None, headers=None, **kwargs):
              ': %s\n\t**kwargs=%s'), method, url, headers, timeout, kwargs)
         try:
             resp = self.session.request(
-                method=method, url=url, headers=headers, timeout=timeout,
-                **kwargs)
+                method=method,
+                url=url,
+                headers=headers,
+                timeout=timeout,
+                **kwargs
+            )
             resp.raise_for_status()
         except requests.exceptions.HTTPError as e:
             raise BGEError('API request error: %s' % e)