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

...

Browse Source
This commit is contained in:
Blake Mizerany 2024-04-11 00:57:08 -07:00
parent 0efb7931c7
commit 5cddcd079a
2 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
types/model/name.go
View File

@ -144,7 +144,7 @@ type Name struct {
// [Name.String] will not print a "+" if the build is empty. // [Name.String] will not print a "+" if the build is empty.
// //
// For more about filling in missing parts, see [Fill]. // For more about filling in missing parts, see [Fill].
func ParseNameFill(s, defaults string) Name { func ParseName(s, defaults string) Name {
var r Name var r Name
parts(s)(func(kind PartKind, part string) bool { parts(s)(func(kind PartKind, part string) bool {
if kind == PartInvalid { if kind == PartInvalid {
@ -162,18 +162,13 @@ func ParseNameFill(s, defaults string) Name {
if defaults == "" { if defaults == "" {
return r return r
} }
return Fill(r, ParseNameFill(defaults, "")) return Fill(r, ParseName(defaults, ""))
} }
return Name{} return Name{}
} }
// ParseName is equal to ParseNameFill(s, DefaultFill).
func ParseName(s string) Name {
return ParseNameFill(s, DefaultFill)
}
func MustParseNameFill(s, defaults string) Name { func MustParseNameFill(s, defaults string) Name {
r := ParseNameFill(s, "") r := ParseName(s, "")
if !r.IsValid() { if !r.IsValid() {
panic("model.MustParseName: invalid name: " + s) panic("model.MustParseName: invalid name: " + s)
} }
@ -231,6 +226,8 @@ func (r Name) slice(from, to PartKind) Name {
return v return v
} }
const empty = "?/?/?:?+?@?"
// DisplayShortest returns the shortest possible display string in form: // DisplayShortest returns the shortest possible display string in form:
// //
// [host/][<namespace>/]<model>[:<tag>] // [host/][<namespace>/]<model>[:<tag>]
@ -240,7 +237,7 @@ func (r Name) slice(from, to PartKind) Name {
// The tag is omitted if it is the mask tag is the same as r. // The tag is omitted if it is the mask tag is the same as r.
func (r Name) DisplayShortest(mask string) string { func (r Name) DisplayShortest(mask string) string {
mask = cmp.Or(mask, DefaultMask) mask = cmp.Or(mask, DefaultMask)
d := ParseName(mask) d := ParseName(mask, empty)
if !d.IsValid() { if !d.IsValid() {
panic("mask is an invalid Name") panic("mask is an invalid Name")
} }

54
types/model/name_test.go
View File

@ -111,11 +111,11 @@ func TestNameConsecutiveDots(t *testing.T) {
for i := 1; i < 10; i++ { for i := 1; i < 10; i++ {
s := strings.Repeat(".", i) s := strings.Repeat(".", i)
if i > 1 { if i > 1 {
if g := ParseNameFill(s, "").String(); g != "" { if g := ParseName(s, "").String(); g != "" {
t.Errorf("ParseName(%q) = %q; want empty string", s, g) t.Errorf("ParseName(%q) = %q; want empty string", s, g)
} }
} else { } else {
if g := ParseNameFill(s, "").String(); g != s { if g := ParseName(s, "").String(); g != s {
t.Errorf("ParseName(%q) = %q; want %q", s, g, s) t.Errorf("ParseName(%q) = %q; want %q", s, g, s)
} }
} }
@ -148,14 +148,14 @@ func TestParseName(t *testing.T) {
s := prefix + baseName s := prefix + baseName
t.Run(s, func(t *testing.T) { t.Run(s, func(t *testing.T) {
name := ParseNameFill(s, "") name := ParseName(s, "")
got := fieldsFromName(name) got := fieldsFromName(name)
if got != want { if got != want {
t.Errorf("ParseName(%q) = %q; want %q", s, got, want) t.Errorf("ParseName(%q) = %q; want %q", s, got, want)
} }
// test round-trip // test round-trip
if !ParseNameFill(name.String(), "").EqualFold(name) { if !ParseName(name.String(), "").EqualFold(name) {
t.Errorf("ParseName(%q).String() = %s; want %s", s, name.String(), baseName) t.Errorf("ParseName(%q).String() = %s; want %s", s, name.String(), baseName)
} }
}) })
@ -179,7 +179,7 @@ func TestCompleteWithAndWithoutBuild(t *testing.T) {
for _, tt := range cases { for _, tt := range cases {
t.Run(tt.in, func(t *testing.T) { t.Run(tt.in, func(t *testing.T) {
p := ParseNameFill(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.IsComplete(); g != tt.complete { if g := p.IsComplete(); g != tt.complete {
t.Errorf("Complete(%q) = %v; want %v", tt.in, g, tt.complete) t.Errorf("Complete(%q) = %v; want %v", tt.in, g, tt.complete)
@ -194,7 +194,7 @@ func TestCompleteWithAndWithoutBuild(t *testing.T) {
// inlined when used in Complete, preventing any allocations or // inlined when used in Complete, preventing any allocations or
// escaping to the heap. // escaping to the heap.
allocs := testing.AllocsPerRun(1000, func() { allocs := testing.AllocsPerRun(1000, func() {
keep(ParseNameFill("complete.com/x/mistral:latest+Q4_0", "").IsComplete()) keep(ParseName("complete.com/x/mistral:latest+Q4_0", "").IsComplete())
}) })
if allocs > 0 { if allocs > 0 {
t.Errorf("Complete allocs = %v; want 0", allocs) t.Errorf("Complete allocs = %v; want 0", allocs)
@ -211,7 +211,7 @@ func TestNameLogValue(t *testing.T) {
t.Run(s, func(t *testing.T) { t.Run(s, func(t *testing.T) {
var b bytes.Buffer var b bytes.Buffer
log := slog.New(slog.NewTextHandler(&b, nil)) log := slog.New(slog.NewTextHandler(&b, nil))
name := ParseNameFill(s, "") name := ParseName(s, "")
log.Info("", "name", name) log.Info("", "name", name)
want := fmt.Sprintf("name=%s", name.GoString()) want := fmt.Sprintf("name=%s", name.GoString())
got := b.String() got := b.String()
@ -258,7 +258,7 @@ func TestNameGoString(t *testing.T) {
for _, tt := range cases { for _, tt := range cases {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
p := ParseNameFill(tt.in, "") p := ParseName(tt.in, "")
tt.wantGoString = cmp.Or(tt.wantGoString, tt.in) tt.wantGoString = cmp.Or(tt.wantGoString, tt.in)
if g := fmt.Sprintf("%#v", p); g != tt.wantGoString { if g := fmt.Sprintf("%#v", p); g != tt.wantGoString {
t.Errorf("GoString() = %q; want %q", g, tt.wantGoString) t.Errorf("GoString() = %q; want %q", g, tt.wantGoString)
@ -309,7 +309,7 @@ func TestDisplayShortest(t *testing.T) {
} }
}() }()
p := ParseNameFill(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.DisplayShortest(tt.mask); g != tt.want { if g := p.DisplayShortest(tt.mask); g != tt.want {
t.Errorf("got = %q; want %q", g, tt.want) t.Errorf("got = %q; want %q", g, tt.want)
@ -320,7 +320,7 @@ func TestDisplayShortest(t *testing.T) {
func TestParseNameAllocs(t *testing.T) { func TestParseNameAllocs(t *testing.T) {
allocs := testing.AllocsPerRun(1000, func() { allocs := testing.AllocsPerRun(1000, func() {
keep(ParseNameFill("example.com/mistral:7b+Q4_0", "")) keep(ParseName("example.com/mistral:7b+Q4_0", ""))
}) })
if allocs > 0 { if allocs > 0 {
t.Errorf("ParseName allocs = %v; want 0", allocs) t.Errorf("ParseName allocs = %v; want 0", allocs)
@ -331,7 +331,7 @@ func BenchmarkParseName(b *testing.B) {
b.ReportAllocs() b.ReportAllocs()
for range b.N { for range b.N {
keep(ParseNameFill("example.com/mistral:7b+Q4_0", "")) keep(ParseName("example.com/mistral:7b+Q4_0", ""))
} }
} }
@ -346,7 +346,7 @@ func FuzzParseName(f *testing.F) {
f.Add(":@!@") f.Add(":@!@")
f.Add("...") f.Add("...")
f.Fuzz(func(t *testing.T, s string) { f.Fuzz(func(t *testing.T, s string) {
r0 := ParseNameFill(s, "") r0 := ParseName(s, "")
if strings.Contains(s, "..") && !r0.IsZero() { if strings.Contains(s, "..") && !r0.IsZero() {
t.Fatalf("non-zero value for path with '..': %q", s) t.Fatalf("non-zero value for path with '..': %q", s)
@ -369,7 +369,7 @@ func FuzzParseName(f *testing.F) {
t.Errorf("String() did not round-trip with case insensitivity: %q\ngot = %q\nwant = %q", s, r0.String(), s) t.Errorf("String() did not round-trip with case insensitivity: %q\ngot = %q\nwant = %q", s, r0.String(), s)
} }
r1 := ParseNameFill(r0.String(), "") r1 := ParseName(r0.String(), "")
if !r0.EqualFold(r1) { if !r0.EqualFold(r1) {
t.Errorf("round-trip mismatch: %+v != %+v", r0, r1) t.Errorf("round-trip mismatch: %+v != %+v", r0, r1)
} }
@ -389,7 +389,7 @@ func TestFill(t *testing.T) {
for _, tt := range cases { for _, tt := range cases {
t.Run(tt.dst, func(t *testing.T) { t.Run(tt.dst, func(t *testing.T) {
r := Fill(ParseNameFill(tt.dst, ""), ParseNameFill(tt.src, "")) r := Fill(ParseName(tt.dst, ""), ParseName(tt.src, ""))
if r.String() != tt.want { if r.String() != tt.want {
t.Errorf("Fill(%q, %q) = %q; want %q", tt.dst, tt.src, r, tt.want) t.Errorf("Fill(%q, %q) = %q; want %q", tt.dst, tt.src, r, tt.want)
} }
@ -398,7 +398,7 @@ func TestFill(t *testing.T) {
} }
func TestNameStringAllocs(t *testing.T) { func TestNameStringAllocs(t *testing.T) {
name := ParseNameFill("example.com/ns/mistral:latest+Q4_0", "") name := ParseName("example.com/ns/mistral:latest+Q4_0", "")
allocs := testing.AllocsPerRun(1000, func() { allocs := testing.AllocsPerRun(1000, func() {
keep(name.String()) keep(name.String())
}) })
@ -408,8 +408,8 @@ func TestNameStringAllocs(t *testing.T) {
} }
func ExampleFill() { func ExampleFill() {
defaults := ParseNameFill("registry.ollama.com/library/PLACEHOLDER:latest+Q4_0", "") defaults := ParseName("registry.ollama.com/library/PLACEHOLDER:latest+Q4_0", "")
r := Fill(ParseNameFill("mistral", ""), defaults) r := Fill(ParseName("mistral", ""), defaults)
fmt.Println(r) fmt.Println(r)
// Output: // Output:
@ -420,12 +420,12 @@ func ExampleName_MapHash() {
m := map[uint64]bool{} m := map[uint64]bool{}
// key 1 // key 1
m[ParseNameFill("mistral:latest+q4", "").MapHash()] = true m[ParseName("mistral:latest+q4", "").MapHash()] = true
m[ParseNameFill("miSTRal:latest+Q4", "").MapHash()] = true m[ParseName("miSTRal:latest+Q4", "").MapHash()] = true
m[ParseNameFill("mistral:LATest+Q4", "").MapHash()] = true m[ParseName("mistral:LATest+Q4", "").MapHash()] = true
// key 2 // key 2
m[ParseNameFill("mistral:LATest", "").MapHash()] = true m[ParseName("mistral:LATest", "").MapHash()] = true
fmt.Println(len(m)) fmt.Println(len(m))
// Output: // Output:
@ -434,9 +434,9 @@ func ExampleName_MapHash() {
func ExampleName_CompareFold_sort() { func ExampleName_CompareFold_sort() {
names := []Name{ names := []Name{
ParseNameFill("mistral:latest", ""), ParseName("mistral:latest", ""),
ParseNameFill("mistRal:7b+q4", ""), ParseName("mistRal:7b+q4", ""),
ParseNameFill("MIstral:7b", ""), ParseName("MIstral:7b", ""),
} }
slices.SortFunc(names, Name.CompareFold) slices.SortFunc(names, Name.CompareFold)
@ -457,7 +457,7 @@ func ExampleName_completeAndResolved() {
"x/y/z:latest+q4_0", "x/y/z:latest+q4_0",
"@sha123-1", "@sha123-1",
} { } {
name := ParseNameFill(s, "") name := ParseName(s, "")
fmt.Printf("complete:%v resolved:%v digest:%s\n", name.IsComplete(), name.IsResolved(), name.Digest()) fmt.Printf("complete:%v resolved:%v digest:%s\n", name.IsComplete(), name.IsResolved(), name.Digest())
} }
@ -468,7 +468,7 @@ func ExampleName_completeAndResolved() {
} }
func ExampleName_DisplayShortest() { func ExampleName_DisplayShortest() {
name := ParseNameFill("example.com/jmorganca/mistral:latest+Q4_0", "") name := ParseName("example.com/jmorganca/mistral:latest+Q4_0", "")
fmt.Println(name.DisplayShortest("example.com/jmorganca/_:latest")) fmt.Println(name.DisplayShortest("example.com/jmorganca/_:latest"))
fmt.Println(name.DisplayShortest("example.com/_/_:latest")) fmt.Println(name.DisplayShortest("example.com/_/_:latest"))
@ -476,7 +476,7 @@ func ExampleName_DisplayShortest() {
fmt.Println(name.DisplayShortest("_/_/_:_")) fmt.Println(name.DisplayShortest("_/_/_:_"))
// Default // Default
name = ParseNameFill("registry.ollama.ai/library/mistral:latest+Q4_0", "") name = ParseName("registry.ollama.ai/library/mistral:latest+Q4_0", "")
fmt.Println(name.DisplayShortest("")) fmt.Println(name.DisplayShortest(""))
// Output: // Output: