unique_toolkit 0.5.19__py3-none-any.whl → 0.5.21__py3-none-any.whl

unique_toolkit/chat/schemas.py

@@ -1,7 +1,14 @@
 from enum import StrEnum
+from typing import Optional
 
 from humps import camelize
-from pydantic import BaseModel, ConfigDict, Field, field_validator
+from pydantic import (
+    BaseModel,
+    ConfigDict,
+    Field,
+    field_validator,
+    model_validator,
+)
 
 # set config to convert camelCase to snake_case
 model_config = ConfigDict(
@@ -12,6 +19,22 @@ model_config = ConfigDict(
 class ChatMessageRole(StrEnum):
     USER = "user"
     ASSISTANT = "assistant"
+    TOOL = "tool"
+
+
+class Function(BaseModel):
+    model_config = model_config
+
+    name: str
+    arguments: str
+
+
+class ToolCall(BaseModel):
+    model_config = model_config
+
+    id: str
+    type: str
+    function: Function
 
 
 class ChatMessage(BaseModel):
@@ -21,6 +44,8 @@ class ChatMessage(BaseModel):
     object: str | None = None
     content: str = Field(alias="text")
     role: ChatMessageRole
+    tool_calls: Optional[list[ToolCall]] = None
+    tool_call_id: Optional[str] = None
     debug_info: dict | None = {}
 
     # TODO make sdk return role consistently in lowercase
@@ -28,3 +53,10 @@ class ChatMessage(BaseModel):
     @field_validator("role", mode="before")
     def set_role(cls, value: str):
         return value.lower()
+
+    # Ensure tool_call_ids is required if role is 'tool'
+    @model_validator(mode="after")
+    def check_tool_call_ids_for_tool_role(self):
+        if self.role == ChatMessageRole.TOOL and not self.tool_call_id:
+            raise ValueError("tool_call_ids is required when role is 'tool'")
+        return self

unique_toolkit/language_model/service.py

@@ -75,37 +75,47 @@ class LanguageModelService(BaseService):
             self.logger.error(f"Error completing: {e}")
             raise e
 
-    async def complete_async(
-        self,
+    @classmethod
+    async def complete_async_util(
+        cls,
+        company_id: str,
         messages: LanguageModelMessages,
         model_name: LanguageModelName | str,
         temperature: float = DEFAULT_COMPLETE_TEMPERATURE,
         timeout: int = DEFAULT_COMPLETE_TIMEOUT,
         tools: Optional[list[LanguageModelTool]] = None,
-    ):
+        logger: Optional[logging.Logger] = logging.getLogger(__name__),
+    ) -> LanguageModelResponse:
         """
         Calls the completion endpoint asynchronously without streaming the response.
 
+        This method sends a request to the completion endpoint using the provided messages, model name,
+        temperature, timeout, and optional tools. It returns a `LanguageModelResponse` object containing
+        the completed result.
+
         Args:
+            company_id (str): The company ID associated with the request.
             messages (LanguageModelMessages): The messages to complete.
-            model_name (LanguageModelName | str): The model name.
-            temperature (float): The temperature value. Defaults to 0.
-            timeout (int): The timeout value in milliseconds. Defaults to 240_000.
-            tools (Optional[list[LanguageModelTool]]): The tools to use. Defaults to None.
+            model_name (LanguageModelName | str): The model name to use for the completion.
+            temperature (float): The temperature setting for the completion. Defaults to 0.
+            timeout (int): The timeout value in milliseconds for the request. Defaults to 240_000.
+            tools (Optional[list[LanguageModelTool]]): Optional list of tools to include in the request.
+            logger (Optional[logging.Logger], optional): The logger used to log errors. Defaults to the logger for the current module.
 
         Returns:
-            str: The completed message content.
+            LanguageModelResponse: The response object containing the completed result.
+
+        Raises:
+            Exception: If an error occurs during the request, an exception is raised and logged.
         """
-        options = self._add_tools_to_options({}, tools)
+        options = cls._add_tools_to_options({}, tools)
         messages = messages.model_dump(exclude_none=True, exclude={"tool_calls"})
         model = (
             model_name.name if isinstance(model_name, LanguageModelName) else model_name
         )
-
         try:
             response = await unique_sdk.ChatCompletion.create_async(
-                company_id=self.event.company_id,
-                # TODO change or extend types in unique_sdk
+                company_id=company_id,
                 model=model,
                 messages=cast(
                     list[unique_sdk.Integrated.ChatCompletionRequestMessage],
@@ -117,9 +127,47 @@ class LanguageModelService(BaseService):
             )
             return LanguageModelResponse(**response)
         except Exception as e:
-            self.logger.error(f"Error completing: {e}")
+            logger.error(f"Error completing: {e}")
             raise e
 
+    async def complete_async(
+        self,
+        messages: LanguageModelMessages,
+        model_name: LanguageModelName | str,
+        temperature: float = DEFAULT_COMPLETE_TEMPERATURE,
+        timeout: int = DEFAULT_COMPLETE_TIMEOUT,
+        tools: Optional[list[LanguageModelTool]] = None,
+    ) -> LanguageModelResponse:
+        """
+        Calls the completion endpoint asynchronously without streaming the response.
+
+        This method utilizes the class method `complete_async_util` to perform the asynchronous completion
+        request using the provided messages, model name, temperature, timeout, and optional tools. It
+        returns a `LanguageModelResponse` object containing the result of the completion.
+
+        Args:
+            messages (LanguageModelMessages): The messages to complete.
+            model_name (LanguageModelName | str): The model name to use for the completion.
+            temperature (float): The temperature setting for the completion. Defaults to 0.0.
+            timeout (int): The timeout value in milliseconds for the request. Defaults to 240,000.
+            tools (Optional[list[LanguageModelTool]]): Optional list of tools to include in the request.
+
+        Returns:
+            LanguageModelResponse: The response object containing the completed result.
+
+        Raises:
+            Exception: If an error occurs during the completion request.
+        """
+        return await self.complete_async_util(
+            company_id=self.event.company_id,
+            messages=messages,
+            model_name=model_name,
+            temperature=temperature,
+            timeout=timeout,
+            tools=tools,
+            logger=self.logger,
+        )
+
     def stream_complete(
         self,
         messages: LanguageModelMessages,

{unique_toolkit-0.5.19.dist-info → unique_toolkit-0.5.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 0.5.19
+Version: 0.5.21
 Summary: 
 License: MIT
 Author: Martin Fadler
@@ -100,8 +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.21] - 2024-09-16
+- Add `tool` as new role `ChatMessage`, as well as `tool_calls` and `tool_call_id` as additional parameters
+
+## [0.5.20] - 2024-09-16
+- `LanguageModelService` now supports complete_util_async that can be called without instantiating the class, currently being used in the Hallucination service and evaluation API
+
 ## [0.5.19] - 2024-09-11
-- `LanguageModelMessage` now supports content as a list of dictionnary. Useful when adding image_url content along user message. 
+- `LanguageModelMessage` now supports content as a list of dictionary. Useful when adding image_url content along user message. 
 
 ## [0.5.18] - 2024-09-03
 - Adds option to use `metadata_filter` with search.

{unique_toolkit-0.5.19.dist-info → unique_toolkit-0.5.21.dist-info}/RECORD

@@ -9,7 +9,7 @@ unique_toolkit/app/performance/async_wrapper.py,sha256=yVVcRDkcdyfjsxro-N29SBvi-
 unique_toolkit/app/schemas.py,sha256=tzrmUFKZUdC1P3LxZ7DrElpkMtekUDoClb7jCRzGqNQ,1521
 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=ff4M-XMagF0Evn3FcKHHP5xzDEyufZgq9Dmit3i8r_E,802
+unique_toolkit/chat/schemas.py,sha256=IHOnb3pWlRlSPoEUWBTl6LK8YeMdlg2iXi9ghyBeiLw,1495
 unique_toolkit/chat/service.py,sha256=nVZ8agpEsXI2-5bS61e1Eawd0abioEQPov2xahiJtfk,17848
 unique_toolkit/chat/state.py,sha256=Cjgwv_2vhDFbV69xxsn7SefhaoIAEqLx3ferdVFCnOg,1445
 unique_toolkit/chat/utils.py,sha256=ihm-wQykBWhB4liR3LnwPVPt_qGW6ETq21Mw4HY0THE,854
@@ -24,9 +24,9 @@ unique_toolkit/embedding/utils.py,sha256=v86lo__bCJbxZBQ3OcLu5SuwT6NbFfWlcq8iyk6
 unique_toolkit/language_model/__init__.py,sha256=QgU_uwpVh1URQyVs6l-6Am4UwmEEhuGXNic3dUZ0FCc,1701
 unique_toolkit/language_model/infos.py,sha256=ETAUV0YTs6BjwuiTdhKz247CtL0W8Jwo3-c0ZQ2HdXs,9962
 unique_toolkit/language_model/schemas.py,sha256=DGZL6j63txkq5rdCn1uuVQIyLOyZt9t8J4f8JzhZENg,4607
-unique_toolkit/language_model/service.py,sha256=8s2tiGLE5ryKQDOtEbNaFkc73NngANxvFNr-hD-dgps,10948
+unique_toolkit/language_model/service.py,sha256=CvVo5CBa5Ia_fQD3DtJRsVChybuUfGFV5ml2_78_p1I,13395
 unique_toolkit/language_model/utils.py,sha256=WBPj1XKkDgxy_-T8HCZvsfkkSzj_1w4UZzNmyvdbBLY,1081
-unique_toolkit-0.5.19.dist-info/LICENSE,sha256=bIeCWCYuoUU_MzNdg48-ubJSVm7qxakaRbzTiJ5uxrs,1065
-unique_toolkit-0.5.19.dist-info/METADATA,sha256=YqqkqMMy9qq6cBc0Z2KufSD6V9-dnigLytMKSjtJcRU,10904
-unique_toolkit-0.5.19.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_toolkit-0.5.19.dist-info/RECORD,,
+unique_toolkit-0.5.21.dist-info/LICENSE,sha256=bIeCWCYuoUU_MzNdg48-ubJSVm7qxakaRbzTiJ5uxrs,1065
+unique_toolkit-0.5.21.dist-info/METADATA,sha256=H0uDtak7X3iObJFeImnvuSuMo7EgX_M09eMNknMOTqw,11242
+unique_toolkit-0.5.21.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_toolkit-0.5.21.dist-info/RECORD,,