unique_toolkit 2026.46.0.dev2__tar.gz → 2026.46.0.dev4__tar.gz

{unique_toolkit-2026.46.0.dev2 → unique_toolkit-2026.46.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: unique-toolkit
-Version: 2026.46.0.dev2
+Version: 2026.46.0.dev4
 Summary: 
 Author: Cedric Klinkert, Martin Fadler, Sadique Sheik, Fabian Schläpfer, Pascal Hauri, Ejiroghene Oki-Peter, Rami Azouz, Ricardo Visini, Sanzio Monti
 Author-email: Cedric Klinkert <cedric.klinkert@unique.ch>, Martin Fadler <martin.fadler@unique.ch>, Sadique Sheik <sadique@unique.ch>, Fabian Schläpfer <fabian@unique.ch>, Pascal Hauri <pascal@unique.ch>, Ejiroghene Oki-Peter <oki-peter.ejiroghene@unique.ai>, Rami Azouz <rami.ext@unique.ch>, Ricardo Visini <ricardo.visini@unique.ch>, Sanzio Monti <sanzio.monti@unique.ai>

{unique_toolkit-2026.46.0.dev2 → unique_toolkit-2026.46.0.dev4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "unique_toolkit"
-version = "2026.46.0.dev2"
+version = "2026.46.0.dev4"
 description = ""
 readme = "README.md"
 requires-python = ">=3.12"

{unique_toolkit-2026.46.0.dev2 → unique_toolkit-2026.46.0.dev4}/unique_toolkit/_common/experimental/write_up_agent/services/generation_handler/service.py

@@ -3,8 +3,6 @@
 import logging
 from typing import Any, Callable
 
-from jinja2 import Template
-
 from unique_toolkit._common.experimental.write_up_agent.schemas import (
     GroupData,
     ProcessedGroup,
@@ -21,6 +19,7 @@ from unique_toolkit._common.experimental.write_up_agent.services.generation_hand
     PromptBuildError,
     TokenLimitError,
 )
+from unique_toolkit._common.utils.jinja.sandbox import sandboxed_template
 from unique_toolkit.language_model import LanguageModelService
 from unique_toolkit.language_model.builder import MessagesBuilder
 
@@ -285,14 +284,14 @@ class GenerationHandler:
         """
         try:
             # Build system prompt
-            system_prompt = Template(
+            system_prompt = sandboxed_template(
                 self._config.prompts_config.system_prompt_template
             ).render(
                 common_instruction=self._config.common_instruction,
             )
 
             # Build user prompt with section name
-            user_prompt = Template(
+            user_prompt = sandboxed_template(
                 self._config.prompts_config.user_prompt_template
             ).render(
                 section_name=section_name,

{unique_toolkit-2026.46.0.dev2 → unique_toolkit-2026.46.0.dev4}/unique_toolkit/_common/experimental/write_up_agent/services/template_handler/service.py

@@ -1,6 +1,6 @@
 """Template handler service."""
 
-from jinja2 import Template, TemplateError
+from jinja2 import TemplateError
 
 from unique_toolkit._common.experimental.write_up_agent.schemas import (
     GroupData,
@@ -18,6 +18,7 @@ from unique_toolkit._common.experimental.write_up_agent.services.template_handle
 from unique_toolkit._common.experimental.write_up_agent.services.template_handler.utils import (
     parse_template,
 )
+from unique_toolkit._common.utils.jinja.sandbox import sandboxed_template
 
 
 # TODO [UN-16142]: Simplify template logic
@@ -44,7 +45,7 @@ class TemplateHandler:
         self._template = template
 
         try:
-            self._jinja_template = Template(template, lstrip_blocks=True)
+            self._jinja_template = sandboxed_template(template, lstrip_blocks=True)
         except TemplateError as e:
             snippet = template[:100] + "..." if len(template) > 100 else template
             raise TemplateParsingError(

{unique_toolkit-2026.46.0.dev2 → unique_toolkit-2026.46.0.dev4}/unique_toolkit/_common/utils/jinja/render.py

@@ -1,7 +1,6 @@
 from typing import Any
 
-from jinja2 import Template
-
+from unique_toolkit._common.utils.jinja.sandbox import sandboxed_template
 from unique_toolkit._common.utils.jinja.schema import Jinja2PromptParams
 
 
@@ -15,4 +14,4 @@ def render_template(
 
     params.update(kwargs)
 
-    return Template(template, lstrip_blocks=True).render(**params)
+    return sandboxed_template(template, lstrip_blocks=True).render(**params)

unique_toolkit-2026.46.0.dev4/unique_toolkit/_common/utils/jinja/sandbox.py

@@ -0,0 +1,18 @@
+from functools import cache
+
+from jinja2 import Template
+from jinja2.sandbox import SandboxedEnvironment
+
+
+@cache
+def _sandboxed_environment(*, lstrip_blocks: bool) -> SandboxedEnvironment:
+    return SandboxedEnvironment(lstrip_blocks=lstrip_blocks)
+
+
+def sandboxed_template(source: str, *, lstrip_blocks: bool = False) -> Template:
+    """Compile a Jinja template under Jinja's sandbox restrictions.
+
+    Use this for templates that come from configuration. An expression the
+    sandbox rejects raises ``jinja2.exceptions.SecurityError``.
+    """
+    return _sandboxed_environment(lstrip_blocks=lstrip_blocks).from_string(source)

{unique_toolkit-2026.46.0.dev2 → unique_toolkit-2026.46.0.dev4}/unique_toolkit/_common/utils/jinja/schema.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 from datetime import date, datetime
 from typing import Annotated, Any
 
-from jinja2 import Template
 from pydantic import (
     BaseModel,
     ConfigDict,
@@ -12,6 +11,7 @@ from pydantic import (
     WrapSerializer,
 )
 
+from unique_toolkit._common.utils.jinja.sandbox import sandboxed_template
 from unique_toolkit.agentic.tools.tool import Tool
 
 
@@ -21,7 +21,7 @@ class Jinja2PromptParams(BaseModel):
     def render_template(self, template: str) -> str:
         params = self.model_dump(exclude_none=True, mode="json")
 
-        return Template(template, lstrip_blocks=True).render(**params)
+        return sandboxed_template(template, lstrip_blocks=True).render(**params)
 
 
 class ToolPromptParams(Jinja2PromptParams):

{unique_toolkit-2026.46.0.dev2 → unique_toolkit-2026.46.0.dev4}/unique_toolkit/agentic/tools/a2a/evaluation/evaluator.py

@@ -2,10 +2,10 @@ import logging
 from typing import Any, NamedTuple, override
 
 import unique_sdk
-from jinja2 import Template
 from pydantic import BaseModel
 
 from unique_toolkit._common.execution import failsafe
+from unique_toolkit._common.utils.jinja.sandbox import sandboxed_template
 from unique_toolkit.agentic.evaluation.evaluation_manager import Evaluation
 from unique_toolkit.agentic.evaluation.exception import EvaluatorException
 from unique_toolkit.agentic.evaluation.schemas import (
@@ -292,7 +292,9 @@ class SubAgentEvaluationService(Evaluation):
             MessagesBuilder()
             .system_message_append(self._config.summarization_system_message)
             .user_message_append(
-                Template(self._config.summarization_user_message_template).render(
+                sandboxed_template(
+                    self._config.summarization_user_message_template
+                ).render(
                     sub_agents=sub_agents_display_data,
                 )
             )

{unique_toolkit-2026.46.0.dev2 → unique_toolkit-2026.46.0.dev4}/unique_toolkit/language_model/model_costs.py

@@ -145,7 +145,12 @@ def calculate_invocation_cost_usd(
     token_usage: LanguageModelTokenUsage,
     catalog: ModelCostCatalog | None = None,
 ) -> float | None:
-    """Calculate invocation cost using prompt and completion token totals."""
+    """Calculate invocation cost, pricing cache reads and writes at their own rates.
+
+    Mirrors node-chat's ``ModelCostService.computeSpent`` so debug-info spend and
+    the platform ledger agree. Cache reads and writes are counted inside
+    ``prompt_tokens``; a row without a cache rate bills them at ``input``.
+    """
 
     if token_usage.prompt_tokens is None or token_usage.completion_tokens is None:
         return None
@@ -163,10 +168,32 @@ def calculate_invocation_cost_usd(
     if model_cost is None:
         return None
 
-    input_multiplier, completion_multiplier = model_cost.multipliers_for(
-        token_usage.prompt_tokens
+    prompt_tokens = token_usage.prompt_tokens
+    cache_read_tokens = min(token_usage.cached_tokens or 0, prompt_tokens)
+    cache_write_tokens = min(
+        token_usage.cache_write_tokens or 0, prompt_tokens - cache_read_tokens
+    )
+    uncached_tokens = prompt_tokens - cache_read_tokens - cache_write_tokens
+    cache_read_rate = (
+        model_cost.cached_input
+        if model_cost.cached_input is not None
+        else model_cost.input
     )
+    # The usage payload does not say which TTL a write used; node-chat bills an
+    # unsplit write at the 5-minute rate too.
+    cache_write_rate = (
+        model_cost.cache_write
+        if model_cost.cache_write is not None
+        else model_cost.input
+    )
+
+    input_multiplier, completion_multiplier = model_cost.multipliers_for(prompt_tokens)
     return (
-        token_usage.prompt_tokens * model_cost.input * input_multiplier
+        (
+            uncached_tokens * model_cost.input
+            + cache_read_tokens * cache_read_rate
+            + cache_write_tokens * cache_write_rate
+        )
+        * input_multiplier
         + token_usage.completion_tokens * model_cost.completion * completion_multiplier
     ) / _TOKENS_PER_MILLION