highperfocused/ollama
1
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2025-08-03 03:03:28 +02: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

7
server/prompt.go
View File

@@ -91,7 +91,7 @@ func countTokens(tmpl string, system string, prompt string, response string, enc
}
// ChatPrompt builds up a prompt from a series of messages, truncating based on context window size
func ChatPrompt(tmpl string, system string, messages []api.Message, window int, encode func(string) ([]int, error)) (string, error) {
func ChatPrompt(tmpl string, messages []api.Message, window int, encode func(string) ([]int, error)) (string, error) {
type prompt struct {
System string
Prompt string
@@ -103,11 +103,6 @@ func ChatPrompt(tmpl string, system string, messages []api.Message, window int,
var p prompt
// Set the first system prompt to the model's system prompt
if system != "" {
p.System = system
}
// iterate through messages to build up {system,user,response} prompts
var imgId int
var prompts []prompt