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

Better err handling

Browse Source
This commit is contained in:
ParthSareen 2024-12-15 23:14:18 -08:00
parent 6fad1637ed
commit a5e66a1163
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
server/routes.go
View File

@ -564,6 +564,12 @@ func (s *Server) TokenizeHandler(w http.ResponseWriter, r *http.Request) {
return return
} }
slog.Info("tokenize request", "text", req.Text, "tokens", req.Text)
if req.Text == "" {
http.Error(w, "missing text for tokenization", http.StatusBadRequest)
return
}
runner, _, _, err := s.scheduleRunner(r.Context(), req.Model, []Capability{}, nil, req.KeepAlive) runner, _, _, err := s.scheduleRunner(r.Context(), req.Model, []Capability{}, nil, req.KeepAlive)
if err != nil { if err != nil {
http.Error(w, fmt.Sprintf("model '%s' not found", req.Model), http.StatusNotFound) http.Error(w, fmt.Sprintf("model '%s' not found", req.Model), http.StatusNotFound)
@ -577,9 +583,12 @@ func (s *Server) TokenizeHandler(w http.ResponseWriter, r *http.Request) {
} }
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(api.TokenizeResponse{ if err := json.NewEncoder(w).Encode(api.TokenizeResponse{
Tokens: tokens, Tokens: tokens,
}) }); err != nil {
http.Error(w, fmt.Sprintf("failed to encode response: %v", err), http.StatusInternalServerError)
return
}
} }
func (s *Server) DetokenizeHandler(w http.ResponseWriter, r *http.Request) { func (s *Server) DetokenizeHandler(w http.ResponseWriter, r *http.Request) {
@ -598,6 +607,11 @@ func (s *Server) DetokenizeHandler(w http.ResponseWriter, r *http.Request) {
return return
} }
if req.Tokens == nil {
http.Error(w, "missing tokens for detokenization", http.StatusBadRequest)
return
}
runner, _, _, err := s.scheduleRunner(r.Context(), req.Model, []Capability{}, nil, req.KeepAlive) runner, _, _, err := s.scheduleRunner(r.Context(), req.Model, []Capability{}, nil, req.KeepAlive)
if err != nil { if err != nil {
http.Error(w, fmt.Sprintf("model '%s' not found", req.Model), http.StatusNotFound) http.Error(w, fmt.Sprintf("model '%s' not found", req.Model), http.StatusNotFound)
@ -611,9 +625,12 @@ func (s *Server) DetokenizeHandler(w http.ResponseWriter, r *http.Request) {
} }
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(api.DetokenizeResponse{ if err := json.NewEncoder(w).Encode(api.DetokenizeResponse{
Text: text, Text: text,
}) }); err != nil {
http.Error(w, fmt.Sprintf("failed to encode response: %v", err), http.StatusInternalServerError)
return
}
} }
func (s *Server) PullHandler(c *gin.Context) { func (s *Server) PullHandler(c *gin.Context) {