celestialflow 3.0.7__tar.gz → 3.0.8__tar.gz

{celestialflow-3.0.7 → celestialflow-3.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: celestialflow
-Version: 3.0.7
+Version: 3.0.8
 Summary: A flexible GRAPH-based task orchestration framework.
 Author-email: Mr-xiaotian <mingxiaomingtian@gmail.com>
 License: MIT
@@ -173,7 +173,7 @@ if __name__ == "__main__":
     graph = TaskGraph([stage1])
 
     # 初始化任务并启动
-    graph.start_graph({stage1.get_stage_tag(): [(1, 2), (3, 4), (5, 6)]})
+    graph.start_graph({stage1.get_tag(): [(1, 2), (3, 4), (5, 6)]})
 ```
 
 注意不要在.ipynb中运行。
@@ -244,79 +244,105 @@ flowchart TD
 ## 文件结构（File Structure）
 
 ```
-📁 CelestialFlow	(205MB 169KB 76B)
-    📁 experiments  	(14KB 536B)
-        🐍 benchmark_datastructures.py	(5KB 796B)
+📁 CelestialFlow	(213MB 633KB 545B)
+    📁 docs         	(25KB 183B)
+        📁 reference	(20KB 175B)
+            📝 go_worker.md     	(6KB 378B)
+            📝 task_graph.md    	(4KB 989B)
+            📝 task_logging.md  	(0B)
+            📝 task_manage.md   	(7KB 7B)
+            📝 task_nodes.md    	(1KB 737B)
+            📝 task_progress.md 	(0B)
+            📝 task_queue.md    	(0B)
+            📝 task_report.md   	(0B)
+            📝 task_structure.md	(112B)
+            📝 task_tools.md    	(0B)
+            📝 task_types.md    	(0B)
+            📝 task_web.md      	(0B)
+        📝 quick_start.md	(5KB 8B)
+        📝 tutorial.md   	(0B)
+    📁 experiments  	(15KB 111B)
+        🐍 benchmark_datastructures.py	(6KB 52B)
         🐍 benchmark_hash.py          	(1KB 284B)
-        🐍 benchmark_queue.py         	(5KB 185B)
+        🐍 benchmark_queue.py         	(5KB 504B)
         🐍 benchmark_tqdm.py          	(1KB 160B)
         🐍 experiment_tqdm.py         	(1KB 135B)
-    📁 go_worker    	(6MB 967KB 64B)
-        📁 worker	(5KB 684B)
+    📁 go_worker    	(6MB 968KB 38B)
+        📁 worker	(5KB 746B)
             🌀 parser.go   	(394B)
             🌀 processor.go	(2KB 612B)
-            🌀 types.go    	(237B)
+            🌀 types.go    	(299B)
             🌀 worker.go   	(2KB 465B)
-        ❓ go.mod       	(258B)
-        ❓ go.sum       	(591B)
+        ❓ go.mod       	(292B)
+        ❓ go.sum       	(1KB 68B)
         ❓ go_worker.exe	(6MB 960KB)
-        🌀 main.go      	(579B)
-    📁 img          	(966KB 63B)
-        📷 logo.png       	(836KB 542B)
+        🌀 main.go      	(980B)
+    📁 img          	(4MB 700KB 695B)
+        📷 logo(old).png  	(836KB 542B)
+        📷 logo.png       	(122KB 747B)
         📷 web_display.png	(129KB 545B)
-    📁 src          	(1MB 884KB 224B)
-        📁 celestialflow         	(1MB 869KB 480B)
-            📁 static     	(1MB 419KB 510B)
-                📁 css	(32KB 568B)
+        🎞️ web_ui.gif     	(3MB 635KB 909B)
+    📁 src          	(1MB 920KB 171B)
+        📁 celestialflow         	(1MB 902KB 818B)
+            📁 adapters   	(13KB 837B)
+                📁 celestialtree	(13KB 681B)
+                    📁 [1项排除的目录]	(6KB 960B)
+                    🐍 client.py  	(5KB 486B)
+                    🐍 tools.py   	(1KB 182B)
+                    🐍 __init__.py	(77B)
+                📁 [1项排除的目录]	(156B)
+                🐍 __init__.py	(0B)
+            📁 static     	(1MB 417KB 101B)
+                📁 css	(31KB 410B)
                     🎨 base.css     	(6KB 155B)
-                    🎨 dashboard.css	(8KB 435B)
+                    🎨 dashboard.css	(7KB 277B)
                     🎨 errors.css   	(5KB 168B)
                     🎨 inject.css   	(12KB 834B)
-                📁 js 	(34KB 868B)
-                    📜 main.js          	(4KB 973B)
-                    📜 task_errors.js   	(4KB 544B)
+                📁 js 	(33KB 617B)
+                    📜 main.js          	(5KB 77B)
+                    📜 task_errors.js   	(4KB 550B)
                     📜 task_injection.js	(8KB 491B)
                     📜 task_statuses.js 	(8KB 63B)
-                    📜 task_structure.js	(7KB 143B)
-                    📜 task_topology.js 	(261B)
+                    📜 task_structure.js	(4KB 668B)
+                    📜 task_topology.js 	(1KB 375B)
                     📜 utils.js         	(1KB 441B)
                 ❓ favicon.ico	(1MB 352KB 98B)
-            📁 templates  	(12KB 973B)
-                🌐 index.html	(12KB 973B)
-            📁 [1项排除的目录]	(314KB 710B)
-            📝 README.md        	(13KB 131B)
-            🐍 task_graph.py    	(22KB 530B)
-            🐍 task_logging.py  	(6KB 291B)
-            🐍 task_manage.py   	(32KB 66B)
-            🐍 task_nodes.py    	(4KB 953B)
+            📁 templates  	(13KB 150B)
+                🌐 index.html	(13KB 150B)
+            📁 [1项排除的目录]	(331KB 149B)
+            🐍 task_graph.py    	(23KB 835B)
+            🐍 task_logging.py  	(8KB 903B)
+            🐍 task_manage.py   	(33KB 577B)
+            🐍 task_nodes.py    	(10KB 922B)
             🐍 task_progress.py 	(1KB 477B)
-            🐍 task_queue.py    	(7KB 896B)
-            🐍 task_report.py   	(5KB 511B)
-            🐍 task_structure.py	(6KB 93B)
-            🐍 task_tools.py    	(15KB 182B)
-            🐍 task_types.py    	(1KB 461B)
-            🐍 task_web.py      	(5KB 47B)
-            🐍 __init__.py      	(817B)
-        📁 celestialflow.egg-info	(14KB 768B)
-            ❓ PKG-INFO            	(13KB 363B)
-            📄 [5项排除的文件]	(1KB 405B)
-    📁 tests        	(113KB 510B)
-        📁 [1项排除的目录]	(81KB 604B)
-        📝 README.md        	(7KB 231B)
-        🐍 test_graph.py    	(5KB 83B)
-        🐍 test_manage.py   	(1KB 785B)
-        🐍 test_nodes.py    	(7KB 864B)
-        🐍 test_structure.py	(9KB 1015B)
-    📁 [6项排除的目录]	(195MB 276KB 932B)
-    ❓ .gitignore    	(264B)
+            🐍 task_queue.py    	(8KB 570B)
+            🐍 task_report.py   	(4KB 805B)
+            🐍 task_stage.py    	(5KB 511B)
+            🐍 task_structure.py	(5KB 996B)
+            🐍 task_tools.py    	(15KB 105B)
+            🐍 task_types.py    	(2KB 265B)
+            🐍 task_web.py      	(5KB 693B)
+            🐍 __init__.py      	(1KB 114B)
+        📁 [1项排除的目录]	(17KB 377B)
+    📁 tests        	(126KB 669B)
+        📁 [1项排除的目录]	(90KB 310B)
+        📝 README.md        	(6KB 324B)
+        🐍 test_graph.py    	(5KB 594B)
+        🐍 test_manage.py   	(3KB 90B)
+        🐍 test_nodes.py    	(11KB 272B)
+        🐍 test_structure.py	(10KB 103B)
+    📁 [6项排除的目录]	(199MB 931KB 238B)
+    ❓ .env          	(88B)
+    ❓ .gitignore    	(272B)
     ❓ LICENSE       	(1KB 65B)
     ❓ Makefile      	(501B)
     ❓ pyproject.toml	(1KB 223B)
     ⚙️ pytest.ini    	(254B)
-    📝 README.md     	(15KB 536B)
+    📝 README.md     	(15KB 109B)
+(celestial-flow 3.0.8)
 ```
 
-(该视图由我的另一个项目[CelestialVault](https://github.com/Mr-xiaotian/CelestialVault)中inst_file生成。)
+(该视图由我的另一个项目[CelestialVault](https://github.com/Mr-xiaotian/CelestialVault)中inst_file.FileTree.print_tree()生成。)
 
 ## 更新日志（Change Log）
 
@@ -336,6 +362,7 @@ flowchart TD
 - 3.0.5: 删除原有的TaskRedisTransfer节点, 并增添三种新的redis交互节点TaskRedisSink TaskRedisSource TaskRedisAck, 用于跨语言 跨进程 跨设备处理任务; 并在Web页面添加展示拓扑信息的卡片
 - 3.0.6: 添加对[CelestialTree](https://github.com/Mr-xiaotian/CelestialTree)系统的支持, 现在可以追踪单个任务的流向
 - 3.0.7: 将TaskStage从TaskManager中单独抽出来作为一个子类; 增加新节点TaskRouter, 可以将传入的任务选择的传给不同的下游节点, 而不是进行广播
+- 3.0.8: 在ctree关系上将"任务重试"后的"任务成功/失败/重试"视为因果关系, 而非之前的并行关系; 重构错误搜集部分逻辑; 修复大量3.0.6与3.07版本引入的bug; 优化部分log表现
 
 ## Star 历史趋势（Star History）
 

{celestialflow-3.0.7 → celestialflow-3.0.8}/README.md

@@ -148,7 +148,7 @@ if __name__ == "__main__":
     graph = TaskGraph([stage1])
 
     # 初始化任务并启动
-    graph.start_graph({stage1.get_stage_tag(): [(1, 2), (3, 4), (5, 6)]})
+    graph.start_graph({stage1.get_tag(): [(1, 2), (3, 4), (5, 6)]})
 ```
 
 注意不要在.ipynb中运行。
@@ -219,79 +219,105 @@ flowchart TD
 ## 文件结构（File Structure）
 
 ```
-📁 CelestialFlow	(205MB 169KB 76B)
-    📁 experiments  	(14KB 536B)
-        🐍 benchmark_datastructures.py	(5KB 796B)
+📁 CelestialFlow	(213MB 633KB 545B)
+    📁 docs         	(25KB 183B)
+        📁 reference	(20KB 175B)
+            📝 go_worker.md     	(6KB 378B)
+            📝 task_graph.md    	(4KB 989B)
+            📝 task_logging.md  	(0B)
+            📝 task_manage.md   	(7KB 7B)
+            📝 task_nodes.md    	(1KB 737B)
+            📝 task_progress.md 	(0B)
+            📝 task_queue.md    	(0B)
+            📝 task_report.md   	(0B)
+            📝 task_structure.md	(112B)
+            📝 task_tools.md    	(0B)
+            📝 task_types.md    	(0B)
+            📝 task_web.md      	(0B)
+        📝 quick_start.md	(5KB 8B)
+        📝 tutorial.md   	(0B)
+    📁 experiments  	(15KB 111B)
+        🐍 benchmark_datastructures.py	(6KB 52B)
         🐍 benchmark_hash.py          	(1KB 284B)
-        🐍 benchmark_queue.py         	(5KB 185B)
+        🐍 benchmark_queue.py         	(5KB 504B)
         🐍 benchmark_tqdm.py          	(1KB 160B)
         🐍 experiment_tqdm.py         	(1KB 135B)
-    📁 go_worker    	(6MB 967KB 64B)
-        📁 worker	(5KB 684B)
+    📁 go_worker    	(6MB 968KB 38B)
+        📁 worker	(5KB 746B)
             🌀 parser.go   	(394B)
             🌀 processor.go	(2KB 612B)
-            🌀 types.go    	(237B)
+            🌀 types.go    	(299B)
             🌀 worker.go   	(2KB 465B)
-        ❓ go.mod       	(258B)
-        ❓ go.sum       	(591B)
+        ❓ go.mod       	(292B)
+        ❓ go.sum       	(1KB 68B)
         ❓ go_worker.exe	(6MB 960KB)
-        🌀 main.go      	(579B)
-    📁 img          	(966KB 63B)
-        📷 logo.png       	(836KB 542B)
+        🌀 main.go      	(980B)
+    📁 img          	(4MB 700KB 695B)
+        📷 logo(old).png  	(836KB 542B)
+        📷 logo.png       	(122KB 747B)
         📷 web_display.png	(129KB 545B)
-    📁 src          	(1MB 884KB 224B)
-        📁 celestialflow         	(1MB 869KB 480B)
-            📁 static     	(1MB 419KB 510B)
-                📁 css	(32KB 568B)
+        🎞️ web_ui.gif     	(3MB 635KB 909B)
+    📁 src          	(1MB 920KB 171B)
+        📁 celestialflow         	(1MB 902KB 818B)
+            📁 adapters   	(13KB 837B)
+                📁 celestialtree	(13KB 681B)
+                    📁 [1项排除的目录]	(6KB 960B)
+                    🐍 client.py  	(5KB 486B)
+                    🐍 tools.py   	(1KB 182B)
+                    🐍 __init__.py	(77B)
+                📁 [1项排除的目录]	(156B)
+                🐍 __init__.py	(0B)
+            📁 static     	(1MB 417KB 101B)
+                📁 css	(31KB 410B)
                     🎨 base.css     	(6KB 155B)
-                    🎨 dashboard.css	(8KB 435B)
+                    🎨 dashboard.css	(7KB 277B)
                     🎨 errors.css   	(5KB 168B)
                     🎨 inject.css   	(12KB 834B)
-                📁 js 	(34KB 868B)
-                    📜 main.js          	(4KB 973B)
-                    📜 task_errors.js   	(4KB 544B)
+                📁 js 	(33KB 617B)
+                    📜 main.js          	(5KB 77B)
+                    📜 task_errors.js   	(4KB 550B)
                     📜 task_injection.js	(8KB 491B)
                     📜 task_statuses.js 	(8KB 63B)
-                    📜 task_structure.js	(7KB 143B)
-                    📜 task_topology.js 	(261B)
+                    📜 task_structure.js	(4KB 668B)
+                    📜 task_topology.js 	(1KB 375B)
                     📜 utils.js         	(1KB 441B)
                 ❓ favicon.ico	(1MB 352KB 98B)
-            📁 templates  	(12KB 973B)
-                🌐 index.html	(12KB 973B)
-            📁 [1项排除的目录]	(314KB 710B)
-            📝 README.md        	(13KB 131B)
-            🐍 task_graph.py    	(22KB 530B)
-            🐍 task_logging.py  	(6KB 291B)
-            🐍 task_manage.py   	(32KB 66B)
-            🐍 task_nodes.py    	(4KB 953B)
+            📁 templates  	(13KB 150B)
+                🌐 index.html	(13KB 150B)
+            📁 [1项排除的目录]	(331KB 149B)
+            🐍 task_graph.py    	(23KB 835B)
+            🐍 task_logging.py  	(8KB 903B)
+            🐍 task_manage.py   	(33KB 577B)
+            🐍 task_nodes.py    	(10KB 922B)
             🐍 task_progress.py 	(1KB 477B)
-            🐍 task_queue.py    	(7KB 896B)
-            🐍 task_report.py   	(5KB 511B)
-            🐍 task_structure.py	(6KB 93B)
-            🐍 task_tools.py    	(15KB 182B)
-            🐍 task_types.py    	(1KB 461B)
-            🐍 task_web.py      	(5KB 47B)
-            🐍 __init__.py      	(817B)
-        📁 celestialflow.egg-info	(14KB 768B)
-            ❓ PKG-INFO            	(13KB 363B)
-            📄 [5项排除的文件]	(1KB 405B)
-    📁 tests        	(113KB 510B)
-        📁 [1项排除的目录]	(81KB 604B)
-        📝 README.md        	(7KB 231B)
-        🐍 test_graph.py    	(5KB 83B)
-        🐍 test_manage.py   	(1KB 785B)
-        🐍 test_nodes.py    	(7KB 864B)
-        🐍 test_structure.py	(9KB 1015B)
-    📁 [6项排除的目录]	(195MB 276KB 932B)
-    ❓ .gitignore    	(264B)
+            🐍 task_queue.py    	(8KB 570B)
+            🐍 task_report.py   	(4KB 805B)
+            🐍 task_stage.py    	(5KB 511B)
+            🐍 task_structure.py	(5KB 996B)
+            🐍 task_tools.py    	(15KB 105B)
+            🐍 task_types.py    	(2KB 265B)
+            🐍 task_web.py      	(5KB 693B)
+            🐍 __init__.py      	(1KB 114B)
+        📁 [1项排除的目录]	(17KB 377B)
+    📁 tests        	(126KB 669B)
+        📁 [1项排除的目录]	(90KB 310B)
+        📝 README.md        	(6KB 324B)
+        🐍 test_graph.py    	(5KB 594B)
+        🐍 test_manage.py   	(3KB 90B)
+        🐍 test_nodes.py    	(11KB 272B)
+        🐍 test_structure.py	(10KB 103B)
+    📁 [6项排除的目录]	(199MB 931KB 238B)
+    ❓ .env          	(88B)
+    ❓ .gitignore    	(272B)
     ❓ LICENSE       	(1KB 65B)
     ❓ Makefile      	(501B)
     ❓ pyproject.toml	(1KB 223B)
     ⚙️ pytest.ini    	(254B)
-    📝 README.md     	(15KB 536B)
+    📝 README.md     	(15KB 109B)
+(celestial-flow 3.0.8)
 ```
 
-(该视图由我的另一个项目[CelestialVault](https://github.com/Mr-xiaotian/CelestialVault)中inst_file生成。)
+(该视图由我的另一个项目[CelestialVault](https://github.com/Mr-xiaotian/CelestialVault)中inst_file.FileTree.print_tree()生成。)
 
 ## 更新日志（Change Log）
 
@@ -311,6 +337,7 @@ flowchart TD
 - 3.0.5: 删除原有的TaskRedisTransfer节点, 并增添三种新的redis交互节点TaskRedisSink TaskRedisSource TaskRedisAck, 用于跨语言 跨进程 跨设备处理任务; 并在Web页面添加展示拓扑信息的卡片
 - 3.0.6: 添加对[CelestialTree](https://github.com/Mr-xiaotian/CelestialTree)系统的支持, 现在可以追踪单个任务的流向
 - 3.0.7: 将TaskStage从TaskManager中单独抽出来作为一个子类; 增加新节点TaskRouter, 可以将传入的任务选择的传给不同的下游节点, 而不是进行广播
+- 3.0.8: 在ctree关系上将"任务重试"后的"任务成功/失败/重试"视为因果关系, 而非之前的并行关系; 重构错误搜集部分逻辑; 修复大量3.0.6与3.07版本引入的bug; 优化部分log表现
 
 ## Star 历史趋势（Star History）
 

{celestialflow-3.0.7 → celestialflow-3.0.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "celestialflow"                   
-version = "3.0.7"                         
+version = "3.0.8"                         
 description = "A flexible GRAPH-based task orchestration framework."
 readme = "README.md"               
 license = { text = "MIT" }    

{celestialflow-3.0.7 → celestialflow-3.0.8}/src/celestialflow/adapters/celestialtree/client.py

@@ -1,6 +1,7 @@
 import json
 import threading
 import requests
+from multiprocessing import Value as MPValue, Lock as MPLock
 from typing import List, Optional, Dict, Any, Callable
 
 
@@ -176,11 +177,13 @@ class Client:
 
 
 class NullClient:
-    event_id = 0
+    def __init__(self, event_id=None):
+        self.event_id = event_id if event_id is not None else MPValue("i", 0)
 
     def emit(self, *args, **kwargs):
-        self.event_id += 1
-        return self.event_id
+        with self.event_id.get_lock():
+            self.event_id.value += 1
+            return self.event_id.value
 
     def get_event(self, *args, **kwargs):
         return None

{celestialflow-3.0.7 → celestialflow-3.0.8}/src/celestialflow/static/js/task_errors.js

@@ -25,7 +25,7 @@ function renderErrors() {
     const matchNode = !filter || e.node === filter;
     const matchKeyword = !keyword ||
       (e.error && e.error.toLowerCase().includes(keyword)) ||
-      (e.task_id && e.task_id.toLowerCase().includes(keyword));
+      (e.task_repr && e.task_repr.toLowerCase().includes(keyword));
     return matchNode && matchKeyword;
   });
 
@@ -48,7 +48,7 @@ function renderErrors() {
       row.innerHTML = `
         <td class="error-message">${e.error}</td>
         <td>${e.node}</td>
-        <td>${e.task_id}</td>
+        <td>${e.task_repr}</td>
         <td>${formatTimestamp(e.timestamp)}</td>
       `;
       errorsTableBody.appendChild(row);

{celestialflow-3.0.7 → celestialflow-3.0.8}/src/celestialflow/static/js/task_structure.js

@@ -111,7 +111,7 @@ linkStyle default stroke:#999,stroke-width:1.5px;
 
   // let defs = [];
 
-  // if (topologyData.layout_mode === "serial") {
+  // if (topologyData.schedule_mode=== "staged") {
   //   const layers = topologyData.layers_dict || {};
   //   const sortedLayerKeys = Object.keys(layers).sort((a, b) => Number(a) - Number(b));
   //   for (const layer of sortedLayerKeys) {

{celestialflow-3.0.7 → celestialflow-3.0.8}/src/celestialflow/static/js/task_topology.js

@@ -21,7 +21,7 @@ function renderTopologyInfo() {
 
   const {
     isDAG,
-    layout_mode,
+    schedule_mode,
     class_name,
     layers_dict = {},
   } = topologyData;
@@ -43,7 +43,7 @@ function renderTopologyInfo() {
 
     <div class="topology-row">
       <span class="label">调度模式</span>
-      <span class="value">${layout_mode}</span>
+      <span class="value">${schedule_mode}</span>
     </div>
 
     <div class="topology-row">