unique_toolkit 1.4.3__tar.gz → 1.5.0__tar.gz

{unique_toolkit-1.4.3 → unique_toolkit-1.5.0}/CHANGELOG.md

@@ -5,6 +5,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.5.0] - 2025-10-01
+- Allow history manager to fetch only ui visible text
+
+## [1.4.4] - 2025-09-30
+- Fix bugs with display of sub-agent answers and evaluations when multiple sub-agent from the same assistant run concurrently.
+
 ## [1.4.3] - 2025-09-30
 - Fix bug with sub-agent post-processing reference numbers.
 

{unique_toolkit-1.4.3 → unique_toolkit-1.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 1.4.3
+Version: 1.5.0
 Summary: 
 License: Proprietary
 Author: Cedric Klinkert
@@ -118,6 +118,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.5.0] - 2025-10-01
+- Allow history manager to fetch only ui visible text
+
+## [1.4.4] - 2025-09-30
+- Fix bugs with display of sub-agent answers and evaluations when multiple sub-agent from the same assistant run concurrently.
+
 ## [1.4.3] - 2025-09-30
 - Fix bug with sub-agent post-processing reference numbers.
 

{unique_toolkit-1.4.3 → unique_toolkit-1.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "unique_toolkit"
-version = "1.4.3"
+version = "1.5.0"
 description = ""
 authors = [
     "Cedric Klinkert <cedric.klinkert@unique.ch>",

{unique_toolkit-1.4.3 → unique_toolkit-1.5.0}/unique_toolkit/agentic/history_manager/history_manager.py

@@ -215,3 +215,22 @@ class HistoryManager:
             remove_from_text=remove_from_text,
         )
         return messages
+
+    async def get_user_visible_chat_history(
+        self, assistant_message_text: str | None = None
+    ) -> LanguageModelMessages:
+        """Get the user visible chat history.
+
+        Args:
+            assistant_message_text (str | None): The latest assistant message to append to the history, as this is not extracted from the history.
+            If None, the history will be returned without the latest assistant message.
+
+        Returns:
+            LanguageModelMessages: The user visible chat history.
+        """
+        history = await self._token_reducer._get_history_from_db()
+        if assistant_message_text:
+            history.append(
+                LanguageModelAssistantMessage(content=assistant_message_text)
+            )
+        return LanguageModelMessages(history)

{unique_toolkit-1.4.3 → unique_toolkit-1.5.0}/unique_toolkit/agentic/history_manager/loop_token_reducer.py

@@ -113,6 +113,21 @@ class LoopTokenReducer:
 
         return messages
 
+    async def get_user_visible_chat_history(
+        self, message: LanguageModelAssistantMessage
+    ) -> LanguageModelMessages:
+        """Get the user visible chat history.
+
+        Args:
+            message (LanguageModelAssistantMessage): The latest assistant message to append to the history, as this is not extracted from the history.
+
+        Returns:
+            LanguageModelMessages: The user visible chat history.
+        """
+        history = await self._get_history_from_db()
+        history.append(message)
+        return LanguageModelMessages(history)
+
     def _exceeds_token_limit(self, token_count: int) -> bool:
         """Check if token count exceeds the maximum allowed limit and if at least one tool call has more than one source."""
         # At least one tool call should have more than one chunk as answer
@@ -223,7 +238,7 @@ class LoopTokenReducer:
         return history
 
     async def _get_history_from_db(
-        self, remove_from_text: Callable[[str], Awaitable[str]]
+        self, remove_from_text: Callable[[str], Awaitable[str]] | None = None
     ) -> list[LanguageModelMessage]:
         """
         Get the history of the conversation. The function will retrieve a subset of the full history based on the configuration.
@@ -242,10 +257,10 @@ class LoopTokenReducer:
                 else FileContentSerialization.FILE_NAME
             ),
         )
-
-        full_history.root = await self._clean_messages(
-            full_history.root, remove_from_text
-        )
+        if remove_from_text is not None:
+            full_history.root = await self._clean_messages(
+                full_history.root, remove_from_text
+            )
 
         limited_history_messages = self._limit_to_token_window(
             full_history.root, self._max_history_tokens

{unique_toolkit-1.4.3 → unique_toolkit-1.5.0}/unique_toolkit/agentic/tools/a2a/evaluation/config.py

@@ -15,6 +15,7 @@ Your task is to give a brief summary (1-10 sentences) of the received assessment
 1. You must NOT in ANY case state a fact that is not stated in the given assessments.
 2. You must focus first and foremost on the failing assessments, labeled `RED` below.
 3. You must mention each agent's name when summarizing its list of assessments.
+4. You must NOT use any markdown formatting in your response as this will FAIL to render in the chat frontend.
 """.strip()
 
 with open(Path(__file__).parent / "summarization_user_message.j2", "r") as file:

{unique_toolkit-1.4.3 → unique_toolkit-1.5.0}/unique_toolkit/agentic/tools/a2a/evaluation/evaluator.py

@@ -27,7 +27,7 @@ logger = logging.getLogger(__name__)
 
 
 class _SubAgentToolInfo(TypedDict):
-    assessment: list[unique_sdk.Space.Assessment] | None
+    assessments: list[list[unique_sdk.Space.Assessment]]
     display_name: str
 
 
@@ -53,7 +53,7 @@ class SubAgentsEvaluation(Evaluation):
             if sub_agent_tool.config.evaluation_config.display_evalution:
                 sub_agent_tool.subscribe(self)
                 self._assistant_id_to_tool_info[sub_agent_tool.config.assistant_id] = {
-                    "assessment": None,
+                    "assessments": [],
                     "display_name": sub_agent_tool.display_name(),
                 }
 
@@ -80,47 +80,53 @@ class SubAgentsEvaluation(Evaluation):
         label_comparison_dict[ChatMessageAssessmentLabel.RED] = 0
 
         for assistant_id, tool_info in self._assistant_id_to_tool_info.items():
-            assessments = tool_info["assessment"] or []
-            valid_assessments = []
-            for assessment in assessments:
-                if (
-                    assessment["label"] is None
-                    or assessment["label"] not in ChatMessageAssessmentLabel
-                ):
-                    logger.warning(
-                        "Unkown assistant label %s for assistant %s will be ignored",
-                        assessment["label"],
-                        assistant_id,
-                    )
-                    continue
-                if assessment["status"] != ChatMessageAssessmentStatus.DONE:
-                    logger.warning(
-                        "Assessment %s for assistant %s is not done (status: %s) will be ignored",
-                        assessment["label"],
-                        assistant_id,
+            sub_agent_assessments = tool_info["assessments"] or []
+            for i, assessments in enumerate(sub_agent_assessments, start=1):
+                valid_assessments = []
+                for assessment in assessments:
+                    if (
+                        assessment["label"] is None
+                        or assessment["label"] not in ChatMessageAssessmentLabel
+                    ):
+                        logger.warning(
+                            "Unkown assistant label %s for assistant %s will be ignored",
+                            assessment["label"],
+                            assistant_id,
+                        )
+                        continue
+                    if assessment["status"] != ChatMessageAssessmentStatus.DONE:
+                        logger.warning(
+                            "Assessment %s for assistant %s is not done (status: %s) will be ignored",
+                            assessment["label"],
+                            assistant_id,
+                        )
+                        continue
+                    valid_assessments.append(assessment)
+
+                if len(valid_assessments) == 0:
+                    logger.info(
+                        "No valid assessment found for assistant %s", assistant_id
                     )
                     continue
-                valid_assessments.append(assessment)
-
-            if len(valid_assessments) == 0:
-                logger.info("No valid assessment found for assistant %s", assistant_id)
-                continue
 
-            assessments = sorted(
-                valid_assessments, key=lambda x: label_comparison_dict[x["label"]]
-            )
-
-            for assessment in assessments:
-                value = min(
-                    value, assessment["label"], key=lambda x: label_comparison_dict[x]
+                assessments = sorted(
+                    valid_assessments, key=lambda x: label_comparison_dict[x["label"]]
                 )
 
-            sub_agents_display_data.append(
-                {
+                for assessment in assessments:
+                    value = min(
+                        value,
+                        assessment["label"],
+                        key=lambda x: label_comparison_dict[x],
+                    )
+                data = {
                     "name": tool_info["display_name"],
                     "assessments": assessments,
                 }
-            )
+                if len(sub_agent_assessments) > 1:
+                    data["name"] += f" {i}"
+
+                sub_agents_display_data.append(data)
 
         if len(sub_agents_display_data) == 0:
             logger.warning("No valid sub agent assessments found")
@@ -200,10 +206,10 @@ class SubAgentsEvaluation(Evaluation):
             )
             return
 
-        self._assistant_id_to_tool_info[sub_agent_assistant_id]["assessment"] = (
+        self._assistant_id_to_tool_info[sub_agent_assistant_id]["assessments"].append(
             response[
                 "assessment"
             ].copy()  # Shallow copy as we don't modify individual assessments
             if response["assessment"] is not None
-            else None
+            else []
         )

{unique_toolkit-1.4.3 → unique_toolkit-1.5.0}/unique_toolkit/agentic/tools/a2a/postprocessing/postprocessor.py

@@ -1,6 +1,6 @@
 import logging
 import re
-from typing import NotRequired, TypedDict, override
+from typing import TypedDict, override
 
 import unique_sdk
 
@@ -30,7 +30,7 @@ class _SubAgentMessageInfo(TypedDict):
 class _SubAgentToolInfo(TypedDict):
     display_name: str
     display_config: SubAgentToolDisplayConfig
-    response: NotRequired[_SubAgentMessageInfo]
+    responses: list[_SubAgentMessageInfo]
 
 
 class SubAgentResponsesPostprocessor(Postprocessor):
@@ -57,6 +57,7 @@ class SubAgentResponsesPostprocessor(Postprocessor):
                 _SubAgentToolInfo(
                     display_config=sub_agent_tool.config.response_display_config,
                     display_name=sub_agent_tool.display_name(),
+                    responses=[],
                 )
             )
 
@@ -81,7 +82,7 @@ class SubAgentResponsesPostprocessor(Postprocessor):
         for assistant_id, tool_info in self._assistant_id_to_tool_info.items():
             display_mode = tool_info["display_config"].mode
 
-            if "response" not in tool_info:
+            if len(tool_info["responses"]) == 0:
                 logger.warning(
                     "No response from assistant %s",
                     assistant_id,
@@ -89,7 +90,7 @@ class SubAgentResponsesPostprocessor(Postprocessor):
                 continue
 
             if display_mode != ResponseDisplayMode.HIDDEN:
-                displayed[assistant_id] = tool_info["response"]
+                displayed[assistant_id] = tool_info["responses"]
 
         existing_refs = {
             ref.source_id: ref.sequence_number
@@ -98,33 +99,38 @@ class SubAgentResponsesPostprocessor(Postprocessor):
         _consolidate_references_in_place(displayed, existing_refs)
 
         modified = len(displayed) > 0
-        for assistant_id, message in reversed(displayed.items()):
-            tool_info = self._assistant_id_to_tool_info[assistant_id]
-            display_mode = tool_info["display_config"].mode
-            display_name = tool_info["display_name"]
-            loop_response.message.text = (
-                build_sub_agent_answer_display(
-                    display_name=display_name,
-                    assistant_id=assistant_id,
-                    display_mode=display_mode,
-                    answer=message["text"],
+        for assistant_id, messages in reversed(displayed.items()):
+            for i in reversed(range(len(messages))):
+                message = messages[i]
+                tool_info = self._assistant_id_to_tool_info[assistant_id]
+                display_mode = tool_info["display_config"].mode
+                display_name = tool_info["display_name"]
+                if len(messages) > 1:
+                    display_name += f" {i + 1}"
+
+                loop_response.message.text = (
+                    build_sub_agent_answer_display(
+                        display_name=display_name,
+                        assistant_id=assistant_id,
+                        display_mode=display_mode,
+                        answer=message["text"],
+                    )
+                    + loop_response.message.text
                 )
-                + loop_response.message.text
-            )
-
-            assert self._sub_agent_message is not None
 
-            loop_response.message.references.extend(
-                ContentReference(
-                    message_id=self._sub_agent_message["id"],
-                    source_id=ref["sourceId"],
-                    url=ref["url"],
-                    source=ref["source"],
-                    name=ref["name"],
-                    sequence_number=ref["sequenceNumber"],
+                assert self._sub_agent_message is not None
+
+                loop_response.message.references.extend(
+                    ContentReference(
+                        message_id=self._sub_agent_message["id"],
+                        source_id=ref["sourceId"],
+                        url=ref["url"],
+                        source=ref["source"],
+                        name=ref["name"],
+                        sequence_number=ref["sequenceNumber"],
+                    )
+                    for ref in message["references"]
                 )
-                for ref in message["references"]
-            )
 
         return modified
 
@@ -150,59 +156,58 @@ class SubAgentResponsesPostprocessor(Postprocessor):
             )
             return
 
-        self._assistant_id_to_tool_info[sub_agent_assistant_id]["response"] = {
-            "text": response["text"],
-            "references": [
-                {
-                    "name": ref["name"],
-                    "url": ref["url"],
-                    "sequenceNumber": ref["sequenceNumber"],
-                    "originalIndex": [],
-                    "sourceId": ref["sourceId"],
-                    "source": ref["source"],
-                }
-                for ref in response["references"] or []
-            ],
-        }
+        self._assistant_id_to_tool_info[sub_agent_assistant_id]["responses"].append(
+            {
+                "text": response["text"],
+                "references": [
+                    {
+                        "name": ref["name"],
+                        "url": ref["url"],
+                        "sequenceNumber": ref["sequenceNumber"],
+                        "originalIndex": [],
+                        "sourceId": ref["sourceId"],
+                        "source": ref["source"],
+                    }
+                    for ref in response["references"] or []
+                ],
+            }
+        )
 
 
 def _consolidate_references_in_place(
-    messages: dict[str, _SubAgentMessageInfo], existing_refs: dict[str, int]
+    messages: dict[str, list[_SubAgentMessageInfo]], existing_refs: dict[str, int]
 ) -> None:
     start_index = max(existing_refs.values(), default=0) + 1
 
-    for assistant_id, message in messages.items():
-        references = message["references"]
-        if len(references) == 0 or message["text"] is None:
-            logger.info(
-                "Message from assistant %s does not contain any references",
-                assistant_id,
-            )
-            continue
-
-        references = list(sorted(references, key=lambda ref: ref["sequenceNumber"]))
-
-        ref_map = {}
-
-        message_new_refs = []
-        for reference in references:
-            source_id = reference["sourceId"]
+    for assistant_id, assistant_messages in messages.items():
+        for message in assistant_messages:
+            references = message["references"]
+            if len(references) == 0 or message["text"] is None:
+                logger.info(
+                    "Message from assistant %s does not contain any references",
+                    assistant_id,
+                )
+                continue
 
-            if source_id not in existing_refs:
-                message_new_refs.append(reference)
+            references = list(sorted(references, key=lambda ref: ref["sequenceNumber"]))
 
-                existing_refs[source_id] = start_index
-                start_index += 1
+            ref_map = {}
 
-            reference_num = existing_refs[source_id]
-            seq_num = reference["sequenceNumber"]
+            message_new_refs = []
+            for reference in references:
+                source_id = reference["sourceId"]
 
-            ref_map[seq_num] = reference_num
+                if source_id not in existing_refs:
+                    message_new_refs.append(reference)
+                    existing_refs[source_id] = start_index
+                    start_index += 1
 
-            reference["sequenceNumber"] = reference_num
+                reference_num = existing_refs[source_id]
+                ref_map[reference["sequenceNumber"]] = reference_num
+                reference["sequenceNumber"] = reference_num
 
-        message["text"] = _replace_references_in_text(message["text"], ref_map)
-        message["references"] = message_new_refs
+            message["text"] = _replace_references_in_text(message["text"], ref_map)
+            message["references"] = message_new_refs
 
 
 def _replace_references_in_text_non_overlapping(
@@ -215,7 +220,7 @@ def _replace_references_in_text_non_overlapping(
 
 def _replace_references_in_text(text: str, ref_map: dict[int, int]) -> str:
     # 2 phase replacement, since the map keys and values can overlap
-    max_ref = max(ref_map.keys(), default=0) + 1
+    max_ref = max(max(ref_map.keys(), default=0), max(ref_map.values(), default=0)) + 1
     unique_refs = range(max_ref, max_ref + len(ref_map))
 
     text = _replace_references_in_text_non_overlapping(