unique_toolkit 1.62.0__tar.gz → 1.62.2__tar.gz

{unique_toolkit-1.62.0 → unique_toolkit-1.62.2}/PKG-INFO

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

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

{unique_toolkit-1.62.0 → unique_toolkit-1.62.2}/unique_toolkit/agentic/tools/a2a/tool/service.py

@@ -19,6 +19,7 @@ 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,
@@ -42,6 +43,7 @@ from unique_toolkit.agentic.tools.tool_progress_reporter import (
 )
 from unique_toolkit.app import ChatEvent
 from unique_toolkit.chat.schemas import MessageLog, MessageLogStatus
+from unique_toolkit.chat.service import ChatService
 from unique_toolkit.content import ContentChunk
 from unique_toolkit.language_model import (
     LanguageModelFunction,
@@ -64,8 +66,12 @@ class SubAgentTool(Tool[SubAgentToolConfig]):
         name: str = "SubAgentTool",
         display_name: str = "SubAgentTool",
         response_watcher: SubAgentResponseWatcher | None = None,
-    ):
-        super().__init__(configuration, event, tool_progress_reporter)
+    ) -> 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)
         self._user_id = event.user_id
         self._company_id = event.company_id
 
@@ -323,12 +329,12 @@ class SubAgentTool(Tool[SubAgentToolConfig]):
         state: ProgressState,
     ) -> None:
         if (
-            self.tool_progress_reporter is not None
+            self._tool_progress_reporter is not None
             and not feature_flags.enable_new_answers_ui_un_14411.is_enabled(
                 self._company_id
             )
         ):
-            await self.tool_progress_reporter.notify_from_tool_call(
+            await self._tool_progress_reporter.notify_from_tool_call(
                 tool_call=tool_call,
                 name=self._display_name,
                 message=message,

{unique_toolkit-1.62.0 → unique_toolkit-1.62.2}/unique_toolkit/agentic/tools/mcp/tool_wrapper.py

@@ -10,6 +10,7 @@ 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
@@ -19,6 +20,7 @@ from unique_toolkit.agentic.tools.tool_progress_reporter import (
 )
 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.schemas import (
     LanguageModelFunction,
@@ -38,9 +40,13 @@ class MCPToolWrapper(Tool[MCPToolConfig]):
         config: MCPToolConfig,
         event: ChatEvent,
         tool_progress_reporter: ToolProgressReporter | None = None,
-    ):
+    ) -> None:
         self.name = mcp_tool.name
-        super().__init__(config, event, tool_progress_reporter)
+        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)
         self._mcp_tool = mcp_tool
         self._mcp_server = mcp_server
 
@@ -121,7 +127,7 @@ class MCPToolWrapper(Tool[MCPToolConfig]):
         if (
             self._tool_progress_reporter
             and not feature_flags.enable_new_answers_ui_un_14411.is_enabled(
-                self.event.company_id
+                self._event.company_id
             )
         ):
             await self._tool_progress_reporter.notify_from_tool_call(
@@ -160,7 +166,7 @@ class MCPToolWrapper(Tool[MCPToolConfig]):
             if (
                 self._tool_progress_reporter
                 and not feature_flags.enable_new_answers_ui_un_14411.is_enabled(
-                    self.event.company_id
+                    self._event.company_id
                 )
             ):
                 await self._tool_progress_reporter.notify_from_tool_call(
@@ -186,7 +192,7 @@ class MCPToolWrapper(Tool[MCPToolConfig]):
             if (
                 self._tool_progress_reporter
                 and not feature_flags.enable_new_answers_ui_un_14411.is_enabled(
-                    self.event.company_id
+                    self._event.company_id
                 )
             ):
                 await self._tool_progress_reporter.notify_from_tool_call(
@@ -348,12 +354,12 @@ class MCPToolWrapper(Tool[MCPToolConfig]):
 
         try:
             content = upload_content_from_bytes(
-                user_id=self.event.user_id,
-                company_id=self.event.company_id,
+                user_id=self._event.user_id,
+                company_id=self._event.company_id,
                 content=img_bytes,
                 content_name=f"mcp_tool_{self.name}_image_{uuid.uuid4().hex[:12]}_{index}{ext}",
                 mime_type=mime_type,
-                chat_id=self.event.payload.chat_id,
+                chat_id=self._event.payload.chat_id,
                 skip_ingestion=True,
                 hide_in_chat=True,
             )
@@ -372,11 +378,11 @@ class MCPToolWrapper(Tool[MCPToolConfig]):
         """Call MCP tool via SDK to public API"""
         try:
             result = unique_sdk.MCP.call_tool(
-                user_id=self.event.user_id,
-                company_id=self.event.company_id,
+                user_id=self._event.user_id,
+                company_id=self._event.company_id,
                 name=self.name,
-                messageId=self.event.payload.assistant_message.id,
-                chatId=self.event.payload.chat_id,
+                messageId=self._event.payload.assistant_message.id,
+                chatId=self._event.payload.chat_id,
                 arguments=arguments,
             )
 

{unique_toolkit-1.62.0 → unique_toolkit-1.62.2}/unique_toolkit/agentic/tools/openai_builtin/code_interpreter/config.py

@@ -25,6 +25,7 @@ Instructions:
 Uploaded and generated files:
 - All files uploaded to the chat are available at the path `/mnt/data/<filename>`.
 - All files generated through code MUST be saved in the `/mnt/data` folder.
+- CRITICAL: When generating any plot or visualization, the code MUST call `plt.savefig('/mnt/data/<filename>.png', bbox_inches='tight')` and `plt.close()` to save the file. Never rely on `plt.show()` alone — a file that is not saved to `/mnt/data/` cannot be displayed.
 
 CRUCIAL Instructions for displaying images and files in the chat:
 - Once files are generated in the `/mnt/data` folder you MUST reference them in the chat using markdown syntax in order to display them in the chat.
@@ -46,6 +47,8 @@ Always use a line break between the title and the markdown!
 
 Handling User Queries:
 - Whenever the user query requires using the python tool, you must always think first about the steps required.
+- CRITICAL: If any step generates a plot or visualization, that code block MUST include `plt.savefig('/mnt/data/<filename>.png', bbox_inches='tight')` and `plt.close()` as the final lines. Code that only calls `plt.show()` without saving will NOT display the image to the user.
+- CRITICAL: NEVER reference a `sandbox:/mnt/data/<filename>` link unless you have already executed code in this response that saved that exact file. Referencing a file that was not created by executed code will result in a broken link.
 - Use the tool multiple times:
     - You MUST NOT guess anything about the structure of the data / files uploaded. Rather, you MUST perform some data exploration first.
         - Example: User uploads an excel files and asks a question about it. First Read the data, explore the columns, columns types, etc. Then use the tool to answer the user's query.
@@ -66,6 +69,7 @@ Instructions:
 Uploaded and generated files:
 - All files uploaded to the chat are available at the path `/mnt/data/<filename>`.
 - All files generated through code MUST be saved in the `/mnt/data` folder.
+- CRITICAL: When generating any plot or visualization, the code MUST call `plt.savefig('/mnt/data/<filename>.png', bbox_inches='tight')` and `plt.close()` to save the file. Never rely on `plt.show()` alone — a file that is not saved to `/mnt/data/` cannot be displayed.
 
 CRUCIAL Instructions for displaying images and files in the chat:
 - Once files are generated in the `/mnt/data` folder you MUST reference them in the chat using markdown syntax in order to display them in the chat.
@@ -89,6 +93,8 @@ IMPORTANT: ALWAYS place a blank line before AND after each file reference link s
 
 Handling User Queries:
 - Whenever the user query requires using the python tool, you must always think first about the steps required.
+- CRITICAL: If any step generates a plot or visualization, that code block MUST include `plt.savefig('/mnt/data/<filename>.png', bbox_inches='tight')` and `plt.close()` as the final lines. Code that only calls `plt.show()` without saving will NOT display the image to the user.
+- CRITICAL: NEVER reference a `sandbox:/mnt/data/<filename>` link unless you have already executed code in this response that saved that exact file. Referencing a file that was not created by executed code will result in a broken link.
 - Use the tool multiple times:
     - You MUST NOT guess anything about the structure of the data / files uploaded. Rather, you MUST perform some data exploration first.
         - Example: User uploads an excel files and asks a question about it. First Read the data, explore the columns, columns types, etc. Then use the tool to answer the user's query.

{unique_toolkit-1.62.0 → unique_toolkit-1.62.2}/unique_toolkit/agentic/tools/test/test_mcp_manager.py

@@ -33,8 +33,8 @@ class MockInternalSearchTool(Tool[BaseToolConfig]):
 
     name = "internal_search"
 
-    def __init__(self, config, event, tool_progress_reporter=None):
-        super().__init__(config, event, tool_progress_reporter)
+    def __init__(self, config, event=None, tool_progress_reporter=None):
+        super().__init__(config)
 
     def tool_description(self):
         from unique_toolkit.language_model.schemas import LanguageModelToolDescription

{unique_toolkit-1.62.0 → unique_toolkit-1.62.2}/unique_toolkit/agentic/tools/tool.py

@@ -2,12 +2,11 @@ from __future__ import annotations
 
 from abc import ABC, abstractmethod
 from logging import getLogger
-from typing import TYPE_CHECKING, Any, Generic, TypeVar, cast
+from typing import TYPE_CHECKING, Any, Generic, TypeVar, cast, overload
 
 from typing_extensions import deprecated
 
 from unique_toolkit.agentic.evaluation.schemas import EvaluationMetricName
-from unique_toolkit.agentic.message_log_manager.service import MessageStepLogger
 from unique_toolkit.agentic.tools.config import ToolBuildConfig, ToolSelectionPolicy
 from unique_toolkit.agentic.tools.schemas import (
     BaseToolConfig,
@@ -16,16 +15,17 @@ from unique_toolkit.agentic.tools.schemas import (
 )
 from unique_toolkit.agentic.tools.tool_progress_reporter import ToolProgressReporter
 from unique_toolkit.app.schemas import ChatEvent
-from unique_toolkit.app.unique_settings import UniqueSettings
 from unique_toolkit.language_model import LanguageModelToolDescription
-from unique_toolkit.services.factory import UniqueServiceFactory
 
 if TYPE_CHECKING:
-    from unique_toolkit.services.chat_service import ChatService
+    pass
 from unique_toolkit.language_model.schemas import (
     LanguageModelFunction,
 )
-from unique_toolkit.language_model.service import LanguageModelService
+
+if TYPE_CHECKING:
+    from unique_toolkit.agentic.tools.tool_progress_reporter import ToolProgressReporter
+    from unique_toolkit.app.schemas import ChatEvent
 
 ConfigType = TypeVar("ConfigType", bound=BaseToolConfig)
 
@@ -78,7 +78,7 @@ class Tool(ABC, Generic[ConfigType]):
         if not isinstance(parameters, dict):
             return parameters.model_json_schema()
         else:
-            return cast("dict[str, Any]", parameters)
+            return cast(dict[str, Any], parameters)
 
     # TODO: This method should be a property
     def tool_description_for_system_prompt(self) -> str:
@@ -140,34 +140,31 @@ class Tool(ABC, Generic[ConfigType]):
             tool_format_information_for_user_prompt=self.tool_format_information_for_user_prompt(),
         )
 
-    # Properties that we should soon deprecate
-
-    @property
-    @deprecated("Never reuse event. Dangerous")
-    def event(self) -> ChatEvent:
-        return self._event
-
-    @property
-    @deprecated("Do not use this property as directly tied to chat frontend")
-    def chat_service(self) -> ChatService:
-        return self._chat_service
-
-    @property
-    @deprecated("Do not use this property as directly tied to chat frontend")
-    def language_model_service(self) -> LanguageModelService:
-        return self._language_model_service
-
-    @property
-    @deprecated("Do not use this as directly tied to chat frontend")
-    def tool_progress_reporter(self) -> ToolProgressReporter | None:
-        return self._tool_progress_reporter
+    @overload
+    def __init__(self, config: ConfigType) -> None: ...
 
+    @overload
     def __init__(
         self,
         config: ConfigType,
         event: ChatEvent,
+        tool_progress_reporter: ToolProgressReporter | None = ...,
+    ) -> None: ...
+
+    def __init__(
+        self,
+        config: ConfigType,
+        event: ChatEvent | None = None,
         tool_progress_reporter: ToolProgressReporter | None = None,
-    ):
+    ) -> None:
+        """Initialize the tool.
+
+        Preferred (decoupled): `Tool(config)` — configuration only.
+
+        Backward compatible: `Tool(config, event, tool_progress_reporter)` — creates
+        deprecated chat_service, language_model_service, message_step_logger for
+        legacy subclasses.
+        """
         self.settings = ToolBuildConfig(
             name=self.name,
             configuration=config,
@@ -178,16 +175,57 @@ class Tool(ABC, Generic[ConfigType]):
         self.logger = getLogger(f"{module_name}.{__name__}")
         self.debug_info: dict = {}
 
-        # TODO: Remove these properties as soon as possible
-        self._event: ChatEvent = event
-        self._tool_progress_reporter: ToolProgressReporter | None = (
-            tool_progress_reporter
-        )
+        if event is not None:
+            from unique_toolkit.agentic.message_log_manager.service import (
+                MessageStepLogger,
+            )
+            from unique_toolkit.chat.service import ChatService
+            from unique_toolkit.language_model.service import LanguageModelService
+
+            self._event = event
+            self._tool_progress_reporter = tool_progress_reporter
+            self._chat_service = ChatService(event)
+            self._language_model_service = LanguageModelService.from_event(event)
+            self._message_step_logger = MessageStepLogger(
+                chat_service=self._chat_service,
+            )
 
-        self._chat_service = UniqueServiceFactory(
-            settings=UniqueSettings.from_chat_event(event)
-        ).chat_service()
-        self._language_model_service = LanguageModelService(event)
-        self._message_step_logger = MessageStepLogger(
-            chat_service=self._chat_service,
-        )
+    @property
+    @deprecated(
+        "Never reuse event. Dangerous. Prefer Tool(config) and inject context in run()."
+    )
+    def event(self) -> ChatEvent:
+        if not hasattr(self, "_event"):
+            raise AttributeError(
+                "event not available (tool was initialized with config only). "
+            )
+        return self._event
+
+    @property
+    @deprecated(
+        "Do not use; tied to chat frontend. Prefer Tool(config) and inject in run()."
+    )
+    def chat_service(self):
+        if not hasattr(self, "_chat_service"):
+            raise AttributeError(
+                "chat_service not available (tool was initialized with config only). "
+            )
+        return self._chat_service
+
+    @property
+    @deprecated(
+        "Do not use; tied to chat frontend. Prefer Tool(config) and inject in run()."
+    )
+    def language_model_service(self):
+        if not hasattr(self, "_language_model_service"):
+            raise AttributeError(
+                "language_model_service not available (tool was initialized with config only). "
+            )
+        return self._language_model_service
+
+    @property
+    @deprecated(
+        "Do not use; tied to chat frontend. Prefer Tool(config) and inject in run()."
+    )
+    def tool_progress_reporter(self) -> ToolProgressReporter | None:
+        return getattr(self, "_tool_progress_reporter", None)