tcsenpai/ollama
1
0
Fork 0
mirror of https://github.com/tcsenpai/ollama.git synced 2025-06-08 04:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

audio processing error prop

Browse Source
This commit is contained in:
Roy Han 2024-08-07 14:05:22 -07:00
parent d503f04b32
commit ad7e822883
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/routes.go
View File

@ -160,7 +160,7 @@ func (s *Server) runWhisperServer(c *gin.Context, portCh chan int, errCh chan er
} }
// Wait for server connection // Wait for server connection
retries := 10 retries := 25
var connErr error var connErr error
for range retries { for range retries {
time.Sleep(50 * time.Millisecond) time.Sleep(50 * time.Millisecond)
@ -1509,9 +1509,9 @@ func (s *Server) ProcessHandler(c *gin.Context) {
c.JSON(http.StatusOK, api.ProcessResponse{Models: models}) c.JSON(http.StatusOK, api.ProcessResponse{Models: models})
} }
func processAudio(c *gin.Context, s *Server, msgs []api.Message, req *api.WhisperRequest) { func processAudio(c *gin.Context, s *Server, msgs []api.Message, req *api.WhisperRequest) error {
if req.Model == "" { if req.Model == "" {
return return nil
} }
portCh := make(chan int, 1) portCh := make(chan int, 1)
errCh := make(chan error, 1) errCh := make(chan error, 1)
@ -1522,7 +1522,7 @@ func processAudio(c *gin.Context, s *Server, msgs []api.Message, req *api.Whispe
case port = <-portCh: case port = <-portCh:
case err := <-errCh: case err := <-errCh:
c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return return err
} }
// could parallelize this // could parallelize this
@ -1531,11 +1531,12 @@ func processAudio(c *gin.Context, s *Server, msgs []api.Message, req *api.Whispe
w, err := whisperInference(c, msg.Audio, port) w, err := whisperInference(c, msg.Audio, port)
if err != nil { if err != nil {
c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"error": "failed to generate completion"}) c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"error": "failed to generate completion"})
return return err
} }
msgs[i].Content += "\n" + w.Text msgs[i].Content += "\n" + w.Text
} }
} }
return nil
} }
func (s *Server) ChatHandler(c *gin.Context) { func (s *Server) ChatHandler(c *gin.Context) {
@ -1583,7 +1584,10 @@ func (s *Server) ChatHandler(c *gin.Context) {
} }
if req.Speech != nil { if req.Speech != nil {
processAudio(c, s, msgs, req.Speech) if err := processAudio(c, s, msgs, req.Speech); err != nil {
slog.Error("failed to process audio", "error", err)
return
}
} }
prompt, images, err := chatPrompt(c.Request.Context(), m, r.Tokenize, opts, msgs, req.Tools) prompt, images, err := chatPrompt(c.Request.Context(), m, r.Tokenize, opts, msgs, req.Tools)