unique_orchestrator 1.7.3__py3-none-any.whl → 1.7.4__py3-none-any.whl

unique_orchestrator/unique_ai_builder.py

@@ -1,6 +1,6 @@
 import os
 from logging import Logger
-from typing import NamedTuple
+from typing import NamedTuple, cast
 
 from openai import AsyncOpenAI
 from unique_follow_up_questions.follow_up_postprocessor import (
@@ -46,11 +46,13 @@ from unique_toolkit.agentic.thinking_manager.thinking_manager import (
 from unique_toolkit.agentic.tools.a2a import (
     A2AManager,
     ExtendedSubAgentToolConfig,
+    SubAgentDisplaySpec,
     SubAgentEvaluationService,
-    SubAgentResponsesPostprocessor,
-)
-from unique_toolkit.agentic.tools.a2a.postprocessing.postprocessor import (
+    SubAgentEvaluationSpec,
+    SubAgentReferencesPostprocessor,
+    SubAgentResponsesDisplayPostprocessor,
     SubAgentResponsesPostprocessorConfig,
+    SubAgentResponseWatcher,
 )
 from unique_toolkit.agentic.tools.config import ToolBuildConfig
 from unique_toolkit.agentic.tools.mcp.manager import MCPManager
@@ -107,6 +109,7 @@ class _CommonComponents(NamedTuple):
     history_manager: HistoryManager
     evaluation_manager: EvaluationManager
     postprocessor_manager: PostprocessorManager
+    response_watcher: SubAgentResponseWatcher
     # Tool Manager Components
     tool_progress_reporter: ToolProgressReporter
     tool_manager_config: ToolManagerConfig
@@ -126,6 +129,8 @@ def _build_common(
 
     uploaded_documents = content_service.get_documents_uploaded_to_chat()
 
+    response_watcher = SubAgentResponseWatcher()
+
     tool_progress_reporter = ToolProgressReporter(
         chat_service=chat_service,
         config=config.agent.services.tool_progress_reporter_config,
@@ -174,7 +179,9 @@ def _build_common(
     a2a_manager = A2AManager(
         logger=logger,
         tool_progress_reporter=tool_progress_reporter,
+        response_watcher=response_watcher,
     )
+
     tool_manager_config = ToolManagerConfig(
         tools=config.space.tools,
         max_tool_calls=config.agent.experimental.loop_configuration.max_tool_calls_per_iteration,
@@ -222,6 +229,7 @@ def _build_common(
         tool_manager_config=tool_manager_config,
         mcp_servers=event.payload.mcp_servers,
         postprocessor_manager=postprocessor_manager,
+        response_watcher=response_watcher,
     )
 
 
@@ -341,16 +349,15 @@ async def _build_responses(
     _add_sub_agents_postprocessor(
         postprocessor_manager=postprocessor_manager,
         tool_manager=tool_manager,
-        user_id=event.user_id,
-        company_id=event.company_id,
-        chat_id=event.payload.chat_id,
-        sleep_time_before_update=config.agent.experimental.sub_agents_config.sleep_time_before_update,
+        config=config,
+        response_watcher=common_components.response_watcher,
     )
     _add_sub_agents_evaluation(
         evaluation_manager=common_components.evaluation_manager,
         tool_manager=tool_manager,
         config=config,
         event=event,
+        response_watcher=common_components.response_watcher,
     )
 
     return UniqueAIResponsesApi(
@@ -414,16 +421,15 @@ def _build_completions(
     _add_sub_agents_postprocessor(
         postprocessor_manager=postprocessor_manager,
         tool_manager=tool_manager,
-        user_id=event.user_id,
-        company_id=event.company_id,
-        chat_id=event.payload.chat_id,
-        sleep_time_before_update=config.agent.experimental.sub_agents_config.sleep_time_before_update,
+        config=config,
+        response_watcher=common_components.response_watcher,
     )
     _add_sub_agents_evaluation(
         evaluation_manager=common_components.evaluation_manager,
         tool_manager=tool_manager,
         config=config,
         event=event,
+        response_watcher=common_components.response_watcher,
     )
 
     return UniqueAI(
@@ -447,28 +453,37 @@ def _build_completions(
 def _add_sub_agents_postprocessor(
     postprocessor_manager: PostprocessorManager,
     tool_manager: ToolManager | ResponsesApiToolManager,
-    user_id: str,
-    company_id: str,
-    chat_id: str,
-    sleep_time_before_update: float,
+    config: UniqueAIConfig,
+    response_watcher: SubAgentResponseWatcher,
 ) -> None:
     sub_agents = tool_manager.sub_agents
     if len(sub_agents) > 0:
-        sub_agent_responses_postprocessor = SubAgentResponsesPostprocessor(
-            user_id=user_id,
-            main_agent_chat_id=chat_id,
-            company_id=company_id,
-            config=SubAgentResponsesPostprocessorConfig(
-                sleep_time_before_update=sleep_time_before_update,
-            ),
+        display_config = SubAgentResponsesPostprocessorConfig(
+            sleep_time_before_update=config.agent.experimental.sub_agents_config.sleep_time_before_update,
         )
-        postprocessor_manager.add_postprocessor(sub_agent_responses_postprocessor)
-
-        for tool in tool_manager.sub_agents:
-            assert isinstance(tool.config, ExtendedSubAgentToolConfig)
-            sub_agent_responses_postprocessor.register_sub_agent_tool(
-                tool, tool.config.response_display_config
+        display_specs = []
+        for tool in sub_agents:
+            tool_config = cast(
+                ExtendedSubAgentToolConfig, tool.settings.configuration
+            )  # (BeforeValidator of ToolBuildConfig)
+
+            display_specs.append(
+                SubAgentDisplaySpec(
+                    assistant_id=tool_config.assistant_id,
+                    display_name=tool.display_name(),
+                    display_config=tool_config.response_display_config,
+                )
             )
+        reference_postprocessor = SubAgentReferencesPostprocessor(
+            response_watcher=response_watcher,
+        )
+        sub_agent_responses_postprocessor = SubAgentResponsesDisplayPostprocessor(
+            config=display_config,
+            response_watcher=response_watcher,
+            display_specs=display_specs,
+        )
+        postprocessor_manager.add_postprocessor(reference_postprocessor)
+        postprocessor_manager.add_postprocessor(sub_agent_responses_postprocessor)
 
 
 def _add_sub_agents_evaluation(
@@ -476,18 +491,31 @@ def _add_sub_agents_evaluation(
     tool_manager: ToolManager | ResponsesApiToolManager,
     config: UniqueAIConfig,
     event: ChatEvent,
+    response_watcher: SubAgentResponseWatcher,
 ) -> None:
     sub_agents = tool_manager.sub_agents
-    if len(sub_agents) > 0:
-        sub_agent_evaluation = None
-        if config.agent.experimental.sub_agents_config.evaluation_config is not None:
-            sub_agent_evaluation = SubAgentEvaluationService(
-                config=config.agent.experimental.sub_agents_config.evaluation_config,
-                language_model_service=LanguageModelService.from_event(event),
-            )
-            evaluation_manager.add_evaluation(sub_agent_evaluation)
-            for tool in tool_manager.sub_agents:
-                assert isinstance(tool.config, ExtendedSubAgentToolConfig)
-                sub_agent_evaluation.register_sub_agent_tool(
-                    tool, tool.config.evaluation_config
+    if (
+        len(sub_agents) > 0
+        and config.agent.experimental.sub_agents_config.evaluation_config is not None
+    ):
+        evaluation_specs = []
+        for tool in sub_agents:
+            tool_config = cast(
+                ExtendedSubAgentToolConfig, tool.settings.configuration
+            )  # (BeforeValidator of ToolBuildConfig)
+
+            evaluation_specs.append(
+                SubAgentEvaluationSpec(
+                    assistant_id=tool_config.assistant_id,
+                    display_name=tool.display_name(),
+                    config=tool_config.evaluation_config,
                 )
+            )
+
+        sub_agent_evaluation = SubAgentEvaluationService(
+            config=config.agent.experimental.sub_agents_config.evaluation_config,
+            language_model_service=LanguageModelService.from_event(event),
+            evaluation_specs=evaluation_specs,
+            response_watcher=response_watcher,
+        )
+        evaluation_manager.add_evaluation(sub_agent_evaluation)

{unique_orchestrator-1.7.3.dist-info → unique_orchestrator-1.7.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_orchestrator
-Version: 1.7.3
+Version: 1.7.4
 Summary: 
 License: Proprietary
 Author: Andreas Hauri
@@ -20,7 +20,7 @@ Requires-Dist: unique-internal-search (>=1.0.1,<2.0.0)
 Requires-Dist: unique-sdk (>=0.10.34,<0.11.0)
 Requires-Dist: unique-stock-ticker (>=1.0.2,<2.0.0)
 Requires-Dist: unique-swot (>=0.1.0,<0.2.0)
-Requires-Dist: unique-toolkit (>=1.22.2,<2.0.0)
+Requires-Dist: unique-toolkit (>=1.23.0,<2.0.0)
 Requires-Dist: unique-web-search (>=1.3.1,<2.0.0)
 Description-Content-Type: text/markdown
 
@@ -34,6 +34,9 @@ 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.7.4] - 2025-11-04
+- Update and adapt to toolkit 1.23.0 (refactor sub agents implementation)
+
 ## [1.7.3] - 2025-11-03
 - Fixed an issue where new assistant messages were not properly generated during streaming outputs with tool calls; the orchestrator now correctly creates messages via `_create_new_assistant_message_if_loop_response_contains_content` when loop_response includes text and tool invocations.
 

{unique_orchestrator-1.7.3.dist-info → unique_orchestrator-1.7.4.dist-info}/RECORD

@@ -4,8 +4,8 @@ unique_orchestrator/prompts/system_prompt.jinja2,sha256=YXFdx3PG2p4TKfjEpz7guIw2
 unique_orchestrator/prompts/user_message_prompt.jinja2,sha256=BQokpBh3H2J-rFk8i-PRph3jy4T1gAJPPb1mxxRWNuM,878
 unique_orchestrator/tests/test_unique_ai_reference_order.py,sha256=8mZeVP1k8neH4qrFW3oa3zwIdaq2c7R1VvurC7kjBU8,4445
 unique_orchestrator/unique_ai.py,sha256=ffA5hfULt5o9MRCIA6XA8ih4jlij2cW8SUm0AUxGAB8,19767
-unique_orchestrator/unique_ai_builder.py,sha256=p7cXCdXN36_CAgTiq-YXuPlaTjWI2D-QTwMSe0S7Chg,17877
-unique_orchestrator-1.7.3.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
-unique_orchestrator-1.7.3.dist-info/METADATA,sha256=NV4MzPvV7A3XTu77BzMpoN1K9jeQ3bvjI4GzxHZ8mAk,4207
-unique_orchestrator-1.7.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_orchestrator-1.7.3.dist-info/RECORD,,
+unique_orchestrator/unique_ai_builder.py,sha256=U2Ok55FjI0GsR6NS071-dqRseEKrvFkEjA1yazKRq80,18818
+unique_orchestrator-1.7.4.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_orchestrator-1.7.4.dist-info/METADATA,sha256=yf1cOrPB6WvzudJWoEQEBgkzZvxz53PBffccNpmbj3o,4306
+unique_orchestrator-1.7.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_orchestrator-1.7.4.dist-info/RECORD,,