grasp_agents 0.3.2__py3-none-any.whl → 0.3.3__py3-none-any.whl

grasp_agents/llm_agent.py

@@ -192,7 +192,7 @@ class LLMAgent(
 
         # 1. Make system prompt (can be None)
 
-        formatted_sys_prompt = self._prompt_builder.make_sys_prompt(
+        formatted_sys_prompt = self._prompt_builder.make_system_prompt(
             sys_args=sys_args, ctx=ctx
         )
 
@@ -313,17 +313,17 @@ class LLMAgent(
 
     # -- Decorators for custom implementations --
 
-    def make_sys_prompt(
+    def make_system_prompt(
         self, func: MakeSystemPromptHandler[CtxT]
     ) -> MakeSystemPromptHandler[CtxT]:
-        self._prompt_builder.make_sys_prompt_impl = func
+        self._prompt_builder.make_system_prompt_impl = func
 
         return func
 
-    def make_in_content(
+    def make_input_content(
         self, func: MakeInputContentHandler[InT_contra, CtxT]
     ) -> MakeInputContentHandler[InT_contra, CtxT]:
-        self._prompt_builder.make_in_content_impl = func
+        self._prompt_builder.make_input_content_impl = func
 
         return func
 
@@ -359,30 +359,28 @@ class LLMAgent(
         cur_cls = type(self)
         base_cls = LLMAgent[Any, Any, Any]
 
-        if cur_cls._make_sys_prompt_fn is not base_cls._make_sys_prompt_fn:  # noqa: SLF001
-            self._prompt_builder.make_sys_prompt_impl = self._make_sys_prompt_fn
+        if cur_cls._make_system_prompt is not base_cls._make_system_prompt:  # noqa: SLF001
+            self._prompt_builder.make_system_prompt_impl = self._make_system_prompt
 
-        if cur_cls._make_in_content_fn is not base_cls._make_in_content_fn:  # noqa: SLF001
-            self._prompt_builder.make_in_content_impl = self._make_in_content_fn
+        if cur_cls._make_input_content is not base_cls._make_input_content:  # noqa: SLF001
+            self._prompt_builder.make_input_content_impl = self._make_input_content
 
-        if cur_cls._set_memory_fn is not base_cls._set_memory_fn:  # noqa: SLF001
-            self._set_memory_impl = self._set_memory_fn
+        if cur_cls._set_memory is not base_cls._set_memory:  # noqa: SLF001
+            self._set_memory_impl = self._set_memory
 
-        if cur_cls._manage_memory_fn is not base_cls._manage_memory_fn:  # noqa: SLF001
-            self._policy_executor.manage_memory_impl = self._manage_memory_fn
+        if cur_cls._manage_memory is not base_cls._manage_memory:  # noqa: SLF001
+            self._policy_executor.manage_memory_impl = self._manage_memory
 
         if (
-            cur_cls._exit_tool_call_loop_fn is not base_cls._exit_tool_call_loop_fn  # noqa: SLF001
+            cur_cls._exit_tool_call_loop is not base_cls._exit_tool_call_loop  # noqa: SLF001
         ):
-            self._policy_executor.exit_tool_call_loop_impl = (
-                self._exit_tool_call_loop_fn
-            )
+            self._policy_executor.exit_tool_call_loop_impl = self._exit_tool_call_loop
 
         self._parse_output_impl: (
             ParseOutputHandler[InT_contra, OutT_co, CtxT] | None
         ) = None
 
-    def _make_sys_prompt_fn(
+    def _make_system_prompt(
         self, sys_args: LLMPromptArgs | None, *, ctx: RunContext[CtxT] | None = None
     ) -> str:
         raise NotImplementedError(
@@ -390,7 +388,7 @@ class LLMAgent(
             "if it's intended to be used as the system arguments formatter."
         )
 
-    def _make_in_content_fn(
+    def _make_input_content(
         self,
         *,
         in_args: InT_contra | None = None,
@@ -402,10 +400,10 @@ class LLMAgent(
             "LLMAgent._format_in_args must be overridden by a subclass"
         )
 
-    def _set_memory_fn(
+    def _set_memory(
         self,
         prev_memory: LLMAgentMemory,
-        in_args: InT_contra | Sequence[InT_contra] | None = None,
+        in_args: Sequence[InT_contra] | None = None,
         sys_prompt: LLMPrompt | None = None,
         ctx: RunContext[Any] | None = None,
     ) -> LLMAgentMemory:
@@ -413,7 +411,7 @@ class LLMAgent(
             "LLMAgent._set_memory must be overridden by a subclass"
         )
 
-    def _exit_tool_call_loop_fn(
+    def _exit_tool_call_loop(
         self,
         conversation: Messages,
         *,
@@ -424,7 +422,7 @@ class LLMAgent(
             "LLMAgent._exit_tool_call_loop must be overridden by a subclass"
         )
 
-    def _manage_memory_fn(
+    def _manage_memory(
         self,
         memory: LLMAgentMemory,
         *,

grasp_agents/llm_policy_executor.py

@@ -28,6 +28,9 @@ from .typing.tool import BaseTool, NamedToolChoice, ToolCall, ToolChoice
 logger = getLogger(__name__)
 
 
+FINAL_ANSWER_TOOL_NAME = "final_answer"
+
+
 _FinalAnswerT = TypeVar("_FinalAnswerT")
 
 
@@ -102,7 +105,7 @@ class LLMPolicyExecutor(AutoInstanceAttributesMixin, Generic[_FinalAnswerT, CtxT
     def max_turns(self) -> int:
         return self._max_turns
 
-    def _exit_tool_call_loop_fn(
+    def _exit_tool_call_loop(
         self,
         conversation: Messages,
         *,
@@ -119,7 +122,7 @@ class LLMPolicyExecutor(AutoInstanceAttributesMixin, Generic[_FinalAnswerT, CtxT
 
         return not bool(conversation[-1].tool_calls)
 
-    def _manage_memory_fn(
+    def _manage_memory(
         self,
         memory: LLMAgentMemory,
         *,
@@ -318,7 +321,7 @@ class LLMPolicyExecutor(AutoInstanceAttributesMixin, Generic[_FinalAnswerT, CtxT
 
             # When final_answer_tool_name is None, we use exit_tool_call_loop_impl
             # to determine whether to exit the loop.
-            if self._final_answer_tool_name is None and self._exit_tool_call_loop_fn(
+            if self._final_answer_tool_name is None and self._exit_tool_call_loop(
                 conversation, ctx=ctx, num_turns=turns
             ):
                 return gen_message
@@ -353,7 +356,7 @@ class LLMPolicyExecutor(AutoInstanceAttributesMixin, Generic[_FinalAnswerT, CtxT
                 await self.call_tools(gen_message.tool_calls, memory=memory, ctx=ctx)
 
             # Apply the memory management function if provided.
-            self._manage_memory_fn(memory, ctx=ctx, num_turns=turns)
+            self._manage_memory(memory, ctx=ctx, num_turns=turns)
 
             # 4. Generate the next message based on the updated memory.
             #    In ReAct mode, we set tool_choice to "none" if we just called tools,
@@ -394,7 +397,7 @@ class LLMPolicyExecutor(AutoInstanceAttributesMixin, Generic[_FinalAnswerT, CtxT
         while True:
             conversation = memory.message_history.conversations[0]
 
-            if self._final_answer_tool_name is None and self._exit_tool_call_loop_fn(
+            if self._final_answer_tool_name is None and self._exit_tool_call_loop(
                 conversation, ctx=ctx, num_turns=turns
             ):
                 return
@@ -429,7 +432,7 @@ class LLMPolicyExecutor(AutoInstanceAttributesMixin, Generic[_FinalAnswerT, CtxT
                 ):
                     yield tool_message_event
 
-            self._manage_memory_fn(memory, ctx=ctx, num_turns=turns)
+            self._manage_memory(memory, ctx=ctx, num_turns=turns)
 
             tool_choice = (
                 "none" if (self._react_mode and gen_message.tool_calls) else "required"
@@ -458,11 +461,10 @@ class LLMPolicyExecutor(AutoInstanceAttributesMixin, Generic[_FinalAnswerT, CtxT
             )
 
         class FinalAnswerTool(BaseTool[self._final_answer_type, None, Any]):
-            name: str = "final_answer"
+            name: str = FINAL_ANSWER_TOOL_NAME
             description: str = (
-                "You must use this tool to provide the final answer. "
-                "Do not provide the final answer anywhere else. "
-                "Input arguments correspond to the final answer."
+                "You must call this tool to provide the final answer. "
+                "DO NOT output your answer before calling the tool. "
             )
 
             async def run(

grasp_agents/prompt_builder.py

@@ -53,14 +53,14 @@ class PromptBuilder(AutoInstanceAttributesMixin, Generic[InT_contra, CtxT]):
         self.in_prompt_template = in_prompt_template
         self.sys_args_schema = sys_args_schema
         self.usr_args_schema = usr_args_schema
-        self.make_sys_prompt_impl: MakeSystemPromptHandler[CtxT] | None = None
-        self.make_in_content_impl: MakeInputContentHandler[InT_contra, CtxT] | None = (
-            None
-        )
+        self.make_system_prompt_impl: MakeSystemPromptHandler[CtxT] | None = None
+        self.make_input_content_impl: (
+            MakeInputContentHandler[InT_contra, CtxT] | None
+        ) = None
 
         self._in_args_type_adapter: TypeAdapter[InT_contra] = TypeAdapter(self._in_type)
 
-    def make_sys_prompt(
+    def make_system_prompt(
         self, sys_args: LLMPromptArgs | None = None, ctx: RunContext[CtxT] | None = None
     ) -> str | None:
         if self.sys_prompt_template is None:
@@ -76,8 +76,8 @@ class PromptBuilder(AutoInstanceAttributesMixin, Generic[InT_contra, CtxT]):
                     "provided."
                 )
 
-        if self.make_sys_prompt_impl:
-            return self.make_sys_prompt_impl(sys_args=val_sys_args, ctx=ctx)
+        if self.make_system_prompt_impl:
+            return self.make_system_prompt_impl(sys_args=val_sys_args, ctx=ctx)
 
         sys_args_dict = (
             val_sys_args.model_dump(exclude_unset=True) if val_sys_args else {}
@@ -85,7 +85,7 @@ class PromptBuilder(AutoInstanceAttributesMixin, Generic[InT_contra, CtxT]):
 
         return self.sys_prompt_template.format(**sys_args_dict)
 
-    def make_in_content(
+    def make_input_content(
         self,
         *,
         in_args: InT_contra | None,
@@ -97,8 +97,8 @@ class PromptBuilder(AutoInstanceAttributesMixin, Generic[InT_contra, CtxT]):
             in_args=in_args, usr_args=usr_args
         )
 
-        if self.make_in_content_impl:
-            return self.make_in_content_impl(
+        if self.make_input_content_impl:
+            return self.make_input_content_impl(
                 in_args=val_in_args, usr_args=val_usr_args, batch_idx=batch_idx, ctx=ctx
             )
 
@@ -126,7 +126,7 @@ class PromptBuilder(AutoInstanceAttributesMixin, Generic[InT_contra, CtxT]):
             return self._usr_messages_from_content_parts(chat_inputs)
 
         in_content_batch = [
-            self.make_in_content(
+            self.make_input_content(
                 in_args=in_args, usr_args=usr_args, batch_idx=i, ctx=ctx
             )
             for i, in_args in enumerate(in_args_batch or [None])

grasp_agents/utils.py

@@ -88,6 +88,9 @@ def validate_obj_from_json_or_py_string(
     else:
         _selected_adapter = adapter
 
+    if _selected_adapter._type is str:  # type: ignore[arg-type]
+        return s
+
     try:
         if from_substring:
             parsed = parse_json_or_py_substring(s, return_none_on_failure=True)

{grasp_agents-0.3.2.dist-info → grasp_agents-0.3.3.dist-info}/METADATA

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

{grasp_agents-0.3.2.dist-info → grasp_agents-0.3.3.dist-info}/RECORD

@@ -6,19 +6,19 @@ grasp_agents/generics_utils.py,sha256=5Pw3I9dlnKC2VGqYKC4ZZUO3Z_vTNT-NPFovNfPkl6
 grasp_agents/grasp_logging.py,sha256=H1GYhXdQvVkmauFDZ-KDwvVmPQHZUUm9sRqX_ObK2xI,1111
 grasp_agents/http_client.py,sha256=KZva2MjJjuI5ohUeU8RdTAImUnQYaqBrV2jDH8smbJw,738
 grasp_agents/llm.py,sha256=5Yn4jkBPSbGVMf1sEuYXX6YrJlYZiH7oqKLY0yQIn-U,5192
-grasp_agents/llm_agent.py,sha256=Ez6_SQ3yq5X0hs7-zjqgYB0RvxoIJsaf4zzS8awrDZI,14851
+grasp_agents/llm_agent.py,sha256=a9TCUpQJwpC5Y0dnTqh5bhRLNsQt8pQOjp9d_7QGRVY,14791
 grasp_agents/llm_agent_memory.py,sha256=kD_UIF8xVgbSgW6xN87TzkdQcbTWLB-C5ZQu1_2HLx8,1770
-grasp_agents/llm_policy_executor.py,sha256=ODyxTgqtbBnTRbCanMKjcQ7ET1fYy28_f2Jh_xXxY0Y,17876
+grasp_agents/llm_policy_executor.py,sha256=PVNuAejt3S-aSGsT7HvgYHyX_cZQSvrt1aUGPdkXtE4,17847
 grasp_agents/memory.py,sha256=gPkVIIF6dI_xXzarIAw9kSEnSJcfW_teUsWA2JAih94,671
 grasp_agents/message_history.py,sha256=-ZNy3C1z0yQeahjqR0oIoWDMySJ7vPS19jdutibW7OE,5408
 grasp_agents/packet.py,sha256=PZ1EpclniAoLk7z4ieZbWzgYH3JSRgnlTe_WfbJYG_4,707
 grasp_agents/packet_pool.py,sha256=9umHbi5FwuUYYhhodSR-Z-fRR6OYiZyYEzq5d4nZFK4,3036
 grasp_agents/printer.py,sha256=eVpSZMVk4ZLkV78Sgfg1euzkaS3XBCb30yJcwLMqI0w,5464
 grasp_agents/processor.py,sha256=Atd_iTQNd3Nudb4mHqt3a5AQ31QUgpbrt1Fhn1sgpSk,6708
-grasp_agents/prompt_builder.py,sha256=eW_TOVarvh5niZcNg6EpiUrR_xv_xKZ0QT04RnzCLxc,8454
+grasp_agents/prompt_builder.py,sha256=CGs7ADlGGmRyDqgFte36cYXKsB3C7SjzqSbkRaWlLN8,8481
 grasp_agents/run_context.py,sha256=0y1JDbz3hJbGiqd3EjUYagkMbEK8YlCzdErp3R2MCr0,1647
 grasp_agents/usage_tracker.py,sha256=SPwv6RpdoHRuMIKE2hCAWAvDbtR3uXuhr2jpHQuKWhI,3438
-grasp_agents/utils.py,sha256=uOUt4LDnErp3WQ2aQesH6mkMzon1-NIsft-o6aVznJE,4522
+grasp_agents/utils.py,sha256=GyJNHkMHnQM3WOUGWD05GpY-iWSd9TtZxfUnFUw9Im0,4605
 grasp_agents/openai/__init__.py,sha256=wpTeew6EjhM6esHCKrEKUpwq0kygMN2QQDxYtmbRG8Y,4201
 grasp_agents/openai/completion_chunk_converters.py,sha256=i-1SvIWhRKtL0K8p5pb3jjACSnyHuJHTCoZovEERpxs,2628
 grasp_agents/openai/completion_converters.py,sha256=vzPEkUOX4l2hobKxZjEk_dyWfzeYesO0DlvWvNVb-Sg,2656
@@ -45,7 +45,7 @@ grasp_agents/workflow/looped_workflow.py,sha256=QqXclXYxsW6C8Rxkf3dRaMHi-DfCvCbj
 grasp_agents/workflow/parallel_processor.py,sha256=Xyzs2UR_mRe2GFgzzadHOhqgMu3rFjd3GUjvmZimt_k,3505
 grasp_agents/workflow/sequential_workflow.py,sha256=Pl7jl9ZVDu-rC5UMfympEaQN8iG3kZurVF5eIPG62XA,2130
 grasp_agents/workflow/workflow_processor.py,sha256=2-iaDIlgNXgj-ClGbiE3fYfSv-N_qRC49Gf_dF6M_40,2640
-grasp_agents-0.3.2.dist-info/METADATA,sha256=y7JtyI-29EtIUDTcqDhPWGyTJJd5w2QP6EKokGQqRbY,6806
-grasp_agents-0.3.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-grasp_agents-0.3.2.dist-info/licenses/LICENSE.md,sha256=-nNNdWqGB8gJ2O-peFQ2Irshv5tW5pHKyTcYkwvH7CE,1201
-grasp_agents-0.3.2.dist-info/RECORD,,
+grasp_agents-0.3.3.dist-info/METADATA,sha256=bV-dofgYSNMv1JHo7kxOZKD6DFDKAb4pHL5yeApC2aA,6806
+grasp_agents-0.3.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+grasp_agents-0.3.3.dist-info/licenses/LICENSE.md,sha256=-nNNdWqGB8gJ2O-peFQ2Irshv5tW5pHKyTcYkwvH7CE,1201
+grasp_agents-0.3.3.dist-info/RECORD,,