check server is running before running command

This commit is contained in:
Bruce MacDonald 2023-07-31 16:25:57 -04:00
parent 90ba0b80c7
commit e72fe7945f
2 changed files with 72 additions and 25 deletions

View File

@ -223,3 +223,10 @@ func (c *Client) Delete(ctx context.Context, req *DeleteRequest) error {
} }
return nil return nil
} }
func (c *Client) Heartbeat(ctx context.Context) error {
if err := c.do(ctx, http.MethodGet, "/", nil, nil); err != nil {
return err
}
return nil
}

View File

@ -10,7 +10,9 @@ import (
"net" "net"
"net/http" "net/http"
"os" "os"
"os/exec"
"path/filepath" "path/filepath"
"runtime"
"strings" "strings"
"time" "time"
@ -431,7 +433,6 @@ func generateInteractive(cmd *cobra.Command, model string) error {
usage() usage()
continue continue
} }
} else { } else {
usage() usage()
continue continue
@ -525,6 +526,38 @@ func RunServer(_ *cobra.Command, _ []string) error {
return server.Serve(ln) return server.Serve(ln)
} }
func checkServerHeartbeat(_ *cobra.Command, _ []string) error {
client := api.NewClient()
if err := client.Heartbeat(context.Background()); err != nil {
if strings.Contains(err.Error(), "connection refused") {
if runtime.GOOS == "darwin" {
// if the mac app is available, start it
if _, err := os.Stat("/Applications/Ollama.app"); err == nil {
if err := exec.Command("/usr/bin/open", "-a", "/Applications/Ollama.app").Run(); err != nil {
return err
}
// wait for the server to start
timeout := time.After(5 * time.Second)
tick := time.Tick(500 * time.Millisecond)
for {
select {
case <-timeout:
return errors.New("timed out waiting for server to start")
case <-tick:
if err := client.Heartbeat(context.Background()); err == nil {
return nil // server has started
}
}
}
}
}
return fmt.Errorf("could not connect to ollama server, run 'ollama serve' to start it")
}
return err
}
return nil
}
func NewCLI() *cobra.Command { func NewCLI() *cobra.Command {
log.SetFlags(log.LstdFlags | log.Lshortfile) log.SetFlags(log.LstdFlags | log.Lshortfile)
@ -540,19 +573,21 @@ func NewCLI() *cobra.Command {
cobra.EnableCommandSorting = false cobra.EnableCommandSorting = false
createCmd := &cobra.Command{ createCmd := &cobra.Command{
Use: "create MODEL", Use: "create MODEL",
Short: "Create a model from a Modelfile", Short: "Create a model from a Modelfile",
Args: cobra.MinimumNArgs(1), Args: cobra.MinimumNArgs(1),
RunE: CreateHandler, PreRunE: checkServerHeartbeat,
RunE: CreateHandler,
} }
createCmd.Flags().StringP("file", "f", "Modelfile", "Name of the Modelfile (default \"Modelfile\")") createCmd.Flags().StringP("file", "f", "Modelfile", "Name of the Modelfile (default \"Modelfile\")")
runCmd := &cobra.Command{ runCmd := &cobra.Command{
Use: "run MODEL [PROMPT]", Use: "run MODEL [PROMPT]",
Short: "Run a model", Short: "Run a model",
Args: cobra.MinimumNArgs(1), Args: cobra.MinimumNArgs(1),
RunE: RunHandler, PreRunE: checkServerHeartbeat,
RunE: RunHandler,
} }
runCmd.Flags().Bool("verbose", false, "Show timings for response") runCmd.Flags().Bool("verbose", false, "Show timings for response")
@ -565,19 +600,21 @@ func NewCLI() *cobra.Command {
} }
pullCmd := &cobra.Command{ pullCmd := &cobra.Command{
Use: "pull MODEL", Use: "pull MODEL",
Short: "Pull a model from a registry", Short: "Pull a model from a registry",
Args: cobra.MinimumNArgs(1), Args: cobra.MinimumNArgs(1),
RunE: PullHandler, PreRunE: checkServerHeartbeat,
RunE: PullHandler,
} }
pullCmd.Flags().Bool("insecure", false, "Use an insecure registry") pullCmd.Flags().Bool("insecure", false, "Use an insecure registry")
pushCmd := &cobra.Command{ pushCmd := &cobra.Command{
Use: "push MODEL", Use: "push MODEL",
Short: "Push a model to a registry", Short: "Push a model to a registry",
Args: cobra.MinimumNArgs(1), Args: cobra.MinimumNArgs(1),
RunE: PushHandler, PreRunE: checkServerHeartbeat,
RunE: PushHandler,
} }
pushCmd.Flags().Bool("insecure", false, "Use an insecure registry") pushCmd.Flags().Bool("insecure", false, "Use an insecure registry")
@ -586,21 +623,24 @@ func NewCLI() *cobra.Command {
Use: "list", Use: "list",
Aliases: []string{"ls"}, Aliases: []string{"ls"},
Short: "List models", Short: "List models",
PreRunE: checkServerHeartbeat,
RunE: ListHandler, RunE: ListHandler,
} }
copyCmd := &cobra.Command{ copyCmd := &cobra.Command{
Use: "cp", Use: "cp",
Short: "Copy a model", Short: "Copy a model",
Args: cobra.MinimumNArgs(2), Args: cobra.MinimumNArgs(2),
RunE: CopyHandler, PreRunE: checkServerHeartbeat,
RunE: CopyHandler,
} }
deleteCmd := &cobra.Command{ deleteCmd := &cobra.Command{
Use: "rm", Use: "rm",
Short: "Remove a model", Short: "Remove a model",
Args: cobra.MinimumNArgs(1), Args: cobra.MinimumNArgs(1),
RunE: DeleteHandler, PreRunE: checkServerHeartbeat,
RunE: DeleteHandler,
} }
rootCmd.AddCommand( rootCmd.AddCommand(