unique-toolkit 2026.34.0.dev6__tar.gz → 2026.34.0.dev7__tar.gz

{unique_toolkit-2026.34.0.dev6 → unique_toolkit-2026.34.0.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: unique-toolkit
-Version: 2026.34.0.dev6
+Version: 2026.34.0.dev7
 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.34.0.dev6 → unique_toolkit-2026.34.0.dev7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "unique_toolkit"
-version = "2026.34.0.dev6"
+version = "2026.34.0.dev7"
 description = ""
 readme = "README.md"
 requires-python = ">=3.12"

{unique_toolkit-2026.34.0.dev6 → unique_toolkit-2026.34.0.dev7}/unique_toolkit/agentic/feature_flags/__init__.py

@@ -1,6 +1,7 @@
 from unique_toolkit.agentic.feature_flags.feature_flags import (
+    FeatureFlagNames,
     FeatureFlags,
     feature_flags,
 )
 
-__all__ = ["FeatureFlags", "feature_flags"]
+__all__ = ["FeatureFlagNames", "FeatureFlags", "feature_flags"]

{unique_toolkit-2026.34.0.dev6 → unique_toolkit-2026.34.0.dev7}/unique_toolkit/agentic/feature_flags/feature_flags.py

@@ -1,11 +1,41 @@
+from enum import StrEnum
 from typing import Any
 
 from pydantic import Field, field_validator
 from pydantic_settings import BaseSettings, SettingsConfigDict
+from typing_extensions import deprecated
 
 from unique_toolkit._common.config_checker import register_config
 
 
+class FeatureFlagNames(StrEnum):
+    """Flag name constants used by unique_toolkit's own agentic features.
+
+    Values match both the env-var fallback names (``FeatureFlags`` below) and
+    the configuration-backend registry keys used by
+    ``unique_toolkit.experimental.resources.feature_flags.FeatureFlagClient``.
+    """
+
+    enable_selected_uploaded_files_un_18215 = (
+        "FEATURE_FLAG_ENABLE_SELECTED_UPLOADED_FILES_UN_18215"
+    )
+    enable_mcp_metadata_fallback_un_19145 = (
+        "FEATURE_FLAG_ENABLE_MCP_METADATA_FALLBACK_UN_19145"
+    )
+    enable_html_rendering_un_15131 = "FEATURE_FLAG_ENABLE_HTML_RENDERING_UN_15131"
+    enable_code_execution_fence_un_17972 = (
+        "FEATURE_FLAG_ENABLE_CODE_EXECUTION_FENCE_UN_17972"
+    )
+    enable_html_with_fence_un_17927 = "FEATURE_FLAG_ENABLE_HTML_WITH_FENCE_UN_17927"
+    enable_web_search_argument_screening_un_18741 = (
+        "FEATURE_FLAG_ENABLE_WEB_SEARCH_ARGUMENT_SCREENING_UN_18741"
+    )
+    enable_new_answers_ui_un_14411 = "FEATURE_FLAG_ENABLE_NEW_ANSWERS_UI_UN_14411"
+
+
+@deprecated(
+    "Use unique_toolkit.experimental.resources.feature_flags.is_flag_enabled instead"
+)
 class FeatureFlag:
     """A feature flag that can be enabled globally or for specific company IDs.
 
@@ -45,6 +75,9 @@ class FeatureFlag:
         return f"FeatureFlag({self.value})"
 
 
+@deprecated(
+    "Use unique_toolkit.experimental.resources.feature_flags.is_flag_enabled instead"
+)
 @register_config()
 class FeatureFlags(BaseSettings):
     """Feature flags loaded from environment variables.
@@ -145,5 +178,7 @@ class FeatureFlags(BaseSettings):
         return FeatureFlag(False)
 
 
-# Initialize once at module load - import this where needed
+# Deprecated, unused elsewhere in this toolkit — kept only for external
+# backward compatibility. Use unique_toolkit.experimental.resources.feature_flags
+# .is_flag_enabled instead.
 feature_flags = FeatureFlags()

{unique_toolkit-2026.34.0.dev6 → unique_toolkit-2026.34.0.dev7}/unique_toolkit/agentic/history_manager/loop_token_reducer.py

@@ -109,7 +109,19 @@ class LoopTokenReducer:
         self._max_db_source_number: int = -1
         self._db_source_map: dict[int, ContentChunk] = {}
         self._enable_tool_call_persistence = enable_tool_call_persistence
-        self._selected_content_ids = get_selected_uploaded_content_ids(event)
+        self._event = event
+        # Lazily resolved on first async use since the flag check is async;
+        # `_resolved` distinguishes "not yet checked" from a resolved `None` (flag off).
+        self._selected_content_ids: set[str] | None = None
+        self._selected_content_ids_resolved = False
+
+    async def _get_selected_content_ids(self) -> set[str] | None:
+        if not self._selected_content_ids_resolved:
+            self._selected_content_ids = await get_selected_uploaded_content_ids(
+                self._event
+            )
+            self._selected_content_ids_resolved = True
+        return self._selected_content_ids
 
     @property
     def max_db_source_number(self) -> int:
@@ -354,6 +366,7 @@ class LoopTokenReducer:
         Returns:
             list[LanguageModelMessage]: The history
         """
+        selected_content_ids = await self._get_selected_content_ids()
         if self._enable_tool_call_persistence:
             (
                 full_history,
@@ -365,7 +378,7 @@ class LoopTokenReducer:
                 chat_service=self._chat_service,
                 content_service=self._content_service,
                 file_content_serializer=self._file_content_serializer,
-                selected_content_ids=self._selected_content_ids,
+                selected_content_ids=selected_content_ids,
             )
             self._max_db_source_number = max_src
             self._db_source_map = src_map
@@ -376,7 +389,7 @@ class LoopTokenReducer:
                 chat_service=self._chat_service,
                 content_service=self._content_service,
                 file_content_serializer=self._file_content_serializer,
-                selected_content_ids=self._selected_content_ids,
+                selected_content_ids=selected_content_ids,
             )
 
         if remove_from_text is not None:

{unique_toolkit-2026.34.0.dev6 → unique_toolkit-2026.34.0.dev7}/unique_toolkit/agentic/history_manager/utils.py

@@ -3,10 +3,11 @@ import logging
 from copy import deepcopy
 from typing import Any
 
-from unique_toolkit.agentic.feature_flags import feature_flags
+from unique_toolkit.agentic.feature_flags import FeatureFlagNames
 from unique_toolkit.agentic.tools.schemas import Source
 from unique_toolkit.app.schemas import ChatEvent
 from unique_toolkit.content.schemas import ContentChunk
+from unique_toolkit.experimental.resources.feature_flags import is_flag_enabled
 from unique_toolkit.language_model.schemas import (
     LanguageModelAssistantMessage,
     LanguageModelMessage,
@@ -16,15 +17,16 @@ from unique_toolkit.language_model.schemas import (
 logger = logging.getLogger(__name__)
 
 
-def get_selected_uploaded_content_ids(event: ChatEvent) -> set[str] | None:
+async def get_selected_uploaded_content_ids(event: ChatEvent) -> set[str] | None:
     """Derive the set of content IDs the user explicitly selected.
 
     Returns ``None`` when the feature flag is disabled (meaning *all*
     uploaded images should be included), or a ``set[str]`` of IDs when
     only a subset should be attached.
     """
-    if not feature_flags.enable_selected_uploaded_files_un_18215.is_enabled(
-        event.company_id
+    if not await is_flag_enabled(
+        FeatureFlagNames.enable_selected_uploaded_files_un_18215,
+        company_id=event.company_id,
     ):
         return None
 

{unique_toolkit-2026.34.0.dev6 → unique_toolkit-2026.34.0.dev7}/unique_toolkit/agentic/tools/a2a/tool/service.py

@@ -22,7 +22,7 @@ from unique_toolkit._common.referencing import (
 )
 from unique_toolkit._common.utils.jinja.render import render_template
 from unique_toolkit.agentic.evaluation.schemas import EvaluationMetricName
-from unique_toolkit.agentic.feature_flags import feature_flags
+from unique_toolkit.agentic.feature_flags import FeatureFlagNames
 from unique_toolkit.agentic.tools.a2a.response_watcher import SubAgentResponseWatcher
 from unique_toolkit.agentic.tools.a2a.tool._memory import (
     get_sub_agent_short_term_memory_manager,
@@ -53,6 +53,7 @@ from unique_toolkit.chat.schemas import (
 )
 from unique_toolkit.chat.service import ChatService
 from unique_toolkit.content import ContentChunk, ContentReference
+from unique_toolkit.experimental.resources.feature_flags import is_flag_enabled
 from unique_toolkit.language_model import (
     LanguageModelFunction,
     LanguageModelService,
@@ -431,11 +432,9 @@ class SubAgentTool(Tool[SubAgentToolConfig]):
         message: str,
         state: ProgressState,
     ) -> None:
-        if (
-            self._tool_progress_reporter is not None
-            and not feature_flags.enable_new_answers_ui_un_14411.is_enabled(
-                self._company_id
-            )
+        if self._tool_progress_reporter is not None and not await is_flag_enabled(
+            FeatureFlagNames.enable_new_answers_ui_un_14411,
+            company_id=self._company_id or "",
         ):
             await self._tool_progress_reporter.notify_from_tool_call(
                 tool_call=tool_call,

{unique_toolkit-2026.34.0.dev6 → unique_toolkit-2026.34.0.dev7}/unique_toolkit/agentic/tools/mcp/tool_wrapper.py

@@ -9,7 +9,7 @@ from typing import Any, Dict
 import unique_sdk
 
 from unique_toolkit.agentic.evaluation.schemas import EvaluationMetricName
-from unique_toolkit.agentic.feature_flags import feature_flags
+from unique_toolkit.agentic.feature_flags import FeatureFlagNames
 from unique_toolkit.agentic.tools.mcp.models import MCPToolConfig
 from unique_toolkit.agentic.tools.schemas import ToolCallResponse
 from unique_toolkit.agentic.tools.tool import Tool
@@ -21,6 +21,7 @@ from unique_toolkit.app.schemas import ChatEvent, McpServer, McpTool
 from unique_toolkit.chat.schemas import MessageLog, MessageLogStatus
 from unique_toolkit.chat.service import ChatService
 from unique_toolkit.content.functions import upload_content_from_bytes
+from unique_toolkit.experimental.resources.feature_flags import is_flag_enabled
 from unique_toolkit.language_model import LanguageModelService
 from unique_toolkit.language_model.schemas import (
     LanguageModelFunction,
@@ -133,11 +134,9 @@ class MCPToolWrapper(Tool[MCPToolConfig]):
         )
 
         # Notify progress if reporter is available
-        if (
-            self._tool_progress_reporter
-            and not feature_flags.enable_new_answers_ui_un_14411.is_enabled(
-                self._event.company_id
-            )
+        if self._tool_progress_reporter and not await is_flag_enabled(
+            FeatureFlagNames.enable_new_answers_ui_un_14411,
+            company_id=self._event.company_id,
         ):
             await self._tool_progress_reporter.notify_from_tool_call(
                 tool_call=tool_call,
@@ -172,11 +171,9 @@ class MCPToolWrapper(Tool[MCPToolConfig]):
             )
 
             # Notify completion
-            if (
-                self._tool_progress_reporter
-                and not feature_flags.enable_new_answers_ui_un_14411.is_enabled(
-                    self._event.company_id
-                )
+            if self._tool_progress_reporter and not await is_flag_enabled(
+                FeatureFlagNames.enable_new_answers_ui_un_14411,
+                company_id=self._event.company_id,
             ):
                 await self._tool_progress_reporter.notify_from_tool_call(
                     tool_call=tool_call,
@@ -198,11 +195,9 @@ class MCPToolWrapper(Tool[MCPToolConfig]):
             self.logger.error(f"Error executing MCP tool {self.name}: {e}")
 
             # Notify failure
-            if (
-                self._tool_progress_reporter
-                and not feature_flags.enable_new_answers_ui_un_14411.is_enabled(
-                    self._event.company_id
-                )
+            if self._tool_progress_reporter and not await is_flag_enabled(
+                FeatureFlagNames.enable_new_answers_ui_un_14411,
+                company_id=self._event.company_id,
             ):
                 await self._tool_progress_reporter.notify_from_tool_call(
                     tool_call=tool_call,

{unique_toolkit-2026.34.0.dev6 → unique_toolkit-2026.34.0.dev7}/unique_toolkit/agentic/tools/openai_builtin/code_interpreter/postprocessors/code_display.py

@@ -6,11 +6,15 @@ from typing import override
 from pydantic import BaseModel, Field
 from pydantic.json_schema import SkipJsonSchema
 
-from unique_toolkit.agentic.feature_flags.feature_flags import feature_flags
+from unique_toolkit.agentic.feature_flags import FeatureFlagNames
 from unique_toolkit.agentic.postprocessor.postprocessor_manager import (
     ResponsesApiPostprocessor,
 )
 from unique_toolkit.agentic.tools.config import get_configuration_dict
+from unique_toolkit.experimental.resources.feature_flags import (
+    COMPANY_ID_PLACEHOLDER,
+    is_flag_enabled,
+)
 from unique_toolkit.language_model.schemas import ResponsesLanguageModelStreamResponse
 
 _TEMPLATE = """
@@ -56,15 +60,15 @@ class ShowExecutedCodePostprocessor(ResponsesApiPostprocessor):
         super().__init__(self.__class__.__name__)
         self._config = config
         self._company_id = company_id
-        self._is_enabled = (
-            self._config.enable
-            and not feature_flags.enable_code_execution_fence_un_17972.is_enabled(
-                company_id
-            )
-        )
+        # Resolved in run() (before apply_postprocessing_to_response) since flag evaluation is async.
+        self._is_enabled = False
 
     @override
     async def run(self, loop_response: ResponsesLanguageModelStreamResponse) -> None:
+        self._is_enabled = self._config.enable and not await is_flag_enabled(
+            FeatureFlagNames.enable_code_execution_fence_un_17972,
+            company_id=self._company_id or COMPANY_ID_PLACEHOLDER,
+        )
         if self._is_enabled:
             await asyncio.sleep(self._config.sleep_time_before_display)
 

{unique_toolkit-2026.34.0.dev6 → unique_toolkit-2026.34.0.dev7}/unique_toolkit/agentic/tools/openai_builtin/code_interpreter/postprocessors/generated_files.py

@@ -21,7 +21,7 @@ from tenacity import (
 
 from unique_toolkit import ChatService
 from unique_toolkit._common.execution import failsafe_async
-from unique_toolkit.agentic.feature_flags.feature_flags import feature_flags
+from unique_toolkit.agentic.feature_flags import FeatureFlagNames
 from unique_toolkit.agentic.postprocessor.postprocessor_manager import (
     ResponsesApiPostprocessor,
 )
@@ -39,6 +39,10 @@ from unique_toolkit.agentic.tools.openai_builtin.code_interpreter.schemas import
 )
 from unique_toolkit.content.schemas import ContentReference
 from unique_toolkit.content.service import ContentService
+from unique_toolkit.experimental.resources.feature_flags import (
+    COMPANY_ID_PLACEHOLDER,
+    is_flag_enabled,
+)
 from unique_toolkit.language_model.schemas import ResponsesLanguageModelStreamResponse
 from unique_toolkit.services.knowledge_base import KnowledgeBaseService
 from unique_toolkit.short_term_memory.service import ShortTermMemoryService
@@ -389,6 +393,10 @@ class DisplayCodeInterpreterFilesPostProcessor(
         # Cleared at the start of each run(); holds this-turn download sizes.
         self._file_size_map: dict[str, int] = {}
 
+        # Resolved in run() (before apply_postprocessing_to_response) since flag evaluation is async.
+        self._fence_ff_on = False
+        self._html_fence_ff_on = False
+
     def _build_retry(self) -> AsyncRetrying:
         """Build a tenacity retry policy from the current config.
 
@@ -409,6 +417,17 @@ class DisplayCodeInterpreterFilesPostProcessor(
         run_t0 = time.monotonic()
         self._log.info("run() started — fetching and uploading code interpreter files")
 
+        self._fence_ff_on = await is_flag_enabled(
+            FeatureFlagNames.enable_code_execution_fence_un_17972,
+            company_id=self._company_id or COMPANY_ID_PLACEHOLDER,
+        )
+        # htmlWithSource requires BOTH the fence FF and the HTML-fence FF on; default
+        # (FF off) keeps HtmlRendering, so existing deployments are unaffected.
+        self._html_fence_ff_on = await is_flag_enabled(
+            FeatureFlagNames.enable_html_with_fence_un_17927,
+            company_id=self._company_id or COMPANY_ID_PLACEHOLDER,
+        )
+
         container_files = loop_response.container_files
         self._log.info(
             "run() found %d container file annotation(s): %s",
@@ -554,9 +573,7 @@ class DisplayCodeInterpreterFilesPostProcessor(
         self._log.info(
             "apply_postprocessing started — %d file(s) in content_map, fence_ff=%s",
             len(self._content_map),
-            feature_flags.enable_code_execution_fence_un_17972.is_enabled(
-                self._company_id
-            ),
+            self._fence_ff_on,
         )
 
         if loop_response.message.references is None:
@@ -566,18 +583,6 @@ class DisplayCodeInterpreterFilesPostProcessor(
 
         ref_number = _get_next_ref_number(loop_response.message.references)
         changed = False
-        fence_ff_on = feature_flags.enable_code_execution_fence_un_17972.is_enabled(
-            self._company_id
-        )
-        # HTML uses htmlWithSource only when BOTH the code-execution fence FF AND the
-        # dedicated HTML-fence FF are on. Default (FF off) keeps HtmlRendering so
-        # existing deployments are unaffected.
-        html_fence_ff_on = (
-            fence_ff_on
-            and feature_flags.enable_html_with_fence_un_17927.is_enabled(
-                self._company_id
-            )
-        )
 
         replaced_files: list[str] = []
         missed_files: list[str] = []
@@ -611,7 +616,7 @@ class DisplayCodeInterpreterFilesPostProcessor(
 
             # HTML rendered as HtmlRendering block unless the dedicated html-fence FF
             # is on (enable_html_with_fence_un_17927). Default keeps HtmlRendering.
-            elif is_html and not html_fence_ff_on:
+            elif is_html and not self._html_fence_ff_on:
                 loop_response.message.text, replaced = _replace_container_html_citation(
                     text=loop_response.message.text or "",
                     filename=filename,
@@ -619,7 +624,7 @@ class DisplayCodeInterpreterFilesPostProcessor(
                 )
                 changed |= replaced
 
-            # Non-HTML files, or HTML when html_fence_ff_on → inline content link for
+            # Non-HTML files, or HTML when self._html_fence_ff_on → inline content link for
             # subsequent fence injection (htmlWithSource / imgWithSource / fileWithSource)
             else:
                 loop_response.message.text, replaced = _replace_container_file_citation(
@@ -627,7 +632,7 @@ class DisplayCodeInterpreterFilesPostProcessor(
                     filename=filename,
                     content_id=content_id,
                     ref_number=ref_number,
-                    use_content_link=fence_ff_on,
+                    use_content_link=self._fence_ff_on,
                 )
                 changed |= replaced
 
@@ -644,7 +649,7 @@ class DisplayCodeInterpreterFilesPostProcessor(
 
             # HtmlRendering and htmlWithSource both embed contentId directly — no ContentReference needed
             is_html_rendered = is_html
-            if replaced and not (is_image or is_html_rendered or fence_ff_on):
+            if replaced and not (is_image or is_html_rendered or self._fence_ff_on):
                 loop_response.message.references.append(
                     ContentReference(
                         sequence_number=ref_number,
@@ -663,9 +668,9 @@ class DisplayCodeInterpreterFilesPostProcessor(
             error_files,
         )
 
-        if fence_ff_on:
+        if self._fence_ff_on:
             code_blocks = _build_code_blocks(
-                loop_response, self._content_map, include_html=html_fence_ff_on
+                loop_response, self._content_map, include_html=self._html_fence_ff_on
             )
             self._log.info(
                 "Fence injection — %d code block(s), files: %s",
@@ -673,7 +678,7 @@ class DisplayCodeInterpreterFilesPostProcessor(
                 [f.filename for b in code_blocks for f in b.files],
             )
             _warn_unmatched_code_blocks(
-                self._content_map, code_blocks, include_html=html_fence_ff_on
+                self._content_map, code_blocks, include_html=self._html_fence_ff_on
             )
             text_before = loop_response.message.text
             loop_response.message.text = _inject_code_execution_fences(

{unique_toolkit-2026.34.0.dev6 → unique_toolkit-2026.34.0.dev7}/unique_toolkit/experimental/resources/feature_flags/__init__.py

@@ -12,10 +12,15 @@ Required env vars::
 
 Quick start — explicit IDs::
 
-    from unique_toolkit.experimental.resources.feature_flags import FeatureFlagClient
+    from unique_toolkit.experimental.resources.feature_flags import FeatureFlagClient, is_flag_enabled
 
-    client = FeatureFlagClient.from_settings()  # singleton; call at startup or first request
-    enabled = await client.is_enabled("FEATURE_FLAG_ENABLE_X", company_id=company_id)
+    # Requires CONFIGURATION_BACKEND_URL / FEATURE_FLAG_SERVICE_ID to be set;
+    # falls back to the env-var value (or stale cache) on transport errors.
+    enabled = await is_flag_enabled("FEATURE_FLAG_ENABLE_X", company_id=company_id)
+
+    # Or manage the singleton directly:
+    client = FeatureFlagClient.from_settings()  # raises if URL/service_id absent
+    client = get_feature_flag_client()          # same — thin passthrough to from_settings()
 
 Per-request binding (when you have UniqueSettings / AuthContext)::
 
@@ -32,6 +37,7 @@ See README.md for the full evaluation-order diagram and adoption steps.
 """
 
 from .client import (
+    COMPANY_ID_PLACEHOLDER,
     BoundFeatureFlagClient,
     FeatureFlagClient,
     get_feature_flag_client,
@@ -41,6 +47,7 @@ from .schemas import FlagEvaluation
 from .settings import FeatureFlagSettings
 
 __all__ = [
+    "COMPANY_ID_PLACEHOLDER",
     "BoundFeatureFlagClient",
     "FeatureFlagClient",
     "FlagEvaluation",

{unique_toolkit-2026.34.0.dev6 → unique_toolkit-2026.34.0.dev7}/unique_toolkit/experimental/resources/feature_flags/client.py

@@ -177,21 +177,15 @@ class FeatureFlagClient:
 
     @staticmethod
     def _env_fallback(flag: str, company_id: str | None = None) -> bool:
-        """Read *flag* from env vars using the same semantics as ``FeatureFlag``.
-
-        Supports both plain booleans (``"true"`` / ``"false"``) and
-        comma-separated company-ID allowlists (``"company1,company2"``),
-        consistent with ``unique_toolkit.agentic.feature_flags.FeatureFlags``.
-        """
-        raw = os.getenv(flag, "false").strip()
-        raw_lower = raw.lower()
+        """Read *flag* from env vars: plain booleans or comma-separated company-ID allowlists."""
+        raw = os.getenv(flag, "false")
+        raw_lower = raw.strip().lower()
         if raw_lower in ("true", "1", "yes"):
             return True
         if raw_lower in ("false", "0", "no", ""):
             return False
-        # Comma-separated company-ID allowlist
-        allowed = {part.strip() for part in raw.split(",") if part.strip()}
-        return company_id in allowed if company_id else False
+        allowlist = [c.strip() for c in raw.split(",") if c.strip()]
+        return company_id in allowlist if company_id else False
 
 
 class BoundFeatureFlagClient:
@@ -215,12 +209,18 @@ class BoundFeatureFlagClient:
         return (await self.evaluate(flag)).value
 
 
+# For is_flag_enabled() callers with no real company_id. Not a real company:
+# bool-configured flags still resolve correctly; allowlist-configured ones safely read as off.
+COMPANY_ID_PLACEHOLDER = "company_id_placeholder"
+
+
 def get_feature_flag_client() -> FeatureFlagClient:
     """Return the process-level :class:`FeatureFlagClient` singleton.
 
-    Built lazily via :meth:`FeatureFlagClient.from_settings` which reads
-    ``CONFIGURATION_BACKEND_URL`` and ``FEATURE_FLAG_SERVICE_ID`` from env.
-    Falls back to env-var defaults on missing config or transport errors.
+    Built lazily via :meth:`FeatureFlagClient.from_settings`, which reads
+    ``CONFIGURATION_BACKEND_URL`` and ``FEATURE_FLAG_SERVICE_ID`` from env and
+    raises :class:`ValueError` if either is missing. Evaluations fall back to
+    env-var defaults (or a stale cached value) only on *transport* errors.
     """
     return FeatureFlagClient.from_settings()
 

{unique_toolkit-2026.34.0.dev6 → unique_toolkit-2026.34.0.dev7}/unique_toolkit/services/chat_service.py

@@ -22,7 +22,7 @@ from unique_toolkit._common.metadata_filter_scope import (
     merge_scope_clause_into_metadata_filter,
 )
 from unique_toolkit._common.utils.files import is_file_content, is_image_content
-from unique_toolkit.agentic.feature_flags import feature_flags
+from unique_toolkit.agentic.feature_flags import FeatureFlagNames
 from unique_toolkit.agentic.message_log_order import next_message_log_order
 from unique_toolkit.app.unique_settings import UniqueContext, UniqueSettings
 from unique_toolkit.chat.cancellation import CancellationWatcher
@@ -100,6 +100,7 @@ from unique_toolkit.content.schemas import (
     ContentSearchType,
 )
 from unique_toolkit.elicitation.service import ElicitationService
+from unique_toolkit.experimental.resources.feature_flags import is_flag_enabled
 from unique_toolkit.language_model.constants import (
     DEFAULT_COMPLETE_TEMPERATURE,
     DEFAULT_COMPLETE_TIMEOUT,
@@ -1805,8 +1806,9 @@ class ChatService(ChatServiceDeprecated):
 
             if not rate_limit_retry_config.log_message_on_retry:
                 return
-            if not feature_flags.enable_new_answers_ui_un_14411.is_enabled(
-                self._company_id
+            if not await is_flag_enabled(
+                FeatureFlagNames.enable_new_answers_ui_un_14411,
+                company_id=self._company_id,
             ):
                 return