Skip to content

GitLab

Unverified Commit 928de905 authored by 湛露先生's avatar 湛露先生 Committed by GitHub
Browse files

server: reuse InvalidModelNameErrMsg type (#8163)

parent 36aea615
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
server/routes.go
View file @ 928de905
...@@ -142,7 +142,7 @@ func (s *Server) GenerateHandler(c *gin.Context) { ...@@ -142,7 +142,7 @@ func (s *Server) GenerateHandler(c *gin.Context) {
switch { switch {
case errors.Is(err, fs.ErrNotExist): case errors.Is(err, fs.ErrNotExist):
c.JSON(http.StatusNotFound, gin.H{"error": fmt.Sprintf("model '%s' not found", req.Model)}) c.JSON(http.StatusNotFound, gin.H{"error": fmt.Sprintf("model '%s' not found", req.Model)})
case err.Error() == "invalid model name": case err.Error() == errtypes.InvalidModelNameErrMsg:
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
default: default:
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
...@@ -568,7 +568,7 @@ func (s *Server) PullHandler(c *gin.Context) { ...@@ -568,7 +568,7 @@ func (s *Server) PullHandler(c *gin.Context) {
name := model.ParseName(cmp.Or(req.Model, req.Name)) name := model.ParseName(cmp.Or(req.Model, req.Name))
if !name.IsValid() { if !name.IsValid() {
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "invalid model name"}) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": errtypes.InvalidModelNameErrMsg})
return return
} }
...@@ -829,7 +829,7 @@ func (s *Server) ShowHandler(c *gin.Context) { ...@@ -829,7 +829,7 @@ func (s *Server) ShowHandler(c *gin.Context) {
switch { switch {
case os.IsNotExist(err): case os.IsNotExist(err):
c.JSON(http.StatusNotFound, gin.H{"error": fmt.Sprintf("model '%s' not found", req.Model)}) c.JSON(http.StatusNotFound, gin.H{"error": fmt.Sprintf("model '%s' not found", req.Model)})
case err.Error() == "invalid model name": case err.Error() == errtypes.InvalidModelNameErrMsg:
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
default: default:
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
...@@ -1470,7 +1470,7 @@ func (s *Server) ChatHandler(c *gin.Context) { ...@@ -1470,7 +1470,7 @@ func (s *Server) ChatHandler(c *gin.Context) {
switch { switch {
case os.IsNotExist(err): case os.IsNotExist(err):
c.JSON(http.StatusNotFound, gin.H{"error": fmt.Sprintf("model '%s' not found", req.Model)}) c.JSON(http.StatusNotFound, gin.H{"error": fmt.Sprintf("model '%s' not found", req.Model)})
case err.Error() == "invalid model name": case err.Error() == errtypes.InvalidModelNameErrMsg:
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
default: default:
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment