unique_toolkit 0.8.19__py3-none-any.whl → 0.8.20__py3-none-any.whl

unique_toolkit/content/service.py

@@ -1,4 +1,6 @@
 import logging
+import mimetypes
+from enum import StrEnum
 from pathlib import Path
 from typing import Any, overload
 
@@ -33,6 +35,29 @@ from unique_toolkit.content.schemas import (
 logger = logging.getLogger(f"toolkit.{DOMAIN_NAME}.{__name__}")
 
 
+class FileMimeType(StrEnum):
+    PDF = "application/pdf"
+    DOCX = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+    DOC = "application/msword"
+    XLSX = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+    XLS = "application/vnd.ms-excel"
+    PPTX = "application/vnd.openxmlformats-officedocument.presentationml.presentation"
+    CSV = "text/csv"
+    HTML = "text/html"
+    MD = "text/markdown"
+    TXT = "text/plain"
+
+
+class ImageMimeType(StrEnum):
+    JPEG = "image/jpeg"
+    PNG = "image/png"
+    GIF = "image/gif"
+    BMP = "image/bmp"
+    WEBP = "image/webp"
+    TIFF = "image/tiff"
+    SVG = "image/svg+xml"
+
+
 class ContentService:
     """
     Provides methods for searching, downloading and uploading content in the knowledge base.
@@ -622,3 +647,51 @@ class ContentService:
             content_id=content_id,
             chat_id=chat_id,
         )
+
+    def get_documents_uploaded_to_chat(self) -> list[Content]:
+        chat_contents = self.search_contents(
+            where={
+                "ownerId": {
+                    "equals": self._chat_id,
+                },
+            },
+        )
+
+        content: list[Content] = []
+        for c in chat_contents:
+            if self.is_file_content(c.key):
+                content.append(c)
+
+        return content
+
+    def get_images_uploaded_to_chat(self) -> list[Content]:
+        chat_contents = self.search_contents(
+            where={
+                "ownerId": {
+                    "equals": self._chat_id,
+                },
+            },
+        )
+
+        content: list[Content] = []
+        for c in chat_contents:
+            if self.is_image_content(c.key):
+                content.append(c)
+
+        return content
+
+    def is_file_content(self, filename: str) -> bool:
+        mimetype, _ = mimetypes.guess_type(filename)
+
+        if not mimetype:
+            return False
+
+        return mimetype in FileMimeType.__members__.values()
+
+    def is_image_content(self, filename: str) -> bool:
+        mimetype, _ = mimetypes.guess_type(filename)
+
+        if not mimetype:
+            return False
+
+        return mimetype in ImageMimeType.__members__.values()

unique_toolkit/tools/schemas.py

@@ -132,6 +132,7 @@ class Source(BaseModel):
 class ToolPrompts(BaseModel):
     name: str
     display_name: str
+    tool_system_prompt: str
     tool_description: str
     tool_format_information_for_system_prompt: str
     input_model: dict[str, Any]

unique_toolkit/tools/tool.py

@@ -109,6 +109,7 @@ class Tool(ABC, Generic[ConfigType]):
             name=self.name,
             display_name=self.display_name(),
             tool_description=self.tool_description().description,
+            tool_system_prompt=self.tool_description_for_system_prompt(),
             tool_format_information_for_system_prompt=self.tool_format_information_for_system_prompt(),
             input_model=self.tool_description_as_json(),
         )

unique_toolkit/tools/tool_manager.py

@@ -1,5 +1,6 @@
 import asyncio
 from logging import Logger, getLogger
+from typing import Any
 
 from pydantic import BaseModel, Field
 
@@ -18,13 +19,6 @@ from unique_toolkit.tools.tool_progress_reporter import ToolProgressReporter
 from unique_toolkit.tools.utils.execution.execution import Result, SafeTaskExecutor
 
 
-class ForcedToolOption:
-    type: str = "function"
-
-    def __init__(self, name: str):
-        self.name = name
-
-
 class ToolManagerConfig(BaseModel):
     tools: list[ToolBuildConfig] = Field(
         default=[],
@@ -122,13 +116,20 @@ class ToolManager:
                 return tool
         return None
 
-    def get_forced_tools(self) -> list[ForcedToolOption]:
+    def get_forced_tools(self) -> list[dict[str, Any]]:
         return [
-            ForcedToolOption(t.name)
+            self._convert_to_forced_tool(t.name)
             for t in self._tools
             if t.name in self._tool_choices
         ]
 
+    def add_forced_tool(self, name):
+        tool = self.get_tool_by_name(name)
+        if not tool:
+            raise ValueError(f"Tool {name} not found")
+        self._tools.append(tool)
+        self._tool_choices.append(tool.name)
+
     def get_tool_definitions(
         self,
     ) -> list[LanguageModelTool | LanguageModelToolDescription]:
@@ -198,7 +199,9 @@ class ToolManager:
     ) -> ToolCallResponse:
         self._logger.info(f"Processing tool call: {tool_call.name}")
 
-        tool_instance = self.get_tool_by_name(tool_call.name)
+        tool_instance = self.get_tool_by_name(
+            tool_call.name
+        )  # we need to copy this as it will have problematic interference on multi calls.
 
         if tool_instance:
             # Execute the tool
@@ -254,3 +257,11 @@ class ToolManager:
                 f"Filtered out {len(tool_calls) - len(unique_tool_calls)} duplicate tool calls."
             )
         return unique_tool_calls
+
+    from typing import Any
+
+    def _convert_to_forced_tool(self, tool_name: str) -> dict[str, Any]:
+        return {
+            "type": "function",
+            "function": {"name": tool_name},
+        }

{unique_toolkit-0.8.19.dist-info → unique_toolkit-0.8.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 0.8.19
+Version: 0.8.20
 Summary: 
 License: Proprietary
 Author: Martin Fadler
@@ -114,6 +114,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.8.20] - 2025-08-24
+- Fixed forced-tool-calls
 
 ## [0.8.19] - 2025-08-24
 - Enforce usage of ruff using pipeline

{unique_toolkit-0.8.19.dist-info → unique_toolkit-0.8.20.dist-info}/RECORD

@@ -27,7 +27,7 @@ unique_toolkit/content/__init__.py,sha256=EdJg_A_7loEtCQf4cah3QARQreJx6pdz89Rm96
 unique_toolkit/content/constants.py,sha256=1iy4Y67xobl5VTnJB6SxSyuoBWbdLl9244xfVMUZi5o,60
 unique_toolkit/content/functions.py,sha256=HZtDIAH3ZxWleq5Si_v30n_7vTnNRu6BCxpTHb9TxdA,18635
 unique_toolkit/content/schemas.py,sha256=KJ604BOx0vBh2AwlTCZkOo55aHsI6yj8vxDAARKKqEo,2995
-unique_toolkit/content/service.py,sha256=3zUu3vUcPV8Mb_v1TCyi2hicGVMLNBamKB3Q6-z1trY,21455
+unique_toolkit/content/service.py,sha256=u4-9hXxali4eSpRtnjK93TunsV0YmB6EDqPY1rpnKQ4,23443
 unique_toolkit/content/utils.py,sha256=qNVmHTuETaPNGqheg7TbgPr1_1jbNHDc09N5RrmUIyo,7901
 unique_toolkit/debug_info_manager/debug_info_manager.py,sha256=7c2yb3ES0yu-SJy3o7EwpuCBGaq_8IOMEAvD-BQ-eLI,576
 unique_toolkit/embedding/__init__.py,sha256=uUyzjonPvuDCYsvXCIt7ErQXopLggpzX-MEQd3_e2kE,250
@@ -98,16 +98,16 @@ unique_toolkit/smart_rules/compile.py,sha256=cxWjb2dxEI2HGsakKdVCkSNi7VK9mr08w5s
 unique_toolkit/thinking_manager/thinking_manager.py,sha256=AJfmrTXTr-DxBnJ2_zYYpYo57kr5deqT0LiZb8UdaDQ,4175
 unique_toolkit/tools/config.py,sha256=CHelTOEd2uqktK-bSYIyaqb9M1hKz8fy_DAR2mVzXpc,2985
 unique_toolkit/tools/factory.py,sha256=w3uNHuYBIJ330Xi8PTdAkr8G3OMbQH2cBgvk5UT16oE,1253
-unique_toolkit/tools/schemas.py,sha256=Zsrkh9RXY6n2GLrW-afzhsWRrU9uIMuZhfAs-s_4_Lo,4692
+unique_toolkit/tools/schemas.py,sha256=PJBWN9NcEBSUmhrAMznbnw06ordrf4lfbhcxYZFmAOc,4720
 unique_toolkit/tools/test/test_tool_progress_reporter.py,sha256=GTtmBqOUo0-4fh_q0lRgxDhwKeankc3FHFD5ULZAm4Y,6299
-unique_toolkit/tools/tool.py,sha256=oMhGR_XdCP36L08LKHELpNwus4_UnC1klb_josM2-vM,5552
-unique_toolkit/tools/tool_manager.py,sha256=_kbB6dA1nyMM9D2YLARn8Ims25SOclOy1944Z0NVGcE,8895
+unique_toolkit/tools/tool.py,sha256=zreY6fGBAfOIPNujWkl4cV5fBojjzGzVyvYuNLDrbzQ,5626
+unique_toolkit/tools/tool_manager.py,sha256=vYGmNF9IvQoAG3N20TIbCpzmsJfoTFn_SVaENTJIk1w,9358
 unique_toolkit/tools/tool_progress_reporter.py,sha256=ixud9VoHey1vlU1t86cW0-WTvyTwMxNSWBon8I11SUk,7955
 unique_toolkit/tools/utils/execution/execution.py,sha256=vjG2Y6awsGNtlvyQAGCTthQ5thWHYnn-vzZXaYLb3QE,7922
 unique_toolkit/tools/utils/source_handling/schema.py,sha256=vzAyf6ZWNexjMO0OrnB8y2glGkvAilmGGQXd6zcDaKw,870
 unique_toolkit/tools/utils/source_handling/source_formatting.py,sha256=C7uayNbdkNVJdEARA5CENnHtNY1SU6etlaqbgHNyxaQ,9152
 unique_toolkit/tools/utils/source_handling/tests/test_source_formatting.py,sha256=oM5ZxEgzROrnX1229KViCAFjRxl9wCTzWZoinYSHleM,6979
-unique_toolkit-0.8.19.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
-unique_toolkit-0.8.19.dist-info/METADATA,sha256=AQgIWpBO6zd4H4cWtY8ML4t2Wdhq5AxdmbjUakFiRFs,28002
-unique_toolkit-0.8.19.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_toolkit-0.8.19.dist-info/RECORD,,
+unique_toolkit-0.8.20.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_toolkit-0.8.20.dist-info/METADATA,sha256=aBoWGMKrGjXZztoTaCqQF4w5CZ-P-4aZJ0QCqL09sjk,28053
+unique_toolkit-0.8.20.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_toolkit-0.8.20.dist-info/RECORD,,