third-party-mirrors/ollama
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: when tools exists, but no call function response is empty

Browse Source
This commit is contained in:
venjiang 2024-08-26 16:27:44 +08:00
parent e990dec90f
commit 79379daab4
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/routes.go
View File

@ -1415,11 +1415,9 @@ func (s *Server) ChatHandler(c *gin.Context) {
// no stream response
if req.Stream != nil && !*req.Stream {
var resp api.ChatResponse
// var sb strings.Builder
for rr := range ch {
switch t := rr.(type) {
case api.ChatResponse:
// sb.WriteString(t.Message.Content)
resp = t
case gin.H:
msg, ok := t["error"].(string)
@ -1435,14 +1433,14 @@ func (s *Server) ChatHandler(c *gin.Context) {
}
}
// resp.Message.Content = sb.String()
content := <-contentCh
resp.Message.Content = content
if toolsRequired {
// if toolCalls, ok := m.parseToolCalls(sb.String()); ok {
resp.Message.ToolCalls = <-toolCallsCh
resp.Message.Content = ""
// }
toolCalls := <-toolCallsCh
if len(toolCalls) > 0 {
resp.Message.ToolCalls = toolCalls
resp.Message.Content = ""
}
}
c.JSON(http.StatusOK, resp)