unique_toolkit 2026.24.0.dev3__py3-none-any.whl → 2026.24.0.dev5__py3-none-any.whl

unique_toolkit/_common/metadata_filter_scope.py

@@ -8,6 +8,8 @@ from typing import Any
 from unique_toolkit.content.smart_rules import (
     Operator,
     Statement,
+    UniqueQL,
+    uniqueql_to_dict,
 )
 
 _UQL_AND = "and"
@@ -29,16 +31,17 @@ def build_folder_id_in_clause(scope_ids: list[str]) -> dict[str, Any]:
 
 def merge_scope_clause_into_metadata_filter(
     scope_clause: Mapping[str, Any],
-    metadata_filter: dict[str, Any] | None,
+    metadata_filter: UniqueQL | Mapping[str, Any] | None,
 ) -> dict[str, Any]:
     """AND-merge *scope_clause* with *metadata_filter*, flattening a top-level ``and``."""
     scope_dict = dict(scope_clause)
-    if not metadata_filter:
+    metadata_dict = uniqueql_to_dict(metadata_filter)
+    if not metadata_dict:
         return scope_dict
-    inner_and = metadata_filter.get(_UQL_AND)
+    inner_and = metadata_dict.get(_UQL_AND)
     if isinstance(inner_and, list):
         return {_UQL_AND: [scope_dict, *inner_and]}
-    return {_UQL_AND: [scope_dict, dict(metadata_filter)]}
+    return {_UQL_AND: [scope_dict, metadata_dict]}
 
 
 __all__ = [

unique_toolkit/_common/pydantic/rjsf_tags.py

@@ -974,7 +974,12 @@ def ui_schema_for_model(
             node["items"] = item_node
 
         # Dict -> additionalProperties (value side)
-        elif origin is dict:
+        # Skip when the node already carries a ui:widget (fully-specified
+        # widget) or an anyOf (fully-specified type branching): walking the
+        # dict value type in those cases adds a spurious "additionalProperties"
+        # node that confuses RJSF renderers.  Presentation-only meta such as
+        # ui:expandable or ui:title does NOT prevent the walk.
+        elif origin is dict and "ui:widget" not in node and "anyOf" not in node:
             _key_t, val_t = get_args(base) or (Any, Any)
             val_base, val_meta = _walk_annotated_chain(val_t)
             val_base = _unwrap_optional(val_base)

unique_toolkit/content/smart_rules.py

@@ -1,10 +1,13 @@
+import json
 import re
+from collections.abc import Mapping
 from datetime import datetime, timedelta, timezone
 from enum import Enum
-from typing import Any, Dict, List, Mapping, Self, Union
+from typing import Annotated, Any, Dict, List, Self, Union
 
-from pydantic import AliasChoices, BaseModel, Field
+from pydantic import AliasChoices, BaseModel, BeforeValidator, Field, PlainSerializer
 from pydantic.config import ConfigDict
+from pydantic.json_schema import WithJsonSchema
 
 
 class Operator(str, Enum):
@@ -54,6 +57,10 @@ class BaseStatement(BaseModel):
     ) -> Self:
         return self.model_copy()
 
+    def to_dict(self) -> dict[str, Any]:
+        """Convert to wire-format JSON dict (uses serialization aliases)."""
+        return self.model_dump(mode="json")
+
 
 class Statement(BaseStatement):
     operator: Operator
@@ -285,7 +292,6 @@ def get_fallback_values(
     return values
 
 
-# Example usage:
 def parse_uniqueql(json_data: Dict[str, Any]) -> UniqueQL:
     if "operator" in json_data:
         return Statement.model_validate(json_data)
@@ -299,3 +305,55 @@ def parse_uniqueql(json_data: Dict[str, Any]) -> UniqueQL:
         )
     else:
         raise ValueError("Invalid UniqueQL format")
+
+
+def parse_uniqueql_input(v: Any) -> UniqueQL | None:
+    """Parse config/API input (JSON string, dict, or model) into a UniqueQL model."""
+    if v is None:
+        return None
+    if isinstance(v, (Statement, AndStatement, OrStatement)):
+        return v
+    if isinstance(v, str):
+        if v.strip() == "":
+            return None
+        try:
+            v = json.loads(v)
+        except json.JSONDecodeError as e:
+            raise ValueError(f"Invalid JSON: {e}") from e
+    if isinstance(v, dict):
+        return parse_uniqueql(v)
+    raise ValueError(f"Expected JSON string or dict, got {type(v).__name__}")
+
+
+def uniqueql_to_dict(
+    value: UniqueQL | Mapping[str, Any] | None,
+) -> dict[str, Any] | None:
+    """Convert a UniqueQL model (or wire dict) to a JSON-serializable dict for APIs."""
+    if value is None:
+        return None
+    if isinstance(value, BaseStatement):
+        return value.to_dict()
+    return dict(value)
+
+
+def _serialize_uniqueql_field(value: UniqueQL | None) -> dict[str, Any] | None:
+    return None if value is None else value.to_dict()
+
+
+_UNIQUEQL_JSON_SCHEMA = {
+    "anyOf": [
+        {"type": "string", "title": "UniqueQL (JSON)"},
+        {"type": "null", "title": "Deactivated", "description": "None"},
+    ]
+}
+
+UniqueQLField = Annotated[
+    UniqueQL | None,
+    BeforeValidator(parse_uniqueql_input),
+    WithJsonSchema(_UNIQUEQL_JSON_SCHEMA),
+    PlainSerializer(
+        _serialize_uniqueql_field,
+        when_used="json",
+        return_type=dict[str, Any] | None,
+    ),
+]

unique_toolkit/experimental/components/internal_search/knowledge_base/config.py

@@ -6,8 +6,10 @@ from typing import Annotated, Self
 from pydantic import Field, model_validator
 
 from unique_toolkit._common.config_checker import register_config
+from unique_toolkit._common.pydantic.rjsf_tags import RJSFMetaTag
 from unique_toolkit._common.pydantic_helpers import DeactivatedNone
 from unique_toolkit.content.schemas import ContentRerankerConfig
+from unique_toolkit.content.smart_rules import UniqueQLField
 from unique_toolkit.experimental.components.internal_search.base.config import (
     InternalSearchConfig,
 )
@@ -15,9 +17,11 @@ from unique_toolkit.experimental.components.internal_search.base.config import (
 
 @register_config()
 class KnowledgeBaseInternalSearchConfig(InternalSearchConfig):
-    scope_ids: list[str] | DeactivatedNone = Field(
+    scope_ids: Annotated[
+        Annotated[list[str], Field(title="Scope IDs")] | DeactivatedNone,
+        RJSFMetaTag({"anyOf": [{"items": {"ui:title": "Scope ID"}}, {}]}),
+    ] = Field(
         default=None,
-        title="Active",
         deprecated=True,
         description=(
             "Not accepted for new configs. Use ``metadata_filter`` with "
@@ -26,10 +30,29 @@ class KnowledgeBaseInternalSearchConfig(InternalSearchConfig):
             "a ``folderId in [scope_ids]`` metadata filter at search time."
         ),
     )
-    metadata_filter: dict[str, object] | None = Field(
+    metadata_filter: Annotated[
+        UniqueQLField,
+        # Put textarea attrs on the string branch (index 0) only, not at field level.
+        # If set at field level, RJSF's MultiSchemaField applies ui:widget to every
+        # anyOf branch during option iteration, which crashes on non-string branches.
+        RJSFMetaTag(
+            {
+                "ui:options": {"customValidation": "uniqueql"},
+                "anyOf": [
+                    {
+                        "ui:widget": "textarea",
+                        "ui:placeholder": '{"operator": "equals", "value": "...", "path": ["fieldName"]}',
+                        "ui:emptyValue": "",
+                    },
+                    {},
+                ],
+            }
+        ),
+    ] = Field(
         default=None,
         description=(
-            "Static metadata filter applied to every KB search. "
+            "Static UniqueQL metadata filter applied to every KB search. "
+            "Pass as a JSON string or a plain dict. "
             "Overridden by chat context filter or per-invocation state override."
         ),
     )

unique_toolkit/experimental/components/internal_search/knowledge_base/service.py

@@ -105,7 +105,11 @@ class KnowledgeBaseInternalSearchService(
             return cast("dict[str, Any] | None", self._state.metadata_filter_override)
         if self._context.chat is not None:
             return self._context.chat.metadata_filter
-        return self._config.metadata_filter
+        return (
+            self._config.metadata_filter.to_dict()
+            if self._config.metadata_filter
+            else None
+        )
 
     @property
     def _effective_scope_ids(self) -> list[str] | None:

unique_toolkit/smart_rules/compile.py

@@ -7,6 +7,7 @@ from unique_toolkit.content.smart_rules import (
     OrStatement,
     Statement,
     UniqueQL,
+    UniqueQLField,
     array_operator,
     binary_operator,
     calculate_current_date,
@@ -19,9 +20,11 @@ from unique_toolkit.content.smart_rules import (
     is_array_of_strings,
     null_operator,
     parse_uniqueql,
+    parse_uniqueql_input,
     replace_tool_parameters_patterns,
     replace_user_metadata_patterns,
     replace_variables,
+    uniqueql_to_dict,
 )
 
 warnings.warn(
@@ -38,6 +41,7 @@ __all__ = [
     "OrStatement",
     "Statement",
     "UniqueQL",
+    "UniqueQLField",
     "array_operator",
     "binary_operator",
     "calculate_current_date",
@@ -50,7 +54,9 @@ __all__ = [
     "is_array_of_strings",
     "null_operator",
     "parse_uniqueql",
+    "parse_uniqueql_input",
     "replace_tool_parameters_patterns",
     "replace_user_metadata_patterns",
     "replace_variables",
+    "uniqueql_to_dict",
 ]

{unique_toolkit-2026.24.0.dev3.dist-info → unique_toolkit-2026.24.0.dev5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: unique-toolkit
-Version: 2026.24.0.dev3
+Version: 2026.24.0.dev5
 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-2026.24.0.dev3.dist-info → unique_toolkit-2026.24.0.dev5.dist-info}/RECORD

@@ -58,8 +58,8 @@ unique_toolkit/_common/experimental/write_up_agent/services/template_handler/ser
 unique_toolkit/_common/experimental/write_up_agent/services/template_handler/utils.py,sha256=FeJhTAU7AUlSFCfFwmEzzI22PtAdFJluzsGeiEPK49Q,6393
 unique_toolkit/_common/experimental/write_up_agent/utils.py,sha256=I_OCDXCxY6uZk_fNQg_bIXHwjnN7ND_ngcisThnGGIc,739
 unique_toolkit/_common/feature_flags/schema.py,sha256=X32VqH4VMK7bhEfSd8Wbddl8FVs7Gh7ucuIEbmqc4Kw,268
-unique_toolkit/_common/metadata_filter_scope.py,sha256=kXjUdCQVjBbWj2TfTyrV5P7Y6etgoQEpAhhIJQ7RXAs,1340
-unique_toolkit/_common/pydantic/rjsf_tags.py,sha256=ZmjqpCa1rCjE7Got1BPK9l3zDWWbkpkxedbWQpq5iSY,39533
+unique_toolkit/_common/metadata_filter_scope.py,sha256=Lj7oYrqHUoiqSBn6PA1FmeqtZONhSdQ8u3CR5YolxcM,1432
+unique_toolkit/_common/pydantic/rjsf_tags.py,sha256=B4iMCvKlzP-xE8pp56uJ4xYNB89Vz9u3z5MXXx68CPs,39955
 unique_toolkit/_common/pydantic_helpers.py,sha256=LTI21litYJdzRe7cbgO1ntKf06yb5V8v7hASMM3Wwa8,5839
 unique_toolkit/_common/referencing.py,sha256=UY7-9nJLcRqlHUNytfJZPVkdpjvy5wIps_7P33_qgA0,1496
 unique_toolkit/_common/string_utilities.py,sha256=HOAOZbH3vRmTDwUCIF0YTE04IWcVHZyq3uOmevxWXn0,4433
@@ -253,7 +253,7 @@ unique_toolkit/content/constants.py,sha256=1iy4Y67xobl5VTnJB6SxSyuoBWbdLl9244xfV
 unique_toolkit/content/functions.py,sha256=Rx3N9x23JjVt7mmUlFhOhjAjkWQCzzodtpDgoIsE2xg,33932
 unique_toolkit/content/schemas.py,sha256=z3xlTkOh9MTwHGLwcc5vfT5OmDRCiWE0F0MaiPMV4dg,10281
 unique_toolkit/content/service.py,sha256=fR93_76aPczx2voxR7cvYDs_-pxD-Mc9WP6-5IqA8ko,28301
-unique_toolkit/content/smart_rules.py,sha256=WEAN1AoRfSaCvg7keLXQg24CRmvyu7vHQgeNuH-WqPQ,9674
+unique_toolkit/content/smart_rules.py,sha256=9GlHXm63POTi4jy5hW0qUjeqy-JSeL1wIbURM1GKhc4,11481
 unique_toolkit/content/utils.py,sha256=keDkqu_ZzQY0y_g7g_XLOza3p4XsvfqVVDI9ylM91KY,10115
 unique_toolkit/data_extraction/README.md,sha256=5KxzqPHC29wxBiWJ-87wBQisSgRBkuSnPTb38pGH1wA,3138
 unique_toolkit/data_extraction/__init__.py,sha256=y6uSp8PAqgPZMoBgXWp1Ep0gsk9MD-NV8qn2QpOY-xY,330
@@ -299,9 +299,9 @@ unique_toolkit/experimental/components/internal_search/chat/config.py,sha256=2DQ
 unique_toolkit/experimental/components/internal_search/chat/schemas.py,sha256=vWPulL7QVo9y8vPZTKAeHVYOCHG1DmKIh6W75S0jEnA,299
 unique_toolkit/experimental/components/internal_search/chat/service.py,sha256=SO60zGtzJIp5kGLEXCzHwcKgdN4MGeiv5kjGA3ki9fc,2355
 unique_toolkit/experimental/components/internal_search/knowledge_base/__init__.py,sha256=eAp_8qw5XP2z6GFbxvVCmwgirXxMvJuEDZGx-PsFi54,411
-unique_toolkit/experimental/components/internal_search/knowledge_base/config.py,sha256=MIvZ_HhJq85yDfoO586BN-XYRYHr3dX2wL0jT0w8D3Q,2217
+unique_toolkit/experimental/components/internal_search/knowledge_base/config.py,sha256=QyewUg9tH5mmfL56N3mpFUZ3_2qSthitd8JCV1oX3oU,3232
 unique_toolkit/experimental/components/internal_search/knowledge_base/schemas.py,sha256=q5tk4IcpyypzqMb_36nEpO_eZgE9PqQsFrlpXJIwVWk,912
-unique_toolkit/experimental/components/internal_search/knowledge_base/service.py,sha256=o579j69_25cPYPzrwOE16DmTojzRUl-b3pEYUS7n_XQ,4756
+unique_toolkit/experimental/components/internal_search/knowledge_base/service.py,sha256=LBp6SPJ8mO5x9rAbey-mejHZFK8om9EviyRUNGm5W7s,4856
 unique_toolkit/experimental/components/internal_search/post_processing/__init__.py,sha256=ndNXfBOya9AEzhg8inbJVRpOtG809cw9vURK1yXnlAY,1896
 unique_toolkit/experimental/components/internal_search/post_processing/config.py,sha256=Rkfm1PZhotJ8yyOK_SufIlUNcknyNzqMZWl4wYHnZMM,2385
 unique_toolkit/experimental/components/internal_search/post_processing/service.py,sha256=5GL0bm4a24saPLUamP59CPPjxGlpEgBHBDCn7OqWGEI,7499
@@ -389,8 +389,8 @@ unique_toolkit/short_term_memory/functions.py,sha256=RQpdcpAIKQ8rRDhP8bHqekIKttQ
 unique_toolkit/short_term_memory/schemas.py,sha256=C6gopsnuIgWJBG7XF87gxMwzLJtqbSGmsKXUf2h1sn4,1666
 unique_toolkit/short_term_memory/service.py,sha256=Ncw0_0CNM6kmzJSLVJGG5GcKpBduIBebYZlzZ7N4G8Q,8900
 unique_toolkit/smart_rules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-unique_toolkit/smart_rules/compile.py,sha256=Ozhh70qCn2yOzRWr9d8WmJeTo7AQurwd3tStgBMPFLA,1246
+unique_toolkit/smart_rules/compile.py,sha256=vRe0aMJWuVIK-VsqomgxQImzke7MDmwgSxxJfYCa7zw,1386
 unique_toolkit/test_utilities/events.py,sha256=FLrhMh0A_mQutAUjoD0FdMcVQ4Gq31r35OVGzRjvLro,6760
-unique_toolkit-2026.24.0.dev3.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-unique_toolkit-2026.24.0.dev3.dist-info/METADATA,sha256=ZaoaKI5FW8PBEO4jZTDu8Rh1POBUC5M6p1z1px7d6aM,7392
-unique_toolkit-2026.24.0.dev3.dist-info/RECORD,,
+unique_toolkit-2026.24.0.dev5.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+unique_toolkit-2026.24.0.dev5.dist-info/METADATA,sha256=c9BRIxMsywMfMEN91oVAv0NOEOi2KlnDULi-ohknj_c,7392
+unique_toolkit-2026.24.0.dev5.dist-info/RECORD,,