unique_toolkit 1.36.0__py3-none-any.whl → 1.37.0__py3-none-any.whl

unique_toolkit/agentic/loop_runner/__init__.py

@@ -1,8 +1,11 @@
 from unique_toolkit.agentic.loop_runner.base import LoopIterationRunner
 from unique_toolkit.agentic.loop_runner.middleware import (
+    QWEN_FORCED_TOOL_CALL_PROMPT_INSTRUCTION,
     PlanningConfig,
     PlanningMiddleware,
     PlanningSchemaConfig,
+    QwenForcedToolCallMiddleware,
+    is_qwen_model,
 )
 from unique_toolkit.agentic.loop_runner.runners import (
     BasicLoopIterationRunner,
@@ -11,9 +14,12 @@ from unique_toolkit.agentic.loop_runner.runners import (
 
 __all__ = [
     "LoopIterationRunner",
+    "QWEN_FORCED_TOOL_CALL_PROMPT_INSTRUCTION",
     "PlanningConfig",
     "PlanningMiddleware",
     "PlanningSchemaConfig",
+    "QwenForcedToolCallMiddleware",
+    "is_qwen_model",
     "BasicLoopIterationRunnerConfig",
     "BasicLoopIterationRunner",
 ]

unique_toolkit/agentic/loop_runner/middleware/__init__.py

@@ -3,5 +3,17 @@ from unique_toolkit.agentic.loop_runner.middleware.planning import (
     PlanningMiddleware,
     PlanningSchemaConfig,
 )
+from unique_toolkit.agentic.loop_runner.middleware.qwen_forced_tool_call import (
+    QWEN_FORCED_TOOL_CALL_PROMPT_INSTRUCTION,
+    QwenForcedToolCallMiddleware,
+    is_qwen_model,
+)
 
-__all__ = ["PlanningConfig", "PlanningMiddleware", "PlanningSchemaConfig"]
+__all__ = [
+    "PlanningConfig",
+    "PlanningMiddleware",
+    "PlanningSchemaConfig",
+    "QWEN_FORCED_TOOL_CALL_PROMPT_INSTRUCTION",
+    "QwenForcedToolCallMiddleware",
+    "is_qwen_model",
+]

unique_toolkit/agentic/loop_runner/middleware/qwen_forced_tool_call/__init__.py

@@ -0,0 +1,13 @@
+from unique_toolkit.agentic.loop_runner.middleware.qwen_forced_tool_call.helpers import (
+    is_qwen_model,
+)
+from unique_toolkit.agentic.loop_runner.middleware.qwen_forced_tool_call.qwen_forced_tool_call import (
+    QWEN_FORCED_TOOL_CALL_PROMPT_INSTRUCTION,
+    QwenForcedToolCallMiddleware,
+)
+
+__all__ = [
+    "QwenForcedToolCallMiddleware",
+    "QWEN_FORCED_TOOL_CALL_PROMPT_INSTRUCTION",
+    "is_qwen_model",
+]

unique_toolkit/agentic/loop_runner/middleware/qwen_forced_tool_call/helpers.py

@@ -0,0 +1,33 @@
+from unique_toolkit.language_model.infos import LanguageModelInfo
+from unique_toolkit.language_model.schemas import (
+    LanguageModelMessageRole,
+    LanguageModelMessages,
+)
+
+
+def is_qwen_model(*, model: str | LanguageModelInfo | None) -> bool:
+    """Check if the model is a Qwen model."""
+    if isinstance(model, LanguageModelInfo):
+        name = model.name
+        # name is an Enum with a .value attribute
+        return "qwen" in str(getattr(name, "value", name)).lower()
+    elif isinstance(model, str):
+        return "qwen" in model.lower()
+    return False
+
+
+def append_qwen_forced_tool_call_instruction(
+    *,
+    messages: LanguageModelMessages,
+    forced_tool_call_instruction: str,
+) -> LanguageModelMessages:
+    """Append tool call instruction to the last user message for Qwen models."""
+    messages_list = list(messages)
+    for i in range(len(messages_list) - 1, -1, -1):
+        msg = messages_list[i]
+        if msg.role == LanguageModelMessageRole.USER and isinstance(msg.content, str):
+            messages_list[i] = msg.model_copy(
+                update={"content": msg.content + "\n" + forced_tool_call_instruction}
+            )
+            break
+    return LanguageModelMessages(root=messages_list)

unique_toolkit/agentic/loop_runner/middleware/qwen_forced_tool_call/qwen_forced_tool_call.py

@@ -0,0 +1,50 @@
+import logging
+from typing import Unpack
+
+from unique_toolkit.agentic.loop_runner.base import (
+    LoopIterationRunner,
+    _LoopIterationRunnerKwargs,
+)
+from unique_toolkit.agentic.loop_runner.middleware.qwen_forced_tool_call.helpers import (
+    append_qwen_forced_tool_call_instruction,
+)
+from unique_toolkit.chat.service import LanguageModelStreamResponse
+
+_LOGGER = logging.getLogger(__name__)
+
+QWEN_FORCED_TOOL_CALL_PROMPT_INSTRUCTION = (
+    "Tool Call Instruction: \nYou always have to return a tool call. "
+    "You must start the response with <tool_call> and end with </tool_call>. "
+    "Do NOT provide natural language explanations, summaries, or any text outside the <tool_call> block."
+)
+
+
+class QwenForcedToolCallMiddleware(LoopIterationRunner):
+    def __init__(
+        self,
+        *,
+        loop_runner: LoopIterationRunner,
+        qwen_forced_tool_call_prompt_instruction: str,
+    ) -> None:
+        self._qwen_forced_tool_call_prompt_instruction = (
+            qwen_forced_tool_call_prompt_instruction
+        )
+        self._loop_runner = loop_runner
+
+    async def __call__(
+        self, **kwargs: Unpack[_LoopIterationRunnerKwargs]
+    ) -> LanguageModelStreamResponse:
+        tool_choices = kwargs.get("tool_choices") or []
+        iteration_index = kwargs["iteration_index"]
+
+        # For Qwen models, append tool call instruction to the last user message. These models ignore the parameter tool_choice.
+        if len(tool_choices) > 0 and iteration_index == 0 and kwargs.get("messages"):
+            _LOGGER.info(
+                "Appending tool call instruction to the last user message for Qwen models to force tool calls."
+            )
+            kwargs["messages"] = append_qwen_forced_tool_call_instruction(
+                messages=kwargs["messages"],
+                forced_tool_call_instruction=self._qwen_forced_tool_call_prompt_instruction,
+            )
+
+        return await self._loop_runner(**kwargs)

unique_toolkit/agentic/loop_runner/runners/basic.py

@@ -56,13 +56,15 @@ class BasicLoopIterationRunner(LoopIterationRunner):
 
         responses: list[LanguageModelStreamResponse] = []
 
+        available_tools = {t.name: t for t in kwargs.get("tools") or []}
+
         for opt in tool_choices:
-            responses.append(
-                await stream_response(
-                    loop_runner_kwargs=kwargs,
-                    tool_choice=opt,
-                )
-            )
+            func_name = opt.get("function", {}).get("name")
+            limited_tool = available_tools.get(func_name) if func_name else None
+            stream_kwargs = {"loop_runner_kwargs": kwargs, "tool_choice": opt}
+            if limited_tool:
+                stream_kwargs["tools"] = [limited_tool]
+            responses.append(await stream_response(**stream_kwargs))
 
         # Merge responses and refs:
         tool_calls = []

{unique_toolkit-1.36.0.dist-info → unique_toolkit-1.37.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 1.36.0
+Version: 1.37.0
 Summary: 
 License: Proprietary
 Author: Cedric Klinkert
@@ -121,6 +121,9 @@ 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).
 
+## [1.37.0] - 2025-12-15
+- Adding a prompt appendix to enforce forced tool calls when using Qwen models
+
 ## [1.36.0] - 2025-12-11
 - Add support for a sub agent tool system reminder when no references are present in the sub agent response.
 

{unique_toolkit-1.36.0.dist-info → unique_toolkit-1.37.0.dist-info}/RECORD

@@ -62,15 +62,18 @@ unique_toolkit/agentic/history_manager/history_construction_with_contents.py,sha
 unique_toolkit/agentic/history_manager/history_manager.py,sha256=7V7_173XkAjc8otBACF0G3dbqRs34FSlURbBPrE95Wk,9537
 unique_toolkit/agentic/history_manager/loop_token_reducer.py,sha256=3c-uonDovtanEJUpAO4zlA4-n9MS_Ws_V0Yb6G7hPM0,20172
 unique_toolkit/agentic/history_manager/utils.py,sha256=VIn_UmcR3jHtpux0qp5lQQzczgAm8XYSeQiPo87jC3A,3143
-unique_toolkit/agentic/loop_runner/__init__.py,sha256=QLCYmIyfcKQEbuv1Xm0VuR_xC8JyD2_aMIvt1TRFzvw,517
+unique_toolkit/agentic/loop_runner/__init__.py,sha256=Kg-6Zgt--iIYk-biAkvnuwbButxPRPoVlrpppUblm0s,721
 unique_toolkit/agentic/loop_runner/_stream_handler_utils.py,sha256=FTGc5y8wkDnwnRVSYEdandgKz-FiySOsrTFFMadwP6E,1706
 unique_toolkit/agentic/loop_runner/base.py,sha256=3g4PalzV00o8kcRwHds2c2rtxW4idD7_7vS2Z7GkMvQ,1370
-unique_toolkit/agentic/loop_runner/middleware/__init__.py,sha256=_yeRH8xYigfJZyQ5-5lZUo2RXDJkGfftCQrKFm2rWb4,217
+unique_toolkit/agentic/loop_runner/middleware/__init__.py,sha256=r9c_Ml2g7obglnEC7gDihSTUrZ6s1sNGCMuMXR0Yl90,520
 unique_toolkit/agentic/loop_runner/middleware/planning/__init__.py,sha256=Y9MlihNA8suNREixW98RF45bj0EMtD_tQuDrO2MEML4,304
 unique_toolkit/agentic/loop_runner/middleware/planning/planning.py,sha256=5d8kyipuFyI_1SQG49f165eOwSHeSG1qjbJQ7laeTsk,3218
 unique_toolkit/agentic/loop_runner/middleware/planning/schema.py,sha256=76C36CWCLfDAYYqtaQlhXsmkWM1fCqf8j-l5afQREKA,2869
+unique_toolkit/agentic/loop_runner/middleware/qwen_forced_tool_call/__init__.py,sha256=lP8N8XLvV1irvGC6Q0FedAlBx-T2UPKotDRwkdx7neA,417
+unique_toolkit/agentic/loop_runner/middleware/qwen_forced_tool_call/helpers.py,sha256=DGKW9i7mCXNTejO2fotCmqSzI2b5k89ybkJA0QQ75qU,1234
+unique_toolkit/agentic/loop_runner/middleware/qwen_forced_tool_call/qwen_forced_tool_call.py,sha256=dp08YgL4UwVDTsJB-z7eiJn7zWEbqG8eiWfMOcvKZdI,1955
 unique_toolkit/agentic/loop_runner/runners/__init__.py,sha256=raaNpHcTfXkYURy0ysyacispSdQzYPDoG17PyR57uK4,205
-unique_toolkit/agentic/loop_runner/runners/basic.py,sha256=3swSPsefV1X-ltUC8iNAOrn9PL0abUUfWXJjhM4sShA,3116
+unique_toolkit/agentic/loop_runner/runners/basic.py,sha256=SQzwkLEiraU8neXvPEc_uOBzC17PkCpOEsFrZ79YGCY,3379
 unique_toolkit/agentic/message_log_manager/__init__.py,sha256=3-KY_sGkPbNoSnrzwPY0FQIJNnsz4NHXvocXgGRUeuE,169
 unique_toolkit/agentic/message_log_manager/service.py,sha256=AiuIq2dKQg9Y8bEYgGcve1X8-WRRdqPZXaZXXLJxfFM,3057
 unique_toolkit/agentic/postprocessor/postprocessor_manager.py,sha256=s6HFhA61TE05aAay15NFTWI1JvdSlxmGpEVfpBbGFyM,7684
@@ -209,7 +212,7 @@ unique_toolkit/short_term_memory/service.py,sha256=5PeVBu1ZCAfyDb2HLVvlmqSbyzBBu
 unique_toolkit/smart_rules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 unique_toolkit/smart_rules/compile.py,sha256=Ozhh70qCn2yOzRWr9d8WmJeTo7AQurwd3tStgBMPFLA,1246
 unique_toolkit/test_utilities/events.py,sha256=_mwV2bs5iLjxS1ynDCjaIq-gjjKhXYCK-iy3dRfvO3g,6410
-unique_toolkit-1.36.0.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
-unique_toolkit-1.36.0.dist-info/METADATA,sha256=b-BMlh-JACksT29xq0D-VY8p3OZo-wXrrwJgn6Ronf0,46179
-unique_toolkit-1.36.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_toolkit-1.36.0.dist-info/RECORD,,
+unique_toolkit-1.37.0.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_toolkit-1.37.0.dist-info/METADATA,sha256=P8N25tqQqezFmyaOYAXtauCGKHdeGaxMa9kyfd-x1_Q,46284
+unique_toolkit-1.37.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_toolkit-1.37.0.dist-info/RECORD,,