unique_orchestrator 2026.22.0.dev4__tar.gz → 2026.22.0.dev6__tar.gz

{unique_orchestrator-2026.22.0.dev4 → unique_orchestrator-2026.22.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: unique-orchestrator
-Version: 2026.22.0.dev4
+Version: 2026.22.0.dev6
 Summary: 
 Author: Andreas Hauri
 Author-email: Andreas Hauri <andreas.hauri@unique.ai>
@@ -9,14 +9,14 @@ Requires-Dist: pydantic>=2.8.2,<3
 Requires-Dist: pydantic-settings>=2.10.1,<3
 Requires-Dist: typing-extensions>=4.9.0,<5
 Requires-Dist: jinja2>=3.1.0,<4
-Requires-Dist: unique-toolkit>=2026.22.0.dev6,<2026.22.0rc0
+Requires-Dist: unique-toolkit>=2026.22.0.dev7,<2026.22.0rc0
 Requires-Dist: unique-stock-ticker>=2026.22.0.dev2,<2026.22.0rc0
 Requires-Dist: unique-follow-up-questions>=2026.22.0.dev2,<2026.22.0rc0
-Requires-Dist: unique-internal-search>=2026.22.0.dev2,<2026.22.0rc0
+Requires-Dist: unique-internal-search>=2026.22.0.dev3,<2026.22.0rc0
 Requires-Dist: unique-deep-research>=2026.22.0.dev2,<2026.22.0rc0
 Requires-Dist: unique-web-search>=2026.22.0.dev4,<2026.22.0rc0
 Requires-Dist: unique-swot>=2026.22.0.dev2,<2026.22.0rc0
-Requires-Dist: unique-skill-tool>=2026.22.0.dev3,<2026.22.0rc0
+Requires-Dist: unique-skill-tool>=2026.22.0.dev4,<2026.22.0rc0
 Requires-Dist: openai>=1.109.1,<3
 Requires-Dist: python-frontmatter>=1.1.0,<2
 Requires-Python: >=3.12, <4

{unique_orchestrator-2026.22.0.dev4 → unique_orchestrator-2026.22.0.dev6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "unique_orchestrator"
-version = "2026.22.0.dev4"
+version = "2026.22.0.dev6"
 description = ""
 readme = "README.md"
 license = { text = "Proprietary" }
@@ -13,14 +13,14 @@ dependencies = [
     "pydantic-settings>=2.10.1,<3",
     "typing-extensions>=4.9.0,<5",
     "jinja2>=3.1.0,<4",
-    "unique-toolkit>=2026.22.0.dev6,<2026.22.0rc0",
+    "unique-toolkit>=2026.22.0.dev7,<2026.22.0rc0",
     "unique-stock-ticker>=2026.22.0.dev2,<2026.22.0rc0",
     "unique-follow-up-questions>=2026.22.0.dev2,<2026.22.0rc0",
-    "unique-internal-search>=2026.22.0.dev2,<2026.22.0rc0",
+    "unique-internal-search>=2026.22.0.dev3,<2026.22.0rc0",
     "unique-deep-research>=2026.22.0.dev2,<2026.22.0rc0",
     "unique-web-search>=2026.22.0.dev4,<2026.22.0rc0",
     "unique-swot>=2026.22.0.dev2,<2026.22.0rc0",
-    "unique-skill-tool>=2026.22.0.dev3,<2026.22.0rc0",
+    "unique-skill-tool>=2026.22.0.dev4,<2026.22.0rc0",
     "openai>=1.109.1,<3",
     "python-frontmatter>=1.1.0,<2",
 ]

{unique_orchestrator-2026.22.0.dev4 → unique_orchestrator-2026.22.0.dev6}/unique_orchestrator/_builders/skill_setup.py

@@ -50,7 +50,6 @@ from pydantic import ValidationError
 from unique_skill_tool.config import SkillToolConfig
 from unique_skill_tool.schemas import SkillDefinition
 from unique_skill_tool.service import SkillTool
-from unique_skill_tool.utils import normalize_skill_name
 from unique_toolkit.agentic.tools.config import ToolBuildConfig
 from unique_toolkit.agentic.tools.schemas import ToolCallResponse
 from unique_toolkit.app.schemas import SkillReference
@@ -140,8 +139,8 @@ def _build_skill(
     is rejected by ``SkillDefinition`` rather than silently flowing into
     the OpenAI tool enum where the model could never emit it verbatim.
 
-    ``content_id`` and ``content_key`` are used only for log messages so
-    operators can locate the offending file in the knowledge base.
+    ``content_id`` is stored on the returned definition so it can be used
+    as a lookup key to load the SKILL.md.
     """
     if not file_text.strip():
         return None
@@ -164,6 +163,7 @@ def _build_skill(
             name=name,
             description=description,
             content=body,
+            content_id=content_id,
         )
     except ValidationError as exc:
         logger.warning(
@@ -325,7 +325,8 @@ async def preload_invoked_skills(
     indistinguishable from skills the model activates itself:
 
     1. Resolves each ``skill_choices`` entry against the registered
-       ``SkillTool`` registry (by normalized name or ``content_id``).
+       ``SkillTool`` registry by ``content_id``. Entries without a
+       ``content_id`` are skipped — every skill choice must carry one.
     2. For each matched skill, synthesizes a ``LanguageModelFunction``
        and runs it through the already-registered ``SkillTool`` — the
        exact same code path ``UniqueAI._handle_tool_calls`` uses.
@@ -340,13 +341,17 @@ async def preload_invoked_skills(
     if not isinstance(skill_tool, SkillTool):
         return
 
+    # content_id → skill.
+    content_id_index: dict[str, SkillDefinition] = {
+        s.content_id: s for s in skill_tool.skill_registry.values() if s.content_id
+    }
+
     forced_skills: list[SkillDefinition] = []
     seen_forced: set[str] = set()
     for choice in skill_choices:
         forced_skill: SkillDefinition | None = None
-        if choice.name:
-            normalized_name = normalize_skill_name(choice.name)
-            forced_skill = skill_tool.skill_registry.get(normalized_name)
+        if choice.content_id:
+            forced_skill = content_id_index.get(choice.content_id)
         if forced_skill is None:
             continue
         if forced_skill.name in seen_forced:

{unique_orchestrator-2026.22.0.dev4 → unique_orchestrator-2026.22.0.dev6}/unique_orchestrator/config.py

@@ -9,6 +9,9 @@ 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_internal_search.uploaded_search.config import (
+    UploadedSearchConfig,
+)
 from unique_stock_ticker.config import StockTickerConfig
 from unique_swot import SwotAnalysisTool, SwotAnalysisToolConfig
 from unique_toolkit._common.validators import (
@@ -329,6 +332,20 @@ class ResponsesApiConfig(BaseToolConfig):
     )
 
 
+class UploadedSearchToolConfig(BaseToolConfig):
+    force: bool = Field(
+        default=True,
+        title="Force tool",
+        description="If set, the tool will be forced when the user uploads a file",
+    )
+    tool_config: UploadedSearchConfig = UploadedSearchConfig()
+
+    @model_validator(mode="after")
+    def validate_tool_config(self) -> "UploadedSearchToolConfig":
+        self.tool_config.enable_tool_call_system_reminder = self.force
+        return self
+
+
 class ExperimentalConfig(BaseToolConfig):
     """Experimental features this part of the configuration might evolve in the future continuously"""
 
@@ -367,6 +384,8 @@ class ExperimentalConfig(BaseToolConfig):
         default_factory=TodoConfig,
     )
 
+    uploaded_search_tool_config: UploadedSearchToolConfig = UploadedSearchToolConfig()
+
     use_responses_api: bool = Field(
         default=False,
         description="If set, the main agent will use the Responses API from OpenAI",

{unique_orchestrator-2026.22.0.dev4 → unique_orchestrator-2026.22.0.dev6}/unique_orchestrator/unique_ai_builder.py

@@ -6,9 +6,6 @@ from typing_extensions import override
 from unique_follow_up_questions.follow_up_postprocessor import (
     FollowUpPostprocessor,
 )
-from unique_internal_search.uploaded_search.config import (
-    UploadedSearchConfig,
-)
 from unique_internal_search.uploaded_search.service import (
     UploadedSearchTool,
 )
@@ -86,7 +83,7 @@ from unique_orchestrator._builders.skill_setup import (
     configure_skill_tool,
     normalize_available_skills_for_tool,
 )
-from unique_orchestrator.config import UniqueAIConfig
+from unique_orchestrator.config import UniqueAIConfig, UploadedSearchToolConfig
 from unique_orchestrator.unique_ai import UniqueAI
 from unique_orchestrator.utils import filter_uploaded_documents_by_selection
 
@@ -390,8 +387,7 @@ async def _build_responses(
         in config.space.language_model.capabilities
     )
 
-    has_valid_uploaded_documents = False
-    has_tool_choices = False
+    force_uploaded_search = False
     if config.agent.experimental.open_file_tool_config.enabled:
         handle_uploaded_file_tool_choices(
             config,
@@ -400,12 +396,11 @@ async def _build_responses(
             logger,
         )
     else:
-        has_valid_uploaded_documents, has_tool_choices = (
-            _configure_uploaded_search_tool(
-                event=event,
-                logger=logger,
-                common_components=common_components,
-            )
+        force_uploaded_search = _configure_uploaded_search_tool(
+            event=event,
+            logger=logger,
+            common_components=common_components,
+            config=config.agent.experimental.uploaded_search_tool_config,
         )
 
     builtin_tool_manager = await OpenAIBuiltInToolManager.build_manager(
@@ -429,9 +424,11 @@ async def _build_responses(
         a2a_manager=common_components.a2a_manager,
         builtin_tool_manager=builtin_tool_manager,
     )
-    if not config.agent.experimental.open_file_tool_config.enabled:
-        if not has_tool_choices and has_valid_uploaded_documents:
-            tool_manager.add_forced_tool(UploadedSearchTool.name)
+    if (
+        not config.agent.experimental.open_file_tool_config.enabled
+        and force_uploaded_search
+    ):
+        tool_manager.add_forced_tool(UploadedSearchTool.name)
 
     agent_file_registry: list[str] = []
     if config.agent.experimental.open_file_tool_config.enabled:
@@ -512,10 +509,11 @@ async def _build_completions(
     common_components: _CommonComponents,
     debug_info_manager: DebugInfoManager,
 ) -> UniqueAI:
-    has_valid_uploaded_documents, has_tool_choices = _configure_uploaded_search_tool(
+    force_uploaded_search = _configure_uploaded_search_tool(
         event=event,
         logger=logger,
         common_components=common_components,
+        config=config.agent.experimental.uploaded_search_tool_config,
     )
 
     tool_manager = ToolManager(
@@ -526,7 +524,7 @@ async def _build_completions(
         mcp_manager=common_components.mcp_manager,
         a2a_manager=common_components.a2a_manager,
     )
-    if not has_tool_choices and has_valid_uploaded_documents:
+    if force_uploaded_search:
         tool_manager.add_forced_tool(UploadedSearchTool.name)
 
     await configure_skill_tool(
@@ -587,8 +585,9 @@ def _configure_uploaded_search_tool(
     event: ChatEvent,
     logger: Logger,
     common_components: _CommonComponents,
-) -> tuple[bool, bool]:
-    """Mirror uploaded-file bootstrapping across completions and Responses API."""
+    config: UploadedSearchToolConfig,
+) -> bool:
+    """Add the uploaded search tool when documents are present and return whether it should be forced."""
     valid_uploaded_documents: list[Content] = []
     expired_uploaded_documents: list[Content] = []
     for doc in common_components.uploaded_documents:
@@ -598,29 +597,30 @@ def _configure_uploaded_search_tool(
             expired_uploaded_documents.append(doc)
         else:
             valid_uploaded_documents.append(doc)
-    has_tool_choices = len(event.payload.tool_choices) > 0
 
     if expired_uploaded_documents:
         logger.info(
             f"Number of expired uploaded documents: {len(expired_uploaded_documents)}"
         )
 
-    if valid_uploaded_documents:
-        logger.info(
-            f"Number of valid uploaded documents: {len(valid_uploaded_documents)}"
-        )
-        common_components.tool_manager_config.tools.append(
-            ToolBuildConfig(
-                name=UploadedSearchTool.name,
-                display_name=UploadedSearchTool.name,
-                configuration=UploadedSearchConfig(),
-            )
+    if not valid_uploaded_documents:
+        return False
+
+    logger.info(f"Number of valid uploaded documents: {len(valid_uploaded_documents)}")
+
+    common_components.tool_manager_config.tools.append(
+        ToolBuildConfig(
+            name=UploadedSearchTool.name,
+            display_name=UploadedSearchTool.name,
+            configuration=config.tool_config,
         )
+    )
 
-    if has_tool_choices and valid_uploaded_documents:
+    if len(event.payload.tool_choices) > 0 and config.force:
         event.payload.tool_choices.append(str(UploadedSearchTool.name))
+        return False
 
-    return bool(valid_uploaded_documents), has_tool_choices
+    return config.force
 
 
 def _add_sub_agents_postprocessor(