Merge pull request #53 from ginping/opt/openapi_endpoint

🐛 fix: 优化 DINGTALK_OPENAPI_ENDPOINT 变量, 避免设置了 DINGTALK_OPENAPI_ENDPOI…
open-dingtalk · Dec 13, 2024 · 4c3f540 · 4c3f540
2 parents 262f2bf + 8a86cf1
commit 4c3f540
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/dingtalk_stream/card_replier.py b/dingtalk_stream/card_replier.py
@@ -686,7 +686,7 @@ def finish(self, card_instance_id: str, card_data: dict):
         card_data_with_status["flowStatus"] = AICardStatus.FINISHED
         self.put_card_data(card_instance_id, card_data_with_status)
 
-    async def finish(self, card_instance_id: str, card_data: dict):
+    async def async_finish(self, card_instance_id: str, card_data: dict):
         """
         AI卡片执行完成的接口，整体更新
         :param card_instance_id:

diff --git a/dingtalk_stream/stream.py b/dingtalk_stream/stream.py
@@ -22,12 +22,12 @@
 from .frames import EventMessage
 from .frames import CallbackMessage
 from .log import setup_default_logger
-from .utils import get_dingtalk_endpoint
+from .utils import DINGTALK_OPENAPI_ENDPOINT
 from .version import VERSION_STRING
 
 
 class DingTalkStreamClient(object):
-    OPEN_CONNECTION_API = get_dingtalk_endpoint() + '/v1.0/gateway/connections/open'
+    OPEN_CONNECTION_API = DINGTALK_OPENAPI_ENDPOINT + '/v1.0/gateway/connections/open'
     TAG_DISCONNECT = 'disconnect'
 
     def __init__(self, credential: Credential, logger: logging.Logger = None):
@@ -198,7 +198,7 @@ def get_access_token(self):
             'appSecret': self.credential.client_secret,
         }
         try:
-            url = get_dingtalk_endpoint() + '/v1.0/oauth2/accessToken'
+            url = DINGTALK_OPENAPI_ENDPOINT + '/v1.0/oauth2/accessToken'
             response_text = ''
             response = requests.post(url,
                                      headers=request_headers,

diff --git a/dingtalk_stream/utils.py b/dingtalk_stream/utils.py
@@ -2,10 +2,7 @@
 
 import os
 
-DINGTALK_OPENAPI_ENDPOINT = "https://api.dingtalk.com"
+DINGTALK_OPENAPI_ENDPOINT = os.getenv(
+    "DINGTALK_OPENAPI_ENDPOINT", "https://api.dingtalk.com"
+)
 
-def get_dingtalk_endpoint():
-    endpoint_env = os.getenv('DINGTALK_OPENAPI_ENDPOINT')
-    if endpoint_env:
-        return endpoint_env
-    return DINGTALK_OPENAPI_ENDPOINT
diff --git a/dingtalk_stream/version.py b/dingtalk_stream/version.py
@@ -1 +1 @@
-VERSION_STRING = '0.22.0'
+VERSION_STRING = '0.22.1'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		VERSION_STRING = '0.22.0'
		VERSION_STRING = '0.22.1'