jeans/ollama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x/model: Name.Short -> Name.Nick

Browse Source
This commit is contained in:
Blake Mizerany 2024-04-04 14:43:47 -07:00
parent 7cd939690a
commit 5041000a28
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
x/model/name.go
View File

@ -16,7 +16,7 @@ const (
Invalid NamePart = iota Invalid NamePart = iota
Registry Registry
Namespace Namespace
Short Nick
Tag Tag
Build Build
) )
@ -25,7 +25,7 @@ var kindNames = map[NamePart]string{
Invalid: "Invalid", Invalid: "Invalid",
Registry: "Domain", Registry: "Domain",
Namespace: "Namespace", Namespace: "Namespace",
Short: "Name", Nick: "Name",
Tag: "Tag", Tag: "Tag",
Build: "Build", Build: "Build",
} }
@ -38,7 +38,7 @@ var kindNames = map[NamePart]string{
type Name struct { type Name struct {
domain string domain string
namespace string namespace string
name string nick string
tag string tag string
build string build string
} }
@ -49,20 +49,20 @@ type Name struct {
func (r Name) Full() string { func (r Name) Full() string {
r.domain = cmp.Or(r.domain, "!(MISSING DOMAIN)") r.domain = cmp.Or(r.domain, "!(MISSING DOMAIN)")
r.namespace = cmp.Or(r.namespace, "!(MISSING NAMESPACE)") r.namespace = cmp.Or(r.namespace, "!(MISSING NAMESPACE)")
r.name = cmp.Or(r.name, "!(MISSING NAME)") r.nick = cmp.Or(r.nick, "!(MISSING NAME)")
r.tag = cmp.Or(r.tag, "!(MISSING TAG)") r.tag = cmp.Or(r.tag, "!(MISSING TAG)")
r.build = cmp.Or(r.build, "!(MISSING BUILD)") r.build = cmp.Or(r.build, "!(MISSING BUILD)")
return r.String() return r.String()
} }
func (r Name) ShortAndTag() string { func (r Name) NickAndTag() string {
r.domain = "" r.domain = ""
r.namespace = "" r.namespace = ""
r.build = "" r.build = ""
return r.String() return r.String()
} }
func (r Name) ShortTagAndBuild() string { func (r Name) NickTagAndBuild() string {
r.domain = "" r.domain = ""
r.namespace = "" r.namespace = ""
return r.String() return r.String()
@ -79,7 +79,7 @@ func (r Name) String() string {
b.WriteString(r.namespace) b.WriteString(r.namespace)
b.WriteString("/") b.WriteString("/")
} }
b.WriteString(r.name) b.WriteString(r.nick)
if r.tag != "" { if r.tag != "" {
b.WriteString(":") b.WriteString(":")
b.WriteString(r.tag) b.WriteString(r.tag)
@ -123,7 +123,7 @@ func (r Name) Parts() []string {
return []string{ return []string{
r.domain, r.domain,
r.namespace, r.namespace,
r.name, r.nick,
r.tag, r.tag,
r.build, r.build,
} }
@ -131,7 +131,7 @@ func (r Name) Parts() []string {
func (r Name) Domain() string { return r.namespace } func (r Name) Domain() string { return r.namespace }
func (r Name) Namespace() string { return r.namespace } func (r Name) Namespace() string { return r.namespace }
func (r Name) Name() string { return r.name } func (r Name) Nick() string { return r.nick }
func (r Name) Tag() string { return r.tag } func (r Name) Tag() string { return r.tag }
func (r Name) Build() string { return r.build } func (r Name) Build() string { return r.build }
@ -159,8 +159,8 @@ func ParseName(s string) Name {
r.domain = part r.domain = part
case Namespace: case Namespace:
r.namespace = part r.namespace = part
case Short: case Nick:
r.name = part r.nick = part
case Tag: case Tag:
r.tag = part r.tag = part
case Build: case Build:
@ -182,7 +182,7 @@ func ParseName(s string) Name {
func Merge(a, b Name) Name { func Merge(a, b Name) Name {
return Name{ return Name{
// name is left untouched // name is left untouched
name: a.name, nick: a.nick,
domain: cmp.Or(a.domain, b.domain), domain: cmp.Or(a.domain, b.domain),
namespace: cmp.Or(a.namespace, b.namespace), namespace: cmp.Or(a.namespace, b.namespace),
@ -243,15 +243,15 @@ func NameParts(s string) iter.Seq2[NamePart, string] {
if !yieldValid(Tag, s[i+1:j]) { if !yieldValid(Tag, s[i+1:j]) {
return return
} }
state, j = Short, i state, j = Nick, i
default: default:
yield(Invalid, "") yield(Invalid, "")
return return
} }
case '/': case '/':
switch state { switch state {
case Short, Tag, Build: case Nick, Tag, Build:
if !yieldValid(Short, s[i+1:j]) { if !yieldValid(Nick, s[i+1:j]) {
return return
} }
state, j = Namespace, i state, j = Namespace, i
@ -275,17 +275,17 @@ func NameParts(s string) iter.Seq2[NamePart, string] {
if state <= Namespace { if state <= Namespace {
yieldValid(state, s[:j]) yieldValid(state, s[:j])
} else { } else {
yieldValid(Short, s[:j]) yieldValid(Nick, s[:j])
} }
} }
} }
// Valid returns true if the ref has a valid name. To know if a ref is // Valid returns true if the ref has a valid nick. To know if a ref is
// "complete", use Complete. // "complete", use Complete.
func (r Name) Valid() bool { func (r Name) Valid() bool {
// Parts ensures we only have valid parts, so no need to validate // Parts ensures we only have valid parts, so no need to validate
// them here, only check if we have a name or not. // them here, only check if we have a name or not.
return r.name != "" return r.nick != ""
} }
// isValidPart returns true if given part is valid ascii [a-zA-Z0-9_\.-] // isValidPart returns true if given part is valid ascii [a-zA-Z0-9_\.-]

36
x/model/name_test.go
View File

@ -7,15 +7,15 @@ import (
) )
var testNames = map[string]Name{ var testNames = map[string]Name{
"mistral:latest": {name: "mistral", tag: "latest"}, "mistral:latest": {nick: "mistral", tag: "latest"},
"mistral": {name: "mistral"}, "mistral": {nick: "mistral"},
"mistral:30B": {name: "mistral", tag: "30B"}, "mistral:30B": {nick: "mistral", tag: "30B"},
"mistral:7b": {name: "mistral", tag: "7b"}, "mistral:7b": {nick: "mistral", tag: "7b"},
"mistral:7b+Q4_0": {name: "mistral", tag: "7b", build: "Q4_0"}, "mistral:7b+Q4_0": {nick: "mistral", tag: "7b", build: "Q4_0"},
"mistral+KQED": {name: "mistral", build: "KQED"}, "mistral+KQED": {nick: "mistral", build: "KQED"},
"mistral.x-3:7b+Q4_0": {name: "mistral.x-3", tag: "7b", build: "Q4_0"}, "mistral.x-3:7b+Q4_0": {nick: "mistral.x-3", tag: "7b", build: "Q4_0"},
"mistral:7b+q4_0": {name: "mistral", tag: "7b", build: "Q4_0"}, "mistral:7b+q4_0": {nick: "mistral", tag: "7b", build: "Q4_0"},
"llama2": {name: "llama2"}, "llama2": {nick: "llama2"},
// invalid (includes fuzzing trophies) // invalid (includes fuzzing trophies)
"+": {}, "+": {},
@ -36,7 +36,7 @@ var testNames = map[string]Name{
"file:///etc/passwd:latest": {}, "file:///etc/passwd:latest": {},
"file:///etc/passwd:latest+u": {}, "file:///etc/passwd:latest+u": {},
strings.Repeat("a", MaxNameLength): {name: strings.Repeat("a", MaxNameLength)}, strings.Repeat("a", MaxNameLength): {nick: strings.Repeat("a", MaxNameLength)},
strings.Repeat("a", MaxNameLength+1): {}, strings.Repeat("a", MaxNameLength+1): {},
} }
@ -66,10 +66,10 @@ func TestParseName(t *testing.T) {
t.Errorf("String() = %s; want %s", got.String(), s) t.Errorf("String() = %s; want %s", got.String(), s)
} }
if got.Valid() && got.Name() == "" { if got.Valid() && got.Nick() == "" {
t.Errorf("Valid() = true; Name() = %q; want non-empty name", got.Name()) t.Errorf("Valid() = true; Nick() = %q; want non-empty name", got.Nick())
} else if !got.Valid() && got.Name() != "" { } else if !got.Valid() && got.Nick() != "" {
t.Errorf("Valid() = false; Name() = %q; want empty name", got.Name()) t.Errorf("Valid() = false; Nick() = %q; want empty name", got.Nick())
} }
}) })
} }
@ -118,11 +118,11 @@ func TestNameStringVariants(t *testing.T) {
t.Run(tt.in, func(t *testing.T) { t.Run(tt.in, func(t *testing.T) {
p := ParseName(tt.in) p := ParseName(tt.in)
t.Logf("ParseName(%q) = %#v", tt.in, p) t.Logf("ParseName(%q) = %#v", tt.in, p)
if g := p.ShortAndTag(); g != tt.nameAndTag { if g := p.NickAndTag(); g != tt.nameAndTag {
t.Errorf("ShortAndTag(%q) = %q; want %q", tt.in, g, tt.nameAndTag) t.Errorf("NickAndTag(%q) = %q; want %q", tt.in, g, tt.nameAndTag)
} }
if g := p.ShortTagAndBuild(); g != tt.nameTagAndBuild { if g := p.NickTagAndBuild(); g != tt.nameTagAndBuild {
t.Errorf("ShortTagAndBuild(%q) = %q; want %q", tt.in, g, tt.nameTagAndBuild) t.Errorf("NickTagAndBuild(%q) = %q; want %q", tt.in, g, tt.nameTagAndBuild)
} }
}) })
} }