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

Cmd changes (#541)

Browse source
This commit is contained in:
Patrick Devine 2023-09-18 12:26:56 -07:00 committed by GitHub
parent 94e1d96b29
commit 80dd44e80a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 90 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
cmd/cmd.go
View file

@ -33,6 +33,17 @@ import (
"github.com/jmorganca/ollama/version" "github.com/jmorganca/ollama/version"
) )
type Painter struct{}
func (p Painter) Paint(line []rune, l int) []rune {
termType := os.Getenv("TERM")
if termType == "xterm-256color" && len(line) == 0 {
prompt := "Send a message (/? for help)"
return []rune(fmt.Sprintf("\033[38;5;245m%s\033[%dD\033[0m", prompt, len(prompt)))
}
return line
}
func CreateHandler(cmd *cobra.Command, args []string) error { func CreateHandler(cmd *cobra.Command, args []string) error {
filename, _ := cmd.Flags().GetString("file") filename, _ := cmd.Flags().GetString("file")
filename, err := filepath.Abs(filename) filename, err := filepath.Abs(filename)
@ -387,7 +398,6 @@ func RunGenerate(cmd *cobra.Command, args []string) error {
type generateContextKey string type generateContextKey string
func generate(cmd *cobra.Command, model, prompt string) error { func generate(cmd *cobra.Command, model, prompt string) error {
if len(strings.TrimSpace(prompt)) > 0 {
client, err := api.FromEnv() client, err := api.FromEnv()
if err != nil { if err != nil {
return err return err
@ -431,8 +441,10 @@ func generate(cmd *cobra.Command, model, prompt string) error {
return err return err
} }
if prompt != "" {
fmt.Println() fmt.Println()
fmt.Println() fmt.Println()
}
if !latest.Done { if !latest.Done {
return errors.New("unexpected end of response") return errors.New("unexpected end of response")
@ -450,7 +462,6 @@ func generate(cmd *cobra.Command, model, prompt string) error {
ctx := cmd.Context() ctx := cmd.Context()
ctx = context.WithValue(ctx, generateContextKey("context"), latest.Context) ctx = context.WithValue(ctx, generateContextKey("context"), latest.Context)
cmd.SetContext(ctx) cmd.SetContext(ctx)
}
return nil return nil
} }
@ -461,6 +472,11 @@ func generateInteractive(cmd *cobra.Command, model string) error {
return err return err
} }
// load the model
if err := generate(cmd, model, ""); err != nil {
return err
}
completer := readline.NewPrefixCompleter( completer := readline.NewPrefixCompleter(
readline.PcItem("/help"), readline.PcItem("/help"),
readline.PcItem("/list"), readline.PcItem("/list"),
@ -492,6 +508,7 @@ func generateInteractive(cmd *cobra.Command, model string) error {
} }
config := readline.Config{ config := readline.Config{
Painter: Painter{},
Prompt: ">>> ", Prompt: ">>> ",
HistoryFile: filepath.Join(home, ".ollama", "history"), HistoryFile: filepath.Join(home, ".ollama", "history"),
AutoComplete: completer, AutoComplete: completer,
@ -621,11 +638,13 @@ func generateInteractive(cmd *cobra.Command, model string) error {
return nil return nil
} }
if len(line) > 0 && line[0] != '/' {
if err := generate(cmd, model, line); err != nil { if err := generate(cmd, model, line); err != nil {
return err return err
} }
} }
} }
}
func generateBatch(cmd *cobra.Command, model string) error { func generateBatch(cmd *cobra.Command, model string) error {
scanner := bufio.NewScanner(os.Stdin) scanner := bufio.NewScanner(os.Stdin)

4
server/routes.go
View file

@ -218,9 +218,13 @@ func GenerateHandler(c *gin.Context) {
ch <- r ch <- r
} }
if req.Prompt == "" {
ch <- api.GenerateResponse{Model: req.Model, Done: true}
} else {
if err := loaded.llm.Predict(c.Request.Context(), req.Context, prompt, fn); err != nil { if err := loaded.llm.Predict(c.Request.Context(), req.Context, prompt, fn); err != nil {
ch <- gin.H{"error": err.Error()} ch <- gin.H{"error": err.Error()}
} }
}
}() }()
streamResponse(c, ch) streamResponse(c, ch)