parallel

minillmflow/__init__.py

@@ -6,16 +6,13 @@ class BaseNode:
     def add_successor(self,node,action="default"):
         if action in self.successors: warnings.warn(f"Overwriting successor for action '{action}'")
         self.successors[action]=node;return node
-    def prep(self,shared): return None
-    def exec(self,prep_res): return None
+    def prep(self,shared): pass
+    def exec(self,prep_res): pass
+    def post(self,shared,prep_res,exec_res): pass
     def _exec(self,prep_res): return self.exec(prep_res)
-    def post(self,shared,prep_res,exec_res): return "default"
-    def _run(self,shared):
-        prep_res=self.prep(shared)
-        exec_res=self._exec(prep_res)
-        return self.post(shared,prep_res,exec_res)
-    def run(self,shared):
-        if self.successors: warnings.warn("Node won't run successors. Use a parent Flow instead.")
+    def _run(self,shared): p=self.prep(shared);e=self._exec(p);return self.post(shared,p,e)
+    def run(self,shared): 
+        if self.successors: warnings.warn("Node won't run successors. Use Flow.")  
         return self._run(shared)
     def __rshift__(self,other): return self.add_successor(other)
     def __sub__(self,action):
@@ -27,74 +24,77 @@ class _ConditionalTransition:
     def __rshift__(self,tgt): return self.src.add_successor(tgt,self.action)
 
 class Node(BaseNode):
-    def __init__(self,max_retries=1): 
-        super().__init__()
-        self.max_retries=max_retries
+    def __init__(self,max_retries=1): super().__init__();self.max_retries=max_retries
     def process_after_fail(self,prep_res,exc): raise exc
     def _exec(self,prep_res):
         for i in range(self.max_retries):
-            try:return super()._exec(prep_res)
+            try: return super()._exec(prep_res)
             except Exception as e:
-                if i==self.max_retries-1:return self.process_after_fail(prep_res,e)
+                if i==self.max_retries-1: return self.process_after_fail(prep_res,e)
 
 class BatchNode(Node):
-    def prep(self,shared): return []
     def _exec(self,items): return [super(Node,self)._exec(i) for i in items]
 
 class Flow(BaseNode):
-    def __init__(self,start):
-        super().__init__()
-        self.start=start
+    def __init__(self,start): super().__init__();self.start=start
     def get_next_node(self,curr,action):
-        nxt=curr.successors.get(action if action is not None else "default")
-        if not nxt and curr.successors: warnings.warn(f"Flow ends: action '{action}' not found in {list(curr.successors)}")
+        nxt=curr.successors.get(action or "default")
+        if not nxt and curr.successors: 
+            warnings.warn(f"Flow ends: '{action}' not found in {list(curr.successors)}")
         return nxt
-    def _orchestrate(self,shared,params=None):
-        curr,p=self.start,(params if params else {**self.params})
-        while curr:
-            curr.set_params(p)
-            curr=self.get_next_node(curr,curr._run(shared))
-    def _run(self,shared):
-        self._orchestrate(shared)
-        return self.post(shared,self.prep(shared),None)
-    def exec(self,prep_res): 
-        raise RuntimeError("Flow should not exec directly. Create a child Node instead.")
+    def _orch(self,shared,params=None):
+        curr,p=self.start,(params or {**self.params})
+        while curr: curr.set_params(p);c=curr._run(shared);curr=self.get_next_node(curr,c)
+    def _run(self,shared): pr=self.prep(shared);self._orch(shared);return self.post(shared,pr,None)
+    def exec(self,prep_res): raise RuntimeError("Flow can't exec.")
 
 class BatchFlow(Flow):
-    def prep(self,shared): return []
     def _run(self,shared):
-        prep_res=self.prep(shared)
-        for batch_params in prep_res:self._orchestrate(shared,{**self.params,**batch_params})
-        return self.post(shared,prep_res,None)
+        pr=self.prep(shared) or []
+        for bp in pr: self._orch(shared,{**self.params,**bp})
+        return self.post(shared,pr,None)
 
 class AsyncNode(Node):
-    def post(self,shared,prep_res,exec_res): 
-        raise RuntimeError("AsyncNode should post using post_async instead.")
-    async def post_async(self,shared,prep_res,exec_res):
-        await asyncio.sleep(0);return "default"
-    async def run_async(self,shared):
-        if self.successors: 
-            warnings.warn("Node won't run successors. Use a parent AsyncFlow instead.")
+    def prep(self,shared): raise RuntimeError("Use prep_async.")
+    def exec(self,prep_res): raise RuntimeError("Use exec_async.")
+    def post(self,shared,prep_res,exec_res): raise RuntimeError("Use post_async.")
+    def _run(self,shared): raise RuntimeError("Use run_async.")
+    async def prep_async(self,shared): pass
+    async def exec_async(self,prep_res): pass
+    async def post_async(self,shared,prep_res,exec_res): pass
+    async def _exec(self,prep_res): return await self.exec_async(prep_res)
+    async def run_async(self,shared): 
+        if self.successors: warnings.warn("Node won't run successors. Use AsyncFlow.")  
         return await self._run_async(shared)
     async def _run_async(self,shared):
-        prep_res=self.prep(shared)
-        exec_res=self._exec(prep_res)
-        return await self.post_async(shared,prep_res,exec_res)
-    def _run(self,shared): raise RuntimeError("AsyncNode should run using run_async instead.")
+        p=await self.prep_async(shared);e=await self._exec(p)
+        return await self.post_async(shared,p,e)
+
+class AsyncBatchNode(AsyncNode):
+    async def _exec(self,items): return [await super()._exec(i) for i in items]
+
+class AsyncParallelBatchNode(AsyncNode):
+    async def _exec(self,items): return await asyncio.gather(*(super()._exec(i) for i in items))
 
 class AsyncFlow(Flow,AsyncNode):
-    async def _orchestrate_async(self,shared,params=None):
-        curr,p=self.start,(params if params else {**self.params})
+    async def _orch_async(self,shared,params=None):
+        curr,p=self.start,(params or {**self.params})
         while curr:
             curr.set_params(p)
-            c=await curr._run_async(shared) if hasattr(curr,"run_async") else curr._run(shared)
+            c=await curr._run_async(shared) if isinstance(curr,AsyncNode) else curr._run(shared)
             curr=self.get_next_node(curr,c)
     async def _run_async(self,shared):
-        await self._orchestrate_async(shared)
-        return await self.post_async(shared,self.prep(shared),None)
+        pr=await self.prep_async(shared);await self._orch_async(shared)
+        return await self.post_async(shared,pr,None)
 
-class BatchAsyncFlow(BatchFlow,AsyncFlow):
+class AsyncBatchFlow(AsyncFlow):
     async def _run_async(self,shared):
-        prep_res=self.prep(shared)
-        for batch_params in prep_res:await self._orchestrate_async(shared,{**self.params,**batch_params})
-        return await self.post_async(shared,prep_res,None)
+        pr=await self.prep_async(shared) or []
+        for bp in pr: await self._orch_async(shared,{**self.params,**bp})
+        return await self.post_async(shared,pr,None)
+
+class AsyncParallelBatchFlow(AsyncFlow):
+    async def _run_async(self,shared):
+        pr=await self.prep_async(shared) or []
+        await asyncio.gather(*(self._orch_async(shared,{**self.params,**bp}) for bp in pr))
+        return await self.post_async(shared,pr,None)