Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
ollama
Commits
e0363717
Commit
e0363717
authored
May 09, 2024
by
Michael Yang
Browse files
fix(routes): skip bad manifests
parent
c02db932
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
server/routes.go
server/routes.go
+7
-4
No files found.
server/routes.go
View file @
e0363717
...
@@ -735,24 +735,27 @@ func (s *Server) ListModelsHandler(c *gin.Context) {
...
@@ -735,24 +735,27 @@ func (s *Server) ListModelsHandler(c *gin.Context) {
n
:=
model
.
ParseNameFromFilepath
(
rel
)
n
:=
model
.
ParseNameFromFilepath
(
rel
)
if
!
n
.
IsValid
()
{
if
!
n
.
IsValid
()
{
slog
.
Info
(
"invalid model
filepath"
,
"path"
,
rel
)
slog
.
Warn
(
"bad manifest
filepath"
,
"path"
,
rel
)
return
nil
return
nil
}
}
m
,
err
:=
ParseNamedManifest
(
n
)
m
,
err
:=
ParseNamedManifest
(
n
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
slog
.
Warn
(
"bad manifest"
,
"name"
,
n
,
"error"
,
err
)
return
nil
}
}
f
,
err
:=
m
.
Config
.
Open
()
f
,
err
:=
m
.
Config
.
Open
()
if
err
!=
nil
{
if
err
!=
nil
{
return
err
slog
.
Warn
(
"bad manifest config filepath"
,
"name"
,
n
,
"error"
,
err
)
return
nil
}
}
defer
f
.
Close
()
defer
f
.
Close
()
var
c
ConfigV2
var
c
ConfigV2
if
err
:=
json
.
NewDecoder
(
f
)
.
Decode
(
&
c
);
err
!=
nil
{
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
// tag should never be masked
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment