[Bugfix][Frontend] Emit non-ASCII tool-call arguments without \uXXXX escapes (#46308)
Signed-off-by: EazyReal <8047065+EazyReal@users.noreply.github.com> Co-authored-by: EazyReal <8047065+EazyReal@users.noreply.github.com>
This commit is contained in:
@@ -144,7 +144,7 @@ class HunyuanA13BToolParser(ToolParser):
|
||||
function=FunctionCall(
|
||||
name=call["name"],
|
||||
arguments=(
|
||||
json.dumps(call["arguments"])
|
||||
json.dumps(call["arguments"], ensure_ascii=False)
|
||||
if isinstance(call["arguments"], dict)
|
||||
else call["arguments"]
|
||||
),
|
||||
|
||||
@@ -528,7 +528,7 @@ class SeedOssToolParser(ToolParser):
|
||||
'"'
|
||||
+ self.current_param_name
|
||||
+ '": "'
|
||||
+ json.dumps(param_value)[1:-1]
|
||||
+ json.dumps(param_value, ensure_ascii=False)[1:-1]
|
||||
+ '"'
|
||||
)
|
||||
else:
|
||||
@@ -536,7 +536,7 @@ class SeedOssToolParser(ToolParser):
|
||||
', "'
|
||||
+ self.current_param_name
|
||||
+ '": "'
|
||||
+ json.dumps(param_value)[1:-1]
|
||||
+ json.dumps(param_value, ensure_ascii=False)[1:-1]
|
||||
+ '"'
|
||||
)
|
||||
|
||||
@@ -571,11 +571,11 @@ class SeedOssToolParser(ToolParser):
|
||||
# Calculate incremental JSON
|
||||
full_value = self.current_param_value + value_chunk
|
||||
prev_escaped = (
|
||||
json.dumps(self.current_param_value)[1:-1]
|
||||
json.dumps(self.current_param_value, ensure_ascii=False)[1:-1]
|
||||
if self.current_param_value
|
||||
else ""
|
||||
)
|
||||
full_escaped = json.dumps(full_value)[1:-1]
|
||||
full_escaped = json.dumps(full_value, ensure_ascii=False)[1:-1]
|
||||
delta_escaped = full_escaped[len(prev_escaped) :]
|
||||
|
||||
self.in_param = False
|
||||
@@ -606,12 +606,16 @@ class SeedOssToolParser(ToolParser):
|
||||
if value_chunk:
|
||||
# Stream the escaped delta
|
||||
prev_escaped = (
|
||||
json.dumps(self.current_param_value)[1:-1]
|
||||
json.dumps(self.current_param_value, ensure_ascii=False)[
|
||||
1:-1
|
||||
]
|
||||
if self.current_param_value
|
||||
else ""
|
||||
)
|
||||
self.current_param_value += value_chunk
|
||||
full_escaped = json.dumps(self.current_param_value)[1:-1]
|
||||
full_escaped = json.dumps(
|
||||
self.current_param_value, ensure_ascii=False
|
||||
)[1:-1]
|
||||
delta_escaped = full_escaped[len(prev_escaped) :]
|
||||
|
||||
if delta_escaped:
|
||||
|
||||
@@ -165,7 +165,7 @@ class xLAMToolParser(ToolParser):
|
||||
function=FunctionCall(
|
||||
name=call["name"],
|
||||
arguments=(
|
||||
json.dumps(call["arguments"])
|
||||
json.dumps(call["arguments"], ensure_ascii=False)
|
||||
if isinstance(call["arguments"], dict)
|
||||
else call["arguments"]
|
||||
),
|
||||
@@ -473,7 +473,9 @@ class xLAMToolParser(ToolParser):
|
||||
):
|
||||
current_tool = parsed_tools[current_idx]
|
||||
if isinstance(current_tool.get("arguments"), dict):
|
||||
args_text = json.dumps(current_tool["arguments"])
|
||||
args_text = json.dumps(
|
||||
current_tool["arguments"], ensure_ascii=False
|
||||
)
|
||||
else:
|
||||
args_text = str(current_tool.get("arguments", "{}"))
|
||||
except (json.JSONDecodeError, KeyError, IndexError):
|
||||
|
||||
Reference in New Issue
Block a user