unique_toolkit 0.7.14__py3-none-any.whl → 0.7.19__py3-none-any.whl

unique_toolkit/app/schemas.py

@@ -109,31 +109,26 @@ class ChatEventPayload(BaseModel):
 @deprecated("""Use `ChatEventPayload` instead.
             This class will be removed in the next major version.""")
 class EventPayload(ChatEventPayload):
-    user_message: EventUserMessage
-    assistant_message: EventAssistantMessage
-    additional_parameters: Optional[EventAdditionalParameters] = None
-
-
-@deprecated(
-    """Use the more specific `ChatEvent` instead that has the same properties. \
-This class will be removed in the next major version."""
-)
-class Event(BaseModel):
-    model_config = model_config
-
-    id: str
-    event: EventName
-    user_id: str
-    company_id: str
-    payload: EventPayload
-    created_at: Optional[int] = None
-    version: Optional[str] = None
+    pass
+    # user_message: EventUserMessage
+    # assistant_message: EventAssistantMessage
+    # additional_parameters: Optional[EventAdditionalParameters] = None
 
 
 class ChatEvent(BaseEvent):
     model_config = model_config
 
-    event: EventName
     payload: ChatEventPayload
     created_at: Optional[int] = None
     version: Optional[str] = None
+
+
+@deprecated(
+    """Use the more specific `ChatEvent` instead that has the same properties. \
+This class will be removed in the next major version."""
+)
+class Event(ChatEvent):
+    pass
+    # The below should only affect type hints
+    # event: EventName T
+    # payload: EventPayload

unique_toolkit/chat/service.py

@@ -41,6 +41,7 @@ from unique_toolkit.language_model.infos import (
 )
 from unique_toolkit.language_model.schemas import (
     LanguageModelMessages,
+    LanguageModelResponse,
     LanguageModelStreamResponse,
     LanguageModelTool,
 )
@@ -81,7 +82,7 @@ class ChatService:
     @deprecated(
         "The event property is deprecated and will be removed in a future version."
     )
-    def event(self) -> Event | ChatEvent | None:
+    def event(self) -> Event | ChatEvent:
         """
         Get the event object (deprecated).
 
@@ -279,14 +280,30 @@ class ChatService:
         Args:
             debug_info (dict): The new debug information.
         """
-
+        [
+            company_id,
+            user_id,
+            assistant_message_id,
+            user_message_id,
+            chat_id,
+            user_message_text,
+        ] = validate_required_values(
+            [
+                self._company_id,
+                self._user_id,
+                self._assistant_message_id,
+                self._user_message_id,
+                self._chat_id,
+                self._user_message_text,
+            ]
+        )
         return await modify_message_async(
-            user_id=self._user_id,
-            company_id=self._company_id,
-            assistant_message_id=self._assistant_message_id,
-            chat_id=self._chat_id,
-            user_message_id=self._user_message_id,
-            user_message_text=self._user_message_text,
+            user_id=user_id,
+            company_id=company_id,
+            assistant_message_id=assistant_message_id,
+            chat_id=chat_id,
+            user_message_id=user_message_id,
+            user_message_text=user_message_text,
             assistant=False,
             debug_info=debug_info,
         )
@@ -298,14 +315,31 @@ class ChatService:
         Args:
             debug_info (dict): The new debug information.
         """
+        [
+            company_id,
+            user_id,
+            assistant_message_id,
+            user_message_id,
+            chat_id,
+            user_message_text,
+        ] = validate_required_values(
+            [
+                self._company_id,
+                self._user_id,
+                self._assistant_message_id,
+                self._user_message_id,
+                self._chat_id,
+                self._user_message_text,
+            ]
+        )
 
         return modify_message(
-            user_id=self._user_id,
-            company_id=self._company_id,
-            assistant_message_id=self._assistant_message_id,
-            chat_id=self._chat_id,
-            user_message_id=self._user_message_id,
-            user_message_text=self._user_message_text,
+            user_id=user_id,
+            company_id=company_id,
+            assistant_message_id=assistant_message_id,
+            chat_id=chat_id,
+            user_message_id=user_message_id,
+            user_message_text=user_message_text,
             assistant=False,
             debug_info=debug_info,
         )
@@ -334,13 +368,31 @@ class ChatService:
         Raises:
             Exception: If the modification fails.
         """
+        [
+            company_id,
+            user_id,
+            assistant_message_id,
+            user_message_id,
+            chat_id,
+            user_message_text,
+        ] = validate_required_values(
+            [
+                self._company_id,
+                self._user_id,
+                self._assistant_message_id,
+                self._user_message_id,
+                self._chat_id,
+                self._user_message_text,
+            ]
+        )
+
         return modify_message(
-            user_id=self._user_id,
-            company_id=self._company_id,
-            assistant_message_id=self._assistant_message_id,
-            chat_id=self._chat_id,
-            user_message_id=self._user_message_id,
-            user_message_text=self._user_message_text,
+            user_id=user_id,
+            company_id=company_id,
+            assistant_message_id=assistant_message_id,
+            chat_id=chat_id,
+            user_message_id=user_message_id,
+            user_message_text=user_message_text,
             assistant=False,
             content=content,
             references=references,
@@ -373,13 +425,32 @@ class ChatService:
         Raises:
             Exception: If the modification fails.
         """
+
+        [
+            company_id,
+            user_id,
+            assistant_message_id,
+            user_message_id,
+            chat_id,
+            user_message_text,
+        ] = validate_required_values(
+            [
+                self._company_id,
+                self._user_id,
+                self._assistant_message_id,
+                self._user_message_id,
+                self._chat_id,
+                self._user_message_text,
+            ]
+        )
+
         return await modify_message_async(
-            user_id=self._user_id,
-            company_id=self._company_id,
-            assistant_message_id=self._assistant_message_id,
-            chat_id=self._chat_id,
-            user_message_id=self._user_message_id,
-            user_message_text=self._user_message_text,
+            user_id=user_id,
+            company_id=company_id,
+            assistant_message_id=assistant_message_id,
+            chat_id=chat_id,
+            user_message_id=user_message_id,
+            user_message_text=user_message_text,
             assistant=False,
             content=content,
             references=references,
@@ -414,13 +485,31 @@ class ChatService:
         Raises:
             Exception: If the modification fails.
         """
+        [
+            company_id,
+            user_id,
+            assistant_message_id,
+            user_message_id,
+            chat_id,
+            user_message_text,
+        ] = validate_required_values(
+            [
+                self._company_id,
+                self._user_id,
+                self._assistant_message_id,
+                self._user_message_id,
+                self._chat_id,
+                self._user_message_text,
+            ]
+        )
+
         return modify_message(
-            user_id=self._user_id,
-            company_id=self._company_id,
-            assistant_message_id=self._assistant_message_id,
-            chat_id=self._chat_id,
-            user_message_id=self._user_message_id,
-            user_message_text=self._user_message_text,
+            user_id=user_id,
+            company_id=company_id,
+            assistant_message_id=assistant_message_id,
+            chat_id=chat_id,
+            user_message_id=user_message_id,
+            user_message_text=user_message_text,
             assistant=True,
             content=content,
             original_content=original_content,
@@ -456,14 +545,30 @@ class ChatService:
         Raises:
             Exception: If the modification fails.
         """
-
+        [
+            company_id,
+            user_id,
+            assistant_message_id,
+            user_message_id,
+            chat_id,
+            user_message_text,
+        ] = validate_required_values(
+            [
+                self._company_id,
+                self._user_id,
+                self._assistant_message_id,
+                self._user_message_id,
+                self._chat_id,
+                self._user_message_text,
+            ]
+        )
         return await modify_message_async(
-            user_id=self._user_id,
-            company_id=self._company_id,
-            assistant_message_id=self._assistant_message_id,
-            chat_id=self._chat_id,
-            user_message_id=self._user_message_id,
-            user_message_text=self._user_message_text,
+            user_id=user_id,
+            company_id=company_id,
+            assistant_message_id=assistant_message_id,
+            chat_id=chat_id,
+            user_message_id=user_message_id,
+            user_message_text=user_message_text,
             assistant=True,
             content=content,
             original_content=original_content,
@@ -595,11 +700,25 @@ class ChatService:
         Raises:
             Exception: If the creation fails.
         """
+        [
+            company_id,
+            user_id,
+            assistant_id,
+            chat_id,
+        ] = validate_required_values(
+            [
+                self._company_id,
+                self._user_id,
+                self._assistant_id,
+                self._chat_id,
+            ]
+        )
+
         chat_message = create_message(
-            user_id=self._user_id,
-            company_id=self._company_id,
-            chat_id=self._chat_id,
-            assistant_id=self._assistant_id,
+            user_id=user_id,
+            company_id=company_id,
+            chat_id=chat_id,
+            assistant_id=assistant_id,
             role=ChatMessageRole.ASSISTANT,
             content=content,
             original_content=original_content,
@@ -635,12 +754,24 @@ class ChatService:
         Raises:
             Exception: If the creation fails.
         """
-
+        [
+            company_id,
+            user_id,
+            assistant_id,
+            chat_id,
+        ] = validate_required_values(
+            [
+                self._company_id,
+                self._user_id,
+                self._assistant_id,
+                self._chat_id,
+            ]
+        )
         chat_message = await create_message_async(
-            user_id=self._user_id,
-            company_id=self._company_id,
-            chat_id=self._chat_id,
-            assistant_id=self._assistant_id,
+            user_id=user_id,
+            company_id=company_id,
+            chat_id=chat_id,
+            assistant_id=assistant_id,
             role=ChatMessageRole.ASSISTANT,
             content=content,
             original_content=original_content,
@@ -676,11 +807,24 @@ class ChatService:
         Raises:
             Exception: If the creation fails.
         """
+        [
+            company_id,
+            user_id,
+            assistant_id,
+            chat_id,
+        ] = validate_required_values(
+            [
+                self._company_id,
+                self._user_id,
+                self._assistant_id,
+                self._chat_id,
+            ]
+        )
         chat_message = create_message(
-            user_id=self._user_id,
-            company_id=self._company_id,
-            chat_id=self._chat_id,
-            assistant_id=self._assistant_id,
+            user_id=user_id,
+            company_id=company_id,
+            chat_id=chat_id,
+            assistant_id=assistant_id,
             role=ChatMessageRole.USER,
             content=content,
             original_content=original_content,
@@ -716,12 +860,24 @@ class ChatService:
         Raises:
             Exception: If the creation fails.
         """
-
+        [
+            company_id,
+            user_id,
+            assistant_id,
+            chat_id,
+        ] = validate_required_values(
+            [
+                self._company_id,
+                self._user_id,
+                self._assistant_id,
+                self._chat_id,
+            ]
+        )
         chat_message = await create_message_async(
-            user_id=self._user_id,
-            company_id=self._company_id,
-            chat_id=self._chat_id,
-            assistant_id=self._assistant_id,
+            user_id=user_id,
+            company_id=company_id,
+            chat_id=chat_id,
+            assistant_id=assistant_id,
             role=ChatMessageRole.USER,
             content=content,
             original_content=original_content,
@@ -761,9 +917,19 @@ class ChatService:
         Raises:
             Exception: If the creation fails
         """
+        [
+            company_id,
+            user_id,
+        ] = validate_required_values(
+            [
+                self._company_id,
+                self._user_id,
+            ]
+        )
+
         return create_message_assessment(
-            user_id=self._user_id,
-            company_id=self._company_id,
+            user_id=user_id,
+            company_id=company_id,
             assistant_message_id=assistant_message_id,
             status=status,
             type=type,
@@ -801,9 +967,19 @@ class ChatService:
         Raises:
             Exception: If the creation fails
         """
+        [
+            company_id,
+            user_id,
+        ] = validate_required_values(
+            [
+                self._company_id,
+                self._user_id,
+            ]
+        )
+
         return await create_message_assessment_async(
-            user_id=self._user_id,
-            company_id=self._company_id,
+            user_id=user_id,
+            company_id=company_id,
             assistant_message_id=assistant_message_id,
             status=status,
             type=type,
@@ -839,9 +1015,19 @@ class ChatService:
         Raises:
             Exception: If the modification fails
         """
+        [
+            company_id,
+            user_id,
+        ] = validate_required_values(
+            [
+                self._company_id,
+                self._user_id,
+            ]
+        )
+
         return modify_message_assessment(
-            user_id=self._user_id,
-            company_id=self._company_id,
+            user_id=user_id,
+            company_id=company_id,
             assistant_message_id=assistant_message_id,
             status=status,
             type=type,
@@ -876,9 +1062,19 @@ class ChatService:
         Raises:
             Exception: If the modification fails
         """
+        [
+            company_id,
+            user_id,
+        ] = validate_required_values(
+            [
+                self._company_id,
+                self._user_id,
+            ]
+        )
+
         return await modify_message_assessment_async(
-            user_id=self._user_id,
-            company_id=self._company_id,
+            user_id=user_id,
+            company_id=company_id,
             assistant_message_id=assistant_message_id,
             status=status,
             type=type,
@@ -938,6 +1134,32 @@ class ChatService:
             other_options=other_options,
         )
 
+    def complete(
+        self,
+        messages: LanguageModelMessages,
+        model_name: LanguageModelName | str,
+        content_chunks: list[ContentChunk] = [],
+        debug_info: dict = {},
+        temperature: float = DEFAULT_COMPLETE_TEMPERATURE,
+        timeout: int = DEFAULT_COMPLETE_TIMEOUT,
+        tools: Optional[list[LanguageModelTool]] = None,
+        start_text: Optional[str] = None,
+        other_options: Optional[dict] = None,
+    ) -> LanguageModelResponse:
+        response = self.stream_complete(
+            messages=messages,
+            model_name=model_name,
+            content_chunks=content_chunks,
+            debug_info=debug_info,
+            temperature=temperature,
+            timeout=timeout,
+            tools=tools,
+            start_text=start_text,
+            other_options=other_options,
+        )
+
+        return LanguageModelResponse.from_stream_response(response)
+
     async def stream_complete_async(
         self,
         messages: LanguageModelMessages,
@@ -989,3 +1211,29 @@ class ChatService:
             start_text=start_text,
             other_options=other_options,
         )
+
+    async def complete_async(
+        self,
+        messages: LanguageModelMessages,
+        model_name: LanguageModelName | str,
+        content_chunks: list[ContentChunk] = [],
+        debug_info: dict = {},
+        temperature: float = DEFAULT_COMPLETE_TEMPERATURE,
+        timeout: int = DEFAULT_COMPLETE_TIMEOUT,
+        tools: Optional[list[LanguageModelTool]] = None,
+        start_text: Optional[str] = None,
+        other_options: Optional[dict] = None,
+    ) -> LanguageModelResponse:
+        response = self.stream_complete_async(
+            messages=messages,
+            model_name=model_name,
+            content_chunks=content_chunks,
+            debug_info=debug_info,
+            temperature=temperature,
+            timeout=timeout,
+            tools=tools,
+            start_text=start_text,
+            other_options=other_options,
+        )
+
+        return LanguageModelResponse.from_stream_response(await response)

unique_toolkit/content/functions.py

@@ -213,6 +213,8 @@ def upload_content_from_bytes(
     scope_id: str | None = None,
     chat_id: str | None = None,
     skip_ingestion: bool = False,
+    ingestion_config: unique_sdk.Content.IngestionConfig | None = None,
+    metadata: dict[str, any] | None = None,
 ):
     """
     Uploads content to the knowledge base.
@@ -226,6 +228,8 @@ def upload_content_from_bytes(
         scope_id (str | None): The scope ID. Defaults to None.
         chat_id (str | None): The chat ID. Defaults to None.
         skip_ingestion (bool): Whether to skip ingestion. Defaults to False.
+        ingestion_config (unique_sdk.Content.IngestionConfig | None): The ingestion configuration. Defaults to None.
+        metadata ( dict[str, any] | None): The metadata for the content. Defaults to None.
 
     Returns:
         Content: The uploaded content.
@@ -241,6 +245,8 @@ def upload_content_from_bytes(
             scope_id=scope_id,
             chat_id=chat_id,
             skip_ingestion=skip_ingestion,
+            ingestion_config=ingestion_config,
+            metadata=metadata,
         )
     except Exception as e:
         logger.error(f"Error while uploading content: {e}")
@@ -256,6 +262,8 @@ def upload_content(
     scope_id: str | None = None,
     chat_id: str | None = None,
     skip_ingestion: bool = False,
+    ingestion_config: unique_sdk.Content.IngestionConfig | None = None,
+    metadata: dict[str, any] | None = None,
 ):
     """
     Uploads content to the knowledge base.
@@ -269,6 +277,8 @@ def upload_content(
         scope_id (str | None): The scope ID. Defaults to None.
         chat_id (str | None): The chat ID. Defaults to None.
         skip_ingestion (bool): Whether to skip ingestion. Defaults to False.
+        ingestion_config (unique_sdk.Content.IngestionConfig | None): The ingestion configuration. Defaults to None.
+        metadata ( dict[str, any] | None): The metadata for the content. Defaults to None.
 
     Returns:
         Content: The uploaded content.
@@ -284,6 +294,8 @@ def upload_content(
             scope_id=scope_id,
             chat_id=chat_id,
             skip_ingestion=skip_ingestion,
+            ingestion_config=ingestion_config,
+            metadata=metadata,
         )
     except Exception as e:
         logger.error(f"Error while uploading content: {e}")
@@ -299,6 +311,8 @@ def _trigger_upload_content(
     scope_id: str | None = None,
     chat_id: str | None = None,
     skip_ingestion: bool = False,
+    ingestion_config: unique_sdk.Content.IngestionConfig | None = None,
+    metadata: dict[str, any] | None = None,
 ):
     """
     Uploads content to the knowledge base.
@@ -312,6 +326,8 @@ def _trigger_upload_content(
         scope_id (str | None): The scope ID. Defaults to None.
         chat_id (str | None): The chat ID. Defaults to None.
         skip_ingestion (bool): Whether to skip ingestion. Defaults to False.
+        ingestion_config (unique_sdk.Content.IngestionConfig | None): The ingestion configuration. Defaults to None.
+        metadata (dict[str, any] | None): The metadata for the content. Defaults to None.
 
     Returns:
         Content: The uploaded content.
@@ -368,16 +384,21 @@ def _trigger_upload_content(
         logger.error(error_msg)
         raise ValueError(error_msg)
 
+    if ingestion_config is None:
+        ingestion_config = {}
+
+    if skip_ingestion:
+        ingestion_config["uniqueIngestionMode"] = "SKIP_INGESTION"
+
     input_dict = {
         "key": content_name,
         "title": content_name,
         "mimeType": mime_type,
         "byteSize": byte_size,
+        "ingestionConfig": ingestion_config,
+        "metadata": metadata,
     }
 
-    if skip_ingestion:
-        input_dict["ingestionConfig"] = {"uniqueIngestionMode": "SKIP_INGESTION"}
-
     if chat_id:
         _upsert_content(
             user_id=user_id,

unique_toolkit/content/schemas.py

@@ -54,6 +54,8 @@ class Content(BaseModel):
     read_url: str | None = None
     created_at: datetime | None = None
     updated_at: datetime | None = None
+    metadata: dict[str, any] | None = None
+    ingestion_config: dict | None = None
 
 
 class ContentReference(BaseModel):

unique_toolkit/content/service.py

@@ -1,6 +1,7 @@
 import logging
 from pathlib import Path
 
+import unique_sdk
 from requests import Response
 from typing_extensions import deprecated
 
@@ -365,6 +366,8 @@ class ContentService:
         scope_id: str | None = None,
         chat_id: str | None = None,
         skip_ingestion: bool = False,
+        ingestion_config: unique_sdk.Content.IngestionConfig | None = None,
+        metadata: dict | None = None,
     ) -> Content:
         """
         Uploads content to the knowledge base.
@@ -376,6 +379,8 @@ class ContentService:
             scope_id (str | None): The scope ID. Defaults to None.
             chat_id (str | None): The chat ID. Defaults to None.
             skip_ingestion (bool): Whether to skip ingestion. Defaults to False.
+            ingestion_config (unique_sdk.Content.IngestionConfig | None): The ingestion configuration. Defaults to None.
+            metadata (dict | None): The metadata to associate with the content. Defaults to None.
 
         Returns:
             Content: The uploaded content.
@@ -390,6 +395,8 @@ class ContentService:
             scope_id=scope_id,
             chat_id=chat_id,
             skip_ingestion=skip_ingestion,
+            ingestion_config=ingestion_config,
+            metadata=metadata,
         )
 
     def upload_content(
@@ -400,6 +407,8 @@ class ContentService:
         scope_id: str | None = None,
         chat_id: str | None = None,
         skip_ingestion: bool = False,
+        ingestion_config: unique_sdk.Content.IngestionConfig | None = None,
+        metadata: dict[str, any] | None = None,
     ):
         """
         Uploads content to the knowledge base.
@@ -411,6 +420,8 @@ class ContentService:
             scope_id (str | None): The scope ID. Defaults to None.
             chat_id (str | None): The chat ID. Defaults to None.
             skip_ingestion (bool): Whether to skip ingestion. Defaults to False.
+            ingestion_config (unique_sdk.Content.IngestionConfig | None): The ingestion configuration. Defaults to None.
+            metadata (dict[str, any] | None): The metadata to associate with the content. Defaults to None.
 
         Returns:
             Content: The uploaded content.
@@ -425,6 +436,8 @@ class ContentService:
             scope_id=scope_id,
             chat_id=chat_id,
             skip_ingestion=skip_ingestion,
+            ingestion_config=ingestion_config,
+            metadata=metadata,
         )
 
     def request_content_by_id(

unique_toolkit/language_model/builder.py

@@ -17,6 +17,10 @@ class MessagesBuilder:
     def __init__(self):
         self.messages: list[LanguageModelMessage] = []
 
+    def append(self, message: LanguageModelMessage) -> Self:
+        self.messages.append(message)
+        return self
+
     def message_append(self, role: LanguageModelMessageRole, content: str):
         message = LanguageModelMessage(role=role, content=content)
         self.messages.append(message)

unique_toolkit/language_model/schemas.py

@@ -1,7 +1,7 @@
 import json
 import math
 from enum import StrEnum
-from typing import Any, Optional, Self
+from typing import Any, Self
 from uuid import uuid4
 
 from humps import camelize
@@ -27,6 +27,8 @@ model_config = ConfigDict(
 )
 
 
+# Equivalent to
+# from openai.types.chat.chat_completion_role import ChatCompletionRole
 class LanguageModelMessageRole(StrEnum):
     USER = "user"
     SYSTEM = "system"
@@ -34,12 +36,32 @@ class LanguageModelMessageRole(StrEnum):
     TOOL = "tool"
 
 
+# This is tailored to the unique backend
+class LanguageModelStreamResponseMessage(BaseModel):
+    model_config = model_config
+
+    id: str
+    previous_message_id: (
+        str | None
+    )  # Stream response can return a null previous_message_id if an assisstant message is manually added
+    role: LanguageModelMessageRole
+    text: str
+    original_text: str | None = None
+    references: list[dict[str, list | dict | str | int | float | bool]] = []  # type: ignore
+
+    # TODO make sdk return role in lowercase
+    # Currently needed as sdk returns role in uppercase
+    @field_validator("role", mode="before")
+    def set_role(cls, value: str):
+        return value.lower()
+
+
 class LanguageModelFunction(BaseModel):
     model_config = model_config
 
     id: str | None = None
     name: str
-    arguments: Optional[dict[str, Any] | str] = None  # type: ignore
+    arguments: dict[str, Any] | str | None = None  # type: ignore
 
     @field_validator("arguments", mode="before")
     def set_arguments(cls, value):
@@ -62,6 +84,14 @@ class LanguageModelFunction(BaseModel):
         return seralization
 
 
+# This is tailored to the unique backend
+class LanguageModelStreamResponse(BaseModel):
+    model_config = model_config
+
+    message: LanguageModelStreamResponseMessage
+    tool_calls: list[LanguageModelFunction] | None = None
+
+
 class LanguageModelFunctionCall(BaseModel):
     model_config = model_config
 
@@ -69,6 +99,8 @@ class LanguageModelFunctionCall(BaseModel):
     type: str | None = None
     function: LanguageModelFunction
 
+    # TODO: Circular reference of types
+    @deprecated("Use LanguageModelAssistantMessage.from_functions instead.")
     @staticmethod
     def create_assistant_message_from_tool_calls(
         tool_calls: list[LanguageModelFunction],
@@ -93,8 +125,7 @@ class LanguageModelMessage(BaseModel):
     content: str | list[dict] | None = None
 
     def __str__(self):
-        if not self.content:
-            message = ""
+        message = ""
         if isinstance(self.content, str):
             message = self.content
         elif isinstance(self.content, list):
@@ -103,6 +134,8 @@ class LanguageModelMessage(BaseModel):
         return format_message(self.role.capitalize(), message=message, num_tabs=1)
 
 
+# Equivalent to
+# from openai.types.chat.chat_completion_system_message_param import ChatCompletionSystemMessageParam
 class LanguageModelSystemMessage(LanguageModelMessage):
     role: LanguageModelMessageRole = LanguageModelMessageRole.SYSTEM
 
@@ -111,6 +144,10 @@ class LanguageModelSystemMessage(LanguageModelMessage):
         return LanguageModelMessageRole.SYSTEM
 
 
+# Equivalent to
+# from openai.types.chat.chat_completion_user_message_param import ChatCompletionUserMessageParam
+
+
 class LanguageModelUserMessage(LanguageModelMessage):
     role: LanguageModelMessageRole = LanguageModelMessageRole.USER
 
@@ -119,6 +156,8 @@ class LanguageModelUserMessage(LanguageModelMessage):
         return LanguageModelMessageRole.USER
 
 
+# Equivalent to
+# from openai.types.chat.chat_completion_assistant_message_param import ChatCompletionAssistantMessageParam
 class LanguageModelAssistantMessage(LanguageModelMessage):
     role: LanguageModelMessageRole = LanguageModelMessageRole.ASSISTANT
     parsed: dict | None = None
@@ -129,6 +168,47 @@ class LanguageModelAssistantMessage(LanguageModelMessage):
     def set_role(cls, value):
         return LanguageModelMessageRole.ASSISTANT
 
+    @classmethod
+    def from_functions(
+        cls,
+        tool_calls: list[LanguageModelFunction],
+    ):
+        return cls(
+            content="",
+            tool_calls=[
+                LanguageModelFunctionCall(
+                    id=tool_call.id,
+                    type="function",
+                    function=tool_call,
+                )
+                for tool_call in tool_calls
+            ],
+        )
+
+    @classmethod
+    def from_stream_response(cls, response: LanguageModelStreamResponse):
+        tool_calls = [
+            LanguageModelFunctionCall(
+                id=None,
+                type=None,
+                function=f,
+            )
+            for f in response.tool_calls or []
+        ]
+
+        tool_calls = tool_calls if len(tool_calls) > 0 else None
+
+        return cls(
+            content=response.message.text,
+            parsed=None,
+            refusal=None,
+            tool_calls=tool_calls,
+        )
+
+
+# Equivalent to
+# from openai.types.chat.chat_completion_tool_message_param import ChatCompletionToolMessageParam
+
 
 class LanguageModelToolMessage(LanguageModelMessage):
     role: LanguageModelMessageRole = LanguageModelMessageRole.TOOL
@@ -147,6 +227,11 @@ class LanguageModelToolMessage(LanguageModelMessage):
         return LanguageModelMessageRole.TOOL
 
 
+# Equivalent implementation for list of
+# from openai.types.chat.chat_completion_tool_message_param import ChatCompletionToolMessageParam
+# with the addition of the builder
+
+
 class LanguageModelMessages(RootModel):
     root: list[
         LanguageModelMessage
@@ -174,6 +259,11 @@ class LanguageModelMessages(RootModel):
         return builder
 
 
+# This seems similar to
+# from openai.types.completion_choice import CompletionChoice
+# but is missing multiple attributes and uses message instead of text
+
+
 class LanguageModelCompletionChoice(BaseModel):
     model_config = model_config
 
@@ -182,38 +272,26 @@ class LanguageModelCompletionChoice(BaseModel):
     finish_reason: str
 
 
+# This seems similar to
+# from openai.types.completion import Completion
+# but is missing multiple attributes
 class LanguageModelResponse(BaseModel):
     model_config = model_config
 
     choices: list[LanguageModelCompletionChoice]
 
+    @classmethod
+    def from_stream_response(cls, response: LanguageModelStreamResponse):
+        choice = LanguageModelCompletionChoice(
+            index=0,
+            message=LanguageModelAssistantMessage.from_stream_response(response),
+            finish_reason="",
+        )
 
-class LanguageModelStreamResponseMessage(BaseModel):
-    model_config = model_config
-
-    id: str
-    previous_message_id: (
-        str | None
-    )  # Stream response can return a null previous_message_id if an assisstant message is manually added
-    role: LanguageModelMessageRole
-    text: str
-    original_text: str | None = None
-    references: list[dict[str, list | dict | str | int | float | bool]] = []  # type: ignore
-
-    # TODO make sdk return role in lowercase
-    # Currently needed as sdk returns role in uppercase
-    @field_validator("role", mode="before")
-    def set_role(cls, value: str):
-        return value.lower()
-
-
-class LanguageModelStreamResponse(BaseModel):
-    model_config = model_config
-
-    message: LanguageModelStreamResponseMessage
-    tool_calls: Optional[list[LanguageModelFunction]] = None
+        return cls(choices=[choice])
 
 
+# This is tailored for unique and only used in language model info
 class LanguageModelTokenLimits(BaseModel):
     token_limit_input: int
     token_limit_output: int
@@ -255,29 +333,35 @@ class LanguageModelTokenLimits(BaseModel):
 
                 data["token_limit_input"] = math.floor(fraction_input * token_limit)
                 data["token_limit_output"] = math.floor(
-                    (1 - fraction_input) * token_limit
+                    (1 - fraction_input) * token_limit,
                 )
                 data["_fraction_adaptpable"] = True
             return data
 
         raise ValueError(
-            'Either "token_limit_input" and "token_limit_output" must be provided together, or "token_limit" must be provided.'
+            'Either "token_limit_input" and "token_limit_output" must be provided together, or "token_limit" must be provided.',
         )
 
 
+# This is more restrictive than what openai allows
 class LanguageModelToolParameterProperty(BaseModel):
     type: str
     description: str
-    enum: Optional[list[Any]] = None
-    items: Optional[Self] = None
+    enum: list[Any] | None = None
+    items: Self | None = None
 
 
+# Looks most like
+# from openai.types.shared.function_parameters import FunctionParameters
 class LanguageModelToolParameters(BaseModel):
     type: str = "object"
     properties: dict[str, LanguageModelToolParameterProperty]
     required: list[str]
 
 
+# Looks most like
+# from openai.types.shared_params.function_definition import FunctionDefinition
+# but returns parameter is not known
 class LanguageModelTool(BaseModel):
     name: str = Field(
         ...,

unique_toolkit/protocols/support.py

@@ -0,0 +1,28 @@
+from typing import Protocol
+
+from unique_toolkit.language_model import (
+    LanguageModelMessages,
+    LanguageModelName,
+    LanguageModelResponse,
+    LanguageModelTool,
+)
+from unique_toolkit.language_model.constants import (
+    DEFAULT_COMPLETE_TEMPERATURE,
+    DEFAULT_COMPLETE_TIMEOUT,
+)
+
+# As soon as we have multiple, remember
+# https://pypi.org/project/typing-protocol-intersection/
+# to generate combinations of protocols without inheritance
+
+
+class SupportsComplete(Protocol):
+    def complete(
+        self,
+        messages: LanguageModelMessages,
+        model_name: LanguageModelName | str,
+        temperature: float = DEFAULT_COMPLETE_TEMPERATURE,
+        timeout: int = DEFAULT_COMPLETE_TIMEOUT,
+        tools: list[LanguageModelTool] | None = None,
+        **kwargs,
+    ) -> LanguageModelResponse: ...

{unique_toolkit-0.7.14.dist-info → unique_toolkit-0.7.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 0.7.14
+Version: 0.7.19
 Summary: 
 License: Proprietary
 Author: Martin Fadler
@@ -17,7 +17,7 @@ Requires-Dist: python-dotenv (>=1.0.1,<2.0.0)
 Requires-Dist: regex (>=2024.5.15,<2025.0.0)
 Requires-Dist: tiktoken (>=0.7.0,<0.8.0)
 Requires-Dist: typing-extensions (>=4.9.0,<5.0.0)
-Requires-Dist: unique-sdk (>=0.9.17,<0.10.0)
+Requires-Dist: unique-sdk (>=0.9.27,<0.10.0)
 Description-Content-Type: text/markdown
 
 # Unique Toolkit
@@ -111,6 +111,23 @@ 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).
 
+## [0.7.19] - 2025-05-20
+- Extend the `MessageBuilder` to allow for appending any `LanguageModelMessage`
+
+## [0.7.18] - 2025-05-20
+- Add the possibility to specify metadata when creating or updating a Content.
+
+## [0.7.17] - 2025-05-16
+- Change inheritance hierarchy of events for easier deprecation
+
+## [0.7.16] - 2025-05-16
+- Add classmethods to create LanguageModelAssistatnMessage from functions and stream response
+- Add completion like method to chat
+- Add protocol for completion like method
+
+## [0.7.15] - 2025-05-13
+- Add the possibility to specify ingestionConfig when creating or updating a Content.
+
 ## [0.7.14] - 2025-05-08
 - Fix bug not selecting the correct llm
 - Add LMI type for flexible init of LanguageModelInfo

{unique_toolkit-0.7.14.dist-info → unique_toolkit-0.7.19.dist-info}/RECORD

@@ -9,20 +9,20 @@ unique_toolkit/app/init_logging.py,sha256=Sh26SRxOj8i8dzobKhYha2lLrkrMTHfB1V4jR3
 unique_toolkit/app/init_sdk.py,sha256=Nv4Now4pMfM0AgRhbtatLpm_39rKxn0WmRLwmPhRl-8,1285
 unique_toolkit/app/performance/async_tasks.py,sha256=H0l3OAcosLwNHZ8d2pd-Di4wHIXfclEvagi5kfqLFPA,1941
 unique_toolkit/app/performance/async_wrapper.py,sha256=yVVcRDkcdyfjsxro-N29SBvi-7773wnfDplef6-y8xw,1077
-unique_toolkit/app/schemas.py,sha256=WsdiK39za5h7ir__DBv_FYV-i2_FMucNCWdFgXWN7NE,3373
+unique_toolkit/app/schemas.py,sha256=fNPRQPrpJjYrtkkXPR7sNFjP0AYPZtKe3H1YZkXd2QQ,3275
 unique_toolkit/app/verification.py,sha256=GxFFwcJMy25fCA_Xe89wKW7bgqOu8PAs5y8QpHF0GSc,3861
 unique_toolkit/chat/__init__.py,sha256=LRs2G-JTVuci4lbtHTkVUiNcZcSR6uqqfnAyo7af6nY,619
 unique_toolkit/chat/constants.py,sha256=05kq6zjqUVB2d6_P7s-90nbljpB3ryxwCI-CAz0r2O4,83
 unique_toolkit/chat/functions.py,sha256=J9Cmgkhj9bBxZja3ggkSp48af_LPU4Dfi9Sbc_WhhNY,27204
 unique_toolkit/chat/schemas.py,sha256=MNcGAXjK1K8zOODeMFz3FHVQL5sIBQXRwkr_2hFkG8k,2672
-unique_toolkit/chat/service.py,sha256=nDXc9PMnepkFDViCAvno-HSQDBaeuG2p8FaHF0TG_9w,34302
+unique_toolkit/chat/service.py,sha256=C8L5Alc9BKmXau5kcbQWKBjg1OGc5fmtO0F9xooxSCw,40641
 unique_toolkit/chat/state.py,sha256=Cjgwv_2vhDFbV69xxsn7SefhaoIAEqLx3ferdVFCnOg,1445
 unique_toolkit/chat/utils.py,sha256=ihm-wQykBWhB4liR3LnwPVPt_qGW6ETq21Mw4HY0THE,854
 unique_toolkit/content/__init__.py,sha256=EdJg_A_7loEtCQf4cah3QARQreJx6pdz89Rm96YbMVg,940
 unique_toolkit/content/constants.py,sha256=1iy4Y67xobl5VTnJB6SxSyuoBWbdLl9244xfVMUZi5o,60
-unique_toolkit/content/functions.py,sha256=yB87wrbtmHzr3jGJUHetmuhy-7RVtnqG2IQ6gqFAun8,17093
-unique_toolkit/content/schemas.py,sha256=zks_Pkki2VhxICJJgHZyc-LPmRuj5dLbw3pgcUT7SW8,2362
-unique_toolkit/content/service.py,sha256=A9M8C9fI73nfzsAqVAfJuMHGyneYZxATJxT3uTMgDs0,18578
+unique_toolkit/content/functions.py,sha256=Chf2QcnnWvKvXMF4IUmU-_aUN6nTZIfsbM7ds77olcY,18344
+unique_toolkit/content/schemas.py,sha256=28Cj0R9JzJ4s0qR2Sfunr7luwYjMF2I8TepVxt5ZE2o,2446
+unique_toolkit/content/service.py,sha256=27awBOsYHdfSxwHM1UzCQLnHuo-M49ej3jpFwBLRflM,19438
 unique_toolkit/content/utils.py,sha256=GUVPrkZfMoAj4MRoBs5BD_7vSuLZTZx69hyWzYFrI50,7747
 unique_toolkit/embedding/__init__.py,sha256=uUyzjonPvuDCYsvXCIt7ErQXopLggpzX-MEQd3_e2kE,250
 unique_toolkit/embedding/constants.py,sha256=Lj8-Lcy1FvuC31PM9Exq7vaFuxQV4pEI1huUMFX-J2M,52
@@ -45,20 +45,21 @@ unique_toolkit/evaluators/hallucination/utils.py,sha256=gO2AOzDQwVTev2_5vDKgJ9A6
 unique_toolkit/evaluators/output_parser.py,sha256=eI72qkzK1dZyUvnfP2SOAQCGBj_-PwX5wy_aLPMsJMY,883
 unique_toolkit/evaluators/schemas.py,sha256=Jaue6Uhx75X1CyHKWj8sT3RE1JZXTqoLtfLt2xQNCX8,2507
 unique_toolkit/language_model/__init__.py,sha256=jWko_vQj48wjnpTtlkg8iNdef0SMI3FN2kGywXRTMzg,1880
-unique_toolkit/language_model/builder.py,sha256=aIAXWWUoB5G-HONJiAt3MdRGd4jdP8nA-HYX2D2WlSI,3048
+unique_toolkit/language_model/builder.py,sha256=69WCcmkm2rMP2-YEH_EjHiEp6OzwjwCs8VbhjVJaCe0,3168
 unique_toolkit/language_model/constants.py,sha256=B-topqW0r83dkC_25DeQfnPk3n53qzIHUCBS7YJ0-1U,119
 unique_toolkit/language_model/functions.py,sha256=0oSkG4xpbxeaVTJide6g-zunBrsBRuvp7UQlKVbjpSk,7949
 unique_toolkit/language_model/infos.py,sha256=qPf4Xlanet8jf0apZ6-qxS_6zmDd6p9D40it2TqmF3w,25910
 unique_toolkit/language_model/prompt.py,sha256=JSawaLjQg3VR-E2fK8engFyJnNdk21zaO8pPIodzN4Q,3991
-unique_toolkit/language_model/schemas.py,sha256=rrwzUgKANFOrdehCULW8Hh03uRW3tsE5dXpWqxmClfg,8618
+unique_toolkit/language_model/schemas.py,sha256=Wc_OeML0AYPTfIC1BObwumsunq23h12qVzi4hVlaZPE,11389
 unique_toolkit/language_model/service.py,sha256=FUf-HTKNslrMAh8qFMco_ZpP-N0t_iAFWK3juldoUe8,8343
 unique_toolkit/language_model/utils.py,sha256=bPQ4l6_YO71w-zaIPanUUmtbXC1_hCvLK0tAFc3VCRc,1902
+unique_toolkit/protocols/support.py,sha256=iSSoERUZGLbmY2DGBqGeFTCRtH3ClhzAUutqNxwYgKs,823
 unique_toolkit/short_term_memory/__init__.py,sha256=2mI3AUrffgH7Yt-xS57EGqnHf7jnn6xquoKEhJqk3Wg,185
 unique_toolkit/short_term_memory/constants.py,sha256=698CL6-wjup2MvU19RxSmQk3gX7aqW_OOpZB7sbz_Xg,34
 unique_toolkit/short_term_memory/functions.py,sha256=3WiK-xatY5nh4Dr5zlDUye1k3E6kr41RiscwtTplw5k,4484
 unique_toolkit/short_term_memory/schemas.py,sha256=OhfcXyF6ACdwIXW45sKzjtZX_gkcJs8FEZXcgQTNenw,1406
 unique_toolkit/short_term_memory/service.py,sha256=vEKFxP1SScPrFniso492fVthWR1sosdFibhiNF3zRvI,8081
-unique_toolkit-0.7.14.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
-unique_toolkit-0.7.14.dist-info/METADATA,sha256=PE6_LSa3whHD6727vPI4Wu2JEuHpPchisWC1RcuFNMA,22172
-unique_toolkit-0.7.14.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_toolkit-0.7.14.dist-info/RECORD,,
+unique_toolkit-0.7.19.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_toolkit-0.7.19.dist-info/METADATA,sha256=7P27qJw5oRh6q1WUTcF-Qvik67x3u1H7dSJZVZhWInI,22784
+unique_toolkit-0.7.19.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_toolkit-0.7.19.dist-info/RECORD,,