norohind/ollama
1
0
Fork 0
forked from third-party-mirrors/ollama
Code Pull Requests Activity

server: update checkNameExists to use case-insensitive name comparison

Browse Source 
This allows pulls, pushes, and other model operations to be performed
with mixed-case names, which the Ollama registry supports.
This commit is contained in:
Blake Mizerany 2024-11-13 23:00:44 -08:00
parent d7eb05b936
commit d1b033c168
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/routes.go
View File

@ -628,7 +628,7 @@ func checkNameExists(name model.Name) error {
}
for n := range names {
if strings.EqualFold(n.Filepath(), name.Filepath()) && n != name {
if strings.EqualFold(n.Filepath(), name.Filepath()) && n.EqualFold(name) {
return errors.New("a model with that name already exists")
}
}

7
types/model/name.go
View File

@ -298,6 +298,13 @@ func (n Name) LogValue() slog.Value {
return slog.StringValue(n.String())
}
func (n Name) EqualFold(o Name) bool {
return strings.EqualFold(n.Host, o.Host) &&
strings.EqualFold(n.Namespace, o.Namespace) &&
strings.EqualFold(n.Model, o.Model) &&
strings.EqualFold(n.Tag, o.Tag)
}
func isValidLen(kind partKind, s string) bool {
switch kind {
case kindHost: