grasp_agents 0.2.1__py3-none-any.whl → 0.2.2__py3-none-any.whl

grasp_agents/__init__.py

@@ -0,0 +1,38 @@
+# pyright: reportUnusedImport=false
+
+
+from .agent_message import AgentMessage
+from .base_agent import BaseAgent
+from .comm_agent import CommunicatingAgent
+from .llm import LLM, LLMSettings
+from .llm_agent import LLMAgent
+from .run_context import RunArgs, RunContextWrapper
+from .typing.completion import Completion
+from .typing.content import Content, ImageData
+from .typing.io import AgentID, AgentState, LLMFormattedArgs, LLMPrompt, LLMPromptArgs
+from .typing.message import AssistantMessage, Conversation, SystemMessage, UserMessage
+from .typing.tool import BaseTool
+
+__all__ = [
+    "LLM",
+    "AgentID",
+    "AgentMessage",
+    "AgentState",
+    "AssistantMessage",
+    "BaseAgent",
+    "BaseTool",
+    "CommunicatingAgent",
+    "Completion",
+    "Content",
+    "Conversation",
+    "ImageData",
+    "LLMAgent",
+    "LLMFormattedArgs",
+    "LLMPrompt",
+    "LLMPromptArgs",
+    "LLMSettings",
+    "RunArgs",
+    "RunContextWrapper",
+    "SystemMessage",
+    "UserMessage",
+]

grasp_agents/llm_agent.py

@@ -395,9 +395,9 @@ class LLMAgent(
             self._tool_orchestrator.manage_agent_state_impl = self._manage_agent_state
 
         if (
-            cur_cls._tool_call_loop_exit is not base_cls._tool_call_loop_exit  # noqa: SLF001
+            cur_cls._exit_tool_call_loop is not base_cls._exit_tool_call_loop  # noqa: SLF001
         ):
-            self._tool_orchestrator.exit_tool_call_loop_impl = self._tool_call_loop_exit
+            self._tool_orchestrator.exit_tool_call_loop_impl = self._exit_tool_call_loop
 
         self._parse_output_impl: ParseOutputHandler[InT, OutT, CtxT] | None = None
 
@@ -414,9 +414,9 @@ class LLMAgent(
 
     def _format_inp_args(
         self,
+        *,
         usr_args: LLMPromptArgs,
         rcv_args: InT,
-        *,
         batch_idx: int = 0,
         ctx: RunContextWrapper[CtxT] | None = None,
     ) -> LLMFormattedArgs:
@@ -436,7 +436,7 @@ class LLMAgent(
             "LLMAgent._set_agent_state_handler must be overridden by a subclass"
         )
 
-    def _tool_call_loop_exit(
+    def _exit_tool_call_loop(
         self,
         conversation: Conversation,
         *,

grasp_agents/openai/__init__.py

@@ -81,3 +81,7 @@ from openai.types.shared_params.response_format_json_schema import (
 from openai.types.shared_params.response_format_text import (
     ResponseFormatText,
 )
+
+from .openai_llm import OpenAILLM, OpenAILLMSettings
+
+__all__ = ["OpenAILLM", "OpenAILLMSettings"]

grasp_agents/openai/openai_llm.py

@@ -3,10 +3,9 @@ from collections.abc import Iterable
 from copy import deepcopy
 from typing import Any, Literal
 
-from pydantic import BaseModel
-
 from openai import AsyncOpenAI
 from openai._types import NOT_GIVEN  # type: ignore[import]
+from pydantic import BaseModel
 
 from ..cloud_llm import APIProvider, CloudLLM, CloudLLMSettings
 from ..http_client import AsyncHTTPClientParams

grasp_agents/prompt_builder.py

@@ -33,9 +33,9 @@ class FormatSystemArgsHandler(Protocol[CtxT]):
 class FormatInputArgsHandler(Protocol[InT, CtxT]):
     def __call__(
         self,
+        *,
         usr_args: LLMPromptArgs,
         rcv_args: InT,
-        *,
         batch_idx: int,
         ctx: RunContextWrapper[CtxT] | None,
     ) -> LLMFormattedArgs: ...
@@ -77,9 +77,9 @@ class PromptBuilder(AutoInstanceAttributesMixin, Generic[InT, CtxT]):
 
     def _format_inp_args(
         self,
+        *,
         usr_args: LLMPromptArgs,
         rcv_args: InT,
-        *,
         batch_idx: int = 0,
         ctx: RunContextWrapper[CtxT] | None = None,
     ) -> LLMFormattedArgs:

grasp_agents/workflow/looped_agent.py

@@ -13,10 +13,10 @@ logger = getLogger(__name__)
 _EH_OutT = TypeVar("_EH_OutT", contravariant=True)  # noqa: PLC0105
 
 
-class WorkflowLoopExitHandler(Protocol[_EH_OutT, CtxT]):
+class ExitWorkflowLoopHandler(Protocol[_EH_OutT, CtxT]):
     def __call__(
         self,
-        output_message: AgentMessage[_EH_OutT, AgentState],
+        output_message: AgentMessage[_EH_OutT, Any],
         ctx: RunContextWrapper[CtxT] | None,
         **kwargs: Any,
     ) -> bool: ...
@@ -31,8 +31,8 @@ class LoopedWorkflowAgent(WorkflowAgent[InT, OutT, CtxT], Generic[InT, OutT, Ctx
     def __init__(
         self,
         agent_id: AgentID,
-        subagents: Sequence[CommunicatingAgent[Any, Any, AgentState, CtxT]],
-        exit_agent: CommunicatingAgent[Any, OutT, AgentState, CtxT],
+        subagents: Sequence[CommunicatingAgent[Any, Any, Any, CtxT]],
+        exit_agent: CommunicatingAgent[Any, OutT, Any, CtxT],
         message_pool: AgentMessagePool[CtxT] | None = None,
         recipient_ids: list[AgentID] | None = None,
         dynamic_routing: bool = False,
@@ -51,27 +51,27 @@ class LoopedWorkflowAgent(WorkflowAgent[InT, OutT, CtxT], Generic[InT, OutT, Ctx
 
         self._max_iterations = max_iterations
 
-        self._workflow_loop_exit_impl: WorkflowLoopExitHandler[OutT, CtxT] | None = None
+        self._exit_workflow_loop_impl: ExitWorkflowLoopHandler[OutT, CtxT] | None = None
 
     @property
     def max_iterations(self) -> int:
         return self._max_iterations
 
-    def workflow_loop_exit_handler(
-        self, func: WorkflowLoopExitHandler[OutT, CtxT]
-    ) -> WorkflowLoopExitHandler[OutT, CtxT]:
-        self._workflow_loop_exit_impl = func
+    def exit_workflow_loop_handler(
+        self, func: ExitWorkflowLoopHandler[OutT, CtxT]
+    ) -> ExitWorkflowLoopHandler[OutT, CtxT]:
+        self._exit_workflow_loop_impl = func
 
         return func
 
     def _exit_workflow_loop(
         self,
-        output_message: AgentMessage[OutT, AgentState],
+        output_message: AgentMessage[OutT, Any],
         ctx: RunContextWrapper[CtxT] | None,
         **kwargs: Any,
     ) -> bool:
-        if self._workflow_loop_exit_impl:
-            return self._workflow_loop_exit_impl(output_message, ctx=ctx, **kwargs)
+        if self._exit_workflow_loop_impl:
+            return self._exit_workflow_loop_impl(output_message, ctx=ctx, **kwargs)
 
         return False
 
@@ -80,15 +80,15 @@ class LoopedWorkflowAgent(WorkflowAgent[InT, OutT, CtxT], Generic[InT, OutT, Ctx
         self,
         inp_items: Any | None = None,
         *,
+        rcv_message: AgentMessage[InT, Any] | None = None,
         ctx: RunContextWrapper[CtxT] | None = None,
-        rcv_message: AgentMessage[InT, AgentState] | None = None,
         entry_point: bool = False,
         forbid_state_change: bool = False,
         **kwargs: Any,
     ) -> AgentMessage[OutT, AgentState]:
         agent_message = rcv_message
         num_iterations = 0
-        exit_message: AgentMessage[OutT, AgentState] | None = None
+        exit_message: AgentMessage[OutT, Any] | None = None
 
         while True:
             for subagent in self.subagents:

grasp_agents/workflow/sequential_agent.py

@@ -4,7 +4,7 @@ from typing import Any, ClassVar, Generic, cast, final
 from ..agent_message_pool import AgentMessage, AgentMessagePool
 from ..comm_agent import CommunicatingAgent
 from ..run_context import CtxT, RunContextWrapper
-from ..typing.io import AgentID, AgentState, InT, OutT
+from ..typing.io import AgentID, InT, OutT
 from .workflow_agent import WorkflowAgent
 
 
@@ -17,7 +17,7 @@ class SequentialWorkflowAgent(WorkflowAgent[InT, OutT, CtxT], Generic[InT, OutT,
     def __init__(
         self,
         agent_id: AgentID,
-        subagents: Sequence[CommunicatingAgent[Any, Any, AgentState, CtxT]],
+        subagents: Sequence[CommunicatingAgent[Any, Any, Any, CtxT]],
         message_pool: AgentMessagePool[CtxT] | None = None,
         recipient_ids: list[AgentID] | None = None,
         dynamic_routing: bool = False,
@@ -38,12 +38,12 @@ class SequentialWorkflowAgent(WorkflowAgent[InT, OutT, CtxT], Generic[InT, OutT,
         self,
         inp_items: Any | None = None,
         *,
+        rcv_message: AgentMessage[InT, Any] | None = None,
         ctx: RunContextWrapper[CtxT] | None = None,
-        rcv_message: AgentMessage[InT, AgentState] | None = None,
         entry_point: bool = False,
         forbid_state_change: bool = False,
         **kwargs: Any,
-    ) -> AgentMessage[OutT, AgentState]:
+    ) -> AgentMessage[OutT, Any]:
         agent_message = rcv_message
         for subagent in self.subagents:
             agent_message = await subagent.run(
@@ -57,4 +57,4 @@ class SequentialWorkflowAgent(WorkflowAgent[InT, OutT, CtxT], Generic[InT, OutT,
             inp_items = None
             entry_point = False
 
-        return cast("AgentMessage[OutT, AgentState]", agent_message)
+        return cast("AgentMessage[OutT, Any]", agent_message)

grasp_agents/workflow/workflow_agent.py

@@ -5,13 +5,11 @@ from typing import Any, ClassVar, Generic
 from ..agent_message_pool import AgentMessage, AgentMessagePool
 from ..comm_agent import CommunicatingAgent
 from ..run_context import CtxT, RunContextWrapper
-from ..typing.io import AgentID, AgentState, InT, OutT
+from ..typing.io import AgentID, InT, OutT
 
 
 class WorkflowAgent(
-    CommunicatingAgent[InT, OutT, AgentState, CtxT],
-    ABC,
-    Generic[InT, OutT, CtxT],
+    CommunicatingAgent[InT, OutT, Any, CtxT], ABC, Generic[InT, OutT, CtxT]
 ):
     _generic_arg_to_instance_attr_map: ClassVar[dict[int, str]] = {
         0: "_in_type",
@@ -21,9 +19,9 @@ class WorkflowAgent(
     def __init__(
         self,
         agent_id: AgentID,
-        subagents: Sequence[CommunicatingAgent[Any, Any, AgentState, CtxT]],
-        start_agent: CommunicatingAgent[InT, Any, AgentState, CtxT],
-        end_agent: CommunicatingAgent[Any, OutT, AgentState, CtxT],
+        subagents: Sequence[CommunicatingAgent[Any, Any, Any, CtxT]],
+        start_agent: CommunicatingAgent[InT, Any, Any, CtxT],
+        end_agent: CommunicatingAgent[Any, OutT, Any, CtxT],
         message_pool: AgentMessagePool[CtxT] | None = None,
         recipient_ids: list[AgentID] | None = None,
         dynamic_routing: bool = False,
@@ -53,11 +51,11 @@ class WorkflowAgent(
             )
 
     @property
-    def start_agent(self) -> CommunicatingAgent[InT, Any, AgentState, CtxT]:
+    def start_agent(self) -> CommunicatingAgent[InT, Any, Any, CtxT]:
         return self._start_agent
 
     @property
-    def end_agent(self) -> CommunicatingAgent[Any, OutT, AgentState, CtxT]:
+    def end_agent(self) -> CommunicatingAgent[Any, OutT, Any, CtxT]:
         return self._end_agent
 
     @abstractmethod
@@ -65,10 +63,10 @@ class WorkflowAgent(
         self,
         inp_items: Any | None = None,
         *,
+        rcv_message: AgentMessage[InT, Any] | None = None,
         ctx: RunContextWrapper[CtxT] | None = None,
-        rcv_message: AgentMessage[InT, AgentState] | None = None,
         entry_point: bool = False,
         forbid_state_change: bool = False,
         **generation_kwargs: Any,
-    ) -> AgentMessage[OutT, AgentState]:
+    ) -> AgentMessage[OutT, Any]:
         pass

{grasp_agents-0.2.1.dist-info → grasp_agents-0.2.2.dist-info}/METADATA

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

{grasp_agents-0.2.1.dist-info → grasp_agents-0.2.2.dist-info}/RECORD

@@ -1,3 +1,4 @@
+grasp_agents/__init__.py,sha256=WPNUUFbucwli6oWIwxbckz0zpY4W2LnND0o7melYZOw,979
 grasp_agents/agent_message.py,sha256=eJV5n44t8EIE6M3jl48Ld7pmaW9dDhBX_FWm_u9yGWE,877
 grasp_agents/agent_message_pool.py,sha256=OKTXNEo9LAJTQJkzxmJ3TQgWw7WJKOzrKCJjeHpln6o,3158
 grasp_agents/base_agent.py,sha256=BOLYxS_cSisOR4qupUYIVn2FW15svit3jbNNfjw_cT8,1347
@@ -8,21 +9,21 @@ grasp_agents/generics_utils.py,sha256=kw4Odte6Nvl4c9U7-mKPgXCavWZXo009zYDHAA0BR3
 grasp_agents/grasp_logging.py,sha256=H1GYhXdQvVkmauFDZ-KDwvVmPQHZUUm9sRqX_ObK2xI,1111
 grasp_agents/http_client.py,sha256=KZva2MjJjuI5ohUeU8RdTAImUnQYaqBrV2jDH8smbJw,738
 grasp_agents/llm.py,sha256=n67lXbB8spr_i3Xz0Plw7oeykfjQmVHHkSiveqBB5Lw,3150
-grasp_agents/llm_agent.py,sha256=C57T2UlsGSebkLIdk96si06b1h5IVIGj1ZIUxV2tX2I,14989
+grasp_agents/llm_agent.py,sha256=Lx6L9ahe9WYnzKpCc-XaIyNw73U2YHtTb6OhFGUv9mU,14989
 grasp_agents/llm_agent_state.py,sha256=lLdYni2f3TA5zJLf_jqR5DSWqVI_zP2YfNrwEGqZnvg,2402
 grasp_agents/memory.py,sha256=X1YtVX8XxP5KnGPMW8BqjID8QK4hTG2obxoyhnnZ4pU,5575
 grasp_agents/printer.py,sha256=Jk6OJExio53gbKBod5Dd8Y3CWYrVb4K5q4UJ8i9cQvo,5024
-grasp_agents/prompt_builder.py,sha256=JQ269tvRokWBdibJIkv1ZBkEYNR-AWppZpj2Fx7c9VY,8208
+grasp_agents/prompt_builder.py,sha256=wb7V8JXjD3IeD3l24HItUkvGmVE4e0PUzu8IT_9rgko,8208
 grasp_agents/run_context.py,sha256=M4w_HXl5aiz-18CDlfNCRNZm3m5UIQMrjKkhurFTtkY,2229
 grasp_agents/tool_orchestrator.py,sha256=--E-ue7Z8nK6NwqGbWeCQWfTjWIbPxEe5X54bjPe62M,6107
 grasp_agents/usage_tracker.py,sha256=5YuN6hpg6HASdg-hOylgWzhCiORmDMnZuQtbISfhm_4,3378
 grasp_agents/utils.py,sha256=gKUtJ6__HB7yHBUPWY5tkdSAfgj3_R3--s2J5B5fBPE,5739
-grasp_agents/openai/__init__.py,sha256=qN8HMAatSJKOsA6v-JwakMYguwkswCVHqrmK1gFy9wI,3096
+grasp_agents/openai/__init__.py,sha256=P7oa4tdJ2JKJv16frRi1C09FnrMayuOYomu5l95uayE,3196
 grasp_agents/openai/completion_converters.py,sha256=lX9h1kaGAo5ttsl-4V7l4x8IpjxJaJJtyU2cKu3-EOc,1871
 grasp_agents/openai/content_converters.py,sha256=6GI0D7xJalzsiawAJOyCUzTJTo0NQdpv87YKmfN0LYQ,2631
 grasp_agents/openai/converters.py,sha256=DBXBxow9oRG6pc8inpZBLiuUqHzVfpscmHFpN9bAdvc,5276
 grasp_agents/openai/message_converters.py,sha256=KjF6FbXzwlWdM-1YT3cswUV-74sjiwOhLFPMY4sJ5Xk,4593
-grasp_agents/openai/openai_llm.py,sha256=dscGlVhH4v1yAw4NRPgJdww9toOoMRpIqA6HD4IGWOs,6132
+grasp_agents/openai/openai_llm.py,sha256=93dSQXed9yqMIVLKJoHp5rauin7xAc-8Aokf1vFJSho,6131
 grasp_agents/openai/tool_converters.py,sha256=KhWRETkjhjocISUo_HBZ8QfBiyTOoC5WurPNAR4BYxc,1027
 grasp_agents/rate_limiting/__init__.py,sha256=KRgtF_E7R3YfA2cpYcFcZ7wycV0pWVJ0xRQC7YhiIEQ,158
 grasp_agents/rate_limiting/rate_limiter_chunked.py,sha256=BPgkUXvhmZhTpZs2T6uujNFuxH_kYHiISuf6_-eNhUc,5544
@@ -36,10 +37,10 @@ grasp_agents/typing/io.py,sha256=uxSvbD05UK5nIhPfDvXIoGuU6xRMW4USZq_4IgBeGCY,609
 grasp_agents/typing/message.py,sha256=XgPjXeh47e2GG1AYslhxaNw1Ax6Ozatga_7X2SFFKMA,3826
 grasp_agents/typing/tool.py,sha256=e0pTMnRcpMpGNVQ8muE9wnh7LdIgh92AqXDo9hMDxf0,1960
 grasp_agents/workflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-grasp_agents/workflow/looped_agent.py,sha256=8NVy6dAwEs7f6JgYHZUI1h-N8SabpND4n-3rSy5mh70,3945
-grasp_agents/workflow/sequential_agent.py,sha256=Ral6Bvsl5-NdO-uKMGiWuz5EE9rNcYb1lXhY8CcQw4w,2054
-grasp_agents/workflow/workflow_agent.py,sha256=LadvEJTsV6YEGRb_eaYgu5r7k1aa8N-2FHXMYJpbBVU,2460
-grasp_agents-0.2.1.dist-info/METADATA,sha256=UY4lcgpBi7u0wqNU1Ep5Wp_13azdTzcFXsncASIdYXA,6889
-grasp_agents-0.2.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-grasp_agents-0.2.1.dist-info/licenses/LICENSE.md,sha256=-nNNdWqGB8gJ2O-peFQ2Irshv5tW5pHKyTcYkwvH7CE,1201
-grasp_agents-0.2.1.dist-info/RECORD,,
+grasp_agents/workflow/looped_agent.py,sha256=VU1Gst_qacU6TrJ0PcwHYOUgRkdR3NdiXm7KoD3U0vw,3903
+grasp_agents/workflow/sequential_agent.py,sha256=4aFLZDJk4A1_0I0mvISIqyO8Nlz5Q5rT7Ig5Zy80cHg,2014
+grasp_agents/workflow/workflow_agent.py,sha256=FzTil10WXzOIHzum-yo2mEETfjoY9RMXUycZhlLNqkw,2383
+grasp_agents-0.2.2.dist-info/METADATA,sha256=ejV2_4MaH9s2zh6HgVcHpae9HP9FzZo8eXZ8xRrEdPY,6889
+grasp_agents-0.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+grasp_agents-0.2.2.dist-info/licenses/LICENSE.md,sha256=-nNNdWqGB8gJ2O-peFQ2Irshv5tW5pHKyTcYkwvH7CE,1201
+grasp_agents-0.2.2.dist-info/RECORD,,