Get up and running with Kimi, GLM, MiniMax, DeepSeek, gpt-oss, Qwen, Gemma and other models.
add REQUIRES command to Modelfile (#13361)
Jeffrey Morgan8852220f59c1
diff --git a/api/types.go b/api/types.goindex 3ccf3ce29..63b898975 100644--- a/api/types.go+++ b/api/types.go@@ -554,6 +554,9 @@ type CreateRequest struct {Renderer string `json:"renderer,omitempty"`Parser string `json:"parser,omitempty"`+ // Requires is the minimum version of Ollama required by the model.+ Requires string `json:"requires,omitempty"`+// Info is a map of additional information for the modelInfo map[string]any `json:"info,omitempty"`@@ -604,6 +607,7 @@ type ShowResponse struct {Tensors []Tensor `json:"tensors,omitempty"`Capabilities []model.Capability `json:"capabilities,omitempty"`ModifiedAt time.Time `json:"modified_at,omitempty"`+ Requires string `json:"requires,omitempty"`}// CopyRequest is the request passed to [Client.Copy].diff --git a/cmd/cmd.go b/cmd/cmd.goindex d77bb2c58..35074ad2b 100644--- a/cmd/cmd.go+++ b/cmd/cmd.go@@ -943,6 +943,9 @@ func showInfo(resp *api.ShowResponse, verbose bool, w io.Writer) error {rows = append(rows, []string{"", "parameters", resp.Details.ParameterSize})}rows = append(rows, []string{"", "quantization", resp.Details.QuantizationLevel})+ if resp.Requires != "" {+ rows = append(rows, []string{"", "requires", resp.Requires})+ }return})diff --git a/cmd/cmd_test.go b/cmd/cmd_test.goindex 1c9d19942..7dc3d0093 100644--- a/cmd/cmd_test.go+++ b/cmd/cmd_test.go@@ -291,6 +291,31 @@ Weigh anchor!t.Errorf("unexpected output (-want +got):\n%s", diff)}})++ t.Run("min version", func(t *testing.T) {+ var b bytes.Buffer+ if err := showInfo(&api.ShowResponse{+ Details: api.ModelDetails{+ Family: "test",+ ParameterSize: "7B",+ QuantizationLevel: "FP16",+ },+ Requires: "0.14.0",+ }, false, &b); err != nil {+ t.Fatal(err)+ }++ expect := ` Model+ architecture test+ parameters 7B+ quantization FP16+ requires 0.14.0++`+ if diff := cmp.Diff(expect, b.String()); diff != "" {+ t.Errorf("unexpected output (-want +got):\n%s", diff)+ }+ })}func TestDeleteHandler(t *testing.T) {diff --git a/docs/modelfile.mdx b/docs/modelfile.mdxindex a3eca2076..ce91bbf69 100644--- a/docs/modelfile.mdx+++ b/docs/modelfile.mdx@@ -41,6 +41,7 @@ INSTRUCTION arguments| [`ADAPTER`](#adapter) | Defines the (Q)LoRA adapters to apply to the model. || [`LICENSE`](#license) | Specifies the legal license. || [`MESSAGE`](#message) | Specify message history. |+| [`REQUIRES`](#requires) | Specify the minimum version of Ollama required by the model. |## Examples@@ -248,6 +249,16 @@ MESSAGE user Is Ontario in Canada?MESSAGE assistant yes```+### REQUIRES++The `REQUIRES` instruction allows you to specify the minimum version of Ollama required by the model.++```+REQUIRES <version>+```++The version should be a valid Ollama version (e.g. 0.14.0).+## Notes- the **`Modelfile` is not case sensitive**. In the examples, uppercase instructions are used to make it easier to distinguish it from arguments.diff --git a/go.mod b/go.modindex 6e7dc1d6d..f7c9ff295 100644--- a/go.mod+++ b/go.mod@@ -15,8 +15,8 @@ require (github.com/spf13/cobra v1.7.0github.com/stretchr/testify v1.9.0github.com/x448/float16 v0.8.4- golang.org/x/sync v0.12.0- golang.org/x/sys v0.36.0+ golang.org/x/sync v0.17.0+ golang.org/x/sys v0.37.0)require (@@ -29,7 +29,8 @@ require (github.com/pdevine/tensor v0.0.0-20240510204454-f88f4562727cgithub.com/tkrajina/typescriptify-golang-structs v0.2.0golang.org/x/image v0.22.0- golang.org/x/tools v0.30.0+ golang.org/x/mod v0.30.0+ golang.org/x/tools v0.38.0gonum.org/v1/gonum v0.15.0)@@ -76,11 +77,11 @@ require (github.com/twitchyliquid64/golang-asm v0.15.1 // indirectgithub.com/ugorji/go/codec v1.2.12 // indirectgolang.org/x/arch v0.8.0 // indirect- golang.org/x/crypto v0.36.0+ golang.org/x/crypto v0.43.0golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa // indirect- golang.org/x/net v0.38.0 // indirect- golang.org/x/term v0.30.0- golang.org/x/text v0.23.0+ golang.org/x/net v0.46.0 // indirect+ golang.org/x/term v0.36.0+ golang.org/x/text v0.30.0google.golang.org/protobuf v1.34.1gopkg.in/yaml.v3 v3.0.1 // indirect)diff --git a/go.sum b/go.sumindex 464cd6fcc..936c040a0 100644--- a/go.sum+++ b/go.sum@@ -224,8 +224,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkgolang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=-golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=-golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=+golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=+golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=@@ -255,6 +255,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBgolang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=+golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk=+golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=@@ -267,8 +269,8 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Rgolang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=-golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=-golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=+golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=+golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=@@ -278,8 +280,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJgolang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=-golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=-golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=+golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=+golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=@@ -295,17 +297,17 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBcgolang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=-golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=-golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=+golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=+golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=-golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=-golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=+golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q=+golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss=golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=-golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=-golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=+golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=+golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=@@ -319,8 +321,8 @@ golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKgolang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=-golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=-golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=+golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=+golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=diff --git a/parser/parser.go b/parser/parser.goindex 1f4764449..5ef918bf2 100644--- a/parser/parser.go+++ b/parser/parser.go@@ -17,6 +17,7 @@ import ("strings""sync"+ "golang.org/x/mod/semver""golang.org/x/sync/errgroup""golang.org/x/text/encoding/unicode""golang.org/x/text/transform"@@ -104,6 +105,16 @@ func (f Modelfile) CreateRequest(relativeDir string) (*api.CreateRequest, error)req.Renderer = c.Argscase "parser":req.Parser = c.Args+ case "requires":+ // golang.org/x/mod/semver requires "v" prefix+ requires := c.Args+ if !strings.HasPrefix(requires, "v") {+ requires = "v" + requires+ }+ if !semver.IsValid(requires) {+ return nil, fmt.Errorf("requires must be a valid semver (e.g. 0.14.0)")+ }+ req.Requires = strings.TrimPrefix(requires, "v")case "message":role, msg, _ := strings.Cut(c.Args, ": ")messages = append(messages, api.Message{Role: role, Content: msg})@@ -322,7 +333,7 @@ func (c Command) String() string {switch c.Name {case "model":fmt.Fprintf(&sb, "FROM %s", c.Args)- case "license", "template", "system", "adapter", "renderer", "parser":+ case "license", "template", "system", "adapter", "renderer", "parser", "requires":fmt.Fprintf(&sb, "%s %s", strings.ToUpper(c.Name), quote(c.Args))case "message":role, message, _ := strings.Cut(c.Args, ": ")@@ -348,7 +359,7 @@ const (var (errMissingFrom = errors.New("no FROM line")errInvalidMessageRole = errors.New("message role must be one of \"system\", \"user\", or \"assistant\"")- errInvalidCommand = errors.New("command must be one of \"from\", \"license\", \"template\", \"system\", \"adapter\", \"renderer\", \"parser\", \"parameter\", or \"message\"")+ errInvalidCommand = errors.New("command must be one of \"from\", \"license\", \"template\", \"system\", \"adapter\", \"renderer\", \"parser\", \"parameter\", \"message\", or \"requires\""))type ParserError struct {@@ -608,7 +619,7 @@ func isValidMessageRole(role string) bool {func isValidCommand(cmd string) bool {switch strings.ToLower(cmd) {- case "from", "license", "template", "system", "adapter", "renderer", "parser", "parameter", "message":+ case "from", "license", "template", "system", "adapter", "renderer", "parser", "parameter", "message", "requires":return truedefault:return falsediff --git a/server/create.go b/server/create.goindex 1e957e420..15e364e1e 100644--- a/server/create.go+++ b/server/create.go@@ -61,6 +61,7 @@ func (s *Server) CreateHandler(c *gin.Context) {config.Renderer = r.Rendererconfig.Parser = r.Parser+ config.Requires = r.Requiresfor v := range r.Files {if !fs.ValidPath(v) {@@ -120,7 +121,7 @@ func (s *Server) CreateHandler(c *gin.Context) {ch <- gin.H{"error": err.Error()}}- if err == nil && !remote && (config.Renderer == "" || config.Parser == "") {+ if err == nil && !remote && (config.Renderer == "" || config.Parser == "" || config.Requires == "") {manifest, mErr := ParseNamedManifest(fromName)if mErr == nil && manifest.Config.Digest != "" {configPath, pErr := GetBlobsPath(manifest.Config.Digest)@@ -134,6 +135,9 @@ func (s *Server) CreateHandler(c *gin.Context) {if config.Parser == "" {config.Parser = baseConfig.Parser}+ if config.Requires == "" {+ config.Requires = baseConfig.Requires+ }}cfgFile.Close()}diff --git a/server/routes.go b/server/routes.goindex 60d3e190f..b19a40fbc 100644--- a/server/routes.go+++ b/server/routes.go@@ -1106,6 +1106,7 @@ func GetModelInfo(req api.ShowRequest) (*api.ShowResponse, error) {Messages: msgs,Capabilities: m.Capabilities(),ModifiedAt: manifest.fi.ModTime(),+ Requires: m.Config.Requires,}if m.Config.RemoteHost != "" {diff --git a/types/model/config.go b/types/model/config.goindex 5a4db7484..96aec8cb1 100644--- a/types/model/config.go+++ b/types/model/config.go@@ -9,6 +9,7 @@ type ConfigV2 struct {FileType string `json:"file_type"` // shown as Quantization LevelRenderer string `json:"renderer,omitempty"`Parser string `json:"parser,omitempty"`+ Requires string `json:"requires,omitempty"`RemoteHost string `json:"remote_host,omitempty"`RemoteModel string `json:"remote_model,omitempty"`