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

Update routes.go

Browse Source
This commit is contained in:
Bruce MacDonald 2024-02-16 13:50:59 -04:00
parent d5ad9238aa
commit dbb966587e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/routes.go
View File

@ -1092,12 +1092,12 @@ func streamResponse(c *gin.Context, ch chan any) {
}
// ChatPrompt builds up a prompt from a series of messages for the currently `loaded` model
func chatPrompt(ctx context.Context, model *Model, messages []api.Message) (string, error) {
func chatPrompt(ctx context.Context, template, system string, messages []api.Message, numCtx int) (string, error) {
encode := func(s string) ([]int, error) {
return loaded.runner.Encode(ctx, s)
}
prompt, err := ChatPrompt(model.Template, model.System, messages, loaded.Options.NumCtx, encode)
prompt, err := ChatPrompt(template, system, messages, numCtx, encode)
if err != nil {
return "", err
}
@ -1167,7 +1167,7 @@ func ChatHandler(c *gin.Context) {
checkpointLoaded := time.Now()
prompt, err := chatPrompt(c.Request.Context(), model, req.Messages)
prompt, err := chatPrompt(c.Request.Context(), model.Template, model.System, req.Messages, opts.NumCtx)
if err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return