unique_toolkit 1.68.4__tar.gz → 1.68.6__tar.gz

{unique_toolkit-1.68.4 → unique_toolkit-1.68.6}/PKG-INFO

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

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

{unique_toolkit-1.68.4 → unique_toolkit-1.68.6}/unique_toolkit/agentic/feature_flags/feature_flags.py

@@ -87,6 +87,11 @@ class FeatureFlags(BaseSettings):
         description="Enable argument screening agent for web search tool calls (UN-18741). Can be 'true' or comma-separated company IDs.",
     )
 
+    enable_selected_uploaded_files_un_18470: FeatureFlag = Field(
+        default=FeatureFlag(False),
+        description="Use selected_uploaded_files from event payload instead of querying uploaded files from the backend. Can be 'true' or comma-separated company IDs.",
+    )
+
     model_config = SettingsConfigDict(
         extra="ignore",
         env_prefix="FEATURE_FLAG_",

{unique_toolkit-1.68.4 → unique_toolkit-1.68.6}/unique_toolkit/agentic/tools/openai_builtin/code_interpreter/postprocessors/generated_files.py

@@ -211,11 +211,11 @@ class DisplayCodeInterpreterFilesPostProcessor(
                 )
                 changed |= replaced
 
-            # HTML rendered as HtmlRendering block — when fence FF is on, or when
-            # the legacy HTML-rendering FF is on (fence FF off path).
-            elif is_html and (
-                fence_ff_on
-                or feature_flags.enable_html_rendering_un_15131.is_enabled(
+            # HTML rendered as legacy HtmlRendering block — only when fence FF is off
+            elif (
+                is_html
+                and not fence_ff_on
+                and feature_flags.enable_html_rendering_un_15131.is_enabled(
                     self._company_id
                 )
             ):
@@ -226,7 +226,7 @@ class DisplayCodeInterpreterFilesPostProcessor(
                 )
                 changed |= replaced
 
-            # Non-HTML files
+            # Files and HTML (fence FF on: HTML → htmlWithSource; others → fileWithSource)
             else:
                 loop_response.message.text, replaced = _replace_container_file_citation(
                     text=loop_response.message.text,
@@ -237,7 +237,7 @@ class DisplayCodeInterpreterFilesPostProcessor(
                 )
                 changed |= replaced
 
-            # HtmlRendering blocks carry contentId directly — no separate reference needed
+            # htmlWithSource / HtmlRendering blocks carry contentId directly — no separate reference needed
             is_html_rendered = is_html and (
                 fence_ff_on
                 or feature_flags.enable_html_rendering_un_15131.is_enabled(
@@ -434,7 +434,9 @@ def _collect_stdout(call: ResponseCodeInterpreterToolCall) -> str:
 
 def _get_next_fence_id(text: str) -> int:
     """Return the next available fence id by scanning existing fences in the text."""
-    existing = re.findall(r"````(?:imgWithSource|fileWithSource)\(id='(\d+)'", text)
+    existing = re.findall(
+        r"````(?:imgWithSource|fileWithSource|htmlWithSource)\(id='(\d+)'", text
+    )
     if not existing:
         return 1
     return max(int(fid) for fid in existing) + 1
@@ -522,11 +524,9 @@ def _build_file_fence(file: CodeInterpreterFile, code: str, fence_id: int) -> st
     content_id, a title derived from the filename, the type, and the
     escaped source code.
 
-    HTML files are handled separately via HtmlRendering blocks and never
-    reach this function.
-
     Format (4 backticks so inner code backticks never close the fence):
       ````imgWithSource(id='{n}', contentId='{id}', title="{title}", code="{escaped_code}")````
+      ````htmlWithSource(id='{n}', contentId='{id}', title="{title}", code="{escaped_code}")````
       ````fileWithSource(id='{n}', contentId='{id}', title="{title}", type="{type}", code="{escaped_code}")````
     """
     title = _file_title(file.filename)
@@ -534,6 +534,8 @@ def _build_file_fence(file: CodeInterpreterFile, code: str, fence_id: int) -> st
     outer = "````"
     if file.type == "image":
         tag = f"imgWithSource(id='{fence_id}', contentId='{file.content_id}', title=\"{title}\", code=\"{escaped}\")"
+    elif file.type == "html":
+        tag = f"htmlWithSource(id='{fence_id}', contentId='{file.content_id}', title=\"{title}\", code=\"{escaped}\")"
     else:
         ftype = _file_frontend_type(file.filename)
         tag = f'fileWithSource(id=\'{fence_id}\', contentId=\'{file.content_id}\', title="{title}", type="{ftype}", code="{escaped}")'
@@ -557,7 +559,7 @@ def _inline_ref_pattern(file: CodeInterpreterFile) -> re.Pattern[str]:
 
 
 _FENCE_BLOCK_START = re.compile(
-    r"^[^\n`]+?(````(?:imgWithSource|fileWithSource)\()",
+    r"^[^\n`]+?(````(?:imgWithSource|fileWithSource|htmlWithSource)\()",
     re.MULTILINE,
 )
 
@@ -567,9 +569,9 @@ _FENCE_BLOCK_START = re.compile(
 #   - cross-line: 1 or 2 newlines optionally surrounded by horizontal whitespace
 #     (list-item linebreak, or blank-line paragraph gap)
 _CONSECUTIVE_FENCES_RE = re.compile(
-    r"(````(?:imgWithSource|fileWithSource)\([^\n]*\)````)"
+    r"(````(?:imgWithSource|fileWithSource|htmlWithSource)\([^\n]*\)````)"
     r"(?:[^\n`]*|[ \t]*\n{1,2}[ \t]*)"
-    r"(?=````(?:imgWithSource|fileWithSource)\()"
+    r"(?=````(?:imgWithSource|fileWithSource|htmlWithSource)\()"
 )
 
 
@@ -819,9 +821,6 @@ def _warn_unmatched_code_blocks(
     for filename, content_id in content_map.items():
         if content_id is None:
             continue
-        # HTML files are rendered via HtmlRendering blocks, not fence injection
-        if _get_file_type(filename) == "html":
-            continue
         if filename not in fenced_filenames:
             logger.warning(
                 "File '%s' (content_id=%s) could not be matched to any code block "

{unique_toolkit-1.68.4 → unique_toolkit-1.68.6}/unique_toolkit/app/__init__.py

@@ -44,6 +44,9 @@ from .schemas import (
 from .schemas import (
     McpTool as McpTool,
 )
+from .schemas import (
+    UploadedFileInfo as UploadedFileInfo,
+)
 from .verification import (
     verify_signature_and_construct_event as verify_signature_and_construct_event,
 )

{unique_toolkit-1.68.4 → unique_toolkit-1.68.6}/unique_toolkit/app/schemas.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 from enum import StrEnum
 from logging import getLogger
@@ -46,7 +48,7 @@ class BaseEvent(BaseModel, Generic[FilterOptionsT]):
     company_id: str
 
     @classmethod
-    def from_json_file(cls, file_path: Path) -> "BaseEvent":
+    def from_json_file(cls, file_path: Path) -> BaseEvent:
         if not file_path.exists():
             raise FileNotFoundError(f"File not found: {file_path}")
         with file_path.open("r", encoding="utf-8") as f:
@@ -162,12 +164,32 @@ class EventAssistantMessage(ChatEventAssistantMessage):
     pass
 
 
+class UploadedFileInfo(BaseModel):
+    """Describes a file attached to the chat"""
+
+    model_config = model_config
+
+    id: str
+    title: str = ""
+    mime_type: str = ""
+
+
 class ChatEventAdditionalParameters(BaseModel):
     model_config = model_config
 
     translate_to_language: Optional[str] = None
     content_id_to_translate: Optional[str] = None
     user_space_instructions: str
+    uploaded_files: list[UploadedFileInfo] = Field(default_factory=list)
+    selected_uploaded_files: list[UploadedFileInfo] = Field(default_factory=list)
+
+    @property
+    def uploaded_file_ids(self) -> list[str]:
+        return [f.id for f in self.uploaded_files]
+
+    @property
+    def selected_uploaded_file_ids(self) -> list[str]:
+        return [f.id for f in self.selected_uploaded_files]
 
 
 @deprecated(
@@ -263,7 +285,7 @@ class ChatEvent(BaseEvent):
     version: Optional[str] = None
 
     @classmethod
-    def from_json_file(cls, file_path: Path) -> "ChatEvent":
+    def from_json_file(cls, file_path: Path) -> ChatEvent:
         if not file_path.exists():
             raise FileNotFoundError(f"File not found: {file_path}")
         with file_path.open("r", encoding="utf-8") as f:
@@ -326,7 +348,7 @@ class Event(ChatEvent):
     # payload: EventPayload
 
     @classmethod
-    def from_json_file(cls, file_path: Path) -> "Event":
+    def from_json_file(cls, file_path: Path) -> Event:
         if not file_path.exists():
             raise FileNotFoundError(f"File not found: {file_path}")
         with file_path.open("r", encoding="utf-8") as f:

{unique_toolkit-1.68.4 → unique_toolkit-1.68.6}/unique_toolkit/test_utilities/events.py

@@ -11,6 +11,7 @@ from unique_toolkit.app.schemas import (
     ChatEventPayload,
     ChatEventUserMessage,
     EventName,
+    UploadedFileInfo,
 )
 from unique_toolkit.app.unique_settings import UniqueSettings
 
@@ -92,11 +93,15 @@ class TestEventFactory:
         translate_to_language: str | None = None,
         content_id_to_translate: str | None = None,
         user_space_instructions: str = "",
+        uploaded_files: list[UploadedFileInfo] = [],
+        selected_uploaded_files: list[UploadedFileInfo] = [],
     ) -> ChatEventAdditionalParameters:
         return ChatEventAdditionalParameters(
             translate_to_language=translate_to_language,
             content_id_to_translate=content_id_to_translate,
             user_space_instructions=user_space_instructions,
+            uploaded_files=uploaded_files,
+            selected_uploaded_files=selected_uploaded_files,
         )
 
     def get_base_event(