unique_toolkit 0.6.6__py3-none-any.whl → 0.6.9__py3-none-any.whl

unique_toolkit/app/schemas.py

@@ -102,7 +102,7 @@ class ChatEventPayload(BaseModel):
     metadata_filter: Optional[dict[str, Any]] = None
 
 
-@deprecated("""UUse `ChatEventPayload` instead.
+@deprecated("""Use `ChatEventPayload` instead.
             This class will be removed in the next major version.""")
 class EventPayload(ChatEventPayload):
     user_message: EventUserMessage

unique_toolkit/app/verification.py

@@ -1,10 +1,15 @@
+import json
 import logging
+import os
 from typing import Callable, TypeVar
 
 import unique_sdk
+from pydantic import ValidationError
 
 from unique_toolkit.app.schemas import Event
 
+logger = logging.getLogger(f"toolkit.{__name__}")
+
 
 class WebhookVerificationError(Exception):
     """Custom exception for webhook verification errors."""
@@ -19,7 +24,7 @@ def verify_signature_and_construct_event(
     headers: dict[str, str],
     payload: bytes,
     endpoint_secret: str,
-    logger: logging.Logger = logging.getLogger(__name__),
+    logger: logging.Logger = logger,
     event_constructor: Callable[..., T] = Event,
 ) -> T:
     """
@@ -57,3 +62,51 @@ def verify_signature_and_construct_event(
     except unique_sdk.SignatureVerificationError as e:
         logger.error("⚠️  Webhook signature verification failed. " + str(e))
         raise WebhookVerificationError(f"Signature verification failed: {str(e)}")
+
+
+def verify_request_and_construct_event(
+    assistant_name: str,
+    payload: bytes,
+    headers: dict[str, str],
+    event_constructor: Callable[..., Event] = Event,
+) -> tuple[str, int] | tuple[Event, int]:
+    """Check the payload, authenticate and genenrate the event if the payload is correct"""
+    logger.info(f"{assistant_name} - received request")
+
+    try:
+        payload_decoded = json.loads(payload)
+    except json.decoder.JSONDecodeError as e:
+        logger.error(f"Error decoding payload: {e}", exc_info=True)
+        return "Invalid payload", 400
+
+    endpoint_secret = os.environ.get("ENDPOINT_SECRET", None)
+    if endpoint_secret:
+        response = verify_signature_and_construct_event(
+            headers=headers,  # type: ignore
+            payload=payload,
+            endpoint_secret=endpoint_secret,
+            logger=logger,
+            event_constructor=event_constructor,
+        )
+        if isinstance(response, tuple):
+            return response  # Error response
+        event = response  # This is an event since it is not a tuple
+    else:
+        try:
+            event = event_constructor(**payload_decoded)
+        except ValidationError as e:
+            # pydantic errors https://docs.pydantic.dev/2.10/errors/errors/
+            logger.error(f"Validation error with model: {e.json()}", exc_info=True)
+            raise ValidationError(e)
+        except ValueError as e:
+            logger.error(f"Error deserializing event: {e}", exc_info=True)
+            return "Invalid event", 400
+
+    if not event.payload.name == assistant_name:
+        logger.error(
+            f"{assistant_name}: Incorrect assistant: {event.payload.name}: Expected {assistant_name}"
+        )
+        return f"Not {assistant_name} event", 400
+
+    logger.info(f"{assistant_name} - received event")
+    return event, 200

unique_toolkit/language_model/builder.py

@@ -3,6 +3,7 @@ from typing_extensions import Self
 from unique_toolkit.language_model import (
     LanguageModelAssistantMessage,
     LanguageModelMessage,
+    LanguageModelMessageRole,
     LanguageModelMessages,
     LanguageModelSystemMessage,
     LanguageModelToolMessage,
@@ -14,6 +15,11 @@ class MessagesBuilder:
     def __init__(self):
         self.messages: list[LanguageModelMessage] = []
 
+    def message_append(self, role: LanguageModelMessageRole, content: str):
+        message = LanguageModelMessage(role=role, content=content)
+        self.messages.append(message)
+        return self
+
     def system_message_append(self, content: str) -> Self:
         """Appends a system message to the messages list."""
         message = LanguageModelSystemMessage(content=content)
@@ -26,15 +32,18 @@ class MessagesBuilder:
         self.messages.append(message)
         return self  # Return self to allow method chaining
 
-    def image_message_append(self, content: str, images: list[str]) -> Self:
-        message = LanguageModelUserMessage(
+    def image_message_append(
+        self, content: str, images: list[str], role=LanguageModelMessageRole.USER
+    ) -> Self:
+        message = LanguageModelMessage(
+            role=role,
             content=[
                 {"type": "text", "text": content},
                 *[
                     {"type": "image_url", "imageUrl": {"url": image}}
                     for image in images
                 ],
-            ]
+            ],
         )
         self.messages.append(message)
         return self

unique_toolkit/language_model/infos.py

@@ -16,9 +16,10 @@ class LanguageModelName(StrEnum):
     AZURE_GPT_4o_2024_0513 = "AZURE_GPT_4o_2024_0513"
     AZURE_GPT_4o_2024_0806 = "AZURE_GPT_4o_2024_0806"
     AZURE_GPT_4o_MINI_2024_0718 = "AZURE_GPT_4o_MINI_2024_0718"
-    AZURE_GPT_o1_2024_1217 = "AZURE_GPT_o1_2024_1217"
-    AZURE_GPT_o1_MINI_2024_0912 = "AZURE_GPT_o1_MINI_2024_0912"
-    AZURE_GPT_o3_MINI_2025_0131 = "AZURE_GPT_o3_MINI_2025_0131"
+    AZURE_o1_PREVIEW_2024_0912 = "AZURE_o1_PREVIEW_2024_0912"
+    AZURE_o1_2024_1217 = "AZURE_o1_2024_1217"
+    AZURE_o1_MINI_2024_0912 = "AZURE_o1_MINI_2024_0912"
+    AZURE_o3_MINI_2025_0131 = "AZURE_o3_MINI_2025_0131"
 
 
 class EncoderName(StrEnum):
@@ -215,7 +216,7 @@ class LanguageModelInfo(BaseModel):
                     info_cutoff_at=date(2023, 10, 1),
                     published_at=date(2024, 7, 18),
                 )
-            case LanguageModelName.AZURE_GPT_o1_2024_1217:
+            case LanguageModelName.AZURE_o1_2024_1217:
                 return cls(
                     name=model_name,
                     capabilities=[
@@ -234,7 +235,10 @@ class LanguageModelInfo(BaseModel):
                     info_cutoff_at=date(2023, 10, 1),
                     published_at=date(2024, 12, 17),
                 )
-            case LanguageModelName.AZURE_GPT_o1_MINI_2024_0912:
+            case (
+                LanguageModelName.AZURE_o1_MINI_2024_0912
+                | LanguageModelName.AZURE_o1_PREVIEW_2024_0912
+            ):
                 return cls(
                     name=model_name,
                     capabilities=[
@@ -253,7 +257,7 @@ class LanguageModelInfo(BaseModel):
                     info_cutoff_at=date(2023, 10, 1),
                     published_at=date(2024, 9, 12),
                 )
-            case LanguageModelName.AZURE_GPT_o3_MINI_2025_0131:
+            case LanguageModelName.AZURE_o3_MINI_2025_0131:
                 return cls(
                     name=model_name,
                     capabilities=[

{unique_toolkit-0.6.6.dist-info → unique_toolkit-0.6.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 0.6.6
+Version: 0.6.9
 Summary: 
 License: Proprietary
 Author: Martin Fadler
@@ -111,6 +111,15 @@ 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.6.9] - 2025-03-11
+- Add o1-preview as part of the language model info, make the name consistent across board.
+
+## [0.6.8] - 2025-03-11
+- Add `verify_request_and_construct_event` to `verification.py`
+
+## [0.6.7] - 2025-03-10
+- Extend language model message builder
+
 ## [0.6.6] - 2025-03-10
 - Add o1, o1-mini and o3-mini models
 - Remove deprecated gpt4 models

{unique_toolkit-0.6.6.dist-info → unique_toolkit-0.6.9.dist-info}/RECORD

@@ -9,8 +9,8 @@ unique_toolkit/app/init_logging.py,sha256=Sh26SRxOj8i8dzobKhYha2lLrkrMTHfB1V4jR3
 unique_toolkit/app/init_sdk.py,sha256=Nv4Now4pMfM0AgRhbtatLpm_39rKxn0WmRLwmPhRl-8,1285
 unique_toolkit/app/performance/async_tasks.py,sha256=H0l3OAcosLwNHZ8d2pd-Di4wHIXfclEvagi5kfqLFPA,1941
 unique_toolkit/app/performance/async_wrapper.py,sha256=yVVcRDkcdyfjsxro-N29SBvi-7773wnfDplef6-y8xw,1077
-unique_toolkit/app/schemas.py,sha256=hPOh5xLNNWgWVIkdrj6ZHYaGz0cTV-5Kv7OQHOaUgV8,3201
-unique_toolkit/app/verification.py,sha256=mffa6wm0i4hJbwzofePrkaia46xumMzECwQ0T3eKAx0,1929
+unique_toolkit/app/schemas.py,sha256=jnW3f_4ohyfM7sVfZlNuV8At19qUwPJGC8XHx4ktlEY,3200
+unique_toolkit/app/verification.py,sha256=GxFFwcJMy25fCA_Xe89wKW7bgqOu8PAs5y8QpHF0GSc,3861
 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=J9Cmgkhj9bBxZja3ggkSp48af_LPU4Dfi9Sbc_WhhNY,27204
@@ -45,10 +45,10 @@ unique_toolkit/evaluators/hallucination/utils.py,sha256=4KTJH8low_fBzOcuVlcHB2FR
 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=jWko_vQj48wjnpTtlkg8iNdef0SMI3FN2kGywXRTMzg,1880
-unique_toolkit/language_model/builder.py,sha256=qP1SlUnYJHLqT-fpXs4lgUixnekhx8IIfuoXnMHvRKE,2408
+unique_toolkit/language_model/builder.py,sha256=_lUL2shMN1Je2LLYu2PiehOvfWtn5pg1yUuYyiw3f_c,2710
 unique_toolkit/language_model/constants.py,sha256=B-topqW0r83dkC_25DeQfnPk3n53qzIHUCBS7YJ0-1U,119
 unique_toolkit/language_model/functions.py,sha256=I5jHhHsKoq7GwEQyTrM8LXB2n_6dvMAk7UklenjuHSY,7945
-unique_toolkit/language_model/infos.py,sha256=DRkF0HzVemtSsSvdtrdsajNKaQ46Xla0ZXzFhi7xMtc,16338
+unique_toolkit/language_model/infos.py,sha256=HRdQLG3oetwc-bPHtsXvDRRLsK7fSsC1q8FubvxLMsw,16459
 unique_toolkit/language_model/prompt.py,sha256=JSawaLjQg3VR-E2fK8engFyJnNdk21zaO8pPIodzN4Q,3991
 unique_toolkit/language_model/schemas.py,sha256=rrwzUgKANFOrdehCULW8Hh03uRW3tsE5dXpWqxmClfg,8618
 unique_toolkit/language_model/service.py,sha256=GupYD4uDZjy1TfVQW3jichmgQwiSgQCj350FtL4O0W4,5569
@@ -58,7 +58,7 @@ unique_toolkit/short_term_memory/constants.py,sha256=698CL6-wjup2MvU19RxSmQk3gX7
 unique_toolkit/short_term_memory/functions.py,sha256=3WiK-xatY5nh4Dr5zlDUye1k3E6kr41RiscwtTplw5k,4484
 unique_toolkit/short_term_memory/schemas.py,sha256=OhfcXyF6ACdwIXW45sKzjtZX_gkcJs8FEZXcgQTNenw,1406
 unique_toolkit/short_term_memory/service.py,sha256=gdsVzoNqTXmLoBR_-p_lJlZDBo8L7Cr5EKchTNVJg1Q,5233
-unique_toolkit-0.6.6.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
-unique_toolkit-0.6.6.dist-info/METADATA,sha256=MAiqgLQcnD82DSwx5CmFbRLoCaAJVgbrHLYpr0AGb2Q,20003
-unique_toolkit-0.6.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_toolkit-0.6.6.dist-info/RECORD,,
+unique_toolkit-0.6.9.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_toolkit-0.6.9.dist-info/METADATA,sha256=x6rRwyHVnMSaaQ2uzBaVrRua8gr234_exrWDG0ybbQY,20274
+unique_toolkit-0.6.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_toolkit-0.6.9.dist-info/RECORD,,