vxcontrol/langchaingo
1
0
Fork 0
mirror of https://github.com/vxcontrol/langchaingo.git synced 2026-07-21 00:45:22 -04:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge branch 'pr/932' into main-pull-requests

Browse Source
This commit is contained in:
Dmitry Ng
2025-05-06 18:42:53 +03:00
parent fb68577e1d 77f099cb3e
commit 4987300a76
2 changed files with 63 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
llms/marshaling.go
+8 -3
View File
@@ -245,10 +245,15 @@ func (tc *ToolCall) UnmarshalJSON(data []byte) error {
}
var fc FunctionCall
fcData, ok := toolCall["function"].(json.RawMessage)
if ok {
if err := json.Unmarshal(fcData, &fc); err != nil {
return fmt.Errorf("error unmarshalling function call: %w", err)
if !ok {
b, err := json.Marshal(toolCall["function"])
if err != nil {
return err
}
fcData = b
}
if err := json.Unmarshal(fcData, &fc); err != nil {
return fmt.Errorf("error unmarshalling function call: %w", err)
}
tc.ID = id
tc.Type = typ
llms/marshaling_test.go
+55 -7
View File
@@ -240,9 +240,12 @@ func TestUnmarshalJSONMessageContent(t *testing.T) {
Parts: []ContentPart{
TextContent{Text: "Hello there!"},
ToolCall{
ID: "t42",
Type: "function",
FunctionCall: &FunctionCall{Name: "get_current_weather", Arguments: `{ "location": "New York" }`},
ID: "t42",
Type: "function",
FunctionCall: &FunctionCall{
Name: "get_current_weather",
Arguments: `{ "location": "New York" }`,
},
},
},
},
@@ -397,7 +400,14 @@ role: user
in: MessageContent{
Role: "assistant",
Parts: []ContentPart{
ToolCall{Type: "function", ID: "t01", FunctionCall: &FunctionCall{Name: "get_current_weather", Arguments: `{ "location": "New York" }`}},
ToolCall{
Type: "function",
ID: "t01",
FunctionCall: &FunctionCall{
Name: "get_current_weather",
Arguments: `{ "location": "New York" }`,
},
},
},
},
},
@@ -406,8 +416,19 @@ role: user
in: MessageContent{
Role: "assistant",
Parts: []ContentPart{
ToolCall{Type: "function", ID: "tc01", FunctionCall: &FunctionCall{Name: "get_current_weather", Arguments: `{ "location": "New York" }`}},
ToolCall{Type: "function", ID: "tc02", FunctionCall: &FunctionCall{Name: "get_current_weather", Arguments: `{ "location": "Berlin" }`}},
ToolCall{
Type: "function",
ID: "tc01",
FunctionCall: &FunctionCall{
Name: "get_current_weather",
Arguments: `{ "location": "New York" }`,
},
},
ToolCall{
Type: "function",
ID: "tc02",
FunctionCall: &FunctionCall{Name: "get_current_weather", Arguments: `{ "location": "Berlin" }`},
},
},
},
assertedJSON: `{"role":"assistant","parts":[{"type":"tool_call","tool_call":{"function":{"name":"get_current_weather","arguments":"{ \"location\": \"New York\" }"},"id":"tc01","type":"function"}},{"type":"tool_call","tool_call":{"function":{"name":"get_current_weather","arguments":"{ \"location\": \"Berlin\" }"},"id":"tc02","type":"function"}}]}`,
@@ -443,7 +464,10 @@ role: assistant
in: MessageContent{
Role: "assistant",
Parts: []ContentPart{
ToolCall{Type: "hammer", FunctionCall: &FunctionCall{Name: "hit", Arguments: `{ "force": 10, "direction": "down" }`}},
ToolCall{
Type: "hammer",
FunctionCall: &FunctionCall{Name: "hit", Arguments: `{ "force": 10, "direction": "down" }`},
},
},
},
},
@@ -533,3 +557,27 @@ role: assistant
})
}
}
func TestToolCallSerialization(t *testing.T) {
t.Parallel()
toolCall := ToolCall{
ID: "test_id",
Type: "tool_call",
FunctionCall: &FunctionCall{
Name: "getIpLocation",
Arguments: `{"ip":"8.8.8.8"}`,
},
}
b, err := json.Marshal(toolCall)
if err != nil {
t.Fatal(err)
}
var unmarshalToolCall ToolCall
if e := json.Unmarshal(b, &unmarshalToolCall); e != nil {
t.Fatal(e)
}
if diff := cmp.Diff(toolCall, unmarshalToolCall); diff != "" {
t.Errorf("")
}
}