unique_toolkit 0.5.42__tar.gz → 0.5.44__tar.gz

{unique_toolkit-0.5.42 → unique_toolkit-0.5.44}/CHANGELOG.md

@@ -5,6 +5,12 @@ 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.44] - 2024-12-18
+- Add `event_constructor` to `verify_signature_and_construct_event` to allow for custom event construction.
+
+## [0.5.43] - 2024-12-13
+- Add `Prompt` class to handle templated prompts that can be formatted into LanguageModelSystemMessage and LanguageModelUserMessage.
+
 ## [0.5.42] - 2024-12-11
 - Update `LanguageModelTokenLimits` with fix avoiding floats for token
 

{unique_toolkit-0.5.42 → unique_toolkit-0.5.44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 0.5.42
+Version: 0.5.44
 Summary: 
 License: Proprietary
 Author: Martin Fadler
@@ -100,6 +100,12 @@ 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.44] - 2024-12-18
+- Add `event_constructor` to `verify_signature_and_construct_event` to allow for custom event construction.
+
+## [0.5.43] - 2024-12-13
+- Add `Prompt` class to handle templated prompts that can be formatted into LanguageModelSystemMessage and LanguageModelUserMessage.
+
 ## [0.5.42] - 2024-12-11
 - Update `LanguageModelTokenLimits` with fix avoiding floats for token
 

{unique_toolkit-0.5.42 → unique_toolkit-0.5.44}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "unique_toolkit"
-version = "0.5.42"
+version = "0.5.44"
 description = ""
 authors = [
     "Martin Fadler <martin.fadler@unique.ch>",

{unique_toolkit-0.5.42 → unique_toolkit-0.5.44}/unique_toolkit/app/verification.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Callable, TypeVar
 
 import unique_sdk
 
@@ -11,12 +12,16 @@ class WebhookVerificationError(Exception):
     pass
 
 
+T = TypeVar("T")
+
+
 def verify_signature_and_construct_event(
     headers: dict[str, str],
     payload: bytes,
     endpoint_secret: str,
     logger: logging.Logger = logging.getLogger(__name__),
-):
+    event_constructor: Callable[..., T] = Event,
+) -> T:
     """
     Verify the signature of a webhook and construct an event object.
 
@@ -25,18 +30,14 @@ def verify_signature_and_construct_event(
         payload (bytes): The raw payload of the webhook request.
         endpoint_secret (str): The secret used to verify the webhook signature.
         logger (logging.Logger): A logger instance for logging messages.
-
+        event_constructor (Callable[..., T]): A callable that constructs an event object.
     Returns:
-        Union[Event, Tuple[Dict[str, bool], int]]:
-            If successful, returns an Event object.
-            If unsuccessful, returns a tuple with an error response and HTTP status code.
+        T: The constructed event object.
 
     Raises:
         WebhookVerificationError: If there's an error during verification or event construction.
     """
 
-    # Only verify the event if there is an endpoint secret defined
-    # Otherwise use the basic event deserialized with json
     sig_header = headers.get("X-Unique-Signature")
     timestamp = headers.get("X-Unique-Created-At")
 
@@ -52,7 +53,7 @@ def verify_signature_and_construct_event(
             endpoint_secret,
         )
         logger.info("✅  Webhook signature verification successful.")
-        return Event(**event)
+        return event_constructor(**event)
     except unique_sdk.SignatureVerificationError as e:
         logger.error("⚠️  Webhook signature verification failed. " + str(e))
         raise WebhookVerificationError(f"Signature verification failed: {str(e)}")

{unique_toolkit-0.5.42 → unique_toolkit-0.5.44}/unique_toolkit/language_model/__init__.py

@@ -1,5 +1,8 @@
 from .infos import LanguageModel as LanguageModel
 from .infos import LanguageModelName as LanguageModelName
+from .prompt import (
+    Prompt as Prompt,
+)
 from .schemas import (
     LanguageModelAssistantMessage as LanguageModelAssistantMessage,
 )

unique_toolkit-0.5.44/unique_toolkit/language_model/prompt.py

@@ -0,0 +1,124 @@
+from string import Template
+from typing import Any
+
+from unique_toolkit.language_model.schemas import (
+    LanguageModelSystemMessage,
+    LanguageModelUserMessage,
+)
+
+
+class Prompt:
+    """
+    A class for handling templated prompts that can be formatted into LanguageModelSystemMessage and LanguageModelUserMessage.
+
+    This class wraps a string template and provides methods to format it with variables and
+    convert it into different types of language model messages. It uses Python's string.Template
+    for variable substitution.
+
+    Usage:
+        # Create a prompt with a template and set variables
+        prompt = Prompt("Hello, ${name}!", name="World")
+
+        # Substitute the template with variables and return the formatted content
+        content = prompt.substitute(name="World")
+
+        # Get the formatted content
+        content = prompt.content  # Returns "Hello, World!"
+
+        # Get the template
+        template = prompt.template
+
+        # Convert to language model messages
+        system_msg = prompt.to_system_msg()
+        user_msg = prompt.to_user_msg()
+        user_msg_with_images = prompt.to_user_msg_with_images(images=["IMAGE_IN_BASE64"])
+
+    Properties:
+        template: Returns the underlying template string
+        content: Returns the current formatted content string
+
+    Methods:
+        substitute(**kwargs): Substitutes the template with the given variables
+        to_user_msg(): Converts the prompt to a LanguageModelUserMessage
+        to_user_msg_with_images(images): Converts the prompt to a LanguageModelUserMessage with images
+    """
+
+    def __init__(self, template: str, **kwargs):
+        self._template = Template(template)
+        self._content = self._template.template
+        if kwargs:
+            self._content = self._template.substitute(**kwargs)
+
+    @property
+    def template(self):
+        """
+        Returns the template string.
+
+        Returns:
+            str: The template string.
+        """
+        return self._template
+
+    @property
+    def content(self):
+        """
+        Returns the formatted content string.
+
+        Returns:
+            str: The formatted content string.
+        """
+        return self._content
+
+    def substitute(self, **kwargs: Any) -> str:
+        """
+        Substitutes the template with the given kwargs. Raises KeyError if a required parameter is missing.
+
+        Args:
+            **kwargs: Keyword arguments to substitute into the template.
+
+        Returns:
+            str: The substituted template string.
+
+        Raises:
+            KeyError: If a required parameter in the template is missing from kwargs.
+        """
+        self._content = self._template.substitute(**kwargs)
+        return self._content
+
+    def to_system_msg(self) -> LanguageModelSystemMessage:
+        """
+        Returns a LanguageModelSystemMessage with the content of the prompt.
+
+        Returns:
+            LanguageModelSystemMessage: The formatted prompt.
+        """
+        return LanguageModelSystemMessage(content=self._content)
+
+    def to_user_msg(self) -> LanguageModelUserMessage:
+        """
+        Returns a LanguageModelUserMessage with the content of the prompt.
+
+        Returns:
+            LanguageModelUserMessage: The formatted prompt.
+        """
+        return LanguageModelUserMessage(content=self._content)
+
+    def to_user_msg_with_images(self, images: list[str]) -> LanguageModelUserMessage:
+        """
+        Returns a LanguageModelUserMessage with the content of the prompt and the images.
+
+        Args:
+            images: List of images in base64 format.
+
+        Returns:
+            LanguageModelUserMessage: The formatted prompt with images.
+        """
+        return LanguageModelUserMessage(
+            content=[
+                {"type": "text", "text": self._content},
+                *[
+                    {"type": "image_url", "imageUrl": {"url": image}}
+                    for image in images
+                ],
+            ]
+        )