From f0c7bfc9e525a8429af5d22b6368379c2a27dbc5 Mon Sep 17 00:00:00 2001 From: JUN SUN <38548315+PatrickStar-SJ@users.noreply.github.com> Date: Mon, 29 Jan 2024 19:47:22 +0800 Subject: [PATCH 1/2] Update sensetime.py --- .../bisheng_langchain/chat_models/sensetime.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/bisheng-langchain/bisheng_langchain/chat_models/sensetime.py b/src/bisheng-langchain/bisheng_langchain/chat_models/sensetime.py index 7929a9f17..875c89dc7 100644 --- a/src/bisheng-langchain/bisheng_langchain/chat_models/sensetime.py +++ b/src/bisheng-langchain/bisheng_langchain/chat_models/sensetime.py @@ -41,7 +41,7 @@ def encode_jwt_token(ak, sk): } payload = { "iss": ak, - "exp": int(time.time()) + 1800, # 填写您期望的有效时间,此处示例代表当前时间+30分钟 + "exp": int(time.time()) + 1800, # 填写您期望的有效时间,此处示例代表当前时间+300分钟 "nbf": int(time.time()) - 5 # 填写您期望的生效时间,此处示例代表当前时间-5秒 } token = jwt.encode(payload, sk, headers=headers) @@ -215,7 +215,12 @@ def _completion_with_retry(**kwargs: Any) -> Any: "max_new_tokens": self.max_tokens, 'stream': False#self.streaming } - + + token = encode_jwt_token(self.access_key_id, self.secret_access_key) + if isinstance(token, bytes): + token = token.decode('utf-8') + self.client.headers.update({'Authorization': 'Bearer {}'.format(token)}) + response = self.client.post(url=url, json=params).json() return response rsp_dict = _completion_with_retry(**kwargs) @@ -231,6 +236,12 @@ def _completion_with_retry(**kwargs: Any) -> Any: async def acompletion_with_retry(self, **kwargs: Any) -> Any: """Use tenacity to retry the async completion call.""" retry_decorator = _create_retry_decorator(self) + + token = encode_jwt_token(self.access_key_id, self.secret_access_key) + if isinstance(token, bytes): + token = token.decode('utf-8') + self.client.headers.update({'Authorization': 'Bearer {}'.format(token)}) + if self.streaming: self.client.headers.update({'Accept': 'text/event-stream'}) else: @@ -411,4 +422,4 @@ def _get_invocation_params(self, @property def _llm_type(self) -> str: """Return type of chat model.""" - return 'sense-chat' \ No newline at end of file + return 'sense-chat' From 31825e7720e17af2772bf8c9f8d760b3786201de Mon Sep 17 00:00:00 2001 From: JUN SUN <38548315+PatrickStar-SJ@users.noreply.github.com> Date: Mon, 29 Jan 2024 19:49:25 +0800 Subject: [PATCH 2/2] Update sensetime.py --- .../bisheng_langchain/chat_models/sensetime.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bisheng-langchain/bisheng_langchain/chat_models/sensetime.py b/src/bisheng-langchain/bisheng_langchain/chat_models/sensetime.py index 875c89dc7..1761957ab 100644 --- a/src/bisheng-langchain/bisheng_langchain/chat_models/sensetime.py +++ b/src/bisheng-langchain/bisheng_langchain/chat_models/sensetime.py @@ -41,7 +41,7 @@ def encode_jwt_token(ak, sk): } payload = { "iss": ak, - "exp": int(time.time()) + 1800, # 填写您期望的有效时间,此处示例代表当前时间+300分钟 + "exp": int(time.time()) + 1800, # 填写您期望的有效时间,此处示例代表当前时间+30分钟 "nbf": int(time.time()) - 5 # 填写您期望的生效时间,此处示例代表当前时间-5秒 } token = jwt.encode(payload, sk, headers=headers)