dagster-dingtalk 0.1.5__tar.gz → 0.1.5b2__tar.gz

{dagster_dingtalk-0.1.5 → dagster_dingtalk-0.1.5b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dagster-dingtalk
-Version: 0.1.5
+Version: 0.1.5b2
 Summary: A dagster plugin for the DingTalk
 Author: YiZixuan
 Author-email: sqkkyzx@qq.com

{dagster_dingtalk-0.1.5 → dagster_dingtalk-0.1.5b2}/dagster_dingtalk/resources.py

@@ -141,7 +141,7 @@ class MultiDingTalkWebhookResource(ConfigurableResource):
             raise f"该 AccessToken 或 别名 <{key}> 不存在于提供的 Webhooks 中。请使用 DingTalkWebhookResource 定义单个 Webhook 后，将其加入 Webhooks 。"
 
 
-class DingTalkMultiClient:
+class DingTalkClient:
     def __init__(self, access_token: str, app_id: str, agent_id: int, robot_code: str) -> None:
         self.access_token: str = access_token
         self.app_id: str = app_id
@@ -165,16 +165,16 @@ class DingTalkResource(ConfigurableResource):
     AppName: Optional[str] = Field(default=None, description="应用名。")
     ClientId: str = Field(description="应用的 Client ID (原 AppKey 和 SuiteKey)")
     ClientSecret: str = Field(description="应用的 Client Secret (原 AppSecret 和 SuiteSecret)")
-    RobotCode: Optional[str] = Field(default=None, description="应用的机器人 RobotCode")
+    RobotCode: Optional[str] = Field(default=None, description="应用的机器人 RobotCode，不传时使用 self.ClientId ")
 
-    _client: DingTalkMultiClient = PrivateAttr()
+    _client: DingTalkClient = PrivateAttr()
 
     @classmethod
     def _is_dagster_maintained(cls) -> bool:
         return False
 
-    def _get_access_token(self, context) -> str:
-        access_token_cache = Path("~/.dingtalk_cache")
+    def _get_access_token(self) -> str:
+        access_token_cache = Path("/tmp/.dingtalk_cache")
 
         if access_token_cache.exists():
             with open(access_token_cache, 'rb') as f:
@@ -187,7 +187,7 @@ class DingTalkResource(ConfigurableResource):
         if access_token and expire_in < int(time.time()):
             return access_token
         else:
-            context.log.info(f"应用{self.AppName}<{self.AppID}> 鉴权缓存过期或不存在，正在重新获取...")
+            print(f"应用{self.AppName}<{self.AppID}> 鉴权缓存过期或不存在，正在重新获取...")
             response = httpx.post(
                 url="https://api.dingtalk.com/v1.0/oauth2/accessToken",
                 json={"appKey": self.ClientId, "appSecret": self.ClientSecret},
@@ -200,24 +200,25 @@ class DingTalkResource(ConfigurableResource):
             return access_token
 
     def setup_for_execution(self, context: InitResourceContext) -> None:
-        self._client = DingTalkMultiClient(
-            self._get_access_token(context),
-            self.AppID,
-            self.AgentID,
-            self.RobotCode,
-        )
+        self._client = DingTalkClient(self._get_access_token(), self.AppID, self.AgentID, self.RobotCode or self.ClientId)
 
     def teardown_after_execution(self, context: InitResourceContext) -> None:
         self._client.api.close()
         self._client.oapi.close()
 
     def 智能人事(self):
+        if not hasattr(self, '_client'):
+            self._client = DingTalkClient(self._get_access_token(), self.AppID, self.AgentID, self.RobotCode or self.ClientId)
         return API_智能人事(self._client)
 
     def 通讯录管理(self):
+        if not hasattr(self, '_client'):
+            self._client = DingTalkClient(self._get_access_token(), self.AppID, self.AgentID, self.RobotCode or self.ClientId)
         return API_通讯录管理(self._client)
 
     def 文档文件(self):
+        if not hasattr(self, '_client'):
+            self._client = DingTalkClient(self._get_access_token(), self.AppID, self.AgentID, self.RobotCode or self.ClientId)
         return API_文档文件(self._client)
 
 
@@ -274,7 +275,7 @@ class MultiDingTalkResource(ConfigurableResource):
 
 # noinspection NonAsciiCharacters
 class API_智能人事:
-    def __init__(self, _client:DingTalkMultiClient):
+    def __init__(self, _client:DingTalkClient):
         self._client = _client
 
     def 花名册_获取花名册元数据(self):
@@ -332,7 +333,7 @@ class API_智能人事:
 
 # noinspection NonAsciiCharacters
 class API_通讯录管理:
-    def __init__(self, _client:DingTalkMultiClient):
+    def __init__(self, _client:DingTalkClient):
         self._client = _client
 
     def 查询用户详情(self, user_id:str, language:str = "zh_CN"):
@@ -349,7 +350,7 @@ class API_通讯录管理:
 
 # noinspection NonAsciiCharacters
 class API_文档文件:
-    def __init__(self, _client:DingTalkMultiClient):
+    def __init__(self, _client:DingTalkClient):
         self._client = _client
 
     def 媒体文件_上传媒体文件(self, file_path:Path|str, media_type:Literal['image', 'voice', 'video', 'file']):

{dagster_dingtalk-0.1.5 → dagster_dingtalk-0.1.5b2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dagster-dingtalk"
-version = "0.1.5"
+version = "0.1.5.b2"
 description = "A dagster plugin for the DingTalk"
 authors = ["YiZixuan <sqkkyzx@qq.com>"]
 readme = "README.md"