highperfocused/ollama
1
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2025-11-11 11:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: chat system prompting overrides (#2542)

Browse Source
This commit is contained in:
Bruce MacDonald
2024-02-16 14:42:43 -05:00
committed by GitHub
parent 9774663013
commit 88622847c6
4 changed files with 24 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
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, messages []api.Message) (string, error) {
func chatPrompt(ctx context.Context, template string, messages []api.Message, numCtx int) (string, error) {
encode := func(s string) ([]int, error) {
return loaded.runner.Encode(ctx, s)
}
prompt, err := ChatPrompt(loaded.Model.Template, loaded.Model.System, messages, loaded.Options.NumCtx, encode)
prompt, err := ChatPrompt(template, messages, numCtx, encode)
if err != nil {
return "", err
}
@@ -1167,7 +1167,17 @@ func ChatHandler(c *gin.Context) {
checkpointLoaded := time.Now()
prompt, err := chatPrompt(c.Request.Context(), req.Messages)
// if the first message is not a system message, then add the model's default system message
if len(req.Messages) > 0 && req.Messages[0].Role != "system" {
req.Messages = append([]api.Message{
{
Role: "system",
Content: model.System,
},
}, req.Messages...)
}
prompt, err := chatPrompt(c.Request.Context(), model.Template, req.Messages, opts.NumCtx)
if err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return