renderers 0.1.13.dev17__tar.gz → 0.1.13.dev21__tar.gz

{renderers-0.1.13.dev17 → renderers-0.1.13.dev21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: renderers
-Version: 0.1.13.dev17
+Version: 0.1.13.dev21
 Summary: Chat template renderers — deterministic message-to-token conversion for LLM training
 License-Expression: Apache-2.0
 License-File: LICENSE

{renderers-0.1.13.dev17 → renderers-0.1.13.dev21}/renderers/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.1.13.dev17'
-__version_tuple__ = version_tuple = (0, 1, 13, 'dev17')
+__version__ = version = '0.1.13.dev21'
+__version_tuple__ = version_tuple = (0, 1, 13, 'dev21')
 
 __commit_id__ = commit_id = None

{renderers-0.1.13.dev17 → renderers-0.1.13.dev21}/renderers/glm45.py

@@ -517,12 +517,14 @@ class GLM45Renderer:
         elif content.strip():
             emit_text("\n" + content.strip(), msg_idx, is_sampled=True, is_content=True)
 
-        for tc in tool_calls:
+        for tc_idx, tc in enumerate(tool_calls):
             func = tc.get("function") or tc
             name = func.get("name", "")
             arguments = func.get("arguments", {})
 
-            if not content.strip():
+            # The template opens every call with "\n<tool_call>"; only the
+            # first call's "\n" is already carried by the content text above.
+            if tc_idx > 0 or not content.strip():
                 emit_text("\n", msg_idx, is_sampled=True, is_content=True)
             emit_special(self._tool_call_tok, msg_idx, is_sampled=True, is_content=True)
             emit_text(name + "\n", msg_idx, is_sampled=True, is_content=True)

{renderers-0.1.13.dev17 → renderers-0.1.13.dev21}/renderers/nemotron3.py

@@ -428,16 +428,16 @@ class Nemotron3Renderer:
             content = self._render_content(msg.get("content"))
             msg_orig_idx = orig_idx(i)
 
-            if role == "system":
-                if i != 0:
-                    raise ValueError("System message must be at the beginning.")
+            if role == "system" and i == 0:
                 continue  # Already handled above
 
-            elif role == "user":
+            elif role in ("user", "system"):
+                # The template renders a later system message through the
+                # user branch, under its own role header.
                 emit_special(
                     self._im_start, msg_orig_idx, is_sampled=False, is_content=False
                 )
-                user_segments: list[tuple[str, bool]] = [("user\n", False)]
+                user_segments: list[tuple[str, bool]] = [(f"{role}\n", False)]
                 if content:
                     user_segments.append((content, True))
                 # Reasoning-effort hint rides on the LAST user message only,

{renderers-0.1.13.dev17 → renderers-0.1.13.dev21}/tests/parity.py

@@ -202,6 +202,7 @@ MODEL_CATALOG = (
             "tool-call-content",
             "tool-call-none",
             "multiple-tool-calls",
+            "multiple-tool-calls-content",
             "tool-response",
             "named-tool-response",
             "consecutive-tool-responses",
@@ -217,6 +218,7 @@ MODEL_CATALOG = (
             "tool-call-content",
             "tool-call-none",
             "multiple-tool-calls",
+            "multiple-tool-calls-content",
             "tool-response",
             "named-tool-response",
             "consecutive-tool-responses",
@@ -246,7 +248,11 @@ MODEL_CATALOG = (
     _model(
         "meta-llama/Llama-3.2-1B-Instruct",
         bridge=True,
-        excluded={"multiple-tool-calls", "consecutive-tool-responses"},
+        excluded={
+            "multiple-tool-calls",
+            "multiple-tool-calls-content",
+            "consecutive-tool-responses",
+        },
         oracle_defaults={"date_string": "26 Jul 2024"},
         extra_suites={"llama-checkpoints"},
     ),
@@ -254,7 +260,11 @@ MODEL_CATALOG = (
         "meta-llama/Llama-3.2-3B-Instruct",
         shared=False,
         roundtrip=False,
-        excluded={"multiple-tool-calls", "consecutive-tool-responses"},
+        excluded={
+            "multiple-tool-calls",
+            "multiple-tool-calls-content",
+            "consecutive-tool-responses",
+        },
         oracle_defaults={"date_string": "26 Jul 2024"},
         extra_suites={"llama-checkpoints"},
     ),
@@ -486,6 +496,21 @@ SCENARIOS = (
         ],
         tools=TOOLS,
     ),
+    _scenario(
+        "multiple-tool-calls-content",
+        [
+            {"role": "user", "content": "Weather in Paris and London?"},
+            {
+                "role": "assistant",
+                "content": "Let me check both.",
+                "tool_calls": [
+                    _call("Paris", id="call_1"),
+                    _call("London", id="call_2"),
+                ],
+            },
+        ],
+        tools=TOOLS,
+    ),
     _scenario(
         "tool-response",
         [
@@ -660,7 +685,13 @@ SCENARIOS = (
             {"role": "system", "content": "Late instruction"},
             {"role": "user", "content": "B"},
         ],
-        only_renderers={"laguna-xs-2.1", "laguna-s-2.1"},
+        only_renderers={
+            "laguna-xs-2.1",
+            "laguna-s-2.1",
+            "nemotron-3",
+            "nemotron-3-ultra",
+            "nemotron-3.5",
+        },
     ),
     _scenario(
         "tool-declare-message",