423A35C7/LLaMA-Factory
1
0
Fork 0
mirror of https://github.com/hiyouga/LLaMA-Factory.git synced 2026-11-07 07:30:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

[data] fix: parse nested JSON literals in LFM2 tools (#10940)

Browse Source 
Co-authored-by: LimbC-C <329404569+LimbC-C@users.noreply.github.com>
This commit is contained in:
LimbC-C
2026-11-06 15:41:40 +08:00
committed by GitHub
parent 702005ce52
commit 26a19a559e
2 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/data/test_formatter.py
View File

@@ -449,6 +449,30 @@ def test_lfm2_tool_round_trip():
assert json.loads(extracted[0][1]) == original["arguments"]
@pytest.mark.runs_on(["cpu", "mps", "xpu"])
@pytest.mark.parametrize(
"arguments",
[
{"options": {"enabled": True, "fallback": None}},
{"items": [True, False, None]},
{"options": [{"active": [True, False, None], "label": "true false null"}]},
{"enabled": True, "fallback": None},
],
)
def test_lfm2_tool_round_trip_nested_json_literals(arguments):
formatter = FunctionFormatter(slots=["{{content}}"], tool_format="lfm2")
extractor = ToolFormatter(tool_format="lfm2")
rendered = formatter.apply(content=json.dumps({"name": "test_tool", "arguments": arguments}))[0]
assert extractor.extract(rendered) == [("test_tool", json.dumps(arguments, ensure_ascii=False))]
@pytest.mark.runs_on(["cpu", "mps", "xpu"])
@pytest.mark.parametrize("value", ['{"enabled": unknown}', "[1 + 2]"])
def test_lfm2_tool_extractor_rejects_nonliteral_values(value):
content = f"<|tool_call_start|>[test_tool(options={value})]<|tool_call_end|>"
assert ToolFormatter(tool_format="lfm2").extract(content) == content
@pytest.mark.runs_on(["cpu", "mps", "xpu"])
def test_minicpm5_function_formatter():
formatter = FunctionFormatter(slots=["{{content}}<|im_end|>\n"], tool_format="minicpm5")