File size: 17,733 Bytes
e5034c3 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 | use std::collections::BTreeMap;
use forge_json_repair::json_repair;
use serde::{Deserialize, Serialize};
use serde_json::value::RawValue;
use serde_json::{Map, Value};
use crate::Error;
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum ToolCallArguments {
Unparsed(String),
Parsed(Value),
}
impl Serialize for ToolCallArguments {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
{
match self {
ToolCallArguments::Unparsed(value) => {
// Use RawValue to serialize the JSON string without double serialization
match RawValue::from_string(value.clone()) {
Ok(raw) => raw.serialize(serializer),
Err(_) => value.serialize(serializer), // Fallback if not valid JSON
}
}
ToolCallArguments::Parsed(value) => value.serialize(serializer),
}
}
}
impl<'de> Deserialize<'de> for ToolCallArguments {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: serde::Deserializer<'de>,
{
let value = Value::deserialize(deserializer)?;
// Handle case where API sends arguments as a string containing JSON
// e.g., "{\"key\": \"value\"}" instead of {"key": "value"}
if let Value::String(json_str) = &value {
if let Ok(repaired) = json_repair(json_str) {
return Ok(ToolCallArguments::Parsed(repaired));
}
// If json_repair fails, fall back to storing as Unparsed
return Ok(ToolCallArguments::Unparsed(json_str.clone()));
}
Ok(ToolCallArguments::Parsed(value))
}
}
impl Default for ToolCallArguments {
fn default() -> Self {
ToolCallArguments::Parsed(Value::Object(Map::new()))
}
}
impl ToolCallArguments {
pub fn into_string(self) -> String {
match self {
ToolCallArguments::Unparsed(str) => str,
ToolCallArguments::Parsed(value) => value.to_string(),
}
}
/// Normalizes the arguments by converting `Unparsed` strings into
/// structured JSON values when possible.
///
/// This is used for persisted conversations that may contain tool call
/// arguments saved as raw strings. If repair succeeds, the arguments become
/// `Parsed`. If repair fails, the raw content is preserved inside a
/// fallback object so downstream request builders always receive
/// structured JSON.
pub fn normalize(self) -> Self {
match self {
ToolCallArguments::Unparsed(json_str) => {
// Try to parse the string as JSON
if let Ok(repaired) = json_repair(&json_str) {
ToolCallArguments::Parsed(repaired)
} else {
// If it's not valid JSON, create a fallback object with the raw content
// This ensures we always send valid JSON to the API
let mut map = Map::new();
map.insert("_raw_content".to_string(), Value::String(json_str));
ToolCallArguments::Parsed(Value::Object(map))
}
}
ToolCallArguments::Parsed(_) => self,
}
}
pub fn parse(&self) -> Result<Value, Error> {
match self {
ToolCallArguments::Unparsed(json) => {
Ok(
json_repair(json).map_err(|error| crate::Error::ToolCallArgument {
error,
args: json.to_owned(),
})?,
)
}
ToolCallArguments::Parsed(value) => Ok(value.to_owned()),
}
}
pub fn from_json(str: &str) -> Self {
ToolCallArguments::Unparsed(str.to_string())
}
pub fn from_parameters(object: BTreeMap<String, String>) -> ToolCallArguments {
let mut map = Map::new();
for (key, value) in object {
map.insert(key, convert_string_to_value(&value));
}
ToolCallArguments::Parsed(Value::Object(map))
}
}
fn convert_string_to_value(value: &str) -> Value {
// Try to parse as boolean first
match value.trim().to_lowercase().as_str() {
"true" => return Value::Bool(true),
"false" => return Value::Bool(false),
_ => {}
}
// Try to parse as number
if let Ok(int_val) = value.parse::<i64>() {
return Value::Number(int_val.into());
}
if let Ok(float_val) = value.parse::<f64>() {
// Create number from float, handling special case where float is actually an
// integer
return if float_val.fract() == 0.0 {
Value::Number(serde_json::Number::from(float_val as i64))
} else if let Some(num) = serde_json::Number::from_f64(float_val) {
Value::Number(num)
} else {
Value::String(value.to_string())
};
}
// Default to string if no other type matches
Value::String(value.to_string())
}
impl From<Value> for ToolCallArguments {
fn from(value: Value) -> Self {
ToolCallArguments::Parsed(value)
}
}
#[cfg(test)]
mod tests {
use pretty_assertions::assert_eq;
use serde_json::json;
use super::*;
#[test]
fn test_serialize_unparsed_valid_json() {
let fixture = ToolCallArguments::from_json(r#"{"param": "value", "count": 42}"#);
let actual = serde_json::to_string(&fixture).unwrap();
// The RawValue preserves the original JSON string when it's valid
let expected = r#"{"param": "value", "count": 42}"#;
assert_eq!(actual, expected);
}
#[test]
fn test_serialize_unparsed_valid_json_array() {
let fixture = ToolCallArguments::from_json(r#"["item1", "item2", 123]"#);
let actual = serde_json::to_string(&fixture).unwrap();
// The RawValue preserves the original JSON string when it's valid
let expected = r#"["item1", "item2", 123]"#;
assert_eq!(actual, expected);
}
#[test]
fn test_serialize_unparsed_valid_json_nested() {
let fixture = ToolCallArguments::from_json(
r#"{"user": {"name": "John", "settings": {"theme": "dark"}}}"#,
);
let actual = serde_json::to_string(&fixture).unwrap();
// The RawValue preserves the original JSON string when it's valid
let expected = r#"{"user": {"name": "John", "settings": {"theme": "dark"}}}"#;
assert_eq!(actual, expected);
}
#[test]
fn test_serialize_unparsed_valid_json_compact() {
let fixture = ToolCallArguments::from_json(r#"{"param":"value","count":42}"#);
let actual = serde_json::to_string(&fixture).unwrap();
// The RawValue preserves the original JSON string when it's valid
let expected = r#"{"param":"value","count":42}"#;
assert_eq!(actual, expected);
}
#[test]
fn test_serialize_unparsed_invalid_json() {
let fixture = ToolCallArguments::from_json(r#"{"param": "value", invalid}"#);
let actual = serde_json::to_string(&fixture).unwrap();
let expected = r#""{\"param\": \"value\", invalid}""#;
assert_eq!(actual, expected);
}
#[test]
fn test_serialize_unparsed_malformed_json() {
let fixture = ToolCallArguments::from_json("not json at all");
let actual = serde_json::to_string(&fixture).unwrap();
let expected = r#""not json at all""#;
assert_eq!(actual, expected);
}
#[test]
fn test_deserialize_stringified_json_object() {
// Simulates kimi-k2p5-turbo sending "arguments": "{\"key\": \"value\"}"
// The outer quotes make it a JSON string, inside we have escaped JSON
let json_str = r#""{\"file_path\": \"/test\", \"content\": \"hello\"}""#;
let actual: ToolCallArguments = serde_json::from_str(json_str).unwrap();
let expected = ToolCallArguments::Parsed(json!({
"file_path": "/test",
"content": "hello"
}));
assert_eq!(actual, expected);
}
#[test]
fn test_roundtrip_stringified_json() {
// Start with stringified JSON, deserialize, then serialize back
let original = r#""{\"param\": \"value\", \"count\": 42}""#;
let deserialized: ToolCallArguments = serde_json::from_str(original).unwrap();
// After roundtrip, should be a proper JSON object (not a string)
let serialized = serde_json::to_string(&deserialized).unwrap();
let reparsed: Value = serde_json::from_str(&serialized).unwrap();
// Should be an object, not a string
assert!(
reparsed.is_object(),
"Should be JSON object, got: {}",
serialized
);
assert_eq!(reparsed["param"], "value");
assert_eq!(reparsed["count"], 42);
}
#[test]
fn test_serialize_unparsed_empty_string() {
let fixture = ToolCallArguments::from_json("");
let actual = serde_json::to_string(&fixture).unwrap();
// Empty string is not valid JSON, so it falls back to string serialization
// which produces a JSON string (quoted)
assert_eq!(actual, "\"\"");
}
#[test]
fn test_serialize_parsed_object() {
let fixture = ToolCallArguments::Parsed(json!({
"name": "test",
"value": 42,
"enabled": true
}));
let actual = serde_json::to_string(&fixture).unwrap();
let expected = r#"{"enabled":true,"name":"test","value":42}"#;
assert_eq!(actual, expected);
}
#[test]
fn test_serialize_parsed_array() {
let fixture = ToolCallArguments::Parsed(json!(["a", "b", 123, true, null]));
let actual = serde_json::to_string(&fixture).unwrap();
let expected = r#"["a","b",123,true,null]"#;
assert_eq!(actual, expected);
}
#[test]
fn test_serialize_parsed_primitive_string() {
let fixture = ToolCallArguments::Parsed(json!("simple string"));
let actual = serde_json::to_string(&fixture).unwrap();
let expected = r#""simple string""#;
assert_eq!(actual, expected);
}
#[test]
fn test_serialize_parsed_primitive_number() {
let fixture = ToolCallArguments::Parsed(json!(42));
let actual = serde_json::to_string(&fixture).unwrap();
let expected = "42";
assert_eq!(actual, expected);
}
#[test]
fn test_serialize_parsed_primitive_boolean() {
let fixture = ToolCallArguments::Parsed(json!(true));
let actual = serde_json::to_string(&fixture).unwrap();
let expected = "true";
assert_eq!(actual, expected);
}
#[test]
fn test_serialize_parsed_null() {
let fixture = ToolCallArguments::Parsed(json!(null));
let actual = serde_json::to_string(&fixture).unwrap();
let expected = "null";
assert_eq!(actual, expected);
}
#[test]
fn test_deserialize_valid_json_object() {
let json_str = r#"{"param": "value", "count": 42}"#;
let actual: ToolCallArguments = serde_json::from_str(json_str).unwrap();
let expected = ToolCallArguments::Parsed(json!({
"param": "value",
"count": 42
}));
assert_eq!(actual, expected);
}
#[test]
fn test_deserialize_valid_json_array() {
let json_str = r#"["item1", "item2", 123]"#;
let actual: ToolCallArguments = serde_json::from_str(json_str).unwrap();
let expected = ToolCallArguments::Parsed(json!(["item1", "item2", 123]));
assert_eq!(actual, expected);
}
#[test]
fn test_deserialize_primitive_string() {
let json_str = r#""simple string""#;
let actual: ToolCallArguments = serde_json::from_str(json_str).unwrap();
let expected = ToolCallArguments::Parsed(json!("simple string"));
assert_eq!(actual, expected);
}
#[test]
fn test_roundtrip_unparsed_valid_json() {
let original_json = r#"{"param": "value", "count": 42}"#;
let fixture = ToolCallArguments::from_json(original_json);
let serialized = serde_json::to_string(&fixture).unwrap();
let deserialized: ToolCallArguments = serde_json::from_str(&serialized).unwrap();
let expected = ToolCallArguments::Parsed(json!({
"param": "value",
"count": 42
}));
assert_eq!(deserialized, expected);
}
#[test]
fn test_roundtrip_parsed_value() {
let fixture = ToolCallArguments::Parsed(json!({
"name": "test",
"value": 42,
"enabled": true
}));
let serialized = serde_json::to_string(&fixture).unwrap();
let actual: ToolCallArguments = serde_json::from_str(&serialized).unwrap();
let expected = fixture;
assert_eq!(actual, expected);
}
#[test]
fn test_parse_unparsed_valid_json() {
let fixture = ToolCallArguments::from_json(r#"{"param": "value"}"#);
let actual = fixture.parse().unwrap();
let expected = json!({"param": "value"});
assert_eq!(actual, expected);
}
#[test]
fn test_parse_unparsed_invalid_json_with_repair() {
let fixture = ToolCallArguments::from_json(r#"{"param": "value", "missing_quote": true"#);
let actual = fixture.parse().unwrap();
let expected = json!({"param": "value", "missing_quote": true});
assert_eq!(actual, expected);
}
#[test]
fn test_parse_parsed_value() {
let value = json!({"param": "value"});
let fixture = ToolCallArguments::Parsed(value.clone());
let actual = fixture.parse().unwrap();
let expected = value;
assert_eq!(actual, expected);
}
#[test]
fn test_from_parameters() {
let mut params = BTreeMap::new();
params.insert("name".to_string(), "John".to_string());
params.insert("age".to_string(), "30".to_string());
params.insert("active".to_string(), "true".to_string());
params.insert("score".to_string(), "95.5".to_string());
let actual = ToolCallArguments::from_parameters(params);
let expected = ToolCallArguments::Parsed(json!({
"name": "John",
"age": 30,
"active": true,
"score": 95.5
}));
assert_eq!(actual, expected);
}
#[test]
fn test_normalize_unparsed_json_string() {
// Test that stringified JSON gets normalized to Parsed
let fixture = ToolCallArguments::from_json(r#"{"file_path": "/test", "content": "hello"}"#);
let normalized = fixture.normalize();
// Should be converted to Parsed
match normalized {
ToolCallArguments::Parsed(value) => {
assert_eq!(value["file_path"], "/test");
assert_eq!(value["content"], "hello");
}
ToolCallArguments::Unparsed(_) => panic!("Should be Parsed after normalization"),
}
}
#[test]
fn test_normalize_parsed_value_unchanged() {
// Test that already Parsed values stay as Parsed
let fixture = ToolCallArguments::Parsed(json!({"key": "value"}));
let normalized = fixture.normalize();
match normalized {
ToolCallArguments::Parsed(value) => assert_eq!(value["key"], "value"),
ToolCallArguments::Unparsed(_) => panic!("Should remain Parsed"),
}
}
#[test]
fn test_normalize_malformed_json_from_dump() {
// Test the exact malformed JSON from the kimi dump
let fixture = ToolCallArguments::from_json(r#"{" ,"replace_all": false}"#);
let normalized = fixture.normalize();
// When JSON can't be repaired, it should create a fallback object
match normalized {
ToolCallArguments::Parsed(value) => {
// Should contain the raw content in a fallback object
assert!(
value.get("_raw_content").is_some(),
"Expected fallback object with _raw_content, got: {:?}",
value
);
}
ToolCallArguments::Unparsed(_) => {
panic!("Should be Parsed (with fallback) even for malformed JSON")
}
}
}
#[test]
fn test_normalize_real_kimi_string() {
// Test with a realistic kimi-k2p5-turbo stringified argument
let json_str = r#"{"file_path": "/home/kassie/projects/test.ts", "new_string": "import { parseArgs } from \"util\";\nimport { aiCommand } from \"./commands/ai\";", "old_string": "old", "replace_all": false}"#;
let fixture = ToolCallArguments::from_json(json_str);
let normalized = fixture.normalize();
match &normalized {
ToolCallArguments::Parsed(value) => {
assert_eq!(value["file_path"], "/home/kassie/projects/test.ts");
assert_eq!(value["replace_all"], false);
}
ToolCallArguments::Unparsed(s) => {
panic!("Should have parsed valid JSON, but got Unparsed: {}", s);
}
}
}
#[test]
fn test_into_string_unparsed() {
let fixture = ToolCallArguments::from_json(r#"{"param": "value"}"#);
let actual = fixture.into_string();
let expected = r#"{"param": "value"}"#;
assert_eq!(actual, expected);
}
#[test]
fn test_into_string_parsed() {
let fixture = ToolCallArguments::Parsed(json!({"param": "value"}));
let actual = fixture.into_string();
let expected = r#"{"param":"value"}"#;
assert_eq!(actual, expected);
}
}
|