mirrors/ollama
1
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2025-05-11 10:26:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "parser: remove role validation from Modelfile parser" (#9917)

Browse source 
This reverts commit ffbfe833da.
This commit is contained in:
Parth Sareen 2025-03-21 12:38:09 -07:00 • committed by GitHub
parent d14ce75b95
commit 00ebda8cc4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
parser/parser.go
View file

@ -7,7 +7,6 @@ import (
"errors" "errors"
"fmt" "fmt"
"io" "io"
"log/slog"
"net/http" "net/http"
"os" "os"
"os/user" "os/user"
@ -301,8 +300,9 @@ const (
) )
var ( var (
errMissingFrom = errors.New("no FROM line") errMissingFrom = errors.New("no FROM line")
errInvalidCommand = errors.New("command must be one of \"from\", \"license\", \"template\", \"system\", \"adapter\", \"parameter\", or \"message\"") 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\", \"parameter\", or \"message\"")
) )
type ParserError struct { type ParserError struct {
@ -379,10 +379,14 @@ func ParseFile(r io.Reader) (*Modelfile, error) {
case stateParameter: case stateParameter:
cmd.Name = b.String() cmd.Name = b.String()
case stateMessage: case stateMessage:
role = b.String() if !isValidMessageRole(b.String()) {
if !isKnownMessageRole(b.String()) { return nil, &ParserError{
slog.Warn("received non-standard role", "role", role) LineNumber: currLine,
Msg: errInvalidMessageRole.Error(),
}
} }
role = b.String()
case stateComment, stateNil: case stateComment, stateNil:
// pass // pass
case stateValue: case stateValue:
@ -552,7 +556,7 @@ func isNewline(r rune) bool {
return r == '\r' || r == '\n' return r == '\r' || r == '\n'
} }
func isKnownMessageRole(role string) bool { func isValidMessageRole(role string) bool {
return role == "system" || role == "user" || role == "assistant" return role == "system" || role == "user" || role == "assistant"
} }

10
parser/parser_test.go
View file

@ -256,13 +256,13 @@ You are a multiline file parser. Always parse things.
{ {
` `
FROM foo FROM foo
MESSAGE somerandomrole I'm ok with you adding any role message now! MESSAGE badguy I'm a bad guy!
`, `,
[]Command{
{Name: "model", Args: "foo"},
{Name: "message", Args: "somerandomrole: I'm ok with you adding any role message now!"},
},
nil, nil,
&ParserError{
LineNumber: 3,
Msg: errInvalidMessageRole.Error(),
},
}, },
{ {
` `