unique_toolkit 0.8.7__py3-none-any.whl → 0.8.8__py3-none-any.whl

unique_toolkit/chat/schemas.py

@@ -2,6 +2,16 @@ from datetime import datetime
 from enum import StrEnum
 
 from humps import camelize
+from openai.types.chat import (
+    ChatCompletionAssistantMessageParam,
+    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,
+)
 from pydantic import (
     BaseModel,
     ConfigDict,
@@ -14,14 +24,15 @@ from unique_toolkit.content.schemas import ContentReference
 
 # set config to convert camelCase to snake_case
 model_config = ConfigDict(
-    alias_generator=camelize, populate_by_name=True, arbitrary_types_allowed=True
+    alias_generator=camelize,
+    populate_by_name=True,
 )
 
 
 class ChatMessageRole(StrEnum):
     USER = "user"
     ASSISTANT = "assistant"
-    TOOL = "tool"
+    TOOL = "tool"  # TODO: Unused according @unique-fabian. To be removed in separate PR
 
 
 class Function(BaseModel):
@@ -30,6 +41,12 @@ class Function(BaseModel):
     name: str
     arguments: str
 
+    def to_openai(self) -> OpenAIFunction:
+        return OpenAIFunction(
+            arguments=self.arguments,
+            name=self.name,
+        )
+
 
 class ToolCall(BaseModel):
     model_config = model_config
@@ -38,8 +55,16 @@ class ToolCall(BaseModel):
     type: str
     function: Function
 
+    def to_openai_param(self) -> ChatCompletionMessageFunctionToolCallParam:
+        return ChatCompletionMessageFunctionToolCallParam(
+            id=self.id,
+            function=self.function.to_openai(),
+            type="function",
+        )
+
 
 class ChatMessage(BaseModel):
+    # TODO: The below seems not to be True anymore @irina-unique. To be checked in separate PR
     # This model should strictly meets https://github.com/Unique-AG/monorepo/blob/master/node/apps/node-chat/src/public-api/2023-12-06/dtos/message/public-message.dto.ts
     model_config = model_config
 
@@ -71,6 +96,27 @@ class ChatMessage(BaseModel):
             raise ValueError("tool_call_ids is required when role is 'tool'")
         return self
 
+    def to_openai_param(self):
+        match self.role:
+            case ChatMessageRole.USER:
+                return ChatCompletionUserMessageParam(
+                    role="user",
+                    content=self.content or "",
+                )
+
+            case ChatMessageRole.ASSISTANT:
+                return 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 or []],
+                )
+
+            case ChatMessageRole.TOOL:
+                raise NotImplementedError
+
 
 class ChatMessageAssessmentStatus(StrEnum):
     PENDING = "PENDING"

unique_toolkit/chat/service.py

@@ -329,9 +329,9 @@ class ChatService:
 
         Args:
             content (str): The new content for the message.
-            references (list[ContentReference]): list of ContentReference objects. Defaults to [].
-            debug_info (dict[str, Any]]]): Debug information. Defaults to {}.
-            message_id (str, optional): The message ID. Defaults to None, then the ChatState user message id is used.
+            references (list[ContentReference]): list of ContentReference objects.
+            debug_info (dict[str, Any]]]): Debug information.
+            message_id (str, optional): The message ID, if not specified the last user message is edited.
             set_completed_at (Optional[bool]): Whether to set the completedAt field with the current date time. Defaults to False.
 
         Returns:

unique_toolkit/language_model/schemas.py

@@ -5,6 +5,11 @@ from typing import Any, Self
 from uuid import uuid4
 
 from humps import camelize
+from openai.types.chat import ChatCompletionAssistantMessageParam
+from openai.types.chat.chat_completion_message_function_tool_call_param import (
+    ChatCompletionMessageFunctionToolCallParam,
+    Function,
+)
 from openai.types.chat.chat_completion_tool_param import ChatCompletionToolParam
 from openai.types.shared_params.function_definition import FunctionDefinition
 from pydantic import (
@@ -88,9 +93,7 @@ class LanguageModelFunction(BaseModel):
         return seralization
 
     def __eq__(self, other: Self) -> bool:
-        """
-        Compare two tool calls based on name and arguments.
-        """
+        """Compare two tool calls based on name and arguments."""
         if not isinstance(other, LanguageModelFunction):
             return False
 
@@ -105,6 +108,19 @@ class LanguageModelFunction(BaseModel):
 
         return True
 
+    def to_openai_param(self) -> ChatCompletionMessageFunctionToolCallParam:
+        arguments = ""
+        if isinstance(self.arguments, dict):
+            arguments = json.dumps(self.arguments)
+        elif isinstance(self.arguments, str):
+            arguments = self.arguments
+
+        return ChatCompletionMessageFunctionToolCallParam(
+            type="function",
+            id=self.id or "unknown_id",
+            function=Function(name=self.name, arguments=arguments),
+        )
+
 
 # This is tailored to the unique backend
 class LanguageModelStreamResponse(BaseModel):
@@ -113,6 +129,16 @@ class LanguageModelStreamResponse(BaseModel):
     message: LanguageModelStreamResponseMessage
     tool_calls: list[LanguageModelFunction] | None = None
 
+    def to_openai_param(self) -> ChatCompletionAssistantMessageParam:
+        return ChatCompletionAssistantMessageParam(
+            role="assistant",
+            audio=None,
+            content=self.message.text,
+            function_call=None,
+            refusal=None,
+            tool_calls=[t.to_openai_param() for t in self.tool_calls or []],
+        )
+
 
 class LanguageModelFunctionCall(BaseModel):
     model_config = model_config
@@ -126,7 +152,7 @@ class LanguageModelFunctionCall(BaseModel):
     @staticmethod
     def create_assistant_message_from_tool_calls(
         tool_calls: list[LanguageModelFunction],
-    ):
+    ) -> "LanguageModelAssistantMessage":
         assistant_message = LanguageModelAssistantMessage(
             content="",
             tool_calls=[

{unique_toolkit-0.8.7.dist-info → unique_toolkit-0.8.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 0.8.7
+Version: 0.8.8
 Summary: 
 License: Proprietary
 Author: Martin Fadler
@@ -114,6 +114,9 @@ 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.8.8] - 2025-08-11
+- Make chat service openai stream response openai compatible 
+- Make `ChatMessage` openai compatible
 
 ## [0.8.7] - 2025-08-11
 - Make chat service openai compatible

{unique_toolkit-0.8.7.dist-info → unique_toolkit-0.8.8.dist-info}/RECORD

@@ -16,8 +16,8 @@ unique_toolkit/app/verification.py,sha256=GxFFwcJMy25fCA_Xe89wKW7bgqOu8PAs5y8QpH
 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=I6r81PpWNu-j9DvHxNFKN3V6T5E5q42FhW9kF8pJJSY,29950
-unique_toolkit/chat/schemas.py,sha256=abPPeDtUIeEyKDnLhIqgIyqTsFANxh3j44EYrITBlHw,2786
-unique_toolkit/chat/service.py,sha256=dB36KCfeowQ9EgiRscK2UK7WOnGhklVNawC_t8MTaZA,37803
+unique_toolkit/chat/schemas.py,sha256=0tWzu5_F_-PRK5A6MUsdpNqCfNAIMEAuQ26wIgP2pYs,4415
+unique_toolkit/chat/service.py,sha256=LNZm9JS17M-MWcVRR3o2HpQFgDkIkxnGMUCoYmz9vzA,37759
 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
@@ -58,7 +58,7 @@ unique_toolkit/language_model/functions.py,sha256=qi4KGa4hLUXy0KwkkGmtGBM1IuYfJq
 unique_toolkit/language_model/infos.py,sha256=mnUnbjDQNOIuPS2VE1SsgyKOxdRulo-9Z5k7_S1Q8Cw,37631
 unique_toolkit/language_model/prompt.py,sha256=JSawaLjQg3VR-E2fK8engFyJnNdk21zaO8pPIodzN4Q,3991
 unique_toolkit/language_model/reference.py,sha256=nkX2VFz-IrUz8yqyc3G5jUMNwrNpxITBrMEKkbqqYoI,8583
-unique_toolkit/language_model/schemas.py,sha256=q7jZNijgy6xu3tHrr2Eqs1jglI_YkqH1RrBt5bCXn-8,15181
+unique_toolkit/language_model/schemas.py,sha256=p95cAwrYmEBupI8f7JZY17aJTKEHvtqF88hMIzS5r_k,16259
 unique_toolkit/language_model/service.py,sha256=zlvC_t9T1wixwcGDPRxl6yYniaKl2725NxWrbW51jUs,11290
 unique_toolkit/language_model/utils.py,sha256=bPQ4l6_YO71w-zaIPanUUmtbXC1_hCvLK0tAFc3VCRc,1902
 unique_toolkit/protocols/support.py,sha256=V15WEIFKVMyF1QCnR8vIi4GrJy4dfTCB6d6JlqPZ58o,2341
@@ -82,7 +82,7 @@ unique_toolkit/tools/utils/execution/execution.py,sha256=vjG2Y6awsGNtlvyQAGCTthQ
 unique_toolkit/tools/utils/source_handling/schema.py,sha256=pvNhtL2daDLpCVIQpfdn6R35GvKmITVLXjZNLAwpgUE,871
 unique_toolkit/tools/utils/source_handling/source_formatting.py,sha256=C7uayNbdkNVJdEARA5CENnHtNY1SU6etlaqbgHNyxaQ,9152
 unique_toolkit/tools/utils/source_handling/tests/test_source_formatting.py,sha256=zu3AJnYH9CMqZPrxKEH3IgI-fM3nlvIBuspJG6W6B18,6978
-unique_toolkit-0.8.7.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
-unique_toolkit-0.8.7.dist-info/METADATA,sha256=ybNaWfFpNt6HHOd3aMPvcvUAwust7t6VV23dfZlOk4Q,26524
-unique_toolkit-0.8.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_toolkit-0.8.7.dist-info/RECORD,,
+unique_toolkit-0.8.8.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_toolkit-0.8.8.dist-info/METADATA,sha256=AUly1ya9VxSfPCq8ivY1kAq4MrClSRQ-fm8_9BZr0oI,26649
+unique_toolkit-0.8.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_toolkit-0.8.8.dist-info/RECORD,,