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

find symlink of mac app

Browse source
This commit is contained in:
Bruce MacDonald 2023-07-31 17:38:10 -04:00
parent e72fe7945f
commit 36d6081ed1
1 changed files with 31 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
cmd/cmd.go
View file

@ -526,14 +526,13 @@ func RunServer(_ *cobra.Command, _ []string) error {
return server.Serve(ln) return server.Serve(ln)
} }
func checkServerHeartbeat(_ *cobra.Command, _ []string) error { func startMacApp(client *api.Client) error {
client := api.NewClient() link, err := os.Readlink("/usr/local/bin/ollama")
if err := client.Heartbeat(context.Background()); err != nil { if err != nil {
if strings.Contains(err.Error(), "connection refused") { return err
if runtime.GOOS == "darwin" { }
// if the mac app is available, start it path := strings.Split(link, "Ollama.app")
if _, err := os.Stat("/Applications/Ollama.app"); err == nil { if err := exec.Command("/usr/bin/open", "-a", path[0]+"Ollama.app").Run(); err != nil {
if err := exec.Command("/usr/bin/open", "-a", "/Applications/Ollama.app").Run(); err != nil {
return err return err
} }
// wait for the server to start // wait for the server to start
@ -549,11 +548,21 @@ func checkServerHeartbeat(_ *cobra.Command, _ []string) error {
} }
} }
} }
}
func checkServerHeartbeat(_ *cobra.Command, _ []string) error {
client := api.NewClient()
if err := client.Heartbeat(context.Background()); err != nil {
if !strings.Contains(err.Error(), "connection refused") {
return err
} }
if runtime.GOOS == "darwin" {
if err := startMacApp(client); err != nil {
return fmt.Errorf("could not connect to ollama app server, run 'ollama serve' to start it")
} }
} else {
return fmt.Errorf("could not connect to ollama server, run 'ollama serve' to start it") return fmt.Errorf("could not connect to ollama server, run 'ollama serve' to start it")
} }
return err
} }
return nil return nil
} }