reorg

synthesize/config.py

@@ -134,13 +134,13 @@ class FlowNode(Model):
 
     color: str
 
-    def write_script(self, tmp_dir: Path, flow_args: Args) -> Path:
+    def write_script(self, tmp_dir: Path, args: Args) -> Path:
         path = tmp_dir / f"{self.id}-{md5(self.model_dump_json().encode())}"
 
         path.parent.mkdir(parents=True, exist_ok=True)
         path.write_text(
             self.target.render(
-                args=flow_args
+                args=args
                 | self.args
                 | {
                     "id": self.id,

synthesize/execution.py

@@ -9,7 +9,7 @@
 
 from frozendict import frozendict
 
-from synthesize.config import Flow, FlowNode
+from synthesize.config import Args, Envs, FlowNode
 from synthesize.messages import ExecutionCompleted, ExecutionOutput, ExecutionStarted, Message
 
 
@@ -28,19 +28,20 @@ class Execution:
     async def start(
         cls,
         node: FlowNode,
-        flow: Flow,
+        args: Args,
+        envs: Envs,
         events: Queue[Message],
         tmp_dir: Path,
         width: int = 80,
     ) -> Execution:
-        path = node.write_script(tmp_dir=tmp_dir, flow_args=flow.args)
+        path = node.write_script(tmp_dir=tmp_dir, args=args)
 
         process = await create_subprocess_exec(
             program=path,
             stdout=PIPE,
             stderr=STDOUT,
             env=frozendict(os.environ)
-            | flow.envs
+            | envs
             | node.envs
             | {
                 "FORCE_COLOR": "1",

synthesize/orchestrator.py

@@ -122,7 +122,8 @@ async def start_ready_targets(self, tmp_dir: Path) -> None:
             async def start() -> None:
                 e = await Execution.start(
                     node=ready_node,
-                    flow=self.flow,
+                    args=self.flow.args,
+                    envs=self.flow.envs,
                     events=self.inbox,
                     width=self.console.width - self.renderer.prefix_width,
                     tmp_dir=tmp_dir,