mirrors/ollama
1
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2025-05-11 18:36:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

parse tool call as individual objects

Browse source
This commit is contained in:
Michael Yang 2024-07-17 11:02:36 -07:00
parent 5b82960df8
commit 5fd6988126
4 changed files with 76 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
server/model.go
View file

@ -344,7 +344,9 @@ func (m *Model) parseToolCalls(s string) ([]api.ToolCall, bool) {
var objs []map[string]any
for offset := 0; offset < len(s); {
if err := json.NewDecoder(strings.NewReader(s[offset:])).Decode(&objs); errors.Is(err, io.EOF) {
var obj map[string]any
decoder := json.NewDecoder(strings.NewReader(s[offset:]))
if err := decoder.Decode(&obj); errors.Is(err, io.EOF) {
break
} else if syntax := &(json.SyntaxError{}); errors.As(err, &syntax) {
// skip over any syntax errors
@ -355,8 +357,8 @@ func (m *Model) parseToolCalls(s string) ([]api.ToolCall, bool) {
} else if err != nil {
return nil, false
} else {
// break when an object is decoded
break
offset += int(decoder.InputOffset())
objs = append(objs, obj)
}
}