jeans/ollama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rm comments

Browse Source
This commit is contained in:
Roy Han 2024-07-29 17:02:03 -07:00
parent d2b25c1bfb
commit 7950053972
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/model.go
View File

@ -15,7 +15,6 @@ import (
"slices" "slices"
"strings" "strings"
"text/template/parse" "text/template/parse"
"time"
"github.com/ollama/ollama/api" "github.com/ollama/ollama/api"
"github.com/ollama/ollama/convert" "github.com/ollama/ollama/convert"
@ -313,7 +312,6 @@ func detectContentType(r io.Reader) (string, error) {
// mxyng: this only really works if the input contains tool calls in some JSON format // mxyng: this only really works if the input contains tool calls in some JSON format
func (m *Model) parseToolCalls(s string) ([]api.ToolCall, bool) { func (m *Model) parseToolCalls(s string) ([]api.ToolCall, bool) {
// create a subtree from the node that ranges over .ToolCalls // create a subtree from the node that ranges over .ToolCalls
start := time.Now()
tmpl := m.Template.Subtree(func(n parse.Node) bool { tmpl := m.Template.Subtree(func(n parse.Node) bool {
if t, ok := n.(*parse.RangeNode); ok { if t, ok := n.(*parse.RangeNode); ok {
return slices.Contains(template.Identifiers(t.Pipe), "ToolCalls") return slices.Contains(template.Identifiers(t.Pipe), "ToolCalls")
@ -417,7 +415,5 @@ func (m *Model) parseToolCalls(s string) ([]api.ToolCall, bool) {
} }
} }
end := time.Now()
slog.Debug("parseToolCalls", "duration", end.Sub(start).String())
return toolCalls, len(toolCalls) > 0 return toolCalls, len(toolCalls) > 0
} }