grasp_agents 0.5.2__py3-none-any.whl → 0.5.4__py3-none-any.whl

grasp_agents/workflow/sequential_workflow.py

@@ -3,22 +3,19 @@ from itertools import pairwise
 from typing import Any, Generic, cast, final
 
 from ..errors import WorkflowConstructionError
-from ..packet_pool import Packet, PacketPool
+from ..packet_pool import Packet
 from ..processor import Processor
 from ..run_context import CtxT, RunContext
 from ..typing.events import Event, ProcPacketOutputEvent, WorkflowResultEvent
-from ..typing.io import InT, OutT_co, ProcName
+from ..typing.io import InT, OutT, ProcName
 from .workflow_processor import WorkflowProcessor
 
 
-class SequentialWorkflow(
-    WorkflowProcessor[InT, OutT_co, CtxT], Generic[InT, OutT_co, CtxT]
-):
+class SequentialWorkflow(WorkflowProcessor[InT, OutT, CtxT], Generic[InT, OutT, CtxT]):
     def __init__(
         self,
         name: ProcName,
         subprocs: Sequence[Processor[Any, Any, Any, CtxT]],
-        packet_pool: PacketPool[CtxT] | None = None,
         recipients: list[ProcName] | None = None,
         max_retries: int = 0,
     ) -> None:
@@ -27,7 +24,6 @@ class SequentialWorkflow(
             start_proc=subprocs[0],
             end_proc=subprocs[-1],
             name=name,
-            packet_pool=packet_pool,
             recipients=recipients,
             max_retries=max_retries,
         )
@@ -50,7 +46,7 @@ class SequentialWorkflow(
         forgetful: bool = False,
         call_id: str | None = None,
         ctx: RunContext[CtxT] | None = None,
-    ) -> Packet[OutT_co]:
+    ) -> Packet[OutT]:
         call_id = self._generate_call_id(call_id)
 
         packet = in_packet
@@ -66,7 +62,7 @@ class SequentialWorkflow(
             chat_inputs = None
             in_args = None
 
-        return cast("Packet[OutT_co]", packet)
+        return cast("Packet[OutT]", packet)
 
     @final
     async def run_stream(  # type: ignore[override]
@@ -99,5 +95,5 @@ class SequentialWorkflow(
             in_args = None
 
         yield WorkflowResultEvent(
-            data=cast("Packet[OutT_co]", packet), proc_name=self.name, call_id=call_id
+            data=cast("Packet[OutT]", packet), proc_name=self.name, call_id=call_id
         )

grasp_agents/workflow/workflow_processor.py

@@ -2,37 +2,29 @@ from abc import ABC, abstractmethod
 from collections.abc import AsyncIterator, Sequence
 from typing import Any, Generic
 
-from ..comm_processor import CommProcessor
 from ..errors import WorkflowConstructionError
 from ..packet import Packet
-from ..packet_pool import PacketPool
 from ..processor import Processor
 from ..run_context import CtxT, RunContext
 from ..typing.events import Event
-from ..typing.io import InT, OutT_co, ProcName
+from ..typing.io import InT, OutT, ProcName
 
 
 class WorkflowProcessor(
-    CommProcessor[InT, OutT_co, Any, CtxT],
+    Processor[InT, OutT, Any, CtxT],
     ABC,
-    Generic[InT, OutT_co, CtxT],
+    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_co, Any, CtxT],
-        packet_pool: PacketPool[CtxT] | None = None,
+        end_proc: Processor[Any, OutT, Any, CtxT],
         recipients: list[ProcName] | None = None,
         max_retries: int = 0,
     ) -> None:
-        super().__init__(
-            name=name,
-            packet_pool=packet_pool,
-            recipients=recipients,
-            max_retries=max_retries,
-        )
+        super().__init__(name=name, recipients=recipients, max_retries=max_retries)
 
         self._in_type = start_proc.in_type
         self._out_type = end_proc.out_type
@@ -61,7 +53,7 @@ class WorkflowProcessor(
         return self._start_proc
 
     @property
-    def end_proc(self) -> Processor[Any, OutT_co, Any, CtxT]:
+    def end_proc(self) -> Processor[Any, OutT, Any, CtxT]:
         return self._end_proc
 
     def _generate_subproc_call_id(
@@ -79,7 +71,7 @@ class WorkflowProcessor(
         ctx: RunContext[CtxT] | None = None,
         forgetful: bool = False,
         call_id: str | None = None,
-    ) -> Packet[OutT_co]:
+    ) -> Packet[OutT]:
         pass
 
     @abstractmethod

{grasp_agents-0.5.2.dist-info → grasp_agents-0.5.4.dist-info}/METADATA

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

{grasp_agents-0.5.2.dist-info → grasp_agents-0.5.4.dist-info}/RECORD

@@ -1,23 +1,22 @@
-grasp_agents/__init__.py,sha256=CIsyUasb9HBC3M4olg6ATAwKXtVNmmtpyGJrt7hpZW4,947
+grasp_agents/__init__.py,sha256=NfnMiLttHb5iudzeDoLAK-wHCK0QBo0guPcupM99ISU,896
 grasp_agents/cloud_llm.py,sha256=C6xrKYhiQb4tNXK_rFo2pNlVTXPS_gYd5uevAnpLFeE,13119
-grasp_agents/comm_processor.py,sha256=Tg6At2Ybow2WnJNvykOXKol4z5k3l8ED-GSesnA6aG0,6816
 grasp_agents/costs_dict.yaml,sha256=2MFNWtkv5W5WSCcv1Cj13B1iQLVv5Ot9pS_KW2Gu2DA,2510
-grasp_agents/errors.py,sha256=s4JRvccRroxmiM5d27f2KvUxw5yK8mkEZO4OCo98BKc,2531
+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=coXcYSd1G8UiYPqNpF1z5ESQcH2zhSHYO8QhQfRtqiE,14401
+grasp_agents/llm_agent.py,sha256=oUMNe5yXt0JKHmVNGSpR1nyb5KyYDkrz9Nyn8sBxx1g,13682
 grasp_agents/llm_agent_memory.py,sha256=GZ2Z66_JC_sR10vATvR53ui62xxY4lDDtL0XvL_AQNk,1846
-grasp_agents/llm_policy_executor.py,sha256=aWxXS2-7Twzaz8U07wslzR8zR9byl2bDha1ACKxUEvI,16734
+grasp_agents/llm_policy_executor.py,sha256=jYJENUooaEz5u-ZkgCijcGIJhA2CFkXQH2TUz5KwgB4,16822
 grasp_agents/memory.py,sha256=keHuNEZNSxHT9FKpMohHOCNi7UAz_oRIc91IQEuzaWE,1162
-grasp_agents/packet.py,sha256=neJ139jgLKgZjLyXAwSe0lH08BftveYOsLFyri9MZ0w,785
-grasp_agents/packet_pool.py,sha256=doG7UpTO7cqJi4YT0UP_vfOnOebqiwzBUHfoxy1TkPY,3282
-grasp_agents/printer.py,sha256=by7-wW0y1rCEqhGLuK8Jq-wsJfbZZO-0u8hS41-XJJU,10823
-grasp_agents/processor.py,sha256=jel12KXWR8oA241NKt-sy0eWGbsfuBPwwdmj6Ecqg5s,15826
-grasp_agents/prompt_builder.py,sha256=3Ua-f-lRdoE2LomFWDiZILpKpfuQxAM-aHcY69hvv1U,7978
-grasp_agents/run_context.py,sha256=dUxwx1yM3gSk2KqMIAeDVVftysdk7v_1Ht0EcLk9jJI,1242
-grasp_agents/runner.py,sha256=yH1yUIhwpcAivLFFaq5pXJ9OQdFa4WjOs_uqJ4XTNQw,1456
+grasp_agents/packet.py,sha256=EmE-W4ZSMVZoqClECGFe7OGqrT4FSJ8IVGICrdjtdEY,1462
+grasp_agents/packet_pool.py,sha256=A5hqEvh7XwaPJVkfbItMm5FQqxujVzXDId7HnSUqluI,4919
+grasp_agents/printer.py,sha256=RvUXPtbD6pdhGxoKZiddKlfMRH6WaSAIdoJSEkmpId8,11041
+grasp_agents/processor.py,sha256=tJTD2T1cmuQ-m_7bsVFsF7k4oZafh_f0p2uqdng2-sA,17053
+grasp_agents/prompt_builder.py,sha256=IFvwvl_YqwL_LGfmauf4Gr1DUGZWkHsKk0ZABFnR6HI,7124
+grasp_agents/run_context.py,sha256=f8PasaPDCBiR59AFTHRIp1wxIPAQSzJGvv_kglWOGlk,1098
+grasp_agents/runner.py,sha256=nZXK5OuM7QbLyzNA-rfXD0YDtdftTK5v2cCpeujhe2k,4479
 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
@@ -43,15 +42,15 @@ grasp_agents/typing/completion.py,sha256=PHJ01m7WI2KYQL8w7W2ti6hMsKEZnzYGaxbNcBC
 grasp_agents/typing/completion_chunk.py,sha256=t6PvkDWQxRN5xA4efBdeou46RifMFodBmZc45Sx7qxQ,7610
 grasp_agents/typing/content.py,sha256=XFmLpNWkGhkw5JujO6UsYwhzTHkU67PfhzaXH2waLcQ,3659
 grasp_agents/typing/converters.py,sha256=kHlocHQS8QnduZOzNPbj3aRD8JpvJd53oudYqWdOxKE,2978
-grasp_agents/typing/events.py,sha256=XMwhEaVLq8vUBnusti5V02EOtx2TrlL1yUGbHVtiBdI,5130
-grasp_agents/typing/io.py,sha256=RtBnxOiEJkfCPz7bEu1T1JXU7o71MhHK3RkeedzWwX0,237
+grasp_agents/typing/events.py,sha256=1n6EVS8vU0RLlQHMHUjiV5i4PYLovT7RcOmpcx0ztlc,5256
+grasp_agents/typing/io.py,sha256=WmFfAVnqd4uNQygNAmlo0BX3q8focS6KLvCChmM0ep8,215
 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=eA2V4ftAjXth1OqQS_jTNS3D5_hzLGGyWfn4Ju47FQ0,6338
-grasp_agents/workflow/sequential_workflow.py,sha256=wKlF6PvzLXkKDGlfvd8h-WI3AGNo6qyS2gkROzdPvWM,3421
-grasp_agents/workflow/workflow_processor.py,sha256=I0sTMfWGeTcx0y0oYssz8B85_PFhbatHXrSJ31woI6Q,3015
-grasp_agents-0.5.2.dist-info/METADATA,sha256=bBp_1qNM0Wv6zMwFN_lyjludKHn6MT7OOKaBnOWCZ3Q,6865
-grasp_agents-0.5.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-grasp_agents-0.5.2.dist-info/licenses/LICENSE.md,sha256=-nNNdWqGB8gJ2O-peFQ2Irshv5tW5pHKyTcYkwvH7CE,1201
-grasp_agents-0.5.2.dist-info/RECORD,,
+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=56XC6KDRQuRftwhWnALmPUlQWCGfuTPRgIznyV2-tOg,2776
+grasp_agents-0.5.4.dist-info/METADATA,sha256=ePDw81wa-FDQu1jj46FN4tO4yUkgCt7lvn_0mDcwaDA,6865
+grasp_agents-0.5.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+grasp_agents-0.5.4.dist-info/licenses/LICENSE.md,sha256=-nNNdWqGB8gJ2O-peFQ2Irshv5tW5pHKyTcYkwvH7CE,1201
+grasp_agents-0.5.4.dist-info/RECORD,,

grasp_agents/comm_processor.py

@@ -1,214 +0,0 @@
-import logging
-from collections.abc import AsyncIterator, Sequence
-from typing import Any, ClassVar, Generic, Protocol, TypeVar, cast
-
-from .errors import PacketRoutingError
-from .memory import MemT
-from .packet import Packet
-from .packet_pool import PacketPool
-from .processor import Processor
-from .run_context import CtxT, RunContext
-from .typing.events import Event, ProcPacketOutputEvent, RunResultEvent
-from .typing.io import InT, OutT_co, ProcName
-
-logger = logging.getLogger(__name__)
-
-
-_OutT_contra = TypeVar("_OutT_contra", contravariant=True)
-
-
-class ExitCommunicationHandler(Protocol[_OutT_contra, CtxT]):
-    def __call__(
-        self,
-        out_packet: Packet[_OutT_contra],
-        ctx: RunContext[CtxT],
-    ) -> bool: ...
-
-
-class SetRecipientsHandler(Protocol[_OutT_contra, CtxT]):
-    def __call__(
-        self, out_packet: Packet[_OutT_contra], ctx: RunContext[CtxT]
-    ) -> None: ...
-
-
-class CommProcessor(
-    Processor[InT, OutT_co, MemT, CtxT],
-    Generic[InT, OutT_co, MemT, CtxT],
-):
-    _generic_arg_to_instance_attr_map: ClassVar[dict[int, str]] = {
-        0: "_in_type",
-        1: "_out_type",
-    }
-
-    def __init__(
-        self,
-        name: ProcName,
-        *,
-        recipients: Sequence[ProcName] | None = None,
-        packet_pool: PacketPool[CtxT] | None = None,
-        max_retries: int = 0,
-    ) -> None:
-        super().__init__(name=name, max_retries=max_retries)
-
-        self.recipients = recipients or []
-        self._packet_pool = packet_pool
-        self._is_listening = False
-
-        self._exit_communication_impl: (
-            ExitCommunicationHandler[OutT_co, CtxT] | None
-        ) = None
-        self._set_recipients_impl: SetRecipientsHandler[OutT_co, CtxT] | None = None
-
-    @property
-    def packet_pool(self) -> PacketPool[CtxT] | None:
-        return self._packet_pool
-
-    @property
-    def is_listening(self) -> bool:
-        return self._is_listening
-
-    def _set_recipients(
-        self, out_packet: Packet[OutT_co], ctx: RunContext[CtxT]
-    ) -> None:
-        if self._set_recipients_impl:
-            self._set_recipients_impl(out_packet=out_packet, ctx=ctx)
-            return
-
-        out_packet.recipients = self.recipients
-
-    def _validate_routing(self, recipients: Sequence[ProcName]) -> Sequence[ProcName]:
-        for r in recipients:
-            if r not in self.recipients:
-                raise PacketRoutingError(
-                    selected_recipient=r,
-                    allowed_recipients=cast("list[str]", self.recipients),
-                )
-
-        return self.recipients
-
-    async def run(
-        self,
-        chat_inputs: Any | None = None,
-        *,
-        in_packet: Packet[InT] | None = None,
-        in_args: InT | Sequence[InT] | None = None,
-        forgetful: bool = False,
-        call_id: str | None = None,
-        ctx: RunContext[CtxT] | None = None,
-    ) -> Packet[OutT_co]:
-        call_id = self._generate_call_id(call_id)
-
-        out_packet = await super().run(
-            chat_inputs=chat_inputs,
-            in_packet=in_packet,
-            in_args=in_args,
-            forgetful=forgetful,
-            call_id=call_id,
-            ctx=ctx,
-        )
-
-        if self._packet_pool is not None:
-            if ctx is None:
-                raise ValueError("RunContext must be provided when using PacketPool")
-            if self._exit_communication(out_packet=out_packet, ctx=ctx):
-                ctx.result = out_packet
-                await self._packet_pool.stop_all()
-                return out_packet
-
-            self._set_recipients(out_packet=out_packet, ctx=ctx)
-            out_packet.recipients = self._validate_routing(out_packet.recipients)
-
-            await self._packet_pool.post(out_packet)
-
-        return out_packet
-
-    async def run_stream(
-        self,
-        chat_inputs: Any | None = None,
-        *,
-        in_packet: Packet[InT] | None = None,
-        in_args: InT | Sequence[InT] | None = None,
-        forgetful: bool = False,
-        call_id: str | None = None,
-        ctx: RunContext[CtxT] | None = None,
-    ) -> AsyncIterator[Event[Any]]:
-        call_id = self._generate_call_id(call_id)
-
-        out_packet: Packet[OutT_co] | None = None
-        async for event in super().run_stream(
-            chat_inputs=chat_inputs,
-            in_packet=in_packet,
-            in_args=in_args,
-            forgetful=forgetful,
-            call_id=call_id,
-            ctx=ctx,
-        ):
-            if isinstance(event, ProcPacketOutputEvent):
-                out_packet = event.data
-            else:
-                yield event
-
-        if out_packet is None:
-            return
-
-        if self._packet_pool is not None:
-            if ctx is None:
-                raise ValueError("RunContext must be provided when using PacketPool")
-            if self._exit_communication(out_packet=out_packet, ctx=ctx):
-                ctx.result = out_packet
-                yield RunResultEvent(
-                    data=out_packet, proc_name=self.name, call_id=call_id
-                )
-                await self._packet_pool.stop_all()
-                return
-
-            self._set_recipients(out_packet=out_packet, ctx=ctx)
-            out_packet.recipients = self._validate_routing(out_packet.recipients)
-
-            await self._packet_pool.post(out_packet)
-
-        yield ProcPacketOutputEvent(
-            data=out_packet, proc_name=self.name, call_id=call_id
-        )
-
-    def start_listening(self, ctx: RunContext[CtxT], **run_kwargs: Any) -> None:
-        if self._packet_pool is None:
-            raise RuntimeError("Packet pool must be initialized before listening")
-
-        if self._is_listening:
-            return
-        self._is_listening = True
-
-        self._packet_pool.register_packet_handler(
-            processor_name=self.name,
-            handler=self.run_stream if ctx.is_streaming else self.run,  # type: ignore[call-arg]
-            ctx=ctx,
-            **run_kwargs,
-        )
-
-    def _exit_communication(
-        self, out_packet: Packet[OutT_co], ctx: RunContext[CtxT]
-    ) -> bool:
-        if self._exit_communication_impl:
-            return self._exit_communication_impl(out_packet=out_packet, ctx=ctx)
-
-        return False
-
-    def exit_communication(
-        self, func: ExitCommunicationHandler[OutT_co, CtxT]
-    ) -> ExitCommunicationHandler[OutT_co, CtxT]:
-        self._exit_communication_impl = func
-
-        return func
-
-    def set_recipients(
-        self, func: SetRecipientsHandler[OutT_co, CtxT]
-    ) -> SetRecipientsHandler[OutT_co, CtxT]:
-        self._select_recipients_impl = func
-
-        return func
-
-    # async def stop_listening(self) -> None:
-    #     assert self._packet_pool is not None
-    #     self._is_listening = False
-    #     await self._packet_pool.unregister_packet_handler(self.name)