From 9b5bf861dd3726ccb3886b6490ec7ea5a996cc8c Mon Sep 17 00:00:00 2001 From: Josh Yan Date: Wed, 17 Jul 2024 11:35:34 -0700 Subject: [PATCH] use new err --- server/images.go | 2 +- server/routes.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/images.go b/server/images.go index 8a22c2f46..574dec191 100644 --- a/server/images.go +++ b/server/images.go @@ -494,7 +494,7 @@ func CreateModel(ctx context.Context, name model.Name, modelFileDir, quantizatio case "license", "template", "system": if c.Name == "template" { if _, err := template.Parse(c.Args); err != nil { - return err + return fmt.Errorf("%w: %s", errBadTemplate, err) } } diff --git a/server/routes.go b/server/routes.go index b0a653399..27f1951e1 100644 --- a/server/routes.go +++ b/server/routes.go @@ -56,6 +56,7 @@ func init() { } var errRequired = errors.New("is required") +var errBadTemplate = errors.New("template error") func modelOptions(model *Model, requestOpts map[string]interface{}) (api.Options, error) { opts := api.DefaultOptions() @@ -614,7 +615,7 @@ func (s *Server) CreateModelHandler(c *gin.Context) { quantization := cmp.Or(r.Quantize, r.Quantization) if err := CreateModel(ctx, name, filepath.Dir(r.Path), strings.ToUpper(quantization), f, fn); err != nil { - if strings.HasPrefix(err.Error(), "template: ") { + if errors.Is(err, errBadTemplate) { c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": err.Error()}) } else { ch <- gin.H{"error": err.Error()}