grasp_agents 0.5.5__py3-none-any.whl → 0.5.8__py3-none-any.whl

grasp_agents/workflow/looped_workflow.py

@@ -5,7 +5,7 @@ from typing import Any, Generic, Protocol, TypeVar, cast, final
 
 from ..errors import WorkflowConstructionError
 from ..packet_pool import Packet
-from ..processor import Processor
+from ..processors.base_processor import BaseProcessor
 from ..run_context import CtxT, RunContext
 from ..typing.events import Event, ProcPacketOutputEvent, WorkflowResultEvent
 from ..typing.io import InT, OutT, ProcName
@@ -16,7 +16,7 @@ logger = getLogger(__name__)
 _OutT_contra = TypeVar("_OutT_contra", contravariant=True)
 
 
-class ExitWorkflowLoopHandler(Protocol[_OutT_contra, CtxT]):
+class WorkflowLoopTerminator(Protocol[_OutT_contra, CtxT]):
     def __call__(
         self,
         out_packet: Packet[_OutT_contra],
@@ -29,8 +29,8 @@ class LoopedWorkflow(WorkflowProcessor[InT, OutT, CtxT], Generic[InT, OutT, CtxT
     def __init__(
         self,
         name: ProcName,
-        subprocs: Sequence[Processor[Any, Any, Any, CtxT]],
-        exit_proc: Processor[Any, OutT, Any, CtxT],
+        subprocs: Sequence[BaseProcessor[Any, Any, Any, CtxT]],
+        exit_proc: BaseProcessor[Any, OutT, Any, CtxT],
         recipients: list[ProcName] | None = None,
         max_retries: int = 0,
         max_iterations: int = 10,
@@ -60,28 +60,30 @@ class LoopedWorkflow(WorkflowProcessor[InT, OutT, CtxT], Generic[InT, OutT, CtxT
 
         self._max_iterations = max_iterations
 
-        self._exit_workflow_loop_impl: ExitWorkflowLoopHandler[OutT, CtxT] | None = None
+        self.workflow_loop_terminator: WorkflowLoopTerminator[OutT, CtxT] | None
+        if not hasattr(type(self), "workflow_loop_terminator"):
+            self.workflow_loop_terminator = None
 
     @property
     def max_iterations(self) -> int:
         return self._max_iterations
 
-    def exit_workflow_loop(
-        self, func: ExitWorkflowLoopHandler[OutT, CtxT]
-    ) -> ExitWorkflowLoopHandler[OutT, CtxT]:
-        self._exit_workflow_loop_impl = func
+    def add_workflow_loop_terminator(
+        self, func: WorkflowLoopTerminator[OutT, CtxT]
+    ) -> WorkflowLoopTerminator[OutT, CtxT]:
+        self.workflow_loop_terminator = func
 
         return func
 
-    def _exit_workflow_loop(
+    def _terminate_workflow_loop(
         self,
         out_packet: Packet[OutT],
         *,
         ctx: RunContext[CtxT] | None = None,
         **kwargs: Any,
     ) -> bool:
-        if self._exit_workflow_loop_impl:
-            return self._exit_workflow_loop_impl(out_packet, ctx=ctx, **kwargs)
+        if self.workflow_loop_terminator:
+            return self.workflow_loop_terminator(out_packet, ctx=ctx, **kwargs)
 
         return False
 
@@ -96,14 +98,15 @@ class LoopedWorkflow(WorkflowProcessor[InT, OutT, CtxT], Generic[InT, OutT, CtxT
         forgetful: bool = False,
         ctx: RunContext[CtxT] | None = None,
     ) -> Packet[OutT]:
-        call_id = self._generate_call_id(call_id)
-
         packet = in_packet
-        num_iterations = 0
         exit_packet: Packet[OutT] | None = None
 
-        while True:
+        for num_iterations in range(1, self._max_iterations + 1):
+            call_id = self._generate_call_id(call_id)
+
             for subproc in self.subprocs:
+                logger.info(f"\n[Running subprocessor {subproc.name}]\n")
+
                 packet = await subproc.run(
                     chat_inputs=chat_inputs,
                     in_packet=packet,
@@ -113,12 +116,13 @@ class LoopedWorkflow(WorkflowProcessor[InT, OutT, CtxT], Generic[InT, OutT, CtxT
                     ctx=ctx,
                 )
 
+                logger.info(f"\n[Finished running subprocessor {subproc.name}]\n")
+
                 if subproc is self._end_proc:
-                    num_iterations += 1
                     exit_packet = cast("Packet[OutT]", packet)
-                    if self._exit_workflow_loop(exit_packet, ctx=ctx):
+                    if self._terminate_workflow_loop(exit_packet, ctx=ctx):
                         return exit_packet
-                    if num_iterations >= self._max_iterations:
+                    if num_iterations == self._max_iterations:
                         logger.info(
                             f"Max iterations reached ({self._max_iterations}). "
                             "Exiting loop."
@@ -128,8 +132,10 @@ class LoopedWorkflow(WorkflowProcessor[InT, OutT, CtxT], Generic[InT, OutT, CtxT
                 chat_inputs = None
                 in_args = None
 
+        raise RuntimeError("Looped workflow did not exit after max iterations.")
+
     @final
-    async def run_stream(  # type: ignore[override]
+    async def run_stream(
         self,
         chat_inputs: Any | None = None,
         *,
@@ -139,14 +145,15 @@ class LoopedWorkflow(WorkflowProcessor[InT, OutT, CtxT], Generic[InT, OutT, CtxT
         forgetful: bool = False,
         ctx: RunContext[CtxT] | None = None,
     ) -> AsyncIterator[Event[Any]]:
-        call_id = self._generate_call_id(call_id)
-
         packet = in_packet
-        num_iterations = 0
         exit_packet: Packet[OutT] | None = None
 
-        while True:
+        for num_iterations in range(1, self._max_iterations + 1):
+            call_id = self._generate_call_id(call_id)
+
             for subproc in self.subprocs:
+                logger.info(f"\n[Running subprocessor {subproc.name}]\n")
+
                 async for event in subproc.run_stream(
                     chat_inputs=chat_inputs,
                     in_packet=packet,
@@ -159,15 +166,16 @@ class LoopedWorkflow(WorkflowProcessor[InT, OutT, CtxT], Generic[InT, OutT, CtxT
                         packet = event.data
                     yield event
 
+                logger.info(f"\n[Finished running subprocessor {subproc.name}]\n")
+
                 if subproc is self._end_proc:
-                    num_iterations += 1
                     exit_packet = cast("Packet[OutT]", packet)
-                    if self._exit_workflow_loop(exit_packet, ctx=ctx):
+                    if self._terminate_workflow_loop(exit_packet, ctx=ctx):
                         yield WorkflowResultEvent(
                             data=exit_packet, proc_name=self.name, call_id=call_id
                         )
                         return
-                    if num_iterations >= self._max_iterations:
+                    if num_iterations == self._max_iterations:
                         logger.info(
                             f"Max iterations reached ({self._max_iterations}). "
                             "Exiting loop."

grasp_agents/workflow/sequential_workflow.py

@@ -1,21 +1,24 @@
+import logging
 from collections.abc import AsyncIterator, Sequence
 from itertools import pairwise
 from typing import Any, Generic, cast, final
 
 from ..errors import WorkflowConstructionError
 from ..packet_pool import Packet
-from ..processor import Processor
+from ..processors.base_processor import BaseProcessor
 from ..run_context import CtxT, RunContext
 from ..typing.events import Event, ProcPacketOutputEvent, WorkflowResultEvent
 from ..typing.io import InT, OutT, ProcName
 from .workflow_processor import WorkflowProcessor
 
+logger = logging.getLogger(__name__)
+
 
 class SequentialWorkflow(WorkflowProcessor[InT, OutT, CtxT], Generic[InT, OutT, CtxT]):
     def __init__(
         self,
         name: ProcName,
-        subprocs: Sequence[Processor[Any, Any, Any, CtxT]],
+        subprocs: Sequence[BaseProcessor[Any, Any, Any, CtxT]],
         recipients: list[ProcName] | None = None,
         max_retries: int = 0,
     ) -> None:
@@ -51,6 +54,8 @@ class SequentialWorkflow(WorkflowProcessor[InT, OutT, CtxT], Generic[InT, OutT,
 
         packet = in_packet
         for subproc in self.subprocs:
+            logger.info(f"\n[Running subprocessor {subproc.name}]\n")
+
             packet = await subproc.run(
                 chat_inputs=chat_inputs,
                 in_packet=packet,
@@ -62,10 +67,12 @@ class SequentialWorkflow(WorkflowProcessor[InT, OutT, CtxT], Generic[InT, OutT,
             chat_inputs = None
             in_args = None
 
+            logger.info(f"\n[Finished running subprocessor {subproc.name}]\n")
+
         return cast("Packet[OutT]", packet)
 
     @final
-    async def run_stream(  # type: ignore[override]
+    async def run_stream(
         self,
         chat_inputs: Any | None = None,
         *,
@@ -79,6 +86,8 @@ class SequentialWorkflow(WorkflowProcessor[InT, OutT, CtxT], Generic[InT, OutT,
 
         packet = in_packet
         for subproc in self.subprocs:
+            logger.info(f"\n[Running subprocessor {subproc.name}]\n")
+
             async for event in subproc.run_stream(
                 chat_inputs=chat_inputs,
                 in_packet=packet,
@@ -94,6 +103,8 @@ class SequentialWorkflow(WorkflowProcessor[InT, OutT, CtxT], Generic[InT, OutT,
             chat_inputs = None
             in_args = None
 
+            logger.info(f"\n[Finished running subprocessor {subproc.name}]\n")
+
         yield WorkflowResultEvent(
             data=cast("Packet[OutT]", packet), proc_name=self.name, call_id=call_id
         )

grasp_agents/workflow/workflow_processor.py

@@ -4,23 +4,23 @@ from typing import Any, Generic
 
 from ..errors import WorkflowConstructionError
 from ..packet import Packet
-from ..processor import Processor, RecipientSelector
+from ..processors.base_processor import BaseProcessor, RecipientSelector
 from ..run_context import CtxT, RunContext
-from ..typing.events import Event
+from ..typing.events import DummyEvent, Event
 from ..typing.io import InT, OutT, ProcName
 
 
 class WorkflowProcessor(
-    Processor[InT, OutT, Any, CtxT],
+    BaseProcessor[InT, OutT, Any, CtxT],
     ABC,
     Generic[InT, OutT, CtxT],
 ):
     def __init__(
         self,
         name: ProcName,
-        subprocs: Sequence[Processor[Any, Any, Any, CtxT]],
-        start_proc: Processor[InT, Any, Any, CtxT],
-        end_proc: Processor[Any, OutT, Any, CtxT],
+        subprocs: Sequence[BaseProcessor[Any, Any, Any, CtxT]],
+        start_proc: BaseProcessor[InT, Any, Any, CtxT],
+        end_proc: BaseProcessor[Any, OutT, Any, CtxT],
         recipients: list[ProcName] | None = None,
         max_retries: int = 0,
     ) -> None:
@@ -44,10 +44,7 @@ class WorkflowProcessor(
         self._start_proc = start_proc
         self._end_proc = end_proc
 
-        self.recipients = end_proc.recipients
-        if recipients is not None:
-            self.recipients = recipients
-
+        self.recipients = recipients
         if hasattr(type(self), "recipient_selector"):
             self._end_proc.recipient_selector = self.recipient_selector
 
@@ -60,19 +57,28 @@ class WorkflowProcessor(
         return func
 
     @property
-    def subprocs(self) -> Sequence[Processor[Any, Any, Any, CtxT]]:
+    def recipients(self) -> list[ProcName] | None:
+        return self._end_proc.recipients
+
+    @recipients.setter
+    def recipients(self, value: list[ProcName] | None) -> None:
+        if hasattr(self, "_end_proc"):
+            self._end_proc.recipients = value
+
+    @property
+    def subprocs(self) -> Sequence[BaseProcessor[Any, Any, Any, CtxT]]:
         return self._subprocs
 
     @property
-    def start_proc(self) -> Processor[InT, Any, Any, CtxT]:
+    def start_proc(self) -> BaseProcessor[InT, Any, Any, CtxT]:
         return self._start_proc
 
     @property
-    def end_proc(self) -> Processor[Any, OutT, Any, CtxT]:
+    def end_proc(self) -> BaseProcessor[Any, OutT, Any, CtxT]:
         return self._end_proc
 
     def _generate_subproc_call_id(
-        self, call_id: str | None, subproc: Processor[Any, Any, Any, CtxT]
+        self, call_id: str | None, subproc: BaseProcessor[Any, Any, Any, CtxT]
     ) -> str | None:
         return f"{self._generate_call_id(call_id)}/{subproc.name}"
 
@@ -100,4 +106,4 @@ class WorkflowProcessor(
         forgetful: bool = False,
         call_id: str | None = None,
     ) -> AsyncIterator[Event[Any]]:
-        pass
+        yield DummyEvent()

{grasp_agents-0.5.5.dist-info → grasp_agents-0.5.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: grasp_agents
-Version: 0.5.5
+Version: 0.5.8
 Summary: Grasp Agents Library
 License-File: LICENSE.md
 Requires-Python: <4,>=3.11.4

{grasp_agents-0.5.5.dist-info → grasp_agents-0.5.8.dist-info}/RECORD

@@ -1,22 +1,21 @@
-grasp_agents/__init__.py,sha256=h8fAUoFK7HrAMgoZ3b4_eGLnn1kF4ofHh_9DdqoaHfU,860
-grasp_agents/cloud_llm.py,sha256=C6xrKYhiQb4tNXK_rFo2pNlVTXPS_gYd5uevAnpLFeE,13119
+grasp_agents/__init__.py,sha256=Z3a_j2Etiap9H6lvE8-PQP_OIGMUcHNPeJAJO12B8kY,1031
+grasp_agents/cloud_llm.py,sha256=gM43G4-dR-vugeKuhGty8iEuZUbloImbz2XyWO0IMjg,13254
 grasp_agents/costs_dict.yaml,sha256=2MFNWtkv5W5WSCcv1Cj13B1iQLVv5Ot9pS_KW2Gu2DA,2510
 grasp_agents/errors.py,sha256=K-22TCM1Klhsej47Rg5eTqnGiGPaXgKOpdOZZ7cPipw,4633
 grasp_agents/generics_utils.py,sha256=5Pw3I9dlnKC2VGqYKC4ZZUO3Z_vTNT-NPFovNfPkl6I,6542
 grasp_agents/grasp_logging.py,sha256=H1GYhXdQvVkmauFDZ-KDwvVmPQHZUUm9sRqX_ObK2xI,1111
 grasp_agents/http_client.py,sha256=Es8NXGDkp4Nem7g24-jW0KFGA9Hp_o2Cv3cOvjup-iU,859
-grasp_agents/llm.py,sha256=YCzHlb2gdWVy77DmQpcu0dyEzGp4VQa3UMRJKodCYSs,6557
-grasp_agents/llm_agent.py,sha256=Qh26FlhGKKw9XMOU16Nr1GOfdUD8L5SjAM-Vh3Y5jx0,13175
+grasp_agents/llm.py,sha256=w3vVIYUfhr_t45sZa0Nl373Htm05r9NUS02SvCKXbVA,12151
+grasp_agents/llm_agent.py,sha256=hX3T2Y5qiTt5CrsahNo5t08HFCyBWEiurzYnFykJN9Y,13513
 grasp_agents/llm_agent_memory.py,sha256=gQwH3g4Ib3ciW2jrBiW13ttwax_pcPobH5RhXRmbc0E,1842
-grasp_agents/llm_policy_executor.py,sha256=glusWe4wTIh_rl3bXPbAMueJ5eDfJxPYBTzoecrHPYg,16849
+grasp_agents/llm_policy_executor.py,sha256=bP-O1itfaG-dr2PC9_zLCNMI862cPRqW7vsj9tRCz-I,17062
 grasp_agents/memory.py,sha256=keHuNEZNSxHT9FKpMohHOCNi7UAz_oRIc91IQEuzaWE,1162
 grasp_agents/packet.py,sha256=EmE-W4ZSMVZoqClECGFe7OGqrT4FSJ8IVGICrdjtdEY,1462
-grasp_agents/packet_pool.py,sha256=A5hqEvh7XwaPJVkfbItMm5FQqxujVzXDId7HnSUqluI,4919
-grasp_agents/printer.py,sha256=kecOs4Jfxb--ZjvvDn1q2-CnZXZeJaMwQEYOlfj2pbo,11039
-grasp_agents/processor.py,sha256=eCte5jvFsGxzlgjEnIcakuvTB5bNWRq-29cAYWNZBXY,17149
+grasp_agents/packet_pool.py,sha256=AF7ZMYY1U6ppNLEn6o0R8QXyWmcLQGcju7_TYQpAudg,4443
+grasp_agents/printer.py,sha256=wVNCaR9mbFKyzYdT8YpYD1JQqRqHdLtdfiZrwYxaM6Y,11132
 grasp_agents/prompt_builder.py,sha256=UuQNnvjrhzd3_NVnvHlCs-NRNRMo4jsMePgZeIxmzSY,5894
 grasp_agents/run_context.py,sha256=ikakNK1khm0UBEIPETB508BL0IlOKbOUPuq0FZ-iQHQ,942
-grasp_agents/runner.py,sha256=nZXK5OuM7QbLyzNA-rfXD0YDtdftTK5v2cCpeujhe2k,4479
+grasp_agents/runner.py,sha256=Gc4xQ9EQWbIHPaoe4KQsFkHhSnJK3xNPIGxHsYLI3aY,5147
 grasp_agents/usage_tracker.py,sha256=ZQfVUUpG0C89hyPWT_JgXnjQOxoYmumcQ9t-aCfcMo8,3561
 grasp_agents/utils.py,sha256=qKmGBwrQHw1-BgqRLuGTPKGs3J_zbrpk3nxnP1iZBiQ,6152
 grasp_agents/litellm/__init__.py,sha256=wD8RZBYokFDfbS9Cs7nO_zKb3w7RIVwEGj7g2D5CJH0,4510
@@ -33,24 +32,27 @@ grasp_agents/openai/converters.py,sha256=CXHF2GehEHLEzjL45HywZ_1qaB3N29-lbac5oBD
 grasp_agents/openai/message_converters.py,sha256=fhSN81uK51EGbLyM2-f0MvPX_UBrMy7SF3JQPo-dkXg,4686
 grasp_agents/openai/openai_llm.py,sha256=uJbbCytqpv8OCncKdzpiUdkVh3mJWgo95Y9Xetk_Ptg,10556
 grasp_agents/openai/tool_converters.py,sha256=IotZvpe3xMQcBfcjUTfAsn4LtZljj3zkU9bfpcoiqPw,1177
+grasp_agents/processors/base_processor.py,sha256=j2_QY6HUjckdxfsf7yAF0xRDp_V-DNDb7hIRMRKUyWw,10685
+grasp_agents/processors/parallel_processor.py,sha256=4NH2gfGgUheZWQGKn3NEMp0uQ0kOeJRZ3Ja0a7qmqpg,7863
+grasp_agents/processors/processor.py,sha256=v7Bf6CGVsjb43XuOtTMuev9UedMy_lBTGifzzCZwh4Q,5157
 grasp_agents/rate_limiting/__init__.py,sha256=KRgtF_E7R3YfA2cpYcFcZ7wycV0pWVJ0xRQC7YhiIEQ,158
 grasp_agents/rate_limiting/rate_limiter_chunked.py,sha256=BPgkUXvhmZhTpZs2T6uujNFuxH_kYHiISuf6_-eNhUc,5544
 grasp_agents/rate_limiting/types.py,sha256=PbnNhEAcYedQdIpPJWud8HUVcxa_xZS2RDZu4c5jr40,1003
 grasp_agents/rate_limiting/utils.py,sha256=oEDWDNHYMUdxOOG49PlAJochkZq8nnVBCo6JxPc1iSo,2007
 grasp_agents/typing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 grasp_agents/typing/completion.py,sha256=PHJ01m7WI2KYQL8w7W2ti6hMsKEZnzYGaxbNcBCc_IE,2782
-grasp_agents/typing/completion_chunk.py,sha256=t6PvkDWQxRN5xA4efBdeou46RifMFodBmZc45Sx7qxQ,7610
+grasp_agents/typing/completion_chunk.py,sha256=eiOcpyMrH4Ws2XnY3_jj2_g396MqA3zV3lHygHfXt4o,17883
 grasp_agents/typing/content.py,sha256=XFmLpNWkGhkw5JujO6UsYwhzTHkU67PfhzaXH2waLcQ,3659
 grasp_agents/typing/converters.py,sha256=kHlocHQS8QnduZOzNPbj3aRD8JpvJd53oudYqWdOxKE,2978
-grasp_agents/typing/events.py,sha256=1n6EVS8vU0RLlQHMHUjiV5i4PYLovT7RcOmpcx0ztlc,5256
+grasp_agents/typing/events.py,sha256=vFq6qRGofY8NuxOG9ZIN2_CnhAqsAodYLD4b4KtAq2U,12620
 grasp_agents/typing/io.py,sha256=MGEoUjAwKH1AHYglFkKNpHiielw-NFf13Epg3B4Q7Iw,139
 grasp_agents/typing/message.py,sha256=o7bN84AgrC5Fm3Wx20gqL9ArAMcEtYvnHnXbb04ngCs,3224
 grasp_agents/typing/tool.py,sha256=4N-k_GvHVPAFyVyEq7z_LYKkA24iQlGoVYiWCzGTgT4,1786
 grasp_agents/workflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-grasp_agents/workflow/looped_workflow.py,sha256=J-mdy1gxsMUC622j8W-_fDX3oAyKHg9TTzCXEksMS-Q,6311
-grasp_agents/workflow/sequential_workflow.py,sha256=7xBl6YtH97y6jSv6eAHtSIeKjoqiUWKu63C-gKp6Eus,3295
-grasp_agents/workflow/workflow_processor.py,sha256=rtW67EBXVoqZTfjLWHz2CyixIu2RdqLxLkFtyI1N49s,3277
-grasp_agents-0.5.5.dist-info/METADATA,sha256=uV2MT_3IKkAl-iOqB1aSa9GflFle77n7UjrinyIHQZ8,6865
-grasp_agents-0.5.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-grasp_agents-0.5.5.dist-info/licenses/LICENSE.md,sha256=-nNNdWqGB8gJ2O-peFQ2Irshv5tW5pHKyTcYkwvH7CE,1201
-grasp_agents-0.5.5.dist-info/RECORD,,
+grasp_agents/workflow/looped_workflow.py,sha256=WHp9O3Za2sBVfY_BLOdvPvtY20XsjZQaWSO2-oAFvOY,6806
+grasp_agents/workflow/sequential_workflow.py,sha256=e3BIWzy_2novmEWNwIteyMbrzvl1-evHrTBE3r3SpU8,3648
+grasp_agents/workflow/workflow_processor.py,sha256=yrxqAGfznmdkbP5zScKKJguxATfU4ObmA6BDR7YCBNU,3549
+grasp_agents-0.5.8.dist-info/METADATA,sha256=0LFzAa3UIg87-9jv2oCAbh-bPSnt0fELxIDWHmgbJzg,6865
+grasp_agents-0.5.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+grasp_agents-0.5.8.dist-info/licenses/LICENSE.md,sha256=-nNNdWqGB8gJ2O-peFQ2Irshv5tW5pHKyTcYkwvH7CE,1201
+grasp_agents-0.5.8.dist-info/RECORD,,