unique_toolkit 1.31.0__py3-none-any.whl → 1.31.2__py3-none-any.whl

unique_toolkit/agentic/tools/a2a/postprocessing/_display_utils.py

@@ -1,6 +1,7 @@
 import re
 from typing import Literal, NamedTuple
 
+from unique_toolkit._common.utils.jinja.render import render_template
 from unique_toolkit.agentic.tools.a2a.postprocessing.config import (
     SubAgentDisplayConfig,
     SubAgentResponseDisplayMode,
@@ -84,6 +85,12 @@ def _prepare_title_template(
     return display_title_template.replace("{}", "{%s}" % display_name_placeholder)
 
 
+def _clean_linebreaks(text: str) -> str:
+    text = text.strip()
+    text = re.sub(r"^(<br>)*|(<br>)*$", "", text)
+    return text
+
+
 def _get_display_template(
     mode: SubAgentResponseDisplayMode,
     add_quote_border: bool,
@@ -126,7 +133,7 @@ def _get_display_template(
     if add_block_border:
         template = _wrap_with_block_border(template)
 
-    return template.strip()
+    return _clean_linebreaks(template)
 
 
 def _get_display_removal_re(
@@ -167,8 +174,7 @@ def get_sub_agent_answer_parts(
 
     substrings = []
     for config in display_config.answer_substrings_config:
-        match = re.search(config.regexp, answer)
-        if match is not None:
+        for match in config.regexp.finditer(answer):
             text = match.group(0)
             substrings.append(
                 SubAgentAnswerPart(
@@ -183,7 +189,7 @@ def get_sub_agent_answer_parts(
 def get_sub_agent_answer_display(
     display_name: str,
     display_config: SubAgentDisplayConfig,
-    answer: str | list[str],
+    answer: str | list[SubAgentAnswerPart],
     assistant_id: str,
 ) -> str:
     template = _get_display_template(
@@ -194,7 +200,12 @@ def get_sub_agent_answer_display(
     )
 
     if isinstance(answer, list):
-        answer = display_config.answer_substrings_separator.join(answer)
+        answer = render_template(
+            display_config.answer_substrings_jinja_template,
+            {
+                "substrings": [answer.formatted_text for answer in answer],
+            },
+        )
 
     return template.format(
         display_name=display_name, answer=answer, assistant_id=assistant_id

unique_toolkit/agentic/tools/a2a/postprocessing/config.py

@@ -1,3 +1,4 @@
+import re
 from enum import StrEnum
 from typing import Literal
 
@@ -16,7 +17,7 @@ class SubAgentResponseDisplayMode(StrEnum):
 class SubAgentAnswerSubstringConfig(BaseModel):
     model_config = get_configuration_dict()
 
-    regexp: str = Field(
+    regexp: re.Pattern[str] = Field(
         description="The regular expression to use to extract the substring. The first capture group will always be used.",
     )
     display_template: str = Field(
@@ -25,6 +26,13 @@ class SubAgentAnswerSubstringConfig(BaseModel):
     )
 
 
+_ANSWER_SUBSTRINGS_JINJA_TEMPLATE = """
+{% for substring in substrings %}
+{{ substring }}
+{% endfor %}
+""".strip()
+
+
 class SubAgentDisplayConfig(BaseModel):
     model_config = get_configuration_dict()
 
@@ -64,7 +72,7 @@ class SubAgentDisplayConfig(BaseModel):
         default=[],
         description="If set, only parts of the answer matching the provided regular expressions will be displayed.",
     )
-    answer_substrings_separator: str = Field(
-        default="\n",
-        description="The separator to use between the substrings.",
+    answer_substrings_jinja_template: str = Field(
+        default=_ANSWER_SUBSTRINGS_JINJA_TEMPLATE,
+        description="The template to use in order to format the different answer substrings, if any.",
     )

unique_toolkit/agentic/tools/a2a/postprocessing/display.py

@@ -7,6 +7,7 @@ import unique_sdk
 from pydantic import BaseModel, Field
 
 from unique_toolkit._common.pydantic_helpers import get_configuration_dict
+from unique_toolkit._common.utils.jinja.render import render_template
 from unique_toolkit.agentic.postprocessor.postprocessor_manager import Postprocessor
 from unique_toolkit.agentic.tools.a2a.postprocessing._display_utils import (
     get_sub_agent_answer_display,
@@ -38,20 +39,22 @@ class SubAgentDisplaySpec(NamedTuple):
     display_config: SubAgentDisplayConfig
 
 
+_ANSWERS_JINJA_TEMPLATE = """
+{% for answer in answers %}
+{{ answer }}
+{% endfor %}
+""".strip()
+
+
 class SubAgentResponsesPostprocessorConfig(BaseModel):
     model_config = get_configuration_dict()
 
     sleep_time_before_update: float = Field(
-        default=1, description="Time to sleep before updating the main agent message."
+        default=0, description="Time to sleep before updating the main agent message."
     )
-
-    remove_duplicate_answers: bool = Field(
-        default=False,
-        description="If set, duplicate answers will only be displayed once. If sub agent is configured to display only substrings, this will remove duplicate substrings across different responses.",
-    )
-    answer_separator: str = Field(
-        default="",
-        description="The separator to use between the different sub agent answers.",
+    answers_jinja_template: str = Field(
+        default=_ANSWERS_JINJA_TEMPLATE,
+        description="The template to use to display the sub agent answers.",
     )
 
 
@@ -106,8 +109,6 @@ class SubAgentResponsesDisplayPostprocessor(Postprocessor):
         answers_displayed_before = []
         answers_displayed_after = []
 
-        all_answers_displayed = set()
-
         for assistant_id, responses in displayed_sub_agent_responses.items():
             for response in responses:
                 message = response.message
@@ -130,34 +131,20 @@ class SubAgentResponsesDisplayPostprocessor(Postprocessor):
                         assistant_id,
                         response.sequence_number,
                     )
-
-                message_text = message["text"] or ""
+                    continue
 
                 answer_parts = get_sub_agent_answer_parts(
-                    answer=message_text,
+                    answer=message["text"],
                     display_config=tool_info.display_config,
                 )
 
                 if len(answer_parts) == 0:
                     continue
 
-                answer_display_texts = []
-                if self._config.remove_duplicate_answers:
-                    for answer_part in answer_parts:
-                        if answer_part.matching_text in all_answers_displayed:
-                            continue
-
-                        all_answers_displayed.add(answer_part.matching_text)
-                        answer_display_texts.append(answer_part.formatted_text)
-                else:
-                    answer_display_texts = [
-                        answer_part.formatted_text for answer_part in answer_parts
-                    ]
-
                 answer = get_sub_agent_answer_display(
                     display_name=display_name,
                     display_config=tool_info.display_config,
-                    answer=answer_display_texts,
+                    answer=answer_parts,
                     assistant_id=assistant_id,
                 )
 
@@ -170,7 +157,7 @@ class SubAgentResponsesDisplayPostprocessor(Postprocessor):
             text=loop_response.message.text,
             answers_before=answers_displayed_before,
             answers_after=answers_displayed_after,
-            sep=self._config.answer_separator,
+            template=self._config.answers_jinja_template,
         )
 
         return True
@@ -211,12 +198,12 @@ def _get_final_answer_display(
     text: str,
     answers_before: list[str],
     answers_after: list[str],
-    sep: str = "<br>\n\n",
+    template: str = _ANSWERS_JINJA_TEMPLATE,
 ) -> str:
     if len(answers_before) > 0:
-        text = sep.join(answers_before) + sep + text
+        text = render_template(template, {"answers": answers_before}) + text
 
     if len(answers_after) > 0:
-        text = text + sep + sep.join(answers_after)
+        text = text + render_template(template, {"answers": answers_after})
 
     return text.strip()

unique_toolkit/agentic/tools/a2a/postprocessing/test/test_display_utils.py

@@ -1492,9 +1492,7 @@ def test_get_sub_agent_answer_parts__returns_empty_list__when_no_matches() -> No
 
 
 @pytest.mark.ai
-def test_get_sub_agent_answer_parts__extracts_first_match_only__for_each_regexp() -> (
-    None
-):
+def test_get_sub_agent_answer_parts__extracts_all_matches__for_each_regexp() -> None:
     """
     Purpose: Verify only first match per regexp is extracted.
     Why this matters: Function uses re.search which finds first occurrence.
@@ -1513,7 +1511,7 @@ def test_get_sub_agent_answer_parts__extracts_first_match_only__for_each_regexp(
     result = get_sub_agent_answer_parts(answer=answer, display_config=config)
 
     # Assert
-    assert len(result) == 1
+    assert len(result) == 2
     assert result[0].matching_text == "42"
 
 
@@ -1661,10 +1659,12 @@ def test_get_sub_agent_answer_parts__preserves_order__of_configs_not_matches() -
     result = get_sub_agent_answer_parts(answer=answer, display_config=config)
 
     # Assert
-    assert len(result) == 2
+    assert len(result) == 4
     # Results follow config order, not text order
     assert result[0].matching_text == "first"
-    assert result[1].matching_text == "123"
+    assert result[1].matching_text == "then"
+    assert result[2].matching_text == "abc"
+    assert result[3].matching_text == "123"
 
 
 @pytest.mark.ai

unique_toolkit/agentic/tools/tool_manager.py

@@ -231,25 +231,6 @@ class _ToolManager(Generic[_ApiMode]):
         self,
         tool_calls: list[LanguageModelFunction],
     ) -> list[ToolCallResponse]:
-        tool_calls = tool_calls
-
-        tool_calls = self.filter_duplicate_tool_calls(
-            tool_calls=tool_calls,
-        )
-        num_tool_calls = len(tool_calls)
-
-        if num_tool_calls > self._config.max_tool_calls:
-            self._logger.warning(
-                (
-                    "Number of tool calls %s exceeds the allowed maximum of %s."
-                    "The tool calls will be reduced to the first %s."
-                ),
-                num_tool_calls,
-                self._config.max_tool_calls,
-                self._config.max_tool_calls,
-            )
-            tool_calls = tool_calls[: self._config.max_tool_calls]
-
         tool_call_responses = await self._execute_parallelized(tool_calls)
         return tool_call_responses
 
@@ -358,6 +339,22 @@ class _ToolManager(Generic[_ApiMode]):
             )
         return unique_tool_calls
 
+    def filter_tool_calls_by_max_tool_calls_allowed(
+        self, tool_calls: list[LanguageModelFunction]
+    ) -> list[LanguageModelFunction]:
+        if len(tool_calls) > self._config.max_tool_calls:
+            self._logger.warning(
+                (
+                    "Number of tool calls %s exceeds the allowed maximum of %s."
+                    "The tool calls will be reduced to the first %s."
+                ),
+                len(tool_calls),
+                self._config.max_tool_calls,
+                self._config.max_tool_calls,
+            )
+            return tool_calls[: self._config.max_tool_calls]
+        return tool_calls
+
     @overload
     def get_tool_by_name(
         self: "_ToolManager[Literal['completions']]", name: str

{unique_toolkit-1.31.0.dist-info → unique_toolkit-1.31.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 1.31.0
+Version: 1.31.2
 Summary: 
 License: Proprietary
 Author: Cedric Klinkert
@@ -121,6 +121,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.31.2] - 2025-11-27
+- Added the function `filter_tool_calls_by_max_tool_calls_allowed` in `tool_manager` to limit the number of parallel tool calls permitted per loop iteration.
+
+## [1.31.1] - 2025-11-27
+- Various fixes to sub agent answers.
+
 ## [1.31.0] - 2025-11-20
 - Adding model `litellm:anthropic-claude-opus-4-5` to `language_model/info.py`
 

{unique_toolkit-1.31.0.dist-info → unique_toolkit-1.31.2.dist-info}/RECORD

@@ -82,12 +82,12 @@ unique_toolkit/agentic/tools/a2a/evaluation/evaluator.py,sha256=AJvXu0UJKHe72nRm
 unique_toolkit/agentic/tools/a2a/evaluation/summarization_user_message.j2,sha256=acP1YqD_sCy6DT0V2EIfhQTmaUKeqpeWNJ7RGgceo8I,271
 unique_toolkit/agentic/tools/a2a/manager.py,sha256=pk06UUXKQdIUY-PyykYiItubBjmIydOaqWvBBDwhMN4,1939
 unique_toolkit/agentic/tools/a2a/postprocessing/__init__.py,sha256=aVtUBPN7kDrqA6Bze34AbqQpcBBqpvfyJG-xF65w7R0,659
-unique_toolkit/agentic/tools/a2a/postprocessing/_display_utils.py,sha256=lpcyCTm3KKhaYMF4Wh7DHrkP_WAOkbXha5QJc7zy2nc,6539
+unique_toolkit/agentic/tools/a2a/postprocessing/_display_utils.py,sha256=cM5EpIFKMNjMfjmOwFfxFxz3KF8iEtY6mdmt-UaJtW4,6879
 unique_toolkit/agentic/tools/a2a/postprocessing/_ref_utils.py,sha256=E3KybH9SX5oOkh14sSaIaLnht4DhKVrHAiUkoACNBsg,2430
-unique_toolkit/agentic/tools/a2a/postprocessing/config.py,sha256=U5N2y6ok14daNf_u-E1SXnV9v9DwpW4jL_U_3o8oJ7Q,2633
-unique_toolkit/agentic/tools/a2a/postprocessing/display.py,sha256=9t6zsVAYCyGXMHkxyH_XHdIbU0w0WBY1O08wjJvjoig,7850
+unique_toolkit/agentic/tools/a2a/postprocessing/config.py,sha256=nYH1otBrVGHq1Y2i1KII3pb1IVE0efwmOwhOLLsv1qU,2841
+unique_toolkit/agentic/tools/a2a/postprocessing/display.py,sha256=L1YFwAvnjNfbG2fxKSLk9wCFcfagq1gtQXucS_kZBeg,7172
 unique_toolkit/agentic/tools/a2a/postprocessing/references.py,sha256=DGiv8WXMjIwumI7tlpWRgV8wSxnE282ryxEf03fgck8,3465
-unique_toolkit/agentic/tools/a2a/postprocessing/test/test_display_utils.py,sha256=mj2kR96ZzVIcgW3x-70oAjOLgYl5QreCIWBum1eQE_I,51989
+unique_toolkit/agentic/tools/a2a/postprocessing/test/test_display_utils.py,sha256=v4P0fi7iKKaU050WxxLGjXG4RUEw6r7kQCRlj9Vu59g,52065
 unique_toolkit/agentic/tools/a2a/postprocessing/test/test_ref_utils.py,sha256=u-eNrHjsRFcu4TmzkD5XfFrxvaIToB42YGyXZ-RpsR0,17830
 unique_toolkit/agentic/tools/a2a/prompts.py,sha256=0ILHL_RAcT04gFm2d470j4Gho7PoJXdCJy-bkZgf_wk,2401
 unique_toolkit/agentic/tools/a2a/response_watcher/__init__.py,sha256=fS8Lq49DZo5spMcP8QGTMWwSg80rYSr2pTfYDbssGYs,184
@@ -112,10 +112,9 @@ unique_toolkit/agentic/tools/openai_builtin/code_interpreter/service.py,sha256=X
 unique_toolkit/agentic/tools/openai_builtin/manager.py,sha256=QeDVgLfnCXrSmXI3b9bgQa9oyfQe_L15wa_YfhfNe9E,2633
 unique_toolkit/agentic/tools/schemas.py,sha256=TXshRvivr2hD-McXHumO0bp-Z0mz_GnAmQRiVjT59rU,5025
 unique_toolkit/agentic/tools/test/test_mcp_manager.py,sha256=VpB4k4Dh0lQWakilJMQSzO8sBXapuEC26cub_lorl-M,19221
-unique_toolkit/agentic/tools/test/test_tool_manager.py,sha256=eO7BSCRrw8iiPhrVL348Ch_yOobc6dUEqK_3OZ5heDw,48298
 unique_toolkit/agentic/tools/test/test_tool_progress_reporter.py,sha256=XHNezB8itj9KzpQgD0cwRtp2AgRUfUkQsHc3bTyPj6c,15801
 unique_toolkit/agentic/tools/tool.py,sha256=YmhGZ-NkPlgQ4X1hA6IVod10LNM5YErzbd0Zn6ANA98,6529
-unique_toolkit/agentic/tools/tool_manager.py,sha256=zOshUjQYuZe-_lN7DgPCT8UgXK-V34CzVBgF7f7XsWg,17549
+unique_toolkit/agentic/tools/tool_manager.py,sha256=ZwzCcjzHYZgB1FxrpKRmarepfaZknIhLilxeyKoe4BY,17541
 unique_toolkit/agentic/tools/tool_progress_reporter.py,sha256=GaR0oqDUJZvBB9WCUVYYh0Zvs6U-LMygJCCrqPlitgA,10296
 unique_toolkit/agentic/tools/utils/__init__.py,sha256=s75sjY5nrJchjLGs3MwSIqhDW08fFXIaX7eRQjFIA4s,346
 unique_toolkit/agentic/tools/utils/execution/__init__.py,sha256=OHiKpqBnfhBiEQagKVWJsZlHv8smPp5OI4dFIexzibw,37
@@ -189,7 +188,7 @@ unique_toolkit/short_term_memory/service.py,sha256=5PeVBu1ZCAfyDb2HLVvlmqSbyzBBu
 unique_toolkit/smart_rules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 unique_toolkit/smart_rules/compile.py,sha256=Ozhh70qCn2yOzRWr9d8WmJeTo7AQurwd3tStgBMPFLA,1246
 unique_toolkit/test_utilities/events.py,sha256=_mwV2bs5iLjxS1ynDCjaIq-gjjKhXYCK-iy3dRfvO3g,6410
-unique_toolkit-1.31.0.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
-unique_toolkit-1.31.0.dist-info/METADATA,sha256=fCVcgrZkBcRqyYl21qWou_M1kuGb7qngixPIdR9sjAo,44652
-unique_toolkit-1.31.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_toolkit-1.31.0.dist-info/RECORD,,
+unique_toolkit-1.31.2.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_toolkit-1.31.2.dist-info/METADATA,sha256=FU5HB8zOBqLFAp77GYJskJr5r3PJefSRQs9zrvVDUxQ,44900
+unique_toolkit-1.31.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_toolkit-1.31.2.dist-info/RECORD,,