baalajimaestro/ollama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

append image tags to user content

Browse source
This commit is contained in:
Michael Yang 2024-01-31 16:31:29 -08:00
parent a896079705
commit b4e11be8ef
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
server/images.go
View file

@ -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)

4
server/routes.go
View file

@ -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()})