baalajimaestro/ollama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

allow overriding template and system in /api/generate

Browse source 
Fixes #297
Fixes #296
This commit is contained in:
Jeffrey Morgan 2023-08-08 00:55:34 -04:00
parent 5eb712f962
commit 8713ac23a8
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
api/types.go
View file

@ -33,9 +33,11 @@ func (e StatusError) Error() string {
} }
type GenerateRequest struct { type GenerateRequest struct {
Model string `json:"model"` Model string `json:"model"`
Prompt string `json:"prompt"` Prompt string `json:"prompt"`
Context []int `json:"context,omitempty"` System string `json:"system"`
Template string `json:"template"`
Context []int `json:"context,omitempty"`
Options map[string]interface{} `json:"options"` Options map[string]interface{} `json:"options"`
} }

13
server/images.go
View file

@ -6,6 +6,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"html/template"
"io" "io"
"log" "log"
"net/http" "net/http"
@ -15,7 +16,6 @@ import (
"reflect" "reflect"
"strconv" "strconv"
"strings" "strings"
"text/template"
"github.com/jmorganca/ollama/api" "github.com/jmorganca/ollama/api"
"github.com/jmorganca/ollama/parser" "github.com/jmorganca/ollama/parser"
@ -37,7 +37,12 @@ type Model struct {
} }
func (m *Model) Prompt(request api.GenerateRequest) (string, error) { func (m *Model) Prompt(request api.GenerateRequest) (string, error) {
tmpl, err := template.New("").Parse(m.Template) t := m.Template
if request.Template != "" {
t = request.Template
}
tmpl, err := template.New("").Parse(t)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -56,6 +61,10 @@ func (m *Model) Prompt(request api.GenerateRequest) (string, error) {
vars.Prompt = request.Prompt vars.Prompt = request.Prompt
vars.Context = request.Context vars.Context = request.Context
if request.System != "" {
vars.System = request.System
}
var sb strings.Builder var sb strings.Builder
if err := tmpl.Execute(&sb, vars); err != nil { if err := tmpl.Execute(&sb, vars); err != nil {
return "", err return "", err