grasp_agents 0.3.6__tar.gz → 0.3.8__tar.gz

{grasp_agents-0.3.6 → grasp_agents-0.3.8}/PKG-INFO

@@ -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 → grasp_agents-0.3.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "grasp_agents"
-version = "0.3.6"
+version = "0.3.8"
 description = "Grasp Agents Library"
 readme = "README.md"
 requires-python = ">=3.11.4,<4"

{grasp_agents-0.3.6 → grasp_agents-0.3.8}/src/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-0.3.6 → grasp_agents-0.3.8}/src/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(