unique-toolkit 2026.28.0.dev17__tar.gz → 2026.28.0.dev18__tar.gz

{unique_toolkit-2026.28.0.dev17 → unique_toolkit-2026.28.0.dev18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: unique-toolkit
-Version: 2026.28.0.dev17
+Version: 2026.28.0.dev18
 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.28.0.dev17 → unique_toolkit-2026.28.0.dev18}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "unique_toolkit"
-version = "2026.28.0.dev17"
+version = "2026.28.0.dev18"
 description = ""
 readme = "README.md"
 requires-python = ">=3.12"

{unique_toolkit-2026.28.0.dev17 → unique_toolkit-2026.28.0.dev18}/unique_toolkit/agentic/tools/a2a/manager.py

@@ -5,6 +5,8 @@ from unique_toolkit.agentic.tools.a2a.tool import SubAgentTool, SubAgentToolConf
 from unique_toolkit.agentic.tools.config import ToolBuildConfig
 from unique_toolkit.agentic.tools.tool_progress_reporter import ToolProgressReporter
 from unique_toolkit.app.schemas import ChatEvent
+from unique_toolkit.chat.service import ChatService
+from unique_toolkit.language_model import LanguageModelService
 
 
 class A2AManager:
@@ -13,10 +15,15 @@ class A2AManager:
         logger: Logger,
         tool_progress_reporter: ToolProgressReporter,
         response_watcher: SubAgentResponseWatcher,
+        *,
+        chat_service: ChatService | None = None,
+        language_model_service: LanguageModelService | None = None,
     ):
         self._logger = logger
         self._tool_progress_reporter = tool_progress_reporter
         self._response_watcher = response_watcher
+        self._chat_service = chat_service
+        self._language_model_service = language_model_service
 
     def get_all_sub_agents(
         self,
@@ -45,16 +52,33 @@ class A2AManager:
             sub_agent_tool_config = tool_config.configuration
 
             try:
-                sub_agents.append(
-                    SubAgentTool(
-                        configuration=sub_agent_tool_config,
-                        event=event,
-                        tool_progress_reporter=self._tool_progress_reporter,
-                        name=tool_config.name,
-                        display_name=tool_config.display_name,
-                        response_watcher=self._response_watcher,
+                if (
+                    self._chat_service is not None
+                    and self._language_model_service is not None
+                ):
+                    sub_agents.append(
+                        SubAgentTool(
+                            configuration=sub_agent_tool_config,
+                            event=event,
+                            tool_progress_reporter=self._tool_progress_reporter,
+                            name=tool_config.name,
+                            display_name=tool_config.display_name,
+                            response_watcher=self._response_watcher,
+                            chat_service=self._chat_service,
+                            language_model_service=self._language_model_service,
+                        )
+                    )
+                else:
+                    sub_agents.append(
+                        SubAgentTool(
+                            configuration=sub_agent_tool_config,
+                            event=event,
+                            tool_progress_reporter=self._tool_progress_reporter,
+                            name=tool_config.name,
+                            display_name=tool_config.display_name,
+                            response_watcher=self._response_watcher,
+                        )
                     )
-                )
             except Exception:
                 self._logger.warning(
                     "Skipping sub-agent '%s' due to initialization failure.",

{unique_toolkit-2026.28.0.dev17 → unique_toolkit-2026.28.0.dev18}/unique_toolkit/agentic/tools/a2a/tool/service.py

@@ -20,7 +20,6 @@ from unique_toolkit._common.referencing import (
 from unique_toolkit._common.utils.jinja.render import render_template
 from unique_toolkit.agentic.evaluation.schemas import EvaluationMetricName
 from unique_toolkit.agentic.feature_flags import feature_flags
-from unique_toolkit.agentic.message_log_manager.service import MessageStepLogger
 from unique_toolkit.agentic.tools.a2a.response_watcher import SubAgentResponseWatcher
 from unique_toolkit.agentic.tools.a2a.tool._memory import (
     get_sub_agent_short_term_memory_manager,
@@ -53,6 +52,7 @@ from unique_toolkit.chat.service import ChatService
 from unique_toolkit.content import ContentChunk, ContentReference
 from unique_toolkit.language_model import (
     LanguageModelFunction,
+    LanguageModelService,
     LanguageModelToolDescription,
 )
 
@@ -72,12 +72,20 @@ class SubAgentTool(Tool[SubAgentToolConfig]):
         name: str = "SubAgentTool",
         display_name: str = "SubAgentTool",
         response_watcher: SubAgentResponseWatcher | None = None,
+        *,
+        chat_service: ChatService | None = None,
+        language_model_service: LanguageModelService | None = None,
     ) -> None:
-        super().__init__(configuration)
-        self._event = event
-        self._tool_progress_reporter = tool_progress_reporter
-        self._chat_service = ChatService(event)
-        self._message_step_logger = MessageStepLogger(chat_service=self._chat_service)
+        if chat_service is not None and language_model_service is not None:
+            super().__init__(
+                configuration,
+                event,
+                tool_progress_reporter=tool_progress_reporter,
+                chat_service=chat_service,
+                language_model_service=language_model_service,
+            )
+        else:
+            super().__init__(configuration, event, tool_progress_reporter)
         self._user_id = event.user_id
         self._company_id = event.company_id
 

{unique_toolkit-2026.28.0.dev17 → unique_toolkit-2026.28.0.dev18}/unique_toolkit/agentic/tools/experimental/ask_user_tool/tool.py

@@ -13,12 +13,14 @@ from unique_toolkit.agentic.tools.schemas import ToolCallResponse
 from unique_toolkit.agentic.tools.tool import Tool
 from unique_toolkit.agentic.tools.tool_progress_reporter import ToolProgressReporter
 from unique_toolkit.app.schemas import ChatEvent
+from unique_toolkit.chat.service import ChatService
 from unique_toolkit.elicitation import (
     ElicitationCancelledException,
     ElicitationDeclinedException,
     ElicitationExpiredException,
     ElicitationMode,
 )
+from unique_toolkit.language_model import LanguageModelService
 from unique_toolkit.language_model.schemas import (
     LanguageModelFunction,
     LanguageModelToolDescription,
@@ -44,10 +46,24 @@ class AskUserTool(Tool[AskUserToolConfig]):
         config: AskUserToolConfig,
         event: ChatEvent,
         tool_progress_reporter: ToolProgressReporter | None = None,
+        *,
+        chat_service: ChatService | None = None,
+        language_model_service: LanguageModelService | None = None,
     ) -> None:
-        super().__init__(
-            config=config, event=event, tool_progress_reporter=tool_progress_reporter
-        )
+        if chat_service is not None and language_model_service is not None:
+            super().__init__(
+                config=config,
+                event=event,
+                tool_progress_reporter=tool_progress_reporter,
+                chat_service=chat_service,
+                language_model_service=language_model_service,
+            )
+        else:
+            super().__init__(
+                config=config,
+                event=event,
+                tool_progress_reporter=tool_progress_reporter,
+            )
         self._lock = asyncio.Lock()
 
     @override

{unique_toolkit-2026.28.0.dev17 → unique_toolkit-2026.28.0.dev18}/unique_toolkit/agentic/tools/experimental/todo/service.py

@@ -20,7 +20,11 @@ from unique_toolkit.agentic.tools.tool import Tool
 from unique_toolkit.agentic.tools.tool_progress_reporter import ToolProgressReporter
 from unique_toolkit.app.schemas import ChatEvent
 from unique_toolkit.chat.schemas import MessageLog, MessageLogStatus
-from unique_toolkit.language_model import LanguageModelToolDescription
+from unique_toolkit.chat.service import ChatService
+from unique_toolkit.language_model import (
+    LanguageModelService,
+    LanguageModelToolDescription,
+)
 from unique_toolkit.language_model.schemas import LanguageModelFunction
 from unique_toolkit.short_term_memory.service import ShortTermMemoryService
 
@@ -45,8 +49,20 @@ class TodoWriteTool(Tool[TodoConfig]):
         config: TodoConfig,
         event: ChatEvent,
         tool_progress_reporter: ToolProgressReporter | None = None,
+        *,
+        chat_service: ChatService | None = None,
+        language_model_service: LanguageModelService | None = None,
     ) -> None:
-        super().__init__(config, event, tool_progress_reporter)
+        if chat_service is not None and language_model_service is not None:
+            super().__init__(
+                config,
+                event,
+                tool_progress_reporter,
+                chat_service=chat_service,
+                language_model_service=language_model_service,
+            )
+        else:
+            super().__init__(config, event, tool_progress_reporter)
         stm_service = ShortTermMemoryService(
             company_id=event.company_id,
             user_id=event.user_id,

{unique_toolkit-2026.28.0.dev17 → unique_toolkit-2026.28.0.dev18}/unique_toolkit/agentic/tools/mcp/manager.py

@@ -11,6 +11,8 @@ from unique_toolkit.agentic.tools.schemas import BaseToolConfig
 from unique_toolkit.agentic.tools.tool import Tool
 from unique_toolkit.agentic.tools.tool_progress_reporter import ToolProgressReporter
 from unique_toolkit.app.schemas import ChatEvent, McpServer
+from unique_toolkit.chat.service import ChatService
+from unique_toolkit.language_model import LanguageModelService
 
 
 class MCPManager:
@@ -19,10 +21,15 @@ class MCPManager:
         mcp_servers: list[McpServer],
         event: ChatEvent,
         tool_progress_reporter: ToolProgressReporter,
-    ):
+        *,
+        chat_service: ChatService | None = None,
+        language_model_service: LanguageModelService | None = None,
+    ) -> None:
         self._mcp_servers = mcp_servers
         self._event = event
         self._tool_progress_reporter = tool_progress_reporter
+        self._chat_service = chat_service
+        self._language_model_service = language_model_service
 
     def get_mcp_servers(self):
         return self._mcp_servers
@@ -47,13 +54,27 @@ class MCPManager:
                         server_user_prompt=server.user_prompt,
                         mcp_source_id=server.id,
                     )
-                    wrapper = MCPToolWrapper(
-                        mcp_server=server,
-                        mcp_tool=tool,
-                        config=config,
-                        event=self._event,
-                        tool_progress_reporter=self._tool_progress_reporter,
-                    )
+                    if (
+                        self._chat_service is not None
+                        and self._language_model_service is not None
+                    ):
+                        wrapper = MCPToolWrapper(
+                            mcp_server=server,
+                            mcp_tool=tool,
+                            config=config,
+                            event=self._event,
+                            tool_progress_reporter=self._tool_progress_reporter,
+                            chat_service=self._chat_service,
+                            language_model_service=self._language_model_service,
+                        )
+                    else:
+                        wrapper = MCPToolWrapper(
+                            mcp_server=server,
+                            mcp_tool=tool,
+                            config=config,
+                            event=self._event,
+                            tool_progress_reporter=self._tool_progress_reporter,
+                        )
                     wrapper.settings = ToolBuildConfig(  # TODO: this must be refactored to behave like the other tools.
                         name=tool.name,
                         configuration=config,

{unique_toolkit-2026.28.0.dev17 → unique_toolkit-2026.28.0.dev18}/unique_toolkit/agentic/tools/mcp/tool_wrapper.py

@@ -10,7 +10,6 @@ import unique_sdk
 
 from unique_toolkit.agentic.evaluation.schemas import EvaluationMetricName
 from unique_toolkit.agentic.feature_flags import feature_flags
-from unique_toolkit.agentic.message_log_manager.service import MessageStepLogger
 from unique_toolkit.agentic.tools.mcp.models import MCPToolConfig
 from unique_toolkit.agentic.tools.schemas import ToolCallResponse
 from unique_toolkit.agentic.tools.tool import Tool
@@ -22,6 +21,7 @@ from unique_toolkit.app.schemas import ChatEvent, McpServer, McpTool
 from unique_toolkit.chat.schemas import MessageLog, MessageLogStatus
 from unique_toolkit.chat.service import ChatService
 from unique_toolkit.content.functions import upload_content_from_bytes
+from unique_toolkit.language_model import LanguageModelService
 from unique_toolkit.language_model.schemas import (
     LanguageModelFunction,
     LanguageModelToolDescription,
@@ -40,13 +40,21 @@ class MCPToolWrapper(Tool[MCPToolConfig]):
         config: MCPToolConfig,
         event: ChatEvent,
         tool_progress_reporter: ToolProgressReporter | None = None,
+        *,
+        chat_service: ChatService | None = None,
+        language_model_service: LanguageModelService | None = None,
     ) -> None:
         self.name = mcp_tool.name
-        super().__init__(config)
-        self._event = event
-        self._tool_progress_reporter = tool_progress_reporter
-        self._chat_service = ChatService(event)
-        self._message_step_logger = MessageStepLogger(chat_service=self._chat_service)
+        if chat_service is not None and language_model_service is not None:
+            super().__init__(
+                config,
+                event,
+                tool_progress_reporter=tool_progress_reporter,
+                chat_service=chat_service,
+                language_model_service=language_model_service,
+            )
+        else:
+            super().__init__(config, event, tool_progress_reporter)
         self._mcp_tool = mcp_tool
         self._mcp_server = mcp_server
 
@@ -384,7 +392,7 @@ class MCPToolWrapper(Tool[MCPToolConfig]):
                 user_id=self._event.user_id,
                 company_id=self._event.company_id,
                 name=self.name,
-                messageId=self._event.payload.assistant_message.id,
+                messageId=self._chat_service.assistant_message_id,
                 chatId=self._event.payload.chat_id,
                 arguments=arguments,
             )

{unique_toolkit-2026.28.0.dev17 → unique_toolkit-2026.28.0.dev18}/unique_toolkit/agentic/tools/tool.py

@@ -180,6 +180,17 @@ class Tool(ABC, Generic[ConfigType]):
         tool_progress_reporter: ToolProgressReporter | None = ...,
     ) -> None: ...
 
+    @overload
+    def __init__(
+        self,
+        config: ConfigType,
+        event: ChatEvent,
+        tool_progress_reporter: ToolProgressReporter | None = ...,
+        *,
+        chat_service: ChatService,
+        language_model_service: LanguageModelService,
+    ) -> None: ...
+
     @overload
     def __init__(
         self,
@@ -230,6 +241,8 @@ class Tool(ABC, Generic[ConfigType]):
                 MessageStepLogger,
             )
 
+            if event is not None:
+                self._event = event
             self._tool_progress_reporter = tool_progress_reporter
             self._chat_service = chat_service
             self._language_model_service = language_model_service

{unique_toolkit-2026.28.0.dev17 → unique_toolkit-2026.28.0.dev18}/unique_toolkit/agentic/tools/tool_manager.py

@@ -37,6 +37,8 @@ from unique_toolkit.agentic.tools.schemas import ToolCallResponse, ToolPrompts
 from unique_toolkit.agentic.tools.tool import Tool
 from unique_toolkit.agentic.tools.tool_progress_reporter import ToolProgressReporter
 from unique_toolkit.app.schemas import ChatEvent
+from unique_toolkit.chat.service import ChatService
+from unique_toolkit.language_model import LanguageModelService
 from unique_toolkit.language_model.schemas import (
     LanguageModelFunction,
     LanguageModelToolDescription,
@@ -90,6 +92,8 @@ class _ToolManager(Generic[_ApiMode]):
         a2a_manager: A2AManager,
         api_mode: _ApiMode,
         builtin_tool_manager: OpenAIBuiltInToolManager | None = None,
+        chat_service: ChatService | None = None,
+        language_model_service: LanguageModelService | None = None,
     ) -> None:
         self._setup(
             logger=logger,
@@ -100,6 +104,8 @@ class _ToolManager(Generic[_ApiMode]):
             a2a_manager=a2a_manager,
             api_mode=api_mode,
             builtin_tool_manager=builtin_tool_manager,
+            chat_service=chat_service,
+            language_model_service=language_model_service,
         )
 
     @classmethod
@@ -114,6 +120,8 @@ class _ToolManager(Generic[_ApiMode]):
         a2a_manager: A2AManager,
         api_mode: _ApiMode,
         builtin_tool_manager: OpenAIBuiltInToolManager | None = None,
+        chat_service: ChatService | None = None,
+        language_model_service: LanguageModelService | None = None,
     ) -> Self:
         instance = cls.__new__(cls)
         instance._setup(
@@ -125,6 +133,8 @@ class _ToolManager(Generic[_ApiMode]):
             a2a_manager=a2a_manager,
             api_mode=api_mode,
             builtin_tool_manager=builtin_tool_manager,
+            chat_service=chat_service,
+            language_model_service=language_model_service,
         )
         return instance
 
@@ -139,10 +149,14 @@ class _ToolManager(Generic[_ApiMode]):
         a2a_manager: A2AManager,
         api_mode: _ApiMode,
         builtin_tool_manager: OpenAIBuiltInToolManager | None,
+        chat_service: ChatService | None = None,
+        language_model_service: LanguageModelService | None = None,
     ) -> None:
         self._logger = logger
         self._config = config
         self._tool_progress_reporter = tool_progress_reporter
+        self._chat_service = chat_service
+        self._language_model_service = language_model_service
         self._tools: list[Tool[Any] | OpenAIBuiltInTool[Any]] = []
         self._tool_choices = run_context.tool_choices
         self._disabled_tools = run_context.disabled_tools
@@ -218,14 +232,29 @@ class _ToolManager(Generic[_ApiMode]):
                     t.name,
                 )
                 continue
-            result = safe_executor.execute(
-                ToolFactory.build_tool_with_settings,
-                t.name,
-                t,
-                t.configuration,
-                tool_init_event,
-                tool_progress_reporter=self._tool_progress_reporter,
-            )
+            if (
+                self._chat_service is not None
+                and self._language_model_service is not None
+            ):
+                result = safe_executor.execute(
+                    ToolFactory.build_tool_with_settings,
+                    t.name,
+                    t,
+                    t.configuration,
+                    tool_init_event,
+                    tool_progress_reporter=self._tool_progress_reporter,
+                    chat_service=self._chat_service,
+                    language_model_service=self._language_model_service,
+                )
+            else:
+                result = safe_executor.execute(
+                    ToolFactory.build_tool_with_settings,
+                    t.name,
+                    t,
+                    t.configuration,
+                    tool_init_event,
+                    tool_progress_reporter=self._tool_progress_reporter,
+                )
             if result.success:
                 self._internal_tools.append(result.unpack())
             else:
@@ -684,6 +713,8 @@ class ToolManager(_ToolManager[Literal["completions"]]):
         tool_progress_reporter: ToolProgressReporter,
         mcp_manager: MCPManager,
         a2a_manager: A2AManager,
+        chat_service: ChatService | None = None,
+        language_model_service: LanguageModelService | None = None,
     ) -> None:
         super().__init__(
             logger=logger,
@@ -694,6 +725,8 @@ class ToolManager(_ToolManager[Literal["completions"]]):
             a2a_manager=a2a_manager,
             api_mode="completions",
             builtin_tool_manager=None,
+            chat_service=chat_service,
+            language_model_service=language_model_service,
         )
 
     @classmethod
@@ -708,6 +741,8 @@ class ToolManager(_ToolManager[Literal["completions"]]):
         a2a_manager: A2AManager,
         api_mode: Literal["completions"] = "completions",
         builtin_tool_manager: OpenAIBuiltInToolManager | None = None,
+        chat_service: ChatService | None = None,
+        language_model_service: LanguageModelService | None = None,
     ) -> Self:
         return super().from_run_context(
             logger=logger,
@@ -718,6 +753,8 @@ class ToolManager(_ToolManager[Literal["completions"]]):
             a2a_manager=a2a_manager,
             api_mode=api_mode,
             builtin_tool_manager=builtin_tool_manager,
+            chat_service=chat_service,
+            language_model_service=language_model_service,
         )
 
 
@@ -731,6 +768,8 @@ class ResponsesApiToolManager(_ToolManager[Literal["responses"]]):
         mcp_manager: MCPManager,
         a2a_manager: A2AManager,
         builtin_tool_manager: OpenAIBuiltInToolManager,
+        chat_service: ChatService | None = None,
+        language_model_service: LanguageModelService | None = None,
     ) -> None:
         self._builtin_tool_manager = builtin_tool_manager
         super().__init__(
@@ -742,6 +781,8 @@ class ResponsesApiToolManager(_ToolManager[Literal["responses"]]):
             a2a_manager=a2a_manager,
             api_mode="responses",
             builtin_tool_manager=builtin_tool_manager,
+            chat_service=chat_service,
+            language_model_service=language_model_service,
         )
 
     @classmethod
@@ -756,6 +797,8 @@ class ResponsesApiToolManager(_ToolManager[Literal["responses"]]):
         a2a_manager: A2AManager,
         api_mode: Literal["responses"] = "responses",
         builtin_tool_manager: OpenAIBuiltInToolManager | None = None,
+        chat_service: ChatService | None = None,
+        language_model_service: LanguageModelService | None = None,
     ) -> Self:
         if builtin_tool_manager is None:
             msg = "builtin_tool_manager is required for ResponsesApiToolManager"
@@ -769,6 +812,8 @@ class ResponsesApiToolManager(_ToolManager[Literal["responses"]]):
             a2a_manager=a2a_manager,
             api_mode=api_mode,
             builtin_tool_manager=builtin_tool_manager,
+            chat_service=chat_service,
+            language_model_service=language_model_service,
         )
 
     def get_required_include_params(self) -> list[ResponseIncludable]: