|
|
@ -57,7 +57,7 @@ type OpenAIRequest struct { |
|
|
|
Model string `json:"model" yaml:"model"` |
|
|
|
Model string `json:"model" yaml:"model"` |
|
|
|
|
|
|
|
|
|
|
|
// Prompt is read only by completion API calls
|
|
|
|
// Prompt is read only by completion API calls
|
|
|
|
Prompt string `json:"prompt" yaml:"prompt"` |
|
|
|
Prompt interface{} `json:"prompt" yaml:"prompt"` |
|
|
|
|
|
|
|
|
|
|
|
// Edit endpoint
|
|
|
|
// Edit endpoint
|
|
|
|
Instruction string `json:"instruction" yaml:"instruction"` |
|
|
|
Instruction string `json:"instruction" yaml:"instruction"` |
|
|
@ -122,9 +122,12 @@ func updateConfig(config *Config, input *OpenAIRequest) { |
|
|
|
if stop != "" { |
|
|
|
if stop != "" { |
|
|
|
config.StopWords = append(config.StopWords, stop) |
|
|
|
config.StopWords = append(config.StopWords, stop) |
|
|
|
} |
|
|
|
} |
|
|
|
case []string: |
|
|
|
case []interface{}: |
|
|
|
config.StopWords = append(config.StopWords, stop...) |
|
|
|
for _, pp := range stop { |
|
|
|
|
|
|
|
if s, ok := pp.(string); ok { |
|
|
|
|
|
|
|
config.StopWords = append(config.StopWords, s) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if input.RepeatPenalty != 0 { |
|
|
|
if input.RepeatPenalty != 0 { |
|
|
@ -234,29 +237,46 @@ func completionEndpoint(cm ConfigMerger, debug bool, loader *model.ModelLoader, |
|
|
|
|
|
|
|
|
|
|
|
log.Debug().Msgf("Parameter Config: %+v", config) |
|
|
|
log.Debug().Msgf("Parameter Config: %+v", config) |
|
|
|
|
|
|
|
|
|
|
|
predInput := input.Prompt |
|
|
|
predInput := []string{} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
switch p := input.Prompt.(type) { |
|
|
|
|
|
|
|
case string: |
|
|
|
|
|
|
|
predInput = append(predInput, p) |
|
|
|
|
|
|
|
case []interface{}: |
|
|
|
|
|
|
|
for _, pp := range p { |
|
|
|
|
|
|
|
if s, ok := pp.(string); ok { |
|
|
|
|
|
|
|
predInput = append(predInput, s) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
templateFile := config.Model |
|
|
|
templateFile := config.Model |
|
|
|
|
|
|
|
|
|
|
|
if config.TemplateConfig.Completion != "" { |
|
|
|
if config.TemplateConfig.Completion != "" { |
|
|
|
templateFile = config.TemplateConfig.Completion |
|
|
|
templateFile = config.TemplateConfig.Completion |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var result []Choice |
|
|
|
|
|
|
|
for _, i := range predInput { |
|
|
|
// A model can have a "file.bin.tmpl" file associated with a prompt template prefix
|
|
|
|
// A model can have a "file.bin.tmpl" file associated with a prompt template prefix
|
|
|
|
templatedInput, err := loader.TemplatePrefix(templateFile, struct { |
|
|
|
templatedInput, err := loader.TemplatePrefix(templateFile, struct { |
|
|
|
Input string |
|
|
|
Input string |
|
|
|
}{Input: predInput}) |
|
|
|
}{Input: i}) |
|
|
|
if err == nil { |
|
|
|
if err == nil { |
|
|
|
predInput = templatedInput |
|
|
|
i = templatedInput |
|
|
|
log.Debug().Msgf("Template found, input modified to: %s", predInput) |
|
|
|
log.Debug().Msgf("Template found, input modified to: %s", i) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
result, err := ComputeChoices(predInput, input, config, loader, func(s string, c *[]Choice) { |
|
|
|
r, err := ComputeChoices(i, input, config, loader, func(s string, c *[]Choice) { |
|
|
|
*c = append(*c, Choice{Text: s}) |
|
|
|
*c = append(*c, Choice{Text: s}) |
|
|
|
}, nil) |
|
|
|
}, nil) |
|
|
|
if err != nil { |
|
|
|
if err != nil { |
|
|
|
return err |
|
|
|
return err |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
result = append(result, r...) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
resp := &OpenAIResponse{ |
|
|
|
resp := &OpenAIResponse{ |
|
|
|
Model: input.Model, // we have to return what the user sent here, due to OpenAI spec.
|
|
|
|
Model: input.Model, // we have to return what the user sent here, due to OpenAI spec.
|
|
|
|
Choices: result, |
|
|
|
Choices: result, |
|
|
|