unique_toolkit 0.5.46__py3-none-any.whl → 0.5.48__py3-none-any.whl

unique_toolkit/language_model/builder.py

@@ -0,0 +1,50 @@
+from unique_toolkit.language_model import (
+    LanguageModelAssistantMessage,
+    LanguageModelMessage,
+    LanguageModelMessages,
+    LanguageModelSystemMessage,
+    LanguageModelToolMessage,
+    LanguageModelUserMessage,
+)
+
+
+class MessagesBuilder:
+    def __init__(self):
+        self.messages: list[LanguageModelMessage] = []
+
+    def system_message_append(self, content):
+        """Appends a user message to the messages list."""
+        message = LanguageModelSystemMessage(content=content)
+        self.messages.append(message)
+        return self  # Return self to allow method chaining
+
+    def user_message_append(self, content):
+        """Appends a user message to the messages list."""
+        message = LanguageModelUserMessage(content=content)
+        self.messages.append(message)
+        return self  # Return self to allow method chaining
+
+    def assistant_message_append(self, content):
+        """Appends an assistant message to the messages list."""
+        message = LanguageModelAssistantMessage(content=content)
+        self.messages.append(message)
+        return self  # Return self to allow method chaining
+
+    def tool_message_append(self, name: str, tool_call_id: str, content: str):
+        """Appends a tool message to the messages list."""
+        message = LanguageModelToolMessage(
+            name=name, tool_call_id=tool_call_id, content=content
+        )
+        self.messages.append(message)
+        return self  # Return self to allow method chaining
+
+    def build(self, reset: bool = True) -> LanguageModelMessages:
+        """Returns the list of messages and resets the builder"""
+        messages = LanguageModelMessages(root=self.messages)
+        if reset:
+            self.messages = []
+        return messages
+
+    def model_dump(self, **kwargs):
+        """Dumps the LanguageModelMessages model"""
+        return self.build().model_dump(**kwargs)

unique_toolkit/language_model/schemas.py

@@ -89,7 +89,6 @@ class LanguageModelMessage(BaseModel):
     model_config = model_config
     role: LanguageModelMessageRole
     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)
@@ -113,6 +112,7 @@ class LanguageModelUserMessage(LanguageModelMessage):
 
 class LanguageModelAssistantMessage(LanguageModelMessage):
     role: LanguageModelMessageRole = LanguageModelMessageRole.ASSISTANT
+    tool_calls: Optional[list[LanguageModelFunctionCall]] = None
 
     @field_validator("role", mode="before")
     def set_role(cls, value):
@@ -159,7 +159,7 @@ class LanguageModelCompletionChoice(BaseModel):
     model_config = model_config
 
     index: int
-    message: LanguageModelMessage
+    message: LanguageModelAssistantMessage
     finish_reason: str
 
 
@@ -173,7 +173,9 @@ class LanguageModelStreamResponseMessage(BaseModel):
     model_config = model_config
 
     id: str
-    previous_message_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: Optional[str] = None
@@ -244,7 +246,9 @@ class LanguageModelTool(BaseModel):
         description="Name must adhere to the pattern ^[a-zA-Z_-]+$",
     )
     description: str
-    parameters: LanguageModelToolParameters
+    parameters: (
+        LanguageModelToolParameters | dict
+    )  # dict represents json schema dumped from pydantic
     returns: LanguageModelToolParameterProperty | LanguageModelToolParameters | None = (
         None
     )

{unique_toolkit-0.5.46.dist-info → unique_toolkit-0.5.48.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 0.5.46
+Version: 0.5.48
 Summary: 
 License: Proprietary
 Author: Martin Fadler
@@ -100,6 +100,13 @@ 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.48] - 2025-01-19
+- Added the possibility define tool parameters with a json schema (Useful when generating tool parameters from a pydantic object)
+
+## [0.5.47] - 2025-01-07
+- Added a message builder to build language model messages conveniently without importing all different messages.
+- Move tool_calls to assistant message as not needed anywhere else.
+
 ## [0.5.46] - 2025-01-07
 - Added `AZURE_GPT_35_TURBO_0125` as new model into toolkit.
 

{unique_toolkit-0.5.46.dist-info → unique_toolkit-0.5.48.dist-info}/RECORD

@@ -36,14 +36,15 @@ unique_toolkit/evaluators/hallucination/utils.py,sha256=507BsX1mFTEne1-LdRCNMgBj
 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=hgk5yiFF4SpIcE2QSoki9YknFxmcKnq2LCJ1cK9de9I,1830
+unique_toolkit/language_model/builder.py,sha256=nsRqWO_2dgFehK5CgtqR5aqXgYUU0QL6mR0lALPrQXM,1898
 unique_toolkit/language_model/infos.py,sha256=NgoV05ausVWMqrYqgH6i3s7tYG7mejupROIF_bwEGZo,13050
 unique_toolkit/language_model/prompt.py,sha256=JSawaLjQg3VR-E2fK8engFyJnNdk21zaO8pPIodzN4Q,3991
-unique_toolkit/language_model/schemas.py,sha256=MBwEAFnnCYjSpbZDUYLrqkCc-0bsarsepSQEj1v6YEY,6991
+unique_toolkit/language_model/schemas.py,sha256=DHGUWRITtYV1phwuc4MyOwIZA78hHxfw0C-g-iRVLBw,7198
 unique_toolkit/language_model/service.py,sha256=brNCPRA0XxgqHi2rI5i2lyFCkUiw4MNMe1VaR3UgWmY,15500
 unique_toolkit/language_model/utils.py,sha256=bPQ4l6_YO71w-zaIPanUUmtbXC1_hCvLK0tAFc3VCRc,1902
 unique_toolkit/short_term_memory/schemas.py,sha256=OhfcXyF6ACdwIXW45sKzjtZX_gkcJs8FEZXcgQTNenw,1406
 unique_toolkit/short_term_memory/service.py,sha256=Jd9P72-VvJy7hnqNrjmrmB5BHmsKuOpTiT0Jr-dBbsQ,1682
-unique_toolkit-0.5.46.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
-unique_toolkit-0.5.46.dist-info/METADATA,sha256=dOAcMwh7VpRNOedFNvGEA_AypsA-LCuuVqQknJxO_Sc,15336
-unique_toolkit-0.5.46.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_toolkit-0.5.46.dist-info/RECORD,,
+unique_toolkit-0.5.48.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_toolkit-0.5.48.dist-info/METADATA,sha256=P27b6NvkO1GUEnYi486DsECbpXch7kjRrwo-j_e5HVA,15700
+unique_toolkit-0.5.48.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_toolkit-0.5.48.dist-info/RECORD,,