mirror of
https://github.com/tcsenpai/ollama.git
synced 2025-06-07 03:35:21 +00:00
fix prompt for non-mllama multimodal
This commit is contained in:
parent
c48e2cfc0d
commit
96a8b2f7d8
@ -84,25 +84,25 @@ func chatPrompt(ctx context.Context, m *Model, tokenize tokenizeFunc, opts *api.
|
|||||||
msgs[lastMsgIdx].Content = strings.TrimSpace("<|image|>" + msgs[lastMsgIdx].Content)
|
msgs[lastMsgIdx].Content = strings.TrimSpace("<|image|>" + msgs[lastMsgIdx].Content)
|
||||||
images = append(images, imgData)
|
images = append(images, imgData)
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
|
for cnt, msg := range msgs[currMsgIdx:] {
|
||||||
|
for _, i := range msg.Images {
|
||||||
|
imgData := llm.ImageData{
|
||||||
|
ID: len(images),
|
||||||
|
Data: i,
|
||||||
|
}
|
||||||
|
|
||||||
for cnt, msg := range msgs[currMsgIdx:] {
|
imageTag := fmt.Sprintf("[img-%d]", imgData.ID)
|
||||||
for _, i := range msg.Images {
|
prompt := msg.Content
|
||||||
imgData := llm.ImageData{
|
|
||||||
ID: len(images),
|
if !strings.Contains(prompt, "[img]") {
|
||||||
Data: i,
|
prompt = strings.TrimSpace("[img] " + prompt)
|
||||||
|
}
|
||||||
|
prompt = strings.Replace(prompt, "[img]", imageTag, 1)
|
||||||
|
msgs[currMsgIdx+cnt].Content = prompt
|
||||||
|
|
||||||
|
images = append(images, imgData)
|
||||||
}
|
}
|
||||||
|
|
||||||
imageTag := fmt.Sprintf("[img-%d]", imgData.ID)
|
|
||||||
prompt := msg.Content
|
|
||||||
|
|
||||||
if !strings.Contains(prompt, "[img]") {
|
|
||||||
prompt = strings.TrimSpace("[img] " + prompt)
|
|
||||||
}
|
|
||||||
prompt = strings.Replace(prompt, "[img]", imageTag, 1)
|
|
||||||
msgs[currMsgIdx+cnt].Content = prompt
|
|
||||||
|
|
||||||
images = append(images, imgData)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user