Get up and running with Kimi, GLM, MiniMax, DeepSeek, gpt-oss, Qwen, Gemma and other models.
types/model: remove knowledge of digest (#5500)
Blake Mizerany631cfd9e6236
diff --git a/types/model/name.go b/types/model/name.goindex e645a844c..5e475687e 100644--- a/types/model/name.go+++ b/types/model/name.go@@ -91,7 +91,6 @@ type Name struct {Namespace stringModel stringTag string- RawDigest string}// ParseName parses and assembles a Name from a name string. The@@ -143,11 +142,6 @@ func ParseNameBare(s string) Name {var n Namevar promised bool- s, n.RawDigest, promised = cutLast(s, "@")- if promised && n.RawDigest == "" {- n.RawDigest = MissingPart- }-// "/" is an illegal tag character, so we can use it to split the hostif strings.LastIndex(s, ":") > strings.LastIndex(s, "/") {s, n.Tag, _ = cutPromised(s, ":")@@ -222,10 +216,6 @@ func (n Name) String() string {b.WriteByte(':')b.WriteString(n.Tag)}- if n.RawDigest != "" {- b.WriteByte('@')- b.WriteString(n.RawDigest)- }return b.String()}@@ -250,16 +240,18 @@ func (n Name) DisplayShortest() string {return sb.String()}-func IsValidNamespace(namespace string) bool {- return isValidPart(kindNamespace, namespace)+// IsValidNamespace reports whether the provided string is a valid+// namespace.+func IsValidNamespace(s string) bool {+ return isValidPart(kindNamespace, s)}// IsValid reports whether all parts of the name are present and valid. The// digest is a special case, and is checked for validity only if present.+//+// Note: The digest check has been removed as is planned to be added back in+// at a later time.func (n Name) IsValid() bool {- if n.RawDigest != "" && !isValidPart(kindDigest, n.RawDigest) {- return false- }return n.IsFullyQualified()}diff --git a/types/model/name_test.go b/types/model/name_test.goindex 008dd586c..794d14d79 100644--- a/types/model/name_test.go+++ b/types/model/name_test.go@@ -122,21 +122,6 @@ func TestParseNameParts(t *testing.T) {},wantFilepath: filepath.Join(part350, part80, part80, part80),},- {- in: "@digest",- want: Name{- RawDigest: "digest",- },- wantValidDigest: false,- },- {- in: "model@sha256:123",- want: Name{- Model: "model",- RawDigest: "sha256:123",- },- wantValidDigest: true,- },}for _, tt := range cases {@@ -160,22 +145,18 @@ var testCases = map[string]bool{ // name -> valid"_why/_the/_lucky:_stiff": true,// minimal- "h/n/m:t@d": true,+ "h/n/m:t": true,"host/namespace/model:tag": true,"host/namespace/model": false,"namespace/model": false,"model": false,- "@sha256-1000000000000000000000000000000000000000000000000000000000000000": false,- "model@sha256-1000000000000000000000000000000000000000000000000000000000000000": false,- "model@sha256:1000000000000000000000000000000000000000000000000000000000000000": false,// long (but valid)part80 + "/" + part80 + "/" + part80 + ":" + part80: true,part350 + "/" + part80 + "/" + part80 + ":" + part80: true,- "h/nn/mm:t@sha256-1000000000000000000000000000000000000000000000000000000000000000": true, // bare minimum part sizes- "h/nn/mm:t@sha256:1000000000000000000000000000000000000000000000000000000000000000": true, // bare minimum part sizes+ "h/nn/mm:t": true, // bare minimum part sizes// unqualified"m": false,@@ -196,11 +177,10 @@ var testCases = map[string]bool{ // name -> valid"@": false,// not starting with alphanum- "-hh/nn/mm:tt@dd": false,- "hh/-nn/mm:tt@dd": false,- "hh/nn/-mm:tt@dd": false,- "hh/nn/mm:-tt@dd": false,- "hh/nn/mm:tt@-dd": false,+ "-hh/nn/mm:tt": false,+ "hh/-nn/mm:tt": false,+ "hh/nn/-mm:tt": false,+ "hh/nn/mm:-tt": false,// hosts"host:https/namespace/model:tag": true,@@ -334,7 +314,7 @@ func FuzzName(f *testing.F) {f.Fuzz(func(t *testing.T, s string) {n := ParseNameBare(s)if n.IsValid() {- parts := [...]string{n.Host, n.Namespace, n.Model, n.Tag, n.RawDigest}+ parts := [...]string{n.Host, n.Namespace, n.Model, n.Tag}for _, part := range parts {if part == ".." {t.Errorf("unexpected .. as valid part")