unique_toolkit 1.47.2__tar.gz → 1.47.4__tar.gz

{unique_toolkit-1.47.2 → unique_toolkit-1.47.4}/CHANGELOG.md

@@ -5,6 +5,13 @@ 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.47.4] - 2026-02-24
+- Extend RJSF tags: add `CustomWidget.custom()` with `CustomWidgetName`, `ObjectWidget.collapsible()`, `SpecialWidget.hidden()`
+- Add RJSF meta tags to `SubAgentToolConfig` text fields (textarea with rows=5 for tool descriptions and format info)
+
+## [1.47.3] - 2026-02-24
+- Add `mcp_server` name to debug info for analytics
+
 ## [1.47.2] - 2026-02-23
 - Add HTML rendering documentation (inline HTML and content references)
 

{unique_toolkit-1.47.2 → unique_toolkit-1.47.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: unique_toolkit
-Version: 1.47.2
+Version: 1.47.4
 Summary: 
 License: Proprietary
 Author: Cedric Klinkert
@@ -9,6 +9,7 @@ Requires-Python: >=3.12,<4.0
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: aiohttp (>=3.12.0,<4.0.0)
 Requires-Dist: click (>=8.1.0,<9.0.0)
 Requires-Dist: deepdiff (>=8.6.1,<9.0.0)
@@ -127,6 +128,13 @@ 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.47.4] - 2026-02-24
+- Extend RJSF tags: add `CustomWidget.custom()` with `CustomWidgetName`, `ObjectWidget.collapsible()`, `SpecialWidget.hidden()`
+- Add RJSF meta tags to `SubAgentToolConfig` text fields (textarea with rows=5 for tool descriptions and format info)
+
+## [1.47.3] - 2026-02-24
+- Add `mcp_server` name to debug info for analytics
+
 ## [1.47.2] - 2026-02-23
 - Add HTML rendering documentation (inline HTML and content references)
 

{unique_toolkit-1.47.2 → unique_toolkit-1.47.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "unique_toolkit"
-version = "1.47.2"
+version = "1.47.4"
 description = ""
 authors = [
     "Cedric Klinkert <cedric.klinkert@unique.ch>",
@@ -94,6 +94,16 @@ coverage = "pytest --cov=unique_toolkit --cov-report=term-missing"
 ci-typecheck = { shell = "bash $(git rev-parse --show-toplevel)/.github/scripts/dev.sh typecheck" }
 ci-coverage = { shell = "bash $(git rev-parse --show-toplevel)/.github/scripts/dev.sh coverage" }
 
+[tool.pytest.ini_options]
+addopts = "--strict-markers"
+asyncio_mode = "auto"
+markers = [
+    "ai: AI-generated tests",
+    "verified: AI-generated tests with human verification",
+    "wip: Work in progress tests"
+]
+filterwarnings = ["ignore::DeprecationWarning"]
+
 [tool.deptry]
 known_first_party = ["unique_toolkit"]
 extend_exclude = ["docs", "tests", "unique_toolkit/.*/test", "unique_toolkit/.*/tests"]

{unique_toolkit-1.47.2 → unique_toolkit-1.47.4}/unique_toolkit/_common/pydantic/rjsf_tags.py

@@ -13,12 +13,21 @@ Key components:
 
 from __future__ import annotations
 
+from collections.abc import Callable
+from enum import StrEnum
 from typing import Annotated, Any, Union, get_args, get_origin
 
 from pydantic import BaseModel
 from typing_extensions import get_type_hints
 
 
+class CustomWidgetName(StrEnum):
+    """Mirrors TypeScript CustomWidgetName. Keep in sync when extending."""
+
+    ICON_PICKER = "iconPicker"
+    # Add new entries here when adding custom widgets in TypeScript
+
+
 # --------- Base Metadata carrier ----------
 class RJSFMetaTag:
     def __init__(self, attrs: dict[str, Any] | None = None):
@@ -401,7 +410,7 @@ class RJSFMetaTag:
 
             attrs = {
                 "ui:widget": "range",
-                "ui:disabled": str(disabled).lower() if disabled else None,
+                "ui:disabled": disabled,
                 "ui:options": options if options else None,
                 "ui:title": title,
                 "ui:description": description,
@@ -573,6 +582,29 @@ class RJSFMetaTag:
             }
             return RJSFMetaTag({k: v for k, v in attrs.items() if v is not None})
 
+    class CustomWidget:
+        @classmethod
+        def custom(
+            cls,
+            name: CustomWidgetName,
+            *,
+            disabled: bool = False,
+            title: str | None = None,
+            description: str | None = None,
+            help: str | None = None,
+            **kwargs: Any,
+        ) -> RJSFMetaTag:
+            """Use any custom widget by name. Extend CustomWidgetName when adding new widgets."""
+            attrs = {
+                "ui:widget": name,
+                "ui:disabled": disabled,
+                "ui:title": title,
+                "ui:description": description,
+                "ui:help": help,
+                **kwargs,
+            }
+            return RJSFMetaTag({k: v for k, v in attrs.items() if v is not None})
+
     # --------- Composer Methods ----------
 
     @classmethod
@@ -663,7 +695,6 @@ class RJSFMetaTag:
         for widget in widgets:
             any_of_branches.append(widget.attrs)
 
-        # Start with Union-level metadata
         union_attrs = {
             "ui:title": title,
             "ui:description": description,
@@ -673,11 +704,6 @@ class RJSFMetaTag:
             **kwargs,
         }
 
-        # Add any additional kwargs
-        for key, value in kwargs.items():
-            if value is not None:
-                union_attrs[f"ui:{key}" if not key.startswith("ui:") else key] = value
-
         union_attrs = {k: v for k, v in union_attrs.items() if v is not None}
         return RJSFMetaTag({**union_attrs, "anyOf": any_of_branches})
 
@@ -788,7 +814,12 @@ def _is_pyd_model(t: Any) -> bool:
 
 
 # --------- Build RJSF-style uiSchema dict from a model *type* ----------
-def ui_schema_for_model(model_cls: type[BaseModel]) -> dict[str, Any]:
+def ui_schema_for_model(
+    model_cls: type[BaseModel],
+    *,
+    key_transform: Callable[[str], str] | None = None,
+    value_transform: Callable[[str], str] | None = None,
+) -> dict[str, Any]:
     """
     Generate a React JSON Schema Form (RJSF) uiSchema from a Pydantic model.
 
@@ -806,6 +837,15 @@ def ui_schema_for_model(model_cls: type[BaseModel]) -> dict[str, Any]:
 
     Args:
         model_cls: A Pydantic BaseModel subclass to analyze
+        key_transform: An optional ``str → str`` function (e.g.
+            ``humps.camelize``) applied to **dict keys** (field names).
+            RJSF metadata keys like ``ui:widget`` are never transformed.
+            When ``None`` (default), the schema is returned with the
+            original snake_case keys.
+        value_transform: An optional ``str → str`` function applied to
+            **string values inside ``ui:order`` lists**.  Defaults to
+            *key_transform* when not provided, since ``ui:order`` values
+            must match the (transformed) property names.
 
     Returns:
         A dictionary representing the RJSF uiSchema with the structure:
@@ -834,11 +874,16 @@ def ui_schema_for_model(model_cls: type[BaseModel]) -> dict[str, Any]:
     hints = get_type_hints(model_cls, include_extras=True)
     ui: dict[str, Any] = {}
 
-    for fname, ann in hints.items():
+    for fname in model_cls.model_fields:
+        ann = hints[fname]
         node: dict[str, Any] = {}
 
         base, meta = _walk_annotated_chain(ann)
         base = _unwrap_optional(base)
+        # For Annotated[T, meta] | None, _walk_annotated_chain sees Union (empty meta).
+        # Re-process the unwrapped type to extract metadata from the Annotated branch.
+        if not meta and get_origin(base) is Annotated:
+            base, meta = _walk_annotated_chain(base)
         # Start with field-level metadata (flat dict)
         if meta:
             node.update(meta)
@@ -901,9 +946,95 @@ def ui_schema_for_model(model_cls: type[BaseModel]) -> dict[str, Any]:
 
         ui[fname] = node
 
+    ui["ui:order"] = list(model_cls.model_fields.keys())
+
+    if key_transform is not None:
+        return transform_ui_schema(ui, key_transform, value_transform)
     return ui
 
 
+# --------- Key / value transformation helpers ----------
+
+
+_STRUCTURAL_KEYS = frozenset(
+    {
+        "anyOf",
+        "oneOf",
+        "allOf",
+        "items",
+        "additionalProperties",
+        "type",
+    }
+)
+
+
+def _is_metadata_key(key: str, field_names: frozenset[str] | None = None) -> bool:
+    """Return ``True`` for RJSF / JSON-Schema structural keys that must not
+    be treated as field names (and therefore must not be transformed).
+
+    When *field_names* is provided, a key that exists in both
+    ``_STRUCTURAL_KEYS`` and *field_names* is treated as a field name
+    (i.e. **not** metadata), so it will be transformed correctly.
+    """
+    if key.startswith(("ui:", "$")):
+        return True
+    if key in _STRUCTURAL_KEYS:
+        return field_names is None or key not in field_names
+    return False
+
+
+def transform_ui_schema(
+    ui_schema: dict[str, Any],
+    key_transform: Callable[[str], str],
+    value_transform: Callable[[str], str] | None = None,
+) -> dict[str, Any]:
+    """Apply transforms to field-name keys and ``ui:order`` values.
+
+    RJSF metadata keys (``ui:widget``, ``ui:options``, …) and JSON-Schema
+    structural keys (``anyOf``, ``items``, …) are never transformed — only
+    regular field-name keys and the string values inside ``ui:order`` lists.
+
+    For the common camelCase use-case::
+
+        from humps import camelize
+        transform_ui_schema(raw_ui, camelize)
+
+    Args:
+        ui_schema: The raw UI schema to transform.
+        key_transform: A ``str → str`` function for dict keys.
+        value_transform: A ``str → str`` function for ``ui:order`` values.
+            Defaults to *key_transform* when ``None``.
+
+    Returns:
+        A new dictionary with transformed keys and ``ui:order`` values.
+    """
+    val_fn = value_transform if value_transform is not None else key_transform
+    top_level_fields = frozenset(ui_schema.get("ui:order", []))
+    return _transform_obj(ui_schema, key_transform, val_fn, top_level_fields)
+
+
+def _transform_obj(
+    obj: Any,
+    key_fn: Callable[[str], str],
+    val_fn: Callable[[str], str],
+    field_names: frozenset[str] | None = None,
+) -> Any:
+    if isinstance(obj, dict):
+        result: dict[str, Any] = {}
+        child_fields = frozenset(obj.get("ui:order", [])) if "ui:order" in obj else None
+        names = field_names if child_fields is None else child_fields
+        for k, v in obj.items():
+            new_key = k if _is_metadata_key(k, names) else key_fn(k)
+            if k == "ui:order" and isinstance(v, list):
+                result[new_key] = [val_fn(s) if isinstance(s, str) else s for s in v]
+            else:
+                result[new_key] = _transform_obj(v, key_fn, val_fn)
+        return result
+    if isinstance(obj, list):
+        return [_transform_obj(item, key_fn, val_fn) for item in obj]
+    return obj
+
+
 # --------- Example ---------
 if __name__ == "__main__":
 

{unique_toolkit-1.47.2 → unique_toolkit-1.47.4}/unique_toolkit/agentic/debug_info_manager/debug_info_manager.py

@@ -13,10 +13,17 @@ class DebugInfoManager:
         loop_iteration_index: int | None = None,
     ):
         for tool_call_response in tool_call_responses:
-            tool_info = {
+            debug_info = (
+                tool_call_response.debug_info.copy()
+                if tool_call_response.debug_info
+                else {}
+            )
+            tool_info: dict = {
                 "name": tool_call_response.name,
-                "info": tool_call_response.debug_info,
+                "info": debug_info,
             }
+            if debug_info.get("mcp_server"):
+                tool_info["mcp_server"] = debug_info["mcp_server"]
             if loop_iteration_index is not None:
                 tool_info["info"]["loop_iteration"] = loop_iteration_index
             self.debug_info["tools"].append(tool_info)

{unique_toolkit-1.47.2 → unique_toolkit-1.47.4}/unique_toolkit/agentic/debug_info_manager/test/test_debug_info_manager.py

@@ -138,6 +138,43 @@ class TestDebugInfoManager:
         assert debug_info["tools"][0]["name"] == "MinimalTool"
         assert debug_info["tools"][0]["info"] == {}
 
+    def test_extract_tool_debug_info__includes_mcp_server__when_present_in_debug_info(
+        self,
+    ):
+        """Test that mcp_server is promoted from debug_info to the tool level."""
+        manager = DebugInfoManager()
+        tool_call_response = ToolCallResponse(
+            id="tool_1",
+            name="MCPSearchTool",
+            debug_info={
+                "mcp_tool": "MCPSearchTool",
+                "mcp_server": "my-mcp-server",
+                "arguments": {"query": "test"},
+            },
+        )
+
+        manager.extract_tool_debug_info([tool_call_response])
+
+        debug_info = manager.get()
+        assert len(debug_info["tools"]) == 1
+        assert debug_info["tools"][0]["name"] == "MCPSearchTool"
+        assert debug_info["tools"][0]["mcp_server"] == "my-mcp-server"
+
+    def test_extract_tool_debug_info__omits_mcp_server__when_not_present(self):
+        """Test that mcp_server is not included for non-MCP tools."""
+        manager = DebugInfoManager()
+        tool_call_response = ToolCallResponse(
+            id="tool_1",
+            name="InternalSearch",
+            debug_info={"query": "test"},
+        )
+
+        manager.extract_tool_debug_info([tool_call_response])
+
+        debug_info = manager.get()
+        assert len(debug_info["tools"]) == 1
+        assert "mcp_server" not in debug_info["tools"][0]
+
     def test_extract_tool_debug_info__handles_empty_list__without_error(self):
         """Test that passing an empty list doesn't cause errors."""
         manager = DebugInfoManager()

{unique_toolkit-1.47.2 → unique_toolkit-1.47.4}/unique_toolkit/agentic/tools/a2a/tool/config.py

@@ -5,6 +5,7 @@ from typing import Annotated, Generic, Literal, TypeVar
 from pydantic import Field
 from pydantic.main import BaseModel
 
+from unique_toolkit._common.pydantic.rjsf_tags import RJSFMetaTag
 from unique_toolkit._common.pydantic_helpers import get_configuration_dict
 from unique_toolkit.agentic.tools.schemas import BaseToolConfig
 
@@ -118,27 +119,37 @@ class SubAgentToolConfig(BaseToolConfig):
         description="The list of tool names that will be forced to be called for this sub-agent.",
     )
 
-    tool_description_for_system_prompt: str = Field(
+    tool_description_for_system_prompt: Annotated[
+        str, RJSFMetaTag.StringWidget.textarea(rows=5)
+    ] = Field(
         default="",
         description="Description of the tool that will be included in the system prompt.",
     )
-    tool_description: str = Field(
+    tool_description: Annotated[str, RJSFMetaTag.StringWidget.textarea(rows=5)] = Field(
         default="",
         description="Description of the tool that will be included in the tools sent to the model.",
     )
-    param_description_sub_agent_user_message: str = Field(
+    param_description_sub_agent_user_message: Annotated[
+        str, RJSFMetaTag.StringWidget.textarea(rows=5)
+    ] = Field(
         default=DEFAULT_PARAM_DESCRIPTION_SUB_AGENT_USER_MESSAGE,
         description="Description of the user message parameter that will be sent to the model.",
     )
-    tool_format_information_for_system_prompt: str = Field(
+    tool_format_information_for_system_prompt: Annotated[
+        str, RJSFMetaTag.StringWidget.textarea(rows=5)
+    ] = Field(
         default="",
         description="Format information that will be included in the system prompt to guide response formatting.",
     )
-    tool_description_for_user_prompt: str = Field(
+    tool_description_for_user_prompt: Annotated[
+        str, RJSFMetaTag.StringWidget.textarea(rows=5)
+    ] = Field(
         default="",
         description="Description of the tool that will be included in the user prompt.",
     )
-    tool_format_information_for_user_prompt: str = Field(
+    tool_format_information_for_user_prompt: Annotated[
+        str, RJSFMetaTag.StringWidget.textarea(rows=5)
+    ] = Field(
         default="",
         description="Format information that will be included in the user prompt to guide response formatting.",
     )
@@ -156,7 +167,9 @@ class SubAgentToolConfig(BaseToolConfig):
         description="The condition that will be used to stop the polling for the sub-agent response.",
     )
 
-    tool_input_json_schema: str | None = Field(
+    tool_input_json_schema: (
+        Annotated[str, RJSFMetaTag.StringWidget.textarea(rows=5)] | None
+    ) = Field(
         default=None,
         description="A custom JSON schema to send to the llm as the tool input schema.",
     )

{unique_toolkit-1.47.2 → unique_toolkit-1.47.4}/unique_toolkit/agentic/tools/mcp/tool_wrapper.py

@@ -139,6 +139,7 @@ class MCPToolWrapper(Tool[MCPToolConfig]):
                 name=self.name,
                 debug_info={
                     "mcp_tool": self.name,
+                    "mcp_server": self._mcp_server.name,
                     "arguments": arguments,
                 },
                 error_message="",
@@ -196,6 +197,7 @@ class MCPToolWrapper(Tool[MCPToolConfig]):
                 name=self.name,
                 debug_info={
                     "mcp_tool": self.name,
+                    "mcp_server": self._mcp_server.name,
                     "error": str(e),
                     "original_arguments": getattr(tool_call, "arguments", None),
                 },