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

unique_toolkit/_common/validators.py

@@ -61,17 +61,8 @@ def validate_and_init_language_model_info(
         LanguageModelInfo: The validated and initialized LanguageModelInfo object.
 
     """
-    if isinstance(v, LanguageModelName):
+    if isinstance(v, LanguageModelName | str):
         return LanguageModelInfo.from_name(v)
-    if isinstance(v, str):
-        if v in [name.value for name in LanguageModelName]:
-            return LanguageModelInfo.from_name(LanguageModelName(v))
-
-        return LanguageModelInfo(
-            name=v,
-            version="custom",
-            provider=LanguageModelProvider.CUSTOM,
-        )
 
     return v
 

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/language_model/infos.py

@@ -1,5 +1,9 @@
+import json
+import logging
+import os
 from datetime import date
 from enum import StrEnum
+from functools import lru_cache
 from typing import Annotated, Any, ClassVar, Optional, Self
 
 from pydantic import BaseModel, Field
@@ -9,6 +13,8 @@ from typing_extensions import deprecated
 from unique_toolkit._common.pydantic_helpers import get_configuration_dict
 from unique_toolkit.language_model.schemas import LanguageModelTokenLimits
 
+_LOGGER = logging.getLogger(__name__)
+
 
 class LanguageModelName(StrEnum):
     AZURE_GPT_35_TURBO_0125 = "AZURE_GPT_35_TURBO_0125"
@@ -202,8 +208,84 @@ class LanguageModelInfo(BaseModel):
 
     default_options: dict[str, Any] = {}
 
+    _ENV_VAR: ClassVar[str] = "LANGUAGE_MODEL_INFOS"
+    """Environment variable name for custom language model infos."""
+
+    @classmethod
+    @lru_cache(maxsize=1)
+    def _load_from_env(cls) -> dict[str, dict]:
+        """
+        Load custom language model infos from environment variable.
+
+        The environment variable should contain a JSON string with a dict of
+        LanguageModelInfo-compatible dictionaries. The key is used for model lookup.
+
+        Example:
+            LANGUAGE_MODEL_INFOS='{"AZURE_GPT_4o_CUSTOM": {"name": "AZURE_GPT_4o_2024_1120",
+            "provider": "AZURE", "version": "custom", "capabilities": ["function_calling",
+            "streaming", "vision"], "token_limits": {"token_limit_input": 3000,
+            "token_limit_output": 150}}}'
+
+        Returns:
+            A dictionary mapping model keys to their info dictionaries.
+        """
+        env_value = os.getenv(cls._ENV_VAR)
+        if not env_value:
+            return {}
+
+        try:
+            model_infos_dict = json.loads(env_value)
+            if not isinstance(model_infos_dict, dict):
+                _LOGGER.error(
+                    f"{cls._ENV_VAR} must be a JSON dict of model info objects. "
+                    f"Got {type(model_infos_dict).__name__} instead."
+                )
+                return {}
+
+            # Validate each entry in the dictionary
+            valid_model_infos: dict[str, dict] = {}
+            for model_key, model_info in model_infos_dict.items():
+                if not isinstance(model_info, dict):
+                    _LOGGER.warning(
+                        f"Skipping invalid model info entry '{model_key}' in {cls._ENV_VAR}: "
+                        f"expected dict, got {type(model_info).__name__}"
+                    )
+                    continue
+
+                valid_model_infos[model_key] = model_info
+
+            _LOGGER.debug(
+                f"Loaded {len(valid_model_infos)} custom language model infos from {cls._ENV_VAR}"
+            )
+            return valid_model_infos
+
+        except json.JSONDecodeError:
+            _LOGGER.error(
+                f"Failed to parse {cls._ENV_VAR} as JSON. "
+                "The environment variable should contain a valid JSON dict of model info objects.",
+                exc_info=True,
+            )
+            return {}
+
     @classmethod
-    def from_name(cls, model_name: LanguageModelName) -> Self:
+    def from_name(cls, model_name: LanguageModelName | str) -> Self:
+        # Check environment variable first - env definitions take precedence
+        env_model_infos = cls._load_from_env()
+        model_name_str = (
+            model_name.value
+            if isinstance(model_name, LanguageModelName)
+            else model_name
+        )
+        if model_name_str in env_model_infos.keys():
+            try:
+                return cls.model_validate(env_model_infos[model_name_str])
+            except Exception:
+                _LOGGER.warning(
+                    f"Failed to parse model info for '{model_name_str}' from "
+                    f"{cls._ENV_VAR}. Falling back to default definition.",
+                    exc_info=True,
+                )
+
         match model_name:
             case LanguageModelName.AZURE_GPT_35_TURBO_0125:
                 return cls(
@@ -1723,14 +1805,7 @@ class LanguageModel:
 
     @classmethod
     def get_model_info(cls, model_name: LanguageModelName | str) -> LanguageModelInfo:
-        if isinstance(model_name, LanguageModelName):
-            return LanguageModelInfo.from_name(model_name)
-
-        return LanguageModelInfo(
-            name=model_name,
-            version="custom",
-            provider=LanguageModelProvider.CUSTOM,
-        )
+        return LanguageModelInfo.from_name(model_name)
 
     @classmethod
     def list_models(cls) -> list[LanguageModelInfo]:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 1.36.0
+Version: 1.38.0
 Summary: 
 License: Proprietary
 Author: Cedric Klinkert
@@ -121,6 +121,12 @@ 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.38.0] - 2025-12-15
+- Including capability to load LanguageModelInfos in env variable
+
+## [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.38.0.dist-info}/RECORD

@@ -39,7 +39,7 @@ unique_toolkit/_common/utils/structured_output/__init__.py,sha256=nm_orZrlCXL0FP
 unique_toolkit/_common/utils/structured_output/schema.py,sha256=Tp7kDYcmKtnUhcuRkH86TSYhylRff0ZZJYb2dLkISts,131
 unique_toolkit/_common/utils/write_configuration.py,sha256=fzvr4C-XBL3OSM3Od9TbqIxeeDS9_d9CLEyTq6DDknY,1409
 unique_toolkit/_common/validate_required_values.py,sha256=Y_M1ub9gIKP9qZ45F6Zq3ZHtuIqhmOjl8Z2Vd3avg8w,588
-unique_toolkit/_common/validators.py,sha256=LFZmAalNa886EXm1VYamFvfBuUZjYKwDdT_HOYU0BtE,2934
+unique_toolkit/_common/validators.py,sha256=ElnkMsyEY24TfzfTVHvireyT39EnZgW5N40T0P4b6gE,2638
 unique_toolkit/agentic/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 unique_toolkit/agentic/debug_info_manager/debug_info_manager.py,sha256=30ZZaw0vffjZjiu9AYdO1Sm8G9FN6XR2ehdOEUCKqh0,891
 unique_toolkit/agentic/debug_info_manager/test/test_debug_info_manager.py,sha256=_fIS6_DHA8A3AB64-LPgHgUGa1w0CFUWwtgV-ZbhkzA,10535
@@ -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
@@ -191,7 +194,7 @@ unique_toolkit/language_model/builder.py,sha256=4OKfwJfj3TrgO1ezc_ewIue6W7BCQ2ZY
 unique_toolkit/language_model/constants.py,sha256=B-topqW0r83dkC_25DeQfnPk3n53qzIHUCBS7YJ0-1U,119
 unique_toolkit/language_model/default_language_model.py,sha256=-_DBsJhLCsFdaU4ynAkyW0jYIl2lhrPybZm1K-GgVJs,125
 unique_toolkit/language_model/functions.py,sha256=PTBm2BBkuqISVHoyUqMIGHGXT-RMSAfz0F_Ylo2esQ8,18246
-unique_toolkit/language_model/infos.py,sha256=sZJOOij-dfReDxJWfd7ZwP3qx4KcN1LVqNchRafKmrY,79877
+unique_toolkit/language_model/infos.py,sha256=Bh6-Fs_xbqqhEPRbEiudcrLPIHYPyfHuzfRZtBVs9I0,82806
 unique_toolkit/language_model/prompt.py,sha256=JSawaLjQg3VR-E2fK8engFyJnNdk21zaO8pPIodzN4Q,3991
 unique_toolkit/language_model/reference.py,sha256=nkX2VFz-IrUz8yqyc3G5jUMNwrNpxITBrMEKkbqqYoI,8583
 unique_toolkit/language_model/schemas.py,sha256=ATiHjhfGxoubS332XuhL9PKSoFewcWvPTUVBaNGWlJo,23994
@@ -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.38.0.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_toolkit-1.38.0.dist-info/METADATA,sha256=OJdgZ3Hlti9zeds9NTOC6OOibFeUsedeFjtZzVZJMTo,46376
+unique_toolkit-1.38.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_toolkit-1.38.0.dist-info/RECORD,,