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

api: add generate endpoint for structured outputs (#7939)

Browse Source
This commit is contained in:
Parth Sareen 2024-12-04 17:37:12 -08:00 committed by GitHub
parent 630e7dc6ff
commit c6c526275d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/types.go
View File

@ -67,7 +67,7 @@ type GenerateRequest struct {
Raw bool `json:"raw,omitempty"` Raw bool `json:"raw,omitempty"`
// Format specifies the format to return a response in. // Format specifies the format to return a response in.
Format string `json:"format"` Format json.RawMessage `json:"format,omitempty"`
// KeepAlive controls how long the model will stay loaded in memory following // KeepAlive controls how long the model will stay loaded in memory following
// this request. // this request.

2
cmd/cmd.go
View File

@ -1126,7 +1126,7 @@ func generate(cmd *cobra.Command, opts runOptions) error {
Prompt: opts.Prompt, Prompt: opts.Prompt,
Context: generateContext, Context: generateContext,
Images: opts.Images, Images: opts.Images,
Format: opts.Format, Format: json.RawMessage(opts.Format),
System: opts.System, System: opts.System,
Options: opts.Options, Options: opts.Options,
KeepAlive: opts.KeepAlive, KeepAlive: opts.KeepAlive,

7
server/routes.go
View File

@ -148,10 +148,7 @@ func (s *Server) GenerateHandler(c *gin.Context) {
return return
} }
if req.Format != "" && req.Format != "json" { if req.Raw && (req.Template != "" || req.System != "" || len(req.Context) > 0) {
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "format must be empty or \"json\""})
return
} else if req.Raw && (req.Template != "" || req.System != "" || len(req.Context) > 0) {
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "raw mode does not support template, system, or context"}) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "raw mode does not support template, system, or context"})
return return
} }
@ -278,7 +275,7 @@ func (s *Server) GenerateHandler(c *gin.Context) {
if err := r.Completion(c.Request.Context(), llm.CompletionRequest{ if err := r.Completion(c.Request.Context(), llm.CompletionRequest{
Prompt: prompt, Prompt: prompt,
Images: images, Images: images,
Format: json.RawMessage(req.Format), Format: req.Format,
Options: opts, Options: opts,
}, func(cr llm.CompletionResponse) { }, func(cr llm.CompletionResponse) {
res := api.GenerateResponse{ res := api.GenerateResponse{