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

This reverts commit ffbfe833da.

parser/parser.go

@@ -7,7 +7,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"log/slog"
 	"net/http"
 	"os"
 	"os/user"
@@ -302,6 +301,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\", \"parameter\", or \"message\"")
 )
 
@@ -379,10 +379,14 @@ func ParseFile(r io.Reader) (*Modelfile, error) {
 			case stateParameter:
 				cmd.Name = b.String()
 			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:
 				// pass
 			case stateValue:
@@ -552,7 +556,7 @@ func isNewline(r rune) bool {
 	return r == '\r' || r == '\n'
 }
 
-func isKnownMessageRole(role string) bool {
+func isValidMessageRole(role string) bool {
 	return role == "system" || role == "user" || role == "assistant"
 }
 

parser/parser_test.go

@@ -256,13 +256,13 @@ You are a multiline file parser. Always parse things.
 		{
 			`
 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,
+			&ParserError{
+				LineNumber: 3,
+				Msg:        errInvalidMessageRole.Error(),
+			},
 		},
 		{
 			`