dagster-dingtalk 0.1.29a1__tar.gz → 0.1.30__tar.gz

{dagster_dingtalk-0.1.29a1 → dagster_dingtalk-0.1.30}/.idea/workspace.xml

@@ -4,7 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d56e898e-6e80-4770-9a14-5869f3cdca54" name="更改" comment="新增[待办任务]API" />
+    <list default="true" id="d56e898e-6e80-4770-9a14-5869f3cdca54" name="更改" comment="修复：线程锁死锁问题">
+      <change beforePath="$PROJECT_DIR$/pyproject.toml" beforeDir="false" afterPath="$PROJECT_DIR$/pyproject.toml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/dagster_dingtalk/app_client.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/dagster_dingtalk/app_client.py" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -14,6 +17,7 @@
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="Python Script" />
+        <option value="Python Unit Test" />
       </list>
     </option>
   </component>
@@ -43,22 +47,23 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
-    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;M:/dagster&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "Python.test.executor": "Run",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "git-widget-placeholder": "master",
+    "ignore.virus.scanning.warn.message": "true",
+    "last_opened_file_path": "M:/dagster",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "settings.editor.selected.configurable": "com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="C:\Users\admin\PycharmProjects\dagster-dingtalk\dagster-dingtalk\src\dagster_dingtalk" />
@@ -70,6 +75,36 @@
       <recent name="C:\Users\admin\PycharmProjects\dagster-dingtalk\dagster-dingtalk\src\dagster_dingtalk" />
     </key>
   </component>
+  <component name="RunManager">
+    <configuration name="test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+      <module name="dagster-dingtalk" />
+      <option name="ENV_FILES" value="" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Python.test" />
+      </list>
+    </recent_temporary>
+  </component>
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
@@ -92,6 +127,7 @@
       <workItem from="1739478013799" duration="20000" />
       <workItem from="1739478384641" duration="3306000" />
       <workItem from="1739521248423" duration="1733000" />
+      <workItem from="1739562869457" duration="2403000" />
     </task>
     <task id="LOCAL-00001" summary="更改目录结构以便于使用 uv 构建和发布包">
       <option name="closed" value="true" />
@@ -117,7 +153,15 @@
       <option name="project" value="LOCAL" />
       <updated>1739480448632</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="修复：线程锁死锁问题">
+      <option name="closed" value="true" />
+      <created>1739564430669</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1739564430669</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -127,6 +171,10 @@
     <MESSAGE value="更改目录结构以便于使用 uv 构建和发布包" />
     <MESSAGE value="修复相对路径引用问题" />
     <MESSAGE value="新增[待办任务]API" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增[待办任务]API" />
+    <MESSAGE value="修复：线程锁死锁问题" />
+    <option name="LAST_COMMIT_MESSAGE" value="修复：线程锁死锁问题" />
+  </component>
+  <component name="com.intellij.coverage.CoverageDataManagerImpl">
+    <SUITE FILE_PATH="coverage/dagster_dingtalk$test.coverage" NAME="test 覆盖结果" MODIFIED="1739565257857" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
   </component>
 </project>

{dagster_dingtalk-0.1.29a1 → dagster_dingtalk-0.1.30}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: dagster-dingtalk
-Version: 0.1.29a1
+Version: 0.1.30
 Summary: A dagster plugin for the DingTalk
 Author-email: YiZixuan <sqkkyzx@qq.com>
 Requires-Python: >=3.11
-Requires-Dist: dagster
+Requires-Dist: dagster==1.10.0
 Requires-Dist: httpx
 Requires-Dist: pydantic
 Description-Content-Type: text/markdown

{dagster_dingtalk-0.1.29a1 → dagster_dingtalk-0.1.30}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dagster-dingtalk"
-version = "0.1.29a1"
+version = "0.1.30"
 description = "A dagster plugin for the DingTalk"
 readme = "README.md"
 authors = [
@@ -10,7 +10,7 @@ requires-python = ">=3.11"
 dependencies = [
     "httpx",
     "pydantic",
-    "dagster"
+    "dagster==1.10.0"
 ]
 
 [build-system]

{dagster_dingtalk-0.1.29a1 → dagster_dingtalk-0.1.30}/src/dagster_dingtalk/app_client.py

@@ -48,10 +48,17 @@ class DingTalkClient:
 
 
     def __init_clients(self):
-        self.__oapi_client = httpx.Client(base_url="https://oapi.dingtalk.com/")
-
-        self.__api_client = httpx.Client(base_url="https://api.dingtalk.com/")
+        self.__oapi_client = httpx.Client(
+            base_url="https://oapi.dingtalk.com/",
+            timeout=httpx.Timeout(60.0),
+            limits=httpx.Limits(max_connections=100),
+        )
 
+        self.__api_client = httpx.Client(
+            base_url="https://api.dingtalk.com/",
+            timeout=httpx.Timeout(10.0),
+            limits=httpx.Limits(max_connections=100),
+        )
 
     def __file_cache_read(self) -> dict:
         if self.__access_token_file_cache.exists():
@@ -64,13 +71,12 @@ class DingTalkClient:
         else:
             return {}
 
-    def __file_cache_write(self):
-        with self.__token_lock:
-            try:
-                with open(self.__access_token_file_cache, 'wb') as f:
-                    f.write(pickle.dumps(self.__access_token_cache))
-            except Exception as e:
-                logging.error(f"AccessToken 缓存写入失败: {e}")
+    def __file_cache_write(self, access_token_cache: dict):
+        try:
+            with open(self.__access_token_file_cache, 'wb') as f:
+                f.write(pickle.dumps(access_token_cache))
+        except Exception as e:
+            logging.error(f"AccessToken 缓存写入失败: {e}")
 
     def __get_access_token(self) -> str:
         with self.__token_lock:
@@ -87,16 +93,17 @@ class DingTalkClient:
                         json={"appKey": self.__client_id, "appSecret": self.__client_secret},
                     ).json()
                     # 提前 1 分钟进行续期
-                    self.__access_token_cache = {
+                    access_token_cache = {
                         "access_token": response.get("accessToken"),
                         "expire_in": response.get("expireIn") + int(time.time()) - 60
                     }
-                    self.__file_cache_write()
+                    self.__access_token_cache = access_token_cache
+                    self.__file_cache_write(self.__access_token_cache)
                 except Exception as e:
                     logging.error(f"AccessToken 获取失败: {e}")
                     raise
 
-        return self.__access_token_cache["access_token"]
+        return access_token_cache["access_token"]
 
     def oapi(self, method: str, path: str, **kwargs) -> httpx.Response:
         params = kwargs.get("params", {})