unique_orchestrator 1.1.0__py3-none-any.whl → 1.2.0__py3-none-any.whl

unique_orchestrator/config.py

@@ -2,7 +2,7 @@ from enum import StrEnum
 from pathlib import Path
 from typing import Annotated, Any, Generic, Literal, TypeVar
 
-from pydantic import BaseModel, Field, ValidationInfo, field_validator
+from pydantic import BaseModel, Field, ValidationInfo, field_validator, model_validator
 from unique_deep_research.config import DeepResearchToolConfig
 from unique_deep_research.service import DeepResearchTool
 from unique_follow_up_questions.config import FollowUpQuestionsConfig
@@ -22,7 +22,11 @@ from unique_toolkit.agentic.evaluation.schemas import EvaluationMetricName
 from unique_toolkit.agentic.history_manager.history_manager import (
     UploadedContentConfig,
 )
-from unique_toolkit.agentic.tools.a2a.evaluation import SubAgentEvaluationConfig
+from unique_toolkit.agentic.tools.a2a import (
+    REFERENCING_INSTRUCTIONS_FOR_SYSTEM_PROMPT,
+    REFERENCING_INSTRUCTIONS_FOR_USER_PROMPT,
+)
+from unique_toolkit.agentic.tools.a2a.evaluation import SubAgentEvaluationServiceConfig
 from unique_toolkit.agentic.tools.config import get_configuration_dict
 from unique_toolkit.agentic.tools.tool import ToolBuildConfig
 from unique_web_search.config import WebSearchConfig
@@ -117,7 +121,9 @@ class EvaluationConfig(BaseModel):
     model_config = get_configuration_dict()
     max_review_steps: int = 3
     hallucination_config: HallucinationConfig = HallucinationConfig()
-    sub_agents_config: SubAgentEvaluationConfig = SubAgentEvaluationConfig()
+    sub_agents_config: SubAgentEvaluationServiceConfig | None = (
+        SubAgentEvaluationServiceConfig()
+    )
 
 
 # ------------------------------------------------------------
@@ -199,6 +205,22 @@ class InputTokenDistributionConfig(BaseModel):
         return int(self.percent_for_history * max_input_token)
 
 
+class SubAgentsConfig(BaseModel):
+    model_config = get_configuration_dict()
+    use_sub_agent_references: bool = Field(
+        default=True,
+        description="Whether to use sub agent references in the main agent's response. Only has an effect if sub agents are used.",
+    )
+    referencing_instructions_for_system_prompt: str = Field(
+        default=REFERENCING_INSTRUCTIONS_FOR_SYSTEM_PROMPT,
+        description="Referencing instructions for the main agent's system prompt.",
+    )
+    referencing_instructions_for_user_prompt: str = Field(
+        default=REFERENCING_INSTRUCTIONS_FOR_USER_PROMPT,
+        description="Referencing instructions for the main agent's user prompt. Should correspond to a short reminder.",
+    )
+
+
 class ExperimentalConfig(BaseModel):
     """Experimental features this part of the configuration might evolve in the future continuously"""
 
@@ -230,6 +252,8 @@ class ExperimentalConfig(BaseModel):
         max_tool_calls_per_iteration=5
     )
 
+    sub_agents_config: SubAgentsConfig = SubAgentsConfig()
+
 
 class UniqueAIAgentConfig(BaseModel):
     model_config = get_configuration_dict(frozen=True)
@@ -254,3 +278,9 @@ class UniqueAIConfig(BaseModel):
     space: UniqueAISpaceConfig = UniqueAISpaceConfig()
 
     agent: UniqueAIAgentConfig = UniqueAIAgentConfig()
+
+    @model_validator(mode="after")
+    def disable_sub_agent_referencing_if_not_used(self) -> "UniqueAIConfig":
+        if not any(tool.is_sub_agent for tool in self.space.tools):
+            self.agent.experimental.sub_agents_config.use_sub_agent_references = False
+        return self

unique_orchestrator/prompts/system_prompt.jinja2

@@ -73,7 +73,12 @@ This tool is called {{ tool_description.display_name }} by the user.
   - {{ meta.message }}
   {%- endif -%}
 {%- endfor -%}
-{%- endif -%}
+{%- endif %}
+
+{% if use_sub_agent_references and sub_agent_referencing_instructions | length > 0 %}
+# Special Instructions: Referencing Sub Agents Answers
+{{ sub_agent_referencing_instructions }}
+{%- endif %}
 
 {# Answer Style Section #}
 # Answer Style

unique_orchestrator/prompts/user_message_prompt.jinja2

@@ -6,13 +6,18 @@
     - date_string: The current date in formatted string
     - mcp_server_user_prompts: List of unique server-wide user prompts from MCP servers
     - tool_descriptions_with_user_prompts: List of UniqueToolDescription objects with user prompts
-#}{{ query }}
+#}
+# User Query
+{{ query }}
 
-{%- if mcp_server_user_prompts and mcp_server_user_prompts|length > 0 %}
+{% if use_sub_agent_references and sub_agent_referencing_instructions | length > 0 %}
+# Sub Agents Referencing Reminder
+{{ sub_agent_referencing_instructions }}
+{%- endif %}
 
-## MCP Server Context
+{%- if mcp_server_user_prompts and mcp_server_user_prompts|length > 0 %}
+# MCP Server Context
 {%- for server_prompt in mcp_server_user_prompts %}
-
 {{ server_prompt }}
 {%- endfor %}
 {%- endif %}

unique_orchestrator/unique_ai.py

@@ -256,12 +256,19 @@ class UniqueAI:
 
         query = self._event.payload.user_message.text
 
+        use_sub_agent_references = (
+            self._config.agent.experimental.sub_agents_config.use_sub_agent_references
+        )
+        sub_agent_referencing_instructions = self._config.agent.experimental.sub_agents_config.referencing_instructions_for_user_prompt
+
         user_msg = user_message_template.render(
             query=query,
             tool_descriptions=tool_descriptions,
             used_tools=used_tools,
             mcp_server_user_prompts=list(mcp_server_user_prompts),
             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,
         )
         return user_msg
 
@@ -283,6 +290,11 @@ class UniqueAI:
             mcp_server.system_prompt for mcp_server in self._mcp_servers
         ]
 
+        use_sub_agent_references = (
+            self._config.agent.experimental.sub_agents_config.use_sub_agent_references
+        )
+        sub_agent_referencing_instructions = self._config.agent.experimental.sub_agents_config.referencing_instructions_for_system_prompt
+
         system_message = system_prompt_template.render(
             model_info=self._config.space.language_model.model_dump(mode="json"),
             date_string=date_string,
@@ -294,6 +306,8 @@ class UniqueAI:
             max_loop_iterations=self._config.agent.max_loop_iterations,
             current_iteration=self.current_iteration_index + 1,
             mcp_server_system_prompts=mcp_server_system_prompts,
+            use_sub_agent_references=use_sub_agent_references,
+            sub_agent_referencing_instructions=sub_agent_referencing_instructions,
         )
         return system_message
 

unique_orchestrator/unique_ai_builder.py

@@ -35,9 +35,10 @@ from unique_toolkit.agentic.thinking_manager.thinking_manager import (
     ThinkingManager,
     ThinkingManagerConfig,
 )
-from unique_toolkit.agentic.tools.a2a.evaluation import SubAgentsEvaluation
-from unique_toolkit.agentic.tools.a2a.manager import A2AManager
-from unique_toolkit.agentic.tools.a2a.postprocessing import (
+from unique_toolkit.agentic.tools.a2a import (
+    A2AManager,
+    ExtendedSubAgentToolConfig,
+    SubAgentEvaluationService,
     SubAgentResponsesPostprocessor,
 )
 from unique_toolkit.agentic.tools.config import ToolBuildConfig
@@ -166,25 +167,33 @@ def build_unique_ai(
         )
 
     if len(tool_manager.sub_agents) > 0:
-        postprocessor_manager.add_postprocessor(
-            SubAgentResponsesPostprocessor(
-                user_id=event.user_id,
-                agent_chat_id=event.payload.chat_id,
-                company_id=event.company_id,
-                sub_agent_tools=tool_manager.sub_agents,
-            )
+        sub_agent_responses_postprocessor = SubAgentResponsesPostprocessor(
+            user_id=event.user_id,
+            main_agent_chat_id=event.payload.chat_id,
+            company_id=event.company_id,
         )
-        if config.agent.services.evaluation_config is not None:
-            logger.info("Adding sub agents evaluation")
-            evaluation_manager.add_evaluation(
-                SubAgentsEvaluation(
-                    config.agent.services.evaluation_config.sub_agents_config,
-                    tool_manager.sub_agents,
-                    LanguageModelService.from_event(event),
-                )
+        postprocessor_manager.add_postprocessor(sub_agent_responses_postprocessor)
+
+        sub_agent_evaluation = None
+        if (
+            config.agent.services.evaluation_config is not None
+            and config.agent.services.evaluation_config.sub_agents_config is not None
+        ):
+            sub_agent_evaluation = SubAgentEvaluationService(
+                config=config.agent.services.evaluation_config.sub_agents_config,
+                language_model_service=LanguageModelService.from_event(event),
             )
-        else:
-            logger.warning("No evaluation config found for sub agents")
+            evaluation_manager.add_evaluation(sub_agent_evaluation)
+
+        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
+            )
+            if sub_agent_evaluation is not None:
+                sub_agent_evaluation.register_sub_agent_tool(
+                    tool, tool.config.evaluation_config
+                )
 
     return UniqueAI(
         event=event,

{unique_orchestrator-1.1.0.dist-info → unique_orchestrator-1.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_orchestrator
-Version: 1.1.0
+Version: 1.2.0
 Summary: 
 License: Proprietary
 Author: Andreas Hauri
@@ -19,7 +19,7 @@ Requires-Dist: unique-follow-up-questions (>=1.0.0,<2.0.0)
 Requires-Dist: unique-internal-search (>=1.0.0,<2.0.0)
 Requires-Dist: unique-sdk (>=0.10.24,<0.11.0)
 Requires-Dist: unique-stock-ticker (>=1.0.0,<2.0.0)
-Requires-Dist: unique-toolkit (>=1.4.0,<2.0.0)
+Requires-Dist: unique-toolkit (>=1.11.0,<2.0.0)
 Requires-Dist: unique-web-search (>=1.0.0,<2.0.0)
 Description-Content-Type: text/markdown
 
@@ -33,6 +33,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.2.0] - 2025-10-07
+- Add sub agent response referencing.
+
+## [1.1.1] - 2025-10-03
+- Adapt orchestrator to toolkit 1.8.0.
+
 ## [1.1.0] - 2025-09-29
 - Add ability to display sub agent's answers in main agent.
 - Add ability to consolidate sub agent's assessment's in main agent.
@@ -61,3 +67,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [0.0.1] - 2025-08-18
 - Initial release of `orchestrator`.
+

unique_orchestrator-1.2.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+unique_orchestrator/config.py,sha256=OqXs0697mEoPEh8baM1z4mU909QD_D812jq8ZQ8wLwc,9512
+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=8sBD5P16XcJ_3BXywBuZRRa4h89ANAi8h3VA4V2G_sI,16471
+unique_orchestrator/unique_ai_builder.py,sha256=m9-k9oVY7RR9ntrWEzBs0gcycNk4JcbqNfqW-DlJXrc,7507
+unique_orchestrator-1.2.0.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_orchestrator-1.2.0.dist-info/METADATA,sha256=AO3IWc2IKsH33aRYbpukGvrySf_iO2hsUwFJBQR9_9w,2098
+unique_orchestrator-1.2.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_orchestrator-1.2.0.dist-info/RECORD,,

unique_orchestrator-1.1.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-unique_orchestrator/config.py,sha256=8TIWd-3d9gEsPyBSKVNWfMnrssvylPTiOGxpW9etwH4,8221
-unique_orchestrator/prompts/generic_reference_prompt.jinja2,sha256=fYPaiE-N1gSoOqu85OeEBa_ttAim8grOhHuOHJjSHNU,2663
-unique_orchestrator/prompts/system_prompt.jinja2,sha256=0FrDZbfpVMjf4G1VBOavG1aUlZTDDDdn_aUGjeVac4g,7018
-unique_orchestrator/prompts/user_message_prompt.jinja2,sha256=KLCfbxMu5R7_V8-AHkdXEmVorcSHNej_xM_7xJyNkl0,692
-unique_orchestrator/tests/test_unique_ai_reference_order.py,sha256=8mZeVP1k8neH4qrFW3oa3zwIdaq2c7R1VvurC7kjBU8,4445
-unique_orchestrator/unique_ai.py,sha256=OFzgyPWvh5mK4p3OxII3hKpQt_dhHBD2BbtHakZ35n8,15635
-unique_orchestrator/unique_ai_builder.py,sha256=wjS3tMdN0kfljBUKVwNJfvZv_pmd14dqv2ZViWHKB8w,7140
-unique_orchestrator-1.1.0.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
-unique_orchestrator-1.1.0.dist-info/METADATA,sha256=DmLm0q6Taii5Ko2uFj3cABAEVIZaiABjducyB2y-cEQ,1969
-unique_orchestrator-1.1.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_orchestrator-1.1.0.dist-info/RECORD,,