unique-toolkit 2026.30.0.dev12__tar.gz → 2026.30.0.dev14__tar.gz

{unique_toolkit-2026.30.0.dev12 → unique_toolkit-2026.30.0.dev14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: unique-toolkit
-Version: 2026.30.0.dev12
+Version: 2026.30.0.dev14
 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.30.0.dev12 → unique_toolkit-2026.30.0.dev14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "unique_toolkit"
-version = "2026.30.0.dev12"
+version = "2026.30.0.dev14"
 description = ""
 readme = "README.md"
 requires-python = ">=3.12"

{unique_toolkit-2026.30.0.dev12 → unique_toolkit-2026.30.0.dev14}/unique_toolkit/agentic/debug_info_manager/debug_info_manager.py

@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Required, TypedDict
 
 from unique_toolkit.agentic.tools.openai_builtin import OpenAICodeInterpreterTool
 from unique_toolkit.agentic.tools.openai_builtin.base import OpenAIBuiltInToolName
@@ -10,6 +10,24 @@ from unique_toolkit.language_model.schemas import (
 )
 
 
+class AnalyticsTool(TypedDict, total=False):
+    name: Required[str]
+    is_forced: bool
+    is_exclusive: bool
+    loop_iteration: int
+
+
+class AnalyticsSkill(TypedDict):
+    name: str
+    content_id: str
+    is_forced: bool
+
+
+class Analytics(TypedDict):
+    tools: list[AnalyticsTool]
+    skills: list[AnalyticsSkill]
+
+
 class DebugInfoManager:
     def __init__(self):
         self.debug_info = {"tools": []}
@@ -53,6 +71,50 @@ class DebugInfoManager:
     def get(self) -> dict[str, Any]:
         return self.debug_info
 
+    def add_analytics(self, skills: list[dict[str, Any]]) -> None:
+        """Add a stable 'analytics' snapshot for downstream ROI/usage reporting.
+
+        Copies the current `tools` list (with each tool's info reduced to
+        attribution fields only) plus the given `skills` list into a new
+        `analytics` key, so later appends to `debug_info["tools"]` (e.g. from
+        extract_tool_debug_info) can't leak into the frozen snapshot. Existing
+        top-level keys (`tools`, `skills`, ...) are left untouched, so this is
+        additive for any consumer already reading the old shape.
+        """
+        self.add(
+            "analytics",
+            Analytics(
+                tools=[
+                    _to_analytics_tool_entry(tool)
+                    for tool in self.debug_info.get("tools", [])
+                ],
+                skills=[
+                    AnalyticsSkill(
+                        name=skill["name"],
+                        content_id=skill["content_id"],
+                        is_forced=skill["is_forced"],
+                    )
+                    for skill in skills
+                ],
+            ),
+        )
+
+
+def _to_analytics_tool_entry(tool: dict[str, Any]) -> AnalyticsTool:
+    """Return an analytics-safe copy of a tool debug-info entry.
+
+    Keeps only name plus is_forced / is_exclusive / loop_iteration.
+    """
+    info = tool.get("info") or {}
+    analytics_tool = AnalyticsTool(name=tool["name"])
+    if "is_forced" in info:
+        analytics_tool["is_forced"] = info["is_forced"]
+    if "is_exclusive" in info:
+        analytics_tool["is_exclusive"] = info["is_exclusive"]
+    if "loop_iteration" in info:
+        analytics_tool["loop_iteration"] = info["loop_iteration"]
+    return analytics_tool
+
 
 def _extract_tool_calls_from_stream_response(
     stream_response: LanguageModelStreamResponse,

{unique_toolkit-2026.30.0.dev12 → unique_toolkit-2026.30.0.dev14}/unique_toolkit/agentic/history_manager/history_construction_with_contents.py

@@ -6,7 +6,7 @@ import mimetypes
 from datetime import datetime
 from enum import StrEnum
 from itertools import groupby
-from typing import TYPE_CHECKING, Iterator
+from typing import TYPE_CHECKING, Callable, Iterator
 
 if TYPE_CHECKING:
     from unique_toolkit.content.schemas import ContentChunk
@@ -200,9 +200,7 @@ async def download_encoded_images_async(
     return base64_encoded_images
 
 
-class FileContentSerialization(StrEnum):
-    NONE = "none"
-    FILE_NAME = "file_name"
+FileContentSerializer = Callable[[Content], str | None]
 
 
 class ImageContentInclusion(StrEnum):
@@ -210,23 +208,17 @@ class ImageContentInclusion(StrEnum):
     ALL = "all"
 
 
-def file_content_serialization(
+def _serialize_file_contents(
+    text: str,
     file_contents: list[Content],
-    file_content_serialization: FileContentSerialization,
+    file_content_serializer: FileContentSerializer | None,
 ) -> str:
-    match file_content_serialization:
-        case FileContentSerialization.NONE:
-            return ""
-        case FileContentSerialization.FILE_NAME:
-            file_names = [
-                f"- Uploaded file: {f.key} at {f.created_at}" for f in file_contents
-            ]
-            return "\n".join(
-                [
-                    "Files Uploaded to Chat can be accessed by internal search tool if available:\n",
-                ]
-                + file_names,
-            )
+    serialized_files: list[str] = []
+    if file_content_serializer is not None:
+        for file_content in file_contents:
+            if serialized_file := file_content_serializer(file_content):
+                serialized_files.append(serialized_file)
+    return (text + "\n\n" + "\n".join(serialized_files)).strip()
 
 
 def _append_element_to_builder(
@@ -234,9 +226,9 @@ def _append_element_to_builder(
     c: ChatMessageWithContents,
     text: str,
     include_images: ImageContentInclusion,
-    file_content_serialization_type: FileContentSerialization,
     content_service: ContentService,
     chat_id: str,
+    file_content_serializer: FileContentSerializer | None = None,
     selected_content_ids: set[str] | None = None,
 ) -> None:
     if len(c.contents) > 0:
@@ -249,15 +241,12 @@ def _append_element_to_builder(
             image_contents = [
                 co for co in image_contents if co.id in selected_content_ids
             ]
-        content = (
-            text
-            + "\n\n"
-            + file_content_serialization(
-                file_contents,
-                file_content_serialization_type,
-            )
-        ).strip()
-        if include_images and len(image_contents) > 0:
+        content = _serialize_file_contents(
+            text,
+            file_contents,
+            file_content_serializer,
+        )
+        if include_images and image_contents:
             builder.image_message_append(
                 content=content,
                 images=download_encoded_images(
@@ -285,9 +274,9 @@ async def _append_element_to_builder_async(
     c: ChatMessageWithContents,
     text: str,
     include_images: ImageContentInclusion,
-    file_content_serialization_type: FileContentSerialization,
     content_service: ContentService,
     chat_id: str,
+    file_content_serializer: FileContentSerializer | None = None,
     selected_content_ids: set[str] | None = None,
 ) -> None:
     if len(c.contents) > 0:
@@ -300,15 +289,12 @@ async def _append_element_to_builder_async(
             image_contents = [
                 co for co in image_contents if co.id in selected_content_ids
             ]
-        content = (
-            text
-            + "\n\n"
-            + file_content_serialization(
-                file_contents,
-                file_content_serialization_type,
-            )
-        ).strip()
-        if include_images and len(image_contents) > 0:
+        content = _serialize_file_contents(
+            text,
+            file_contents,
+            file_content_serializer,
+        )
+        if include_images and image_contents:
             builder.image_message_append(
                 content=content,
                 images=await download_encoded_images_async(
@@ -336,7 +322,7 @@ def get_full_history_with_contents(
     chat_service: ChatService,
     content_service: ContentService,
     include_images: ImageContentInclusion = ImageContentInclusion.ALL,
-    file_content_serialization_type: FileContentSerialization = FileContentSerialization.FILE_NAME,
+    file_content_serializer: FileContentSerializer | None = None,
     selected_content_ids: set[str] | None = None,
 ) -> LanguageModelMessages:
     grouped_elements = get_chat_history_with_contents(
@@ -361,7 +347,7 @@ def get_full_history_with_contents(
             c=c,
             text=text,
             include_images=include_images,
-            file_content_serialization_type=file_content_serialization_type,
+            file_content_serializer=file_content_serializer,
             content_service=content_service,
             chat_id=chat_id,
             selected_content_ids=selected_content_ids,
@@ -376,7 +362,7 @@ async def get_full_history_with_contents_async(
     chat_service: ChatService,
     content_service: ContentService,
     include_images: ImageContentInclusion = ImageContentInclusion.ALL,
-    file_content_serialization_type: FileContentSerialization = FileContentSerialization.FILE_NAME,
+    file_content_serializer: FileContentSerializer | None = None,
     selected_content_ids: set[str] | None = None,
 ) -> LanguageModelMessages:
     grouped_elements = await get_chat_history_with_contents_async(
@@ -400,7 +386,7 @@ async def get_full_history_with_contents_async(
             c=c,
             text=text,
             include_images=include_images,
-            file_content_serialization_type=file_content_serialization_type,
+            file_content_serializer=file_content_serializer,
             content_service=content_service,
             chat_id=chat_id,
             selected_content_ids=selected_content_ids,
@@ -415,7 +401,7 @@ def get_full_history_with_contents_and_tool_calls(
     chat_service: ChatService,
     content_service: ContentService,
     include_images: ImageContentInclusion = ImageContentInclusion.ALL,
-    file_content_serialization_type: FileContentSerialization = FileContentSerialization.FILE_NAME,
+    file_content_serializer: FileContentSerializer | None = None,
     selected_content_ids: set[str] | None = None,
 ) -> tuple[LanguageModelMessages, int, dict[int, "ContentChunk"]]:
     """Build the full LLM message history, including persisted tool call rounds.
@@ -544,7 +530,7 @@ def get_full_history_with_contents_and_tool_calls(
             c=c,
             text=text,
             include_images=include_images,
-            file_content_serialization_type=file_content_serialization_type,
+            file_content_serializer=file_content_serializer,
             content_service=content_service,
             chat_id=chat_id,
             selected_content_ids=selected_content_ids,
@@ -559,7 +545,7 @@ async def get_full_history_with_contents_and_tool_calls_async(
     chat_service: ChatService,
     content_service: ContentService,
     include_images: ImageContentInclusion = ImageContentInclusion.ALL,
-    file_content_serialization_type: FileContentSerialization = FileContentSerialization.FILE_NAME,
+    file_content_serializer: FileContentSerializer | None = None,
     selected_content_ids: set[str] | None = None,
 ) -> tuple[LanguageModelMessages, int, dict[int, "ContentChunk"]]:
     """Async version of get_full_history_with_contents_and_tool_calls."""
@@ -662,7 +648,7 @@ async def get_full_history_with_contents_and_tool_calls_async(
             c=c,
             text=text,
             include_images=include_images,
-            file_content_serialization_type=file_content_serialization_type,
+            file_content_serializer=file_content_serializer,
             content_service=content_service,
             chat_id=chat_id,
             selected_content_ids=selected_content_ids,

{unique_toolkit-2026.30.0.dev12 → unique_toolkit-2026.30.0.dev14}/unique_toolkit/agentic/history_manager/history_manager.py

@@ -10,6 +10,9 @@ from unique_toolkit._common.feature_flags.schema import (
 )
 from unique_toolkit._common.pydantic_helpers import DeactivatedNone
 from unique_toolkit._common.validators import LMI
+from unique_toolkit.agentic.history_manager.history_construction_with_contents import (
+    FileContentSerializer,
+)
 from unique_toolkit.agentic.history_manager.loop_token_reducer import LoopTokenReducer
 from unique_toolkit.agentic.history_manager.utils import (
     serialize_tool_content_json,
@@ -115,6 +118,7 @@ class HistoryManager:
         config: HistoryManagerConfig,
         language_model: LMI,
         reference_manager: ReferenceManager,
+        file_content_serializer: FileContentSerializer | None = None,
     ):
         self._config = config
         self._logger = logger
@@ -123,10 +127,10 @@ class HistoryManager:
             logger=self._logger,
             event=event,
             max_history_tokens=self._config.max_history_tokens,
-            has_uploaded_content_config=bool(self._config.uploaded_content_config),
             language_model=self._language_model,
             reference_manager=reference_manager,
             enable_tool_call_persistence=self._config.enable_tool_call_persistence,
+            file_content_serializer=file_content_serializer,
         )
         self._reference_manager = reference_manager
         self._tool_call_result_history: list[ToolCallResponse] = []

{unique_toolkit-2026.30.0.dev12 → unique_toolkit-2026.30.0.dev14}/unique_toolkit/agentic/history_manager/loop_token_reducer.py

@@ -9,7 +9,7 @@ from unique_toolkit._common.token.token_counting import (
 )
 from unique_toolkit._common.validators import LMI
 from unique_toolkit.agentic.history_manager.history_construction_with_contents import (
-    FileContentSerialization,
+    FileContentSerializer,
     get_full_history_with_contents_and_tool_calls_async,
     get_full_history_with_contents_async,
 )
@@ -54,13 +54,13 @@ class LoopTokenReducer:
         logger: Logger,
         event: ChatEvent,
         max_history_tokens: int,
-        has_uploaded_content_config: bool,
         reference_manager: ReferenceManager,
         language_model: LMI,
         enable_tool_call_persistence: bool = False,
+        file_content_serializer: FileContentSerializer | None = None,
     ):
         self._max_history_tokens = max_history_tokens
-        self._has_uploaded_content_config = has_uploaded_content_config
+        self._file_content_serializer = file_content_serializer
         self._logger = logger
         self._reference_manager = reference_manager
         self._language_model = language_model
@@ -309,11 +309,6 @@ class LoopTokenReducer:
         Returns:
             list[LanguageModelMessage]: The history
         """
-        file_content_serialization_type = (
-            FileContentSerialization.NONE
-            if self._has_uploaded_content_config
-            else FileContentSerialization.FILE_NAME
-        )
         if self._enable_tool_call_persistence:
             (
                 full_history,
@@ -324,7 +319,7 @@ class LoopTokenReducer:
                 chat_id=self._chat_id,
                 chat_service=self._chat_service,
                 content_service=self._content_service,
-                file_content_serialization_type=file_content_serialization_type,
+                file_content_serializer=self._file_content_serializer,
                 selected_content_ids=self._selected_content_ids,
             )
             self._max_db_source_number = max_src
@@ -335,7 +330,7 @@ class LoopTokenReducer:
                 chat_id=self._chat_id,
                 chat_service=self._chat_service,
                 content_service=self._content_service,
-                file_content_serialization_type=file_content_serialization_type,
+                file_content_serializer=self._file_content_serializer,
                 selected_content_ids=self._selected_content_ids,
             )