unique_toolkit 1.69.2__tar.gz → 1.69.4__tar.gz

{unique_toolkit-1.69.2 → unique_toolkit-1.69.4}/PKG-INFO

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

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

{unique_toolkit-1.69.2 → unique_toolkit-1.69.4}/unique_toolkit/_common/api_calling/human_verification_manager.py

@@ -332,6 +332,7 @@ if __name__ == "__main__":
     )
 
     last_assistant_message = ChatMessage(
+        id="123",
         role=ChatMessageRole.ASSISTANT,
         text=api_call.confirmation.payload_hash,
         chat_id="123",

{unique_toolkit-1.69.2 → unique_toolkit-1.69.4}/unique_toolkit/_common/base_model_type_attribute.py

@@ -237,8 +237,8 @@ if __name__ == "__main__":
     class ToolDescription(BaseModel, Generic[TModel]):
         name: str = Field(
             ...,
-            pattern=r"^[a-zA-Z1-9_-]+$",
-            description="Name must adhere to the pattern ^[a-zA-Z1-9_-]+$",
+            pattern=r"^[a-zA-Z0-9_-]+$",
+            description="Name must adhere to the pattern ^[a-zA-Z0-9_-]+$",
         )
         description: str = Field(
             ...,

{unique_toolkit-1.69.2 → unique_toolkit-1.69.4}/unique_toolkit/app/unique_settings.py

@@ -657,6 +657,11 @@ class UniqueSettings:
     @property
     @deprecated("Use authcontext instead")
     def auth(self) -> UniqueAuth:
+        if isinstance(self._context.auth, AuthContext):
+            return UniqueAuth(
+                company_id=SecretStr(self._context.auth.get_confidential_company_id()),
+                user_id=SecretStr(self._context.auth.get_confidential_user_id()),
+            )
         if not isinstance(self._context.auth, UniqueAuth):
             raise ValueError("Auth context is not a UniqueAuth instance")
         return self._context.auth

{unique_toolkit-1.69.2 → unique_toolkit-1.69.4}/unique_toolkit/chat/functions.py

@@ -426,6 +426,7 @@ def get_selection_from_history(
     )
 
 
+@deprecated("Use ChatMessage directly")
 def map_to_chat_messages(messages: list[dict]) -> list[ChatMessage]:
     return [ChatMessage(**msg) for msg in messages]
 
@@ -502,7 +503,7 @@ def get_full_history(
     messages = list_messages(event_user_id, event_company_id, event_payload_chat_id)
     messages = filter_valid_messages(messages)
 
-    return map_to_chat_messages(messages)
+    return [ChatMessage.model_validate(msg) for msg in messages]
 
 
 async def get_full_history_async(
@@ -517,7 +518,7 @@ async def get_full_history_async(
     )
     messages = filter_valid_messages(messages)
 
-    return map_to_chat_messages(messages)
+    return [ChatMessage.model_validate(msg) for msg in messages]
 
 
 def filter_valid_messages(

{unique_toolkit-1.69.2 → unique_toolkit-1.69.4}/unique_toolkit/chat/schemas.py

@@ -9,9 +9,6 @@ from openai.types.chat import (
     ChatCompletionMessageParam,
     ChatCompletionUserMessageParam,
 )
-from openai.types.chat.chat_completion_message_function_tool_call_param import (
-    ChatCompletionMessageFunctionToolCallParam,
-)
 from openai.types.chat.chat_completion_message_function_tool_call_param import (
     Function as OpenAIFunction,
 )
@@ -20,7 +17,6 @@ from pydantic import (
     ConfigDict,
     Field,
     field_validator,
-    model_validator,
 )
 
 from unique_toolkit.content.schemas import ContentReference
@@ -35,7 +31,6 @@ model_config = ConfigDict(
 class ChatMessageRole(StrEnum):
     USER = "user"
     ASSISTANT = "assistant"
-    TOOL = "tool"
     SYSTEM = "system"  # Note: These messages are appended by the backend and should not be confused with the LLM's system message.
 
 
@@ -52,21 +47,6 @@ class Function(BaseModel):
         )
 
 
-class ToolCall(BaseModel):
-    model_config = model_config
-
-    id: str
-    type: str
-    function: Function
-
-    def to_openai_param(self) -> ChatCompletionMessageFunctionToolCallParam:
-        return ChatCompletionMessageFunctionToolCallParam(
-            id=self.id,
-            function=self.function.to_openai(),
-            type="function",
-        )
-
-
 class ChatMessageToolResponse(BaseModel):
     """Persisted response for a single tool call."""
 
@@ -146,9 +126,9 @@ class ChatMessage(BaseModel):
     # Fields previous_message_id, tool_calls, tool_call_id are internal extensions not in the DTO.
     model_config = model_config
 
-    id: str | None = None
+    id: str
     chat_id: str
-    object: str | None = None
+    object: Literal["message"] = "message"
     # alias="text" applies only to construction (model_validate / __init__).
     # model_dump() uses the field name "content", not "text". Use model_dump(by_alias=True)
     # to get "text" as the key, or access via the .text property.
@@ -157,7 +137,6 @@ class ChatMessage(BaseModel):
     role: ChatMessageRole
     previous_message_id: str | None = None
     gpt_request: list[dict] | dict | None = None
-    tool_calls: list[ToolCall] | None = None
     debug_info: dict | None = {}
     created_at: datetime | None = None
     completed_at: datetime | None = None
@@ -182,13 +161,6 @@ class ChatMessage(BaseModel):
     def text(self, value: str | None) -> None:
         self.content = value
 
-    # Ensure tool_call_id is required if role is 'tool'
-    @model_validator(mode="after")
-    def check_tool_call_ids_for_tool_role(self):
-        if self.role == ChatMessageRole.TOOL and not self.tool_call_id:
-            raise ValueError("tool_call_id is required when role is 'tool'")
-        return self
-
     def to_openai_param(self) -> ChatCompletionMessageParam:
         match self.role:
             case ChatMessageRole.USER:
@@ -198,25 +170,13 @@ class ChatMessage(BaseModel):
                 )
 
             case ChatMessageRole.ASSISTANT:
-                if self.tool_calls:
-                    assistant_message = ChatCompletionAssistantMessageParam(
-                        role="assistant",
-                        audio=None,
-                        content=self.content or "",
-                        function_call=None,
-                        refusal=None,
-                        tool_calls=[t.to_openai_param() for t in self.tool_calls],
-                    )
-                else:
-                    assistant_message = ChatCompletionAssistantMessageParam(
-                        role="assistant",
-                        audio=None,
-                        content=self.content or "",
-                        function_call=None,
-                        refusal=None,
-                    )
-
-                return assistant_message
+                return ChatCompletionAssistantMessageParam(
+                    role="assistant",
+                    audio=None,
+                    content=self.content or "",
+                    function_call=None,
+                    refusal=None,
+                )
 
             case _:
                 raise NotImplementedError(

{unique_toolkit-1.69.2 → unique_toolkit-1.69.4}/unique_toolkit/language_model/builder.py

@@ -1,3 +1,4 @@
+import logging
 from typing import Any, Self
 
 from unique_toolkit.language_model import (
@@ -12,6 +13,8 @@ from unique_toolkit.language_model import (
     LanguageModelUserMessage,
 )
 
+_LOGGER = logging.getLogger(__name__)
+
 
 class MessagesBuilder:
     def __init__(self):
@@ -22,8 +25,24 @@ class MessagesBuilder:
         return self
 
     def message_append(self, role: LanguageModelMessageRole, content: str):
-        message = LanguageModelMessage(role=role, content=content)
-        self.messages.append(message)
+        message = None
+        match role:
+            case LanguageModelMessageRole.SYSTEM:
+                message = LanguageModelSystemMessage(content=content)
+            case LanguageModelMessageRole.USER:
+                message = LanguageModelUserMessage(content=content)
+            case LanguageModelMessageRole.ASSISTANT:
+                message = LanguageModelAssistantMessage(content=content)
+            case LanguageModelMessageRole.TOOL:
+                logging.warning(
+                    "Tool messages are not supported in the builder as messages"
+                )
+
+        if message:
+            self.messages.append(message)
+        else:
+            _LOGGER.warning(f"Invalid message role: {role}")
+
         return self
 
     def system_message_append(self, content: str) -> Self:
@@ -54,12 +73,22 @@ class MessagesBuilder:
                 for image in images
             ],
         )
+        message = None
+        match role:
+            case LanguageModelMessageRole.SYSTEM:
+                message = LanguageModelSystemMessage(content=final_content)
+            case LanguageModelMessageRole.USER:
+                message = LanguageModelUserMessage(content=final_content)
+            case LanguageModelMessageRole.ASSISTANT:
+                message = LanguageModelAssistantMessage(content=final_content)
+            case LanguageModelMessageRole.TOOL:
+                pass
+
+        if message:
+            self.messages.append(message)
+        else:
+            _LOGGER.warning(f"Invalid message role: {role}")
 
-        message = LanguageModelMessage(
-            role=role,
-            content=final_content,
-        )
-        self.messages.append(message)
         return self
 
     def assistant_message_append(

{unique_toolkit-1.69.2 → unique_toolkit-1.69.4}/unique_toolkit/language_model/schemas.py

@@ -1,11 +1,14 @@
 import json
 import math
-from typing import Any, Literal, Self, TypeVar
+from abc import ABC, abstractmethod
+from enum import StrEnum
+from typing import Any, Literal, Self, TypeVar, override
 from uuid import uuid4
 
 from humps import camelize
 from openai.types.chat import (
     ChatCompletionAssistantMessageParam,
+    ChatCompletionMessageParam,
     ChatCompletionSystemMessageParam,
     ChatCompletionToolMessageParam,
     ChatCompletionUserMessageParam,
@@ -20,6 +23,7 @@ from openai.types.responses import (
     FunctionToolParam,
     ResponseCodeInterpreterToolCall,
     ResponseFunctionToolCallParam,
+    ResponseInputItemParam,
     ResponseOutputItem,
     ResponseOutputMessage,
 )
@@ -40,7 +44,6 @@ from pydantic import (
 from typing_extensions import deprecated, overload
 
 from unique_toolkit.chat.schemas import ChatMessage
-from unique_toolkit.chat.schemas import ChatMessageRole as LanguageModelMessageRole
 from unique_toolkit.language_model._responses_api_utils import (
     convert_user_message_content_to_responses_api,
 )
@@ -54,6 +57,13 @@ model_config = ConfigDict(
 )
 
 
+class LanguageModelMessageRole(StrEnum):
+    ASSISTANT = "assistant"
+    SYSTEM = "system"
+    USER = "user"
+    TOOL = "tool"
+
+
 # Backward compatibility alias — use ChatMessage directly.
 # LanguageModelStreamResponseMessage was a toolkit-only subclass with stricter types
 # (required id/content, non-null references). The backend DTOs (PublicMessageDto,
@@ -238,7 +248,7 @@ class LanguageModelFunctionCall(BaseModel):
         return assistant_message
 
 
-class LanguageModelMessage(BaseModel):
+class LanguageModelMessage(BaseModel, ABC):
     model_config = model_config
     role: LanguageModelMessageRole
     content: str | list[dict] | None = None
@@ -252,6 +262,14 @@ class LanguageModelMessage(BaseModel):
 
         return format_message(self.role.capitalize(), message=message, num_tabs=1)
 
+    @abstractmethod
+    def to_openai(
+        self, mode: Literal["completions", "responses"] = "completions"
+    ) -> ChatCompletionMessageParam | ResponseInputItemParam:
+        raise NotImplementedError(
+            "Subclasses must implement this. This class should not be used directly"
+        )
+
 
 class LanguageModelSystemMessage(LanguageModelMessage):
     role: LanguageModelMessageRole = LanguageModelMessageRole.SYSTEM
@@ -268,6 +286,7 @@ class LanguageModelSystemMessage(LanguageModelMessage):
     @overload
     def to_openai(self, mode: Literal["responses"]) -> EasyInputMessageParam: ...
 
+    @override
     def to_openai(
         self, mode: Literal["completions", "responses"] = "completions"
     ) -> ChatCompletionSystemMessageParam | EasyInputMessageParam:
@@ -296,11 +315,12 @@ class LanguageModelUserMessage(LanguageModelMessage):
     ) -> ChatCompletionUserMessageParam: ...
 
     @overload
-    def to_openai(self, mode: Literal["responses"]) -> EasyInputMessageParam: ...
+    def to_openai(self, mode: Literal["responses"]) -> ResponseInputItemParam: ...
 
+    @override
     def to_openai(
         self, mode: Literal["completions", "responses"] = "completions"
-    ) -> ChatCompletionUserMessageParam | EasyInputMessageParam:
+    ) -> ChatCompletionUserMessageParam | ResponseInputItemParam:
         if self.content is None:
             content = ""
         else:
@@ -370,16 +390,12 @@ class LanguageModelAssistantMessage(LanguageModelMessage):
     ) -> ChatCompletionAssistantMessageParam: ...
 
     @overload
-    def to_openai(
-        self, mode: Literal["responses"]
-    ) -> list[EasyInputMessageParam | ResponseFunctionToolCallParam]: ...
+    def to_openai(self, mode: Literal["responses"]) -> EasyInputMessageParam: ...
 
+    @override
     def to_openai(
         self, mode: Literal["completions", "responses"] = "completions"
-    ) -> (
-        ChatCompletionAssistantMessageParam
-        | list[EasyInputMessageParam | ResponseFunctionToolCallParam]
-    ):
+    ) -> ChatCompletionAssistantMessageParam | EasyInputMessageParam:
         content = self.content or ""
         if not isinstance(content, str):
             raise ValueError("Content must be a string")
@@ -437,6 +453,7 @@ class LanguageModelToolMessage(LanguageModelMessage):
     @overload
     def to_openai(self, mode: Literal["responses"]) -> FunctionCallOutput: ...
 
+    @override
     def to_openai(
         self, mode: Literal["completions", "responses"] = "completions"
     ) -> ChatCompletionToolMessageParam | FunctionCallOutput:
@@ -463,7 +480,7 @@ class LanguageModelToolMessage(LanguageModelMessage):
 # with the addition of the builder
 
 LanguageModelMessageOptions = (
-    LanguageModelMessage
+    LanguageModelMessage  # TODO: Ideally we remove this
     | LanguageModelToolMessage
     | LanguageModelAssistantMessage
     | LanguageModelSystemMessage
@@ -501,8 +518,7 @@ class LanguageModelMessages(RootModel):
                 elif role == "tool":
                     converted_messages.append(LanguageModelToolMessage(**item))
                 else:
-                    # Fallback to base LanguageModelMessage
-                    converted_messages.append(LanguageModelMessage(**item))
+                    raise ValueError(f"Unknown message role: {item.get('role')!r}")
             else:
                 # If it's already a message object, keep it as is
                 converted_messages.append(item)
@@ -525,6 +541,11 @@ class LanguageModelMessages(RootModel):
         builder.messages = self.root.copy()  # Start with existing messages
         return builder
 
+    def to_openai(
+        self, mode: Literal["completions", "responses"] = "completions"
+    ) -> list[ChatCompletionMessageParam | ResponseInputItemParam]:
+        return [message.to_openai(mode=mode) for message in self.root]
+
 
 # This seems similar to
 # from openai.types.completion_choice import CompletionChoice
@@ -643,8 +664,8 @@ class LanguageModelToolParameters(BaseModel):
 class LanguageModelTool(BaseModel):
     name: str = Field(
         ...,
-        pattern=r"^[a-zA-Z1-9_-]+$",
-        description="Name must adhere to the pattern ^[a-zA-Z_-]+$",
+        pattern=r"^[a-zA-Z0-9_-]+$",
+        description="Name must adhere to the pattern ^[a-zA-Z0-9_-]+$",
     )
     description: str
     parameters: (
@@ -658,8 +679,8 @@ class LanguageModelTool(BaseModel):
 class LanguageModelToolDescription(BaseModel):
     name: str = Field(
         ...,
-        pattern=r"^[a-zA-Z1-9_-]+$",
-        description="Name must adhere to the pattern ^[a-zA-Z1-9_-]+$",
+        pattern=r"^[a-zA-Z0-9_-]+$",
+        description="Name must adhere to the pattern ^[a-zA-Z0-9_-]+$",
     )
     description: str = Field(
         ...,

{unique_toolkit-1.69.2 → unique_toolkit-1.69.4}/unique_toolkit/services/chat_service.py

@@ -1133,7 +1133,7 @@ class ChatService(ChatServiceDeprecated):
         seconds_remaining: int | None = None,
         percentage_completed: int | None = None,
         is_queueable: bool = True,
-        execution_options: dict | None = None,
+        execution_options: dict[str, Any] | None = None,
         progress_title: str | None = None,
     ) -> MessageExecution:
         """Creates a message execution for tracking long-running operations synchronously.