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

bugfix: "null" value json mode (#7979)

Browse Source
This commit is contained in:
Parth Sareen 2024-12-06 14:13:15 -08:00 committed by GitHub
parent acd7d03266
commit de52b6c2f9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/cmd.go
View File

@ -1036,6 +1036,10 @@ func chat(cmd *cobra.Command, opts runOptions) (*api.Message, error) {
return nil return nil
} }
if opts.Format == "json" {
opts.Format = `"` + opts.Format + `"`
}
req := &api.ChatRequest{ req := &api.ChatRequest{
Model: opts.Model, Model: opts.Model,
Messages: opts.Messages, Messages: opts.Messages,
@ -1121,6 +1125,10 @@ func generate(cmd *cobra.Command, opts runOptions) error {
} }
} }
if opts.Format == "json" {
opts.Format = `"` + opts.Format + `"`
}
request := api.GenerateRequest{ request := api.GenerateRequest{
Model: opts.Model, Model: opts.Model,
Prompt: opts.Prompt, Prompt: opts.Prompt,

2
llm/server.go
View File

@ -746,7 +746,7 @@ func (s *llmServer) Completion(ctx context.Context, req CompletionRequest, fn fu
// TODO (parthsareen): Move conversion to grammar with sampling logic // TODO (parthsareen): Move conversion to grammar with sampling logic
// API should do error handling for invalid formats // API should do error handling for invalid formats
if req.Format != nil { if req.Format != nil && strings.TrimSpace(string(req.Format)) != "null" {
if strings.ToLower(strings.TrimSpace(string(req.Format))) == `"json"` { if strings.ToLower(strings.TrimSpace(string(req.Format))) == `"json"` {
request["grammar"] = jsonGrammar request["grammar"] = jsonGrammar
if !strings.Contains(strings.ToLower(req.Prompt), "json") { if !strings.Contains(strings.ToLower(req.Prompt), "json") {