jeans/ollama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge conflicts

Browse Source
This commit is contained in:
Roy Han 2024-07-08 15:15:09 -07:00
parent b7c622dd32
commit 3342e5f035
1 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
server/routes.go
View File

@ -9,6 +9,7 @@ import (
"io" "io"
"io/fs" "io/fs"
"log/slog" "log/slog"
"math"
"net" "net"
"net/http" "net/http"
"net/netip" "net/netip"
@ -309,32 +310,6 @@ func (s *Server) GenerateHandler(c *gin.Context) {
streamResponse(c, ch) streamResponse(c, ch)
} }
func getDefaultSessionDuration() time.Duration {
if envconfig.KeepAlive != "" {
v, err := strconv.Atoi(envconfig.KeepAlive)
if err != nil {
d, err := time.ParseDuration(envconfig.KeepAlive)
if err != nil {
return defaultSessionDuration
}
if d < 0 {
return time.Duration(math.MaxInt64)
}
return d
}
d := time.Duration(v) * time.Second
if d < 0 {
return time.Duration(math.MaxInt64)
}
return d
}
return defaultSessionDuration
}
func (s *Server) EmbedHandler(c *gin.Context) { func (s *Server) EmbedHandler(c *gin.Context) {
var req api.EmbedRequest var req api.EmbedRequest
err := c.ShouldBindJSON(&req) err := c.ShouldBindJSON(&req)
@ -374,13 +349,6 @@ func (s *Server) EmbedHandler(c *gin.Context) {
return return
} }
var sessionDuration time.Duration
if req.KeepAlive == nil {
sessionDuration = getDefaultSessionDuration()
} else {
sessionDuration = req.KeepAlive.Duration
}
switch reqEmbed := req.Input.(type) { switch reqEmbed := req.Input.(type) {
case string: case string:
if reqEmbed == "" { if reqEmbed == "" {
@ -404,7 +372,7 @@ func (s *Server) EmbedHandler(c *gin.Context) {
return return
} }
rCh, eCh := s.sched.GetRunner(c.Request.Context(), model, opts, sessionDuration) rCh, eCh := s.sched.GetRunner(c.Request.Context(), model, opts, req.KeepAlive)
var runner *runnerRef var runner *runnerRef
select { select {
case runner = <-rCh: case runner = <-rCh: