unique_orchestrator 1.5.0__py3-none-any.whl → 1.7.7__py3-none-any.whl

unique_orchestrator/config.py

@@ -3,13 +3,13 @@ from pathlib import Path
 from typing import Annotated, Any, Generic, Literal, TypeVar
 
 from pydantic import BaseModel, Field, ValidationInfo, field_validator, model_validator
-from pydantic.json_schema import SkipJsonSchema
 from unique_deep_research.config import DeepResearchToolConfig
 from unique_deep_research.service import DeepResearchTool
 from unique_follow_up_questions.config import FollowUpQuestionsConfig
 from unique_internal_search.config import InternalSearchConfig
 from unique_internal_search.service import InternalSearchTool
 from unique_stock_ticker.config import StockTickerConfig
+from unique_swot import SwotAnalysisTool, SwotAnalysisToolConfig
 from unique_toolkit._common.validators import (
     LMI,
     ClipInt,
@@ -33,6 +33,9 @@ from unique_toolkit.agentic.tools.openai_builtin.manager import (
     OpenAICodeInterpreterConfig,
 )
 from unique_toolkit.agentic.tools.tool import ToolBuildConfig
+from unique_toolkit.agentic.tools.tool_progress_reporter import (
+    ToolProgressReporterConfig,
+)
 from unique_toolkit.language_model.default_language_model import DEFAULT_GPT_4o
 from unique_web_search.config import WebSearchConfig
 from unique_web_search.service import WebSearchTool
@@ -87,6 +90,10 @@ class SpaceConfigBase(BaseModel, Generic[T]):
                 name=DeepResearchTool.name,
                 configuration=DeepResearchToolConfig(),
             ),
+            ToolBuildConfig(
+                name=SwotAnalysisTool.name,
+                configuration=SwotAnalysisToolConfig(),
+            ),
         ],
     )
 
@@ -155,6 +162,12 @@ class UniqueAIPromptConfig(BaseModel):
         description="The user message prompt template as a Jinja2 template string.",
     )
 
+    user_metadata: list[str] = Field(
+        default=[],
+        title="User Metadata",
+        description="User metadata fields to be ingested in the system prompt.",
+    )
+
 
 class UniqueAIServices(BaseModel):
     """Determine the services the agent is using
@@ -191,6 +204,10 @@ class UniqueAIServices(BaseModel):
 
     uploaded_content_config: UploadedContentConfig = UploadedContentConfig()
 
+    tool_progress_reporter_config: ToolProgressReporterConfig = (
+        ToolProgressReporterConfig()
+    )
+
 
 class InputTokenDistributionConfig(BaseModel):
     model_config = get_configuration_dict(frozen=True)
@@ -230,43 +247,36 @@ class SubAgentsConfig(BaseModel):
         | DeactivatedNone
     ) = SubAgentEvaluationServiceConfig()
 
+    sleep_time_before_update: float = Field(
+        default=0.5,
+        description="Time to sleep before updating the main agent message to display the sub agent responses. Temporary fix to avoid rendering issues.",
+    )
 
-class ResponsesApiConfig(BaseModel):
-    model_config = get_configuration_dict(frozen=True)
 
-    use_responses_api: bool = Field(
-        default=False,
-        description="Whether to use the responses API instead of the completions API.",
+class CodeInterpreterExtendedConfig(OpenAICodeInterpreterConfig):
+    generated_files_scope_id: str = Field(
+        description="Folder where files generated by the LLM will be uploaded",
     )
-    code_interpreter_display_config: (
+    display_config: (
         Annotated[
             ShowExecutedCodePostprocessorConfig,
             Field(title="Active"),
         ]
         | DeactivatedNone
-    ) = ShowExecutedCodePostprocessorConfig()
-
-    use_direct_azure_client: SkipJsonSchema[bool] = Field(
-        default=True,
-        description="[TEMPORARY] Whether to use the direct Azure client instead of the responses API.",
-    )
-    direct_azure_client_api_base_env_var: SkipJsonSchema[str] = Field(
-        default="OPENAI_BASE_URL",
-        description="[TEMPORARY] The environment variable that contains the API base for the direct Azure client.",
-    )
-    direct_azure_client_api_key_env_var: SkipJsonSchema[str] = Field(
-        default="OPENAI_API_KEY",
-        description="[TEMPORARY] The environment variable that contains the API key for the direct Azure client.",
+    ) = Field(
+        ShowExecutedCodePostprocessorConfig(),
+        description="If active, generated code will be prepended to the LLM answer",
     )
+
+
+class ResponsesApiConfig(BaseModel):
+    model_config = get_configuration_dict(frozen=True)
+
     code_interpreter: (
-        Annotated[OpenAICodeInterpreterConfig, Field(title="Active")] | DeactivatedNone
+        Annotated[CodeInterpreterExtendedConfig, Field(title="Active")]
+        | DeactivatedNone
     ) = Field(default=None, description="Config for openai code interpreter")
 
-    generated_files_scope_id: str = Field(
-        default="<SCOPE_ID_PLACEHOLDER>",
-        description="Scope ID for the responses API.",
-    )
-
 
 class ExperimentalConfig(BaseModel):
     """Experimental features this part of the configuration might evolve in the future continuously"""
@@ -301,7 +311,12 @@ class ExperimentalConfig(BaseModel):
 
     sub_agents_config: SubAgentsConfig = SubAgentsConfig()
 
-    responses_api_config: ResponsesApiConfig = ResponsesApiConfig()
+    responses_api_config: (
+        Annotated[ResponsesApiConfig, Field(title="Active")] | DeactivatedNone
+    ) = Field(
+        default=None,
+        description="If active, the main agent will use the responses api from open ai",
+    )
 
 
 class UniqueAIAgentConfig(BaseModel):

unique_orchestrator/prompts/system_prompt.jinja2

@@ -7,6 +7,15 @@ You are Unique AI Chat a system based on large language models
 **Knowledge cutoff**: {{ model_info.info_cutoff_at | default('unknown') }}
 **Current date**: {{ date_string }}
 
+{#- User Metadata Section #}
+{% if user_metadata and user_metadata|length > 0 %}
+# User Information
+Here is some metadata about the user, which may help you write better queries, and help contextualize the information you retrieve:
+{%- for key, value in user_metadata.items() %}
+- {{ key.replace('_', ' ').title() }}: {{ value }}
+{%- endfor %}
+{%- endif %}
+
 Over the course of the conversation, you adapt to the user's tone and preference.
 Try to match the user's vibe, tone, and generally how they are speaking. You want the conversation to feel natural.
 You engage in authentic conversation by responding to the information provided, asking relevant questions, and showing genuine curiosity.

unique_orchestrator/tests/test_unique_ai_get_filtered_user_metadata.py

@@ -0,0 +1,257 @@
+from unittest.mock import MagicMock
+
+import pytest
+
+
+class TestGetFilteredUserMetadata:
+    """Test suite for UniqueAI._get_filtered_user_metadata method"""
+
+    @pytest.fixture
+    def mock_unique_ai(self):
+        """Create a minimal UniqueAI instance with mocked dependencies"""
+        # Lazy import to avoid heavy dependencies at module import time
+        from unique_orchestrator.unique_ai import UniqueAI
+
+        mock_logger = MagicMock()
+
+        # Create minimal event structure
+        dummy_event = MagicMock()
+        dummy_event.payload.assistant_message.id = "assist_1"
+        dummy_event.payload.user_message.text = "query"
+
+        # Create minimal config structure
+        mock_config = MagicMock()
+        mock_config.agent.prompt_config.user_metadata = []
+
+        # Create minimal required dependencies
+        mock_chat_service = MagicMock()
+        mock_content_service = MagicMock()
+        mock_debug_info_manager = MagicMock()
+        mock_reference_manager = MagicMock()
+        mock_thinking_manager = MagicMock()
+        mock_tool_manager = MagicMock()
+        mock_history_manager = MagicMock()
+        mock_evaluation_manager = MagicMock()
+        mock_postprocessor_manager = MagicMock()
+        mock_streaming_handler = MagicMock()
+
+        # Instantiate UniqueAI
+        ua = UniqueAI(
+            logger=mock_logger,
+            event=dummy_event,
+            config=mock_config,
+            chat_service=mock_chat_service,
+            content_service=mock_content_service,
+            debug_info_manager=mock_debug_info_manager,
+            streaming_handler=mock_streaming_handler,
+            reference_manager=mock_reference_manager,
+            thinking_manager=mock_thinking_manager,
+            tool_manager=mock_tool_manager,
+            history_manager=mock_history_manager,
+            evaluation_manager=mock_evaluation_manager,
+            postprocessor_manager=mock_postprocessor_manager,
+            mcp_servers=[],
+        )
+
+        return ua
+
+    def test_returns_empty_dict_when_config_is_empty_list(self, mock_unique_ai):
+        """Test that empty dict is returned when config.user_metadata is an empty list"""
+        mock_unique_ai._config.agent.prompt_config.user_metadata = []
+        mock_unique_ai._event.payload.user_metadata = {
+            "department": "Engineering",
+            "role": "Developer",
+        }
+
+        result = mock_unique_ai._get_filtered_user_metadata()
+
+        assert result == {}
+        assert isinstance(result, dict)
+
+    def test_returns_empty_dict_when_user_metadata_is_none(self, mock_unique_ai):
+        """Test that empty dict is returned when user_metadata is None"""
+        mock_unique_ai._config.agent.prompt_config.user_metadata = [
+            "department",
+            "role",
+        ]
+        mock_unique_ai._event.payload.user_metadata = None
+
+        result = mock_unique_ai._get_filtered_user_metadata()
+
+        assert result == {}
+        assert isinstance(result, dict)
+
+    def test_returns_empty_dict_when_both_config_and_metadata_are_empty(
+        self, mock_unique_ai
+    ):
+        """Test that empty dict is returned when both config and user_metadata are empty/None"""
+        mock_unique_ai._config.agent.prompt_config.user_metadata = []
+        mock_unique_ai._event.payload.user_metadata = None
+
+        result = mock_unique_ai._get_filtered_user_metadata()
+
+        assert result == {}
+        assert isinstance(result, dict)
+
+    def test_filters_metadata_to_include_only_configured_keys(self, mock_unique_ai):
+        """Test that only keys specified in config are included in the result"""
+        mock_unique_ai._config.agent.prompt_config.user_metadata = [
+            "department",
+            "role",
+        ]
+        mock_unique_ai._event.payload.user_metadata = {
+            "department": "Engineering",
+            "role": "Developer",
+            "location": "San Francisco",
+            "salary": "100000",
+        }
+
+        result = mock_unique_ai._get_filtered_user_metadata()
+
+        assert result == {"department": "Engineering", "role": "Developer"}
+        assert "location" not in result
+        assert "salary" not in result
+        # Verify all values are strings
+        assert all(isinstance(v, str) for v in result.values())
+
+    def test_returns_only_existing_keys_from_user_metadata(self, mock_unique_ai):
+        """Test that keys in config but not in user_metadata are not included"""
+        mock_unique_ai._config.agent.prompt_config.user_metadata = [
+            "department",
+            "role",
+            "team",
+            "manager",
+        ]
+        mock_unique_ai._event.payload.user_metadata = {
+            "department": "Engineering",
+            "role": "Developer",
+        }
+
+        result = mock_unique_ai._get_filtered_user_metadata()
+
+        assert result == {"department": "Engineering", "role": "Developer"}
+        assert "team" not in result
+        assert "manager" not in result
+
+    def test_handles_single_key_in_config(self, mock_unique_ai):
+        """Test filtering with a single key in config"""
+        mock_unique_ai._config.agent.prompt_config.user_metadata = ["department"]
+        mock_unique_ai._event.payload.user_metadata = {
+            "department": "Engineering",
+            "role": "Developer",
+        }
+
+        result = mock_unique_ai._get_filtered_user_metadata()
+
+        assert result == {"department": "Engineering"}
+        assert isinstance(result["department"], str)
+
+    def test_handles_string_values(self, mock_unique_ai):
+        """Test that string values in user_metadata are preserved"""
+        mock_unique_ai._config.agent.prompt_config.user_metadata = [
+            "name",
+            "email",
+            "department",
+            "title",
+        ]
+        mock_unique_ai._event.payload.user_metadata = {
+            "name": "John Doe",
+            "email": "john.doe@example.com",
+            "department": "Engineering",
+            "title": "Senior Developer",
+            "ignored": "This should not appear",
+        }
+
+        result = mock_unique_ai._get_filtered_user_metadata()
+
+        assert result == {
+            "name": "John Doe",
+            "email": "john.doe@example.com",
+            "department": "Engineering",
+            "title": "Senior Developer",
+        }
+        assert "ignored" not in result
+        # Verify all values are strings
+        assert all(isinstance(v, str) for v in result.values())
+
+    def test_handles_empty_dict_user_metadata(self, mock_unique_ai):
+        """Test behavior when user_metadata is an empty dict"""
+        mock_unique_ai._config.agent.prompt_config.user_metadata = ["department"]
+        mock_unique_ai._event.payload.user_metadata = {}
+
+        result = mock_unique_ai._get_filtered_user_metadata()
+
+        assert result == {}
+
+    def test_handles_empty_string_values(self, mock_unique_ai):
+        """Test that empty string values in user_metadata are preserved if key is in config"""
+        mock_unique_ai._config.agent.prompt_config.user_metadata = [
+            "department",
+            "role",
+        ]
+        mock_unique_ai._event.payload.user_metadata = {
+            "department": "Engineering",
+            "role": "",
+        }
+
+        result = mock_unique_ai._get_filtered_user_metadata()
+
+        assert result == {"department": "Engineering", "role": ""}
+        assert isinstance(result["role"], str)
+
+    def test_preserves_original_metadata_unchanged(self, mock_unique_ai):
+        """Test that the original user_metadata dict is not modified"""
+        original_metadata = {
+            "department": "Engineering",
+            "role": "Developer",
+            "location": "San Francisco",
+        }
+        mock_unique_ai._config.agent.prompt_config.user_metadata = ["department"]
+        mock_unique_ai._event.payload.user_metadata = original_metadata.copy()
+
+        result = mock_unique_ai._get_filtered_user_metadata()
+
+        # Original should still have all keys
+        assert mock_unique_ai._event.payload.user_metadata == original_metadata
+        # Result should only have filtered key
+        assert result == {"department": "Engineering"}
+
+    def test_handles_special_characters_in_values(self, mock_unique_ai):
+        """Test that special characters in string values are preserved"""
+        mock_unique_ai._config.agent.prompt_config.user_metadata = [
+            "description",
+            "notes",
+        ]
+        mock_unique_ai._event.payload.user_metadata = {
+            "description": "User with special chars: @#$%^&*()",
+            "notes": "Multi-line\ntext\twith\ttabs",
+            "other": "excluded",
+        }
+
+        result = mock_unique_ai._get_filtered_user_metadata()
+
+        assert result == {
+            "description": "User with special chars: @#$%^&*()",
+            "notes": "Multi-line\ntext\twith\ttabs",
+        }
+        assert all(isinstance(v, str) for v in result.values())
+
+    def test_return_type_is_dict_str_str(self, mock_unique_ai):
+        """Test that return type is dict[str, str]"""
+        mock_unique_ai._config.agent.prompt_config.user_metadata = [
+            "department",
+            "role",
+        ]
+        mock_unique_ai._event.payload.user_metadata = {
+            "department": "Engineering",
+            "role": "Developer",
+        }
+
+        result = mock_unique_ai._get_filtered_user_metadata()
+
+        # Check it's a dict
+        assert isinstance(result, dict)
+        # Check all keys are strings
+        assert all(isinstance(k, str) for k in result.keys())
+        # Check all values are strings
+        assert all(isinstance(v, str) for v in result.values())

unique_orchestrator/unique_ai.py

@@ -1,3 +1,4 @@
+import asyncio
 from datetime import datetime
 from logging import Logger
 
@@ -14,6 +15,7 @@ from unique_toolkit.agentic.reference_manager.reference_manager import Reference
 from unique_toolkit.agentic.thinking_manager.thinking_manager import ThinkingManager
 from unique_toolkit.agentic.tools.tool_manager import (
     ResponsesApiToolManager,
+    SafeTaskExecutor,
     ToolManager,
 )
 from unique_toolkit.app.schemas import ChatEvent, McpServer
@@ -133,9 +135,6 @@ class UniqueAI:
             self.start_text = self._thinking_manager.update_start_text(
                 self.start_text, loop_response
             )
-            await self._create_new_assistant_message_if_loop_response_contains_content(
-                loop_response
-            )
 
         # Only set completed_at if no tool took control. Tools that take control will set the message state to completed themselves.
         await self._chat_service.modify_assistant_message_async(
@@ -229,6 +228,9 @@ class UniqueAI:
             self._logger.debug(
                 "Tools were called we process them and do not exit the loop"
             )
+            await self._create_new_assistant_message_if_loop_response_contains_content(
+                loop_response
+            )
 
             return await self._handle_tool_calls(loop_response)
 
@@ -259,12 +261,17 @@ class UniqueAI:
             for prompts in self._tool_manager.get_tool_prompts()
         ]
 
-        used_tools = [m.name for m in self._tool_manager.get_tools()]
+        used_tools = [t.name for t in self._history_manager.get_tool_calls()]
+        sub_agent_calls = self._tool_manager.filter_tool_calls(
+            self._history_manager.get_tool_calls(), ["subagent"]
+        )
 
         mcp_server_user_prompts = [
             mcp_server.user_prompt for mcp_server in self._mcp_servers
         ]
 
+        user_metadata = self._get_filtered_user_metadata()
+
         tool_descriptions = self._tool_manager.get_tool_prompts()
 
         query = self._event.payload.user_message.text
@@ -272,6 +279,7 @@ class UniqueAI:
         if (
             self._config.agent.experimental.sub_agents_config.referencing_config
             is not None
+            and len(sub_agent_calls) > 0
         ):
             use_sub_agent_references = True
             sub_agent_referencing_instructions = self._config.agent.experimental.sub_agents_config.referencing_config.referencing_instructions_for_user_prompt
@@ -287,16 +295,18 @@ class UniqueAI:
             tool_descriptions_with_user_prompts=tool_descriptions_with_user_prompts,
             use_sub_agent_references=use_sub_agent_references,
             sub_agent_referencing_instructions=sub_agent_referencing_instructions,
+            user_metadata=user_metadata,
         )
         return user_msg
 
-    async def _render_system_prompt(
-        self,
-    ) -> str:
+    async def _render_system_prompt(self) -> str:
         # TODO: Collect tool information here and adapt to system prompt
         tool_descriptions = self._tool_manager.get_tool_prompts()
 
-        used_tools = [m.name for m in self._tool_manager.get_tools()]
+        used_tools = [t.name for t in self._history_manager.get_tool_calls()]
+        sub_agent_calls = self._tool_manager.filter_tool_calls(
+            self._history_manager.get_tool_calls(), ["subagent"]
+        )
 
         system_prompt_template = jinja2.Template(
             self._config.agent.prompt_config.system_prompt_template
@@ -304,6 +314,8 @@ class UniqueAI:
 
         date_string = datetime.now().strftime("%A %B %d, %Y")
 
+        user_metadata = self._get_filtered_user_metadata()
+
         mcp_server_system_prompts = [
             mcp_server.system_prompt for mcp_server in self._mcp_servers
         ]
@@ -311,6 +323,7 @@ class UniqueAI:
         if (
             self._config.agent.experimental.sub_agents_config.referencing_config
             is not None
+            and len(sub_agent_calls) > 0
         ):
             use_sub_agent_references = True
             sub_agent_referencing_instructions = self._config.agent.experimental.sub_agents_config.referencing_config.referencing_instructions_for_system_prompt
@@ -331,6 +344,7 @@ class UniqueAI:
             mcp_server_system_prompts=mcp_server_system_prompts,
             use_sub_agent_references=use_sub_agent_references,
             sub_agent_referencing_instructions=sub_agent_referencing_instructions,
+            user_metadata=user_metadata,
         )
         return system_message
 
@@ -338,14 +352,31 @@ class UniqueAI:
         self, loop_response: LanguageModelStreamResponse
     ) -> bool:
         """Handle the case where no tool calls are returned."""
+        task_executor = SafeTaskExecutor(
+            logger=self._logger,
+        )
+
         selected_evaluation_names = self._tool_manager.get_evaluation_check_list()
-        evaluation_results = await self._evaluation_manager.run_evaluations(
-            selected_evaluation_names, loop_response, self._latest_assistant_id
+        evaluation_results = task_executor.execute_async(
+            self._evaluation_manager.run_evaluations,
+            selected_evaluation_names,
+            loop_response,
+            self._latest_assistant_id,
+        )
+
+        postprocessor_result = task_executor.execute_async(
+            self._postprocessor_manager.run_postprocessors,
+            loop_response.model_copy(deep=True),
         )
 
-        await self._postprocessor_manager.run_postprocessors(loop_response)
+        _, evaluation_results = await asyncio.gather(
+            postprocessor_result,
+            evaluation_results,
+        )
 
-        if not all(result.is_positive for result in evaluation_results):
+        if evaluation_results.success and not all(
+            result.is_positive for result in evaluation_results.unpack()
+        ):
             self._logger.warning(
                 "we should add here the retry counter add an instruction and retry the loop for now we just exit the loop"
             )  # TODO: add retry counter and instruction
@@ -363,6 +394,9 @@ class UniqueAI:
         # Append function calls to history
         self._history_manager._append_tool_calls_to_history(tool_calls)
 
+        for tool_call in tool_calls:
+            self._history_manager.add_tool_call(tool_call)
+
         # Execute tool calls
         tool_call_responses = await self._tool_manager.execute_selected_tools(
             tool_calls
@@ -416,6 +450,26 @@ class UniqueAI:
             )
         )
 
+    def _get_filtered_user_metadata(self) -> dict[str, str]:
+        """
+        Filter user metadata to only include keys specified in the agent's prompt config.
+
+        Returns:
+            Dictionary containing only the metadata keys that are configured to be included.
+        """
+        user_metadata = {}
+        if (
+            self._config.agent.prompt_config.user_metadata
+            and self._event.payload.user_metadata is not None
+        ):
+            # Filter metadata to only include selected keys
+            user_metadata = {
+                k: str(v)
+                for k, v in self._event.payload.user_metadata.items()
+                if k in self._config.agent.prompt_config.user_metadata
+            }
+        return user_metadata
+
 
 class UniqueAIResponsesApi(UniqueAI):
     def __init__(

unique_orchestrator/unique_ai_builder.py

@@ -1,8 +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 (
     FollowUpPostprocessor,
 )
@@ -31,7 +29,6 @@ from unique_toolkit.agentic.history_manager.history_manager import (
     HistoryManagerConfig,
 )
 from unique_toolkit.agentic.postprocessor.postprocessor_manager import (
-    Postprocessor,
     PostprocessorManager,
 )
 from unique_toolkit.agentic.reference_manager.reference_manager import ReferenceManager
@@ -47,8 +44,13 @@ from unique_toolkit.agentic.thinking_manager.thinking_manager import (
 from unique_toolkit.agentic.tools.a2a import (
     A2AManager,
     ExtendedSubAgentToolConfig,
+    SubAgentDisplaySpec,
     SubAgentEvaluationService,
-    SubAgentResponsesPostprocessor,
+    SubAgentEvaluationSpec,
+    SubAgentReferencesPostprocessor,
+    SubAgentResponsesDisplayPostprocessor,
+    SubAgentResponsesPostprocessorConfig,
+    SubAgentResponseWatcher,
 )
 from unique_toolkit.agentic.tools.config import ToolBuildConfig
 from unique_toolkit.agentic.tools.mcp.manager import MCPManager
@@ -78,7 +80,7 @@ async def build_unique_ai(
 ) -> UniqueAI | UniqueAIResponsesApi:
     common_components = _build_common(event, logger, config)
 
-    if config.agent.experimental.responses_api_config.use_responses_api:
+    if config.agent.experimental.responses_api_config is not None:
         return await _build_responses(
             event=event,
             logger=logger,
@@ -104,13 +106,14 @@ class _CommonComponents(NamedTuple):
     reference_manager: ReferenceManager
     history_manager: HistoryManager
     evaluation_manager: EvaluationManager
+    postprocessor_manager: PostprocessorManager
+    response_watcher: SubAgentResponseWatcher
     # Tool Manager Components
     tool_progress_reporter: ToolProgressReporter
     tool_manager_config: ToolManagerConfig
     mcp_manager: MCPManager
     a2a_manager: A2AManager
     mcp_servers: list[McpServer]
-    postprocessors: list[Postprocessor]
 
 
 def _build_common(
@@ -124,7 +127,12 @@ def _build_common(
 
     uploaded_documents = content_service.get_documents_uploaded_to_chat()
 
-    tool_progress_reporter = ToolProgressReporter(chat_service=chat_service)
+    response_watcher = SubAgentResponseWatcher()
+
+    tool_progress_reporter = ToolProgressReporter(
+        chat_service=chat_service,
+        config=config.agent.services.tool_progress_reporter_config,
+    )
     thinking_manager_config = ThinkingManagerConfig(
         thinking_steps_display=config.agent.experimental.thinking_steps_display
     )
@@ -138,9 +146,7 @@ def _build_common(
     reference_manager = ReferenceManager()
 
     history_manager_config = HistoryManagerConfig(
-        experimental_features=history_manager_module.ExperimentalFeatures(
-            full_sources_serialize_dump=False,
-        ),
+        experimental_features=history_manager_module.ExperimentalFeatures(),
         percent_of_max_tokens_for_history=config.agent.input_token_distribution.percent_for_history,
         language_model=config.space.language_model,
         uploaded_content_config=config.agent.services.uploaded_content_config,
@@ -171,16 +177,21 @@ 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,
     )
 
-    postprocessors = []
+    postprocessor_manager = PostprocessorManager(
+        logger=logger,
+        chat_service=chat_service,
+    )
 
-    if config.agent.services.stock_ticker_config:
-        postprocessors.append(
+    if config.agent.services.stock_ticker_config is not None:
+        postprocessor_manager.add_postprocessor(
             StockTickerPostprocessor(
                 config=config.agent.services.stock_ticker_config,
                 event=event,
@@ -191,7 +202,8 @@ def _build_common(
         config.agent.services.follow_up_questions_config
         and config.agent.services.follow_up_questions_config.number_of_questions > 0
     ):
-        postprocessors.append(
+        # Should run last to make sure the follow up questions are displayed last.
+        postprocessor_manager.set_last_postprocessor(
             FollowUpPostprocessor(
                 logger=logger,
                 config=config.agent.services.follow_up_questions_config,
@@ -214,40 +226,9 @@ def _build_common(
         a2a_manager=a2a_manager,
         tool_manager_config=tool_manager_config,
         mcp_servers=event.payload.mcp_servers,
-        postprocessors=postprocessors,
-    )
-
-
-def _prepare_base_url(url: str, use_v1: bool) -> str:
-    url = url.rstrip("/") + "/openai"
-
-    if use_v1:
-        url += "/v1"
-
-    return url
-
-
-def _get_openai_client_from_env(
-    config: UniqueAIConfig, use_v1: bool = False
-) -> AsyncOpenAI:
-    use_direct_azure_client = (
-        config.agent.experimental.responses_api_config.use_direct_azure_client
+        postprocessor_manager=postprocessor_manager,
+        response_watcher=response_watcher,
     )
-    api_key_env_var = config.agent.experimental.responses_api_config.direct_azure_client_api_key_env_var
-    api_base_env_var = config.agent.experimental.responses_api_config.direct_azure_client_api_base_env_var
-
-    if use_direct_azure_client:
-        # TODO: (for testing only), remove when v1 endpoint is working
-        return AsyncOpenAI(
-            api_key=os.environ[api_key_env_var],
-            base_url=_prepare_base_url(os.environ[api_base_env_var], use_v1=use_v1),
-        )
-    else:
-        return get_async_openai_client().copy(
-            default_headers={
-                "x-model": config.space.language_model.name
-            }  # Backend requires a model name
-        )
 
 
 async def _build_responses(
@@ -257,25 +238,52 @@ async def _build_responses(
     common_components: _CommonComponents,
     debug_info_manager: DebugInfoManager,
 ) -> UniqueAIResponsesApi:
-    client = _get_openai_client_from_env(config, use_v1=True)
+    client = get_async_openai_client().copy(
+        default_headers={
+            "x-model": config.space.language_model.name,
+            "x-user-id": event.user_id,
+            "x-company-id": event.company_id,
+            "x-assistant-id": event.payload.assistant_id,
+            "x-chat-id": event.payload.chat_id,
+        }
+    )
+
+    assert config.agent.experimental.responses_api_config is not None
+
     code_interpreter_config = (
         config.agent.experimental.responses_api_config.code_interpreter
     )
-
+    postprocessor_manager = common_components.postprocessor_manager
     tool_names = [tool.name for tool in config.space.tools]
-    if (
-        code_interpreter_config is not None
-        and OpenAIBuiltInToolName.CODE_INTERPRETER not in tool_names
-    ):
-        logger.info("Automatically adding code interpreter to the tools")
-        config = config.model_copy(deep=True)
-        config.space.tools.append(
-            ToolBuildConfig(
-                name=OpenAIBuiltInToolName.CODE_INTERPRETER,
-                configuration=code_interpreter_config,
+
+    if code_interpreter_config is not None:
+        if OpenAIBuiltInToolName.CODE_INTERPRETER not in tool_names:
+            logger.info("Automatically adding code interpreter to the tools")
+            config = config.model_copy(deep=True)
+            config.space.tools.append(
+                ToolBuildConfig(
+                    name=OpenAIBuiltInToolName.CODE_INTERPRETER,
+                    configuration=code_interpreter_config,
+                )
+            )
+            common_components.tool_manager_config.tools = config.space.tools
+
+        if code_interpreter_config.display_config is not None:
+            postprocessor_manager.add_postprocessor(
+                ShowExecutedCodePostprocessor(
+                    config=code_interpreter_config.display_config
+                )
+            )
+
+        postprocessor_manager.add_postprocessor(
+            DisplayCodeInterpreterFilesPostProcessor(
+                client=client,
+                content_service=common_components.content_service,
+                config=DisplayCodeInterpreterFilesPostProcessorConfig(
+                    upload_scope_id=code_interpreter_config.generated_files_scope_id,
+                ),
             )
         )
-        common_components.tool_manager_config.tools = config.space.tools
 
     builtin_tool_manager = OpenAIBuiltInToolManager(
         uploaded_files=common_components.uploaded_documents,
@@ -296,32 +304,7 @@ async def _build_responses(
         builtin_tool_manager=builtin_tool_manager,
     )
 
-    postprocessor_manager = PostprocessorManager(
-        logger=logger,
-        chat_service=common_components.chat_service,
-    )
-    for postprocessor in common_components.postprocessors:
-        postprocessor_manager.add_postprocessor(postprocessor)
-
-    if (
-        config.agent.experimental.responses_api_config.code_interpreter_display_config
-        is not None
-    ):
-        postprocessor_manager.add_postprocessor(
-            ShowExecutedCodePostprocessor(
-                config=config.agent.experimental.responses_api_config.code_interpreter_display_config
-            )
-        )
-
-    postprocessor_manager.add_postprocessor(
-        DisplayCodeInterpreterFilesPostProcessor(
-            client=client,
-            content_service=common_components.content_service,
-            config=DisplayCodeInterpreterFilesPostProcessorConfig(
-                upload_scope_id=config.agent.experimental.responses_api_config.generated_files_scope_id,
-            ),
-        )
-    )
+    postprocessor_manager = common_components.postprocessor_manager
 
     class ResponsesStreamingHandler(ResponsesSupportCompleteWithReferences):
         def complete_with_references(self, *args, **kwargs):
@@ -339,15 +322,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,
+        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(
@@ -375,17 +358,24 @@ def _build_completions(
     common_components: _CommonComponents,
     debug_info_manager: DebugInfoManager,
 ) -> UniqueAI:
-    if len(common_components.uploaded_documents) > 0:
+    # Uploaded content behavior is always to force uploaded search tool:
+    # 1. Add it to forced tools if there are tool choices.
+    # 2. Simply force it if there are no tool choices.
+    # 3. Not available if not uploaded documents.
+    UPLOADED_DOCUMENTS = len(common_components.uploaded_documents) > 0
+    TOOL_CHOICES = len(event.payload.tool_choices) > 0
+    if UPLOADED_DOCUMENTS:
         logger.info(
             f"Adding UploadedSearchTool with {len(common_components.uploaded_documents)} documents"
         )
-        config.space.tools.append(
+        common_components.tool_manager_config.tools.append(
             ToolBuildConfig(
                 name=UploadedSearchTool.name,
                 display_name=UploadedSearchTool.name,
                 configuration=UploadedSearchConfig(),
-            ),
+            )
         )
+    if TOOL_CHOICES and UPLOADED_DOCUMENTS:
         event.payload.tool_choices.append(str(UploadedSearchTool.name))
 
     tool_manager = ToolManager(
@@ -396,26 +386,23 @@ def _build_completions(
         mcp_manager=common_components.mcp_manager,
         a2a_manager=common_components.a2a_manager,
     )
+    if not TOOL_CHOICES and UPLOADED_DOCUMENTS:
+        tool_manager.add_forced_tool(UploadedSearchTool.name)
 
-    postprocessor_manager = PostprocessorManager(
-        logger=logger,
-        chat_service=common_components.chat_service,
-    )
-    for postprocessor in common_components.postprocessors:
-        postprocessor_manager.add_postprocessor(postprocessor)
+    postprocessor_manager = common_components.postprocessor_manager
 
     _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,
+        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(
@@ -439,24 +426,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,
+    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,
+        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(
@@ -464,18 +464,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.5.0.dist-info → unique_orchestrator-1.7.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_orchestrator
-Version: 1.5.0
+Version: 1.7.7
 Summary: 
 License: Proprietary
 Author: Andreas Hauri
@@ -17,9 +17,10 @@ Requires-Dist: typing-extensions (>=4.9.0,<5.0.0)
 Requires-Dist: unique-deep-research (>=3.0.0,<4.0.0)
 Requires-Dist: unique-follow-up-questions (>=1.1.2,<2.0.0)
 Requires-Dist: unique-internal-search (>=1.0.1,<2.0.0)
-Requires-Dist: unique-sdk (>=0.10.24,<0.11.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-toolkit (>=1.16.1,<2.0.0)
+Requires-Dist: unique-swot (>=0.1.0,<0.2.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
 
@@ -33,6 +34,47 @@ 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.7] - 2025-11-10
+- Remove direct azure client config from responses api config
+- Organize Responses API config better
+
+## [1.7.6] - 2025-11-05
+- Update default system prompt (including user metadata section)
+
+## [1.7.5] - 2025-11-05
+- Adding functionality to include user metadata into user/system prompts of the orchestrator
+
+## [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.
+
+## [1.7.2] - 2025-11-03
+- Add Swot tool to the orchestrator
+
+## [1.7.1] - 2025-10-30
+- Fixing that system format info is only appended to system prompt if tool is called
+
+## [1.7.0] - 2025-10-30
+- Add option to customize the display of tool progress statuses.
+- Make follow-questions postprocessor run last to make sure the follow up questions are displayed last.
+
+## [1.6.1] - 2025-10-28
+- Removing unused experimental config `full_sources_serialize_dump` in `history_manager`
+
+## [1.6.0] - 2025-10-27
+- Add temporary config option `sleep_time_before_update` to avoid rendering issues with sub agent responses`
+
+## [1.5.2] - 2025-10-23
+- Run evaluation and post processing in parallel
+
+## [1.5.1] - 2025-10-17
+- revert behavior of unique ai upload and chat to 
+1. Add upload and chat tool to forced tools if there are tool choices
+2. Simply force it if there are no tool choices.
+3. Tool not available when no uploaded documents
+
 ## [1.5.0] - 2025-10-16
 - Make code interpreter configurable through spaces 2.0.
 

unique_orchestrator-1.7.7.dist-info/RECORD

@@ -0,0 +1,12 @@
+unique_orchestrator/config.py,sha256=MWoms-7GDF7ki6KtsQGt5zwqYRVjbtGQnfEr5KsNhD8,11657
+unique_orchestrator/prompts/generic_reference_prompt.jinja2,sha256=fYPaiE-N1gSoOqu85OeEBa_ttAim8grOhHuOHJjSHNU,2663
+unique_orchestrator/prompts/system_prompt.jinja2,sha256=IcjkImrQxSrkcUs7BfiAeArhSH0RSxnVIrsJWs-53II,7571
+unique_orchestrator/prompts/user_message_prompt.jinja2,sha256=BQokpBh3H2J-rFk8i-PRph3jy4T1gAJPPb1mxxRWNuM,878
+unique_orchestrator/tests/test_unique_ai_get_filtered_user_metadata.py,sha256=I0xkhR_1DFZEiwSm5x6_B668fQTlYm5tYtPU9uULX3k,9661
+unique_orchestrator/tests/test_unique_ai_reference_order.py,sha256=8mZeVP1k8neH4qrFW3oa3zwIdaq2c7R1VvurC7kjBU8,4445
+unique_orchestrator/unique_ai.py,sha256=qmbWul6O0ri50PtWNt8qz4GHsxZe5upJW7XOo6fmQL0,20743
+unique_orchestrator/unique_ai_builder.py,sha256=Vh4dL4rm-rt1ten3Xi3pkhgjkmr6tuEEithc5L_Z8Cg,18080
+unique_orchestrator-1.7.7.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_orchestrator-1.7.7.dist-info/METADATA,sha256=ZmqFUSyXzxYH-ShKQVxLy6hKGN3Z5F48rzVmzYSu7ck,4640
+unique_orchestrator-1.7.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_orchestrator-1.7.7.dist-info/RECORD,,

unique_orchestrator-1.5.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-unique_orchestrator/config.py,sha256=IwYUrPUzyanKA8sQpS5J-u1WzsBnqQlKRv-vUM_2uRU,11361
-unique_orchestrator/prompts/generic_reference_prompt.jinja2,sha256=fYPaiE-N1gSoOqu85OeEBa_ttAim8grOhHuOHJjSHNU,2663
-unique_orchestrator/prompts/system_prompt.jinja2,sha256=YXFdx3PG2p4TKfjEpz7guIw2GaKoY-4zRMEzXaKhHXE,7213
-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=PqeDaXtr2krqQ_xqhr1Kb9j0A3rPaCT0BqIvnJlFVbU,18845
-unique_orchestrator/unique_ai_builder.py,sha256=JEbMYZBY3mxx6kJkAsm33yO4mkP-rj3SLlCuFFOS0Zs,16977
-unique_orchestrator-1.5.0.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
-unique_orchestrator-1.5.0.dist-info/METADATA,sha256=uVIDWlKwLnl6WM23auxCXlIyhh0OOrzEdJLLWgkt1nQ,2918
-unique_orchestrator-1.5.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_orchestrator-1.5.0.dist-info/RECORD,,