unique_toolkit 1.29.0__tar.gz → 1.29.2__tar.gz

{unique_toolkit-1.29.0 → unique_toolkit-1.29.2}/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).
 
+## [1.29.2] - 2025-11-21
+- Add `jinja` utility helpers to `_common`
+
+## [1.29.1] - 2025-11-21
+- Add early return in `create_message_log_entry` if chat_service doesn't have assistant_message_id (relevant for agentic table)
+
 ## [1.29.0] - 2025-11-21
 - Add option to force include references in sub agent responses even if unused by main agent response.
 

{unique_toolkit-1.29.0 → unique_toolkit-1.29.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 1.29.0
+Version: 1.29.2
 Summary: 
 License: Proprietary
 Author: Cedric Klinkert
@@ -11,6 +11,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: docxtpl (>=0.20.1,<0.21.0)
 Requires-Dist: jambo (>=0.1.2,<0.2.0)
+Requires-Dist: jinja2 (>=3.1.6,<4.0.0)
 Requires-Dist: markdown-it-py (>=4.0.0,<5.0.0)
 Requires-Dist: mkdocs-mermaid2-plugin (>=1.2.2,<2.0.0)
 Requires-Dist: mkdocs-multirepo-plugin (>=0.8.3,<0.9.0)
@@ -120,6 +121,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).
 
+## [1.29.2] - 2025-11-21
+- Add `jinja` utility helpers to `_common`
+
+## [1.29.1] - 2025-11-21
+- Add early return in `create_message_log_entry` if chat_service doesn't have assistant_message_id (relevant for agentic table)
+
 ## [1.29.0] - 2025-11-21
 - Add option to force include references in sub agent responses even if unused by main agent response.
 

{unique_toolkit-1.29.0 → unique_toolkit-1.29.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "unique_toolkit"
-version = "1.29.0"
+version = "1.29.2"
 description = ""
 authors = [
     "Cedric Klinkert <cedric.klinkert@unique.ch>",
@@ -31,6 +31,7 @@ platformdirs = "^4.0.0"
 pillow = "^10.4.0"
 unique-sdk = "^0.10.48"
 jambo = "^0.1.2"
+jinja2 = "^3.1.6"
 mkdocs-multirepo-plugin = "^0.8.3"
 mkdocs-mermaid2-plugin = "^1.2.2"
 docxtpl = "^0.20.1"
@@ -57,6 +58,7 @@ pytest-mock = "^3.14.0"
 platformdirs = "^4.0.0"
 pillow = "^10.4.0"
 ipykernel = "^6.29.5"
+jinja2 = "^3.1.6"
 # unique-sdk = { path = "../unique_sdk" }
 mkdocs = "^1.6.1"
 mkdocs-material = "^9.6.11"

unique_toolkit-1.29.2/unique_toolkit/_common/utils/jinja/helpers.py

@@ -0,0 +1,10 @@
+from pathlib import Path
+
+
+def get_parent_dir(file_path: str) -> Path:
+    return Path(file_path).parent
+
+
+def load_template(parent_dir: Path, template_name: str) -> str:
+    with open(parent_dir / template_name, "r") as file:
+        return file.read().strip()

unique_toolkit-1.29.2/unique_toolkit/_common/utils/jinja/render.py

@@ -0,0 +1,11 @@
+from typing import Any
+
+from _common.utils.jinja.schema import Jinja2PromptParams
+from jinja2 import Template
+
+
+def render_template(template: str, params: Jinja2PromptParams | dict[str, Any]) -> str:
+    if isinstance(params, Jinja2PromptParams):
+        params = params.model_dump(exclude_none=True, mode="json")
+
+    return Template(template, lstrip_blocks=True).render(**params)

unique_toolkit-1.29.2/unique_toolkit/_common/utils/jinja/schema.py

@@ -0,0 +1,65 @@
+from datetime import date, datetime
+from typing import Annotated, Any
+
+from jinja2 import Template
+from pydantic import (
+    BaseModel,
+    ConfigDict,
+    Field,
+    SerializerFunctionWrapHandler,
+    WrapSerializer,
+)
+
+from unique_toolkit.agentic.tools.tool import Tool
+
+
+class Jinja2PromptParams(BaseModel):
+    model_config = ConfigDict(str_strip_whitespace=True)
+
+    def render_template(self, template: str) -> str:
+        params = self.model_dump(exclude_none=True, mode="json")
+
+        return Template(template, lstrip_blocks=True).render(**params)
+
+
+class ToolPromptParams(Jinja2PromptParams):
+    name: str
+    tool_description_for_system_prompt: str = ""
+    tool_format_information_for_system_prompt: str = ""
+    tool_format_reminder_for_user_prompt: str = ""
+
+    @classmethod
+    def from_tool(cls, tool: Tool) -> "ToolPromptParams":
+        return cls(
+            name=tool.name,
+            tool_description_for_system_prompt=tool.tool_description_for_system_prompt(),
+            tool_format_information_for_system_prompt=tool.tool_format_information_for_system_prompt(),
+            tool_format_reminder_for_user_prompt=tool.tool_format_reminder_for_user_prompt(),
+        )
+
+
+def serialize_iso8601_date(v: Any, handler: SerializerFunctionWrapHandler) -> str:
+    if isinstance(v, date):
+        return v.isoformat()
+    return handler(v)
+
+
+ISO8601Date = Annotated[
+    date,
+    WrapSerializer(serialize_iso8601_date, return_type=str),
+]
+
+
+class AgentSystemPromptParams(Jinja2PromptParams):
+    info_cutoff_at: ISO8601Date | None
+    current_date: ISO8601Date = Field(default_factory=lambda: datetime.now().date())
+    tools: list[ToolPromptParams]
+    used_tools: list[ToolPromptParams]
+    add_citation_appendix: bool = True
+    max_tools_per_iteration: int
+    max_loop_iterations: int
+    current_iteration: int
+
+
+class AgentUserPromptParams(Jinja2PromptParams):
+    user_prompt: str

unique_toolkit-1.29.2/unique_toolkit/_common/utils/jinja/utils.py

@@ -0,0 +1,80 @@
+from jinja2 import Environment
+from jinja2.nodes import Const, Getattr, Getitem, Name
+from pydantic import BaseModel
+
+
+class TemplateValidationResult(BaseModel):
+    is_valid: bool
+    missing_placeholders: list[str]
+    optional_placeholders: list[str]
+    unexpected_placeholders: list[str]
+
+
+def _get_nested_variables(node):
+    """Recursively extract all variable references from a Jinja2 AST node."""
+    variables = set()
+
+    if isinstance(node, Name):
+        variables.add(node.name)
+    elif isinstance(node, (Getattr, Getitem)):
+        # For nested attributes like example.category
+        if isinstance(node.node, Name):
+            if isinstance(node, Getattr):
+                variables.add(f"{node.node.name}.{node.attr}")
+            else:  # Getitem
+                if isinstance(node.arg, Const):
+                    variables.add(f"{node.node.name}.{node.arg.value}")
+                else:
+                    # For dynamic indices, just use the base variable
+                    variables.add(node.node.name)
+        # Recursively process nested nodes
+        variables.update(_get_nested_variables(node.node))
+
+    # Process child nodes
+    for child in node.iter_child_nodes():
+        variables.update(_get_nested_variables(child))
+
+    return variables
+
+
+def validate_template_placeholders(
+    template_content: str,
+    required_placeholders: set[str],
+    optional_placeholders: set[str],
+) -> TemplateValidationResult:
+    """
+    Validates that all required placeholders in the template are present.
+    Handles both top-level and nested variables (e.g. example.category).
+
+    Args:
+        template_content (str): The content of the Jinja template
+        required_placeholders (set[str]): Set of required placeholder names
+        optional_placeholders (set[str]): Set of optional placeholder names
+
+    Returns:
+        TemplateValidationResult: A result object containing validation information
+    """
+    # Create a Jinja environment
+    env = Environment()
+
+    # Parse the template and get all variables including nested ones
+    ast = env.parse(template_content)
+    template_vars = _get_nested_variables(ast)
+
+    # Check for missing required placeholders
+    missing_placeholders = required_placeholders - template_vars
+
+    # Check for optional placeholders present
+    present_optional = optional_placeholders & template_vars
+
+    # Check for any unexpected placeholders
+    unexpected_placeholders = template_vars - (
+        required_placeholders | optional_placeholders
+    )
+
+    return TemplateValidationResult(
+        is_valid=len(missing_placeholders) == 0,
+        missing_placeholders=sorted(list(missing_placeholders)),
+        optional_placeholders=sorted(list(present_optional)),
+        unexpected_placeholders=sorted(list(unexpected_placeholders)),
+    )

{unique_toolkit-1.29.0 → unique_toolkit-1.29.2}/unique_toolkit/agentic/message_log_manager/service.py

@@ -5,6 +5,7 @@ Target of the method is to extend the step tracking on all levels of the tool.
 """
 
 from collections import defaultdict
+from logging import getLogger
 
 from unique_toolkit.chat.schemas import (
     MessageLogDetails,
@@ -14,6 +15,8 @@ from unique_toolkit.chat.schemas import (
 from unique_toolkit.chat.service import ChatService
 from unique_toolkit.content.schemas import ContentReference
 
+_LOGGER = getLogger(__name__)
+
 # Per-request counters for message log ordering - keyed by message_id
 # This is a mandatory global variable since we have in the system a bug which makes it impossible to use it as a proper class variable.
 _request_counters = defaultdict(int)
@@ -71,6 +74,12 @@ class MessageStepLogger:
         """
 
         # Creating a new message log entry with the found hits.
+        if not self._chat_service._assistant_message_id:
+            _LOGGER.warning(
+                "Assistant message id is not set. Skipping message log entry creation."
+            )
+            return
+
         _ = self._chat_service.create_message_log(
             message_id=self._chat_service._assistant_message_id,
             text=text,