grasp_agents 0.3.6__py3-none-any.whl → 0.3.8__py3-none-any.whl

grasp_agents/llm_agent.py

@@ -175,10 +175,12 @@ class LLMAgent(
 
         # 2. Set agent memory
 
+        system_message: SystemMessage | None = None
         _memory = self.memory.model_copy(deep=True)
-        prev_message_hist_length = len(_memory.message_history)
         if self._reset_memory_on_run or _memory.is_empty:
             _memory.reset(formatted_sys_prompt)
+            if formatted_sys_prompt is not None:
+                system_message = _memory.message_history[0][0]  # type: ignore[assignment]
         elif self._set_memory_impl:
             _memory = self._set_memory_impl(
                 prev_memory=_memory,
@@ -195,16 +197,6 @@ class LLMAgent(
         if user_message_batch:
             _memory.update(message_batch=user_message_batch)
 
-        # 4. Extract system message if it was added
-
-        system_message: SystemMessage | None = None
-        if (
-            len(_memory.message_history) == 1
-            and prev_message_hist_length == 0
-            and isinstance(_memory.message_history[0][0], SystemMessage)
-        ):
-            system_message = _memory.message_history[0][0]
-
         return system_message, user_message_batch, _memory
 
     def _extract_outputs(

grasp_agents/prompt_builder.py

@@ -165,7 +165,7 @@ class PromptBuilder(AutoInstanceAttributesMixin, Generic[InT_contra, CtxT]):
         if in_args is not None:
             val_in_args = self._in_args_type_adapter.validate_python(in_args)
             if isinstance(val_in_args, BaseModel):
-                _, has_image = self._format_pydantic_prompt_args(val_in_args)
+                has_image = self._has_image_data(val_in_args)
                 if has_image and self.in_prompt_template is None:
                     raise TypeError(
                         "BaseModel input arguments contain ImageData, but input prompt "
@@ -179,22 +179,27 @@ class PromptBuilder(AutoInstanceAttributesMixin, Generic[InT_contra, CtxT]):
 
         return val_in_args, val_usr_args
 
+    @staticmethod
+    def _has_image_data(inp: BaseModel) -> bool:
+        contains_image_data = False
+        for field in type(inp).model_fields:
+            if isinstance(getattr(inp, field), ImageData):
+                contains_image_data = True
+
+        return contains_image_data
+
     @staticmethod
     def _format_pydantic_prompt_args(
         inp: BaseModel,
-    ) -> tuple[dict[str, PromptArgumentType], bool]:
+    ) -> dict[str, PromptArgumentType]:
         formatted_args: dict[str, PromptArgumentType] = {}
-        contains_image_data = False
         for field in type(inp).model_fields:
             if field == "selected_recipients":
                 continue
 
             val = getattr(inp, field)
-            if isinstance(val, (int, str, bool)):
-                formatted_args[field] = val
-            elif isinstance(val, ImageData):
+            if isinstance(val, (int, str, bool, ImageData)):
                 formatted_args[field] = val
-                contains_image_data = True
             elif isinstance(val, BaseModel):
                 formatted_args[field] = val.model_dump_json(indent=2, warnings="error")
             else:
@@ -203,20 +208,18 @@ class PromptBuilder(AutoInstanceAttributesMixin, Generic[InT_contra, CtxT]):
                     "int, str, bool, BaseModel, or ImageData."
                 )
 
-        return formatted_args, contains_image_data
+        return formatted_args
 
     def _combine_args(
         self, *, in_args: InT_contra | None, usr_args: LLMPromptArgs | None
     ) -> Mapping[str, PromptArgumentType] | str:
-        fmt_usr_args, _ = (
-            self._format_pydantic_prompt_args(usr_args) if usr_args else ({}, False)
-        )
+        fmt_usr_args = self._format_pydantic_prompt_args(usr_args) if usr_args else {}
 
         if in_args is None:
             return fmt_usr_args
 
         if isinstance(in_args, BaseModel):
-            fmt_in_args, _ = self._format_pydantic_prompt_args(in_args)
+            fmt_in_args = self._format_pydantic_prompt_args(in_args)
             return fmt_in_args | fmt_usr_args
 
         combined_args_str = self._in_args_type_adapter.dump_json(

{grasp_agents-0.3.6.dist-info → grasp_agents-0.3.8.dist-info}/METADATA

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

{grasp_agents-0.3.6.dist-info → grasp_agents-0.3.8.dist-info}/RECORD

@@ -6,7 +6,7 @@ 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=vVjELab9l0mK9bjO-IJebmmXUyUiws2fNjbXVQQNRvs,5392
-grasp_agents/llm_agent.py,sha256=_Fb3PAfw5okbsybz-BsUkd4kN8K9D5Sjw3HCbDHJFGk,14697
+grasp_agents/llm_agent.py,sha256=EM_1h1O8Gvs5RbQiEV3KT52ADpPDSpvToBLRn0MRUu0,14471
 grasp_agents/llm_agent_memory.py,sha256=kD_UIF8xVgbSgW6xN87TzkdQcbTWLB-C5ZQu1_2HLx8,1770
 grasp_agents/llm_policy_executor.py,sha256=PVNuAejt3S-aSGsT7HvgYHyX_cZQSvrt1aUGPdkXtE4,17847
 grasp_agents/memory.py,sha256=gPkVIIF6dI_xXzarIAw9kSEnSJcfW_teUsWA2JAih94,671
@@ -15,7 +15,7 @@ grasp_agents/packet.py,sha256=PZ1EpclniAoLk7z4ieZbWzgYH3JSRgnlTe_WfbJYG_4,707
 grasp_agents/packet_pool.py,sha256=9umHbi5FwuUYYhhodSR-Z-fRR6OYiZyYEzq5d4nZFK4,3036
 grasp_agents/printer.py,sha256=M-gkLrZMg0ll9T1MRmKOQbp65niFB5ZiZbm-tUT_EYw,5464
 grasp_agents/processor.py,sha256=Atd_iTQNd3Nudb4mHqt3a5AQ31QUgpbrt1Fhn1sgpSk,6708
-grasp_agents/prompt_builder.py,sha256=1o7eMO4FxqRrrXFCj7aQKIajty6jZbBVaUZv7qOMIoY,8414
+grasp_agents/prompt_builder.py,sha256=URMT4X8sNhdMPnkJK0YAF0i2xqBpK2-WlBlkmpVGe_Y,8455
 grasp_agents/run_context.py,sha256=9CidWWCKJ8umlhkRGtg_P3JQsRpH0K3_vhUjgVon4Wk,1597
 grasp_agents/usage_tracker.py,sha256=SPwv6RpdoHRuMIKE2hCAWAvDbtR3uXuhr2jpHQuKWhI,3438
 grasp_agents/utils.py,sha256=WNA5b0IkAsth0XKHEjgTY3PIHdw5L3vEsYPkyDGw8Mw,4741
@@ -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.6.dist-info/METADATA,sha256=kwdiPSqyVZ1B3kjjQFbyDDzdm0eokb6k0krwHqZWQ0s,6806
-grasp_agents-0.3.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-grasp_agents-0.3.6.dist-info/licenses/LICENSE.md,sha256=-nNNdWqGB8gJ2O-peFQ2Irshv5tW5pHKyTcYkwvH7CE,1201
-grasp_agents-0.3.6.dist-info/RECORD,,
+grasp_agents-0.3.8.dist-info/METADATA,sha256=wDMEIbN27VM13L1TQ94oXOFZMVM4Dd2pQkXsif2MQEo,6806
+grasp_agents-0.3.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+grasp_agents-0.3.8.dist-info/licenses/LICENSE.md,sha256=-nNNdWqGB8gJ2O-peFQ2Irshv5tW5pHKyTcYkwvH7CE,1201
+grasp_agents-0.3.8.dist-info/RECORD,,