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

Refactor code. Remove extra variable.

Browse source
This commit is contained in:
Vyacheslav Moskalev 2024-08-01 19:56:15 +07:00
parent b0c216584c
commit 3b5210548e
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
server/routes.go
View file

@ -187,7 +187,6 @@ func (s *Server) GenerateHandler(c *gin.Context) {
values.Messages = append(msgs, api.Message{Role: "user", Content: req.Prompt}) values.Messages = append(msgs, api.Message{Role: "user", Content: req.Prompt})
} }
var s string
var b bytes.Buffer var b bytes.Buffer
if err := tmpl.Execute(&b, values); err != nil { if err := tmpl.Execute(&b, values); err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
@ -195,16 +194,15 @@ func (s *Server) GenerateHandler(c *gin.Context) {
} }
if req.Context != nil { if req.Context != nil {
prev, err := r.Detokenize(c.Request.Context(), req.Context) s, err := r.Detokenize(c.Request.Context(), req.Context)
if err != nil { if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return return
} }
s += prev prompt = s + b.String()
} else {
prompt = b.String();
} }
s += b.String();
prompt = s
} }
slog.Debug("generate request", "prompt", prompt, "images", images) slog.Debug("generate request", "prompt", prompt, "images", images)