Merge pull request #4306 from ollama/mxyng/fix-routes

This commit is contained in:
Michael Yang 2024-05-10 08:58:16 -07:00 committed by GitHub
commit 200a18820e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -735,24 +735,27 @@ func (s *Server) ListModelsHandler(c *gin.Context) {
n := model.ParseNameFromFilepath(rel)
if !n.IsValid() {
slog.Info("invalid model filepath", "path", rel)
slog.Warn("bad manifest filepath", "path", rel)
return nil
}
m, err := ParseNamedManifest(n)
if err != nil {
return err
slog.Warn("bad manifest", "name", n, "error", err)
return nil
}
f, err := m.Config.Open()
if err != nil {
return err
slog.Warn("bad manifest config filepath", "name", n, "error", err)
return nil
}
defer f.Close()
var c ConfigV2
if err := json.NewDecoder(f).Decode(&c); err != nil {
return err
slog.Warn("bad manifest config", "name", n, "error", err)
return nil
}
// tag should never be masked