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

generate: set created_at

Browse source 
move the empty response so it's more visible
This commit is contained in:
Michael Yang 2023-10-18 16:04:32 -07:00
parent 7e547c6833
commit 2ad8a074ac
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
server/routes.go
View file

@ -182,6 +182,12 @@ func GenerateHandler(c *gin.Context) {
ch := make(chan any) ch := make(chan any)
go func() { go func() {
defer close(ch) defer close(ch)
// an empty request loads the model
if req.Prompt == "" && req.Template == "" && req.System == "" {
ch <- api.GenerateResponse{CreatedAt: time.Now().UTC(), Model: req.Model, Done: true}
return
}
fn := func(r api.GenerateResponse) { fn := func(r api.GenerateResponse) {
loaded.expireAt = time.Now().Add(sessionDuration) loaded.expireAt = time.Now().Add(sessionDuration)
loaded.expireTimer.Reset(sessionDuration) loaded.expireTimer.Reset(sessionDuration)
@ -196,14 +202,9 @@ func GenerateHandler(c *gin.Context) {
ch <- r ch <- r
} }
// an empty request loads the model
if req.Prompt == "" && req.Template == "" && req.System == "" {
ch <- api.GenerateResponse{Model: req.Model, Done: true}
} else {
if err := loaded.runner.Predict(c.Request.Context(), req.Context, prompt, fn); err != nil { if err := loaded.runner.Predict(c.Request.Context(), req.Context, prompt, fn); err != nil {
ch <- gin.H{"error": err.Error()} ch <- gin.H{"error": err.Error()}
} }
}
}() }()
if req.Stream != nil && !*req.Stream { if req.Stream != nil && !*req.Stream {