jeans/ollama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

llm: loosen format check to default to no format (#8127)

Browse Source
This commit is contained in:
Jeffrey Morgan 2024-12-16 18:45:46 -08:00 committed by GitHub
parent 8f805dd74b
commit 0f06a6daa7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
llm/server.go
View File

@ -722,20 +722,14 @@ func (s *llmServer) Completion(ctx context.Context, req CompletionRequest, fn fu
return fmt.Errorf("unexpected server status: %s", status.ToString()) return fmt.Errorf("unexpected server status: %s", status.ToString())
} }
if len(req.Format) > 0 { if bytes.Equal(req.Format, []byte(`"json"`)) {
switch {
case bytes.Equal(req.Format, []byte(`"json"`)):
request["grammar"] = grammarJSON request["grammar"] = grammarJSON
case bytes.HasPrefix(req.Format, []byte("{")): } else if bytes.HasPrefix(req.Format, []byte("{")) {
// User provided a JSON schema
g := llama.SchemaToGrammar(req.Format) g := llama.SchemaToGrammar(req.Format)
if g == nil { if g == nil {
return fmt.Errorf("invalid JSON schema in format") return fmt.Errorf("invalid JSON schema in format")
} }
request["grammar"] = string(g) request["grammar"] = string(g)
default:
return errors.New(`invalid format: expected "json" or a JSON schema`)
}
} }
// Handling JSON marshaling with special characters unescaped. // Handling JSON marshaling with special characters unescaped.