mirror of
https://github.com/tcsenpai/ollama.git
synced 2025-06-08 12:15:22 +00:00
append image tags to user content
This commit is contained in:
parent
a896079705
commit
b4e11be8ef
@ -179,8 +179,13 @@ func (m *Model) ChatPrompts(msgs []api.Message) (*ChatHistory, error) {
|
|||||||
prompts = append(prompts, currentVars)
|
prompts = append(prompts, currentVars)
|
||||||
currentVars = PromptVars{}
|
currentVars = PromptVars{}
|
||||||
}
|
}
|
||||||
|
|
||||||
currentVars.Prompt = msg.Content
|
currentVars.Prompt = msg.Content
|
||||||
currentImages = msg.Images
|
for i := range msg.Images {
|
||||||
|
currentVars.Prompt += fmt.Sprintf(" [img-%d]", len(currentImages)+i)
|
||||||
|
}
|
||||||
|
|
||||||
|
currentImages = append(currentImages, msg.Images...)
|
||||||
case "assistant":
|
case "assistant":
|
||||||
currentVars.Response = msg.Content
|
currentVars.Response = msg.Content
|
||||||
prompts = append(prompts, currentVars)
|
prompts = append(prompts, currentVars)
|
||||||
|
@ -244,6 +244,10 @@ func GenerateHandler(c *gin.Context) {
|
|||||||
promptVars.System = model.System
|
promptVars.System = model.System
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for i := range req.Images {
|
||||||
|
promptVars.Prompt += fmt.Sprintf(" [img-%d]", i)
|
||||||
|
}
|
||||||
|
|
||||||
p, err := model.PreResponsePrompt(promptVars)
|
p, err := model.PreResponsePrompt(promptVars)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
||||||
|
Loading…
x
Reference in New Issue
Block a user