unique_toolkit 0.5.28__py3-none-any.whl → 0.5.31__py3-none-any.whl

unique_toolkit/language_model/schemas.py

@@ -9,6 +9,7 @@ from pydantic import (
     Field,
     RootModel,
     field_validator,
+    model_serializer,
     model_validator,
 )
 
@@ -32,27 +33,54 @@ class LanguageModelFunction(BaseModel):
 
     id: Optional[str] = None
     name: str
-    arguments: Optional[dict[str, list | dict | str | int | float | bool]] = None  # type: ignore
+    arguments: Optional[dict[str, Any] | str] = None  # type: ignore
 
     @field_validator("arguments", mode="before")
     def set_arguments(cls, value):
-        return json.loads(value)
+        if isinstance(value, str):
+            return json.loads(value)
+        return value
+
+    @model_serializer()
+    def serialize_model(self):
+        seralization = {}
+        if self.id:
+            seralization["id"] = self.id
+        seralization["name"] = self.name
+        if self.arguments:
+            seralization["arguments"] = json.dumps(self.arguments)
+        return seralization
 
 
 class LanguageModelFunctionCall(BaseModel):
     model_config = model_config
 
-    id: str
+    id: Optional[str] = None
     type: Optional[str] = None
     function: LanguageModelFunction
 
+    @staticmethod
+    def create_assistant_message_from_tool_calls(
+        tool_calls: list[LanguageModelFunction],
+    ):
+        assistant_message = LanguageModelAssistantMessage(
+            content="",
+            tool_calls=[
+                LanguageModelFunctionCall(
+                    id=tool_call.id,
+                    type="function",
+                    function=tool_call,
+                )
+                for tool_call in tool_calls
+            ],
+        )
+        return assistant_message
+
 
 class LanguageModelMessage(BaseModel):
     model_config = model_config
-
     role: LanguageModelMessageRole
     content: Optional[str | list[dict]] = None
-    name: Optional[str] = None
     tool_calls: Optional[list[LanguageModelFunctionCall]] = None
 
 
@@ -82,6 +110,8 @@ class LanguageModelAssistantMessage(LanguageModelMessage):
 
 class LanguageModelToolMessage(LanguageModelMessage):
     role: LanguageModelMessageRole = LanguageModelMessageRole.TOOL
+    name: str
+    tool_call_id: str
 
     @field_validator("role", mode="before")
     def set_role(cls, value):
@@ -89,7 +119,13 @@ class LanguageModelToolMessage(LanguageModelMessage):
 
 
 class LanguageModelMessages(RootModel):
-    root: list[LanguageModelMessage]
+    root: list[
+        LanguageModelMessage
+        | LanguageModelToolMessage
+        | LanguageModelAssistantMessage
+        | LanguageModelSystemMessage
+        | LanguageModelUserMessage
+    ]
 
     def __iter__(self):
         return iter(self.root)
@@ -182,7 +218,7 @@ class LanguageModelToolParameters(BaseModel):
 class LanguageModelTool(BaseModel):
     name: str = Field(
         ...,
-        pattern=r"^[a-zA-Z_-]+$",
+        pattern=r"^[a-zA-Z1-9_-]+$",
         description="Name must adhere to the pattern ^[a-zA-Z_-]+$",
     )
     description: str

unique_toolkit/language_model/service.py

@@ -52,6 +52,7 @@ class LanguageModelService(BaseService):
             LanguageModelResponse: The LanguageModelResponse object.
         """
         options = self._add_tools_to_options({}, tools)
+        options["temperature"] = temperature
         messages = messages.model_dump(exclude_none=True)
         model = (
             model_name.name if isinstance(model_name, LanguageModelName) else model_name
@@ -67,7 +68,6 @@ class LanguageModelService(BaseService):
                     messages,
                 ),
                 timeout=timeout,
-                temperature=temperature,
                 options=options,  # type: ignore
             )
             return LanguageModelResponse(**response)
@@ -109,6 +109,7 @@ class LanguageModelService(BaseService):
             Exception: If an error occurs during the request, an exception is raised and logged.
         """
         options = cls._add_tools_to_options({}, tools)
+        options["temperature"] = temperature
         messages = messages.model_dump(exclude_none=True, exclude={"tool_calls"})
         model = (
             model_name.name if isinstance(model_name, LanguageModelName) else model_name
@@ -122,12 +123,11 @@ class LanguageModelService(BaseService):
                     messages,
                 ),
                 timeout=timeout,
-                temperature=temperature,
                 options=options,  # type: ignore
             )
             return LanguageModelResponse(**response)
         except Exception as e:
-            logger.error(f"Error completing: {e}")
+            logger.error(f"Error completing: {e}")  # type: ignore
             raise e
 
     async def complete_async(
@@ -198,7 +198,7 @@ class LanguageModelService(BaseService):
         options = self._add_tools_to_options({}, tools)
         options["temperature"] = temperature
         search_context = self._to_search_context(content_chunks)
-        messages = messages.model_dump(exclude_none=True)
+        messages = messages.model_dump(exclude_none=True, by_alias=True)
         model = (
             model_name.name if isinstance(model_name, LanguageModelName) else model_name
         )
@@ -259,7 +259,7 @@ class LanguageModelService(BaseService):
         options = self._add_tools_to_options({}, tools)
         options["temperature"] = temperature
         search_context = self._to_search_context(content_chunks)
-        messages = messages.model_dump(exclude_none=True, exclude=["tool_calls"])
+        messages = messages.model_dump(exclude_none=True, by_alias=True)
         model = (
             model_name.name if isinstance(model_name, LanguageModelName) else model_name
         )

{unique_toolkit-0.5.28.dist-info → unique_toolkit-0.5.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 0.5.28
+Version: 0.5.31
 Summary: 
 License: Proprietary
 Author: Martin Fadler
@@ -100,8 +100,17 @@ 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.31] - 2024-10-29
+- Adding support for function calling. Assistant message for tool calls can be directly created with `LanguageModelFunctionCall.create_assistant_message_from_tool_calls`. Better separation of schemas for different types of `LanguageModelMessages`.
+
+## [0.5.30] - 2024-10-28
+- Correctly use `temperature` parameter in `LanguageModelService.complete` and `LanguageModelService.complete_async` methods
+
+## [0.5.29] - 2024-10-28
+- Allow numbers in `LanguageModelTool` name
+
 ## [0.5.28] - 2024-10-23
-- Correctly use `temperature` parameter in `LanguageModelService.complete`, `LanguageModelService.complete_async`, `LanguageModelService.stream_complete` and `LanguageModelService.stream_complete_async` methods
+- Correctly use `temperature` parameter in `LanguageModelService.stream_complete` and `LanguageModelService.stream_complete_async` methods
 
 ## [0.5.27] - 2024-10-22
 - Add encoder_name to to language model info

{unique_toolkit-0.5.28.dist-info → unique_toolkit-0.5.31.dist-info}/RECORD

@@ -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=Oxkr9_6s8gFubxjox-iCm1GSs1RCAQQ5t8oh20izlC0,12002
-unique_toolkit/language_model/schemas.py,sha256=LO3QHsyFuJXG3HxXWFf44QV28JJzW8YW5TeIYhVzZTI,5035
-unique_toolkit/language_model/service.py,sha256=R8j2cr-lDbR96Vl5LVQIdtscS0gfscezKMXNMM2AZHM,13403
+unique_toolkit/language_model/schemas.py,sha256=CLMnhUQeBlsm-XX7Sy54_Gxeqfa7M0z-P7xMwOzfqTg,6089
+unique_toolkit/language_model/service.py,sha256=s5X6EStyYumiYqlD9gkW4GANif18d9QZOMysmUSfv8M,13433
 unique_toolkit/language_model/utils.py,sha256=WBPj1XKkDgxy_-T8HCZvsfkkSzj_1w4UZzNmyvdbBLY,1081
-unique_toolkit-0.5.28.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
-unique_toolkit-0.5.28.dist-info/METADATA,sha256=mvFUKA2gYyPWx19cex2Y6YIdoZ-WSwx0LeTGymenwVo,12521
-unique_toolkit-0.5.28.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_toolkit-0.5.28.dist-info/RECORD,,
+unique_toolkit-0.5.31.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_toolkit-0.5.31.dist-info/METADATA,sha256=vPlMZjvxDXjkByH7-W7H19nyGgzUA-pFOryUlGb3sPE,12944
+unique_toolkit-0.5.31.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_toolkit-0.5.31.dist-info/RECORD,,