dv-flow-mgr 1.8.14920283751rc0__py3-none-any.whl → 1.8.14931268525rc0__py3-none-any.whl

dv_flow/mgr/__init__.py

@@ -32,6 +32,6 @@ from .task_runner import TaskSetRunner
 from .task_listener_log import TaskListenerLog
 
 VERSION="1.8.0"
-SUFFIX="14920283751rc0"
+SUFFIX="14931268525rc0"
 __version__="%s%s" % (VERSION, SUFFIX)
 

dv_flow/mgr/task_listener_trace.py

@@ -3,6 +3,7 @@ import json
 import time
 from typing import Dict, List, TextIO
 from .task_node import TaskNode
+from .fileset import FileSet
 
 @dc.dataclass
 class TaskListenerTrace(object):
@@ -58,6 +59,36 @@ class TaskListenerTrace(object):
             del self._task_tid_map[task]
             self._free_tids.append(tid)
 
+    def _get_task_data(self, task: TaskNode) -> dict:
+        """Extract serializable task data"""
+        data = {}
+        
+        # Add any parameters
+        if hasattr(task, 'params') and task.params:
+            # If params is a dataclass or has __dict__, get its fields
+            if hasattr(task.params, '__dict__'):
+                data['params'] = task.params.__dict__
+            elif isinstance(task.params, dict):
+                data['params'] = task.params
+
+        # Add inputs if present
+        if hasattr(task, 'needs') and task.needs:
+            inputs = []
+            for need, _ in task.needs:
+                if hasattr(need, 'output') and need.output:
+                    _items = []
+                    for out in need.output.output:
+                        if hasattr(out, 'model_dump'):
+                            _items.append(out.model_dump())
+                    inputs.append({
+                        'task': need.name,
+                        'data': _items
+                    })
+            if inputs:
+                data['inputs'] = inputs
+
+        return data
+
     def event(self, task: TaskNode, reason: str):
         """Record a task execution event.
         
@@ -74,87 +105,72 @@ class TaskListenerTrace(object):
         # Get current timestamp in microseconds
         ts = int(time.time() * 1_000_000) if reason == "enter" else int(task.end.timestamp() * 1_000_000)
 
-        # Create the duration event
+        # Create the duration event with initial args
+        args = {}
+        
+        # Add task data
+        if reason == "enter":
+            # Add input data on task start
+            input_data = self._get_task_data(task)
+            if input_data:
+                args = input_data
+
+        elif reason == 'leave':
+            if task.result:
+                # Add status and change info
+                args["status"] = task.result.status
+                args["changed"] = task.result.changed
+                
+                # Add output data if present
+                if hasattr(task.result, 'output') and task.result.output:
+                    args["output"] = [
+                        out.__dict__ if hasattr(out, '__dict__') else out 
+                        for out in task.result.output
+                    ]
+
+            self._release_tid(task)
+
+        # Create the event with collected args
         event = {
             "name": task.name,
             "cat": "task",
             "ph": ph, 
             "pid": 1,
             "tid": tid,
-            "ts": ts
+            "ts": ts,
+            "args": args
         }
 
         # Store the duration event
         self._events.append(event)
 
+        # Add flow event for dependencies
         if reason == "enter":
-            # When a task starts, create flow events from all its dependencies
+            # When task starts, add flow event from each dependency
             for need, _ in task.needs:
-                flow_id = self._next_flow_id
-                self._next_flow_id += 1
-
-                # # Add flow end event connecting to this task
-                # flow_end = {
-                #     "name": f"{need.name} -> {task.name}",
-                #     "cat": "flow",
-                #     "ph": "e",  # Flow end
-                #     "pid": 1,
-                #     "tid": tid,  # Target task's thread
-                #     "ts": ts,
-                #     "id": flow_id,
-                #     "bp": "e"  # Connect to enclosing slice
-                # }
-                # self._events.append(flow_end)
-
-                # # Add flow start event from dependency
-                # flow_start = {
-                #     "name": f"{need.name} -> {task.name}",
-                #     "cat": "flow",
-                #     "ph": "b",  # Flow begin
-                #     "pid": 1,
-                #     "tid": self._task_tid_map.get(need, 0),  # Source task's thread
-                #     "ts": int(need.end.timestamp() * 1_000_000) if need.end else ts,
-                #     "id": flow_id,
-                #     "bp": "e"  # Connect to enclosing slice
-                # }
-                # self._events.append(flow_start)
-
-        elif reason == 'leave':
-            # For completed tasks, emit flow start events
-            if task.result:
-                event["args"] = {
-                    "status": task.result.status,
-                    "changed": task.result.changed
+                # Create flow start from completed task to this one
+                flow = {
+                    "name": f"{need.name} -> {task.name}",
+                    "cat": "flow",
+                    "ph": "s",  # Flow start 
+                    "pid": 1,
+                    "tid": self._task_tid_map.get(need, 0),
+                    "ts": int(need.end.timestamp() * 1_000_000) if need.end else ts,
+                    "id": self._next_flow_id,
+                    "bp": "e"
                 }
-
-                # Find any tasks that depend on this one and create flow events
-                for dep_task, dep_tid in self._task_tid_map.items():
-                    if any(need[0] is task for need in dep_task.needs):
-                        # # Create flow start event
-                        # flow = {
-                        #     "name": f"{task.name} -> {dep_task.name}",
-                        #     "cat": "flow",
-                        #     "ph": "s",  # Flow start
-                        #     "pid": 1,
-                        #     "tid": tid,  # Source task's thread
-                        #     "ts": ts,  # Use task end time
-                        #     "id": self._next_flow_id,
-                        #     "bp": "e"  # Connect to enclosing slice
-                        # }
-                        # self._events.append(flow)
-
-                        # # Create flow end event
-                        # flow_end = {
-                        #     "name": f"{task.name} -> {dep_task.name}",
-                        #     "cat": "flow",
-                        #     "ph": "f",  # Flow finish
-                        #     "pid": 1,
-                        #     "tid": dep_tid,  # Target task's thread
-                        #     "ts": ts,  # Will be updated when target task starts
-                        #     "id": self._next_flow_id,
-                        #     "bp": "e"  # Connect to enclosing slice
-                        # }
-                        # self._events.append(flow_end)
-                        self._next_flow_id += 1
-
-            self._release_tid(task)
+                self._events.append(flow)
+                
+                # Create flow finish at the start of this task
+                flow_end = {
+                    "name": f"{need.name} -> {task.name}",
+                    "cat": "flow",
+                    "ph": "f",  # Flow finish
+                    "pid": 1, 
+                    "tid": tid,
+                    "ts": ts,
+                    "id": self._next_flow_id,
+                    "bp": "e"
+                }
+                self._events.append(flow_end)
+                self._next_flow_id += 1

{dv_flow_mgr-1.8.14920283751rc0.dist-info → dv_flow_mgr-1.8.14931268525rc0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dv-flow-mgr
-Version: 1.8.14920283751rc0
+Version: 1.8.14931268525rc0
 Summary: DV Flow Manager is a build system for silicon design
 Author-email: Matthew Ballance <matt.ballance@gmail.com>
 License:                                  Apache License

{dv_flow_mgr-1.8.14920283751rc0.dist-info → dv_flow_mgr-1.8.14931268525rc0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-dv_flow/mgr/__init__.py,sha256=NUUQLnpk4-yjT3DaUH9ugThEF8n1nqhlzLs6YW9zLHU,1315
+dv_flow/mgr/__init__.py,sha256=oKr6XoYlfmr7HcnXVV6xho2mkUJB4ROiJB-2tfirtYA,1315
 dv_flow/mgr/__main__.py,sha256=BogNdBkXhgg05E8_IumNkVoag6WwvfbpiI8346oOtPo,3844
 dv_flow/mgr/cond_def.py,sha256=2ZkzPusqVkN1fFMTvkDl9O_OJLPdD_cK3xzX9J75RMw,343
 dv_flow/mgr/config.py,sha256=b2MVlVVNB0psk8x4bQRAYshkpNJrtyMtV1Ymhmx9AfM,137
@@ -37,7 +37,7 @@ dv_flow/mgr/task_def.py,sha256=8NPwtTROfWDkMqcO9mKXV4dw0sC4mCMmnsNuv8uTdTY,5094
 dv_flow/mgr/task_graph_builder.py,sha256=q7BS7OLYkS6uZwQLvo6P_CtJkhIvPal_tXLZHgUuLpU,28172
 dv_flow/mgr/task_graph_dot_writer.py,sha256=qK4Imy9o2_F1aKoU1tJ-qoBHslq2BhSMbdjAUPfpN7I,6009
 dv_flow/mgr/task_listener_log.py,sha256=Ai-6X5BOoGsaNTgnlXEW0-czrjJm7__ShNK501CUmko,4337
-dv_flow/mgr/task_listener_trace.py,sha256=76Fqb7hiAT2GH8_-_bMRAl6T2lrTly6sP1Zis6BG3wU,6192
+dv_flow/mgr/task_listener_trace.py,sha256=7B-V2YK8uXd_QSGBq_7USmbe5CleVvwumU0CpsmxZvg,6224
 dv_flow/mgr/task_node.py,sha256=OC3rkeRSFv9wmgkMZ_7eJu7nuXGJcwW_b6FGQM-w7AU,5231
 dv_flow/mgr/task_node_compound.py,sha256=0biBPT_2SpCPJL7DFaFY27_K7kNxJ1taIut3Fv12HXk,3347
 dv_flow/mgr/task_node_ctor.py,sha256=YsoVMX5WbpbzcHvEK7ps_ZRV-J7MZ3F8NNozQw7vbog,4418
@@ -74,9 +74,9 @@ dv_flow/mgr/util/util.py,sha256=BO7iqP_c9ttmXkojq7nKDN-g8wl1_Pco9k-KnrXxjwE,1889
 dv_flow/mgr/util/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dv_flow/mgr/util/cmds/cmd_schema.py,sha256=IJzZdxCSEgIQ79LpYiM7UqJ9RJ-7yraqmBN2XVgAgXA,1752
 dv_flow/mgr/util/cmds/cmd_workspace.py,sha256=egmaIXpe5L-TePwmcfisfrG6tdiTUWSjqa9Za5WChVs,890
-dv_flow_mgr-1.8.14920283751rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-1.8.14920283751rc0.dist-info/METADATA,sha256=CeTzqO-0eYhSYkg9hMV97sS0lr_W_2gulAFrOH5wy_4,13335
-dv_flow_mgr-1.8.14920283751rc0.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-dv_flow_mgr-1.8.14920283751rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-1.8.14920283751rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-1.8.14920283751rc0.dist-info/RECORD,,
+dv_flow_mgr-1.8.14931268525rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-1.8.14931268525rc0.dist-info/METADATA,sha256=xtNJAHBujbtKSu7qN8OAoN_tAMUOtvUFzmd9eFKAwRU,13335
+dv_flow_mgr-1.8.14931268525rc0.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+dv_flow_mgr-1.8.14931268525rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-1.8.14931268525rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-1.8.14931268525rc0.dist-info/RECORD,,