unique_toolkit 0.5.36__py3-none-any.whl → 0.5.38__py3-none-any.whl

unique_toolkit/chat/service.py

@@ -140,7 +140,8 @@ class ChatService(BaseService):
 
     def modify_assistant_message(
         self,
-        content: str,
+        content: str | None = None,
+        original_content: str | None = None,
         references: list[ContentReference] = [],
         debug_info: dict = {},
         message_id: Optional[str] = None,
@@ -150,7 +151,8 @@ class ChatService(BaseService):
         Modifies a message in the chat session synchronously.
 
         Args:
-            content (str): The new content for the message.
+            content (str, optional): The new content for the message.
+            original_content (str, optional): The original content for the message.
             references (list[ContentReference]): list of ContentReference objects. Defaults to [].
             debug_info (dict[str, Any]]]): Debug information. Defaults to {}.
             message_id (Optional[str]): The message ID. Defaults to None.
@@ -166,6 +168,7 @@ class ChatService(BaseService):
             params = self._construct_message_modify_params(
                 assistant=True,
                 content=content,
+                original_content=original_content,
                 references=references,
                 debug_info=debug_info,
                 message_id=message_id,
@@ -179,7 +182,8 @@ class ChatService(BaseService):
 
     async def modify_assistant_message_async(
         self,
-        content: str,
+        content: str | None = None,
+        original_content: str | None = None,
         references: list[ContentReference] = [],
         debug_info: dict = {},
         message_id: Optional[str] = None,
@@ -189,7 +193,8 @@ class ChatService(BaseService):
         Modifies a message in the chat session asynchronously.
 
         Args:
-            content (str): The new content for the message.
+            content (str, optional): The new content for the message.
+            original_content (str, optional): The original content for the message.
             message_id (str, optional): The message ID. Defaults to None, then the ChatState assistant message id is used.
             references (list[ContentReference]): list of ContentReference objects. Defaults to None.
             debug_info (Optional[dict[str, Any]]], optional): Debug information. Defaults to None.
@@ -205,6 +210,7 @@ class ChatService(BaseService):
             params = self._construct_message_modify_params(
                 assistant=True,
                 content=content,
+                original_content=original_content,
                 references=references,
                 debug_info=debug_info,
                 message_id=message_id,
@@ -301,6 +307,7 @@ class ChatService(BaseService):
     def create_assistant_message(
         self,
         content: str,
+        original_content: str | None = None,
         references: list[ContentReference] = [],
         debug_info: dict = {},
         set_completed_at: Optional[bool] = False,
@@ -310,6 +317,7 @@ class ChatService(BaseService):
 
         Args:
             content (str): The content for the message.
+            original_content (str, optional): The original content for the message.
             references (list[ContentReference]): list of ContentReference objects. Defaults to None.
             debug_info (dict[str, Any]]): Debug information. Defaults to None.
             set_completed_at (Optional[bool]): Whether to set the completedAt field with the current date time. Defaults to False.
@@ -320,10 +328,13 @@ class ChatService(BaseService):
         Raises:
             Exception: If the creation fails.
         """
+        if original_content is None:
+            original_content = content
 
         try:
             params = self._construct_message_create_params(
                 content=content,
+                original_content=original_content,
                 references=references,
                 debug_info=debug_info,
                 set_completed_at=set_completed_at,
@@ -338,6 +349,7 @@ class ChatService(BaseService):
     async def create_assistant_message_async(
         self,
         content: str,
+        original_content: str | None = None,
         references: list[ContentReference] = [],
         debug_info: dict = {},
         set_completed_at: Optional[bool] = False,
@@ -347,6 +359,7 @@ class ChatService(BaseService):
 
         Args:
             content (str): The content for the message.
+            original_content (str, optional): The original content for the message.
             references (list[ContentReference]): list of references. Defaults to None.
             debug_info (dict[str, Any]]): Debug information. Defaults to None.
             set_completed_at (Optional[bool]): Whether to set the completedAt field with the current date time. Defaults to False.
@@ -357,9 +370,13 @@ class ChatService(BaseService):
         Raises:
             Exception: If the creation fails.
         """
+        if original_content is None:
+            original_content = content
+
         try:
             params = self._construct_message_create_params(
                 content=content,
+                original_content=original_content,
                 references=references,
                 debug_info=debug_info,
                 set_completed_at=set_completed_at,
@@ -497,6 +514,7 @@ class ChatService(BaseService):
         self,
         assistant: bool = True,
         content: Optional[str] = None,
+        original_content: Optional[str] = None,
         references: Optional[list[ContentReference]] = None,
         debug_info: Optional[dict] = None,
         message_id: Optional[str] = None,
@@ -525,7 +543,7 @@ class ChatService(BaseService):
             "id": message_id,
             "chatId": self.event.payload.chat_id,
             "text": content,
-            "originalText": content,
+            "originalText": original_content,
             "references": self._map_references(references) if references else [],
             "debugInfo": debug_info,
             "completedAt": completed_at_datetime,
@@ -536,6 +554,7 @@ class ChatService(BaseService):
         self,
         role: ChatMessageRole = ChatMessageRole.ASSISTANT,
         content: Optional[str] = None,
+        original_content: Optional[str] = None,
         references: Optional[list[ContentReference]] = None,
         debug_info: Optional[dict] = None,
         assistantId: Optional[str] = None,
@@ -552,6 +571,9 @@ class ChatService(BaseService):
         else:
             completed_at_datetime = None
 
+        if original_content is None:
+            original_content = content
+
         params = {
             "user_id": self.event.user_id,
             "company_id": self.event.company_id,
@@ -559,7 +581,7 @@ class ChatService(BaseService):
             "role": role.value.upper(),
             "chatId": self.event.payload.chat_id,
             "text": content,
-            "originalText": content,
+            "originalText": original_content,
             "references": self._map_references(references) if references else [],
             "debugInfo": debug_info,
             "completedAt": completed_at_datetime,

unique_toolkit/language_model/schemas.py

@@ -14,6 +14,8 @@ from pydantic import (
     model_validator,
 )
 
+from unique_toolkit.language_model.utils import format_message
+
 # set config to convert camelCase to snake_case
 model_config = ConfigDict(
     alias_generator=camelize,
@@ -88,6 +90,9 @@ class LanguageModelMessage(BaseModel):
     content: Optional[str | list[dict]] = None
     tool_calls: Optional[list[LanguageModelFunctionCall]] = None
 
+    def __str__(self):
+        return format_message(self.role.capitalize(), message=self.content, num_tabs=1)
+
 
 class LanguageModelSystemMessage(LanguageModelMessage):
     role: LanguageModelMessageRole = LanguageModelMessageRole.SYSTEM
@@ -118,6 +123,13 @@ class LanguageModelToolMessage(LanguageModelMessage):
     name: str
     tool_call_id: str
 
+    def __str__(self):
+        return format_message(
+            user=self.role.capitalize(),
+            message=f"{self.name}, {self.tool_call_id}, {self.content}",
+            num_tabs=1,
+        )
+
     @field_validator("role", mode="before")
     def set_role(cls, value):
         return LanguageModelMessageRole.TOOL
@@ -132,6 +144,9 @@ class LanguageModelMessages(RootModel):
         | LanguageModelUserMessage
     ]
 
+    def __str__(self):
+        return "\n\n".join([str(message) for message in self.root])
+
     def __iter__(self):
         return iter(self.root)
 

unique_toolkit/language_model/utils.py

@@ -42,3 +42,27 @@ def find_last_json_object(text: str) -> str | None:
         return matches[-1]
     else:
         return None
+
+
+def format_message(user: str, message: str, num_tabs: int = 1) -> str:
+    """
+    Formats a message from a user by indenting each line with a specified number of tabs.
+
+    Args:
+        user (str): The name of the user sending the message.
+        message (str): The message content that may include multiple lines.
+        num_tabs (int): The number of tabs to use for indenting each line. Default is 1 tab.
+
+    Returns:
+        str: A formatted string with user and indented message lines.
+
+    Example:
+        >>> format_message("Alice", "Hello\nWorld", 2)
+        Alice:
+        \t\tHello
+        \t\tWorld
+    """
+    indentation = "\t" * num_tabs
+    indented_message = message.replace("\n", "\n" + indentation)
+    formatted_message = f"{user}:\n{indentation}{indented_message}"
+    return formatted_message

{unique_toolkit-0.5.36.dist-info → unique_toolkit-0.5.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 0.5.36
+Version: 0.5.38
 Summary: 
 License: Proprietary
 Author: Martin Fadler
@@ -100,6 +100,14 @@ 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.5.38] - 2024-11-26
+- Added string representation to `LanguageModelMessage` and `LanguageModelMessages` class
+
+## [0.5.37] - 2024-11-26
+- `content` parameter in `ChatService.modify_assistant_message` and `ChatService.modify_assistant_message_async` is now optional
+- Added optional parameter `original_content` to `ChatService.modify_assistant_message` and `ChatService.modify_assistant_message_async`
+- Added optional parameter `original_content` to `ChatService.create_assistant_message` and `ChatService.create_assistant_message_async`
+
 ## [0.5.36] - 2024-11-19
 - Add possibility to return the response from the download file from chat request
 - Add possibility to not specify a filename and use filename from response headers

{unique_toolkit-0.5.36.dist-info → unique_toolkit-0.5.38.dist-info}/RECORD

@@ -12,7 +12,7 @@ unique_toolkit/app/schemas.py,sha256=6RY7Ex-B3pOnFILlitHEi9sqJvupbpdxlN9xt33qRsM
 unique_toolkit/app/verification.py,sha256=UZqTHg3PX_QxMjeLH_BVBYoMVqMnMpeMoqvyTBKDqj8,1996
 unique_toolkit/chat/__init__.py,sha256=1prdTVfLOf6NgU-Aa1VIO-XiR6OYuRm51LaVRfKDCqc,267
 unique_toolkit/chat/schemas.py,sha256=IHOnb3pWlRlSPoEUWBTl6LK8YeMdlg2iXi9ghyBeiLw,1495
-unique_toolkit/chat/service.py,sha256=aS_cm42WBcrQnqVc3DR27RerRu2dGQGPlbXM-SYcKOc,20326
+unique_toolkit/chat/service.py,sha256=lFcwCKHRHVLkMIO1cBHwH_Py0uZ4mmvgkUwQuZkpsxI,21438
 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=MSH2sxjQyKD2Sef92fzE5Dt9SihdzivB6yliSwJfTmQ,890
@@ -37,10 +37,10 @@ unique_toolkit/evaluators/output_parser.py,sha256=eI72qkzK1dZyUvnfP2SOAQCGBj_-Pw
 unique_toolkit/evaluators/schemas.py,sha256=Jaue6Uhx75X1CyHKWj8sT3RE1JZXTqoLtfLt2xQNCX8,2507
 unique_toolkit/language_model/__init__.py,sha256=YuhyczGPj6w9xX-sOVUhmozvzIFxcckHFEkeMBecr5s,1784
 unique_toolkit/language_model/infos.py,sha256=kQK6F3r8xTN7oT6b39J7rxW-Y4iPXjx_Fr9bCOVQdm0,12509
-unique_toolkit/language_model/schemas.py,sha256=0pMLM1cCplw1OlM-eLqldZtYMObGr7tjHKXSHQP7hwE,6216
+unique_toolkit/language_model/schemas.py,sha256=wg_ly66UvLOVNdrq8xr-0uN0HPY41UIk5mVPxdG-VGs,6687
 unique_toolkit/language_model/service.py,sha256=s5X6EStyYumiYqlD9gkW4GANif18d9QZOMysmUSfv8M,13433
-unique_toolkit/language_model/utils.py,sha256=WBPj1XKkDgxy_-T8HCZvsfkkSzj_1w4UZzNmyvdbBLY,1081
-unique_toolkit-0.5.36.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
-unique_toolkit-0.5.36.dist-info/METADATA,sha256=4YTkAbPH4uPA3IxsLyxr4-eI3wvn8LLJTAxhO-UDNTw,13635
-unique_toolkit-0.5.36.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_toolkit-0.5.36.dist-info/RECORD,,
+unique_toolkit/language_model/utils.py,sha256=bPQ4l6_YO71w-zaIPanUUmtbXC1_hCvLK0tAFc3VCRc,1902
+unique_toolkit-0.5.38.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_toolkit-0.5.38.dist-info/METADATA,sha256=gjQLXWLmCmcvUCIEAF6k2_LKj8muzzR6r2m9BvOQxqQ,14180
+unique_toolkit-0.5.38.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_toolkit-0.5.38.dist-info/RECORD,,