baalajimaestro/ollama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

more resilient Manifests

Browse source
This commit is contained in:
Michael Yang 2024-05-09 10:00:18 -07:00
parent a385382ff5
commit 81fb06f530
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
server/manifest.go
View file

@ -125,13 +125,24 @@ func Manifests() (map[model.Name]*Manifest, error) {
ms := make(map[model.Name]*Manifest)
for _, match := range matches {
rel, err := filepath.Rel(manifests, match)
fi, err := os.Stat(match)
if err != nil {
return nil, err
}
if !fi.IsDir() {
rel, err := filepath.Rel(manifests, match)
if err != nil {
slog.Warn("bad filepath", "path", match, "error", err)
continue
}
n := model.ParseNameFromFilepath(rel)
if n.IsValid() {
if !n.IsValid() {
slog.Warn("bad manifest name", "path", rel, "error", err)
continue
}
m, err := ParseNamedManifest(n)
if err != nil {
slog.Warn("bad manifest", "name", n, "error", err)

4
server/manifest_test.go
View file

@ -56,6 +56,10 @@ func TestManifests(t *testing.T) {
filepath.Join("host", "namespace", "model", "tag"),
filepath.Join("host", "namespace", "model", ".hidden"),
},
"subdir": {
filepath.Join("host", "namespace", "model", "tag", "one"),
filepath.Join("host", "namespace", "model", "tag", "another", "one"),
},
}
for n, wants := range cases {