unique_orchestrator 1.2.3__py3-none-any.whl → 1.3.0__py3-none-any.whl

unique_orchestrator/config.py

@@ -32,6 +32,11 @@ 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
 
+DeactivatedNone = Annotated[
+    None,
+    Field(title="Deactivated", description="None"),
+]
+
 
 class SpaceType(StrEnum):
     UNIQUE_CUSTOM = "unique_custom"
@@ -121,9 +126,6 @@ class EvaluationConfig(BaseModel):
     model_config = get_configuration_dict()
     max_review_steps: int = 3
     hallucination_config: HallucinationConfig = HallucinationConfig()
-    sub_agents_config: SubAgentEvaluationServiceConfig | None = (
-        SubAgentEvaluationServiceConfig()
-    )
 
 
 # ------------------------------------------------------------
@@ -149,12 +151,6 @@ class UniqueAIPromptConfig(BaseModel):
     )
 
 
-DeactivatedNone = Annotated[
-    None,
-    Field(title="Deactivated", description="None"),
-]
-
-
 class UniqueAIServices(BaseModel):
     """Determine the services the agent is using
 
@@ -205,12 +201,9 @@ class InputTokenDistributionConfig(BaseModel):
         return int(self.percent_for_history * max_input_token)
 
 
-class SubAgentsConfig(BaseModel):
+class SubAgentsReferencingConfig(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.",
@@ -221,6 +214,18 @@ class SubAgentsConfig(BaseModel):
     )
 
 
+class SubAgentsConfig(BaseModel):
+    model_config = get_configuration_dict()
+
+    referencing_config: (
+        Annotated[SubAgentsReferencingConfig, Field(title="Active")] | DeactivatedNone
+    ) = SubAgentsReferencingConfig()
+    evaluation_config: (
+        Annotated[SubAgentEvaluationServiceConfig, Field(title="Active")]
+        | DeactivatedNone
+    ) = SubAgentEvaluationServiceConfig()
+
+
 class ExperimentalConfig(BaseModel):
     """Experimental features this part of the configuration might evolve in the future continuously"""
 
@@ -282,5 +287,5 @@ class UniqueAIConfig(BaseModel):
     @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
+            self.agent.experimental.sub_agents_config.referencing_config = None
         return self

unique_orchestrator/unique_ai.py

@@ -71,6 +71,9 @@ class UniqueAI:
         self._latest_assistant_id: str = event.payload.assistant_message.id
         self._mcp_servers = mcp_servers
 
+        # Helper variable to support control loop
+        self._tool_took_control = False
+
     ############################################################
     # Override of base methods
     ############################################################
@@ -125,8 +128,9 @@ class UniqueAI:
                 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(
-            set_completed_at=True,
+            set_completed_at=not self._tool_took_control,
         )
 
     # @track()
@@ -256,10 +260,15 @@ 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
+        if (
+            self._config.agent.experimental.sub_agents_config.referencing_config
+            is not None
+        ):
+            use_sub_agent_references = True
+            sub_agent_referencing_instructions = self._config.agent.experimental.sub_agents_config.referencing_config.referencing_instructions_for_user_prompt
+        else:
+            use_sub_agent_references = False
+            sub_agent_referencing_instructions = None
 
         user_msg = user_message_template.render(
             query=query,
@@ -290,10 +299,15 @@ 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
+        if (
+            self._config.agent.experimental.sub_agents_config.referencing_config
+            is not None
+        ):
+            use_sub_agent_references = True
+            sub_agent_referencing_instructions = self._config.agent.experimental.sub_agents_config.referencing_config.referencing_instructions_for_system_prompt
+        else:
+            use_sub_agent_references = False
+            sub_agent_referencing_instructions = None
 
         system_message = system_prompt_template.render(
             model_info=self._config.space.language_model.model_dump(mode="json"),
@@ -352,7 +366,10 @@ class UniqueAI:
         self._reference_manager.extract_referenceable_chunks(tool_call_responses)
         self._debug_info_manager.extract_tool_debug_info(tool_call_responses)
 
-        return self._tool_manager.does_a_tool_take_control(tool_calls)
+        self._tool_took_control = self._tool_manager.does_a_tool_take_control(
+            tool_calls
+        )
+        return self._tool_took_control
 
     async def _create_new_assistant_message_if_loop_response_contains_content(
         self, loop_response: LanguageModelStreamResponse

unique_orchestrator/unique_ai_builder.py

@@ -178,12 +178,9 @@ def build_unique_ai(
         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
-        ):
+        if config.agent.experimental.sub_agents_config.evaluation_config is not None:
             sub_agent_evaluation = SubAgentEvaluationService(
-                config=config.agent.services.evaluation_config.sub_agents_config,
+                config=config.agent.experimental.sub_agents_config.evaluation_config,
                 language_model_service=LanguageModelService.from_event(event),
             )
             evaluation_manager.add_evaluation(sub_agent_evaluation)

{unique_orchestrator-1.2.3.dist-info → unique_orchestrator-1.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_orchestrator
-Version: 1.2.3
+Version: 1.3.0
 Summary: 
 License: Proprietary
 Author: Andreas Hauri
@@ -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.3.0] - 2025-10-14
+- Re-organize sub-agents configuration for clarity.
+
+## [1.2.4] - 2025-10-14
+- Let control taking tool itself set the message state to completed
+
 ## [1.2.3] - 2025-10-13
 - Fix bug where follow-up questions were being generated even if the number of questions is set to 0 in the config.
 

unique_orchestrator-1.3.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+unique_orchestrator/config.py,sha256=2A3pDEc37PlOULgQzJu_PoLchwLT7T0OEA1Gieue2Ow,9603
+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=4juvEzASX6FMQJywTYLzH-V-vaCNviqiu7HZ2jkrDSc,17148
+unique_orchestrator/unique_ai_builder.py,sha256=knwm1cJ59SarJE1DsKGVS5WVpU1B_FCPbMHEFQg4uZY,7524
+unique_orchestrator-1.3.0.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_orchestrator-1.3.0.dist-info/METADATA,sha256=7jZHo2njuFcvuYZmSvQp2_9VaLT37a3P9Xwu5LrE6Ro,2556
+unique_orchestrator-1.3.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_orchestrator-1.3.0.dist-info/RECORD,,

unique_orchestrator-1.2.3.dist-info/RECORD

@@ -1,11 +0,0 @@
-unique_orchestrator/config.py,sha256=miZXSKSyYkYahk4VOvZ5v0u93QQX-z0RO6aC0mtJu4w,9519
-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=FUIJAVv0lPTWDgWeMx-KuCyrIc8w8lWyEciFs3_7a3Q,7608
-unique_orchestrator-1.2.3.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
-unique_orchestrator-1.2.3.dist-info/METADATA,sha256=8AZVFC-ygH-hJlGryJr8To5D1qQGxVX-I-7a_oY5EQk,2386
-unique_orchestrator-1.2.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_orchestrator-1.2.3.dist-info/RECORD,,