unique-toolkit 2026.20.0.dev31__tar.gz → 2026.20.0.dev33__tar.gz

{unique_toolkit-2026.20.0.dev31 → unique_toolkit-2026.20.0.dev33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: unique-toolkit
-Version: 2026.20.0.dev31
+Version: 2026.20.0.dev33
 Summary: 
 Author: Cedric Klinkert, Martin Fadler, Sadique Sheik, Fabian Schläpfer, Pascal Hauri, Ejiroghene Oki-Peter, Rami Azouz, Ricardo Visini, Sanzio Monti
 Author-email: Cedric Klinkert <cedric.klinkert@unique.ch>, Martin Fadler <martin.fadler@unique.ch>, Sadique Sheik <sadique@unique.ch>, Fabian Schläpfer <fabian@unique.ch>, Pascal Hauri <pascal@unique.ch>, Ejiroghene Oki-Peter <oki-peter.ejiroghene@unique.ai>, Rami Azouz <rami.ext@unique.ch>, Ricardo Visini <ricardo.visini@unique.ch>, Sanzio Monti <sanzio.monti@unique.ai>

{unique_toolkit-2026.20.0.dev31 → unique_toolkit-2026.20.0.dev33}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "unique_toolkit"
-version = "2026.20.0.dev31"
+version = "2026.20.0.dev33"
 description = ""
 readme = "README.md"
 requires-python = ">=3.12"

unique_toolkit-2026.20.0.dev33/unique_toolkit/agentic/tools/names.py

@@ -0,0 +1,10 @@
+"""Canonical tool-name constants shared across toolkit modules.
+
+This module intentionally contains only string constants so callers can depend on
+stable tool identifiers without importing concrete tool classes.
+
+TODO(UN-20578): Add canonical name constants for the remaining toolkit tools.
+"""
+
+INTERNAL_SEARCH_TOOL_NAME = "InternalSearch"
+UPLOADED_SEARCH_TOOL_NAME = "UploadedSearch"

{unique_toolkit-2026.20.0.dev31 → unique_toolkit-2026.20.0.dev33}/unique_toolkit/agentic/tools/tool_manager.py

@@ -22,6 +22,10 @@ from unique_toolkit.agentic.tools.a2a import A2AManager, SubAgentTool
 from unique_toolkit.agentic.tools.config import ToolBuildConfig
 from unique_toolkit.agentic.tools.factory import ToolFactory
 from unique_toolkit.agentic.tools.mcp.manager import MCPManager
+from unique_toolkit.agentic.tools.names import (
+    INTERNAL_SEARCH_TOOL_NAME,
+    UPLOADED_SEARCH_TOOL_NAME,
+)
 from unique_toolkit.agentic.tools.openai_builtin.base import (
     OpenAIBuiltInTool,
     OpenAIBuiltInToolName,
@@ -163,6 +167,9 @@ class _ToolManager(Generic[_ApiMode]):
             # is the tool exclusive and has been choosen by the user?
             if t.is_exclusive() and len(tool_choices) > 0 and t.name in tool_choices:
                 self._tools = [t]  # override all other tools
+                self._restore_uploaded_search_for_internal_search_if_available(
+                    exclusive_tool=t
+                )
                 break
             # if the tool is exclusive but no tool choices are given, skip it
             if t.is_exclusive():
@@ -170,6 +177,27 @@ class _ToolManager(Generic[_ApiMode]):
 
             self._tools.append(t)
 
+    def _restore_uploaded_search_for_internal_search_if_available(
+        self,
+        exclusive_tool: Tool[Any] | OpenAIBuiltInTool[Any],
+    ) -> None:
+        """Keep UploadedSearch available when InternalSearch wins exclusivity."""
+        if exclusive_tool.name != INTERNAL_SEARCH_TOOL_NAME:
+            return
+
+        uploaded_search_tool = next(
+            (
+                tool
+                for tool in self.available_tools
+                if tool.name == UPLOADED_SEARCH_TOOL_NAME
+            ),
+            None,
+        )
+        if uploaded_search_tool is None:
+            return
+
+        self._tools.append(uploaded_search_tool)
+
     def filter_tool_calls(
         self,
         tool_calls: list[LanguageModelFunction],

{unique_toolkit-2026.20.0.dev31 → unique_toolkit-2026.20.0.dev33}/unique_toolkit/content/functions.py

@@ -2,6 +2,7 @@ import logging
 import os
 import re
 import tempfile
+import urllib.parse
 from pathlib import Path
 from typing import Any
 
@@ -725,6 +726,26 @@ async def request_content_by_id_async(
         return await client.get(url, headers=headers)
 
 
+def _extract_filename(content_disposition: str) -> str | None:
+    """Extract filename from a Content-Disposition header.
+
+    Prefers the RFC 5987 ``filename*=UTF-8''...`` parameter (which carries
+    properly percent-encoded UTF-8 filenames) and falls back to the legacy
+    ASCII ``filename="..."`` parameter.
+    """
+    utf8_match = re.search(
+        r"filename\*=UTF-8'[^']*'(.+?)(?:;|$)", content_disposition, re.IGNORECASE
+    )
+    if utf8_match:
+        return urllib.parse.unquote(utf8_match.group(1))
+
+    ascii_match = re.search(r'filename="([^"]+)"', content_disposition)
+    if ascii_match:
+        return ascii_match.group(1)
+
+    return None
+
+
 def download_content_to_file_by_id(
     user_id: str,
     company_id: str,
@@ -759,10 +780,11 @@ def download_content_to_file_by_id(
         if filename:
             content_path = Path(random_dir) / filename
         else:
-            pattern = r'filename="([^"]+)"'
-            match = re.search(pattern, response.headers.get("Content-Disposition", ""))
-            if match:
-                content_path = Path(random_dir) / match.group(1)
+            extracted = _extract_filename(
+                response.headers.get("Content-Disposition", "")
+            )
+            if extracted:
+                content_path = Path(random_dir) / extracted
             else:
                 error_msg = "Error downloading file: Filename could not be determined"
                 logger.error(error_msg)