third-party-mirrors/ollama
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

error on unknown message role

Browse Source
This commit is contained in:
Bruce MacDonald 2023-11-17 15:01:43 -05:00
parent 6e6b3baa23
commit 1eff6853eb
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/routes.go
View File

@ -216,7 +216,11 @@ func GenerateHandler(c *gin.Context) {
case req.Prompt != "":
prompt, err = promptFromRequestParams(c, model, req)
if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
status := http.StatusInternalServerError
if errors.Is(err, errInvalidRole) {
status = http.StatusBadRequest
}
c.JSON(status, gin.H{"error": err.Error()})
return
}
sendContext = true
@ -325,6 +329,8 @@ func promptFromRequestParams(c *gin.Context, model *Model, req api.GenerateReque
return prompt.String(), nil
}
var errInvalidRole = errors.New("invalid message role")
func promptFromMessages(model *Model, messages []api.Message) (string, error) {
flush := func(vars *PromptVars, model *Model, prompt *strings.Builder) error {
p, err := model.Prompt(vars)
@ -360,6 +366,8 @@ func promptFromMessages(model *Model, messages []api.Message) (string, error) {
vars.Prompt = m.Content
case "assistant":
prompt.WriteString(m.Content)
default:
return "", fmt.Errorf("%w %q, role must be one of [system, user, assistant]", errInvalidRole, m.Role)
}
}