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

Refactor and format code.

Browse source
This commit is contained in:
Vyacheslav Moskalev 2024-08-02 03:50:05 +07:00
parent 3b5210548e
commit 8a9f946ca7
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
server/routes.go
View file

@ -188,21 +188,21 @@ func (s *Server) GenerateHandler(c *gin.Context) {
} }
var b bytes.Buffer var b bytes.Buffer
if err := tmpl.Execute(&b, values); err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}
if req.Context != nil { if req.Context != nil {
s, 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
} }
prompt = s + b.String() b.WriteString(s)
} else {
prompt = b.String();
} }
if err := tmpl.Execute(&b, values); err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}
prompt = b.String()
} }
slog.Debug("generate request", "prompt", prompt, "images", images) slog.Debug("generate request", "prompt", prompt, "images", images)
@ -241,12 +241,12 @@ func (s *Server) GenerateHandler(c *gin.Context) {
res.LoadDuration = checkpointLoaded.Sub(checkpointStart) res.LoadDuration = checkpointLoaded.Sub(checkpointStart)
if !req.Raw { if !req.Raw {
tokens, err := r.Tokenize(c.Request.Context(), prompt + sb.String()) tokens, err := r.Tokenize(c.Request.Context(), prompt+sb.String())
if err != nil { if err != nil {
ch <- gin.H{"error": err.Error()} ch <- gin.H{"error": err.Error()}
return return
} }
res.Context = tokens[:] res.Context = tokens
} }
} }