From 949d7832cf540ede8e1de69e0e66550528117ada Mon Sep 17 00:00:00 2001 From: Blake Mizerany Date: Mon, 15 Apr 2024 16:58:00 -0700 Subject: [PATCH] Revert "cmd: provide feedback if OLLAMA_MODELS is set on non-serve command (#3470)" (#3662) This reverts commit 7d05a6ee8f44b314fa697a427439e5fa4d78c3d7. This proved to be more painful than useful. See: https://github.com/ollama/ollama/issues/3624 --- cmd/cmd.go | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/cmd/cmd.go b/cmd/cmd.go index bf55061f..f77c08b8 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -252,14 +252,6 @@ func createBlob(cmd *cobra.Command, client *api.Client, path string) (string, er } func RunHandler(cmd *cobra.Command, args []string) error { - if os.Getenv("OLLAMA_MODELS") != "" { - return errors.New("OLLAMA_MODELS must only be set for 'ollama serve'") - } - - if err := checkServerHeartbeat(cmd, args); err != nil { - return err - } - client, err := api.ClientFromEnvironment() if err != nil { return err @@ -986,10 +978,11 @@ func NewCLI() *cobra.Command { showCmd.Flags().Bool("system", false, "Show system message of a model") runCmd := &cobra.Command{ - Use: "run MODEL [PROMPT]", - Short: "Run a model", - Args: cobra.MinimumNArgs(1), - RunE: RunHandler, + Use: "run MODEL [PROMPT]", + Short: "Run a model", + Args: cobra.MinimumNArgs(1), + PreRunE: checkServerHeartbeat, + RunE: RunHandler, } runCmd.Flags().Bool("verbose", false, "Show timings for response")